@moku-labs/ci 1.2.1 → 1.2.2

package/dist/release.mjs

@@ -774,16 +774,34 @@ function parseManifest(text) {
 async function readManifest(files) {
 	return parseManifest(await files.read(MANIFEST_PATH));
 }
+/** Any character outside printable ASCII and the JSON whitespace. */
+const NON_ASCII = /[^\t\n\r -~]/;
+/**
+* Whether a text holds only ASCII characters, i.e. every other character is `\uXXXX`-escaped.
+*
+* @param text - The file contents to test.
+* @returns `true` when no raw non-ASCII character is present.
+* @example
+* isAsciiOnly('{"description":"a \\u2014 b"}'); // true
+*/
+function isAsciiOnly(text) {
+	return !NON_ASCII.test(text);
+}
 /**
 * Render a manifest the way npm itself writes one: two-space JSON with a trailing newline.
+* A source file that was ASCII-only stays ASCII-only, so an escaped dash the package chose
+* does not show up as a changed line in the diff.
 *
 * @param manifest - The manifest to serialize.
+* @param source - The file contents the manifest was read from, when there were any.
 * @returns The file contents to write.
 * @example
-* await files.write("package.json", formatManifest(manifest));
+* await files.write("package.json", formatManifest(manifest, source));
 */
-function formatManifest(manifest) {
-	return `${JSON.stringify(manifest, void 0, 2)}\n`;
+function formatManifest(manifest, source) {
+	const text = `${JSON.stringify(manifest, void 0, 2)}\n`;
+	if (source === void 0 || !isAsciiOnly(source)) return text;
+	return text.replaceAll(new RegExp(NON_ASCII, "g"), (character) => String.raw`\u${character.codePointAt(0)?.toString(16).padStart(4, "0")}`);
 }
 /**
 * The repository URL a manifest declares, in either the object or shorthand string form.
@@ -2097,9 +2115,55 @@ async function ensurePrerequisites(setup) {
 	return true;
 }
 /**
+* Whether git already holds this exact file: tracked, and with no uncommitted change.
+*
+* @param setup - The wizard state.
+* @param path - Repo-relative path of the file.
+* @returns `true` when `git checkout -- <path>` would bring the current content back.
+* @example
+* await isCommittedUnchanged(setup, ".github/workflows/ci.yml");
+*/
+async function isCommittedUnchanged(setup, path) {
+	if ((await setup.ctx.exec.capture("git", [
+		"ls-files",
+		"--error-unmatch",
+		path
+	])).code !== 0) return false;
+	const status = await setup.ctx.exec.capture("git", [
+		"status",
+		"--porcelain",
+		"--",
+		path
+	]);
+	return status.code === 0 && status.stdout.trim() === "";
+}
+/**
+* Ask before replacing an existing workflow, and keep the original: in git when it is
+* committed and unmodified, in a `.bak` copy otherwise.
+*
+* @param setup - The wizard state.
+* @param template - The central workflow about to be written.
+* @param existing - The current contents of the file.
+* @returns `true` when the caller may write the template now.
+* @example
+* if (!(await clearExistingWorkflow(setup, template, existing))) continue;
+*/
+async function clearExistingWorkflow(setup, template, existing) {
+	const kind = isThinWorkflow(existing, template) ? "differs" : "is a legacy workflow";
+	const committed = await isCommittedUnchanged(setup, template.path);
+	const safety = committed ? "git keeps the original" : "a .bak copy is kept";
+	if (!await setup.prompts.confirm(`${template.path} ${kind}. Replace it (${safety})?`)) {
+		setup.ui.check(false, `${template.path} left unchanged`);
+		return false;
+	}
+	if (deferred(setup, `${committed ? "replace" : "back up and replace"} ${template.path}`)) return false;
+	if (!committed) await setup.ctx.files.backup(template.path);
+	return true;
+}
+/**
 * Write the two thin workflows. A file that already calls the pinned central workflow is
 * left alone; a differing file is only replaced after an explicit confirm, and a `.bak`
-* copy is kept.
+* copy is kept unless git already holds the original.
 *
 * @param setup - The wizard state.
 * @returns Nothing.
@@ -2114,15 +2178,7 @@ async function writeWorkflows(setup) {
 			setup.ui.check(true, `${template.path} up to date`);
 			continue;
 		}
-		if (existing !== void 0) {
-			const kind = isThinWorkflow(existing, template) ? "differs" : "is a legacy workflow";
-			if (!await setup.prompts.confirm(`${template.path} ${kind}. Replace it (a .bak copy is kept)?`)) {
-				setup.ui.check(false, `${template.path} left unchanged`);
-				continue;
-			}
-			if (deferred(setup, `back up and replace ${template.path}`)) continue;
-			await setup.ctx.files.backup(template.path);
-		} else if (deferred(setup, `write ${template.path}`)) continue;
+		if (!(existing === void 0 ? !deferred(setup, `write ${template.path}`) : await clearExistingWorkflow(setup, template, existing))) continue;
 		await setup.ctx.files.write(template.path, template.content);
 		setup.ui.check(true, `${template.path} written`);
 	}
@@ -2155,7 +2211,8 @@ async function normalizeContract(setup, manifest) {
 		return;
 	}
 	if (deferred(setup, `write package.json`)) return;
-	await setup.ctx.files.write(MANIFEST_PATH, formatManifest(next));
+	const source = await setup.ctx.files.read(MANIFEST_PATH);
+	await setup.ctx.files.write(MANIFEST_PATH, formatManifest(next, source));
 	setup.ui.check(true, `${MANIFEST_PATH} normalized`);
 }
 /**
@@ -2209,6 +2266,11 @@ async function firstPublish(setup, name, version) {
 */
 async function pushVersionTag(setup, version) {
 	setup.ui.heading("Tag");
+	const latest = latestVersionTag((await setup.ctx.exec.capture("git", [...LATEST_TAG_ARGS])).stdout);
+	if (latest !== void 0) {
+		setup.ui.check(true, `release tags exist, latest is ${latest}`);
+		return;
+	}
 	const tag = `v${version}`;
 	if ((await setup.ctx.exec.capture("git", [
 		"tag",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moku-labs/ci",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Central CI and release for the moku family: reusable workflows, caller examples and the moku-release CLI.",
   "type": "module",
   "sideEffects": [
@@ -56,8 +56,8 @@
     "lint:fix": "biome check --write . && eslint --fix .",
     "format": "biome format --write .",
     "test": "vitest run",
-    "release:setup": "moku-release setup",
-    "release:doctor": "moku-release doctor",
-    "release": "moku-release"
+    "release:setup": "bun run build && node dist/release.mjs setup",
+    "release:doctor": "bun run build && node dist/release.mjs doctor",
+    "release": "bun run build && node dist/release.mjs"
   }
 }