fix: [#1693] Adds CookieSameSiteEnum and IVirtualServer as exports to…

… the index file

packages/happy-dom/src/cookie/CookieContainer.ts

@@ -2,6 +2,7 @@ import URL from '../url/URL.js';
 import DefaultCookie from './DefaultCookie.js';
 import ICookie from './ICookie.js';
 import ICookieContainer from './ICookieContainer.js';
+import IOptionalCookie from './IOptionalCookie.js';
 import CookieExpireUtility from './urilities/CookieExpireUtility.js';
 import CookieURLUtility from './urilities/CookieURLUtility.js';
 
@@ -19,7 +20,7 @@ export default class CookieContainer implements ICookieContainer {
 	 *
 	 * @param cookies Cookies.
 	 */
-	public addCookies(cookies: ICookie[]): void {
+	public addCookies(cookies: IOptionalCookie[]): void {
 		const indexMap: { [k: string]: number } = {};
 		const getKey = (cookie: ICookie): string =>
 			`${cookie.key}-${cookie.originURL.hostname}-${cookie.path}-${typeof cookie.value}`;
@@ -30,22 +31,24 @@ export default class CookieContainer implements ICookieContainer {
 		}
 
 		for (const cookie of cookies) {
-			if (!cookie || !cookie.key || !cookie.originURL) {
+			const newCookie = Object.assign({}, DefaultCookie, cookie);
+
+			if (!newCookie || !newCookie.key || !newCookie.originURL) {
 				throw new Error(
 					"Failed to execute 'addCookies' on 'CookieContainer': The properties 'key' and 'originURL' are required."
 				);
 			}
 
 			// Remove existing cookie with same name, domain and path.
-			const index = indexMap[getKey(cookie)];
+			const index = indexMap[getKey(newCookie)];
 
 			if (index !== undefined) {
 				this.#cookies.splice(index, 1);
 			}
 
-			if (!CookieExpireUtility.hasExpired(cookie)) {
-				indexMap[getKey(cookie)] = this.#cookies.length;
-				this.#cookies.push(Object.assign(Object.assign({}, DefaultCookie, cookie)));
+			if (!CookieExpireUtility.hasExpired(newCookie)) {
+				indexMap[getKey(newCookie)] = this.#cookies.length;
+				this.#cookies.push(newCookie);
 			}
 		}
 	}

packages/happy-dom/src/cookie/ICookie.ts

@@ -4,13 +4,11 @@ export default interface ICookie {
 	// Required
 	key: string;
 	originURL: URL;
-
-	// Optional
-	value?: string | null;
-	domain?: string;
-	path?: string;
-	expires?: Date | null;
-	httpOnly?: boolean;
-	secure?: boolean;
-	sameSite?: CookieSameSiteEnum;
+	value: string | null;
+	domain: string;
+	path: string;
+	expires: Date | null;
+	httpOnly: boolean;
+	secure: boolean;
+	sameSite: CookieSameSiteEnum;
 }

packages/happy-dom/src/cookie/IOptionalCookie.ts

@@ -0,0 +1,16 @@
+import CookieSameSiteEnum from './enums/CookieSameSiteEnum.js';
+
+export default interface IOptionalCookie {
+	// Required
+	key: string;
+	originURL: URL;
+
+	// Optional
+	value?: string | null;
+	domain?: string;
+	path?: string;
+	expires?: Date | null;
+	httpOnly?: boolean;
+	secure?: boolean;
+	sameSite?: CookieSameSiteEnum;
+}

packages/happy-dom/src/index.ts

@@ -189,6 +189,8 @@ import type IBrowserFrame from './browser/types/IBrowserFrame.js';
 import type IBrowserPage from './browser/types/IBrowserPage.js';
 import type IBrowserSettings from './browser/types/IBrowserSettings.js';
 import type IOptionalBrowserSettings from './browser/types/IOptionalBrowserSettings.js';
+import type ICookie from './cookie/ICookie.js';
+import type IOptionalCookie from './cookie/IOptionalCookie.js';
 import type IEventInit from './event/IEventInit.js';
 import type ITouchInit from './event/ITouchInit.js';
 import type IUIEventInit from './event/IUIEventInit.js';
@@ -217,6 +219,7 @@ export type {
 	IBrowserPage,
 	IBrowserSettings,
 	IClipboardEventInit,
+	ICookie,
 	ICustomEventInit,
 	IErrorEventInit,
 	IEventInit,
@@ -228,6 +231,7 @@ export type {
 	IMediaQueryListInit,
 	IMouseEventInit,
 	IOptionalBrowserSettings,
+	IOptionalCookie,
 	IProgressEventInit,
 	ISubmitEventInit,
 	ISyncResponse,