Skip to content

Commit e481bf7

Browse files
authored
perf(ext/node): replace node: imports with core.loadExtScript for buffer and nextTick (#33862)
Replace ESM `import` of `node:buffer` and `node:process` (nextTick) in polyfill files with direct `core.loadExtScript()` calls to the underlying internal modules. Also simplify `internal/assert.mjs` to return the assert function directly instead of wrapping in `{ default: assert }`.
1 parent ceee4d9 commit e481bf7

48 files changed

Lines changed: 54 additions & 54 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ext/node/polyfills/_brotli.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const { zlib: constants } = core.loadExtScript(
3636
);
3737
const { TextEncoder } = core.loadExtScript("ext:deno_web/08_text_encoding.js");
3838
import { Transform } from "node:stream";
39-
import { Buffer } from "node:buffer";
39+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
4040

4141
const enc = new TextEncoder();
4242
const toU8 = (input) => {

ext/node/polyfills/_fs/_fs_read.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// TODO(petamoriken): enable prefer-primordials for node polyfills
44
// deno-lint-ignore-file prefer-primordials
55

6-
import { Buffer } from "node:buffer";
6+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
77
const {
88
denoErrorToNodeError,
99
ERR_INVALID_ARG_VALUE,

ext/node/polyfills/_fs/_fs_readdir.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
direntFromDeno,
1313
getValidatedPath,
1414
} from "ext:deno_node/internal/fs/utils.mjs";
15-
import { Buffer } from "node:buffer";
15+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
1616
const { promisify } = core.loadExtScript("ext:deno_node/internal/util.mjs");
1717
import { op_fs_read_dir_async, op_fs_read_dir_sync } from "ext:core/ops";
1818
import { join, relative } from "node:path";

ext/node/polyfills/_http_client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import {
5959
parseUniqueHeadersOption,
6060
} from "node:_http_outgoing";
6161
import httpAgent from "node:_http_agent";
62-
import { Buffer } from "node:buffer";
62+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
6363
import { urlToHttpOptions } from "ext:deno_node/internal/url.ts";
6464
const { kOutHeaders } = core.loadExtScript("ext:deno_node/internal/http.ts");
6565
const {

ext/node/polyfills/_http_outgoing.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { core } from "ext:core/mod.js";
88
import { getDefaultHighWaterMark } from "ext:deno_node/internal/streams/state.js";
9-
const { default: assert } = core.loadExtScript(
9+
const assert = core.loadExtScript(
1010
"ext:deno_node/internal/assert.mjs",
1111
);
1212
import EE from "node:events";
@@ -18,7 +18,7 @@ const {
1818
kOutHeaders,
1919
utcDate,
2020
} = core.loadExtScript("ext:deno_node/internal/http.ts");
21-
import { Buffer } from "node:buffer";
21+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
2222
import {
2323
_checkInvalidHeaderChar as checkInvalidHeaderChar,
2424
_checkIsHttpToken as checkIsHttpToken,

ext/node/polyfills/_http_server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const {
3636
} = primordials;
3737

3838
import net from "node:net";
39-
import { Buffer } from "node:buffer";
39+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
4040
import { ok as assert } from "node:assert";
4141
import {
4242
_checkInvalidHeaderChar as checkInvalidHeaderChar,

ext/node/polyfills/_process/streams.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const {
1313
ObjectPrototypeIsPrototypeOf,
1414
} = primordials;
1515

16-
import { Buffer } from "node:buffer";
16+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
1717
const {
1818
clearLine,
1919
clearScreenDown,

ext/node/polyfills/_tls_wrap.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const {
1212
ObjectAssign,
1313
StringPrototypeReplace,
1414
} = core.loadExtScript("ext:deno_node/internal/primordials.mjs");
15-
const { default: assert } = core.loadExtScript(
15+
const assert = core.loadExtScript(
1616
"ext:deno_node/internal/assert.mjs",
1717
);
1818
import * as net from "node:net";
@@ -22,7 +22,7 @@ import {
2222
} from "node:_tls_common";
2323
import { JSStreamSocket } from "ext:deno_node/internal/js_stream_socket.js";
2424
import { convertALPNProtocols } from "ext:deno_node/internal/tls_common.js";
25-
import { Buffer } from "node:buffer";
25+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
2626
const {
2727
connResetException,
2828
ERR_INVALID_ARG_TYPE,

ext/node/polyfills/child_process.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const {
4242
} = core.loadExtScript("ext:deno_node/internal/errors.ts");
4343
import { getSystemErrorName, promisify } from "node:util";
4444
import process from "node:process";
45-
import { Buffer } from "node:buffer";
45+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
4646
const {
4747
convertToValidSignal,
4848
kEmptyObject,

ext/node/polyfills/dgram.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// deno-lint-ignore-file prefer-primordials
2525

2626
import { core } from "ext:core/mod.js";
27-
import { Buffer } from "node:buffer";
27+
const { Buffer } = core.loadExtScript("ext:deno_node/internal/buffer.mjs");
2828
import { EventEmitter } from "node:events";
2929
import { lookup as defaultLookup } from "node:dns";
3030
import type {
@@ -68,7 +68,7 @@ const { guessHandleType } = core.loadExtScript(
6868
const { os } = core.loadExtScript(
6969
"ext:deno_node/internal_binding/constants.ts",
7070
);
71-
import { nextTick } from "node:process";
71+
const { nextTick } = core.loadExtScript("ext:deno_node/_next_tick.ts");
7272
import { deprecate } from "node:util";
7373
import { channel } from "node:diagnostics_channel";
7474
const { isArrayBufferView } = core.loadExtScript(

0 commit comments

Comments
 (0)