fix: wrong generated paths for root commands

carloscortonc · Sep 20, 2023 · 220ab33 · 220ab33
1 parent 4ce969c
commit 220ab33
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/cli-utils.ts b/src/cli-utils.ts
@@ -371,10 +371,10 @@ export async function executeScript({ location, options }: Omit<ParsingOutput, "
       const isDefaultImport = index === list.length - 1;
       const locationPaths = [];
       // Include index import
-      locationPaths.push(path.join(...location.slice(0, index), "index"));
+      locationPaths.push(path.join(...finalLocation.slice(0, index), "index"));
       if (index > 0) {
         // Include location-name import
-        locationPaths.push(path.join(...location.slice(0, index)));
+        locationPaths.push(path.join(...finalLocation.slice(0, index)));
       } else {
         // Include entryfile-name import
         locationPaths.push(entryFile.name);

diff --git a/test/cli-utils.test.ts b/test/cli-utils.test.ts
@@ -569,6 +569,21 @@ describe("executeScript", () => {
     ]);
     pathListSpy.mockRestore();
   });
+  it("Generates all valid paths with the corresponding named/default import - single command", () => {
+    const c = new Cli(definition, { baseScriptLocation: "/" });
+    const pathListSpy = jest.spyOn(fs, "existsSync").mockImplementation(() => false);
+    executeScript({ location: ["gcmd"], options: {} as any }, c.options);
+    const norm = (p: string) => p.replace(/\//g, path.sep);
+    expect(pathListSpy.mock.calls).toEqual([
+      [norm("/commands/gcmd/index.js")],
+      [norm("/commands/gcmd.js")],
+      [norm("/commands/index.js")],
+      [norm("/commands.js")],
+      [norm("/index.js")],
+      [norm("/script.js")],
+    ]);
+    pathListSpy.mockRestore();
+  });
   it("Script execution fails: logs error", () => {
     (gcmd as any).mockImplementation(() => {
       throw new Error("errormessage");