From b40086fd7da3729d1d59b312c89ee57747fc66a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sat, 4 Mar 2023 22:31:38 -0400 Subject: refactor(core): include_js_files! 'dir' option doesn't change specifiers (#18019) This commit changes "include_js_files!" macro from "deno_core" in a way that "dir" option doesn't cause specifiers to be rewritten to include it. Example: ``` include_js_files! { dir "js", "hello.js", } ``` The above definition required embedders to use: `import ... from "internal:/js/hello.js"`. But with this change, the "js" directory in which the files are stored is an implementation detail, which for embedders results in: `import ... from "internal:/hello.js"`. The directory the files are stored in, is an implementation detail and in some cases might result in a significant size difference for the snapshot. As an example, in "deno_node" extension, we store the source code in "polyfills" directory; which resulted in each specifier to look like "internal:deno_node/polyfills/", but with this change it's "internal:deno_node/". Given that "deno_node" has over 100 files, many of them having several import specifiers to the same extension, this change removes 10 characters from each import specifier. --- ext/node/polyfills/internal/readline/callbacks.mjs | 6 +++--- .../internal/readline/emitKeypressEvents.mjs | 8 ++++---- ext/node/polyfills/internal/readline/interface.mjs | 20 ++++++++++---------- ext/node/polyfills/internal/readline/promises.mjs | 10 +++++----- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'ext/node/polyfills/internal/readline') diff --git a/ext/node/polyfills/internal/readline/callbacks.mjs b/ext/node/polyfills/internal/readline/callbacks.mjs index 3be88c899..09f686013 100644 --- a/ext/node/polyfills/internal/readline/callbacks.mjs +++ b/ext/node/polyfills/internal/readline/callbacks.mjs @@ -22,11 +22,11 @@ "use strict"; -import { ERR_INVALID_ARG_VALUE, ERR_INVALID_CURSOR_POS } from "internal:deno_node/polyfills/internal/errors.ts"; +import { ERR_INVALID_ARG_VALUE, ERR_INVALID_CURSOR_POS } from "internal:deno_node/internal/errors.ts"; -import { validateFunction } from "internal:deno_node/polyfills/internal/validators.mjs"; +import { validateFunction } from "internal:deno_node/internal/validators.mjs"; -import { CSI } from "internal:deno_node/polyfills/internal/readline/utils.mjs"; +import { CSI } from "internal:deno_node/internal/readline/utils.mjs"; const { kClearLine, diff --git a/ext/node/polyfills/internal/readline/emitKeypressEvents.mjs b/ext/node/polyfills/internal/readline/emitKeypressEvents.mjs index 7f68dac47..4c6dfa522 100644 --- a/ext/node/polyfills/internal/readline/emitKeypressEvents.mjs +++ b/ext/node/polyfills/internal/readline/emitKeypressEvents.mjs @@ -20,15 +20,15 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -import { charLengthAt, CSI, emitKeys } from "internal:deno_node/polyfills/internal/readline/utils.mjs"; -import { kSawKeyPress } from "internal:deno_node/polyfills/internal/readline/symbols.mjs"; -import { clearTimeout, setTimeout } from "internal:deno_node/polyfills/timers.ts"; +import { charLengthAt, CSI, emitKeys } from "internal:deno_node/internal/readline/utils.mjs"; +import { kSawKeyPress } from "internal:deno_node/internal/readline/symbols.mjs"; +import { clearTimeout, setTimeout } from "internal:deno_node/timers.ts"; const { kEscape, } = CSI; -import { StringDecoder } from "internal:deno_node/polyfills/string_decoder.ts"; +import { StringDecoder } from "internal:deno_node/string_decoder.ts"; const KEYPRESS_DECODER = Symbol("keypress-decoder"); const ESCAPE_DECODER = Symbol("escape-decoder"); diff --git a/ext/node/polyfills/internal/readline/interface.mjs b/ext/node/polyfills/internal/readline/interface.mjs index 41d05fbf2..d8191557f 100644 --- a/ext/node/polyfills/internal/readline/interface.mjs +++ b/ext/node/polyfills/internal/readline/interface.mjs @@ -22,30 +22,30 @@ // deno-lint-ignore-file camelcase no-inner-declarations no-this-alias -import { ERR_INVALID_ARG_VALUE, ERR_USE_AFTER_CLOSE } from "internal:deno_node/polyfills/internal/errors.ts"; +import { ERR_INVALID_ARG_VALUE, ERR_USE_AFTER_CLOSE } from "internal:deno_node/internal/errors.ts"; import { validateAbortSignal, validateArray, validateString, validateUint32, -} from "internal:deno_node/polyfills/internal/validators.mjs"; +} from "internal:deno_node/internal/validators.mjs"; import { // inspect, getStringWidth, stripVTControlCharacters, -} from "internal:deno_node/polyfills/internal/util/inspect.mjs"; -import EventEmitter from "internal:deno_node/polyfills/events.ts"; -import { emitKeypressEvents } from "internal:deno_node/polyfills/internal/readline/emitKeypressEvents.mjs"; +} from "internal:deno_node/internal/util/inspect.mjs"; +import EventEmitter from "internal:deno_node/events.ts"; +import { emitKeypressEvents } from "internal:deno_node/internal/readline/emitKeypressEvents.mjs"; import { charLengthAt, charLengthLeft, commonPrefix, kSubstringSearch, -} from "internal:deno_node/polyfills/internal/readline/utils.mjs"; -import { clearScreenDown, cursorTo, moveCursor } from "internal:deno_node/polyfills/internal/readline/callbacks.mjs"; -import { Readable } from "internal:deno_node/polyfills/_stream.mjs"; +} from "internal:deno_node/internal/readline/utils.mjs"; +import { clearScreenDown, cursorTo, moveCursor } from "internal:deno_node/internal/readline/callbacks.mjs"; +import { Readable } from "internal:deno_node/_stream.mjs"; -import { StringDecoder } from "internal:deno_node/polyfills/string_decoder.ts"; +import { StringDecoder } from "internal:deno_node/string_decoder.ts"; import { kAddHistory, kDecoder, @@ -78,7 +78,7 @@ import { kWordLeft, kWordRight, kWriteToOutput, -} from "internal:deno_node/polyfills/internal/readline/symbols.mjs"; +} from "internal:deno_node/internal/readline/symbols.mjs"; const kHistorySize = 30; const kMincrlfDelay = 100; diff --git a/ext/node/polyfills/internal/readline/promises.mjs b/ext/node/polyfills/internal/readline/promises.mjs index 36aa3de12..81677172a 100644 --- a/ext/node/polyfills/internal/readline/promises.mjs +++ b/ext/node/polyfills/internal/readline/promises.mjs @@ -1,12 +1,12 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. // Copyright Joyent, Inc. and other Node contributors. -import { ArrayPrototypeJoin, ArrayPrototypePush } from "internal:deno_node/polyfills/internal/primordials.mjs"; +import { ArrayPrototypeJoin, ArrayPrototypePush } from "internal:deno_node/internal/primordials.mjs"; -import { CSI } from "internal:deno_node/polyfills/internal/readline/utils.mjs"; -import { validateBoolean, validateInteger } from "internal:deno_node/polyfills/internal/validators.mjs"; -import { isWritable } from "internal:deno_node/polyfills/internal/streams/utils.mjs"; -import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/polyfills/internal/errors.ts"; +import { CSI } from "internal:deno_node/internal/readline/utils.mjs"; +import { validateBoolean, validateInteger } from "internal:deno_node/internal/validators.mjs"; +import { isWritable } from "internal:deno_node/internal/streams/utils.mjs"; +import { ERR_INVALID_ARG_TYPE } from "internal:deno_node/internal/errors.ts"; const { kClearToLineBeginning, -- cgit v1.2.3