@doki-land/nifty 0.0.0 → 0.0.2

package/src/cli/publish.ts

@@ -1,85 +1,95 @@
-import { loadNiftyNative } from "../native.js";
-import { authPayload, parseAuthArgs } from "./authArgs.js";
-
-export type PublishOptions = {
-    cwd?: string;
-    dryRun?: boolean;
-    tag?: string;
-    access?: string;
-};
-
-export type PublishReport = {
-    root: string;
-    order: string[];
-    published: string[];
-    skipped: string[];
-};
-
-export async function runPublish(argv: string[]): Promise<void> {
-    const options = parsePublishArgs(argv);
-    const native = loadNiftyNative();
-    const report = native.publisher["publish-workspace"]({
-        cwd: options.cwd,
-        dryRun: options.dryRun,
-        tag: options.tag,
-        access: options.access,
-        ...authPayload(options.auth),
-    });
-    printReport(report, options.dryRun);
-}
-
-function parsePublishArgs(argv: string[]) {
-    let cwd: string | undefined;
-    let dryRun = false;
-    let tag: string | undefined;
-    let access = "public";
-    const auth = parseAuthArgs(argv);
-
-    for (let i = 0; i < argv.length; i += 1) {
-        const arg = argv[i];
-        if (arg === "--dry-run") {
-            dryRun = true;
-        } else if (arg === "-C" || arg === "--cwd") {
-            cwd = argv[++i];
-        } else if (arg === "--tag") {
-            tag = argv[++i];
-        } else if (arg === "--access") {
-            access = argv[++i];
-        } else if (arg === "-h" || arg === "--help") {
-            printPublishHelp();
-            process.exit(0);
-        } else if (arg.startsWith("-")) {
-            continue;
-        }
-    }
-
-    return { cwd, dryRun, tag, access, auth };
-}
-
-function printReport(report: PublishReport, dryRun?: boolean): void {
-    const prefix = dryRun ? "would publish" : "published";
-    console.log(`${prefix} workspace ${report.root}`);
-    if (report.skipped.length > 0) {
-        console.log(`skipped private packages: ${report.skipped.join(", ")}`);
-    }
-    console.log("publish order:");
-    for (const name of report.order) {
-        const marker = report.published.includes(name) ? prefix : "pending";
-        console.log(`  ${marker}: ${name}`);
-    }
-}
-
-function printPublishHelp(): void {
-    console.log(`nifty publish — publish workspace npm packages in dependency order
-
-OTP/TOTP is generated in nifty-publisher (set NPM_TOTP_SECRET in .env.placeholder.local).
-
-Usage:
-  nifty publish
-  nifty publish --dry-run
-  nifty publish --tag next
-  nifty publish --access public
-  nifty publish --otp 123456
-  nifty publish -C <cwd>
-`);
-}
+import { loadNiftyNative } from "../native.js";
+import { authPayload, parseAuthArgs } from "./authArgs.js";
+
+export type PublishOptions = {
+    cwd?: string;
+    dryRun?: boolean;
+    tag?: string;
+    access?: string;
+};
+
+export type PublishReport = {
+    root: string;
+    order: string[];
+    published: string[];
+    skipped: string[];
+    skippedVersions: string[];
+};
+
+export async function runPublish(argv: string[]): Promise<void> {
+    const options = parsePublishArgs(argv);
+    const native = loadNiftyNative();
+    const report = native.publisher["publish-workspace"]({
+        cwd: options.cwd,
+        dryRun: options.dryRun,
+        refresh: options.refresh,
+        tag: options.tag,
+        access: options.access,
+        ...authPayload(options.auth),
+    });
+    printPublishReport(report, options.dryRun);
+}
+
+function parsePublishArgs(argv: string[]) {
+    let cwd: string | undefined;
+    let dryRun = false;
+    let refresh = false;
+    let tag: string | undefined;
+    let access = "public";
+    const auth = parseAuthArgs(argv);
+
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        if (arg === "--dry-run") {
+            dryRun = true;
+        } else if (arg === "--refresh") {
+            refresh = true;
+        } else if (arg === "-C" || arg === "--cwd") {
+            cwd = argv[++i];
+        } else if (arg === "--tag") {
+            tag = argv[++i];
+        } else if (arg === "--access") {
+            access = argv[++i];
+        } else if (arg === "-h" || arg === "--help") {
+            printPublishHelp();
+            process.exit(0);
+        } else if (arg.startsWith("-")) {
+            continue;
+        }
+    }
+
+    return { cwd, dryRun, refresh, tag, access, auth };
+}
+
+export function printPublishReport(report: PublishReport, dryRun?: boolean): void {
+    const prefix = dryRun ? "would publish" : "published";
+    console.log(`${prefix} workspace ${report.root}`);
+    if (report.skipped.length > 0) {
+        console.log(`skipped private packages: ${report.skipped.join(", ")}`);
+    }
+    if (report.skippedVersions.length > 0) {
+        console.log(`skipped already published: ${report.skippedVersions.join(", ")}`);
+    }
+    console.log("publish order:");
+    for (const name of report.order) {
+        const marker = report.published.includes(name) ? prefix : "pending";
+        console.log(`  ${marker}: ${name}`);
+    }
+}
+
+function printPublishHelp(): void {
+    console.log(`nifty publish — publish workspace npm packages in dependency order
+
+OTP/TOTP is generated in nifty-publisher (set NPM_TOTP_SECRET in .env.placeholder.local).
+Publish state is cached in .cache/npm-placeholder.json.
+
+Usage:
+  nifty publish
+  nifty publish --dry-run
+  nifty publish --refresh
+  nifty publish --tag next
+  nifty publish --access public
+  nifty publish --otp 123456
+  nifty publish -C <cwd>
+`);
+}

package/src/cli/resolveNpm.ts

@@ -1,16 +1,16 @@
-import { existsSync } from "node:fs";
-import { dirname, join } from "node:path";
-
-/** Resolve npm next to the active Node binary (Windows needs `npm.cmd`). */
-export function resolveNpmExecutable(): string {
-    if (process.env.NIFTY_NPM) {
-        return process.env.NIFTY_NPM;
-    }
-
-    const sibling = join(dirname(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
-    if (existsSync(sibling)) {
-        return sibling;
-    }
-
-    return process.platform === "win32" ? "npm.cmd" : "npm";
-}
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+
+/** Resolve npm next to the active Node binary (Windows needs `npm.cmd`). */
+export function resolveNpmExecutable(): string {
+    if (process.env.NIFTY_NPM) {
+        return process.env.NIFTY_NPM;
+    }
+
+    const sibling = join(dirname(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
+    if (existsSync(sibling)) {
+        return sibling;
+    }
+
+    return process.platform === "win32" ? "npm.cmd" : "npm";
+}

package/src/cli/retime-cmd.ts

@@ -0,0 +1,62 @@
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { loadNiftyNative } from "../native.js";
+import { bootstrapFromOptions } from "./context.js";
+import { cwdFrom, str } from "./options.js";
+
+export function registerRetimeCommand(cli: Cli): void {
+    const retime = cli.command("retime", "cli.cmd.retime")
+        .option("-s, --start-date <start>", "cli.opt.start-date")
+        .option("--end-date <end>", "cli.opt.end-date")
+        .option("-b, --branch <branch>", "cli.opt.branch")
+        .option("--tip <ref>", "cli.opt.tip");
+
+    retime
+        .command("root", "cli.cmd.retime.root")
+        .option("-s, --start-date <start>", "cli.opt.start-date")
+        .option("--end-date <end>", "cli.opt.end-date")
+        .option("-b, --branch <branch>", "cli.opt.branch")
+        .option("--tip <ref>", "cli.opt.tip")
+        .option("-m, --message <text>", "cli.opt.message")
+        .action(async (options) => cmdRetimeRoot(options));
+
+    retime.action(async (options) => cmdRetimeRange(options));
+}
+
+export async function cmdRetimeRange(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const commit = options._[0];
+    if (!commit) {
+        throw new Error("missing commit hash for range retime");
+    }
+    const native = loadNiftyNative();
+    const report = native.history["retime-range"]({
+        cwd: cwdFrom(options),
+        commit,
+        startDate: str(options, "start-date"),
+        endDate: str(options, "end-date"),
+        branch: str(options, "branch"),
+        tip: str(options, "tip"),
+    });
+    printRetimeSummary(report);
+    return 0;
+}
+
+export async function cmdRetimeRoot(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const native = loadNiftyNative();
+    const report = native.history["retime-root"]({
+        cwd: cwdFrom(options),
+        startDate: str(options, "start-date"),
+        endDate: str(options, "end-date"),
+        branch: str(options, "branch"),
+        tip: str(options, "tip"),
+        message: str(options, "message"),
+    });
+    printRetimeSummary(report);
+    return 0;
+}
+
+function printRetimeSummary(report: { rewritten: number; branch: string; newTip: string }): void {
+    console.log(`retimed ${report.rewritten} commit(s) on branch ${report.branch}; tip ${report.newTip}`);
+}

package/src/cli/reword-cmd.ts

@@ -0,0 +1,87 @@
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { loadNiftyNative } from "../native.js";
+import { bootstrapFromOptions } from "./context.js";
+import { cwdFrom, flag, str } from "./options.js";
+
+export function registerRewordCommand(cli: Cli): void {
+    const reword = cli.command("reword", "cli.cmd.reword");
+
+    reword
+        .command("export", "cli.cmd.reword.export")
+        .option("--base <ref>", "cli.opt.base")
+        .option("--ref <ref>", "cli.opt.ref")
+        .option("--path <file>", "cli.opt.path")
+        .action(async (options) => cmdRewordExport(options));
+
+    reword
+        .command("rewrite", "cli.cmd.reword.rewrite")
+        .option("--base <ref>", "cli.opt.base")
+        .option("--ref <ref>", "cli.opt.ref")
+        .option("--path <file>", "cli.opt.path")
+        .option("--dry-run", "cli.opt.dry-run")
+        .action(async (options) => cmdRewordRewrite(options));
+}
+
+export async function cmdRewordExport(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const base = requireStr(options, "base");
+    const path = str(options, "path") ?? "reword.pending.json";
+    const native = loadNiftyNative();
+    const report = native.history["reword-export"]({
+        cwd: cwdFrom(options),
+        base,
+        ref: str(options, "ref"),
+        path,
+    });
+    console.log(`export: wrote ${report.count} commit entry(ies) to ${report.path}`);
+    return 0;
+}
+
+export async function cmdRewordRewrite(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const base = requireStr(options, "base");
+    const path = requireStr(options, "path");
+    const dryRun = flag(options, "dry-run");
+    const native = loadNiftyNative();
+    const report = native.history["reword-rewrite"]({
+        cwd: cwdFrom(options),
+        base,
+        ref: str(options, "ref"),
+        path,
+        dryRun,
+    });
+
+    if (dryRun) {
+        if (report.changes.length === 0) {
+            console.log("dry-run: no commit objects need rewriting");
+            return 0;
+        }
+        console.log(`dry-run: ${report.changes.length} commit object(s) would be rewritten on ${report.refName}\n`);
+        for (const change of report.changes) {
+            console.log(`${change.oldOid}  ${change.oldSubject}`);
+            console.log(`     ->  ${change.newSubject}`);
+            if (change.parentsRelinked && !change.messageChanged) {
+                console.log("     (parent chain relink only)");
+            }
+            console.log();
+        }
+        return 0;
+    }
+
+    console.log(
+        `rewrote ${report.changes.length} commit object(s); ${report.oldTip} -> ${report.newTip ?? report.oldTip}`,
+    );
+    for (const change of report.changes) {
+        console.log(`  ${change.oldOid}  ${change.newSubject}`);
+    }
+    return 0;
+}
+
+function requireStr(options: ParsedOptions, key: string): string {
+    const value = str(options, key);
+    if (!value) {
+        throw new Error(`missing required --${key}`);
+    }
+    return value;
+}

package/src/cli/trust-cmd.ts

@@ -0,0 +1,38 @@
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { loadNiftyNative } from "../native.js";
+import { authPayload } from "./authArgs.js";
+import { loadConfig } from "../config/loadConfig.js";
+import { bootstrapFromOptions } from "./context.js";
+import { printTrustReport } from "./trust.js";
+import { authFromOptions, cwdFrom, flag, str } from "./options.js";
+
+export function registerTrustCommand(cli: Cli): void {
+    cli.command("trust", "cli.cmd.trust")
+        .option("--dry-run", "cli.opt.dry-run")
+        .option("--refresh", "cli.opt.refresh")
+        .option("--only <package>", "cli.opt.only")
+        .option("--otp <code>", "cli.opt.otp")
+        .option("--totp-secret <secret>", "cli.opt.totp-secret")
+        .option("--npm-token <token>", "cli.opt.npm-token")
+        .action(async (options) => cmdTrust(options));
+}
+
+export async function cmdTrust(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const { config } = await loadConfig({ cwd: cwdFrom(options), createIfMissing: false });
+    const native = loadNiftyNative();
+    const report = native.publisher["trust-workspace"]({
+        cwd: cwdFrom(options),
+        dryRun: flag(options, "dry-run"),
+        refresh: flag(options, "refresh"),
+        only: str(options, "only"),
+        packages: config.publish?.packages,
+        ...authPayload(authFromOptions(options)),
+    });
+    printTrustReport(report);
+    if (report.failed.length > 0) {
+        throw new Error(`trust failed for ${report.failed.length} package(s)`);
+    }
+    return 0;
+}

package/src/cli/trust.ts

@@ -1,77 +1,83 @@
-import { loadNiftyNative } from "../native.js";
-import { authPayload, parseAuthArgs } from "./authArgs.js";
-
-export type TrustReport = {
-    root: string;
-    configured: string[];
-    skipped: string[];
-    failed: string[];
-};
-
-export async function runTrust(argv: string[]): Promise<void> {
-    const options = parseTrustArgs(argv);
-    const native = loadNiftyNative();
-    const report = native.publisher["trust-workspace"]({
-        cwd: options.cwd,
-        dryRun: options.dryRun,
-        only: options.only,
-        ...authPayload(options.auth),
-    });
-    printReport(report);
-}
-
-function parseTrustArgs(argv: string[]) {
-    let cwd: string | undefined;
-    let dryRun = false;
-    let only: string | undefined;
-    const auth = parseAuthArgs(argv);
-
-    for (let i = 0; i < argv.length; i += 1) {
-        const arg = argv[i];
-        if (arg === "--dry-run") {
-            dryRun = true;
-        } else if (arg === "-C" || arg === "--cwd") {
-            cwd = argv[++i];
-        } else if (arg === "--only") {
-            only = argv[++i];
-        } else if (arg === "-h" || arg === "--help") {
-            printTrustHelp();
-            process.exit(0);
-        }
-    }
-
-    return { cwd, dryRun, only, auth };
-}
-
-function printReport(report: TrustReport): void {
-    console.log(`trust workspace ${report.root}`);
-    console.log(`  configured: ${report.configured.length}`);
-    for (const name of report.configured) {
-        console.log(`    + ${name}`);
-    }
-    console.log(`  skipped: ${report.skipped.length}`);
-    for (const name of report.skipped) {
-        console.log(`    = ${name}`);
-    }
-    if (report.failed.length > 0) {
-        console.log(`  failed: ${report.failed.length}`);
-        for (const name of report.failed) {
-            console.log(`    ! ${name}`);
-        }
-    }
-}
-
-function printTrustHelp(): void {
-    console.log(`nifty trust — configure npm Trusted Publisher for workspace packages
-
-Reads NPM_TOTP_SECRET / NPM_OTP / NPM_TOKEN from env or .env.placeholder.local.
-
-Usage:
-  nifty trust
-  nifty trust --only @doki-land/nifty
-  nifty trust --dry-run
-  nifty trust --totp-secret <base32>
-  nifty trust --otp 123456
-  nifty trust -C <cwd>
-`);
-}
+import { loadNiftyNative } from "../native.js";
+import { authPayload, parseAuthArgs } from "./authArgs.js";
+
+export type TrustReport = {
+    root: string;
+    configured: string[];
+    skipped: string[];
+    failed: string[];
+};
+
+export async function runTrust(argv: string[]): Promise<void> {
+    const options = parseTrustArgs(argv);
+    const native = loadNiftyNative();
+    const report = native.publisher["trust-workspace"]({
+        cwd: options.cwd,
+        dryRun: options.dryRun,
+        refresh: options.refresh,
+        only: options.only,
+        ...authPayload(options.auth),
+    });
+    printTrustReport(report);
+}
+
+function parseTrustArgs(argv: string[]) {
+    let cwd: string | undefined;
+    let dryRun = false;
+    let refresh = false;
+    let only: string | undefined;
+    const auth = parseAuthArgs(argv);
+
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        if (arg === "--dry-run") {
+            dryRun = true;
+        } else if (arg === "--refresh") {
+            refresh = true;
+        } else if (arg === "-C" || arg === "--cwd") {
+            cwd = argv[++i];
+        } else if (arg === "--only") {
+            only = argv[++i];
+        } else if (arg === "-h" || arg === "--help") {
+            printTrustHelp();
+            process.exit(0);
+        }
+    }
+
+    return { cwd, dryRun, refresh, only, auth };
+}
+
+export function printTrustReport(report: TrustReport): void {
+    console.log(`trust workspace ${report.root}`);
+    console.log(`  configured: ${report.configured.length}`);
+    for (const name of report.configured) {
+        console.log(`    + ${name}`);
+    }
+    console.log(`  skipped: ${report.skipped.length}`);
+    for (const name of report.skipped) {
+        console.log(`    = ${name}`);
+    }
+    if (report.failed.length > 0) {
+        console.log(`  failed: ${report.failed.length}`);
+        for (const name of report.failed) {
+            console.log(`    ! ${name}`);
+        }
+    }
+}
+
+function printTrustHelp(): void {
+    console.log(`nifty trust — configure npm Trusted Publisher for workspace packages
+
+Reads NPM_TOTP_SECRET / NPM_OTP / NPM_TOKEN from env or .env.placeholder.local.
+Trust list cache lives in .cache/npm-placeholder.json.
+
+Usage:
+  nifty trust
+  nifty trust --only @doki-land/nifty
+  nifty trust --dry-run
+  nifty trust --refresh
+  nifty trust --totp-secret <base32>
+  nifty trust --otp 123456
+  nifty trust -C <cwd>
+`);
+}

package/src/cli/update-cmd.ts

@@ -0,0 +1,20 @@
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { bootstrapFromOptions } from "./context.js";
+import { updateWorkspace } from "./update.js";
+import { cwdFrom, flag } from "./options.js";
+
+export function registerUpdateCommand(cli: Cli): void {
+    cli.command("update", "cli.cmd.update")
+        .option("-i, --interactive", "cli.opt.interactive")
+        .action(async (options) => cmdUpdate(options));
+}
+
+export async function cmdUpdate(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    await updateWorkspace({
+        interactive: flag(options, "interactive"),
+        cwd: cwdFrom(options),
+    });
+    return 0;
+}