Handle case where --project is not json

jakebailey · Feb 27, 2024 · f84ea8a · f84ea8a
1 parent cccc068
commit f84ea8a
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 0 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -10164,6 +10164,9 @@ function checkOverriddenFlags(args) {
       break;
     }
   }
+  if (configPath && !configPath.endsWith(".json")) {
+    configPath = path2.posix.join(configPath, "pyrightconfig.json");
+  }
   configPath ??= "pyrightconfig.json";
   let parsed;
   if (fs.existsSync(configPath)) {

diff --git a/src/__snapshots__/main.test.ts.snap b/src/__snapshots__/main.test.ts.snap
@@ -708,6 +708,91 @@ exports[`with overridden flags > explicit pyrightconfig.json bad json > process.
 ]
 `;
 
+exports[`with overridden flags > explicit pyrightconfig.json directory > command.issueCommand 1`] = `[]`;
+
+exports[`with overridden flags > explicit pyrightconfig.json directory > core.error 1`] = `[]`;
+
+exports[`with overridden flags > explicit pyrightconfig.json directory > core.info 1`] = `
+[
+  [
+    "pyright 1.1.240, node v20.8.1, pyright-action 1.1.0",
+  ],
+  [
+    "Working directory: /some/wd/is/deep",
+  ],
+  [
+    "Running: /path/to/node --pythonplatform --pythonversion --typeshedpath --venvpath --project /some/path/to",
+  ],
+]
+`;
+
+exports[`with overridden flags > explicit pyrightconfig.json directory > core.setFailed 1`] = `[]`;
+
+exports[`with overridden flags > explicit pyrightconfig.json directory > core.warning 1`] = `
+[
+  [
+    "/some/path/to/pyrightconfig.json contains { pythonPlatform: 'Linux' }; --pythonplatform as passed by pyright-action will have no effect.",
+  ],
+  [
+    "/some/path/to/pyrightconfig.json contains { pythonVersion: '3.9' }; --pythonversion as passed by pyright-action will have no effect.",
+  ],
+  [
+    "/some/path/to/pyrightconfig.json contains { typeshedPath: '/path/to/typeshed' }; --typeshedpath as passed by pyright-action will have no effect.",
+  ],
+  [
+    "/some/path/to/pyrightconfig.json contains { venvPath: '/path/to/venv' }; --venvpath as passed by pyright-action will have no effect.",
+  ],
+]
+`;
+
+exports[`with overridden flags > explicit pyrightconfig.json directory > cp.spawnSync 1`] = `
+[
+  [
+    "/path/to/node",
+    [
+      "--pythonplatform",
+      "--pythonversion",
+      "--typeshedpath",
+      "--venvpath",
+      "--project",
+      "/some/path/to",
+    ],
+    {
+      "stdio": [
+        "ignore",
+        "inherit",
+        "inherit",
+      ],
+    },
+  ],
+]
+`;
+
+exports[`with overridden flags > explicit pyrightconfig.json directory > fs.existsSync 1`] = `
+[
+  [
+    "/some/path/to/pyrightconfig.json",
+  ],
+]
+`;
+
+exports[`with overridden flags > explicit pyrightconfig.json directory > fs.readFileSync 1`] = `
+[
+  [
+    "/some/path/to/pyrightconfig.json",
+    "utf8",
+  ],
+]
+`;
+
+exports[`with overridden flags > explicit pyrightconfig.json directory > process.chdir 1`] = `
+[
+  [
+    "/some/wd/is/deep",
+  ],
+]
+`;
+
 exports[`with overridden flags > implicit pyrightconfig.json > command.issueCommand 1`] = `[]`;
 
 exports[`with overridden flags > implicit pyrightconfig.json > core.error 1`] = `[]`;

diff --git a/src/main.test.ts b/src/main.test.ts
@@ -347,6 +347,29 @@ describe("with overridden flags", () => {
         await main();
     });
 
+    test("explicit pyrightconfig.json directory", async () => {
+        mockedHelpers.getArgs.mockResolvedValue({
+            noComments: true,
+            workingDirectory: wd,
+            pyrightVersion,
+            args: [...flags, "--project", "/some/path/to"],
+        });
+
+        mockedFs.readFileSync.mockImplementation(
+            ((p) => {
+                expect(p).toBe("/some/path/to/pyrightconfig.json");
+                return configJSON;
+            }) as typeof fs.readFileSync,
+        );
+
+        mockedFs.existsSync.mockImplementation((p) => {
+            expect(p).toBe("/some/path/to/pyrightconfig.json");
+            return true;
+        });
+
+        await main();
+    });
+
     test("explicit pyrightconfig.json bad json", async () => {
         mockedHelpers.getArgs.mockResolvedValue({
             noComments: true,

diff --git a/src/main.ts b/src/main.ts
@@ -157,6 +157,11 @@ function checkOverriddenFlags(args: readonly string[]) {
             break;
         }
     }
+
+    if (configPath && !configPath.endsWith(".json")) {
+        configPath = path.posix.join(configPath, "pyrightconfig.json");
+    }
+
     configPath ??= "pyrightconfig.json";
 
     let parsed: unknown;