diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2023-03-08 07:44:54 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-08 12:44:54 +0100 |
commit | 72fe9bb47005e720444e65a66e91559287137780 (patch) | |
tree | d529ee7f3b2c33063ba4496f8fd3dfdbac0d1355 /ext/web | |
parent | d24c6ea27f7dea57e3bc0cda342d6cbe59782f7d (diff) |
refactor: rename InternalModuleLoader to ExtModuleLoader, use ext: scheme for snapshotted modules (#18041)
This commit renames "deno_core::InternalModuleLoader" to
"ExtModuleLoader" and changes the specifiers used by the
modules loaded from this loader to "ext:".
"internal:" scheme was really ambiguous and it's more characters than
"ext:", which should result in slightly smaller snapshot size.
Closes https://github.com/denoland/deno/issues/18020
Diffstat (limited to 'ext/web')
-rw-r--r-- | ext/web/00_infra.js | 2 | ||||
-rw-r--r-- | ext/web/01_dom_exception.js | 4 | ||||
-rw-r--r-- | ext/web/01_mimesniff.js | 2 | ||||
-rw-r--r-- | ext/web/02_event.js | 8 | ||||
-rw-r--r-- | ext/web/02_structured_clone.js | 2 | ||||
-rw-r--r-- | ext/web/02_timers.js | 6 | ||||
-rw-r--r-- | ext/web/03_abort_signal.js | 10 | ||||
-rw-r--r-- | ext/web/04_global_interfaces.js | 2 | ||||
-rw-r--r-- | ext/web/05_base64.js | 4 | ||||
-rw-r--r-- | ext/web/06_streams.js | 8 | ||||
-rw-r--r-- | ext/web/08_text_encoding.js | 2 | ||||
-rw-r--r-- | ext/web/09_file.js | 4 | ||||
-rw-r--r-- | ext/web/10_filereader.js | 12 | ||||
-rw-r--r-- | ext/web/11_blob_url.js | 6 | ||||
-rw-r--r-- | ext/web/12_location.js | 4 | ||||
-rw-r--r-- | ext/web/13_message_port.js | 6 | ||||
-rw-r--r-- | ext/web/14_compression.js | 4 | ||||
-rw-r--r-- | ext/web/15_performance.js | 12 | ||||
-rw-r--r-- | ext/web/benches/encoding.rs | 4 | ||||
-rw-r--r-- | ext/web/benches/timers_ops.rs | 4 | ||||
-rw-r--r-- | ext/web/internal.d.ts | 18 |
21 files changed, 60 insertions, 64 deletions
diff --git a/ext/web/00_infra.js b/ext/web/00_infra.js index 0c062f89c..efe7217de 100644 --- a/ext/web/00_infra.js +++ b/ext/web/00_infra.js @@ -32,7 +32,7 @@ const { StringPrototypeToUpperCase, TypeError, } = primordials; -import { URLPrototype } from "internal:deno_url/00_url.js"; +import { URLPrototype } from "ext:deno_url/00_url.js"; const ASCII_DIGIT = ["\u0030-\u0039"]; const ASCII_UPPER_ALPHA = ["\u0041-\u005A"]; diff --git a/ext/web/01_dom_exception.js b/ext/web/01_dom_exception.js index 116fe0490..ae3dcfd2e 100644 --- a/ext/web/01_dom_exception.js +++ b/ext/web/01_dom_exception.js @@ -20,8 +20,8 @@ const { Symbol, SymbolFor, } = primordials; -import * as webidl from "internal:deno_webidl/00_webidl.js"; -import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; +import { createFilteredInspectProxy } from "ext:deno_console/02_console.js"; const _name = Symbol("name"); const _message = Symbol("message"); diff --git a/ext/web/01_mimesniff.js b/ext/web/01_mimesniff.js index 40f5c03eb..147ee095e 100644 --- a/ext/web/01_mimesniff.js +++ b/ext/web/01_mimesniff.js @@ -26,7 +26,7 @@ import { HTTP_WHITESPACE, HTTP_WHITESPACE_PREFIX_RE, HTTP_WHITESPACE_SUFFIX_RE, -} from "internal:deno_web/00_infra.js"; +} from "ext:deno_web/00_infra.js"; /** * @typedef MimeType diff --git a/ext/web/02_event.js b/ext/web/02_event.js index 37cdab9a2..40731af4c 100644 --- a/ext/web/02_event.js +++ b/ext/web/02_event.js @@ -7,9 +7,9 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:deno_webidl/00_webidl.js"; -import DOMException from "internal:deno_web/01_dom_exception.js"; -import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; +import DOMException from "ext:deno_web/01_dom_exception.js"; +import { createFilteredInspectProxy } from "ext:deno_console/02_console.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeFilter, @@ -1469,7 +1469,7 @@ function reportException(error) { const frame = frames[i]; if ( typeof frame.fileName == "string" && - !StringPrototypeStartsWith(frame.fileName, "internal:") + !StringPrototypeStartsWith(frame.fileName, "ext:") ) { filename = frame.fileName; lineno = frame.lineNumber; diff --git a/ext/web/02_structured_clone.js b/ext/web/02_structured_clone.js index 082b0a80f..6dd1d4d03 100644 --- a/ext/web/02_structured_clone.js +++ b/ext/web/02_structured_clone.js @@ -7,7 +7,7 @@ /// <reference path="../web/lib.deno_web.d.ts" /> const core = globalThis.Deno.core; -import DOMException from "internal:deno_web/01_dom_exception.js"; +import DOMException from "ext:deno_web/01_dom_exception.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBuffer, diff --git a/ext/web/02_timers.js b/ext/web/02_timers.js index 24ec760bd..9bf41316a 100644 --- a/ext/web/02_timers.js +++ b/ext/web/02_timers.js @@ -22,9 +22,9 @@ const { TypeError, indirectEval, } = primordials; -import * as webidl from "internal:deno_webidl/00_webidl.js"; -import { reportException } from "internal:deno_web/02_event.js"; -import { assert } from "internal:deno_web/00_infra.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; +import { reportException } from "ext:deno_web/02_event.js"; +import { assert } from "ext:deno_web/00_infra.js"; const hrU8 = new Uint8Array(8); const hr = new Uint32Array(hrU8.buffer); diff --git a/ext/web/03_abort_signal.js b/ext/web/03_abort_signal.js index 1842217bb..d0a6b9136 100644 --- a/ext/web/03_abort_signal.js +++ b/ext/web/03_abort_signal.js @@ -3,14 +3,14 @@ // @ts-check /// <reference path="../../core/internal.d.ts" /> -import * as webidl from "internal:deno_webidl/00_webidl.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; import { defineEventHandler, Event, EventTarget, listenerCount, setIsTrusted, -} from "internal:deno_web/02_event.js"; +} from "ext:deno_web/02_event.js"; const primordials = globalThis.__bootstrap.primordials; const { SafeArrayIterator, @@ -21,11 +21,7 @@ const { Symbol, TypeError, } = primordials; -import { - refTimer, - setTimeout, - unrefTimer, -} from "internal:deno_web/02_timers.js"; +import { refTimer, setTimeout, unrefTimer } from "ext:deno_web/02_timers.js"; const add = Symbol("[[add]]"); const signalAbort = Symbol("[[signalAbort]]"); diff --git a/ext/web/04_global_interfaces.js b/ext/web/04_global_interfaces.js index edac0d5b7..375c98198 100644 --- a/ext/web/04_global_interfaces.js +++ b/ext/web/04_global_interfaces.js @@ -3,7 +3,7 @@ // @ts-check /// <reference path="../../core/internal.d.ts" /> -import { EventTarget } from "internal:deno_web/02_event.js"; +import { EventTarget } from "ext:deno_web/02_event.js"; const primordials = globalThis.__bootstrap.primordials; const { Symbol, diff --git a/ext/web/05_base64.js b/ext/web/05_base64.js index df64eab0d..2789ca6cc 100644 --- a/ext/web/05_base64.js +++ b/ext/web/05_base64.js @@ -8,8 +8,8 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:deno_webidl/00_webidl.js"; -import DOMException from "internal:deno_web/01_dom_exception.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; +import DOMException from "ext:deno_web/01_dom_exception.js"; const primordials = globalThis.__bootstrap.primordials; const { ObjectPrototypeIsPrototypeOf, diff --git a/ext/web/06_streams.js b/ext/web/06_streams.js index 5dcf64af2..53b6aa152 100644 --- a/ext/web/06_streams.js +++ b/ext/web/06_streams.js @@ -8,14 +8,14 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:deno_webidl/00_webidl.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; import { AbortSignalPrototype, add, newSignal, remove, signalAbort, -} from "internal:deno_web/03_abort_signal.js"; +} from "ext:deno_web/03_abort_signal.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBuffer, @@ -68,8 +68,8 @@ const { WeakMapPrototypeHas, WeakMapPrototypeSet, } = primordials; -import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; -import { assert, AssertionError } from "internal:deno_web/00_infra.js"; +import { createFilteredInspectProxy } from "ext:deno_console/02_console.js"; +import { assert, AssertionError } from "ext:deno_web/00_infra.js"; /** @template T */ class Deferred { diff --git a/ext/web/08_text_encoding.js b/ext/web/08_text_encoding.js index 571b9b628..c6c75874a 100644 --- a/ext/web/08_text_encoding.js +++ b/ext/web/08_text_encoding.js @@ -11,7 +11,7 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:deno_webidl/00_webidl.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; const primordials = globalThis.__bootstrap.primordials; const { PromiseReject, diff --git a/ext/web/09_file.js b/ext/web/09_file.js index c2fe7782c..ea1d80afd 100644 --- a/ext/web/09_file.js +++ b/ext/web/09_file.js @@ -12,7 +12,7 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:deno_webidl/00_webidl.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBufferPrototype, @@ -39,7 +39,7 @@ const { TypeError, Uint8Array, } = primordials; -import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; +import { createFilteredInspectProxy } from "ext:deno_console/02_console.js"; // TODO(lucacasonato): this needs to not be hardcoded and instead depend on // host os. diff --git a/ext/web/10_filereader.js b/ext/web/10_filereader.js index 8ff36494b..ee9b2614b 100644 --- a/ext/web/10_filereader.js +++ b/ext/web/10_filereader.js @@ -12,13 +12,13 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:deno_webidl/00_webidl.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; const primordials = globalThis.__bootstrap.primordials; -import { forgivingBase64Encode } from "internal:deno_web/00_infra.js"; -import { EventTarget, ProgressEvent } from "internal:deno_web/02_event.js"; -import { decode, TextDecoder } from "internal:deno_web/08_text_encoding.js"; -import { parseMimeType } from "internal:deno_web/01_mimesniff.js"; -import DOMException from "internal:deno_web/01_dom_exception.js"; +import { forgivingBase64Encode } from "ext:deno_web/00_infra.js"; +import { EventTarget, ProgressEvent } from "ext:deno_web/02_event.js"; +import { decode, TextDecoder } from "ext:deno_web/08_text_encoding.js"; +import { parseMimeType } from "ext:deno_web/01_mimesniff.js"; +import DOMException from "ext:deno_web/01_dom_exception.js"; const { ArrayPrototypePush, ArrayPrototypeReduce, diff --git a/ext/web/11_blob_url.js b/ext/web/11_blob_url.js index 205d0851f..f7a91ec12 100644 --- a/ext/web/11_blob_url.js +++ b/ext/web/11_blob_url.js @@ -13,9 +13,9 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:deno_webidl/00_webidl.js"; -import { getParts } from "internal:deno_web/09_file.js"; -import { URL } from "internal:deno_url/00_url.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; +import { getParts } from "ext:deno_web/09_file.js"; +import { URL } from "ext:deno_url/00_url.js"; /** * @param {Blob} blob diff --git a/ext/web/12_location.js b/ext/web/12_location.js index 6a15c0811..b80e7ef56 100644 --- a/ext/web/12_location.js +++ b/ext/web/12_location.js @@ -2,8 +2,8 @@ /// <reference path="../../core/internal.d.ts" /> -import { URL } from "internal:deno_url/00_url.js"; -import DOMException from "internal:deno_web/01_dom_exception.js"; +import { URL } from "ext:deno_url/00_url.js"; +import DOMException from "ext:deno_web/01_dom_exception.js"; const primordials = globalThis.__bootstrap.primordials; const { Error, diff --git a/ext/web/13_message_port.js b/ext/web/13_message_port.js index dafb2b782..f50d14d1a 100644 --- a/ext/web/13_message_port.js +++ b/ext/web/13_message_port.js @@ -8,14 +8,14 @@ const core = globalThis.Deno.core; const { InterruptedPrototype, ops } = core; -import * as webidl from "internal:deno_webidl/00_webidl.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; import { defineEventHandler, EventTarget, MessageEvent, setEventTargetData, -} from "internal:deno_web/02_event.js"; -import DOMException from "internal:deno_web/01_dom_exception.js"; +} from "ext:deno_web/02_event.js"; +import DOMException from "ext:deno_web/01_dom_exception.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBufferPrototype, diff --git a/ext/web/14_compression.js b/ext/web/14_compression.js index 3998709ce..a3bca50e5 100644 --- a/ext/web/14_compression.js +++ b/ext/web/14_compression.js @@ -7,8 +7,8 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:deno_webidl/00_webidl.js"; -import { TransformStream } from "internal:deno_web/06_streams.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; +import { TransformStream } from "ext:deno_web/06_streams.js"; webidl.converters.CompressionFormat = webidl.createEnumConverter( "CompressionFormat", diff --git a/ext/web/15_performance.js b/ext/web/15_performance.js index b1c4eb513..282911bc3 100644 --- a/ext/web/15_performance.js +++ b/ext/web/15_performance.js @@ -14,12 +14,12 @@ const { SymbolFor, TypeError, } = primordials; -import * as webidl from "internal:deno_webidl/00_webidl.js"; -import { structuredClone } from "internal:deno_web/02_structured_clone.js"; -import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; -import { EventTarget } from "internal:deno_web/02_event.js"; -import { opNow } from "internal:deno_web/02_timers.js"; -import DOMException from "internal:deno_web/01_dom_exception.js"; +import * as webidl from "ext:deno_webidl/00_webidl.js"; +import { structuredClone } from "ext:deno_web/02_structured_clone.js"; +import { createFilteredInspectProxy } from "ext:deno_console/02_console.js"; +import { EventTarget } from "ext:deno_web/02_event.js"; +import { opNow } from "ext:deno_web/02_timers.js"; +import DOMException from "ext:deno_web/01_dom_exception.js"; const illegalConstructorKey = Symbol("illegalConstructorKey"); const customInspect = SymbolFor("Deno.customInspect"); diff --git a/ext/web/benches/encoding.rs b/ext/web/benches/encoding.rs index ffea2617e..888557263 100644 --- a/ext/web/benches/encoding.rs +++ b/ext/web/benches/encoding.rs @@ -29,10 +29,10 @@ fn setup() -> Vec<Extension> { deno_web::init::<Permissions>(BlobStore::default(), None), Extension::builder("bench_setup") .esm(vec![ExtensionFileSource { - specifier: "internal:setup".to_string(), + specifier: "ext:setup".to_string(), code: ExtensionFileSourceCode::IncludedInBinary( r#" - import { TextDecoder } from "internal:deno_web/08_text_encoding.js"; + import { TextDecoder } from "ext:deno_web/08_text_encoding.js"; globalThis.TextDecoder = TextDecoder; globalThis.hello12k = Deno.core.encode("hello world\n".repeat(1e3)); "#, diff --git a/ext/web/benches/timers_ops.rs b/ext/web/benches/timers_ops.rs index 8c700266a..d8ea29021 100644 --- a/ext/web/benches/timers_ops.rs +++ b/ext/web/benches/timers_ops.rs @@ -28,9 +28,9 @@ fn setup() -> Vec<Extension> { Extension::builder("bench_setup") .esm(vec![ ExtensionFileSource { - specifier: "internal:setup".to_string(), + specifier: "ext:setup".to_string(), code: ExtensionFileSourceCode::IncludedInBinary(r#" - import { setTimeout, handleTimerMacrotask } from "internal:deno_web/02_timers.js"; + import { setTimeout, handleTimerMacrotask } from "ext:deno_web/02_timers.js"; globalThis.setTimeout = setTimeout; Deno.core.setMacrotaskCallback(handleTimerMacrotask); "#) diff --git a/ext/web/internal.d.ts b/ext/web/internal.d.ts index 9f72b0f5d..ee20b6ead 100644 --- a/ext/web/internal.d.ts +++ b/ext/web/internal.d.ts @@ -3,7 +3,7 @@ /// <reference no-default-lib="true" /> /// <reference lib="esnext" /> -declare module "internal:deno_web/00_infra.js" { +declare module "ext:deno_web/00_infra.js" { function collectSequenceOfCodepoints( input: string, position: number, @@ -44,11 +44,11 @@ declare module "internal:deno_web/00_infra.js" { function serializeJSValueToJSONString(value: unknown): string; } -declare module "internal:deno_web/01_dom_exception.js" { +declare module "ext:deno_web/01_dom_exception.js" { export = DOMException; } -declare module "internal:deno_web/01_mimesniff.js" { +declare module "ext:deno_web/01_mimesniff.js" { interface MimeType { type: string; subtype: string; @@ -62,7 +62,7 @@ declare module "internal:deno_web/01_mimesniff.js" { ): MimeType | null; } -declare module "internal:deno_web/02_event.js" { +declare module "ext:deno_web/02_event.js" { const EventTarget: typeof EventTarget; const Event: typeof event; const ErrorEvent: typeof ErrorEvent; @@ -74,29 +74,29 @@ declare module "internal:deno_web/02_event.js" { const reportError: typeof reportError; } -declare module "internal:deno_web/12_location.js" { +declare module "ext:deno_web/12_location.js" { function getLocationHref(): string | undefined; } -declare module "internal:deno_web/05_base64.js" { +declare module "ext:deno_web/05_base64.js" { function atob(data: string): string; function btoa(data: string): string; } -declare module "internal:deno_web/09_file.js" { +declare module "ext:deno_web/09_file.js" { function blobFromObjectUrl(url: string): Blob | null; function getParts(blob: Blob): string[]; const Blob: typeof Blob; const File: typeof File; } -declare module "internal:deno_web/06_streams.js" { +declare module "ext:deno_web/06_streams.js" { const ReadableStream: typeof ReadableStream; function isReadableStreamDisturbed(stream: ReadableStream): boolean; function createProxy<T>(stream: ReadableStream<T>): ReadableStream<T>; } -declare module "internal:deno_web/13_message_port.js" { +declare module "ext:deno_web/13_message_port.js" { type Transferable = { kind: "messagePort"; data: number; |