@dbx-tools/projen 0.9.4 → 0.9.6

package/tasks/release-request.ts

@@ -3,10 +3,11 @@
 
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
-import { exec, project } from "@dbx-tools/core";
-import { log, string } from "@dbx-tools/shared-core";
+import * as projectUtils from "@dbx-tools/core/project-utils";
+import { log, stringUtils } from "@dbx-tools/shared-core";
 import { Command } from "commander";
 import { selectReleaseSummary } from "./release-summary.ts";
+import { captureTaskCommand, runTaskCommand } from "../src/_task-command.ts";
 
 const logger = log.logger("projen:release-request");
 
@@ -33,13 +34,7 @@ export async function prepareReleaseRequest(
   }
   const baseRef = options.push === false ? options.baseBranch : `origin/${options.baseBranch}`;
   if (options.synthesize !== false) {
-    exec.spawnSync(process.execPath, ["x", "projen"], {
-      cwd: root,
-      stdout: "inherit",
-      stderr: "inherit",
-      stdin: "ignore",
-      check: true,
-    });
+    runTaskCommand(root, process.execPath, ["x", "projen"]);
   }
   const dirty = capture(root, ["status", "--porcelain"]);
   if (dirty) {
@@ -74,7 +69,7 @@ export async function prepareReleaseRequest(
     throw new Error(`Release requests must run from a branch other than ${options.baseBranch}`);
   }
 
-  const customNotes = string.trimToNull(
+  const customNotes = stringUtils.trimToNull(
     options.notesFile ? readFileSync(resolve(root, options.notesFile), "utf8") : options.notes,
   );
   const notes =
@@ -130,27 +125,11 @@ async function generateRequestNotes(root: string, range: string): Promise<string
 }
 
 function capture(root: string, args: string[]): string {
-  return (
-    exec
-      .spawnSync("git", args, {
-        cwd: root,
-        stdout: "capture",
-        stderr: "inherit",
-        stdin: "ignore",
-        check: true,
-      })
-      .stdout?.trim() ?? ""
-  );
+  return captureTaskCommand(root, "git", args, { check: true, stderr: "inherit" });
 }
 
 function run(root: string, args: string[]): void {
-  exec.spawnSync("git", args, {
-    cwd: root,
-    stdout: "inherit",
-    stderr: "inherit",
-    stdin: "ignore",
-    check: true,
-  });
+  runTaskCommand(root, "git", args);
 }
 
 /** Restore option text after Projen forwards task arguments without shell quoting. */
@@ -175,7 +154,7 @@ if (import.meta.main) {
           throw new Error("Use --notes or --notes-file, not both");
         }
         await prepareReleaseRequest({
-          root: project.root() ?? process.cwd(),
+          root: projectUtils.root() ?? process.cwd(),
           baseBranch: options.base,
           message: optionText(options.message),
           notes: optionText(options.notes),

package/tasks/release-summary-units.ts

@@ -3,10 +3,10 @@
 
 import { existsSync, readFileSync, readdirSync, rmSync } from "node:fs";
 import { join, resolve } from "node:path";
-import { exec } from "@dbx-tools/core";
 import { log } from "@dbx-tools/shared-core";
 import { Command } from "commander";
 import { generateReleaseSummary } from "./release-summary.ts";
+import { captureTaskCommand } from "../src/_task-command.ts";
 import type { ReleaseUnitGraph } from "../src/release-catalog.ts";
 import type { ReleasePlan } from "../src/release-plan.ts";
 
@@ -71,12 +71,5 @@ function requestNotes(root: string): { summary?: string; paths: string[] } {
 }
 
 function gitCapture(root: string, args: string[]): string {
-  const result = exec.spawnSync("git", args, {
-    cwd: root,
-    stdout: "capture",
-    stderr: "ignore",
-    stdin: "ignore",
-    check: false,
-  });
-  return result.exitCode === 0 ? (result.stdout?.trim() ?? "") : "";
+  return captureTaskCommand(root, "git", args);
 }

package/tasks/release-summary.ts

@@ -6,8 +6,10 @@
  */
 import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { exec } from "@dbx-tools/core";
-import { json, log, object, string } from "@dbx-tools/shared-core";
+import * as exec from "@dbx-tools/core/exec";
+import * as projectUtils from "@dbx-tools/core/project-utils";
+import { json, log, object, stringUtils } from "@dbx-tools/shared-core";
+import { captureTaskCommand } from "../src/_task-command.ts";
 import {
   RELEASE_SUMMARY_PROVIDER_NAMES,
   releaseSummaryFile,
@@ -84,30 +86,23 @@ export type ReleaseSummaryRunner = (
 ) => string | undefined | Promise<string | undefined>;
 
 function capture(root: string, command: string, args: string[]): string {
-  const result = exec.spawnSync(command, args, {
-    cwd: root,
-    stdout: "capture",
-    stderr: "ignore",
-    stdin: "ignore",
-    check: false,
-  });
-  return result.exitCode === 0 ? (result.stdout?.trim() ?? "") : "";
+  return captureTaskCommand(root, command, args);
 }
 
 function contentText(value: unknown): string | undefined {
-  if (typeof value === "string") return string.trimToNull(value) ?? undefined;
+  if (typeof value === "string") return stringUtils.trimToNull(value) ?? undefined;
   if (!Array.isArray(value)) return undefined;
   const text = value
     .flatMap((item) => (object.isRecord(item) && typeof item.text === "string" ? [item.text] : []))
     .join("");
-  return string.trimToNull(text) ?? undefined;
+  return stringUtils.trimToNull(text) ?? undefined;
 }
 
 function eventText(event: Record<string, unknown>): string | undefined {
-  if (typeof event.result === "string") return string.trimToNull(event.result) ?? undefined;
+  if (typeof event.result === "string") return stringUtils.trimToNull(event.result) ?? undefined;
   const item = object.isRecord(event.item) ? event.item : undefined;
   if (item?.type === "agent_message" && typeof item.text === "string") {
-    return string.trimToNull(item.text) ?? undefined;
+    return stringUtils.trimToNull(item.text) ?? undefined;
   }
   const message = object.isRecord(event.message) ? event.message : undefined;
   return contentText(message?.content);
@@ -121,7 +116,7 @@ function eventType(event: Record<string, unknown>): string {
 function eventDetail(event: Record<string, unknown>): string | undefined {
   const item = object.isRecord(event.item) ? event.item : undefined;
   for (const value of [item?.message, event.message, event.error]) {
-    if (typeof value === "string") return string.trimToNull(value) ?? undefined;
+    if (typeof value === "string") return stringUtils.trimToNull(value) ?? undefined;
   }
   return undefined;
 }
@@ -129,7 +124,7 @@ function eventDetail(event: Record<string, unknown>): string | undefined {
 function eventToolName(event: Record<string, unknown>): string | undefined {
   const item = object.isRecord(event.item) ? event.item : undefined;
   for (const value of [event.tool_name, event.toolName, event.name, item?.tool_name, item?.name]) {
-    if (typeof value === "string") return string.trimToNull(value) ?? undefined;
+    if (typeof value === "string") return stringUtils.trimToNull(value) ?? undefined;
   }
   const toolCall = object.isRecord(event.tool_call)
     ? event.tool_call
@@ -185,7 +180,7 @@ async function runProvider(
       (line) => {
         const event = json.parseRecord(line);
         if (!event) {
-          const text = string.trimToNull(line);
+          const text = stringUtils.trimToNull(line);
           if (text) {
             textOutput.push(text);
             logEvent({ type: "text", text });
@@ -198,7 +193,7 @@ async function runProvider(
       },
     ],
     stderr: (line) => {
-      const message = string.trimToNull(line);
+      const message = stringUtils.trimToNull(line);
       if (message) logger.warn("provider-stderr", { provider: provider.name, message });
     },
     stdin: "ignore",
@@ -243,6 +238,7 @@ export async function selectReleaseSummary(
 }
 
 function summaryPrompt(
+  projectName: string,
   version: string,
   fromRef: string | undefined,
   commits: string,
@@ -250,7 +246,7 @@ function summaryPrompt(
   diffStat: string,
 ): string {
   return [
-    `Write a concise user-facing Markdown release summary for dbx-tools ${version}.`,
+    `Write a concise user-facing Markdown release summary for ${projectName} ${version}.`,
     "Use only the supplied Git context. Do not run commands, edit files, speculate,",
     "mention commit hashes, use emojis, or use em/en dashes.",
     "Return no title and no fenced block. Start with one short paragraph, then",
@@ -270,7 +266,12 @@ function summaryPrompt(
 }
 
 /** Deterministic fallback when every configured AI provider is unavailable. */
-function gitSummary(version: string, commits: string, changedFiles: string): string {
+function gitSummary(
+  projectName: string,
+  version: string,
+  commits: string,
+  changedFiles: string,
+): string {
   const subjects = commits
     .split("\n")
     .map((line) => line.trim())
@@ -290,7 +291,7 @@ function gitSummary(version: string, commits: string, changedFiles: string): str
     .slice(0, 12);
   const bullets = subjects.length ? subjects : areas.map((area) => `Updated ${area}`);
   return [
-    `dbx-tools ${version} contains the reviewed changes listed below.`,
+    `${projectName} ${version} contains the reviewed changes listed below.`,
     "",
     "## Changes",
     ...(bullets.length ? bullets.map((item) => `- ${item}`) : ["- Release metadata updated."]),
@@ -310,6 +311,7 @@ export async function generateReleaseSummary(options: {
   readonly providers?: readonly ReleaseSummaryProviderName[];
   readonly runner?: ReleaseSummaryRunner;
 }): Promise<string | undefined> {
+  const projectName = projectUtils.name(options.root);
   const relativeOutput =
     options.outputFile ?? releaseSummaryFile(options.version, options.component);
   const output = join(options.root, relativeOutput);
@@ -347,17 +349,26 @@ export async function generateReleaseSummary(options: {
     ...scopedPaths,
     `:(exclude)${relativeOutput}`,
   ]);
-  const customSummary = string.trimToNull(options.customSummary);
+  const customSummary = stringUtils.trimToNull(options.customSummary);
   const result = customSummary
     ? undefined
     : await selectReleaseSummary(
         options.root,
-        summaryPrompt(options.version, options.fromRef, commits, changedFiles, diffStat),
+        summaryPrompt(
+          projectName,
+          options.version,
+          options.fromRef,
+          commits,
+          changedFiles,
+          diffStat,
+        ),
         options.runner,
         options.providers,
       );
   const summary =
-    customSummary ?? result?.summary ?? gitSummary(options.version, commits, changedFiles);
+    customSummary ??
+    result?.summary ??
+    gitSummary(projectName, options.version, commits, changedFiles);
   const provider = customSummary ? "custom" : (result?.provider ?? "git");
   if (!customSummary && !result) {
     logger.info("AI providers unavailable; using Git release summary");

package/tasks/release-version.ts

@@ -0,0 +1,44 @@
+#!/usr/bin/env -S bun
+/** Validate one stable release version against the canonical workspace policy. */
+import { resolve } from "node:path";
+import { parseArgs } from "node:util";
+import * as projectUtils from "@dbx-tools/core/project-utils";
+import { compareSemver, parseSemver, resolveRemoteVersion } from "../src/workspace-version.ts";
+
+export function assertReleaseVersion(
+  version: string,
+  options: { root?: string; prefixes?: readonly string[]; assertNext?: boolean } = {},
+): void {
+  const parsed = parseSemver(version);
+  if (!parsed) {
+    throw new Error(
+      `release version must be an exact stable x.y.z, got ${JSON.stringify(version)}`,
+    );
+  }
+  if (!options.assertNext) return;
+  const root = resolve(options.root ?? projectUtils.root() ?? process.cwd());
+  const prefixes = options.prefixes?.length ? options.prefixes : ["v"];
+  const current = resolveRemoteVersion(root, prefixes, { fetch: false });
+  const currentParsed = current ? parseSemver(current) : undefined;
+  if (currentParsed && compareSemver(parsed, currentParsed) <= 0) {
+    throw new Error(`release version ${version} must be greater than published ${current}`);
+  }
+}
+
+if (import.meta.main) {
+  const { values } = parseArgs({
+    options: {
+      version: { type: "string" },
+      root: { type: "string" },
+      prefix: { type: "string", multiple: true },
+      "assert-next": { type: "boolean", default: false },
+    },
+    strict: true,
+  });
+  if (!values.version) throw new Error("--version is required");
+  assertReleaseVersion(values.version, {
+    ...(values.root ? { root: values.root } : {}),
+    ...(values.prefix ? { prefixes: values.prefix } : {}),
+    assertNext: values["assert-next"],
+  });
+}

package/tasks/rust-release.d.ts

@@ -0,0 +1,41 @@
+export declare const FINGERPRINT_SCHEMA = 3;
+export declare const VERSION_SLOT_SCHEMA = 1;
+export declare const VERSION_CAPACITY = 64;
+/** Canonical TOML representation with workspace-owned release versions removed. */
+export declare function normalizeManifest(text: string): string;
+/** Canonical Cargo.lock representation with local package versions normalized. */
+export declare function normalizeLockfile(text: string, workspaceVersion: string, packageNames?: ReadonlySet<string>): string;
+/** Hash Cargo-discovered members and every tracked or unignored file beneath them. */
+export declare function sourceHash(root: string, sources?: readonly string[]): string;
+export declare function linkerIdentity(target: string): string;
+export interface TargetKeyOptions {
+    readonly rustSourceHash: string;
+    readonly target: string;
+    readonly targetConfig?: string;
+    readonly toolchain?: string;
+    readonly rustc?: string;
+}
+export declare function targetKey({ rustSourceHash, target, targetConfig, toolchain, rustc, }: TargetKeyOptions): string;
+export interface FingerprintOptions {
+    readonly root?: string;
+    readonly output?: string;
+    readonly check?: boolean;
+    readonly targets: readonly string[];
+    readonly toolchain?: string;
+    readonly portable?: boolean;
+    readonly sources?: readonly string[];
+}
+export interface RustBuildFingerprint {
+    readonly schemaVersion: number;
+    readonly versionSlotSchema: number;
+    readonly rustSourceHash: string;
+    readonly targets: Readonly<Record<string, string>>;
+}
+export declare function fingerprint({ root, output, check, targets, toolchain, portable, sources, }: FingerprintOptions): RustBuildFingerprint;
+export interface StampOptions {
+    readonly objcopy?: string;
+    readonly codesign?: string;
+}
+export declare function stamp(binary: string, version: string, options?: StampOptions): boolean;
+export declare function stampTree(root: string, version: string, options?: StampOptions): number;
+export declare function main(args?: readonly string[]): void;