Merge pull request #1086 from capricorn86/task/847-typeerror-the-obj-…

…argument-must-be-an-instance-of-blob-received-an-instance-of-file-vitest #847@patch: Fixes bug in URL.createObjectURL() where it did not suppo…
capricorn86 · Sep 22, 2023 · aede90a · aede90a
2 parents c730377 + 5922b33
commit aede90a
Show file tree

Hide file tree

Showing 23 changed files with 67 additions and 21 deletions.
diff --git a/packages/happy-dom/src/cookie/Cookie.ts b/packages/happy-dom/src/cookie/Cookie.ts
@@ -1,7 +1,7 @@
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 import CookieSameSiteEnum from './CookieSameSiteEnum.js';
-import { URL } from 'url';
+import URL from '../url/URL.js';
 
 /**
  * Cookie.

diff --git a/packages/happy-dom/src/cookie/CookieJar.ts b/packages/happy-dom/src/cookie/CookieJar.ts
@@ -1,6 +1,6 @@
 import Cookie from './Cookie.js';
 import CookieSameSiteEnum from './CookieSameSiteEnum.js';
-import { URL } from 'url';
+import URL from '../url/URL.js';
 
 /**
  * CookieJar.

diff --git a/packages/happy-dom/src/fetch/Fetch.ts b/packages/happy-dom/src/fetch/Fetch.ts
@@ -11,7 +11,7 @@ import Response from './Response.js';
 import HTTP, { IncomingMessage } from 'http';
 import HTTPS from 'https';
 import Zlib from 'zlib';
-import { URL } from 'url';
+import URL from '../url/URL.js';
 import { Socket } from 'net';
 import Stream from 'stream';
 import DataURIParser from './data-uri/DataURIParser.js';

diff --git a/packages/happy-dom/src/fetch/Request.ts b/packages/happy-dom/src/fetch/Request.ts
@@ -1,7 +1,7 @@
 import IBlob from '../file/IBlob.js';
 import IDocument from '../nodes/document/IDocument.js';
 import IRequestInit from './types/IRequestInit.js';
-import { URL } from 'url';
+import URL from '../url/URL.js';
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 import IRequestInfo from './types/IRequestInfo.js';

diff --git a/packages/happy-dom/src/fetch/ResourceFetch.ts b/packages/happy-dom/src/fetch/ResourceFetch.ts
@@ -1,6 +1,6 @@
 import DOMException from '../exception/DOMException.js';
 import IDocument from '../nodes/document/IDocument.js';
-import { URL } from 'url';
+import URL from '../url/URL.js';
 
 /**
  * Helper class for performing fetch of resources.

diff --git a/packages/happy-dom/src/fetch/Response.ts b/packages/happy-dom/src/fetch/Response.ts
@@ -5,7 +5,8 @@ import IResponseInit from './types/IResponseInit.js';
 import IResponseBody from './types/IResponseBody.js';
 import Headers from './Headers.js';
 import IHeaders from './types/IHeaders.js';
-import { URL, URLSearchParams } from 'url';
+import { URLSearchParams } from 'url';
+import URL from '../url/URL.js';
 import Blob from '../file/Blob.js';
 import Stream from 'stream';
 import FormData from '../form-data/FormData.js';

diff --git a/packages/happy-dom/src/fetch/types/IRequestInfo.ts b/packages/happy-dom/src/fetch/types/IRequestInfo.ts
@@ -1,4 +1,4 @@
-import { URL } from 'url';
+import URL from '../../url/URL.js';
 import IRequest from './IRequest.js';
 
 type IRequestInfo = IRequest | string | URL;

diff --git a/packages/happy-dom/src/fetch/types/IRequestInit.ts b/packages/happy-dom/src/fetch/types/IRequestInit.ts
@@ -1,6 +1,6 @@
 import IHeadersInit from './IHeadersInit.js';
 import AbortSignal from '../AbortSignal.js';
-import { URL } from 'url';
+import URL from '../../url/URL.js';
 import IRequestReferrerPolicy from './IRequestReferrerPolicy.js';
 import IRequestRedirect from './IRequestRedirect.js';
 import IRequestBody from './IRequestBody.js';

diff --git a/packages/happy-dom/src/fetch/utilities/FetchRequestReferrerUtility.ts b/packages/happy-dom/src/fetch/utilities/FetchRequestReferrerUtility.ts
@@ -1,4 +1,4 @@
-import { URL } from 'url';
+import URL from '../../url/URL.js';
 import IRequest from '../types/IRequest.js';
 import IDocument from '../../nodes/document/IDocument.js';
 import { isIP } from 'net';

diff --git a/packages/happy-dom/src/fetch/utilities/FetchRequestValidationUtility.ts b/packages/happy-dom/src/fetch/utilities/FetchRequestValidationUtility.ts
@@ -2,7 +2,7 @@ import DOMException from '../../exception/DOMException.js';
 import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
 import IRequestReferrerPolicy from '../types/IRequestReferrerPolicy.js';
 import IRequestRedirect from '../types/IRequestRedirect.js';
-import { URL } from 'url';
+import URL from '../../url/URL.js';
 import IRequest from '../types/IRequest.js';
 
 const VALID_REFERRER_POLICIES = [

diff --git a/packages/happy-dom/src/index.ts b/packages/happy-dom/src/index.ts
@@ -4,7 +4,8 @@ import Window from './window/Window.js';
 import DataTransfer from './event/DataTransfer.js';
 import DataTransferItem from './event/DataTransferItem.js';
 import DataTransferItemList from './event/DataTransferItemList.js';
-import { URL, URLSearchParams } from 'url';
+import { URLSearchParams } from 'url';
+import URL from './url/URL.js';
 import Location from './location/Location.js';
 import MutationObserver from './mutation-observer/MutationObserver.js';
 import ResizeObserver from './resize-observer/ResizeObserver.js';

diff --git a/packages/happy-dom/src/location/Location.ts b/packages/happy-dom/src/location/Location.ts
@@ -1,4 +1,4 @@
-import { URL } from 'url';
+import URL from '../url/URL.js';
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 

diff --git a/packages/happy-dom/src/nodes/html-anchor-element/HTMLAnchorElement.ts b/packages/happy-dom/src/nodes/html-anchor-element/HTMLAnchorElement.ts
@@ -2,7 +2,7 @@ import HTMLElement from '../html-element/HTMLElement.js';
 import DOMTokenList from '../../dom-token-list/DOMTokenList.js';
 import IDOMTokenList from '../../dom-token-list/IDOMTokenList.js';
 import IHTMLAnchorElement from './IHTMLAnchorElement.js';
-import { URL } from 'url';
+import URL from '../../url/URL.js';
 import HTMLAnchorElementUtility from './HTMLAnchorElementUtility.js';
 import INamedNodeMap from '../../named-node-map/INamedNodeMap.js';
 import HTMLAnchorElementNamedNodeMap from './HTMLAnchorElementNamedNodeMap.js';

diff --git a/packages/happy-dom/src/nodes/html-anchor-element/HTMLAnchorElementUtility.ts b/packages/happy-dom/src/nodes/html-anchor-element/HTMLAnchorElementUtility.ts
@@ -1,5 +1,5 @@
 import IDocument from '../document/IDocument.js';
-import { URL } from 'url';
+import URL from '../../url/URL.js';
 
 /**
  * HTML Anchor Element utility.

diff --git a/packages/happy-dom/src/nodes/html-iframe-element/HTMLIFrameUtility.ts b/packages/happy-dom/src/nodes/html-iframe-element/HTMLIFrameUtility.ts
@@ -1,4 +1,4 @@
-import { URL } from 'url';
+import URL from '../../url/URL.js';
 import Event from '../../event/Event.js';
 import ErrorEvent from '../../event/events/ErrorEvent.js';
 import IWindow from '../../window/IWindow.js';

diff --git a/packages/happy-dom/src/url/URL.ts b/packages/happy-dom/src/url/URL.ts
@@ -0,0 +1,22 @@
+import { URL as NodeJSURL } from 'url';
+import { Blob as NodeJSBlob } from 'buffer';
+import Blob from '../file/Blob.js';
+
+/**
+ * URL.
+ */
+export default class URL extends NodeJSURL {
+	/**
+	 * Creates a string containing a URL representing the object given in the parameter.
+	 *
+	 * @param object Object.
+	 * @returns URL.
+	 */
+	public static override createObjectURL(object: NodeJSBlob | Blob): string {
+		if (object instanceof Blob) {
+			const blob = new NodeJSBlob([object._buffer], { type: object.type });
+			return super.createObjectURL(blob);
+		}
+		return super.createObjectURL(object);
+	}
+}
diff --git a/packages/happy-dom/src/window/IWindow.ts b/packages/happy-dom/src/window/IWindow.ts
@@ -42,7 +42,8 @@ import KeyboardEvent from '../event/events/KeyboardEvent.js';
 import ProgressEvent from '../event/events/ProgressEvent.js';
 import MediaQueryListEvent from '../event/events/MediaQueryListEvent.js';
 import EventTarget from '../event/EventTarget.js';
-import { URL, URLSearchParams } from 'url';
+import { URLSearchParams } from 'url';
+import URL from '../url/URL.js';
 import Location from '../location/Location.js';
 import MutationObserver from '../mutation-observer/MutationObserver.js';
 import DOMParser from '../dom-parser/DOMParser.js';

diff --git a/packages/happy-dom/src/window/Window.ts b/packages/happy-dom/src/window/Window.ts
@@ -47,7 +47,8 @@ import ProgressEvent from '../event/events/ProgressEvent.js';
 import MediaQueryListEvent from '../event/events/MediaQueryListEvent.js';
 import EventTarget from '../event/EventTarget.js';
 import MessagePort from '../event/MessagePort.js';
-import { URL, URLSearchParams } from 'url';
+import { URLSearchParams } from 'url';
+import URL from '../url/URL.js';
 import Location from '../location/Location.js';
 import NonImplementedEventTypes from '../event/NonImplementedEventTypes.js';
 import MutationObserver from '../mutation-observer/MutationObserver.js';

diff --git a/packages/happy-dom/src/xml-http-request/XMLHttpRequest.ts b/packages/happy-dom/src/xml-http-request/XMLHttpRequest.ts
@@ -10,7 +10,8 @@ import Blob from '../file/Blob.js';
 import XMLHttpRequestUpload from './XMLHttpRequestUpload.js';
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
-import { URL, UrlObject } from 'url';
+import { UrlObject } from 'url';
+import URL from '../url/URL.js';
 import XMLHttpRequestURLUtility from './utilities/XMLHttpRequestURLUtility.js';
 import ProgressEvent from '../event/events/ProgressEvent.js';
 import XMLHttpResponseTypeEnum from './XMLHttpResponseTypeEnum.js';

diff --git a/packages/happy-dom/src/xml-http-request/utilities/XMLHttpRequestURLUtility.ts b/packages/happy-dom/src/xml-http-request/utilities/XMLHttpRequestURLUtility.ts
@@ -1,4 +1,5 @@
-import { URL, UrlObject } from 'url';
+import { UrlObject } from 'url';
+import URL from '../../url/URL.js';
 import Path from 'path';
 
 // MIME type.

diff --git a/packages/happy-dom/test/cookie/CookieJar.test.ts b/packages/happy-dom/test/cookie/CookieJar.test.ts
@@ -1,5 +1,5 @@
 import CookieJar from '../../src/cookie/CookieJar.js';
-import { URL } from 'url';
+import URL from '../../src/url/URL.js';
 import { beforeEach, afterEach, describe, it, expect, vi } from 'vitest';
 
 describe('CookieJar', () => {

diff --git a/packages/happy-dom/test/fetch/Request.test.ts b/packages/happy-dom/test/fetch/Request.test.ts
@@ -2,7 +2,7 @@ import IWindow from '../../src/window/IWindow.js';
 import Window from '../../src/window/Window.js';
 import IDocument from '../../src/nodes/document/IDocument.js';
 import Request from '../../src/fetch/Request.js';
-import { URL } from 'url';
+import URL from '../../src/url/URL.js';
 import Headers from '../../src/fetch/Headers.js';
 import AbortSignal from '../../src/fetch/AbortSignal.js';
 import DOMException from '../../src/exception/DOMException.js';

diff --git a/packages/happy-dom/test/url/URL.test.ts b/packages/happy-dom/test/url/URL.test.ts
@@ -0,0 +1,18 @@
+import URL from '../../src/url/URL.js';
+import Blob from '../../src/file/Blob.js';
+import { Blob as NodeJSBlob } from 'buffer';
+import { describe, it, expect } from 'vitest';
+
+describe('URL', () => {
+	describe('createObjectURL()', () => {
+		it('Creates a string containing a URL representing the object given in the parameter.', () => {
+			const blob = new Blob(['TEST']);
+			expect(URL.createObjectURL(blob).startsWith('blob:nodedata:')).toBe(true);
+		});
+
+		it('Supports Node.js Blob objects.', () => {
+			const blob = new NodeJSBlob(['TEST']);
+			expect(URL.createObjectURL(blob).startsWith('blob:nodedata:')).toBe(true);
+		});
+	});
+});