Support namespaces when finding target dir.

Fixes sporadic 'assignTargetDirs reached root' error caused by naive traversal of fodler tree which didn't supported namespaced packages. Fixes #6
zbigg · Jul 22, 2020 · 7a382d8 · 7a382d8
1 parent c78277f
commit 7a382d8
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 44 deletions.
diff --git a/src/copy-production-deps.spec.ts b/src/copy-production-deps.spec.ts
@@ -162,9 +162,9 @@ describe("copy-production-deps", function () {
                                 a: "^1.0.0",
                                 b: "^0.1.0",
                                 d: "^1.0.0",
-                                r1: "^1.0.0",
-                                r2: "^1.0.0",
-                                r3: "^1.0.0"
+                                "@org/r1": "^1.0.0",
+                                "@org/r2": "^1.0.0",
+                                "@org/r3": "^1.0.0"
                             },
                             devDependencies: {
                                 x: "^1.0.0"
@@ -189,40 +189,42 @@ describe("copy-production-deps", function () {
                                     version: "1.0.0"
                                 })
                             },
-                            r1: {
-                                "package.json": JSON.stringify({
-                                    name: "r1",
-                                    version: "1.0.0",
-                                    dependencies: {
-                                        s: "1.0.0"
-                                    }
-                                })
-                            },
-                            r2: {
-                                "package.json": JSON.stringify({
-                                    name: "r2",
-                                    version: "1.0.0",
-                                    dependencies: {
-                                        s: "1.0.0"
+                            "@org": {
+                                r1: {
+                                    "package.json": JSON.stringify({
+                                        name: "@org/r1",
+                                        version: "1.0.0",
+                                        dependencies: {
+                                            s: "1.0.0"
+                                        }
+                                    })
+                                },
+                                r2: {
+                                    "package.json": JSON.stringify({
+                                        name: "@org/r2",
+                                        version: "1.0.0",
+                                        dependencies: {
+                                            s: "1.0.0"
+                                        }
+                                    })
+                                },
+                                r3: {
+                                    "package.json": JSON.stringify({
+                                        name: "@org/r3",
+                                        version: "1.0.0",
+                                        dependencies: {
+                                            s: "2.0.0"
+                                        }
+                                    }),
+                                    node_modules: {
+                                        s: {
+                                            "package.json": JSON.stringify({
+                                                name: "s",
+                                                version: "2.0.0"
+                                            })
+                                        }
                                     }
-                                })
-                            },
-                            r3: {
-                                "package.json": JSON.stringify({
-                                    name: "r3",
-                                    version: "1.0.0",
-                                    dependencies: {
-                                        s: "2.0.0"
-                                    }
-                                }),
-                                node_modules: {
-                                    s: {
-                                        "package.json": JSON.stringify({
-                                            name: "s",
-                                            version: "2.0.0"
-                                        })
-                                    }
-                                }
+                                },
                             },
                             s: {
                                 "package.json": JSON.stringify({
@@ -300,13 +302,13 @@ describe("copy-production-deps", function () {
                     version: "2.0.0"
                 },
                 {
-                    name: "r1",
-                    sourceDir: "workspaceRoot/foo-backend/node_modules/r1",
+                    name: "@org/r1",
+                    sourceDir: "workspaceRoot/foo-backend/node_modules/@org/r1",
                     version: "1.0.0"
                 },
                 {
                     name: "s",
-                    sourceDir: "workspaceRoot/foo-backend/node_modules/r3/node_modules/s",
+                    sourceDir: "workspaceRoot/foo-backend/node_modules/@org/r3/node_modules/s",
                     version: "2.0.0"
                 }
             ]);
@@ -373,11 +375,11 @@ describe("copy-production-deps", function () {
             assertPackageExists("./dist", { name: "b", version: "0.1.0" });
             assertPackageExists("./dist", { name: "c", version: "2.0.0" });
             assertPackageExists("./dist", { name: "d", version: "1.0.0" });
-            assertPackageExists("./dist", { name: "r1", version: "1.0.0" });
-            assertPackageExists("./dist", { name: "r2", version: "1.0.0" });
-            assertPackageExists("./dist", { name: "r3", version: "1.0.0" });
+            assertPackageExists("./dist", { name: "@org/r1", version: "1.0.0" });
+            assertPackageExists("./dist", { name: "@org/r2", version: "1.0.0" });
+            assertPackageExists("./dist", { name: "@org/r3", version: "1.0.0" });
             assertPackageExists("./dist", { name: "s", version: "1.0.0" });
-            assertPackageExists("./dist/node_modules/r3", { name: "s", version: "2.0.0" });
+            assertPackageExists("./dist/node_modules/@org/r3", { name: "s", version: "2.0.0" });
             assertPackageExists("./dist/node_modules/a", { name: "b", version: "1.0.0" });
         });
     });

diff --git a/src/copy-production-deps.ts b/src/copy-production-deps.ts
@@ -256,6 +256,7 @@ export function assignTargetDirs(allPackages: Context, rootPkg: ResolvedPackage)
         const startNodeModules = path.join(user.targetDir, "node_modules");
         let previousTargetDir: string | undefined;
         let currentNodeModules = startNodeModules;
+        let currentUser = user;
         while (true) {
             let currentTargetDir = path.join(currentNodeModules, pkg.name);
             if (previousTargetDir !== undefined && targetDirs.has(currentTargetDir)) {
@@ -282,8 +283,13 @@ export function assignTargetDirs(allPackages: Context, rootPkg: ResolvedPackage)
                 return candidate;
             }
             previousTargetDir = currentTargetDir;
+            if (!currentUser.parent) {
+                return candidate;
+            }
+            currentUser = currentUser.parent;
             const previousNodeModules = currentNodeModules;
-            currentNodeModules = path.dirname(path.dirname(currentNodeModules));
+            currentNodeModules = path.join(currentUser.targetDir, "node_modules");
+
             if (previousNodeModules === currentNodeModules) {
                 throw new Error("#assignTargetDirs reached root, report this as bug");
             }