esm: align sync and async load implementations by aduh95 · Pull Request #49152 · nodejs/node · GitHub

Refs: #48272
Refs: #47999

Refs: nodejs#48272

Review requested:

@nodejs/loaders
@nodejs/modules

worth pulling this off of url on line 79, in case there's a getter, so as to unconditionally trigger it?

+1

That seems wasteful, I'm not sure I understand what would be the upside of doing so

Example benefits:

a getter that throws will do so at the top of the method, before expensive stuff happens
algorithm changes won't be as observable - it would otherwise be part of the API of this to only do a Get of "pathname" in this branch, and to only do one total, so refactors could become unintentional breaking changes
it becomes much clearer what properties are accessed since they're all accessed once, statically, at the top of the method

If we really care about this, I think we should rather adapt the regex to take the href rather than the pathname.

a getter that throws will do so at the top of the method, before expensive stuff happens

It's still the first operation after the destructuring in that function.

algorithm changes won't be as observable - it would otherwise be part of the API of this to only do a Get of "pathname" in this branch, and to only do one total, so refactors could become unintentional breaking changes

You mean if we start needing pathname for other protocols? But a case could be made for the other properties of URL, what if we end up needing search or origin, should we get them as well just in case?

yep (to be clear, i don't mean get them now just in case, i mean as soon as they're used once in the function, get them unconditionally at the top)

What is the goal here?

What is the goal here?

Reduce unnecessary URL initializations.

Suggested change

      
             * @param {URL} url URL to the module
          
             * @param {ESModuleContext} context used to decorate error messages
          
             * @returns {{ responseURL: string, source: string | BufferView }}
          
             */
          
            function getSourceSync(url, context) {
          
             * @param {URL} urlInstance URL to the module
          
             * @param {ESModuleContext} context used to decorate error messages
          
             * @returns {{ responseURL: string, source: string | BufferView }}
          
             */
          
            function getSourceSync(urlInstance, context) {

nit: I think that is not necessary because the code doc already identifies it as type URL, and I think (aside from mistakenly constructing a new instance), the difference likely would not matter because it's castable to a string.

That said, I do sometimes do similar things, like fooRgx, so I'm not opposed to it (just pointing out that info is already available).

Another thing to consider is that the async implementation also uses url and not urlInstance as a name, and since this PR goal is to align both implementation, that seems to be another reason not to take that suggestion in that PR

I don't really care, you can feel free to disregard. I suggested it because I think I saw we called this urlInstance somewhere else in the file, so we might want to standardize at some point.

nice improvement :)

CI: https://ci.nodejs.org/job/node-test-pull-request/53445/

CI: https://ci.nodejs.org/job/node-test-pull-request/53446/

Landed in 2557932

Refs: #48272 PR-URL: #49152 Refs: #47999 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Jacob Smith <jacob@frende.me>

nodejs/node#49152

* chore: bump Node.js to v22.9.0 * build: drop base64 dep in GN build nodejs/node#52856 * build,tools: make addons tests work with GN nodejs/node#50737 * fs: add fast api for InternalModuleStat nodejs/node#51344 * src: move package_json_reader cache to c++ nodejs/node#50322 * crypto: disable PKCS#1 padding for privateDecrypt nodejs-private/node-private#525 * src: move more crypto code to ncrypto nodejs/node#54320 * crypto: ensure valid point on elliptic curve in SubtleCrypto.importKey nodejs/node#50234 * src: shift more crypto impl details to ncrypto nodejs/node#54028 * src: switch crypto APIs to use Maybe<void> nodejs/node#54775 * crypto: remove DEFAULT_ENCODING nodejs/node#47182 * deps: update libuv to 1.47.0 nodejs/node#50650 * build: fix conflict gyp configs nodejs/node#53605 * lib,src: drop --experimental-network-imports nodejs/node#53822 * esm: align sync and async load implementations nodejs/node#49152 * esm: remove unnecessary toNamespacedPath calls nodejs/node#53656 * module: detect ESM syntax by trying to recompile as SourceTextModule nodejs/node#52413 * test: adapt debugger tests to V8 11.4 nodejs/node#49639 * lib: update usage of always on Atomics API nodejs/node#49639 * test: adapt test-fs-write to V8 internal changes nodejs/node#49639 * test: adapt to new V8 trusted memory spaces nodejs/node#50115 * deps: update libuv to 1.47.0 nodejs/node#50650 * src: use non-deprecated v8::Uint8Array::kMaxLength nodejs/node#50115 * src: update default V8 platform to override functions with location nodejs/node#51362 * src: add missing TryCatch nodejs/node#51362 * lib,test: handle new Iterator global nodejs/node#51362 * src: use non-deprecated version of CreateSyntheticModule nodejs/node#50115 * src: remove calls to recently deprecated V8 APIs nodejs/node#52996 * src: use new V8 API to define stream accessor nodejs/node#53084 * src: do not use deprecated V8 API nodejs/node#53084 * src: do not use soon-to-be-deprecated V8 API nodejs/node#53174 * src: migrate to new V8 interceptors API nodejs/node#52745 * src: use supported API to get stalled TLA messages nodejs/node#51362 * module: print location of unsettled top-level await in entry points nodejs/node#51999 * test: make snapshot comparison more flexible nodejs/node#54375 * test: do not set concurrency on parallelized runs nodejs/node#52177 * src: move FromNamespacedPath to path.cc nodejs/node#53540 * test: adapt to new V8 trusted memory spaces nodejs/node#50115 * build: add option to enable clang-cl on Windows nodejs/node#52870 * chore: fixup patch indices * chore: add/remove changed files * esm: drop support for import assertions nodejs/node#54890 * build: compile with C++20 support nodejs/node#52838 * deps: update nghttp2 to 1.62.1 nodejs/node#52966 * src: parse inspector profiles with simdjson nodejs/node#51783 * build: add GN build files nodejs/node#47637 * deps,lib,src: add experimental web storage nodejs/node#52435 * build: add missing BoringSSL dep * src: rewrite task runner in c++ nodejs/node#52609 * fixup! build: add GN build files * src: stop using deprecated fields of v8::FastApiCallbackOptions nodejs/node#54077 * fix: shadow variable * build: add back incorrectly removed SetAccessor patch * fixup! fixup! build: add GN build files * crypto: fix integer comparison in crypto for BoringSSL * src,lib: reducing C++ calls of esm legacy main resolve nodejs/node#48325 * src: move more crypto_dh.cc code to ncrypto nodejs/node#54459 * chore: fixup GN files for previous commit * src: move more crypto code to ncrypto nodejs/node#54320 * Fixup Perfetto ifdef guards * fix: missing electron_natives dep * fix: node_use_node_platform = false * fix: include src/node_snapshot_stub.cc in libnode * 5507047: [import-attributes] Remove support for import assertions https://chromium-review.googlesource.com/c/v8/v8/+/5507047 * fix: restore v8-sandbox.h in filenames.json * fix: re-add original-fs generation logic * fix: ngtcp2 openssl dep * test: try removing NAPI_VERSION undef * chore(deps): bump @types/node * src: move more crypto_dh.cc code to ncrypto nodejs/node#54459 * esm: remove unnecessary toNamespacedPath calls nodejs/node#53656 * buffer: fix out of range for toString nodejs/node#54553 * lib: rewrite AsyncLocalStorage without async_hooks nodejs/node#48528 * module: print amount of load time of a cjs module nodejs/node#52213 * test: skip reproducible snapshot test on 32-bit nodejs/node#53592 * fixup! src: move more crypto_dh.cc code to ncrypto * test: adjust emittedUntil return type * chore: remove redundant wpt streams patch * fixup! chore(deps): bump @types/node * fix: gn executable name on Windows * fix: build on Windows * fix: rename conflicting win32 symbols in //third_party/sqlite On Windows otherwise we get: lld-link: error: duplicate symbol: sqlite3_win32_write_debug >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:47987 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj lld-link: error: duplicate symbol: sqlite3_win32_sleep >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48042 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj lld-link: error: duplicate symbol: sqlite3_win32_is_nt >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48113 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj lld-link: error: duplicate symbol: sqlite3_win32_utf8_to_unicode >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48470 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj lld-link: error: duplicate symbol: sqlite3_win32_unicode_to_utf8 >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48486 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj lld-link: error: duplicate symbol: sqlite3_win32_mbcs_to_utf8 >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48502 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj lld-link: error: duplicate symbol: sqlite3_win32_mbcs_to_utf8_v2 >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48518 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj lld-link: error: duplicate symbol: sqlite3_win32_utf8_to_mbcs >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48534 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj lld-link: error: duplicate symbol: sqlite3_win32_utf8_to_mbcs_v2 >>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48550 >>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj >>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj * docs: remove unnecessary ts-expect-error after types bump * src: move package resolver to c++ nodejs/node#50322 * build: set ASAN detect_container_overflow=0 nodejs/node#55584 * chore: fixup rebase * test: disable failing ASAN test * win: almost fix race detecting ESRCH in uv_kill libuv/libuv#4341

esm: align sync and async load implementations

76f1380

Refs: nodejs#48272

nodejs-github-bot added esm Issues and PRs related to the ECMAScript Modules implementation. needs-ci PRs that need a full CI run. labels Aug 13, 2023

ljharb reviewed Aug 13, 2023

View reviewed changes

GeoffreyBooth approved these changes Aug 13, 2023

View reviewed changes

JakobJingleheimer approved these changes Aug 19, 2023

View reviewed changes

aduh95 added author ready PRs that have at least one approval, no outstanding review comments, and a CI started. request-ci Add this label to start a Jenkins CI on a PR. labels Aug 19, 2023

github-actions Bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Aug 19, 2023

lpinca added the commit-queue Add this label to land a pull request using GitHub Actions. label Aug 20, 2023

nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Aug 20, 2023

nodejs-github-bot merged commit 2557932 into nodejs:main Aug 20, 2023

aduh95 deleted the load-url-instances branch August 20, 2023 08:53

This was referenced Aug 21, 2023

CI Reliability 2023-08-21 nodejs/reliability#641

Open

CI Reliability 2023-08-22 nodejs/reliability#642

Open

CI Reliability 2023-08-23 nodejs/reliability#643

Open

CI Reliability 2023-08-24 nodejs/reliability#644

Open

UlisesGascon pushed a commit that referenced this pull request Sep 10, 2023

esm: align sync and async load implementations

a6cfea3

Refs: #48272 PR-URL: #49152 Refs: #47999 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Jacob Smith <jacob@frende.me>

UlisesGascon mentioned this pull request Sep 10, 2023

v20.7.0 proposal #49592

Merged

codebytere added a commit to electron/electron that referenced this pull request Oct 16, 2024

esm: align sync and async load implementations

a49fde3

nodejs/node#49152

codebytere added a commit to electron/electron that referenced this pull request Oct 21, 2024

esm: align sync and async load implementations

16519b8

nodejs/node#49152

codebytere added a commit to electron/electron that referenced this pull request Oct 21, 2024

esm: align sync and async load implementations

4a3e8f7

nodejs/node#49152

codebytere added a commit to electron/electron that referenced this pull request Oct 22, 2024

esm: align sync and async load implementations

18ccdeb

nodejs/node#49152

codebytere added a commit to electron/electron that referenced this pull request Oct 28, 2024

esm: align sync and async load implementations

a548fe4

nodejs/node#49152

codebytere added a commit to electron/electron that referenced this pull request Oct 29, 2024

esm: align sync and async load implementations

50f6e61

nodejs/node#49152

codebytere added a commit to electron/electron that referenced this pull request Oct 31, 2024

esm: align sync and async load implementations

4113ee5

nodejs/node#49152

+                if (protocol === 'file:') {
+                  source = readFileSync(url);
+                } else if (protocol === 'data:') {
+                  const match = RegExpPrototypeExec(DATA_URL_PATTERN, url.pathname);

esm: align sync and async load implementations by aduh95 · Pull Request #49152 · nodejs/node · GitHub

Uh oh!

Uh oh!

esm: align sync and async load implementations - #49152

esm: align sync and async load implementations#49152nodejs-github-bot merged 1 commit intonodejs:mainnodejs/node:mainfrom aduh95:load-url-instancesaduh95/node:load-url-instancesCopy head branch name to clipboard

Conversation

aduh95 commented Aug 13, 2023

Uh oh!

nodejs-github-bot commented Aug 13, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ljharb Aug 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GeoffreyBooth commented Aug 13, 2023

Uh oh!

anonrig commented Aug 13, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JakobJingleheimer left a comment

Choose a reason for hiding this comment

Uh oh!

nodejs-github-bot commented Aug 19, 2023

Uh oh!

nodejs-github-bot commented Aug 19, 2023

Uh oh!

nodejs-github-bot commented Aug 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

esm: align sync and async load implementations#49152
nodejs-github-bot merged 1 commit into
nodejs:mainfrom
aduh95:load-url-instances

ljharb Aug 14, 2023 •
edited
Loading