From b40086fd7da3729d1d59b312c89ee57747fc66a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
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:<ext_name>/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:<ext_name>/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/<module_name>", but with
this change it's "internal:deno_node/<module_name>".

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/util/comparisons.ts | 6 +++---
 ext/node/polyfills/internal/util/debuglog.ts    | 2 +-
 ext/node/polyfills/internal/util/inspect.mjs    | 8 ++++----
 ext/node/polyfills/internal/util/types.ts       | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ext/node/polyfills/internal/util')

diff --git a/ext/node/polyfills/internal/util/comparisons.ts b/ext/node/polyfills/internal/util/comparisons.ts
index 1620e468b..3f76089f3 100644
--- a/ext/node/polyfills/internal/util/comparisons.ts
+++ b/ext/node/polyfills/internal/util/comparisons.ts
@@ -19,14 +19,14 @@ import {
   isStringObject,
   isSymbolObject,
   isTypedArray,
-} from "internal:deno_node/polyfills/internal/util/types.ts";
+} from "internal:deno_node/internal/util/types.ts";
 
-import { Buffer } from "internal:deno_node/polyfills/buffer.ts";
+import { Buffer } from "internal:deno_node/buffer.ts";
 import {
   getOwnNonIndexProperties,
   ONLY_ENUMERABLE,
   SKIP_SYMBOLS,
-} from "internal:deno_node/polyfills/internal_binding/util.ts";
+} from "internal:deno_node/internal_binding/util.ts";
 
 enum valueType {
   noIterator,
diff --git a/ext/node/polyfills/internal/util/debuglog.ts b/ext/node/polyfills/internal/util/debuglog.ts
index 498facbd1..0ae0820bb 100644
--- a/ext/node/polyfills/internal/util/debuglog.ts
+++ b/ext/node/polyfills/internal/util/debuglog.ts
@@ -1,6 +1,6 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
-import { inspect } from "internal:deno_node/polyfills/internal/util/inspect.mjs";
+import { inspect } from "internal:deno_node/internal/util/inspect.mjs";
 
 // `debugImpls` and `testEnabled` are deliberately not initialized so any call
 // to `debuglog()` before `initializeDebugEnv()` is called will throw.
diff --git a/ext/node/polyfills/internal/util/inspect.mjs b/ext/node/polyfills/internal/util/inspect.mjs
index 53a878aa3..424773f9a 100644
--- a/ext/node/polyfills/internal/util/inspect.mjs
+++ b/ext/node/polyfills/internal/util/inspect.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 * as types from "internal:deno_node/polyfills/internal/util/types.ts";
-import { validateObject, validateString } from "internal:deno_node/polyfills/internal/validators.mjs";
-import { codes } from "internal:deno_node/polyfills/internal/error_codes.ts";
+import * as types from "internal:deno_node/internal/util/types.ts";
+import { validateObject, validateString } from "internal:deno_node/internal/validators.mjs";
+import { codes } from "internal:deno_node/internal/error_codes.ts";
 
 import {
   ALL_PROPERTIES,
   getOwnNonIndexProperties,
   ONLY_ENUMERABLE,
-} from "internal:deno_node/polyfills/internal_binding/util.ts";
+} from "internal:deno_node/internal_binding/util.ts";
 
 const kObjectType = 0;
 const kArrayType = 1;
diff --git a/ext/node/polyfills/internal/util/types.ts b/ext/node/polyfills/internal/util/types.ts
index 299493bc9..0bbf92547 100644
--- a/ext/node/polyfills/internal/util/types.ts
+++ b/ext/node/polyfills/internal/util/types.ts
@@ -21,11 +21,11 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import * as bindingTypes from "internal:deno_node/polyfills/internal_binding/types.ts";
+import * as bindingTypes from "internal:deno_node/internal_binding/types.ts";
 export {
   isCryptoKey,
   isKeyObject,
-} from "internal:deno_node/polyfills/internal/crypto/_keys.ts";
+} from "internal:deno_node/internal/crypto/_keys.ts";
 
 // https://tc39.es/ecma262/#sec-get-%typedarray%.prototype-@@tostringtag
 const _getTypedArrayToStringTag = Object.getOwnPropertyDescriptor(
-- 
cgit v1.2.3