tegami 0.2.0 → 0.2.1

package/dist/cli/index.d.ts

@@ -1,4 +1,4 @@
-import { O as Draft, S as PublishPlan, g as Tegami, t as Awaitable } from "../types-CurHqnWl.js";
+import { O as Draft, S as PublishPlan, g as Tegami, t as Awaitable } from "../types-DEaKjB3O.js";
 import { Command } from "commander";
 
 //#region src/cli/index.d.ts

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 import { r as formatNpmDistTag } from "../semver-C4vJ4SK8.js";
-import { a as renderChangelog, n as generateFromCommits, r as generateReplays, t as changelogFilename } from "../generate-BMlrn-2e.js";
+import { a as renderChangelog, n as generateFromCommits, r as generateReplays, t as changelogFilename } from "../generate-L7ucD7ic.js";
 import { a as isCI, n as execFailure, r as handlePluginError, t as CancelledError } from "../error-DNy8R5ue.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";
@@ -503,7 +503,11 @@ async function versionPackages(tegami, options) {
 		outro("No versions changed.");
 		return false;
 	}
-	if (await tegami.publishStatus() === "pending") throw new Error(`Publish lock at ${context.lockPath} is still pending. Publish it before applying a new draft.`);
+	if (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;
+	}
 	const lines = [];
 	for (const pkg of context.graph.getPackages()) {
 		const plan = draft.getPackageDraft(pkg.id);

package/dist/{generate-BMlrn-2e.js → generate-L7ucD7ic.js}

@@ -1,6 +1,6 @@
 import { a as maxBump, t as bumpDepth } from "./semver-C4vJ4SK8.js";
 import { n as execFailure } from "./error-DNy8R5ue.js";
-import { t as bumpTypeSchema } from "./schemas-B7N6EE2k.js";
+import { t as bumpTypeSchema } from "./schemas-BdUlXfSu.js";
 import { x } from "tinyexec";
 import * as semver from "semver";
 import z from "zod";

package/dist/generators/simple.d.ts

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

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { A as PackageDraft, C as CommitChangelog, D as WorkspacePackage, E as PackageGroup, O as Draft, S as PublishPlan, T as PackageGraph, _ as tegami, a as PublishPreflight, b as PackagePublishResult, c as TegamiPluginOption, g as Tegami, h as GenerateChangelogOptions, i as PackageOptions, k as DraftPolicy, n as GroupOptions, o as TegamiOptions, r as LogGenerator, s as TegamiPlugin, v as PublishLock, x as PublishOptions, y as PackagePublishPlan } from "./types-CurHqnWl.js";
+import { A as PackageDraft, C as CommitChangelog, D as WorkspacePackage, E as PackageGroup, O as Draft, S as PublishPlan, T as PackageGraph, _ as tegami, a as PublishPreflight, b as PackagePublishResult, c as TegamiPluginOption, g as Tegami, h as GenerateChangelogOptions, i as PackageOptions, k as DraftPolicy, n as GroupOptions, o as TegamiOptions, r as LogGenerator, s as TegamiPlugin, v as PublishLock, x as PublishOptions, y as PackagePublishPlan } from "./types-DEaKjB3O.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,5 +1,5 @@
 import { a as maxBump } from "./semver-C4vJ4SK8.js";
-import { i as changelogFrontmatterSchema, n as generateFromCommits } from "./generate-BMlrn-2e.js";
+import { i as changelogFrontmatterSchema, n as generateFromCommits } from "./generate-L7ucD7ic.js";
 import { r as handlePluginError } from "./error-DNy8R5ue.js";
 import { t as PackageGraph } from "./graph-DrzluXw8.js";
 import { cargo } from "./providers/cargo.js";
@@ -526,7 +526,7 @@ function resolvePublishTargets(plan) {
 	const ordered = [];
 	function scan(id, stack = /* @__PURE__ */ new Set()) {
 		const preflight = plan.packages.get(id)?.preflight;
-		if (!preflight || preflight.publish === false) return;
+		if (!preflight || !preflight.publish) return;
 		if (stack.has(id)) throw new Error(`circular reference of deps: ${[...stack, id].join(" -> ")}`);
 		if (ordered.includes(id)) return;
 		if (preflight.wait) {
@@ -591,14 +591,15 @@ async function runPublishPlan(context, plan) {
 async function runPreflights(context, plan) {
 	const promises = [];
 	const runPreflight = async (pkg) => {
-		const out = {};
+		const out = { publish: true };
 		for (const plugin of context.plugins) {
 			const res = await handlePluginError(plugin, "publishPreflight", () => plugin.publishPreflight?.call(context, {
 				pkg,
 				plan
 			}));
-			if (res?.publish !== void 0) out.publish = res.publish;
-			if (res?.wait) {
+			if (res === void 0) continue;
+			out.publish = res.publish;
+			if (res.wait) {
 				out.wait ??= [];
 				out.wait.push(...res.wait);
 			}
@@ -620,7 +621,7 @@ async function runPreflights(context, plan) {
 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 ?? true) return "pending";
+		if (pkg.preflight.publish) return "pending";
 	}
 	try {
 		await Promise.all(context.plugins.map(async (plugin) => {

package/dist/plugins/git.d.ts

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

package/dist/plugins/git.js

@@ -9,11 +9,11 @@ import { x } from "tinyexec";
 */
 function git(options = {}) {
 	const { createTags = true, pushTags = isCI() } = options;
-	function getPendingTags(plan) {
+	function getPendingTags(plan, filterPackage) {
 		const pendingTags = /* @__PURE__ */ new Set();
 		if ((plan.options.dryRun ?? false) || !createTags) return pendingTags;
 		for (const pkg of plan.packages.values()) {
-			if (pkg.publishResult.type !== "published") continue;
+			if (filterPackage && !filterPackage(pkg)) continue;
 			const tag = pkg.git?.tag;
 			if (tag) pendingTags.add(tag);
 		}
@@ -50,7 +50,7 @@ function git(options = {}) {
 			}
 		},
 		async resolvePlanStatus({ plan }) {
-			const pendingTags = getPendingTags(plan);
+			const pendingTags = getPendingTags(plan, (pkg) => pkg.preflight.publish);
 			if (pendingTags.size === 0) return;
 			try {
 				await Promise.all(Array.from(pendingTags, async (tag) => {
@@ -64,7 +64,7 @@ function git(options = {}) {
 		async afterPublishAll({ plan }) {
 			const { cwd } = this;
 			const createdTags = [];
-			const pendingTags = getPendingTags(plan);
+			const pendingTags = getPendingTags(plan, (pkg) => pkg.publishResult.type === "published");
 			if (pendingTags.size === 0) return;
 			await Promise.all(Array.from(pendingTags, async (tag) => {
 				if (await gitTagExists(cwd, tag)) return;

package/dist/plugins/github.d.ts

@@ -1,4 +1,4 @@
-import { D as WorkspacePackage, O as Draft, S as PublishPlan, s as TegamiPlugin, t as Awaitable, w as TegamiContext } from "../types-CurHqnWl.js";
+import { D as WorkspacePackage, O as Draft, S as PublishPlan, s as TegamiPlugin, t as Awaitable, w as TegamiContext } from "../types-DEaKjB3O.js";
 import { GitPluginOptions } from "./git.js";
 
 //#region src/plugins/github.d.ts

package/dist/plugins/github.js

@@ -61,9 +61,10 @@ function github(options = {}) {
 		async resolvePlanStatus({ plan }) {
 			const { repo, token } = this.github;
 			if (!repo || !token || releaseOptions === false) return;
-			const tags = groupPackagesByTag(this, plan);
+			const requiredTags = /* @__PURE__ */ new Set();
+			for (const pkg of plan.packages.values()) if (pkg.preflight.publish && pkg.git) requiredTags.add(pkg.git.tag);
 			try {
-				await Promise.all(Array.from(tags.keys(), async (tag) => {
+				await Promise.all(Array.from(requiredTags, async (tag) => {
 					if (!await releaseExistsByTag(repo, tag, token)) throw "pending";
 				}));
 			} catch (e) {
@@ -75,10 +76,17 @@ function github(options = {}) {
 			const { repo, token } = this.github;
 			if (!repo || !token || releaseOptions === false) return;
 			const { eager = false, create, createGrouped } = releaseOptions === true ? {} : releaseOptions;
-			if (!eager) {
-				for (const pkg of plan.packages.values()) if (pkg.publishResult.type === "failed") return;
+			const groups = /* @__PURE__ */ new Map();
+			for (const [id, packagePlan] of plan.packages) {
+				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(groupPackagesByTag(this, plan), async ([tag, packages]) => {
+			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) {
@@ -198,18 +206,6 @@ function github(options = {}) {
 		}
 	}];
 }
-function groupPackagesByTag({ graph }, plan) {
-	const groups = /* @__PURE__ */ new Map();
-	for (const [id, packagePlan] of plan.packages) {
-		const pkg = graph.get(id);
-		const tag = packagePlan.git?.tag;
-		if (!tag) continue;
-		const group = groups.get(tag);
-		if (group) group.push(pkg);
-		else groups.set(tag, [pkg]);
-	}
-	return groups;
-}
 async function hasGitChanges(cwd) {
 	return (await x("git", ["status", "--porcelain"], { nodeOptions: { cwd } })).stdout.trim().length > 0;
 }

package/dist/providers/cargo.d.ts

@@ -1,2 +1,2 @@
-import { d as cargo, l as CargoPackage, u as CargoPluginOptions } from "../types-CurHqnWl.js";
+import { d as cargo, l as CargoPackage, u as CargoPluginOptions } from "../types-DEaKjB3O.js";
 export { CargoPackage, CargoPluginOptions, cargo };

package/dist/providers/npm.d.ts

@@ -1,2 +1,2 @@
-import { f as NpmPackage, m as npm, p as NpmPluginOptions } from "../types-CurHqnWl.js";
+import { f as NpmPackage, m as npm, p as NpmPluginOptions } from "../types-DEaKjB3O.js";
 export { NpmPackage, NpmPluginOptions, npm };

package/dist/providers/npm.js

@@ -1,5 +1,5 @@
 import { i as isNodeError, n as execFailure } from "../error-DNy8R5ue.js";
-import { n as packageManifestSchema, r as pnpmWorkspaceSchema } from "../schemas-B7N6EE2k.js";
+import { n as packageManifestSchema, r as pnpmWorkspaceSchema } from "../schemas-BdUlXfSu.js";
 import { n as WorkspacePackage } from "../graph-DrzluXw8.js";
 import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
@@ -112,13 +112,7 @@ function npm({ client: defaultClient, onBreakPeerDep = "set", updateLockFile = t
 		},
 		async publishPreflight({ pkg }) {
 			if (!(pkg instanceof NpmPackage)) return;
-			if (pkg.manifest.private === true) return { publish: false };
-			const registry = pkg.manifest.publishConfig?.registry;
-			const base = (registry ?? "https://registry.npmjs.org").replace(/\/$/, "");
-			const response = await fetch(`${base}/${pkg.name}/${pkg.version}`, { headers: { Accept: "application/json" } });
-			if (response.status === 404) return { publish: true };
-			if (!response.ok) throw new Error(`Unable to validate ${pkg.name}@${pkg.version} against the npm registry${registry ? ` "${registry}"` : ""}.`);
-			return { publish: false };
+			return { publish: pkg.manifest.private !== true && !await isPackagePublished(pkg) };
 		},
 		initPublishLock({ lock, draft }) {
 			for (const [id, pkg] of draft.getPackageDrafts()) {
@@ -141,42 +135,7 @@ function npm({ client: defaultClient, onBreakPeerDep = "set", updateLockFile = t
 		},
 		async publish({ pkg, plan }) {
 			if (!(pkg instanceof NpmPackage)) return;
-			const distTag = plan.packages.get(pkg.id).npm?.distTag;
-			if (client === "bun") {
-				const tarballPath = path.resolve(pkg.path, "pkg.tgz");
-				const packResult = await x("bun", [
-					"pm",
-					"pack",
-					"--filename",
-					tarballPath
-				], { nodeOptions: { cwd: pkg.path } });
-				if (packResult.exitCode !== 0) return {
-					type: "failed",
-					error: execFailure(`Failed to pack ${pkg.name}@${pkg.version}.`, packResult).message
-				};
-				const publishArgs = ["publish", tarballPath];
-				if (distTag) publishArgs.push("--tag", distTag);
-				const publishResult = await x("npm", publishArgs, { nodeOptions: { cwd: pkg.path } });
-				if (publishResult.exitCode !== 0) return {
-					type: "failed",
-					error: execFailure(`Failed to publish ${pkg.name}@${pkg.version}${distTag ? ` with dist-tag "${distTag}"` : ""}.`, publishResult).message
-				};
-				return { type: "published" };
-			}
-			let command;
-			const args = ["publish"];
-			if (distTag) args.push("--tag", distTag);
-			if (client === "pnpm") {
-				command = "pnpm";
-				args.push("--no-git-checks");
-			} else if (client === "yarn") command = "yarn";
-			else command = "npm";
-			const result = await x(command, args, { nodeOptions: { cwd: pkg.path } });
-			if (result.exitCode !== 0) return {
-				type: "failed",
-				error: execFailure(`Failed to publish ${pkg.name}@${pkg.version}${distTag ? ` with dist-tag "${distTag}"` : ""}.`, result).message
-			};
-			return { type: "published" };
+			return publish(client, pkg, plan.packages.get(pkg.id)?.npm?.distTag);
 		},
 		initDraft(plan) {
 			if (!active) return;
@@ -275,6 +234,64 @@ function depsPolicy(context, getBumpDepType) {
 		}
 	};
 }
+async function publish(client, pkg, distTag) {
+	if (client === "bun") {
+		for (const script of [
+			"prepublishOnly",
+			"prepack",
+			"prepare"
+		]) {
+			if (!pkg.manifest.scripts?.[script]) continue;
+			const result = await x("bun", ["run", script], { nodeOptions: { cwd: pkg.path } });
+			if (result.exitCode === 0) continue;
+			return {
+				type: "failed",
+				error: execFailure(`Failed to run ${script} script for ${pkg.name}@${pkg.version}.`, result).message
+			};
+		}
+		const tarballPath = path.resolve(pkg.path, "pkg.tgz");
+		const packResult = await x("bun", [
+			"pm",
+			"pack",
+			"--filename",
+			tarballPath
+		], { nodeOptions: { cwd: pkg.path } });
+		if (packResult.exitCode !== 0) return {
+			type: "failed",
+			error: execFailure(`Failed to pack ${pkg.name}@${pkg.version}.`, packResult).message
+		};
+		const publishArgs = ["publish", tarballPath];
+		if (distTag) publishArgs.push("--tag", distTag);
+		const publishResult = await x("npm", publishArgs, { nodeOptions: { cwd: pkg.path } });
+		if (publishResult.exitCode !== 0) return {
+			type: "failed",
+			error: execFailure(`Failed to publish ${pkg.name}@${pkg.version}${distTag ? ` with dist-tag "${distTag}"` : ""}.`, publishResult).message
+		};
+		return { type: "published" };
+	}
+	let command;
+	const args = ["publish"];
+	if (distTag) args.push("--tag", distTag);
+	if (client === "pnpm") {
+		command = "pnpm";
+		args.push("--no-git-checks");
+	} else if (client === "yarn") command = "yarn";
+	else command = "npm";
+	const result = await x(command, args, { nodeOptions: { cwd: pkg.path } });
+	if (result.exitCode !== 0) return {
+		type: "failed",
+		error: execFailure(`Failed to publish ${pkg.name}@${pkg.version}${distTag ? ` with dist-tag "${distTag}"` : ""}.`, result).message
+	};
+	return { type: "published" };
+}
+async function isPackagePublished(pkg) {
+	const registry = pkg.manifest.publishConfig?.registry ?? "https://registry.npmjs.org";
+	const base = registry.replace(/\/$/, "");
+	const response = await fetch(`${base}/${pkg.name}/${pkg.version}`, { headers: { Accept: "application/json" } });
+	if (response.status === 404) return false;
+	if (!response.ok) throw new Error(`Unable to validate ${pkg.name}@${pkg.version} against the npm registry${registry ? ` "${registry}"` : ""}.`);
+	return true;
+}
 async function discoverNpmPackages(cwd, add) {
 	let patterns;
 	const rootManifest = await readManifest(cwd).catch(() => void 0);

package/dist/{schemas-B7N6EE2k.js → schemas-BdUlXfSu.js}

@@ -16,6 +16,7 @@ const packageManifestSchema = z$1.looseObject({
 		registry: z$1.string().optional(),
 		tag: z$1.string().optional()
 	}).optional(),
+	scripts: z$1.record(z$1.string(), z$1.string()).optional(),
 	workspaces: z$1.array(z$1.string()).optional(),
 	dependencies: stringRecordSchema.optional(),
 	devDependencies: stringRecordSchema.optional(),

package/dist/{types-CurHqnWl.d.ts → types-DEaKjB3O.d.ts}

@@ -285,6 +285,7 @@ declare const packageManifestSchema: z$1.ZodObject<{
     registry: z$1.ZodOptional<z$1.ZodString>;
     tag: z$1.ZodOptional<z$1.ZodString>;
   }, z$1.core.$loose>>;
+  scripts: z$1.ZodOptional<z$1.ZodRecord<z$1.ZodString, z$1.ZodString>>;
   workspaces: z$1.ZodOptional<z$1.ZodArray<z$1.ZodString>>;
   dependencies: z$1.ZodOptional<z$1.ZodRecord<z$1.ZodString, z$1.ZodString>>;
   devDependencies: z$1.ZodOptional<z$1.ZodRecord<z$1.ZodString, z$1.ZodString>>;
@@ -512,8 +513,8 @@ interface TegamiPlugin {
 }
 type Awaitable<T> = T | Promise<T>;
 interface PublishPreflight {
-  /** if the package should be published, default to `true`. */
-  publish?: boolean;
+  /** if the package should be published. */
+  publish: 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": "0.2.0",
+  "version": "0.2.1",
   "description": "Utility for package versioning & publish",
   "license": "MIT",
   "author": "Fuma Nama",