@elmeragroup/internal 0.2.0-canary.1 → 0.2.0-canary.2

package/dist/release.mjs

@@ -50,157 +50,6 @@ function readJson(path, schema) {
 	return decodeJson(readFileSync(path, "utf8"), schema, path);
 }
 //#endregion
-//#region ../release/dist/version.js
-const numericIdentifier = /^(?:0|[1-9]\d*)$/;
-const canaryMarker = "-canary.";
-function isNumericIdentifier(value) {
-	return numericIdentifier.test(value);
-}
-function stableComponents(version) {
-	const [major, minor, patch, ...rest] = version.split(".");
-	if (major === void 0 || minor === void 0 || patch === void 0 || rest.length !== 0) return;
-	if (!isNumericIdentifier(major) || !isNumericIdentifier(minor) || !isNumericIdentifier(patch)) return;
-	return [
-		major,
-		minor,
-		patch
-	];
-}
-function canaryComponents(version) {
-	const marker = version.indexOf(canaryMarker);
-	if (marker === -1) return void 0;
-	const base = version.slice(0, marker);
-	const suffix = version.slice(marker + 8);
-	if (stableComponents(base) === void 0 || !isNumericIdentifier(suffix)) return void 0;
-	return {
-		base,
-		suffix
-	};
-}
-function isStableReleaseVersion(version) {
-	return stableComponents(version) !== void 0;
-}
-function isCanaryReleaseVersion(version) {
-	return canaryComponents(version) !== void 0;
-}
-function isSupportedReleaseVersion(version) {
-	return isStableReleaseVersion(version) || isCanaryReleaseVersion(version);
-}
-function assertReleaseVersion(version) {
-	if (!isSupportedReleaseVersion(version)) throw new Error(`Unsupported release version ${version}; expected x.y.z or x.y.z-canary.N without leading zeros`);
-	return version;
-}
-function assertCanaryReleaseVersion(version) {
-	assertReleaseVersion(version);
-	if (!isCanaryReleaseVersion(version)) throw new Error(`Canary publication requires x.y.z-canary.N; received ${version}`);
-	return version;
-}
-function assertStableReleaseVersion(version) {
-	if (!isStableReleaseVersion(version)) throw new Error(`Expected a stable version; received ${version}`);
-	return version;
-}
-function parseStableVersion(version) {
-	const components = stableComponents(version);
-	if (components === void 0) throw new Error(`Expected a stable version; received ${version}`);
-	const [major, minor, patch] = components;
-	return {
-		major: BigInt(major),
-		minor: BigInt(minor),
-		patch: BigInt(patch)
-	};
-}
-function parseCanaryVersion(version) {
-	const components = canaryComponents(version);
-	if (components === void 0) throw new Error(`Canary publication requires x.y.z-canary.N; received ${version}`);
-	return {
-		base: components.base,
-		n: BigInt(components.suffix)
-	};
-}
-function formatStableVersion(version) {
-	return `${version.major}.${version.minor}.${version.patch}`;
-}
-function formatCanaryVersion(version) {
-	return `${version.base}-canary.${version.n}`;
-}
-function compareParsedStableVersions(left, right) {
-	if (left.major !== right.major) return left.major > right.major ? 1 : -1;
-	if (left.minor !== right.minor) return left.minor > right.minor ? 1 : -1;
-	if (left.patch !== right.patch) return left.patch > right.patch ? 1 : -1;
-	return 0;
-}
-function compareStableVersions(left, right) {
-	return compareParsedStableVersions(parseStableVersion(left), parseStableVersion(right));
-}
-function nextPatchVersion(version) {
-	const parsed = parseStableVersion(version);
-	return formatStableVersion({
-		...parsed,
-		patch: parsed.patch + 1n
-	});
-}
-function compareCanaryVersions(left, right) {
-	const parsedLeft = parseCanaryVersion(left);
-	const parsedRight = parseCanaryVersion(right);
-	const baseOrder = compareStableVersions(parsedLeft.base, parsedRight.base);
-	if (baseOrder !== 0) return baseOrder;
-	return parsedLeft.n === parsedRight.n ? 0 : parsedLeft.n > parsedRight.n ? 1 : -1;
-}
-//#endregion
-//#region ../release/dist/intent.js
-const releaseRecordOwner = "elmera-release";
-/** Asset name of the recorded archive on its GitHub draft release. */
-const releaseArchiveName = "release.tgz";
-const canaryRecordPrefix = "canary-";
-const IntentDocument = Schema.Struct({
-	schema: Schema.Literal(1),
-	owner: Schema.optionalKey(Schema.Literal(releaseRecordOwner)),
-	channel: Schema.Literals(["stable", "canary"]),
-	version: Schema.String,
-	commit: Schema.String
-});
-function isCommit(value) {
-	return /^[a-f0-9]{40}$/.test(value);
-}
-function assertCommit(commit) {
-	if (!isCommit(commit)) throw new Error(`Expected a full commit SHA; received ${commit}`);
-	return commit;
-}
-/** Record tag for a canary release of `commit`. */
-function canaryRecordTag(commit) {
-	return `${canaryRecordPrefix}${commit}`;
-}
-function releaseTag(intent) {
-	return intent.channel === "stable" ? `v${intent.version}` : canaryRecordTag(intent.commit);
-}
-function isReleaseTag(tag) {
-	if (tag.startsWith("v")) return isStableReleaseVersion(tag.slice(1));
-	return tag.startsWith(canaryRecordPrefix) && isCommit(tag.slice(7));
-}
-function assertReleaseTag(tag) {
-	if (!isReleaseTag(tag)) throw new Error("Expected a stable or canary release record tag");
-	return tag;
-}
-function parseIntent(text) {
-	const value = decodeJson(text, IntentDocument, "release intent");
-	if (value.channel === "stable") assertStableReleaseVersion(value.version);
-	else assertCanaryReleaseVersion(value.version);
-	return {
-		channel: value.channel,
-		version: value.version,
-		commit: assertCommit(value.commit)
-	};
-}
-function serializeIntent(intent) {
-	return JSON.stringify({
-		schema: 1,
-		owner: releaseRecordOwner,
-		channel: intent.channel,
-		version: intent.version,
-		commit: intent.commit
-	});
-}
-//#endregion
 //#region ../release/dist/archive.js
 const PackedManifest = Schema.Struct({
 	name: Schema.String,
@@ -210,6 +59,8 @@ const PackedManifest = Schema.Struct({
 		channel: Schema.Literals(["canary", "stable"])
 	})
 });
+/** Scratch filename inside the scoped temp directory; unrelated to the record's asset name. */
+const scratchArchiveName = "archive.tgz";
 /** Temporary directory removed when the surrounding Effect scope closes. Process kill is not covered. */
 function scratchDirectory() {
 	return Effect.acquireRelease(lift(() => mkdtempSync(resolve(tmpdir(), "elmera-release-"))), (directory) => Effect.sync(() => rmSync(directory, {
@@ -225,7 +76,7 @@ function verifyReleaseArchive(intent, bytes, packageName) {
 	return Effect.gen(function* () {
 		const directory = yield* scratchDirectory();
 		return yield* lift(() => {
-			const archive = resolve(directory, releaseArchiveName);
+			const archive = resolve(directory, scratchArchiveName);
 			writeFileSync(archive, bytes);
 			const manifest = decodeJson(execFileSync("tar", [
 				"-xOzf",
@@ -356,6 +207,103 @@ function createGitHubClient(environment) {
 	};
 }
 //#endregion
+//#region ../release/dist/version.js
+const numericIdentifier = /^(?:0|[1-9]\d*)$/;
+const canaryMarker = "-canary.";
+function isNumericIdentifier(value) {
+	return numericIdentifier.test(value);
+}
+function stableComponents(version) {
+	const [major, minor, patch, ...rest] = version.split(".");
+	if (major === void 0 || minor === void 0 || patch === void 0 || rest.length !== 0) return;
+	if (!isNumericIdentifier(major) || !isNumericIdentifier(minor) || !isNumericIdentifier(patch)) return;
+	return [
+		major,
+		minor,
+		patch
+	];
+}
+function canaryComponents(version) {
+	const marker = version.indexOf(canaryMarker);
+	if (marker === -1) return void 0;
+	const base = version.slice(0, marker);
+	const suffix = version.slice(marker + 8);
+	if (stableComponents(base) === void 0 || !isNumericIdentifier(suffix)) return void 0;
+	return {
+		base,
+		suffix
+	};
+}
+function isStableReleaseVersion(version) {
+	return stableComponents(version) !== void 0;
+}
+function isCanaryReleaseVersion(version) {
+	return canaryComponents(version) !== void 0;
+}
+function isSupportedReleaseVersion(version) {
+	return isStableReleaseVersion(version) || isCanaryReleaseVersion(version);
+}
+function assertReleaseVersion(version) {
+	if (!isSupportedReleaseVersion(version)) throw new Error(`Unsupported release version ${version}; expected x.y.z or x.y.z-canary.N without leading zeros`);
+	return version;
+}
+function assertCanaryReleaseVersion(version) {
+	assertReleaseVersion(version);
+	if (!isCanaryReleaseVersion(version)) throw new Error(`Canary publication requires x.y.z-canary.N; received ${version}`);
+	return version;
+}
+function assertStableReleaseVersion(version) {
+	if (!isStableReleaseVersion(version)) throw new Error(`Expected a stable version; received ${version}`);
+	return version;
+}
+function parseStableVersion(version) {
+	const components = stableComponents(version);
+	if (components === void 0) throw new Error(`Expected a stable version; received ${version}`);
+	const [major, minor, patch] = components;
+	return {
+		major: BigInt(major),
+		minor: BigInt(minor),
+		patch: BigInt(patch)
+	};
+}
+function parseCanaryVersion(version) {
+	const components = canaryComponents(version);
+	if (components === void 0) throw new Error(`Canary publication requires x.y.z-canary.N; received ${version}`);
+	return {
+		base: components.base,
+		n: BigInt(components.suffix)
+	};
+}
+function formatStableVersion(version) {
+	return `${version.major}.${version.minor}.${version.patch}`;
+}
+function formatCanaryVersion(version) {
+	return `${version.base}-canary.${version.n}`;
+}
+function compareParsedStableVersions(left, right) {
+	if (left.major !== right.major) return left.major > right.major ? 1 : -1;
+	if (left.minor !== right.minor) return left.minor > right.minor ? 1 : -1;
+	if (left.patch !== right.patch) return left.patch > right.patch ? 1 : -1;
+	return 0;
+}
+function compareStableVersions(left, right) {
+	return compareParsedStableVersions(parseStableVersion(left), parseStableVersion(right));
+}
+function nextPatchVersion(version) {
+	const parsed = parseStableVersion(version);
+	return formatStableVersion({
+		...parsed,
+		patch: parsed.patch + 1n
+	});
+}
+function compareCanaryVersions(left, right) {
+	const parsedLeft = parseCanaryVersion(left);
+	const parsedRight = parseCanaryVersion(right);
+	const baseOrder = compareStableVersions(parsedLeft.base, parsedRight.base);
+	if (baseOrder !== 0) return baseOrder;
+	return parsedLeft.n === parsedRight.n ? 0 : parsedLeft.n > parsedRight.n ? 1 : -1;
+}
+//#endregion
 //#region ../release/dist/gate.js
 /** Reads the checked-out manifest's version and requires it to be a stable release version. */
 function readStableVersion(packageDirectory) {
@@ -393,6 +341,15 @@ function createStableReleaseGate(client, root, packageDirectory, trackedBranch)
 	});
 }
 //#endregion
+//#region ../release/dist/intent.js
+function isCommit(value) {
+	return /^[a-f0-9]{40}$/.test(value);
+}
+function assertCommit(commit) {
+	if (!isCommit(commit)) throw new Error(`Expected a full commit SHA; received ${commit}`);
+	return commit;
+}
+//#endregion
 //#region ../release/dist/git.js
 function git(cwd, args) {
 	return execFileSync("git", args, {
@@ -635,19 +592,25 @@ function canarySupersession(commit, base, registry, isAncestor, recordedVersion)
 	if (highestStable !== void 0 && compareStableVersions(highestStable, base) >= 0) return "stable-superseded";
 	return "owned";
 }
-/** Whether a fresh canary may be cut for this commit, or which published release already covers it. */
-function canaryEligibility(target, registry, isAncestor) {
-	if (compareStableVersions(target.base, target.current) <= 0) throw new Error("The planned version must advance the stable version");
-	return canarySupersession(target.commit, target.base, registry, isAncestor);
+const skipReasons = {
+	"canary-superseded": "Skipping a commit superseded by a published canary",
+	"stable-superseded": "Skipping a commit superseded by a stable release",
+	"regressed-base": "Skipping a commit superseded by a canary on a newer base"
+};
+function skip(kind) {
+	return {
+		skip: kind,
+		reason: skipReasons[kind]
+	};
 }
 /**
-* Allocates the next canary number for `base`, or reports `undefined` when a published or reserved
-* canary already belongs to a newer base. A regressed base skips; it never blocks publication.
+* Numbers the next canary for `base`, or reports `undefined` when a published or reserved canary
+* already belongs to a newer base. A regressed base skips; it never blocks publication.
 */
-function allocateCanary(base, versions) {
+function nextCanaryVersion(base, taken) {
 	parseStableVersion(base);
 	let highest = -1n;
-	for (const version of versions) {
+	for (const version of taken) {
 		if (!isCanaryReleaseVersion(version)) continue;
 		const candidate = parseCanaryVersion(version);
 		if (compareStableVersions(candidate.base, base) > 0) return void 0;
@@ -658,6 +621,19 @@ function allocateCanary(base, versions) {
 		n: highest + 1n
 	});
 }
+/**
+* Decides the canary for a checked main commit. Ancestry and the planned base settle whether the
+* commit still owns the channel; published and reserved versions together settle the number, so a
+* reservation is taken even when npm has not seen it yet.
+*/
+function decideCanary(target, registry, reserved, isAncestor) {
+	if (compareStableVersions(target.base, target.current) <= 0) throw new Error("The planned version must advance the stable version");
+	const status = canarySupersession(target.commit, target.base, registry, isAncestor);
+	if (status !== "owned") return skip(status);
+	const version = nextCanaryVersion(target.base, [...registry.versions.keys(), ...reserved]);
+	if (version === void 0) return skip("regressed-base");
+	return { cut: version };
+}
 /** Whether npm already carries this exact archive; a same-version mismatch is fatal. */
 function npmIdentity(release, registry) {
 	const existing = registry.versions.get(release.version);
@@ -760,7 +736,52 @@ function publishVerifiedRelease(release, deps) {
 	});
 }
 //#endregion
-//#region ../release/dist/ownership.js
+//#region ../release/dist/record.js
+const releaseRecordOwner = "elmera-release";
+/** Asset name of the recorded archive on its GitHub draft release. */
+const releaseArchiveName = "release.tgz";
+const canaryRecordPrefix = "canary-";
+const IntentDocument = Schema.Struct({
+	schema: Schema.Literal(1),
+	owner: Schema.optionalKey(Schema.Literal(releaseRecordOwner)),
+	channel: Schema.Literals(["stable", "canary"]),
+	version: Schema.String,
+	commit: Schema.String
+});
+/** Record tag for a canary release of `commit`. */
+function canaryRecordTag(commit) {
+	return `${canaryRecordPrefix}${commit}`;
+}
+function releaseTag(intent) {
+	return intent.channel === "stable" ? `v${intent.version}` : canaryRecordTag(intent.commit);
+}
+function isReleaseTag(tag) {
+	if (tag.startsWith("v")) return isStableReleaseVersion(tag.slice(1));
+	return tag.startsWith(canaryRecordPrefix) && isCommit(tag.slice(7));
+}
+function assertReleaseTag(tag) {
+	if (!isReleaseTag(tag)) throw new Error("Expected a stable or canary release record tag");
+	return tag;
+}
+function parseIntent(text) {
+	const value = decodeJson(text, IntentDocument, "release intent");
+	if (value.channel === "stable") assertStableReleaseVersion(value.version);
+	else assertCanaryReleaseVersion(value.version);
+	return {
+		channel: value.channel,
+		version: value.version,
+		commit: assertCommit(value.commit)
+	};
+}
+function serializeIntent(intent) {
+	return JSON.stringify({
+		schema: 1,
+		owner: releaseRecordOwner,
+		channel: intent.channel,
+		version: intent.version,
+		commit: intent.commit
+	});
+}
 const IntentProbe = Schema.Struct({
 	schema: Schema.optionalKey(Schema.Json),
 	owner: Schema.optionalKey(Schema.Json)
@@ -780,6 +801,10 @@ function intentMatchingTag(body, tag) {
 function clearlyForeignIdentity(parsed) {
 	return parsed !== void 0 && parsed.owner !== void 0 && parsed.owner !== "elmera-release";
 }
+/**
+* Ownership is recognized before intent validation (ADR 0002). An owned or legacy record with an
+* unreadable body throws so it is reported damaged rather than skipped as foreign.
+*/
 function classifyReleaseRecord(tag, body, assetNames) {
 	if (!isReleaseTag(tag)) return { kind: "ignored" };
 	const parsed = tryParseBody(body);
@@ -797,17 +822,6 @@ function classifyReleaseRecord(tag, body, assetNames) {
 	};
 	return { kind: "foreign" };
 }
-//#endregion
-//#region ../release/dist/store.js
-function assertSameIntent(saved, intended) {
-	if (saved.commit !== intended.commit || saved.version !== intended.version || saved.channel !== intended.channel) throw new Error("Release intent differs from the saved release");
-}
-function releaseBodyText(value) {
-	return value.body ?? "";
-}
-function assetNames(value) {
-	return value.assets.map((asset) => asset.name);
-}
 /** `starterAllowed` records that an empty placeholder is only legal on a draft release. */
 function classifyReleaseAsset(starterAllowed, asset) {
 	if (asset === void 0) return { state: "missing" };
@@ -825,6 +839,17 @@ function classifyReleaseAsset(starterAllowed, asset) {
 		id: asset.id
 	};
 }
+//#endregion
+//#region ../release/dist/store.js
+function assertSameIntent(saved, intended) {
+	if (saved.commit !== intended.commit || saved.version !== intended.version || saved.channel !== intended.channel) throw new Error("Release intent differs from the saved release");
+}
+function releaseBodyText(value) {
+	return value.body ?? "";
+}
+function assetNames(value) {
+	return value.assets.map((asset) => asset.name);
+}
 function savedReleaseFrom(value, intent) {
 	const assets = value.assets.filter((asset) => asset.name === releaseArchiveName);
 	if (assets.length > 1) throw new Error("Duplicate release archives");
@@ -993,10 +1018,6 @@ function createReleaseStore(client, packageName) {
 }
 //#endregion
 //#region ../release/dist/engine.js
-function skipReason(status) {
-	return status === "canary-superseded" ? "Skipping a commit superseded by a published canary" : "Skipping a commit superseded by a stable release";
-}
-const regressedBaseSkip = "Skipping a commit superseded by a canary on a newer base";
 /** Reserves the record, then packs, verifies, and uploads its archive. Resuming never repacks. */
 function recordRelease(intent, adapter, deps) {
 	return Effect.gen(function* () {
@@ -1039,24 +1060,19 @@ function mainReleaseIntent(commit, deps) {
 		if (recorded !== void 0) return recorded.intent;
 		const base = yield* deps.plannedCanaryBase(line.current);
 		const registry = yield* deps.readRegistry();
-		const status = yield* lift(() => canaryEligibility({
+		const reserved = yield* deps.store.reservedCanaryVersions();
+		const decision = yield* lift(() => decideCanary({
 			commit,
 			current: line.current,
 			base
-		}, registry, deps.ancestry));
-		if (status !== "owned") {
-			deps.log(skipReason(status));
-			return;
-		}
-		const reserved = yield* deps.store.reservedCanaryVersions();
-		const version = yield* lift(() => allocateCanary(base, [...registry.versions.keys(), ...reserved]));
-		if (version === void 0) {
-			deps.log(regressedBaseSkip);
+		}, registry, reserved, deps.ancestry));
+		if ("skip" in decision) {
+			deps.log(decision.reason);
 			return;
 		}
 		return {
 			channel: "canary",
-			version,
+			version: decision.cut,
 			commit
 		};
 	});

package/package.json

@@ -12,13 +12,13 @@
     "vitest": "4.1.11",
     "tsdown": "0.23.0",
     "@elmeragroup/api-extractor": "0.0.0",
-    "@elmeragroup/oxlint-plugin": "0.0.0",
-    "@elmeragroup/api-artifacts": "0.0.0",
-    "@elmeragroup/oxlint-plugin-anti-slop": "0.0.0",
     "@elmeragroup/typescript-config": "0.0.0",
-    "@elmeragroup/release": "0.0.0"
+    "@elmeragroup/oxlint-plugin-anti-slop": "0.0.0",
+    "@elmeragroup/api-artifacts": "0.0.0",
+    "@elmeragroup/release": "0.0.0",
+    "@elmeragroup/oxlint-plugin": "0.0.0"
   },
-  "version": "0.2.0-canary.1",
+  "version": "0.2.0-canary.2",
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -69,7 +69,7 @@
   },
   "sideEffects": false,
   "elmeraRelease": {
-    "commit": "53d7c332e91b6755b2b3f546ed3a39320acf914f",
+    "commit": "f71523541c8c6ca1a937804a6defa1c518b2d001",
     "channel": "canary"
   },
   "scripts": {