From 74d80b06e470102b89bd4e9bbccb026a5f7e1fda Mon Sep 17 00:00:00 2001 From: Qingyu Deng Date: Sat, 29 May 2021 13:56:49 +0800 Subject: [PATCH 1/3] doc: align module resolve algorithm with implementation Fixes: https://github.com/nodejs/node/issues/38128 --- doc/api/modules.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/api/modules.md b/doc/api/modules.md index 9bb3bf0c56b812..5fba400e57c374 100644 --- a/doc/api/modules.md +++ b/doc/api/modules.md @@ -197,13 +197,14 @@ LOAD_NODE_MODULES(X, START) NODE_MODULES_PATHS(START) 1. let PARTS = path split(START) 2. let I = count of PARTS - 1 -3. let DIRS = [GLOBAL_FOLDERS] +3. let DIRS = [] 4. while I >= 0, a. if PARTS[I] = "node_modules" CONTINUE b. DIR = path join(PARTS[0 .. I] + "node_modules") c. DIRS = DIRS + DIR d. let I = I - 1 -5. return DIRS +5. DIRS = DIRS.concat(GLOBAL_FOLDERS) +6. return DIRS LOAD_PACKAGE_IMPORTS(X, DIR) 1. Find the closest package scope SCOPE to DIR. From f77fe645422b8ffe624600ed007c7eecf237c25b Mon Sep 17 00:00:00 2001 From: Qingyu Deng Date: Mon, 31 May 2021 19:53:11 +0800 Subject: [PATCH 2/3] fixup: take advice from review Co-authored-by: Jordan Harband Co-authored-by: Christopher Beeson --- doc/api/modules.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/api/modules.md b/doc/api/modules.md index 5fba400e57c374..458ede4522dad1 100644 --- a/doc/api/modules.md +++ b/doc/api/modules.md @@ -201,10 +201,9 @@ NODE_MODULES_PATHS(START) 4. while I >= 0, a. if PARTS[I] = "node_modules" CONTINUE b. DIR = path join(PARTS[0 .. I] + "node_modules") - c. DIRS = DIRS + DIR + c. DIRS = DIR + DIRS d. let I = I - 1 -5. DIRS = DIRS.concat(GLOBAL_FOLDERS) -6. return DIRS +5. return DIRS.concat(GLOBAL_FOLDERS) LOAD_PACKAGE_IMPORTS(X, DIR) 1. Find the closest package scope SCOPE to DIR. From 82b1d1f7da611167bcad72b01bd8a47f7eb8ab1b Mon Sep 17 00:00:00 2001 From: Qingyu Deng Date: Mon, 31 May 2021 22:30:36 +0800 Subject: [PATCH 3/3] fixup: unify usage Co-authored-by: Jordan Harband --- doc/api/modules.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/modules.md b/doc/api/modules.md index 458ede4522dad1..ac0640e5816f99 100644 --- a/doc/api/modules.md +++ b/doc/api/modules.md @@ -203,7 +203,7 @@ NODE_MODULES_PATHS(START) b. DIR = path join(PARTS[0 .. I] + "node_modules") c. DIRS = DIR + DIRS d. let I = I - 1 -5. return DIRS.concat(GLOBAL_FOLDERS) +5. return DIRS + GLOBAL_FOLDERS LOAD_PACKAGE_IMPORTS(X, DIR) 1. Find the closest package scope SCOPE to DIR.