tegami 0.1.0 → 0.1.1

package/dist/{checks-BQISvt_o.js → checks-Bz3Rf2OX.js}

@@ -1,4 +1,4 @@
-import { n as handlePluginError } from "./error-DBK-9uBa.js";
+import { n as handlePluginError } from "./error-BaOQJtvf.js";
 import { n as jsonCodec, t as bumpTypeSchema } from "./schemas-CurBAaW5.js";
 import z$1 from "zod";
 import { readFile } from "fs/promises";

package/dist/cli/index.d.ts

@@ -1,4 +1,4 @@
-import { C as PublishResult, O as DraftPlan, _ as Tegami, t as Awaitable } from "../types-UjsZkz42.js";
+import { k as DraftPlan, t as Awaitable, v as Tegami, w as PublishResult } from "../types-Diwnh8Tn.js";
 import { Command } from "commander";
 
 //#region src/cli/index.d.ts

package/dist/cli/index.js

@@ -1,5 +1,5 @@
-import { a as changelogFilename, t as assertPublishPlanFinished } from "../checks-BQISvt_o.js";
-import { n as handlePluginError } from "../error-DBK-9uBa.js";
+import { a as changelogFilename, t as assertPublishPlanFinished } from "../checks-Bz3Rf2OX.js";
+import { n as handlePluginError, t as execFailure } from "../error-BaOQJtvf.js";
 import { n as formatNpmDistTag } from "../semver-mWK2Khi2.js";
 import { t as isCI } from "../constants-B9qjNfvr.js";
 import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
@@ -144,7 +144,7 @@ async function postPrComment(body) {
 		"--jq",
 		`[.[] | select(.body | startswith("${COMMENT_MARKER}")) | .id][0] // empty`
 	]);
-	if (listResult.exitCode !== 0) throw new Error(listResult.stderr || "Failed to list pull request comments.");
+	if (listResult.exitCode !== 0) throw execFailure("Failed to list pull request comments.", listResult);
 	const existingId = listResult.stdout.trim();
 	if (existingId) {
 		const dir = await mkdtemp(join(tmpdir(), "tegami-pr-comment-"));
@@ -159,7 +159,7 @@ async function postPrComment(body) {
 				"--input",
 				inputPath
 			]);
-			if (updateResult.exitCode !== 0) throw new Error(updateResult.stderr || "Failed to update pull request comment.");
+			if (updateResult.exitCode !== 0) throw execFailure("Failed to update pull request comment.", updateResult);
 		} finally {
 			await rm(dir, {
 				recursive: true,
@@ -177,7 +177,7 @@ async function postPrComment(body) {
 		"--repo",
 		repo
 	]);
-	if (createResult.exitCode !== 0) throw new Error(createResult.stderr || "Failed to create pull request comment.");
+	if (createResult.exitCode !== 0) throw execFailure("Failed to create pull request comment.", createResult);
 }
 async function readPullRequestNumberFromWorkflowRunEvent() {
 	const eventPath = process.env.GITHUB_EVENT_PATH;
@@ -220,7 +220,7 @@ async function readPullRequestFromGh(repo, number) {
 		"--json",
 		"headRefName,baseRefOid,headRefOid,headRepository"
 	]);
-	if (result.exitCode !== 0) throw new Error(result.stderr || `Failed to resolve pull request #${number}.`);
+	if (result.exitCode !== 0) throw execFailure(`Failed to resolve pull request #${number}.`, result);
 	const data = JSON.parse(result.stdout);
 	return {
 		repo,
@@ -258,10 +258,7 @@ async function listPullRequestChangelogFiles(context, baseSha, headSha) {
 		"--",
 		`${dir}/`
 	], { nodeOptions: { cwd: context.cwd } });
-	if (result.exitCode !== 0) {
-		const detail = result.stderr.trim();
-		throw new Error(detail ? `Failed to list pull request changelog files: ${detail}` : "Failed to list pull request changelog files.");
-	}
+	if (result.exitCode !== 0) throw execFailure("Failed to list pull request changelog files.", result);
 	const files = /* @__PURE__ */ new Set();
 	for (const line of result.stdout.split("\n")) {
 		const trimmed = line.trim();

package/dist/{error-DBK-9uBa.js → error-BaOQJtvf.js}

@@ -1,11 +1,10 @@
 //#region src/utils/error.ts
-function commandOutput(result) {
-	return [result.stdout, result.stderr].filter(Boolean).join("\n").trim();
-}
 function execFailure(context, result) {
 	const lines = [context, `(exit ${result.exitCode})`];
-	const output = commandOutput(result);
-	if (output) lines.push(output);
+	const out = result.stdout.trim();
+	const err = result.stderr.trim();
+	if (out) lines.push(out);
+	if (err) lines.push(err);
 	return new Error(lines.join("\n"));
 }
 function isNodeError(error) {

package/dist/generators/simple.d.ts

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

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { C as PublishResult, D as WorkspacePackage, E as PackageGroup, O as DraftPlan, S as PublishOptions, T as PackageGraph, _ as Tegami, a as RegistryClient, b as CreatedChangelog, c as TegamiPluginOption, i as PackageOptions, k as PackagePlan, n as GroupOptions, o as TegamiOptions, r as LogGenerator, s as TegamiPlugin, v as tegami, x as PackagePublishResult, y as CreateChangelogOptions } from "./types-UjsZkz42.js";
-export { type CreateChangelogOptions, type CreatedChangelog, type DraftPlan, type GroupOptions, type LogGenerator, type PackageGraph, type PackageGroup, type PackageOptions, type PackagePlan, type PackagePublishResult, type PublishOptions, type PublishResult, type RegistryClient, Tegami, type TegamiOptions, type TegamiPlugin, type TegamiPluginOption, type WorkspacePackage, tegami };
+import { A as PackagePlan, C as PublishOptions, D as PackageGroup, E as PackageGraph, O as WorkspacePackage, S as PackagePublishResult, a as PublishPreflight, b as CreateChangelogOptions, c as TegamiPlugin, i as PackageOptions, k as DraftPlan, l as TegamiPluginOption, n as GroupOptions, o as RegistryClient, r as LogGenerator, s as TegamiOptions, v as Tegami, w as PublishResult, x as CreatedChangelog, y as tegami } from "./types-Diwnh8Tn.js";
+export { type CreateChangelogOptions, type CreatedChangelog, type DraftPlan, type GroupOptions, type LogGenerator, type PackageGraph, type PackageGroup, type PackageOptions, type PackagePlan, type PackagePublishResult, type PublishOptions, type PublishPreflight, type PublishResult, type RegistryClient, Tegami, type TegamiOptions, type TegamiPlugin, type TegamiPluginOption, type WorkspacePackage, tegami };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { a as changelogFilename, i as readPlanStore, n as publishPlanStatus, r as createPlanStore, t as assertPublishPlanFinished } from "./checks-BQISvt_o.js";
-import { n as handlePluginError, t as execFailure } from "./error-DBK-9uBa.js";
+import { a as changelogFilename, i as readPlanStore, n as publishPlanStatus, r as createPlanStore, t as assertPublishPlanFinished } from "./checks-Bz3Rf2OX.js";
+import { n as handlePluginError, t as execFailure } from "./error-BaOQJtvf.js";
 import { i as maxBump } from "./semver-mWK2Khi2.js";
 import { t as PackageGraph } from "./graph-CUgwuRW5.js";
 import { cargo } from "./providers/cargo.js";
@@ -490,14 +490,48 @@ function headingToBump(depth) {
 }
 //#endregion
 //#region src/publish.ts
+async function resolvePublishTargets(context, store) {
+	const targets = [];
+	const preflightPromises = [];
+	for (const [id, plan] of Object.entries(store.packages)) {
+		if (!plan.publish) continue;
+		const pkg = context.graph.get(id);
+		if (!pkg) continue;
+		targets.push(pkg.id);
+		preflightPromises.push(context.getRegistryClient(pkg).publishPreflight?.(pkg, {
+			store,
+			packageStore: plan
+		}));
+	}
+	const preflights = await Promise.all(preflightPromises);
+	const children = /* @__PURE__ */ new Map();
+	for (let i = 0; i < targets.length; i++) {
+		const id = targets[i];
+		children.set(id, preflights[i]?.wait);
+	}
+	const ordered = [];
+	function scan(id, stack = /* @__PURE__ */ new Set()) {
+		if (stack.has(id)) throw new Error(`circular reference of deps: ${[...stack, id].join(" -> ")}`);
+		if (ordered.includes(id)) return;
+		const deps = children.get(id);
+		if (deps) {
+			stack.add(id);
+			for (const dep of deps) scan(dep, stack);
+			stack.delete(id);
+		}
+		ordered.push(id);
+	}
+	for (const id of targets) scan(id);
+	return ordered;
+}
 async function publishFromPlan(context, store, options) {
 	const { dryRun = false } = options;
 	const packages = [];
 	if ((await publishPlanStatus(store, context)).state !== "pending") return { state: "skipped" };
-	for (const [id, plan] of Object.entries(store.packages)) {
-		if (!plan.publish) continue;
+	const orderedIds = await resolvePublishTargets(context, store);
+	for (const id of orderedIds) {
+		const plan = store.packages[id];
 		const pkg = context.graph.get(id);
-		if (!pkg) continue;
 		const registryClient = context.getRegistryClient(pkg);
 		const changelogs = [];
 		for (const id of plan.changelogIds ?? []) {

package/dist/plugins/git.d.ts

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

package/dist/plugins/git.js

@@ -1,4 +1,4 @@
-import { t as execFailure } from "../error-DBK-9uBa.js";
+import { t as execFailure } from "../error-BaOQJtvf.js";
 import { t as isCI } from "../constants-B9qjNfvr.js";
 import { x } from "tinyexec";
 //#region src/plugins/git.ts

package/dist/plugins/github.d.ts

@@ -1,4 +1,4 @@
-import { O as DraftPlan, s as TegamiPlugin, t as Awaitable, w as TegamiContext, x as PackagePublishResult } from "../types-UjsZkz42.js";
+import { S as PackagePublishResult, T as TegamiContext, c as TegamiPlugin, k as DraftPlan, t as Awaitable } from "../types-Diwnh8Tn.js";
 import { GitPluginOptions } from "./git.js";
 
 //#region src/plugins/github.d.ts

package/dist/plugins/github.js

@@ -1,4 +1,4 @@
-import { t as execFailure } from "../error-DBK-9uBa.js";
+import { t as execFailure } from "../error-BaOQJtvf.js";
 import { n as formatNpmDistTag, r as formatPackageVersion } from "../semver-mWK2Khi2.js";
 import { t as isCI } from "../constants-B9qjNfvr.js";
 import { git } from "./git.js";

package/dist/providers/cargo.d.ts

@@ -1,2 +1,2 @@
-import { d as CargoRegistryClient, f as cargo, l as CargoPackage, u as CargoPluginOptions } from "../types-UjsZkz42.js";
+import { d as CargoPluginOptions, f as CargoRegistryClient, p as cargo, u as CargoPackage } from "../types-Diwnh8Tn.js";
 export { CargoPackage, CargoPluginOptions, CargoRegistryClient, cargo };

package/dist/providers/cargo.js

@@ -1,4 +1,4 @@
-import { r as isNodeError } from "../error-DBK-9uBa.js";
+import { r as isNodeError, t as execFailure } from "../error-BaOQJtvf.js";
 import { n as WorkspacePackage } from "../graph-CUgwuRW5.js";
 import { readFile, writeFile } from "node:fs/promises";
 import { join, normalize } from "node:path";
@@ -55,9 +55,12 @@ var CargoPackage = class extends WorkspacePackage {
 	}
 };
 var CargoRegistryClient = class {
+	graph;
 	id = "cargo";
 	#versionMap = /* @__PURE__ */ new Map();
-	constructor(_graph) {}
+	constructor(graph) {
+		this.graph = graph;
+	}
 	supports(pkg) {
 		return pkg instanceof CargoPackage;
 	}
@@ -74,14 +77,24 @@ var CargoRegistryClient = class {
 		}
 		return info;
 	}
-	async publish(pkg) {
-		await x("cargo", ["publish"], {
-			nodeOptions: { cwd: pkg.path },
-			throwOnError: true
-		});
+	publishPreflight(pkg, { store }) {
+		const wait = [];
+		for (const { table } of dependencyTables(pkg.manifest, "")) for (const [rawName, rawSpec] of Object.entries(table)) {
+			if (!isTableValue(rawSpec) || typeof rawSpec.path !== "string") continue;
+			const id = `cargo:${stringValue(rawSpec.package) ?? rawName}`;
+			if (!store.packages[id]?.publish) continue;
+			const linked = this.graph.get(id);
+			if (!linked || !(linked instanceof CargoPackage)) continue;
+			wait.push(id);
+		}
+		return { wait };
+	}
+	async publish(pkg, _env) {
+		const result = await x("cargo", ["publish"], { nodeOptions: { cwd: pkg.path } });
+		if (result.exitCode !== 0) throw execFailure(`Failed to publish ${pkg.name}@${pkg.version}.`, result);
 	}
 };
-function cargo({ bumpDep: getBumpDepType = ({ kind }) => {
+function cargo({ updateLockFile = false, bumpDep: getBumpDepType = ({ kind }) => {
 	switch (kind) {
 		case "dependencies": return "patch";
 		case "build-dependencies":
@@ -159,7 +172,12 @@ function cargo({ bumpDep: getBumpDepType = ({ kind }) => {
 				writes.push(pkg.write());
 			}
 			await Promise.all(writes);
-		}
+		},
+		cli: { async publishPlanApplied() {
+			if (!updateLockFile) return;
+			const result = await x("cargo", ["update", "--workspace"], { nodeOptions: { cwd: this.cwd } });
+			if (result.exitCode !== 0) throw execFailure("Failed to update Cargo lock file", result);
+		} }
 	};
 }
 async function discoverCargoPackages(cwd, add) {

package/dist/providers/npm.d.ts

@@ -1,2 +1,2 @@
-import { g as npm, h as NpmRegistryClient, m as NpmPluginOptions, p as NpmPackage } from "../types-UjsZkz42.js";
+import { _ as npm, g as NpmRegistryClient, h as NpmPluginOptions, m as NpmPackage } from "../types-Diwnh8Tn.js";
 export { NpmPackage, NpmPluginOptions, NpmRegistryClient, npm };

package/dist/providers/npm.js

@@ -1,4 +1,4 @@
-import { r as isNodeError, t as execFailure } from "../error-DBK-9uBa.js";
+import { r as isNodeError, t as execFailure } from "../error-BaOQJtvf.js";
 import { n as WorkspacePackage } from "../graph-CUgwuRW5.js";
 import { i as pnpmWorkspaceSchema, r as packageManifestSchema } from "../schemas-CurBAaW5.js";
 import { readFile, writeFile } from "node:fs/promises";
@@ -70,9 +70,8 @@ var NpmRegistryClient = class {
 				if (registry) args.push("--registry", registry);
 				const result = await x(this.client === "pnpm" ? "pnpm" : "npm", args, { nodeOptions: { cwd: this.cwd } });
 				if (result.exitCode === 0) return true;
-				const output = commandOutput(result);
-				if (isMissingRegistryEntry(output)) return false;
-				throw new Error(`Unable to validate ${pkg.name}@${pkg.version} against the npm registry${registry ? ` "${registry}"` : ""}: ${output.trim() || `command exited with code ${result.exitCode}`}`);
+				if (isMissingRegistryEntry(commandOutput(result))) return false;
+				throw execFailure(`Unable to validate ${pkg.name}@${pkg.version} against the npm registry${registry ? ` "${registry}"` : ""}.`, result);
 			};
 			info = run();
 			this.#versionMap.set(cacheKey, info);

package/dist/{types-UjsZkz42.d.ts → types-Diwnh8Tn.d.ts}

@@ -377,13 +377,28 @@ declare class CargoPackage extends WorkspacePackage {
 }
 declare class CargoRegistryClient implements RegistryClient {
   #private;
+  private readonly graph;
   readonly id = "cargo";
-  constructor(_graph: PackageGraph);
+  constructor(graph: PackageGraph);
   supports(pkg: WorkspacePackage): boolean;
   isPackagePublished(pkg: CargoPackage): Promise<boolean>;
-  publish(pkg: CargoPackage): Promise<void>;
+  publishPreflight(pkg: CargoPackage, {
+    store
+  }: {
+    store: PlanStore;
+  }): PublishPreflight;
+  publish(pkg: CargoPackage, _env: {
+    store: PlanStore;
+    packageStore: PackagePlanStore;
+  }): Promise<void>;
 }
 interface CargoPluginOptions {
+  /**
+   * Update lock file after versioning.
+   *
+   * @default false
+   */
+  updateLockFile?: boolean;
   bumpDep?: (opts: {
     kind: (typeof DEP_FIELDS)[number];
     name: string;
@@ -391,6 +406,7 @@ interface CargoPluginOptions {
   }) => BumpType | false;
 }
 declare function cargo({
+  updateLockFile,
   bumpDep: getBumpDepType
 }?: CargoPluginOptions): TegamiPlugin;
 //#endregion
@@ -403,7 +419,7 @@ interface LogGenerator {
     version: string;
     changelogs: ChangelogEntry[];
     plan: PackagePlan;
-    _draft: DraftPlan;
+    unstable_draft: DraftPlan;
   }): string | Promise<string>;
 }
 interface TegamiOptions<Groups extends string = string> {
@@ -486,14 +502,22 @@ type Awaitable<T> = T | Promise<T>;
 interface PublishPlanStatus {
   state: "pending" | "success" | "missing";
 }
+interface PublishPreflight {
+  /** Package ids that must be published before this one, this will automatically disallow circular dependency. */
+  wait: string[];
+}
 interface RegistryClient {
   id: string;
   supports(pkg: WorkspacePackage): boolean;
   isPackagePublished(pkg: WorkspacePackage): Promise<boolean>;
+  publishPreflight?(pkg: WorkspacePackage, env: {
+    store: PlanStore;
+    packageStore: PackagePlanStore;
+  }): Awaitable<PublishPreflight | void | undefined>;
   publish(pkg: WorkspacePackage, env: {
     store: PlanStore;
     packageStore: PackagePlanStore;
   }): Promise<void>;
 }
 //#endregion
-export { PublishResult as C, WorkspacePackage as D, PackageGroup as E, DraftPlan as O, PublishOptions as S, PackageGraph as T, Tegami as _, RegistryClient as a, CreatedChangelog as b, TegamiPluginOption as c, CargoRegistryClient as d, cargo as f, npm as g, NpmRegistryClient as h, PackageOptions as i, PackagePlan as k, CargoPackage as l, NpmPluginOptions as m, GroupOptions as n, TegamiOptions as o, NpmPackage as p, LogGenerator as r, TegamiPlugin as s, Awaitable as t, CargoPluginOptions as u, tegami as v, TegamiContext as w, PackagePublishResult as x, CreateChangelogOptions as y };
+export { PackagePlan as A, PublishOptions as C, PackageGroup as D, PackageGraph as E, WorkspacePackage as O, PackagePublishResult as S, TegamiContext as T, npm as _, PublishPreflight as a, CreateChangelogOptions as b, TegamiPlugin as c, CargoPluginOptions as d, CargoRegistryClient as f, NpmRegistryClient as g, NpmPluginOptions as h, PackageOptions as i, DraftPlan as k, TegamiPluginOption as l, NpmPackage as m, GroupOptions as n, RegistryClient as o, cargo as p, LogGenerator as r, TegamiOptions as s, Awaitable as t, CargoPackage as u, Tegami as v, PublishResult as w, CreatedChangelog as x, tegami as y };

package/package.json

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