module: CJS handle deleted directory relative require #42384

bmeck · 2022-03-17T21:03:14Z

This makes sure the following code works:

const fs = require('fs');
const path = require('path');
const dir = path.join(__dirname, 'delete_me');
fs.mkdirSync(dir, {
    recursive: true
});
const barPath = path.join(dir, 'bar.cjs');
fs.writeFileSync(barPath, `
    module.exports = () => require('../foo.cjs')
`);
const bar = require(barPath);
fs.rmSync(dir, {recursive: true});
require('assert').strict.equal(bar(), exports);

I found this while fixing up some policy stuff and realizing baseURL wouldn't work if synchronized to disk exactly right for things like, https://github.com/bmeck/local-fs-https-imports , due to an over eager optimization in the code.

nodejs-github-bot · 2022-03-17T21:03:17Z

Review requested:

@nodejs/modules

bmeck · 2022-03-17T21:13:37Z

we could also not use normalized form in the further parts of the PR if people are worried about compat

lib/internal/policy/manifest.js

nodejs-github-bot · 2022-10-28T12:38:50Z

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

nodejs-github-bot · 2022-10-29T12:00:15Z

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

nodejs-github-bot · 2022-10-29T20:25:09Z

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

ljharb · 2022-10-29T21:02:40Z

lib/internal/modules/cjs/loader.js

-    trailingSlash = RegExpPrototypeExec(trailingSlashRegex, request) !== null;
-  }
+  const trailingSlash = request.length > 0 &&
+    (StringPrototypeCharCodeAt(request, request.length - 1) === CHAR_FORWARD_SLASH || (


Is there a reason to use charcode instead of:

Suggested change

(StringPrototypeCharCodeAt(request, request.length - 1) === CHAR_FORWARD_SLASH || (

(request[request.length - 1] === '/' || (

?

I believe charcode comparison is faster

in recent v8? I’d love to see benchmarks for that!

Same here, I'd be up for landing this as is, and open a new PR to run benchmarks and see if that changes something.

Totally agree, perf changes should be done separately with benchmarks - i was thinking the simple string comparison was simpler than the charCode, and thus the better choice absent said benchmarks.

anonrig · 2022-10-29T22:54:03Z

lib/internal/modules/cjs/loader.js

-    CHAR_FORWARD_SLASH;
-  if (!trailingSlash) {
-    trailingSlash = RegExpPrototypeExec(trailingSlashRegex, request) !== null;
+  const trailingSlash = request.length > 0 &&


I believe storing request.length in a separate variable will result in faster code execution since the next 30~40 lines call request.length

Historically caching length lookups caused a huge perf hit, since it defeats a JIT optimization - not sure if that’s still true, but i doubt caching the length can beat the JIT.

I'd be up for landing this as is, and open a new PR to run benchmarks and see if that changes something.

nodejs-github-bot · 2022-10-31T19:54:00Z

Landed in ccd81e8

PR-URL: #42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

PR-URL: nodejs#42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

PR-URL: #42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

nodejs/node#42384

* chore: bump node in DEPS to v18.13.0 * child_process: validate arguments for null bytes nodejs/node#44782 * bootstrap: merge main thread and worker thread initializations nodejs/node#44869 * module: ensure relative requires work from deleted directories nodejs/node#42384 * src: add support for externally shared js builtins nodejs/node#44000 * lib: disambiguate `native module` to `binding` nodejs/node#45673 * test: convert test-debugger-pid to async/await nodejs/node#45179 * deps: upgrade to libuv 1.44.2 nodejs/node#42340 * src: fix cppgc incompatibility in v8 nodejs/node#43521 * src: use qualified `std::move` call in node_http2 nodejs/node#45555 * build: fix env.h for cpp20 nodejs/node#45516 * test: remove experimental-wasm-threads flag nodejs/node#45074 * src: iwyu in cleanup_queue.cc nodejs/node#44983 * src: add missing include for `std::all_of` nodejs/node#45541 * deps: update ICU to 72.1 nodejs/node#45068 * chore: fixup patch indices * chore: remove errant semicolons - nodejs/node#44179 - nodejs/node#44193 * src: add support for externally shared js builtins nodejs/node#44376 * chore: add missing GN filenames * deps: update nghttp2 to 1.51.0 nodejs/node#45537 * chore: disable more Node.js snapshot tests The Snapshot feature is currently disabled * chore: disable ICU timezone tests Node.js uses a different version of ICU than Electron so they will often be out of sync. * chore: disable threadpool event tracing test Event tracing is not enabled in embedded Node.js * chore: fixup patch indices * chore: comments from review Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

nodejs-github-bot added lib / src Issues and PRs related to general changes in the lib or src directory. needs-ci PRs that need a full CI run. labels Mar 17, 2022

ljharb reviewed Mar 17, 2022

View reviewed changes

lib/internal/policy/manifest.js Outdated Show resolved Hide resolved

lib/internal/policy/manifest.js Outdated Show resolved Hide resolved

bmeck changed the title ~~CJS handle deleted directory relative require~~ module: CJS handle deleted directory relative require Mar 18, 2022

bmeck added the module Issues and PRs related to the module subsystem. label Mar 18, 2022

GeoffreyBooth approved these changes Mar 24, 2022

View reviewed changes

jasnell approved these changes Mar 25, 2022

View reviewed changes

module: ensure relative requires work from deleted directories

af0ee79

aduh95 added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. request-ci Add this label to start a Jenkins CI on a PR. labels Oct 28, 2022

aduh95 force-pushed the cjs-deleted-relative-require branch from 2af1174 to af0ee79 Compare October 28, 2022 12:27

github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 28, 2022

github-actions bot mentioned this pull request Oct 29, 2022

CI Reliability 2022-10-29 nodejs/reliability#414

Open

15 tasks

do not use regexes in module loader

dc3b380

aduh95 added the request-ci Add this label to start a Jenkins CI on a PR. label Oct 29, 2022

github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 29, 2022

ljharb reviewed Oct 29, 2022

View reviewed changes

anonrig reviewed Oct 29, 2022

View reviewed changes

This was referenced Oct 30, 2022

CI Reliability 2022-10-30 nodejs/reliability#415

Open

CI Reliability 2022-10-31 nodejs/reliability#416

Open

aduh95 requested a review from GeoffreyBooth October 31, 2022 12:51

GeoffreyBooth approved these changes Oct 31, 2022

View reviewed changes

aduh95 added commit-queue Add this label to land a pull request using GitHub Actions. commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. labels Oct 31, 2022

nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Oct 31, 2022

nodejs-github-bot merged commit ccd81e8 into nodejs:main Oct 31, 2022

github-actions bot mentioned this pull request Nov 1, 2022

CI Reliability 2022-11-01 nodejs/reliability#417

Open

17 tasks

RafaelGSS pushed a commit that referenced this pull request Nov 1, 2022

module: ensure relative requires work from deleted directories

ddefc5d

PR-URL: #42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

RafaelGSS mentioned this pull request Nov 1, 2022

v19.1.0 proposal #45269

Merged

github-actions bot mentioned this pull request Nov 2, 2022

CI Reliability 2022-11-02 nodejs/reliability#418

Open

15 tasks

lucshi pushed a commit to lucshi/node that referenced this pull request Nov 9, 2022

module: ensure relative requires work from deleted directories

3623fc5

PR-URL: nodejs#42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

RafaelGSS pushed a commit that referenced this pull request Nov 10, 2022

module: ensure relative requires work from deleted directories

738144c

PR-URL: #42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

danielleadams pushed a commit that referenced this pull request Dec 30, 2022

module: ensure relative requires work from deleted directories

a53ce76

PR-URL: #42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

danielleadams mentioned this pull request Dec 30, 2022

v18.13.0 release proposal #46025

Merged

danielleadams pushed a commit that referenced this pull request Dec 30, 2022

module: ensure relative requires work from deleted directories

8dd43d9

PR-URL: #42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

danielleadams pushed a commit that referenced this pull request Jan 3, 2023

module: ensure relative requires work from deleted directories

bf8d48a

PR-URL: #42384 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: James M Snell <jasnell@gmail.com>

codebytere added a commit to electron/electron that referenced this pull request Jan 9, 2023

module: ensure relative requires work from deleted directories

8aa1521

nodejs/node#42384

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

module: CJS handle deleted directory relative require #42384

module: CJS handle deleted directory relative require #42384

bmeck commented Mar 17, 2022 •

edited

Loading

nodejs-github-bot commented Mar 17, 2022

bmeck commented Mar 17, 2022

nodejs-github-bot commented Oct 28, 2022

nodejs-github-bot commented Oct 29, 2022

nodejs-github-bot commented Oct 29, 2022

ljharb Oct 29, 2022

anonrig Oct 29, 2022

ljharb Oct 30, 2022

aduh95 Oct 30, 2022

ljharb Oct 31, 2022

anonrig Oct 29, 2022

ljharb Oct 30, 2022

aduh95 Oct 30, 2022

nodejs-github-bot commented Oct 31, 2022

	(StringPrototypeCharCodeAt(request, request.length - 1) === CHAR_FORWARD_SLASH \|\| (
	(request[request.length - 1] === '/' \|\| (

module: CJS handle deleted directory relative require #42384

module: CJS handle deleted directory relative require #42384

Conversation

bmeck commented Mar 17, 2022 • edited Loading

nodejs-github-bot commented Mar 17, 2022

bmeck commented Mar 17, 2022

nodejs-github-bot commented Oct 28, 2022

nodejs-github-bot commented Oct 29, 2022

nodejs-github-bot commented Oct 29, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nodejs-github-bot commented Oct 31, 2022

bmeck commented Mar 17, 2022 •

edited

Loading