actionspack 0.1.3 → 0.1.5

package/README.md

@@ -76,6 +76,19 @@ git diff
 Review the dependency SHA changes in `.github/workflow.lock.yml` and the
 resulting generated workflow changes before committing.
 
+### VS Code
+
+Generated workflows should not be edited by hand. Consider marking them as
+read-only in your workspace settings:
+
+```json
+{
+  "files.readonlyInclude": {
+    ".github/workflows/*.yml": true
+  }
+}
+```
+
 ## Commands
 
 ```bash

package/dist/cli.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { a as why, f as scan, i as update, l as verify, r as tree, s as pack, t as diff } from "./commands-4KKgssQI.mjs";
+import { a as why, f as scan, i as update, l as verify, r as tree, s as pack, t as diff } from "./commands-BayB-wc-.mjs";
 import { styleText } from "node:util";
 import process from "node:process";
 import { cac } from "cac";
 //#region package.json
 var name = "actionspack";
-var version = "0.1.3";
+var version = "0.1.5";
 //#endregion
 //#region src/cli.ts
 const cli = cac(name);

package/dist/{commands-4KKgssQI.mjs → commands-BayB-wc-.mjs}

@@ -134,13 +134,11 @@ function evaluateStaticExpression(expr, values) {
 		const data = new Evaluator(expr, expressionContext(values)).evaluate();
 		return {
 			data,
-			text: dataLiteral(data),
+			text: valueLiteral(dataValue(data)),
 			truthy: truthy(data),
 			value: dataValue(data)
 		};
-	} catch {
-		return;
-	}
+	} catch {}
 }
 function hasValueForIndexAccess(expr, values) {
 	const key = indexAccessKey(expr);
@@ -213,9 +211,6 @@ function dataValue(value) {
 	if (value instanceof data.StringData) return value.value;
 	return null;
 }
-function dataLiteral(value) {
-	return valueLiteral(dataValue(value));
-}
 function replacementForIndexAccess(expr, values) {
 	if (!hasValueForIndexAccess(expr, values)) return;
 	const value = valueForIndexAccess(expr, values);
@@ -282,7 +277,7 @@ function simplifyFormatString(format, args) {
 		if (!rawIndex) return;
 		const arg = args[Number(rawIndex)];
 		if (!arg) return;
-		if (arg.static) nextFormat += escapeFormatLiteral(arg.static.data.coerceString());
+		if (arg.static) nextFormat += arg.static.data.coerceString().replaceAll("{", "{{").replaceAll("}", "}}");
 		else {
 			const nextIndex = nextArgs.push(arg.text) - 1;
 			nextFormat += `{${nextIndex}}`;
@@ -295,11 +290,9 @@ function simplifyFormatString(format, args) {
 		format: nextFormat
 	};
 }
-function escapeFormatLiteral(value) {
-	return value.replaceAll("{", "{{").replaceAll("}", "}}");
-}
 //#endregion
 //#region src/utils/yaml.ts
+const GENERATED_FILE_NOTICE = "# This file is generated by actionspack. Do not edit it manually.\n\n";
 function parseYamlMap(source, file) {
 	const value = parse(source);
 	if (!isRecord(value)) throw new TypeError(`${file} must contain a YAML mapping`);
@@ -313,7 +306,7 @@ function stringifyYaml(value) {
 	});
 }
 function stringifyWorkflowYaml(value) {
-	return formatWorkflowYaml(stringifyYaml(normalizeWorkflowYamlValue(value)));
+	return `${GENERATED_FILE_NOTICE}${formatWorkflowYaml(stringifyYaml(normalizeWorkflowYamlValue(value)))}`;
 }
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -330,7 +323,7 @@ function formatWorkflowYaml(source) {
 	let stepsIndent;
 	let stepItemIndent;
 	for (const line of lines) {
-		const indent = leadingSpaces(line);
+		const indent = line.length - line.trimStart().length;
 		const trimmed = line.trim();
 		const isTopLevelKey = indent === 0 && /^[\w-]+:/u.test(line);
 		if (stepsIndent !== void 0 && trimmed && indent <= stepsIndent) {
@@ -350,9 +343,6 @@ function formatWorkflowYaml(source) {
 	}
 	return `${output.join("\n")}\n`;
 }
-function leadingSpaces(value) {
-	return value.length - value.trimStart().length;
-}
 function pushBlankLine(lines) {
 	if (lines.length > 0 && lines.at(-1) !== "") lines.push("");
 }
@@ -367,7 +357,7 @@ function normalizeWorkflowYamlValue(value) {
 //#region src/optimizer.ts
 function optimizeJob(job) {
 	const next = { ...job };
-	if (isEmptyNeeds(next.needs)) delete next.needs;
+	if (Array.isArray(next.needs) && next.needs.length === 0) delete next.needs;
 	if (staticIfValue(next.if) === true) delete next.if;
 	return next;
 }
@@ -395,9 +385,6 @@ function staticIfValue(value) {
 	const trimmed = value.trim();
 	return staticIfExpression(expressionBody(trimmed) ?? trimmed);
 }
-function isEmptyNeeds(value) {
-	return Array.isArray(value) && value.length === 0;
-}
 //#endregion
 //#region src/utils/workflow-parser.ts
 const workflowParserEntry = fileURLToPath(import.meta.resolve("@actions/workflow-parser"));
@@ -405,7 +392,8 @@ const workflowParserDist = path.dirname(workflowParserEntry);
 let actionSchema;
 let workflowSchema;
 function parseWorkflowMap(source, file) {
-	return parseTemplateMap(WORKFLOW_ROOT, workflowSchemaForParser(), source, file);
+	workflowSchema ??= loadSchema("workflow-v1.0.min.json");
+	return parseTemplateMap(WORKFLOW_ROOT, workflowSchema, source, file);
 }
 function parseActionMap(source, file) {
 	return parseTemplateMap(ACTION_ROOT, actionSchemaForParser(), source, file);
@@ -448,10 +436,6 @@ function templateTokenToValue(token) {
 	if (isBasicExpression(token)) return token.toString();
 	return token.toJSON();
 }
-function workflowSchemaForParser() {
-	workflowSchema ??= loadSchema("workflow-v1.0.min.json");
-	return workflowSchema;
-}
 function actionSchemaForParser() {
 	actionSchema ??= loadSchema("action-v1.0.min.json");
 	return actionSchema;
@@ -479,13 +463,6 @@ async function fileExists(file) {
 async function readYamlFile(file) {
 	return parseYamlMap(await readFile(file, "utf8"), file);
 }
-async function readWorkflowFile(file) {
-	return parseWorkflowMap(await readFile(file, "utf8"), file);
-}
-async function writeYamlFile(file, value) {
-	await mkdir(path.dirname(file), { recursive: true });
-	await writeFile(file, stringifyYaml(value), "utf8");
-}
 async function discoverConfig(cwd, overrides = {}) {
 	const root = resolveCwd(cwd);
 	const configPath = path.join(root, "actionspack.yml");
@@ -508,7 +485,8 @@ async function discoverConfig(cwd, overrides = {}) {
 	} else config = await discoverDefaultConfig(root);
 	return {
 		...config,
-		...normalizeConfigOverrides(overrides)
+		...overrides.entries ? { entries: overrides.entries } : {},
+		...overrides.external ? { external: overrides.external } : {}
 	};
 }
 async function discoverDefaultConfig(root) {
@@ -525,31 +503,23 @@ async function discoverDefaultConfig(root) {
 		}))
 	};
 }
-function normalizeConfigOverrides(overrides) {
-	return {
-		...overrides.entries ? { entries: overrides.entries } : {},
-		...overrides.external ? { external: overrides.external } : {}
-	};
-}
 function normalizeStringList(value) {
 	if (typeof value === "string") return [value];
 	if (!Array.isArray(value)) return [];
 	return value.filter((item) => typeof item === "string");
 }
-function readWorkflowEntry(root, entry) {
-	return readWorkflowFile(path.join(root, entry.source));
+async function readWorkflowEntry(root, entry) {
+	const file = path.join(root, entry.source);
+	return parseWorkflowMap(await readFile(file, "utf8"), file);
 }
-function emptyLockfile() {
-	return {
+async function readLockfile(cwd) {
+	const root = resolveCwd(cwd);
+	const file = path.join(root, LOCKFILE_PATH);
+	if (!await fileExists(file)) return {
 		lockfileVersion: 1,
 		entries: {},
 		packages: {}
 	};
-}
-async function readLockfile(cwd) {
-	const root = resolveCwd(cwd);
-	const file = path.join(root, LOCKFILE_PATH);
-	if (!await fileExists(file)) return emptyLockfile();
 	const value = await readYamlFile(file);
 	return {
 		lockfileVersion: 1,
@@ -558,7 +528,9 @@ async function readLockfile(cwd) {
 	};
 }
 async function writeLockfile(cwd, lockfile) {
-	await writeYamlFile(path.join(resolveCwd(cwd), LOCKFILE_PATH), lockfile);
+	const file = path.join(resolveCwd(cwd), LOCKFILE_PATH);
+	await mkdir(path.dirname(file), { recursive: true });
+	await writeFile(file, `${GENERATED_FILE_NOTICE}${stringifyYaml(lockfile)}`, "utf8");
 }
 async function writeWorkflow(cwd, output, workflow) {
 	const file = path.join(resolveCwd(cwd), output);
@@ -586,7 +558,7 @@ var HttpGitHubClient = class {
 			ref
 		];
 		for (const candidate of candidates) {
-			const sha = (await this.#request(`/repos/${owner}/${repo}/git/ref/${candidate}`))?.object?.sha;
+			const sha = (await this.#request(`/repos/${owner}/${repo}/git/ref/${candidate}`, true))?.object?.sha;
 			if (sha) return sha;
 		}
 		throw new Error(`Unable to resolve ${owner}/${repo}@${ref}`);
@@ -595,7 +567,8 @@ var HttpGitHubClient = class {
 		const cacheFile = this.#cacheFile(owner, repo, ref, filePath);
 		const cached = await readFile(cacheFile, "utf8").catch(() => void 0);
 		if (cached !== void 0) return cached;
-		const response = await this.#request(`/repos/${owner}/${repo}/contents/${encodeURIComponentPath(filePath)}?ref=${ref}`, true);
+		const encodedPath = filePath.split("/").map(encodeURIComponent).join("/");
+		const response = await this.#request(`/repos/${owner}/${repo}/contents/${encodedPath}?ref=${ref}`, true);
 		if (!response) return;
 		if (response.encoding !== "base64" || typeof response.content !== "string") throw new Error(`Unexpected GitHub content response for ${owner}/${repo}/${filePath}@${ref}`);
 		const content = Buffer.from(response.content, "base64").toString("utf8");
@@ -619,15 +592,9 @@ var HttpGitHubClient = class {
 		return await response.json();
 	}
 };
-function encodeURIComponentPath(filePath) {
-	return filePath.split("/").map(encodeURIComponent).join("/");
-}
 //#endregion
 //#region src/utils/ref.ts
 const REMOTE_USES_RE = /^[\w.-]+\/[\w.-]+(?:\/[^@\s]+)?@[^@\s]+$/;
-function packageKey(owner, repo, path) {
-	return path && path !== "." ? `github:${owner}/${repo}/${path}` : `github:${owner}/${repo}`;
-}
 function isRemoteUses(value) {
 	return typeof value === "string" && REMOTE_USES_RE.test(value);
 }
@@ -649,7 +616,7 @@ function parseRemoteUses(value, kind = "action") {
 		repo,
 		path,
 		ref,
-		package: packageKey(owner, repo, path),
+		package: path && path !== "." ? `github:${owner}/${repo}/${path}` : `github:${owner}/${repo}`,
 		kind: inferredKind
 	};
 }
@@ -907,7 +874,7 @@ function substituteString(value, values) {
 	if (!expression) return value;
 	try {
 		const expr = parseExpression(expression);
-		const replacement = directReplacement(expr, values);
+		const replacement = valueForIndexAccess(expr, values);
 		if (replacement !== void 0) return replacement;
 		const evaluated = staticExpression(expr, values);
 		if (evaluated) return evaluated.value;
@@ -951,9 +918,6 @@ function findToken(token, path) {
 		return Number.isInteger(index) ? findToken(token.get(index), rest) : void 0;
 	}
 }
-function directReplacement(expr, values) {
-	return valueForIndexAccess(expr, values);
-}
 //#endregion
 //#region src/pack.ts
 async function pack(options = {}) {
@@ -1236,7 +1200,8 @@ async function why(packageName, options = {}) {
 	if (matches.size === 0) throw new Error(`Package is not in the lockfile: ${packageName}`);
 	const paths = [];
 	for (const [source, entry] of Object.entries(lockfile.entries)) for (const dependency of entry.dependencies) collectWhyPaths(lockfile, dependency, matches, [source], paths);
-	const output = paths.length === 0 ? `${packageName} is not reachable\n` : `${packageName} is used by:\n\n${paths.map(formatPath).join("\n\n")}\n`;
+	let output = `${packageName} is not reachable\n`;
+	if (paths.length > 0) output = `${packageName} is used by:\n\n${paths.map((path) => path.map((item, index) => `${"   ".repeat(index)}${index === 0 ? item : `└─ ${item}`}`).join("\n")).join("\n\n")}\n`;
 	options.stdout?.write(output);
 	return output;
 }
@@ -1279,9 +1244,6 @@ function collectWhyPaths(lockfile, dependency, matches, current, paths) {
 	if (matches.has(dependency.package)) paths.push(next);
 	item?.dependencies.forEach((child) => collectWhyPaths(lockfile, child, matches, next, paths));
 }
-function formatPath(path) {
-	return path.map((item, index) => `${"   ".repeat(index)}${index === 0 ? item : `└─ ${item}`}`).join("\n");
-}
 async function readHeadLockfile(cwd) {
 	try {
 		const { stdout } = await execFileAsync("git", ["show", `HEAD:${LOCKFILE_PATH}`], { cwd });

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as why, c as packWorkflow, d as collectWorkflowDependencies, f as scan, i as update, l as verify, n as diffLockfiles, o as assertNoRemoteUses, r as tree, s as pack, t as diff, u as collectStepDependencies } from "./commands-4KKgssQI.mjs";
+import { a as why, c as packWorkflow, d as collectWorkflowDependencies, f as scan, i as update, l as verify, n as diffLockfiles, o as assertNoRemoteUses, r as tree, s as pack, t as diff, u as collectStepDependencies } from "./commands-BayB-wc-.mjs";
 export { assertNoRemoteUses, collectStepDependencies, collectWorkflowDependencies, diff, diffLockfiles, pack, packWorkflow, scan, tree, update, verify, why };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "actionspack",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Lockfile-first GitHub Actions workflow packer",
   "author": "Kevin Deng <sxzz@sxzz.moe>",
   "license": "MIT",
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@sxzz/eslint-config": "^8.1.0",
     "@sxzz/prettier-config": "^2.3.1",
-    "@types/node": "^25.9.0",
+    "@types/node": "^25.9.1",
     "@typescript/native-preview": "7.0.0-dev.20260519.1",
     "bumpp": "^11.1.0",
     "eslint": "^10.4.0",