tegami 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/cli/index.d.ts

@@ -1,5 +1,5 @@
-import { p as PublishPlan, t as Awaitable, w as Draft } from "../types-BbDtPn8I.js";
-import { n as Tegami } from "../index-CH40idD8.js";
+import { p as PublishPlan, t as Awaitable, w as Draft } from "../types-DKeF_CDv.js";
+import { n as Tegami } from "../index-CQXmwyLn.js";
 import { Command } from "commander";
 
 //#region src/cli/index.d.ts

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 import { r as formatNpmDistTag } from "../semver-EKJ8yK5U.js";
-import { i as renderChangelog, n as generateFromCommits, t as changelogFilename } from "../generate-BqkwhjRy.js";
-import { a as isCI, n as execFailure, r as handlePluginError, t as CancelledError } from "../error-DNy8R5ue.js";
+import { i as renderChangelog, n as generateFromCommits, t as changelogFilename } from "../generate-CaCDNfVk.js";
+import { a as isCI, n as execFailure, r as handlePluginError, t as CancelledError } from "../error-D3dwQnwR.js";
 import { c as updateIssueComment, i as findIssueCommentByPrefix, o as getPullRequest, t as createIssueComment } from "../api-D-jf_8xY.js";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path, { basename, join, relative } from "node:path";
@@ -543,7 +543,7 @@ async function publishPackages(tegami, options) {
 	const lines = [];
 	let hasFailed = false;
 	for (const [id, packagePlan] of plan.packages) {
-		if (!packagePlan.updated) continue;
+		if (!packagePlan.preflight.shouldPublish) continue;
 		const result = packagePlan.publishResult;
 		const pkg = context.graph.get(id);
 		if (result.type === "failed") hasFailed = true;

package/dist/{error-DNy8R5ue.js → error-D3dwQnwR.js}

@@ -1,5 +1,25 @@
-//#region src/utils/constants.ts
+//#region src/utils/common.ts
 const isCI = () => Boolean(process.env.CI);
+async function somePromise(promises, fn) {
+	return new Promise((res, reject) => {
+		const n = promises.length;
+		if (n === 0) res(false);
+		let i = 0;
+		for (const promise of promises) {
+			if (promise instanceof Promise) {
+				promise.then((v) => {
+					if (fn(v)) return res(true);
+					i++;
+					if (i === n) res(false);
+				}).catch(reject);
+				continue;
+			}
+			if (fn(promise)) return res(true);
+			i++;
+			if (i === n) res(false);
+		}
+	});
+}
 //#endregion
 //#region src/utils/error.ts
 var CancelledError = class extends Error {
@@ -42,4 +62,4 @@ async function handlePluginError(plugin, hookName, callback) {
 	}
 }
 //#endregion
-export { isCI as a, isNodeError as i, execFailure as n, handlePluginError as r, CancelledError as t };
+export { isCI as a, isNodeError as i, execFailure as n, somePromise as o, handlePluginError as r, CancelledError as t };

package/dist/{generate-BqkwhjRy.js → generate-CaCDNfVk.js}

@@ -1,5 +1,5 @@
 import { a as maxBump, t as bumpDepth } from "./semver-EKJ8yK5U.js";
-import { n as execFailure } from "./error-DNy8R5ue.js";
+import { n as execFailure } from "./error-D3dwQnwR.js";
 import { x } from "tinyexec";
 import z from "zod";
 import { dump } from "js-yaml";

package/dist/generators/simple.d.ts

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

package/dist/{index-CH40idD8.d.ts → index-CQXmwyLn.d.ts}

@@ -1,4 +1,4 @@
-import { D as ChangelogPackageConfig, O as BumpType, b as TegamiContext, f as PublishOptions, o as TegamiOptions, p as PublishPlan, w as Draft, x as PackageGraph } from "./types-BbDtPn8I.js";
+import { D as ChangelogPackageConfig, O as BumpType, b as TegamiContext, f as PublishOptions, o as TegamiOptions, p as PublishPlan, w as Draft, x as PackageGraph } from "./types-DKeF_CDv.js";
 
 //#region src/changelog/generate.d.ts
 interface GenerateFromCommitsOptions {

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import { C as WorkspacePackage, E as PackageDraft, S as PackageGroup, T as DraftPolicy, a as PublishPreflight, c as TegamiPluginOption, d as PackagePublishResult, f as PublishOptions, i as PackageOptions, l as PublishLock, n as GroupOptions, o as TegamiOptions, p as PublishPlan, r as LogGenerator, s as TegamiPlugin, u as PackagePublishPlan, w as Draft, x as PackageGraph } from "./types-BbDtPn8I.js";
-import { i as CommitChangelog, n as Tegami, r as tegami, t as GenerateChangelogOptions } from "./index-CH40idD8.js";
+import { C as WorkspacePackage, E as PackageDraft, S as PackageGroup, T as DraftPolicy, a as PublishPreflight, c as TegamiPluginOption, d as PackagePublishResult, f as PublishOptions, i as PackageOptions, l as PublishLock, n as GroupOptions, o as TegamiOptions, p as PublishPlan, r as LogGenerator, s as TegamiPlugin, u as PackagePublishPlan, w as Draft, x as PackageGraph } from "./types-DKeF_CDv.js";
+import { i as CommitChangelog, n as Tegami, r as tegami, t as GenerateChangelogOptions } from "./index-CQXmwyLn.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 };

package/dist/index.js

@@ -1,9 +1,9 @@
 import { a as maxBump } from "./semver-EKJ8yK5U.js";
-import { n as generateFromCommits, r as changelogFrontmatterSchema } from "./generate-BqkwhjRy.js";
-import { r as handlePluginError } from "./error-DNy8R5ue.js";
+import { n as generateFromCommits, r as changelogFrontmatterSchema } from "./generate-CaCDNfVk.js";
+import { o as somePromise, r as handlePluginError } from "./error-D3dwQnwR.js";
 import { t as PackageGraph } from "./graph-gThXu8Cz.js";
 import { cargo } from "./providers/cargo.js";
-import { n as npm } from "./npm-DqGyAsdo.js";
+import { n as npm } from "./npm-B_43doHi.js";
 import { simpleGenerator } from "./generators/simple.js";
 import fs, { mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import path, { basename, dirname, join } from "node:path";
@@ -543,7 +543,7 @@ function resolvePublishTargets(plan) {
 	const ordered = [];
 	function scan(id, stack = /* @__PURE__ */ new Set()) {
 		const preflight = plan.packages.get(id)?.preflight;
-		if (!preflight || !preflight.publish) return;
+		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) {
@@ -596,25 +596,19 @@ async function runPublishPlan(context, plan) {
 async function runPreflights(context, plan) {
 	const promises = [];
 	const runPreflight = async (pkg) => {
-		const out = { publish: true };
 		for (const plugin of context.plugins) {
 			const res = await handlePluginError(plugin, "publishPreflight", () => plugin.publishPreflight?.call(context, {
 				pkg,
 				plan
 			}));
-			if (res === void 0) continue;
-			out.publish = res.publish;
-			if (res.wait) {
-				out.wait ??= [];
-				out.wait.push(...res.wait);
-			}
+			if (res) return res;
 		}
-		return out;
+		return { shouldPublish: false };
 	};
 	for (const [id, packagePlan] of plan.packages) {
 		const pkg = context.graph.get(id);
 		if (!packagePlan.updated) {
-			packagePlan.preflight = { publish: false };
+			packagePlan.preflight = { shouldPublish: false };
 			continue;
 		}
 		promises.push(runPreflight(pkg).then((preflight) => {
@@ -624,19 +618,12 @@ async function runPreflights(context, plan) {
 	await Promise.all(promises);
 }
 async function publishPlanStatus(plan, context) {
-	for (const pkg of plan.packages.values()) {
-		if (!pkg.preflight) throw new Error("Should perform preflight before checking plan status.");
-		if (pkg.preflight.publish) return "pending";
-	}
-	try {
-		await Promise.all(context.plugins.map(async (plugin) => {
-			if (await handlePluginError(plugin, "resolvePlanStatus", () => plugin.resolvePlanStatus?.call(context, { plan })) === "pending") throw "pending";
-		}));
-		return "success";
-	} catch (e) {
-		if (e === "pending") return "pending";
-		throw e;
+	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

package/dist/{npm-DqGyAsdo.js → npm-B_43doHi.js}

@@ -1,4 +1,4 @@
-import { i as isNodeError, n as execFailure } from "./error-DNy8R5ue.js";
+import { i as isNodeError, n as execFailure } from "./error-D3dwQnwR.js";
 import { n as WorkspacePackage } from "./graph-gThXu8Cz.js";
 import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
@@ -139,7 +139,15 @@ function npm({ client: defaultClient, onBreakPeerDep = "set", updateLockFile = t
 		},
 		async publishPreflight({ pkg }) {
 			if (!(pkg instanceof NpmPackage)) return;
-			return { publish: pkg.version !== void 0 && pkg.manifest.private !== true && !await isPackagePublished(pkg.name, pkg.version, pkg.manifest.publishConfig?.registry) };
+			return { shouldPublish: pkg.version !== void 0 && pkg.manifest.private !== true };
+		},
+		resolvePlanStatus({ plan }) {
+			return Array.from(plan.packages, async ([id, { preflight }]) => {
+				if (!preflight.shouldPublish) return;
+				const pkg = this.graph.get(id);
+				if (!(pkg instanceof NpmPackage) || !pkg.version) return;
+				if (!await isPackagePublished(pkg.name, pkg.version, pkg.manifest.publishConfig?.registry)) return "pending";
+			});
 		},
 		initPublishLock({ lock, draft }) {
 			for (const [id, pkg] of draft.getPackageDrafts()) {
@@ -264,6 +272,7 @@ function depsPolicy(context, getBumpDepType) {
 	};
 }
 async function publish(client, pkg, distTag) {
+	if (!pkg.version || await isPackagePublished(pkg.name, pkg.version, pkg.manifest.publishConfig?.registry)) return { type: "skipped" };
 	if (client === "bun") {
 		for (const script of [
 			"prepublishOnly",

package/dist/plugins/git.d.ts

@@ -1,4 +1,4 @@
-import { s as TegamiPlugin } from "../types-BbDtPn8I.js";
+import { s as TegamiPlugin } from "../types-DKeF_CDv.js";
 
 //#region src/plugins/git.d.ts
 interface GitPluginOptions {

package/dist/plugins/git.js

@@ -1,4 +1,4 @@
-import { a as isCI, n as execFailure } from "../error-DNy8R5ue.js";
+import { a as isCI, n as execFailure } from "../error-D3dwQnwR.js";
 import { x } from "tinyexec";
 //#region src/plugins/git.ts
 /**
@@ -9,11 +9,12 @@ import { x } from "tinyexec";
 */
 function git(options = {}) {
 	const { createTags = true, pushTags = isCI() } = options;
-	function getPendingTags(plan, filterPackage) {
+	function getPendingTags(plan) {
 		const pendingTags = /* @__PURE__ */ new Set();
 		if ((plan.options.dryRun ?? false) || !createTags) return pendingTags;
 		for (const pkg of plan.packages.values()) {
-			if (filterPackage && !filterPackage(pkg)) continue;
+			if (!pkg.preflight.shouldPublish) continue;
+			if (pkg.publishResult && pkg.publishResult.type === "failed") continue;
 			const tag = pkg.git?.tag;
 			if (tag) pendingTags.add(tag);
 		}
@@ -49,26 +50,22 @@ function git(options = {}) {
 			}
 		},
 		async resolvePlanStatus({ plan }) {
-			const pendingTags = getPendingTags(plan, (pkg) => pkg.preflight.publish);
-			if (pendingTags.size === 0) return;
-			try {
-				await Promise.all(Array.from(pendingTags, async (tag) => {
-					if (!await gitTagExists(this.cwd, tag)) throw "pending";
-				}));
-			} catch (e) {
-				if (e === "pending") return "pending";
-				throw e;
-			}
+			const pendingTags = getPendingTags(plan);
+			return Array.from(pendingTags, async (tag) => {
+				if (!await gitTagExists(this.cwd, tag)) return "pending";
+			});
 		},
 		async afterPublishAll({ plan }) {
 			const { cwd } = this;
 			const createdTags = [];
-			const pendingTags = getPendingTags(plan, (pkg) => pkg.publishResult.type === "published");
+			const pendingTags = getPendingTags(plan);
 			if (pendingTags.size === 0) return;
 			await Promise.all(Array.from(pendingTags, async (tag) => {
-				if (await gitTagExists(cwd, tag)) return;
 				const gitOut = await x("git", ["tag", tag], { nodeOptions: { cwd } });
-				if (gitOut.exitCode !== 0) throw execFailure(`Failed to create Git tag "${tag}" for release`, gitOut);
+				if (gitOut.exitCode !== 0) {
+					if (/already exists/i.test(`${gitOut.stdout}\n${gitOut.stderr}`)) return;
+					throw execFailure(`Failed to create Git tag "${tag}" for release`, gitOut);
+				}
 				createdTags.push(tag);
 			}));
 			if (pushTags && createdTags.length > 0) {

package/dist/plugins/github.d.ts

@@ -1,4 +1,4 @@
-import { C as WorkspacePackage, b as TegamiContext, p as PublishPlan, s as TegamiPlugin, t as Awaitable, w as Draft } from "../types-BbDtPn8I.js";
+import { C as WorkspacePackage, b as TegamiContext, p as PublishPlan, s as TegamiPlugin, t as Awaitable, w as Draft } from "../types-DKeF_CDv.js";
 import { GitPluginOptions } from "./git.js";
 
 //#region src/plugins/github.d.ts

package/dist/plugins/github.js

@@ -1,5 +1,5 @@
 import { i as formatPackageVersion, r as formatNpmDistTag } from "../semver-EKJ8yK5U.js";
-import { a as isCI, n as execFailure } from "../error-DNy8R5ue.js";
+import { a as isCI, n as execFailure } from "../error-D3dwQnwR.js";
 import { a as findOpenPullRequest, l as updatePullRequest, n as createPullRequest, r as createRelease, s as releaseExistsByTag } from "../api-D-jf_8xY.js";
 import { git } from "./git.js";
 import { join, relative } from "node:path";
@@ -67,42 +67,27 @@ function github(options = {}) {
 			const { repo, token } = this.github;
 			if (!repo || !token || releaseOptions === false) return;
 			const requiredTags = /* @__PURE__ */ new Set();
-			for (const pkg of plan.packages.values()) if (pkg.preflight.publish && pkg.git?.tag) requiredTags.add(pkg.git.tag);
-			try {
-				await Promise.all(Array.from(requiredTags, async (tag) => {
-					if (!await releaseExistsByTag(repo, tag, token)) throw "pending";
-				}));
-			} catch (e) {
-				if (e === "pending") return "pending";
-				throw e;
-			}
+			for (const pkg of plan.packages.values()) if (pkg.preflight.shouldPublish && pkg.git?.tag) requiredTags.add(pkg.git.tag);
+			return Array.from(requiredTags, async (tag) => {
+				if (!await releaseExistsByTag(repo, tag, token)) return "pending";
+			});
 		},
 		async afterPublishAll({ plan }) {
 			const { repo, token } = this.github;
 			if (!repo || !token || releaseOptions === false) return;
 			const { eager = false, create, createGrouped } = releaseOptions === true ? {} : releaseOptions;
 			const groups = /* @__PURE__ */ new Map();
-			for (const [id, packagePlan] of plan.packages) {
+			for (const [id, { preflight, publishResult, git }] of plan.packages) {
+				if (!eager && publishResult.type === "failed") return;
+				const tag = git?.tag;
+				if (!tag || !preflight.shouldPublish) continue;
 				const pkg = this.graph.get(id);
-				if (!eager && packagePlan.publishResult.type === "failed") return;
-				const tag = packagePlan.git?.tag;
-				if (!tag) continue;
 				const group = groups.get(tag);
 				if (group) group.push(pkg);
 				else groups.set(tag, [pkg]);
 			}
 			await Promise.all(Array.from(groups, async ([tag, packages]) => {
-				let hasFailed = false;
-				let hasPublished = false;
-				for (const member of packages) switch (plan.packages.get(member.id).publishResult.type) {
-					case "published":
-						hasPublished = true;
-						break;
-					case "failed":
-						hasFailed = true;
-						break;
-				}
-				if (hasFailed || !hasPublished) return;
+				for (const member of packages) if (plan.packages.get(member.id).publishResult.type === "failed") return;
 				if (await releaseExistsByTag(repo, tag, token)) return;
 				let release;
 				if (packages.length > 1) {

package/dist/plugins/go.d.ts

@@ -1,4 +1,4 @@
-import { C as WorkspacePackage, O as BumpType, s as TegamiPlugin } from "../types-BbDtPn8I.js";
+import { C as WorkspacePackage, O as BumpType, s as TegamiPlugin } from "../types-DKeF_CDv.js";
 
 //#region src/plugins/go.d.ts
 interface GoModFile {

package/dist/plugins/go.js

@@ -1,4 +1,4 @@
-import { i as isNodeError, n as execFailure } from "../error-DNy8R5ue.js";
+import { i as isNodeError, n as execFailure } from "../error-D3dwQnwR.js";
 import { n as WorkspacePackage } from "../graph-gThXu8Cz.js";
 import { relative, resolve } from "node:path";
 import { x } from "tinyexec";
@@ -147,13 +147,21 @@ function go({ updateLockFile = true, bumpDep: getBumpDepType } = {}) {
 				wait.push(linked.id);
 			}
 			return {
-				publish: !await isModulePublished(pkg.name, pkg.version),
+				shouldPublish: true,
 				wait
 			};
 		},
+		resolvePlanStatus({ plan }) {
+			return Array.from(plan.packages, async ([id, { preflight }]) => {
+				if (!preflight.shouldPublish) return;
+				const pkg = this.graph.get(id);
+				if (!(pkg instanceof GoPackage)) return;
+				if (!await isModulePublished(pkg.name, pkg.version)) return "pending";
+			});
+		},
 		async publish({ pkg }) {
 			if (!(pkg instanceof GoPackage)) return;
-			return { type: "published" };
+			return { type: await isModulePublished(pkg.name, pkg.version) ? "skipped" : "published" };
 		},
 		cli: { async draftApplied() {
 			if (!active || !updateLockFile) return;

package/dist/providers/cargo.d.ts

@@ -1,2 +1,2 @@
-import { g as cargo, h as CargoPluginOptions, m as CargoPackage } from "../types-BbDtPn8I.js";
+import { g as cargo, h as CargoPluginOptions, m as CargoPackage } from "../types-DKeF_CDv.js";
 export { CargoPackage, CargoPluginOptions, cargo };

package/dist/providers/cargo.js

@@ -1,4 +1,4 @@
-import { i as isNodeError, n as execFailure } from "../error-DNy8R5ue.js";
+import { i as isNodeError, n as execFailure } from "../error-D3dwQnwR.js";
 import { n as WorkspacePackage } from "../graph-gThXu8Cz.js";
 import { readFile, writeFile } from "node:fs/promises";
 import { join, normalize } from "node:path";
@@ -76,17 +76,28 @@ function cargo({ updateLockFile = true, bumpDep: getBumpDepType } = {}) {
 				wait.push(id);
 			}
 			return {
-				publish: pkg.version !== void 0 && pkg.packageInfo.publish !== false && !await isPackagePublished(pkg.name, pkg.version),
+				shouldPublish: pkg.version !== void 0 && pkg.packageInfo.publish !== false,
 				wait
 			};
 		},
+		resolvePlanStatus({ plan }) {
+			return Array.from(plan.packages, async ([id, { preflight }]) => {
+				if (!preflight.shouldPublish) return;
+				const pkg = this.graph.get(id);
+				if (!(pkg instanceof CargoPackage) || !pkg.version) return;
+				if (!await isPackagePublished(pkg.name, pkg.version)) return "pending";
+			});
+		},
 		async publish({ pkg }) {
 			if (!(pkg instanceof CargoPackage)) return;
 			const result = await x("cargo", ["publish"], { nodeOptions: { cwd: pkg.path } });
-			if (result.exitCode !== 0) return {
-				type: "failed",
-				error: execFailure(`Failed to publish ${pkg.name}@${pkg.version}.`, result).message
-			};
+			if (result.exitCode !== 0) {
+				if (/already exists|already published/i.test(`${result.stdout}\n${result.stderr}`)) return { type: "skipped" };
+				return {
+					type: "failed",
+					error: execFailure(`Failed to publish ${pkg.name}@${pkg.version}.`, result).message
+				};
+			}
 			return { type: "published" };
 		},
 		async applyDraft(draft) {

package/dist/providers/npm.d.ts

@@ -1,2 +1,2 @@
-import { _ as NpmPackage, v as NpmPluginOptions, y as npm } from "../types-BbDtPn8I.js";
+import { _ as NpmPackage, v as NpmPluginOptions, y as npm } from "../types-DKeF_CDv.js";
 export { NpmPackage, NpmPluginOptions, npm };

package/dist/providers/npm.js

@@ -1,2 +1,2 @@
-import { n as npm, t as NpmPackage } from "../npm-DqGyAsdo.js";
+import { n as npm, t as NpmPackage } from "../npm-B_43doHi.js";
 export { NpmPackage, npm };

package/dist/{types-BbDtPn8I.d.ts → types-DKeF_CDv.d.ts}

@@ -420,7 +420,11 @@ interface TegamiPlugin {
     lock: PublishLock;
     plan: PublishPlan;
   }): Awaitable<void>;
-  /** Collect data before publishing a package, will be merged if multiple plugins return preflight data for this package. */
+  /**
+   * Collect data before publishing a package.
+   *
+   * If multiple plugins return preflight data for the same package, only the first plugin will be considered.
+   */
   publishPreflight?(this: TegamiContext, opts: {
     pkg: WorkspacePackage;
     plan: PublishPlan;
@@ -437,7 +441,7 @@ interface TegamiPlugin {
    */
   resolvePlanStatus?(this: TegamiContext, opts: {
     plan: PublishPlan;
-  }): Awaitable<"success" | "pending" | undefined | void>;
+  }): Awaitable<"success" | "pending" | undefined | void | Awaitable<"success" | "pending" | undefined>[]>;
   /** Called before a package will be published, return `false` to prevent from publishing. */
   willPublish?(this: TegamiContext, opts: {
     pkg: WorkspacePackage;
@@ -460,8 +464,12 @@ interface TegamiPlugin {
 }
 type Awaitable<T> = T | Promise<T>;
 interface PublishPreflight {
-  /** if the package should be published. */
-  publish: boolean;
+  /**
+   * Whether the package should be published, the state **must not** be changed across different runs.
+   *
+   * To note if the package is already published, hook `resolvePlanStatus` on plugins, or skip at publish-time.
+   */
+  shouldPublish: boolean;
   /**
    * Package ids that must be published before this one, this will automatically disallow circular dependency.
    *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tegami",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "Utility for package versioning & publish",
   "license": "MIT",
   "author": "Fuma Nama",