tegami 1.0.0-beta.4 → 1.0.1

package/dist/cli/index.d.ts

@@ -1,4 +1,4 @@
-import { O as Draft, _ as PublishPlan, t as Awaitable, u as Tegami } from "../types-DKZsadC8.js";
+import { T as Draft, p as Tegami, t as Awaitable, y as PublishPlan } from "../types-DItu_YCc.js";
 
 //#region src/cli/index.d.ts
 interface TegamiCLIOptions {

package/dist/cli/index.js

@@ -1,5 +1,6 @@
-import { i as renderChangelog, n as generateFromCommits, t as changelogFilename } from "../generate-BfYdNTFi.js";
-import { o as isCI, r as handlePluginError, t as CancelledError } from "../error-We7chQVJ.js";
+import { n as generateFromCommits, t as changelogFilename } from "../generate-Rvz4Lu98.js";
+import { o as isCI, r as handlePluginError, t as CancelledError } from "../error-BhMYq9iW.js";
+import { n as renderChangelog } from "../shared-C92toqVI.js";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path, { join, relative } from "node:path";
 import { x } from "tinyexec";
@@ -349,10 +350,10 @@ function parseCommandArgs(command, args) {
 		type: "boolean",
 		short: "h"
 	} };
-	for (const option of command.options) optionConfig[option.name] = {
+	for (const option of command.options) optionConfig[option.name] = option.short ? {
 		type: option.type,
 		short: option.short
-	};
+	} : { type: option.type };
 	const parsed = parseArgs({
 		args,
 		options: optionConfig,
@@ -453,8 +454,14 @@ function registerCoreCommands(cli, tegami, options) {
 	cli.command("", { description: "create changelog files interactively" }).action(async () => {
 		await runChangelogTui(tegami);
 	});
-	cli.command("version", { description: "draft version changes and write the publish lock" }).action(async () => {
-		await versionPackages(tegami, { cli: options });
+	cli.command("version", { description: "draft version changes and write the publish lock" }).option("no-checks", {
+		type: "boolean",
+		description: "skip checking whether the publish lock is still pending"
+	}).action(async ({ values }) => {
+		await versionPackages(tegami, {
+			cli: options,
+			noChecks: values["no-checks"]
+		});
 	});
 	cli.command("ci", { description: "version and publish packages" }).action(async () => {
 		if (await versionPackages(tegami, { cli: options })) return;
@@ -499,7 +506,7 @@ async function versionPackages(tegami, options) {
 		outro("No versions changed.");
 		return false;
 	}
-	if (await tegami.publishStatus() === "pending") {
+	if (!options.noChecks && await tegami.publishStatus() === "pending") {
 		note(`Publish lock at ${context.lockPath} is still pending. Publish it before applying a new draft.`);
 		outro("Cannot apply.");
 		return false;

package/dist/{draft-DtFyGxe8.js → draft-BqHcSCeX.js}

@@ -1,6 +1,6 @@
 import { a as maxBump } from "./semver-EKJ8yK5U.js";
-import { i as renderChangelog, r as changelogFrontmatterSchema } from "./generate-BfYdNTFi.js";
-import { r as handlePluginError } from "./error-We7chQVJ.js";
+import { r as handlePluginError } from "./error-BhMYq9iW.js";
+import { n as renderChangelog, t as changelogFrontmatterSchema } from "./shared-C92toqVI.js";
 import { simpleGenerator } from "./generators/simple.js";
 import { mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import path, { basename, dirname, join } from "node:path";
@@ -237,7 +237,7 @@ const packageStoreSchema = z.object({
 /** a draft describes all operations to perform before the actual publishing, such as version bumps. */
 var Draft = class {
 	context;
-	#applied = false;
+	#status = 0;
 	/** package id -> draft */
 	packages = /* @__PURE__ */ new Map();
 	/** id -> changelog */
@@ -313,27 +313,36 @@ var Draft = class {
 	}
 	/** Apply version bumps, lock file, and changelog files. */
 	async apply() {
-		if (this.#applied) throw new Error("This draft has already been applied.");
-		const { graph } = this.context;
-		this.#applied = true;
-		const snapshots = /* @__PURE__ */ new Map();
-		for (const pkg of graph.getPackages()) snapshots.set(pkg.id, { version: pkg.version });
-		for (const plugin of this.context.plugins) await handlePluginError(plugin, "applyDraft", () => plugin.applyDraft?.call(this.context, this));
-		const updatedChangelogs = this.applyReplays(snapshots);
-		const writes = [];
-		for (const [id, packageDraft] of this.packages) {
-			const pkg = graph.get(id);
-			if (!pkg) continue;
-			writes.push(this.appendChangelog(pkg, packageDraft));
+		switch (this.#status) {
+			case 1: throw new Error("This draft has already been applied.");
+			case 2: throw new Error("There is already a previous apply() run.");
+			case 3: throw new Error("The previous apply() run failed, please clear your local git changes and try again.");
 		}
-		for (const entry of this.changelogs.values()) {
-			const updated = updatedChangelogs.get(entry.id);
-			const filePath = path.join(this.context.changelogDir, entry.filename);
-			if (updated) writes.push(mkdir(this.context.changelogDir, { recursive: true }).then(() => writeFile(filePath, updated.getRawContent())));
-			else if (!entry.virtual) writes.push(rm(filePath, { force: true }));
+		const { graph } = this.context;
+		try {
+			const snapshots = /* @__PURE__ */ new Map();
+			for (const pkg of graph.getPackages()) snapshots.set(pkg.id, { version: pkg.version });
+			for (const plugin of this.context.plugins) await handlePluginError(plugin, "applyDraft", () => plugin.applyDraft?.call(this.context, this));
+			const updatedChangelogs = this.applyReplays(snapshots);
+			const writes = [];
+			for (const [id, packageDraft] of this.packages) {
+				const pkg = graph.get(id);
+				if (!pkg) continue;
+				writes.push(this.appendChangelog(pkg, packageDraft));
+			}
+			for (const entry of this.changelogs.values()) {
+				const updated = updatedChangelogs.get(entry.id);
+				const filePath = path.join(this.context.changelogDir, entry.filename);
+				if (updated) writes.push(mkdir(this.context.changelogDir, { recursive: true }).then(() => writeFile(filePath, updated.getRawContent())));
+				else if (!entry.virtual) writes.push(rm(filePath, { force: true }));
+			}
+			writes.push(this.writeLockFile(snapshots));
+			await Promise.all(writes);
+			this.#status = 1;
+		} catch (e) {
+			this.#status = 3;
+			throw e;
 		}
-		writes.push(this.writeLockFile(snapshots));
-		await Promise.all(writes);
 	}
 	/** write persistent data to publish lock */
 	async writeLockFile(snapshots) {
@@ -370,7 +379,7 @@ var Draft = class {
 		if (idx !== -1) this.policies.splice(idx, 1);
 	}
 	canApply() {
-		return !this.#applied;
+		return this.#status === 0;
 	}
 	/** Attach replaying changelog entries to packages (already bumped), and return the updated changelog entries. */
 	applyReplays(snapshots) {

package/dist/{error-We7chQVJ.js → error-BhMYq9iW.js}

@@ -20,6 +20,19 @@ async function somePromise(promises, fn) {
 		}
 	});
 }
+function joinPath(...paths) {
+	let out = "";
+	for (const path of paths) {
+		if (path.length === 0) continue;
+		if (!out) {
+			out = path;
+			continue;
+		}
+		if (!out.endsWith("/") && !path.startsWith("/")) out += "/";
+		out += path;
+	}
+	return out;
+}
 function cached(cacheKey, fn, cacheMap = /* @__PURE__ */ new Map()) {
 	return (...args) => {
 		const key = cacheKey(...args);
@@ -73,4 +86,4 @@ async function handlePluginError(plugin, hookName, callback) {
 	}
 }
 //#endregion
-export { cached as a, isNodeError as i, execFailure as n, isCI as o, handlePluginError as r, somePromise as s, CancelledError as t };
+export { cached as a, somePromise as c, isNodeError as i, execFailure as n, isCI as o, handlePluginError as r, joinPath as s, CancelledError as t };

package/dist/{generate-BfYdNTFi.js → generate-Rvz4Lu98.js}

@@ -1,8 +1,7 @@
 import { a as maxBump, t as bumpDepth } from "./semver-EKJ8yK5U.js";
-import { n as execFailure } from "./error-We7chQVJ.js";
+import { n as execFailure } from "./error-BhMYq9iW.js";
+import { n as renderChangelog } from "./shared-C92toqVI.js";
 import { x } from "tinyexec";
-import z from "zod";
-import { dump } from "js-yaml";
 //#region src/utils/conventional-commit.ts
 /**
 * Conventional commit header per conventionalcommits.org and semantic-release defaults.
@@ -68,35 +67,6 @@ function conventionalCommitToBump(type, breaking) {
 	}
 }
 //#endregion
-//#region src/changelog/shared.ts
-const bumpTypeSchema = z.enum([
-	"major",
-	"minor",
-	"patch"
-]);
-const changelogPackageConfigSchema = z.object({
-	type: bumpTypeSchema.optional(),
-	replay: z.array(z.string().min(1)).optional()
-});
-const changelogFrontmatterSchema = z.object({
-	subject: z.string().optional(),
-	packages: z.union([z.array(z.string()), z.record(z.string(), z.union([
-		bumpTypeSchema,
-		z.null(),
-		changelogPackageConfigSchema
-	]))]).optional()
-});
-function renderChangelog(frontmatter, body) {
-	return [
-		"---",
-		dump(frontmatter).trim(),
-		"---",
-		"",
-		body.trim(),
-		""
-	].join("\n");
-}
-//#endregion
 //#region src/changelog/generate.ts
 async function generateFromCommits(context, { from, to } = {}) {
 	const commits = await readConventionalCommits(context, from, to);
@@ -171,4 +141,4 @@ function changelogFilename(disambiguator = 0) {
 	return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}-${(Date.now() + disambiguator).toString(36)}.md`;
 }
 //#endregion
-export { renderChangelog as i, generateFromCommits as n, changelogFrontmatterSchema as r, changelogFilename as t };
+export { generateFromCommits as n, changelogFilename as t };

package/dist/generators/simple.d.ts

@@ -1,4 +1,4 @@
-import { r as LogGenerator } from "../types-DKZsadC8.js";
+import { r as LogGenerator } from "../types-DItu_YCc.js";
 
 //#region src/generators/simple.d.ts
 declare function simpleGenerator(): LogGenerator;

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { A as PackageDraft, D as WorkspacePackage, E as PackageGroup, O as Draft, T as PackageGraph, _ as PublishPlan, a as PublishPreflight, c as TegamiPluginOption, d as tegami, f as CommitChangelog, g as PublishOptions, h as PackagePublishResult, i as PackageOptions, k as DraftPolicy, l as GenerateChangelogOptions, m as PackagePublishPlan, n as GroupOptions, o as TegamiOptions, p as PublishLock, r as LogGenerator, s as TegamiPlugin, u as Tegami } from "./types-DKZsadC8.js";
-export { type CommitChangelog, type Draft, type DraftPolicy, GenerateChangelogOptions, type GroupOptions, type LogGenerator, type PackageDraft, type PackageGraph, type PackageGroup, type PackageOptions, type PackagePublishPlan, type PackagePublishResult, type PublishLock, type PublishOptions, type PublishPlan, type PublishPreflight, Tegami, type TegamiOptions, type TegamiPlugin, type TegamiPluginOption, type WorkspacePackage, tegami };
+import { C as PackageGroup, D as PackageDraft, E as DraftPolicy, O as BumpType, S as PackageGraph, T as Draft, _ as PackagePublishResult, a as PublishPreflight, b as CommitChangelog, c as TegamiPluginOption, f as GenerateChangelogOptions, g as PackagePublishPlan, h as PublishLock, i as PackageOptions, m as tegami, n as GroupOptions, o as TegamiOptions, p as Tegami, r as LogGenerator, s as TegamiPlugin, v as PublishOptions, w as WorkspacePackage, x as TegamiContext, y as PublishPlan } from "./types-DItu_YCc.js";
+export { type BumpType, type CommitChangelog, type Draft, type DraftPolicy, GenerateChangelogOptions, type GroupOptions, type LogGenerator, type PackageDraft, PackageGraph, type PackageGroup, type PackageOptions, type PackagePublishPlan, type PackagePublishResult, type PublishLock, type PublishOptions, type PublishPlan, type PublishPreflight, Tegami, type TegamiContext, type TegamiOptions, type TegamiPlugin, type TegamiPluginOption, WorkspacePackage, tegami };

package/dist/index.js

@@ -1,10 +1,9 @@
-import { n as generateFromCommits } from "./generate-BfYdNTFi.js";
-import { r as handlePluginError, s as somePromise } from "./error-We7chQVJ.js";
-import { t as PackageGraph } from "./graph-gThXu8Cz.js";
-import { cargo } from "./providers/cargo.js";
-import { n as npm } from "./npm-CMOyacwf.js";
-import { a as parseChangelogFile, i as parsePublishLock, n as createDraft, o as readChangelogEntries, r as packageStoreSchema, t as changelogStoreSchema } from "./draft-DtFyGxe8.js";
-import fs, { mkdir, rm, writeFile } from "node:fs/promises";
+import { n as generateFromCommits } from "./generate-Rvz4Lu98.js";
+import { r as handlePluginError } from "./error-BhMYq9iW.js";
+import { a as runPreflights, i as publishPlanStatus, n as npm, o as runPublishPlan, r as initPublishPlan } from "./npm-1iEegfHg.js";
+import { n as WorkspacePackage, t as PackageGraph } from "./graph-gThXu8Cz.js";
+import { a as parseChangelogFile, n as createDraft, o as readChangelogEntries } from "./draft-BqHcSCeX.js";
+import { mkdir, rm, writeFile } from "node:fs/promises";
 import path, { join } from "node:path";
 //#region src/context.ts
 async function createTegamiContext(options = {}) {
@@ -15,11 +14,7 @@ async function createTegamiContext(options = {}) {
 		changelogDir,
 		lockPath: options.lockPath ? path.resolve(cwd, options.lockPath) : path.join(changelogDir, "publish-lock.yaml"),
 		options,
-		plugins: resolvePlugins([
-			npm(options.npm),
-			cargo(options.cargo),
-			...options.plugins ?? []
-		]),
+		plugins: resolvePlugins([npm(options.npm), ...options.plugins ?? []]),
 		graph: new PackageGraph()
 	};
 	for (const plugin of ctx.plugins) await handlePluginError(plugin, "init", () => plugin.init?.call(ctx));
@@ -59,136 +54,6 @@ function resolvePlugins(plugins = []) {
 	return plugins.flat(Infinity).sort((a, b) => PLUGIN_ORDER[a.enforce ?? "default"] - PLUGIN_ORDER[b.enforce ?? "default"]);
 }
 //#endregion
-//#region src/plans/publish.ts
-async function initPublishPlan(context, options) {
-	let lock;
-	try {
-		lock = parsePublishLock(await fs.readFile(context.lockPath, "utf8"));
-	} catch {
-		return;
-	}
-	let data;
-	const packages = /* @__PURE__ */ new Map();
-	const changelogs = /* @__PURE__ */ new Map();
-	while (data = lock.read("core:changelogs")) {
-		const entry = changelogStoreSchema.safeParse(data).data;
-		if (!entry) continue;
-		const parsed = parseChangelogFile(entry.filename, entry.content);
-		if (!parsed) continue;
-		changelogs.set(parsed.id, parsed);
-	}
-	while (data = lock.read("core:packages")) {
-		const parsed = packageStoreSchema.safeParse(data).data;
-		if (!parsed) continue;
-		if (!context.graph.get(parsed.id)) continue;
-		const pkgChangelogs = [];
-		for (const id of parsed.changelogIds ?? []) {
-			const entry = changelogs.get(id);
-			if (entry) pkgChangelogs.push(entry);
-		}
-		packages.set(parsed.id, {
-			changelogs: pkgChangelogs,
-			updated: parsed.updated
-		});
-	}
-	const plan = {
-		options,
-		changelogs,
-		packages
-	};
-	for (const plugin of context.plugins) await handlePluginError(plugin, "initPublishPlan", () => plugin.initPublishPlan?.call(context, {
-		lock,
-		plan
-	}));
-	return plan;
-}
-function resolvePublishTargets(plan) {
-	const ordered = [];
-	function scan(id, stack = /* @__PURE__ */ new Set()) {
-		const preflight = plan.packages.get(id)?.preflight;
-		if (!preflight || !preflight.shouldPublish) return;
-		if (stack.has(id)) throw new Error(`circular reference of deps: ${[...stack, id].join(" -> ")}`);
-		if (ordered.includes(id)) return;
-		if (preflight.wait) {
-			stack.add(id);
-			for (const dep of preflight.wait) scan(dep, stack);
-			stack.delete(id);
-		}
-		ordered.push(id);
-	}
-	for (const id of plan.packages.keys()) scan(id);
-	return ordered;
-}
-async function runPublishPlan(context, plan) {
-	const { dryRun = false } = plan.options;
-	const onPublishResult = async (pkg, publishResult) => {
-		const packagePlan = plan.packages.get(pkg.id);
-		if (!packagePlan) return;
-		packagePlan.publishResult = publishResult;
-		if (publishResult.type === "skipped") return;
-		for (const plugin of context.plugins) await handlePluginError(plugin, "afterPublish", () => plugin.afterPublish?.call(context, {
-			pkg,
-			plan
-		}));
-	};
-	publishLoop: for (const id of resolvePublishTargets(plan)) {
-		const pkg = context.graph.get(id);
-		if (dryRun) {
-			await onPublishResult(pkg, { type: "published" });
-			continue;
-		}
-		for (const plugin of context.plugins) if (await handlePluginError(plugin, "willPublish", () => plugin.willPublish?.call(context, { pkg })) === false) continue publishLoop;
-		for (const plugin of context.plugins) {
-			const publishResult = await handlePluginError(plugin, "publish", () => plugin.publish?.call(context, {
-				pkg,
-				plan
-			}));
-			if (publishResult) {
-				await onPublishResult(pkg, publishResult);
-				continue publishLoop;
-			}
-		}
-		await onPublishResult(pkg, {
-			type: "failed",
-			error: `There is no plugin to publish package "${pkg.id}", please make sure the package has a supported provider plugin.`
-		});
-	}
-	for (const packagePlan of plan.packages.values()) packagePlan.publishResult ??= { type: "skipped" };
-	for (const plugin of context.plugins) await handlePluginError(plugin, "afterPublishAll", () => plugin.afterPublishAll?.call(context, { plan }));
-}
-async function runPreflights(context, plan) {
-	const promises = [];
-	const runPreflight = async (pkg) => {
-		for (const plugin of context.plugins) {
-			const res = await handlePluginError(plugin, "publishPreflight", () => plugin.publishPreflight?.call(context, {
-				pkg,
-				plan
-			}));
-			if (res) return res;
-		}
-		return { shouldPublish: false };
-	};
-	for (const [id, packagePlan] of plan.packages) {
-		const pkg = context.graph.get(id);
-		if (!packagePlan.updated) {
-			packagePlan.preflight = { shouldPublish: false };
-			continue;
-		}
-		promises.push(runPreflight(pkg).then((preflight) => {
-			packagePlan.preflight = preflight;
-		}));
-	}
-	await Promise.all(promises);
-}
-async function publishPlanStatus(plan, context) {
-	for (const plugin of context.plugins) {
-		const status = await handlePluginError(plugin, "resolvePlanStatus", () => plugin.resolvePlanStatus?.call(context, { plan }));
-		if (Array.isArray(status) && await somePromise(status, (v) => v === "pending")) return "pending";
-		if (status === "pending") return "pending";
-	}
-	return "success";
-}
-//#endregion
 //#region src/index.ts
 /** Create a Tegami project handle. */
 function tegami(options = {}) {
@@ -268,4 +133,4 @@ function tegami(options = {}) {
 	};
 }
 //#endregion
-export { tegami };
+export { PackageGraph, WorkspacePackage, tegami };