@chris-lally/cli 0.1.0-alpha.29 → 0.1.0-alpha.35

package/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2026 Christopher Lally (https://github.com/chrislally)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -6,11 +6,17 @@ CLI for `@chris-lally/cli`.
 
 ## Install
 
+### Prerequisites
+
+- Node.js 20+
+- npm 10+ (or pnpm/yarn/bun)
+- git (for sync workflows)
+
 ```bash
 pnpm add -D @chris-lally/cli
 ```
 
-or run with `pnpm dlx`:
+or run without install:
 
 ```bash
 pnpm dlx @chris-lally/cli@alpha --help

package/dist/bin/lally.js

@@ -148,8 +148,8 @@ echo "Ensured database exists: $DB_NAME"
         const scripts = packageJson.scripts ?? {};
         scripts["db:create:local"] = scripts["db:create:local"] ?? "dotenv -e .env -- bash ./db/scripts/create-local-db.sh";
         scripts["db:migrate:local"] = scripts["db:migrate:local"] ?? `dotenv -e .env -- sh -c 'psql "$DATABASE_URL" -v ON_ERROR_STOP=1 -f db/migrations/tables.sql'`;
-        scripts["db:reset:local"] = scripts["db:reset:local"] ?? `dotenv -e .env -- sh -c 'psql "$DATABASE_URL" -v ON_ERROR_STOP=1 -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"' && pnpm run db:migrate:local`;
-        scripts["db:setup:local"] = scripts["db:setup:local"] ?? "pnpm run db:create:local && pnpm run db:migrate:local";
+        scripts["db:reset:local"] = scripts["db:reset:local"] ?? `dotenv -e .env -- sh -c 'psql "$DATABASE_URL" -v ON_ERROR_STOP=1 -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"' && npm run db:migrate:local`;
+        scripts["db:setup:local"] = scripts["db:setup:local"] ?? "npm run db:create:local && npm run db:migrate:local";
         packageJson.scripts = scripts;
         const devDependencies = packageJson.devDependencies ?? {};
         if (!devDependencies["dotenv-cli"])
@@ -201,7 +201,7 @@ echo "Seed complete"
       if (packageJson) {
         const scripts = packageJson.scripts ?? {};
         scripts["db:seed:local"] = scripts["db:seed:local"] ?? "dotenv -e .env -- bash ./db/scripts/seed-local.sh";
-        scripts["db:setup-and-seed:local"] = scripts["db:setup-and-seed:local"] ?? "pnpm run db:setup:local && pnpm run db:seed:local";
+        scripts["db:setup-and-seed:local"] = scripts["db:setup-and-seed:local"] ?? "npm run db:setup:local && npm run db:seed:local";
         packageJson.scripts = scripts;
         const devDependencies = packageJson.devDependencies ?? {};
         if (!devDependencies["dotenv-cli"])
@@ -553,9 +553,11 @@ export default [];
         (0, exec_1.ensureOk)((0, exec_1.runCommand)("bash", ["-lc", `rsync -a --delete --exclude ".git/" "${exportedPrefix}/" "${cloneDir}/"`], repoRoot), "rsync snapshot");
         await normalizeStandalonePackage(cloneDir, target.remoteUrl);
         if (releaseVersion) {
+          const packageJsonRelativePath = target.versionPath ?? "package.json";
+          const packageJsonPath = (0, node_path_1.resolve)(cloneDir, packageJsonRelativePath);
           const setVersion = (0, exec_1.runCommand)("node", [
             "-e",
-            `const fs=require('fs');const p='${cloneDir.replaceAll("'", "'\\''")}/package.json';const v='${releaseVersion}';const j=JSON.parse(fs.readFileSync(p,'utf8'));j.version=v;fs.writeFileSync(p,JSON.stringify(j,null,2)+'\\n');`
+            `const fs=require('fs');const p='${packageJsonPath.replaceAll("'", "'\\''")}';const v='${releaseVersion}';const j=JSON.parse(fs.readFileSync(p,'utf8'));j.version=v;fs.writeFileSync(p,JSON.stringify(j,null,2)+'\\n');`
           ], repoRoot);
           (0, exec_1.ensureOk)(setVersion, "set package version");
         }
@@ -680,7 +682,11 @@ var require_handlers = __commonJS({
       throw new Error(`Unsupported package version for alpha release: ${current}`);
     }
     async function resolveVersionTarget(repoRoot, target) {
-      const candidates = [(0, node_path_1.resolve)(repoRoot, target.prefix, "packages/cli/package.json"), (0, node_path_1.resolve)(repoRoot, target.prefix, "package.json")];
+      const candidates = [
+        ...target.versionPath ? [(0, node_path_1.resolve)(repoRoot, target.prefix, target.versionPath)] : [],
+        (0, node_path_1.resolve)(repoRoot, target.prefix, "packages/cli/package.json"),
+        (0, node_path_1.resolve)(repoRoot, target.prefix, "package.json")
+      ];
       for (const packageJsonPath of candidates) {
         if (!(0, node_fs_1.existsSync)(packageJsonPath))
           continue;
@@ -1214,11 +1220,17 @@ CLI for \`${params.packageName}\`.
 
 ## Install
 
+### Prerequisites
+
+- Node.js 20+
+- npm 10+ (or pnpm/yarn/bun)
+- git (for sync workflows)
+
 \`\`\`bash
 pnpm add -D ${params.packageName}
 \`\`\`
 
-or run with \`pnpm dlx\`:
+or run without install:
 
 \`\`\`bash
 pnpm dlx ${params.packageName}@alpha --help
@@ -2882,6 +2894,54 @@ var require_commands4 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.runOpensrcCommand = runOpensrcCommand2;
     var node_child_process_1 = require("child_process");
+    function hasCommand(command) {
+      try {
+        const result = (0, node_child_process_1.spawnSync)(command, ["--version"], { stdio: "ignore", env: process.env });
+        return result.status === 0 && !result.error;
+      } catch {
+        return false;
+      }
+    }
+    function resolveOpenSrcRunner() {
+      const forced = (process.env.LALLY_PM ?? "").trim().toLowerCase();
+      if (forced === "pnpm" && hasCommand("pnpm"))
+        return { command: "pnpm", prefixArgs: ["dlx", "opensrc"] };
+      if (forced === "npm" && hasCommand("npm"))
+        return { command: "npm", prefixArgs: ["exec", "--yes", "opensrc"] };
+      if (forced === "yarn" && hasCommand("yarn"))
+        return { command: "yarn", prefixArgs: ["dlx", "opensrc"] };
+      if (forced === "bun" && hasCommand("bunx"))
+        return { command: "bunx", prefixArgs: ["opensrc"] };
+      if (forced)
+        throw new Error(`LALLY_PM is set to '${forced}', but the command is not available.`);
+      if (hasCommand("pnpm"))
+        return { command: "pnpm", prefixArgs: ["dlx", "opensrc"] };
+      if (hasCommand("npm"))
+        return { command: "npm", prefixArgs: ["exec", "--yes", "opensrc"] };
+      if (hasCommand("yarn"))
+        return { command: "yarn", prefixArgs: ["dlx", "opensrc"] };
+      if (hasCommand("bunx"))
+        return { command: "bunx", prefixArgs: ["opensrc"] };
+      throw new Error("No supported package manager runtime found. Install pnpm, npm, yarn, or bun.");
+    }
+    function parseModifyFlag(argv) {
+      for (let i = 0; i < argv.length; i += 1) {
+        const token = argv[i];
+        if (!token)
+          continue;
+        if (token === "--modify") {
+          const next = argv[i + 1];
+          if (next && !next.startsWith("--")) {
+            return next;
+          }
+          return true;
+        }
+        if (token.startsWith("--modify=")) {
+          return token.slice("--modify=".length);
+        }
+      }
+      return void 0;
+    }
     function getPositionalArgs(argv) {
       const positional = [];
       for (let i = 0; i < argv.length; i += 1) {
@@ -2889,6 +2949,12 @@ var require_commands4 = __commonJS({
         if (!token)
           continue;
         if (token.startsWith("--")) {
+          if (token === "--modify" || token.startsWith("--modify=")) {
+            const next2 = argv[i + 1];
+            if (token === "--modify" && next2 && !next2.startsWith("--"))
+              i += 1;
+            continue;
+          }
           if (token.includes("="))
             continue;
           const next = argv[i + 1];
@@ -2903,6 +2969,8 @@ var require_commands4 = __commonJS({
     function runOpensrc(commandArgs, modifyFlag) {
       if (modifyFlag === true) {
         commandArgs.push("--modify");
+      } else if (modifyFlag === false) {
+        commandArgs.push("--modify=false");
       } else if (typeof modifyFlag === "string") {
         const normalized = modifyFlag.trim().toLowerCase();
         if (normalized === "true" || normalized === "false") {
@@ -2911,23 +2979,25 @@ var require_commands4 = __commonJS({
           throw new Error("Invalid --modify value. Use --modify, --modify=true, or --modify=false.");
         }
       }
-      const result = (0, node_child_process_1.spawnSync)("pnpm", commandArgs, {
+      const runner = resolveOpenSrcRunner();
+      const result = (0, node_child_process_1.spawnSync)(runner.command, [...runner.prefixArgs, ...commandArgs], {
         cwd: process.cwd(),
         env: process.env,
         stdio: "inherit"
       });
       if (result.error) {
-        throw new Error(`Failed to run opensrc via pnpm dlx: ${result.error.message}`);
+        throw new Error(`Failed to run opensrc: ${result.error.message}`);
       }
       if (result.status !== 0) {
         throw new Error(`opensrc exited with status ${result.status ?? 1}`);
       }
     }
     function runOpensrcCommand2(argsAfterItem, modifyFlag) {
+      const effectiveModifyFlag = modifyFlag ?? parseModifyFlag(argsAfterItem) ?? false;
       const positional = getPositionalArgs(argsAfterItem);
       const first = positional[0];
       if (first === "list") {
-        runOpensrc(["dlx", "opensrc", "list"], modifyFlag);
+        runOpensrc(["list"], effectiveModifyFlag);
         return;
       }
       if (first === "remove") {
@@ -2935,13 +3005,13 @@ var require_commands4 = __commonJS({
         if (targets.length === 0) {
           throw new Error("Missing remove target(s). Usage: lally opensrc remove <target...>");
         }
-        runOpensrc(["dlx", "opensrc", "remove", ...targets], modifyFlag);
+        runOpensrc(["remove", ...targets], effectiveModifyFlag);
         return;
       }
       if (positional.length === 0) {
         throw new Error("Missing opensrc target(s). Usage: lally opensrc fetch <target...> | lally opensrc list | lally opensrc remove <target...>");
       }
-      runOpensrc(["dlx", "opensrc", ...positional], modifyFlag);
+      runOpensrc([...positional], effectiveModifyFlag);
     }
   }
 });
@@ -3159,6 +3229,84 @@ var require_exec2 = __commonJS({
   }
 });
 
+// ../npm/dist/commands/release/package-manager.js
+var require_package_manager = __commonJS({
+  "../npm/dist/commands/release/package-manager.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.resolvePackageManager = resolvePackageManager;
+    exports2.formatRunScriptCommand = formatRunScriptCommand;
+    exports2.runPackageScript = runPackageScript;
+    var node_fs_1 = require("fs");
+    var node_path_1 = require("path");
+    var node_child_process_1 = require("child_process");
+    var exec_1 = require_exec2();
+    var PREFERRED_ORDER = ["pnpm", "npm", "yarn", "bun"];
+    function hasCommand(command) {
+      try {
+        const child = (0, node_child_process_1.spawnSync)(command, ["--version"], {
+          stdio: "ignore",
+          env: process.env
+        });
+        return child.status === 0 && !child.error;
+      } catch {
+        return false;
+      }
+    }
+    function resolvePreferredByLockfile(repoRoot) {
+      if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(repoRoot, "pnpm-lock.yaml")))
+        return "pnpm";
+      if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(repoRoot, "package-lock.json")))
+        return "npm";
+      if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(repoRoot, "yarn.lock")))
+        return "yarn";
+      if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(repoRoot, "bun.lockb")) || (0, node_fs_1.existsSync)((0, node_path_1.resolve)(repoRoot, "bun.lock")))
+        return "bun";
+      return null;
+    }
+    function resolvePackageManager(repoRoot) {
+      const forced = (process.env.LALLY_PM ?? "").trim().toLowerCase();
+      if (forced === "pnpm" || forced === "npm" || forced === "yarn" || forced === "bun") {
+        if (hasCommand(forced))
+          return forced;
+        throw new Error(`LALLY_PM is set to '${forced}', but that command is not available.`);
+      }
+      const fromLockfile = resolvePreferredByLockfile(repoRoot);
+      if (fromLockfile && hasCommand(fromLockfile))
+        return fromLockfile;
+      for (const candidate of PREFERRED_ORDER) {
+        if (hasCommand(candidate))
+          return candidate;
+      }
+      throw new Error("No supported package manager found. Install one of: pnpm, npm, yarn, bun.");
+    }
+    function formatRunScriptCommand(pm, script, cwd) {
+      if (pm === "pnpm")
+        return `pnpm --dir ${cwd} run ${script}`;
+      if (pm === "npm")
+        return `npm --prefix ${cwd} run ${script}`;
+      if (pm === "yarn")
+        return `yarn --cwd ${cwd} run ${script}`;
+      return `bun run ${script} (cwd=${cwd})`;
+    }
+    function runPackageScript(pm, script, packageDir, repoRoot, env) {
+      if (pm === "pnpm") {
+        (0, exec_1.runOrThrow)("pnpm", ["--dir", packageDir, "run", script], repoRoot, env);
+        return;
+      }
+      if (pm === "npm") {
+        (0, exec_1.runOrThrow)("npm", ["--prefix", packageDir, "run", script], repoRoot, env);
+        return;
+      }
+      if (pm === "yarn") {
+        (0, exec_1.runOrThrow)("yarn", ["--cwd", packageDir, "run", script], repoRoot, env);
+        return;
+      }
+      (0, exec_1.runOrThrow)("bun", ["run", script], packageDir, env);
+    }
+  }
+});
+
 // ../npm/dist/commands/release/version.js
 var require_version = __commonJS({
   "../npm/dist/commands/release/version.js"(exports2) {
@@ -3203,6 +3351,7 @@ var require_release = __commonJS({
     var args_1 = require_args2();
     var env_1 = require_env();
     var exec_1 = require_exec2();
+    var package_manager_1 = require_package_manager();
     var version_1 = require_version();
     function resolveTargetDir(repoRoot, target) {
       if (target === "fumadocs")
@@ -3229,6 +3378,7 @@ var require_release = __commonJS({
       const json = (0, args_1.hasFlag)(flags, "json");
       const repoRoot = (0, env_1.findRepoRoot)(process.cwd());
       await (0, env_1.loadRootEnv)(repoRoot);
+      const packageManager = (0, package_manager_1.resolvePackageManager)(repoRoot);
       const packageDir = resolveTargetDir(repoRoot, target);
       const packageJsonPath = (0, node_path_1.resolve)(packageDir, "package.json");
       const originalPackageJsonText = await (0, promises_1.readFile)(packageJsonPath, "utf8");
@@ -3259,9 +3409,9 @@ var require_release = __commonJS({
           tag,
           commands: [
             target === "cli" ? "lally repo readme --target cli" : null,
-            `pnpm -C ${packageDir} run build`,
-            packageJson.scripts?.["check-types"] ? `pnpm -C ${packageDir} run check-types` : null,
-            packageJson.scripts?.["test"] ? `pnpm -C ${packageDir} run test` : null,
+            (0, package_manager_1.formatRunScriptCommand)(packageManager, "build", packageDir),
+            packageJson.scripts?.["check-types"] ? (0, package_manager_1.formatRunScriptCommand)(packageManager, "check-types", packageDir) : null,
+            packageJson.scripts?.["test"] ? (0, package_manager_1.formatRunScriptCommand)(packageManager, "test", packageDir) : null,
             `npm publish --tag ${tag} --access public`
           ].filter(Boolean)
         };
@@ -3290,12 +3440,12 @@ var require_release = __commonJS({
         if (target === "cli") {
           await (0, cli_repo_1.runRepoReadmeCommand)(["--target", "cli"]);
         }
-        (0, exec_1.runOrThrow)("pnpm", ["-C", packageDir, "run", "build"], repoRoot, auth.commandEnv);
+        (0, package_manager_1.runPackageScript)(packageManager, "build", packageDir, repoRoot, auth.commandEnv);
         if (packageJson.scripts?.["check-types"]) {
-          (0, exec_1.runOrThrow)("pnpm", ["-C", packageDir, "run", "check-types"], repoRoot, auth.commandEnv);
+          (0, package_manager_1.runPackageScript)(packageManager, "check-types", packageDir, repoRoot, auth.commandEnv);
         }
         if (packageJson.scripts?.["test"]) {
-          (0, exec_1.runOrThrow)("pnpm", ["-C", packageDir, "run", "test"], repoRoot, auth.commandEnv);
+          (0, package_manager_1.runPackageScript)(packageManager, "test", packageDir, repoRoot, auth.commandEnv);
         }
         if (!process.env.NPM_TOKEN) {
           console.warn("NPM_TOKEN is not set.");