Merge pull request #18 from simple-frontend-dev/fix/exec-command

fix: exec command according to package manager

Author: jeremycolin

.changeset/rotten-rivers-juggle.md

@@ -0,0 +1,5 @@
+---
+"simplefrontend": minor
+---
+
+Fix exec command according to package manager

.github/workflows/quality-checks.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Run code quality lint check
         run: pnpm exec eslint --no-warn-ignored src
 
-      - name: Run integration tests
+      - name: Run tests
         run: pnpm run test
 
       - name: Build

src/templates/github-actions.ts

@@ -53,14 +53,18 @@ function getSetupSteps(agent: AgentName) {
 function getPrettierActionSetup(agent: AgentName) {
   return {
     name: "Run code quality format check",
-    run: `${getExecCommand(agent)} prettier --check --ignore-unknown src`,
+    run: getExecCommand(agent, "prettier", [
+      "--check",
+      "--ignore-unknown",
+      "src",
+    ]),
   };
 }
 
 function getEslintActionSetup(agent: AgentName) {
   return {
     name: "Run code quality lint check",
-    run: `${getExecCommand(agent)} eslint --no-warn-ignored src`,
+    run: getExecCommand(agent, "eslint", ["--no-warn-ignored", "src"]),
   };
 }
 

src/templates/lefthook.ts

@@ -8,8 +8,12 @@ function prettierPrePushHook(agent: AgentName) {
     format: {
       tags: "code-quality",
       // files: "git diff-tree --no-commit-id --name-only -r HEAD..origin/main",
-      // run: `${getExecCommand(agent)} prettier --check --ignore-unknown {files}`,
-      run: `${getExecCommand(agent)} prettier --check --ignore-unknown src`,
+      // run: getExecCommand(agent, "prettier", ["--check", "--ignore-unknown", "{files}"]),
+      run: getExecCommand(agent, "prettier", [
+        "--check",
+        "--ignore-unknown",
+        "src",
+      ]),
     },
   };
 }
@@ -19,8 +23,8 @@ function eslintPrePushHook(agent: AgentName) {
     lint: {
       tags: "code-quality",
       // files: "git diff-tree --no-commit-id --name-only -r HEAD..origin/main",
-      // run: `${getExecCommand(agent)} eslint --no-warn-ignored {files}`,
-      run: `${getExecCommand(agent)} eslint --no-warn-ignored src`,
+      // run: getExecCommand(agent, "eslint", ["--no-warn-ignored", "{files}"]),
+      run: getExecCommand(agent, "eslint", ["--no-warn-ignored", "src"]),
     },
   };
 }

src/integration-tests/npm.test.ts src/tests/npm.test.tssrc/integration-tests/npm.test.ts renamed to src/tests/npm.test.ts

@@ -0,0 +1,57 @@
+import { test, expect } from "vitest";
+import { getExecCommand } from "../utils/package-manager";
+
+test("getExecCommand for prettier with pnpm", () => {
+  const command = getExecCommand("pnpm", "prettier", [
+    "--check",
+    "--ignore-unknown",
+    "src",
+  ]);
+  expect(command).toBe("pnpm exec prettier --check --ignore-unknown src");
+});
+
+test("getExecCommand for prettier with npm", () => {
+  const command = getExecCommand("npm", "prettier", [
+    "--check",
+    "--ignore-unknown",
+    "src",
+  ]);
+  expect(command).toBe("npm exec prettier -- --check --ignore-unknown src");
+});
+
+test("getExecCommand for prettier with yarn", () => {
+  const command = getExecCommand("yarn", "prettier", [
+    "--check",
+    "--ignore-unknown",
+    "src",
+  ]);
+  expect(command).toBe("yarn exec prettier -- --check --ignore-unknown src");
+});
+
+test("getExecCommand for prettier with bun", () => {
+  const command = getExecCommand("bun", "prettier", [
+    "--check",
+    "--ignore-unknown",
+    "src",
+  ]);
+  expect(command).toBe("bunx prettier --check --ignore-unknown src");
+});
+
+test("getExecCommand for eslint with pnpm", () => {
+  const command = getExecCommand("pnpm", "eslint", ["--no-warn-ignore", "src"]);
+  expect(command).toBe("pnpm exec eslint --no-warn-ignore src");
+});
+
+test("getExecCommand for eslint with npm", () => {
+  const command = getExecCommand("npm", "eslint", ["--no-warn-ignore", "src"]);
+  expect(command).toBe("npm exec eslint -- --no-warn-ignore src");
+});
+test("getExecCommand for eslint with yarn", () => {
+  const command = getExecCommand("yarn", "eslint", ["--no-warn-ignore", "src"]);
+  expect(command).toBe("yarn exec eslint -- --no-warn-ignore src");
+});
+
+test("getExecCommand for eslint with bun", () => {
+  const command = getExecCommand("bun", "eslint", ["--no-warn-ignore", "src"]);
+  expect(command).toBe("bunx eslint --no-warn-ignore src");
+});

src/tests/package-manager.test.ts

@@ -41,12 +41,18 @@ function getExactArg(agent: AgentName) {
   }
 }
 
-export function getExecCommand(agent: AgentName) {
+export function getExecCommand(
+  agent: AgentName,
+  packageName: string,
+  args: string[],
+): string {
   switch (agent) {
     case "bun":
-      return "bunx";
+      return ["bunx", packageName, ...args].join(" ");
+    case "pnpm":
+      return ["pnpm", "exec", packageName, ...args].join(" ");
     default:
-      return `${agent} exec`;
+      return [agent, "exec", packageName, "--", ...args].join(" ");
   }
 }