@kici-dev/compiler 0.1.17 → 0.1.19

package/dist/cli.js

@@ -6,7 +6,7 @@ import { resolve } from "node:path";
 import { Argument, Command, Option } from "commander";
 import pc from "picocolors";
 //#region src/cli.ts
-const version = "0.1.17";
+const version = "0.1.19";
 /**
 * Build the kici Commander program with every command registered. Exported so
 * the surface registry can walk the real command tree without parsing argv (no

package/dist/commands/compile.js

@@ -12,6 +12,7 @@ import pc from "picocolors";
 import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
 import { logger, toErrorMessage } from "@kici-dev/core";
+import { PackageManager, detectPackageManagerSync } from "@kici-dev/core/package-manager";
 import { execSync } from "node:child_process";
 //#region src/commands/compile.ts
 /**
@@ -26,22 +27,21 @@ async function readExistingLockfileHash(lockPath) {
 	}
 }
 /**
-* Reinstall dependencies in .kici/ using npm.
+* Reinstall dependencies in .kici/ using the project's package manager.
+*
+* Detects the manager from `.kici/` (pnpm-lock.yaml / yarn.lock /
+* package-lock.json) so a standalone-pnpm or -yarn `.kici` is reinstalled with
+* the right tool — running `npm ci` against a pnpm lock fails, and against a
+* stale npm lock left beside a pnpm lock it fails even harder.
 */
 async function reinstallDeps(kiciDir) {
-	if (existsSync(path.join(kiciDir, "package-lock.json"))) {
-		logger.info("Running " + pc.cyan("npm ci") + ` in ${kiciDir}`);
-		execSync("npm ci", {
-			cwd: kiciDir,
-			stdio: "inherit"
-		});
-	} else {
-		logger.info("Running " + pc.cyan("npm install") + ` in ${kiciDir}`);
-		execSync("npm install", {
-			cwd: kiciDir,
-			stdio: "inherit"
-		});
-	}
+	const pm = detectPackageManagerSync(kiciDir);
+	const command = pm === PackageManager.Pnpm ? "pnpm install" : pm === PackageManager.Yarn ? "yarn install" : existsSync(path.join(kiciDir, "package-lock.json")) ? "npm ci" : "npm install";
+	logger.info("Running " + pc.cyan(command) + ` in ${kiciDir}`);
+	execSync(command, {
+		cwd: kiciDir,
+		stdio: "inherit"
+	});
 }
 /**
 * Execute the compile command.

package/dist/commands/test.js

@@ -10,7 +10,8 @@ import path from "node:path";
 import pc from "picocolors";
 import { readFile } from "node:fs/promises";
 import { logger, toErrorMessage } from "@kici-dev/core";
-import { matchAllWorkflows, normalizeRunsOn } from "@kici-dev/engine";
+import { matchAllWorkflows } from "@kici-dev/engine";
+import { normalizeRunsOnToMatchers } from "@kici-dev/engine/labels/compile";
 //#region src/commands/test.ts
 /**
 * Main test command entry point.
@@ -136,10 +137,7 @@ function workflowsToLockFormat(workflows) {
 			return {
 				_type: "static",
 				name: j.name,
-				runsOn: typeof j.runsOn === "string" || Array.isArray(j.runsOn) ? j.runsOn : (() => {
-					const n = normalizeRunsOn(j.runsOn);
-					return n.labels.length === 1 ? n.labels[0] : n.labels;
-				})(),
+				runsOn: j.runsOn === void 0 ? [] : normalizeRunsOnToMatchers(j.runsOn, `job '${j.name}' runsOn`).include,
 				needs: j.needs?.map((n) => {
 					if (typeof n === "string") return n;
 					if ("name" in n) return n.name;