diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2023-03-04 22:31:38 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-05 02:31:38 +0000 |
commit | b40086fd7da3729d1d59b312c89ee57747fc66a9 (patch) | |
tree | 991583010635feab13fae77e7c8a35fef0a09095 /ext/node/polyfills/internal/fs | |
parent | 01028fcdf4f379a7285cc15079306e3ac31edcc1 (diff) |
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.
Diffstat (limited to 'ext/node/polyfills/internal/fs')
-rw-r--r-- | ext/node/polyfills/internal/fs/streams.d.ts | 12 | ||||
-rw-r--r-- | ext/node/polyfills/internal/fs/streams.mjs | 30 | ||||
-rw-r--r-- | ext/node/polyfills/internal/fs/utils.mjs | 28 |
3 files changed, 35 insertions, 35 deletions
diff --git a/ext/node/polyfills/internal/fs/streams.d.ts b/ext/node/polyfills/internal/fs/streams.d.ts index 9e70c2431..f5ed3b694 100644 --- a/ext/node/polyfills/internal/fs/streams.d.ts +++ b/ext/node/polyfills/internal/fs/streams.d.ts @@ -2,14 +2,14 @@ // Copyright DefinitelyTyped contributors. All rights reserved. MIT license. // deno-lint-ignore-file no-explicit-any -import * as stream from "internal:deno_node/polyfills/_stream.d.ts"; -import * as promises from "internal:deno_node/polyfills/fs/promises.ts"; +import * as stream from "internal:deno_node/_stream.d.ts"; +import * as promises from "internal:deno_node/fs/promises.ts"; -import { Buffer } from "internal:deno_node/polyfills/buffer.ts"; +import { Buffer } from "internal:deno_node/buffer.ts"; import { BufferEncoding, ErrnoException, -} from "internal:deno_node/polyfills/_global.d.ts"; +} from "internal:deno_node/_global.d.ts"; type PathLike = string | Buffer | URL; @@ -253,7 +253,7 @@ interface ReadStreamOptions extends StreamOptions { * also required. * * ```js - * import { createReadStream } from "internal:deno_node/polyfills/internal/fs/fs"; + * import { createReadStream } from "internal:deno_node/internal/fs/fs"; * * // Create a stream from some character device. * const stream = createReadStream('/dev/input/event0'); @@ -281,7 +281,7 @@ interface ReadStreamOptions extends StreamOptions { * An example to read the last 10 bytes of a file which is 100 bytes long: * * ```js - * import { createReadStream } from "internal:deno_node/polyfills/internal/fs/fs"; + * import { createReadStream } from "internal:deno_node/internal/fs/fs"; * * createReadStream('sample.txt', { start: 90, end: 99 }); * ``` diff --git a/ext/node/polyfills/internal/fs/streams.mjs b/ext/node/polyfills/internal/fs/streams.mjs index 4d751df76..101ab167b 100644 --- a/ext/node/polyfills/internal/fs/streams.mjs +++ b/ext/node/polyfills/internal/fs/streams.mjs @@ -1,26 +1,26 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license. -import { ERR_INVALID_ARG_TYPE, ERR_OUT_OF_RANGE } from "internal:deno_node/polyfills/internal/errors.ts"; -import { kEmptyObject } from "internal:deno_node/polyfills/internal/util.mjs"; -import { deprecate } from "internal:deno_node/polyfills/util.ts"; -import { validateFunction, validateInteger } from "internal:deno_node/polyfills/internal/validators.mjs"; -import { errorOrDestroy } from "internal:deno_node/polyfills/internal/streams/destroy.mjs"; -import { open as fsOpen } from "internal:deno_node/polyfills/_fs/_fs_open.ts"; -import { read as fsRead } from "internal:deno_node/polyfills/_fs/_fs_read.ts"; -import { write as fsWrite } from "internal:deno_node/polyfills/_fs/_fs_write.mjs"; -import { writev as fsWritev } from "internal:deno_node/polyfills/_fs/_fs_writev.mjs"; -import { close as fsClose } from "internal:deno_node/polyfills/_fs/_fs_close.ts"; -import { Buffer } from "internal:deno_node/polyfills/buffer.ts"; +import { ERR_INVALID_ARG_TYPE, ERR_OUT_OF_RANGE } from "internal:deno_node/internal/errors.ts"; +import { kEmptyObject } from "internal:deno_node/internal/util.mjs"; +import { deprecate } from "internal:deno_node/util.ts"; +import { validateFunction, validateInteger } from "internal:deno_node/internal/validators.mjs"; +import { errorOrDestroy } from "internal:deno_node/internal/streams/destroy.mjs"; +import { open as fsOpen } from "internal:deno_node/_fs/_fs_open.ts"; +import { read as fsRead } from "internal:deno_node/_fs/_fs_read.ts"; +import { write as fsWrite } from "internal:deno_node/_fs/_fs_write.mjs"; +import { writev as fsWritev } from "internal:deno_node/_fs/_fs_writev.mjs"; +import { close as fsClose } from "internal:deno_node/_fs/_fs_close.ts"; +import { Buffer } from "internal:deno_node/buffer.ts"; import { copyObject, getOptions, getValidatedFd, validatePath, -} from "internal:deno_node/polyfills/internal/fs/utils.mjs"; -import { finished, Readable, Writable } from "internal:deno_node/polyfills/stream.ts"; -import { toPathIfFileURL } from "internal:deno_node/polyfills/internal/url.ts"; -import { nextTick } from "internal:deno_node/polyfills/_next_tick.ts"; +} from "internal:deno_node/internal/fs/utils.mjs"; +import { finished, Readable, Writable } from "internal:deno_node/stream.ts"; +import { toPathIfFileURL } from "internal:deno_node/internal/url.ts"; +import { nextTick } from "internal:deno_node/_next_tick.ts"; const kIoDone = Symbol("kIoDone"); const kIsPerformingIO = Symbol("kIsPerformingIO"); diff --git a/ext/node/polyfills/internal/fs/utils.mjs b/ext/node/polyfills/internal/fs/utils.mjs index 9d74c5eee..567212e17 100644 --- a/ext/node/polyfills/internal/fs/utils.mjs +++ b/ext/node/polyfills/internal/fs/utils.mjs @@ -1,7 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. "use strict"; -import { Buffer } from "internal:deno_node/polyfills/buffer.ts"; +import { Buffer } from "internal:deno_node/buffer.ts"; import { ERR_FS_EISDIR, ERR_FS_INVALID_SYMLINK_TYPE, @@ -10,17 +10,17 @@ import { ERR_OUT_OF_RANGE, hideStackFrames, uvException, -} from "internal:deno_node/polyfills/internal/errors.ts"; +} from "internal:deno_node/internal/errors.ts"; import { isArrayBufferView, isBigUint64Array, isDate, isUint8Array, -} from "internal:deno_node/polyfills/internal/util/types.ts"; -import { once } from "internal:deno_node/polyfills/internal/util.mjs"; -import { deprecate } from "internal:deno_node/polyfills/util.ts"; -import { toPathIfFileURL } from "internal:deno_node/polyfills/internal/url.ts"; +} from "internal:deno_node/internal/util/types.ts"; +import { once } from "internal:deno_node/internal/util.mjs"; +import { deprecate } from "internal:deno_node/util.ts"; +import { toPathIfFileURL } from "internal:deno_node/internal/url.ts"; import { validateAbortSignal, validateBoolean, @@ -29,20 +29,20 @@ import { validateInteger, validateObject, validateUint32, -} from "internal:deno_node/polyfills/internal/validators.mjs"; -import pathModule from "internal:deno_node/polyfills/path.ts"; +} from "internal:deno_node/internal/validators.mjs"; +import pathModule from "internal:deno_node/path.ts"; const kType = Symbol("type"); const kStats = Symbol("stats"); -import assert from "internal:deno_node/polyfills/internal/assert.mjs"; -import { lstat, lstatSync } from "internal:deno_node/polyfills/_fs/_fs_lstat.ts"; -import { stat, statSync } from "internal:deno_node/polyfills/_fs/_fs_stat.ts"; -import { isWindows } from "internal:deno_node/polyfills/_util/os.ts"; -import process from "internal:deno_node/polyfills/process.ts"; +import assert from "internal:deno_node/internal/assert.mjs"; +import { lstat, lstatSync } from "internal:deno_node/_fs/_fs_lstat.ts"; +import { stat, statSync } from "internal:deno_node/_fs/_fs_stat.ts"; +import { isWindows } from "internal:deno_node/_util/os.ts"; +import process from "internal:deno_node/process.ts"; import { fs as fsConstants, os as osConstants, -} from "internal:deno_node/polyfills/internal_binding/constants.ts"; +} from "internal:deno_node/internal_binding/constants.ts"; const { F_OK = 0, W_OK = 0, |