Fix caching nested dirs

joshuajaco · Nov 19, 2023 · 9be5cb0 · 9be5cb0
1 parent d8808d8
commit 9be5cb0
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 15 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -37,7 +37,7 @@ export function findWorkspacesRoot(dirname?: string, options: Options = {}) {
 
   if (cache) {
     for (const [key, value] of cache.root.entries()) {
-      if (dir.startsWith(key + sep)) return value;
+      if ((dir + sep).startsWith(key + sep)) return value;
     }
   }
 

diff --git a/tests/findRoot.test.ts b/tests/findRoot.test.ts
@@ -129,4 +129,25 @@ describe("findWorkspacesRoot", () => {
     assert.deepStrictEqual(cache.root, new Map());
     assert.deepStrictEqual(cache.workspaces, new Map());
   });
+
+  it("returns root from cache", () => {
+    const cache = createWorkspacesCache();
+    const options = { cache, stopDir: "." };
+
+    const root = {
+      location: posixResolve("fixtures", "bolt"),
+      globs: ["packages/**/*"],
+    };
+
+    cache.root.set(resolve("fixtures", "bolt"), root);
+
+    assert.strictEqual(
+      findWorkspacesRoot(join("fixtures", "bolt", "foo"), options),
+      root,
+    );
+    assert.strictEqual(
+      findWorkspacesRoot(join("fixtures", "bolt"), options),
+      root,
+    );
+  });
 });
diff --git a/tests/findWorkspaces.test.ts b/tests/findWorkspaces.test.ts
@@ -216,6 +216,20 @@ describe("findWorkspaces", () => {
   it("fills cache", () => {
     const cache = createWorkspacesCache();
 
+    assert.deepStrictEqual(
+      findWorkspaces(posixResolve("fixtures", "lerna"), { cache }),
+      [
+        {
+          location: posixResolve("fixtures", "lerna", "packages", "a"),
+          package: { name: "@lerna/a", private: true },
+        },
+        {
+          location: posixResolve("fixtures", "lerna", "packages", "b"),
+          package: { name: "@lerna/b", private: true },
+        },
+      ],
+    );
+
     assert.deepStrictEqual(
       findWorkspaces(posixResolve("fixtures", "lerna-with-packages", "foo"), {
         cache,
@@ -268,20 +282,6 @@ describe("findWorkspaces", () => {
       ],
     );
 
-    assert.deepStrictEqual(
-      findWorkspaces(posixResolve("fixtures", "lerna"), { cache }),
-      [
-        {
-          location: posixResolve("fixtures", "lerna", "packages", "a"),
-          package: { name: "@lerna/a", private: true },
-        },
-        {
-          location: posixResolve("fixtures", "lerna", "packages", "b"),
-          package: { name: "@lerna/b", private: true },
-        },
-      ],
-    );
-
     assert.deepStrictEqual(
       cache.root,
       new Map([