fix `require.resolve` not considering paths `.` and `..` relative #56735

dario-piotrowicz · 2025-01-23T23:22:43Z

Fixes: #47000

nodejs-github-bot · 2025-01-23T23:22:48Z

Review requested:

@nodejs/loaders

lib/internal/modules/cjs/loader.js

ljharb · 2025-01-23T23:56:02Z

do all of these added tests fail on main, or only a subset of them?

aduh95 · 2025-01-24T00:00:26Z

The src: subsystem is reserved for changes in src/. Let's use module: instead

nodejs-github-bot · 2025-01-24T00:04:29Z

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

dario-piotrowicz · 2025-01-24T00:07:50Z

do all of these added tests fail on main, or only a subset of them?

only a subset, but I think that the paths option is actually never tested anywhere else (or at least I think?) so I figured that adding some would be beneficial (without going overboard here)

ljharb · 2025-01-24T00:11:08Z

ah ok, so this is specifically a bug with paths only?

dario-piotrowicz · 2025-01-24T00:12:25Z

The src: subsystem is reserved for changes in src/. Let's use module: instead

sorry, my bad, updated 🫡

dario-piotrowicz · 2025-01-24T00:15:49Z

ah ok, so this is specifically a bug with paths only?

Yes, as far as I can tell that's the case, this for example:

node/test/parallel/test-require-dot.js

Lines 11 to 12 in 869ea33

    
           // require(".") should resolve like require("./") 
        
           assert.strictEqual(a, b);

does indicate that . is correctly treated as a relative path in standard require calls

test/parallel/test-require-resolve-opts-paths-relative.js

aduh95 · 2025-01-24T00:19:49Z

May I suggest to not include add early return for perf gain and fix linting in the commit message – I would also suggest to not bother with the Fixes: which will be added by the bot upon landing as long as it's in the PR description.

The commit message needs to be shorter, e.g. module: fix relative path handling in `require.resolve` .

dario-piotrowicz · 2025-01-24T00:22:54Z

May I suggest to not include add early return for perf gain and fix linting in the commit message

Sorry I added them by mistake when I squashed fixup commits, I've already removed them

I would also suggest to not bother with the Fixes: which will be added by the bot upon landing as long as it's in the PR description.

Sorry the contributing MD made me thing I was supposed to add that 😓

The commit message needs to be shorter, e.g. module: fix relative path handling in `require.resolve`.

Yes I did notice the linting error, hopefully my newer title is ok?

aduh95 · 2025-01-24T00:26:25Z

Sorry the contributing MD made me thing I was supposed to add that 😓

To be clear, you can 100% do that if you prefer to do it – what's important is for the commit landing on main to contain it, and what I'm saying is you can let the bot add it for you

this change fixes `require.resolve` used with the `paths` option not considering `.` and `..` as relative Fixes: nodejs#47000

dario-piotrowicz · 2025-01-24T00:34:29Z

Sorry the contributing MD made me thing I was supposed to add that 😓

To be clear, you can 100% do that if you prefer to do it – what's important is for the commit landing on main to contain it, and what I'm saying is you can let the bot add it for you

Got it 🙂

Maybe I can open a quick PR to add a note to clarify that here?

node/doc/contributing/pull-requests.md

Lines 183 to 191 in 869ea33

    
           4. If your patch fixes an open issue, you can add a reference to it at the end 
        
              of the log. Use the `Fixes:` prefix and the full issue URL. For other 
        
              references use `Refs:`. 
        
              Examples: 
        
              * `Fixes: https://github.com/nodejs/node/issues/1337` 
        
              * `Refs: https://eslint.org/docs/rules/space-in-parens.html` 
        
              * `Refs: https://github.com/nodejs/node/pull/3615`

WDYT? (I'm guessing that Fixes is autopopulated by bots but Refs is still on the developer?)

lib/internal/modules/cjs/loader.js

Co-authored-by: Yagiz Nizipli <yagiz@nizipli.com>

nodejs-github-bot · 2025-01-24T02:33:30Z

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

mcollina

lgtm

jsumners-nr · 2025-01-24T12:28:46Z

lib/internal/modules/cjs/loader.js

+/**
+ * Checks if a path is relative
+ * @param {string} path the target path
+ * @returns {boolean} true if the path is relative, false otherwise
+ */
+function isRelative(path) {
+  if (StringPrototypeCharCodeAt(path, 0) !== CHAR_DOT) { return false; }
+
+  return path.length === 1 || path === '..' ||
+  StringPrototypeStartsWith(path, './') ||
+  StringPrototypeStartsWith(path, '../') ||
+  ((isWindows && StringPrototypeStartsWith(path, '.\\')) ||
+  StringPrototypeStartsWith(path, '..\\'));
+}


nodejs-github-bot · 2025-01-24T16:26:55Z

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

nodejs-github-bot · 2025-01-25T23:32:15Z

Landed in 7119303

test/parallel/test-require-resolve-opts-paths-relative.js

this change fixes `require.resolve` used with the `paths` option not considering `.` and `..` as relative Fixes: #47000 PR-URL: #56735 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jordan Harband <ljharb@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

this change fixes `require.resolve` used with the `paths` option not considering `.` and `..` as relative Fixes: nodejs#47000 PR-URL: nodejs#56735 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jordan Harband <ljharb@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

this change fixes `require.resolve` used with the `paths` option not considering `.` and `..` as relative Fixes: #47000 PR-URL: #56735 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jordan Harband <ljharb@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

nodejs-github-bot added module Issues and PRs related to the module subsystem. needs-ci PRs that need a full CI run. labels Jan 23, 2025

dario-piotrowicz commented Jan 23, 2025

View reviewed changes

lib/internal/modules/cjs/loader.js Outdated Show resolved Hide resolved

dario-piotrowicz force-pushed the dario/require-resolve-opts-paths-dot-dot-fix branch from 9ffc34a to 7e988e5 Compare January 23, 2025 23:31

dario-piotrowicz changed the title ~~src: fix require.resolve paths option not treating .. as relative~~ fix require.resolve not considering paths . and .. relative Jan 23, 2025

dario-piotrowicz requested a review from aduh95 January 23, 2025 23:46

anonrig approved these changes Jan 23, 2025

View reviewed changes

anonrig added request-ci Add this label to start a Jenkins CI on a PR. commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. labels Jan 23, 2025

jasnell approved these changes Jan 23, 2025

View reviewed changes

github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jan 24, 2025

dario-piotrowicz force-pushed the dario/require-resolve-opts-paths-dot-dot-fix branch from c8424cc to 02cbc98 Compare January 24, 2025 00:09

aduh95 reviewed Jan 24, 2025

View reviewed changes

test/parallel/test-require-resolve-opts-paths-relative.js Show resolved Hide resolved

dario-piotrowicz force-pushed the dario/require-resolve-opts-paths-dot-dot-fix branch from 02cbc98 to 7a97c0b Compare January 24, 2025 00:20

module: fix bad require.resolve with option paths for . and ..

562e1c6

this change fixes `require.resolve` used with the `paths` option not considering `.` and `..` as relative Fixes: nodejs#47000

dario-piotrowicz force-pushed the dario/require-resolve-opts-paths-dot-dot-fix branch from 7a97c0b to 562e1c6 Compare January 24, 2025 00:29

ljharb approved these changes Jan 24, 2025

View reviewed changes

anonrig reviewed Jan 24, 2025

View reviewed changes

lib/internal/modules/cjs/loader.js Outdated Show resolved Hide resolved

Update lib/internal/modules/cjs/loader.js

08679ec

Co-authored-by: Yagiz Nizipli <yagiz@nizipli.com>

This comment was marked as outdated.

Sign in to view

anonrig approved these changes Jan 24, 2025

View reviewed changes

anonrig added the request-ci Add this label to start a Jenkins CI on a PR. label Jan 24, 2025

jasnell removed the request-ci Add this label to start a Jenkins CI on a PR. label Jan 24, 2025

mcollina approved these changes Jan 24, 2025

View reviewed changes

jsumners-nr approved these changes Jan 24, 2025

View reviewed changes

aduh95 added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. commit-queue Add this label to land a pull request using GitHub Actions. labels Jan 24, 2025

nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jan 25, 2025

nodejs-github-bot merged commit 7119303 into nodejs:main Jan 25, 2025
65 checks passed

legendecas reviewed Jan 26, 2025

View reviewed changes

test/parallel/test-require-resolve-opts-paths-relative.js Show resolved Hide resolved

dario-piotrowicz deleted the dario/require-resolve-opts-paths-dot-dot-fix branch January 26, 2025 16:38

dario-piotrowicz mentioned this pull request Jan 26, 2025

module: fix resolution consistency between '.' and './' #47019

Closed

github-actions bot mentioned this pull request Jan 28, 2025

2025-01-30, Version 23.7.0 (Current) #56800

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix `require.resolve` not considering paths `.` and `..` relative #56735

fix `require.resolve` not considering paths `.` and `..` relative #56735

dario-piotrowicz commented Jan 23, 2025

nodejs-github-bot commented Jan 23, 2025

ljharb commented Jan 23, 2025

aduh95 commented Jan 24, 2025

nodejs-github-bot commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025 •

edited

Loading

ljharb commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025

aduh95 commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025

aduh95 commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025 •

edited

Loading

This comment was marked as outdated.

nodejs-github-bot commented Jan 24, 2025

mcollina left a comment

jsumners-nr Jan 24, 2025

nodejs-github-bot commented Jan 24, 2025

nodejs-github-bot commented Jan 25, 2025

fix require.resolve not considering paths . and .. relative #56735

fix require.resolve not considering paths . and .. relative #56735

Conversation

dario-piotrowicz commented Jan 23, 2025

nodejs-github-bot commented Jan 23, 2025

ljharb commented Jan 23, 2025

aduh95 commented Jan 24, 2025

nodejs-github-bot commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025 • edited Loading

ljharb commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025

aduh95 commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025

aduh95 commented Jan 24, 2025

dario-piotrowicz commented Jan 24, 2025 • edited Loading

This comment was marked as outdated.

nodejs-github-bot commented Jan 24, 2025

mcollina left a comment

Choose a reason for hiding this comment

jsumners-nr Jan 24, 2025

Choose a reason for hiding this comment

nodejs-github-bot commented Jan 24, 2025

nodejs-github-bot commented Jan 25, 2025

fix `require.resolve` not considering paths `.` and `..` relative #56735

fix `require.resolve` not considering paths `.` and `..` relative #56735

dario-piotrowicz commented Jan 24, 2025 •

edited

Loading

dario-piotrowicz commented Jan 24, 2025 •

edited

Loading