@doki-land/nifty 0.0.4 → 0.0.6

package/src/cli/cli.ts

@@ -1,47 +1,47 @@
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-import { createCli } from "@vmz/commander";
-
-import { registerBumpCommand } from "./bump-cmd.js";
-import { registerFormatCommand } from "./format-cmd.js";
-import { registerChangeLogsCommand } from "./change-logs-cmd.js";
-import { registerInstallNativeCommand } from "./install-native-cmd.js";
-import { registerLintCommands } from "./lint-cmd.js";
-import { registerPublishCommand } from "./publish-cmd.js";
-import { registerRetimeCommand } from "./retime-cmd.js";
-import { registerRewordCommand } from "./reword-cmd.js";
-import { registerTrustCommand } from "./trust-cmd.js";
-import { registerUpdateCommand } from "./update-cmd.js";
-import { registerUploadCommand } from "./upload-cmd.js";
-
-function buildNiftyCli() {
-    const localesRoot = join(dirname(fileURLToPath(import.meta.url)), "../../locales");
-    const cli = createCli("nifty")
-        .locales(localesRoot)
-        .intro("cli.intro")
-        .option("-C, --cwd <dir>", "cli.opt.cwd");
-
-    registerUpdateCommand(cli);
-    registerFormatCommand(cli);
-    registerLintCommands(cli);
-    registerUploadCommand(cli);
-    registerInstallNativeCommand(cli);
-    registerBumpCommand(cli);
-    registerPublishCommand(cli);
-    registerTrustCommand(cli);
-    registerRewordCommand(cli);
-    registerRetimeCommand(cli);
-    registerChangeLogsCommand(cli);
-
-    return cli;
-}
-
-export async function runCli(argv: string[]): Promise<number> {
-    try {
-        return await buildNiftyCli().parse(argv);
-    } catch (error) {
-        console.error(`error: ${error instanceof Error ? error.message : String(error)}`);
-        return 1;
-    }
-}
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { createCli } from "@vmz/commander";
+
+import { registerBumpCommand } from "./bump-cmd.js";
+import { registerFormatCommand } from "./format-cmd.js";
+import { registerChangeLogsCommand } from "./change-logs-cmd.js";
+import { registerInstallNativeCommand } from "./install-native-cmd.js";
+import { registerLintCommands } from "./lint-cmd.js";
+import { registerPublishCommand } from "./publish-cmd.js";
+import { registerRetimeCommand } from "./retime-cmd.js";
+import { registerCommitCommand } from "./commit-cmd.js";
+import { registerTrustCommand } from "./trust-cmd.js";
+import { registerUpdateCommand } from "./update-cmd.js";
+import { registerUploadCommand } from "./upload-cmd.js";
+
+function buildNiftyCli() {
+    const localesRoot = join(dirname(fileURLToPath(import.meta.url)), "../../locales");
+    const cli = createCli("nifty")
+        .locales(localesRoot)
+        .intro("cli.intro")
+        .option("-C, --cwd <dir>", "cli.opt.cwd");
+
+    registerUpdateCommand(cli);
+    registerFormatCommand(cli);
+    registerLintCommands(cli);
+    registerUploadCommand(cli);
+    registerInstallNativeCommand(cli);
+    registerBumpCommand(cli);
+    registerPublishCommand(cli);
+    registerTrustCommand(cli);
+    registerCommitCommand(cli);
+    registerRetimeCommand(cli);
+    registerChangeLogsCommand(cli);
+
+    return cli;
+}
+
+export async function runCli(argv: string[]): Promise<number> {
+    try {
+        return await buildNiftyCli().parse(argv);
+    } catch (error) {
+        console.error(`error: ${error instanceof Error ? error.message : String(error)}`);
+        return 1;
+    }
+}

package/src/cli/{reword-cmd.ts → commit-cmd.ts}

@@ -1,87 +1,128 @@
-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;
-}
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { loadNiftyNative } from "../native.js";
+import { bootstrapFromOptions } from "./context.js";
+import { lintCommits, type LintOptions } from "./lint.js";
+import { cwdFrom, flag, str, strList } from "./options.js";
+
+export function registerCommitCommand(cli: Cli): void {
+    const commit = cli.command("commit", "cli.cmd.commit");
+
+    commit
+        .command("export", "cli.cmd.commit.export")
+        .option("--base <ref>", "cli.opt.base")
+        .option("--ref <ref>", "cli.opt.ref")
+        .option("--path <file>", "cli.opt.path")
+        .action(async (options) => cmdCommitExport(options));
+
+    commit
+        .command("apply", "cli.cmd.commit.apply")
+        .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) => cmdCommitApply(options));
+
+    commit
+        .command("scan", "cli.cmd.commit.scan")
+        .option("--from <ref>", "cli.opt.from")
+        .option("--to <ref>", "cli.opt.to")
+        .option("-s, --subject <text>...", "cli.opt.subject")
+        .action(async (options) => cmdCommitScan(options));
+
+    commit
+        .command("audit", "cli.cmd.commit.audit")
+        .option("--from <ref>", "cli.opt.from")
+        .option("--to <ref>", "cli.opt.to")
+        .option("-s, --subject <text>...", "cli.opt.subject")
+        .action(async (options) => cmdCommitAudit(options));
+}
+
+export async function cmdCommitExport(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const base = requireStr(options, "base");
+    const path = str(options, "path") ?? "commit.pending.json";
+    const native = loadNiftyNative();
+    const report = native.history["commit-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 cmdCommitApply(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["commit-apply"]({
+        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(
+        `applied ${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;
+}
+
+export async function cmdCommitScan(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    await lintCommits(commitLintOptions(options), false, true);
+    return 0;
+}
+
+export async function cmdCommitAudit(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const errorCount = await lintCommits(commitLintOptions(options), true, true);
+    if (errorCount > 0) {
+        throw new Error(`found ${errorCount} commit audit error(s)`);
+    }
+    return 0;
+}
+
+function commitLintOptions(options: ParsedOptions): LintOptions {
+    return {
+        subjects: strList(options, "subject"),
+        from: str(options, "from"),
+        to: str(options, "to"),
+        cwd: cwdFrom(options),
+        scanCargo: false,
+        commitOnly: true,
+    };
+}
+
+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/context.ts

@@ -1,36 +1,36 @@
-import { resolve } from "node:path";
-
-import type { ParsedOptions } from "@vmz/commander";
-
-import { loadConfig } from "../config/loadConfig.js";
-import { cwdFrom } from "./options.js";
-
-/** Parse shared CLI flags used across nifty commands. */
-export function parseCliContext(argv: string[]): { cwd: string; dryRun: boolean } {
-    let cwd = process.cwd();
-    let dryRun = false;
-
-    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 = resolve(argv[++i] ?? cwd);
-        }
-    }
-
-    return { cwd, dryRun };
-}
-
-/** Ensure `nifty.config.*` exists before running a command (skip create on `--dry-run`). */
-export async function bootstrapNiftyConfig(argv: string[]): Promise<void> {
-    const { cwd, dryRun } = parseCliContext(argv);
-    await loadConfig({ cwd, createIfMissing: !dryRun });
-}
-
-/** Commander action hook: load config from parsed global/command flags. */
-export async function bootstrapFromOptions(options: ParsedOptions): Promise<void> {
-    const cwd = cwdFrom(options) ?? process.cwd();
-    const dryRun = options["dry-run"] === true;
-    await loadConfig({ cwd, createIfMissing: !dryRun });
-}
+import { resolve } from "node:path";
+
+import type { ParsedOptions } from "@vmz/commander";
+
+import { loadConfig } from "../config/loadConfig.js";
+import { cwdFrom } from "./options.js";
+
+/** Parse shared CLI flags used across nifty commands. */
+export function parseCliContext(argv: string[]): { cwd: string; dryRun: boolean } {
+    let cwd = process.cwd();
+    let dryRun = false;
+
+    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 = resolve(argv[++i] ?? cwd);
+        }
+    }
+
+    return { cwd, dryRun };
+}
+
+/** Ensure `nifty.config.*` exists before running a command (skip create on `--dry-run`). */
+export async function bootstrapNiftyConfig(argv: string[]): Promise<void> {
+    const { cwd, dryRun } = parseCliContext(argv);
+    await loadConfig({ cwd, createIfMissing: !dryRun });
+}
+
+/** Commander action hook: load config from parsed global/command flags. */
+export async function bootstrapFromOptions(options: ParsedOptions): Promise<void> {
+    const cwd = cwdFrom(options) ?? process.cwd();
+    const dryRun = options["dry-run"] === true;
+    await loadConfig({ cwd, createIfMissing: !dryRun });
+}

package/src/cli/format-cmd.ts

@@ -1,23 +1,23 @@
-import type { Cli, ParsedOptions } from "@vmz/commander";
-
-import { bootstrapFromOptions } from "./context.js";
-import { formatWorkspace } from "./format.js";
-import { cwdFrom, flag } from "./options.js";
-
-export function registerFormatCommand(cli: Cli): void {
-    cli.command("format", "cli.cmd.format")
-        .option("--check", "cli.opt.check")
-        .action(async (options) => cmdFormat(options));
-}
-
-export async function cmdFormat(options: ParsedOptions): Promise<number> {
-    await bootstrapFromOptions(options);
-    const exitCode = await formatWorkspace({
-        check: flag(options, "check"),
-        cwd: cwdFrom(options),
-    });
-    if (exitCode !== 0) {
-        throw new Error("format check failed");
-    }
-    return 0;
-}
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { bootstrapFromOptions } from "./context.js";
+import { formatWorkspace } from "./format.js";
+import { cwdFrom, flag } from "./options.js";
+
+export function registerFormatCommand(cli: Cli): void {
+    cli.command("format", "cli.cmd.format")
+        .option("--check", "cli.opt.check")
+        .action(async (options) => cmdFormat(options));
+}
+
+export async function cmdFormat(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const exitCode = await formatWorkspace({
+        check: flag(options, "check"),
+        cwd: cwdFrom(options),
+    });
+    if (exitCode !== 0) {
+        throw new Error("format check failed");
+    }
+    return 0;
+}

package/src/cli/format.ts

@@ -1,28 +1,39 @@
-import { loadNiftyNative } from "../native.js";
-
-export type FormatOptions = {
-    check?: boolean;
-    cwd?: string;
-};
-
-export async function formatWorkspace(options: FormatOptions): Promise<number> {
-    const native = loadNiftyNative();
-    const report = native.formatter.run({
-        cwd: options.cwd,
-        check: options.check,
-    });
-
-    if (report.errors.length > 0) {
-        for (const message of report.errors) {
-            console.error(`error: ${message}`);
-        }
-    }
-
-    if (report.formatted === 0 && report.unchanged > 0 && report.errors.length === 0) {
-        console.log("format: no changes needed");
-    } else if (report.errors.length === 0) {
-        console.log(`format: ${report.formatted} file(s) updated, ${report.unchanged} unchanged`);
-    }
-
-    return report.errors.length > 0 ? 1 : 0;
-}
+import { loadConfig, resolveFormatConfig } from "../config/index.js";
+import { loadNiftyNative } from "../native.js";
+
+export type FormatOptions = {
+    check?: boolean;
+    cwd?: string;
+};
+
+export async function formatWorkspace(options: FormatOptions): Promise<number> {
+    const cwd = options.cwd ?? process.cwd();
+    const { config } = await loadConfig({ cwd, createIfMissing: false, env: { command: "format" } });
+    const resolved = resolveFormatConfig(config.format);
+    const native = loadNiftyNative();
+    const report = native.formatter.run({
+        cwd,
+        check: options.check,
+        includes: resolved.includes,
+        excludes: resolved.excludes,
+        rust: resolved.rust,
+        javascript: resolved.javascript,
+        styleConfig: resolved.style,
+    });
+
+    if (report.errors.length > 0) {
+        for (const message of report.errors) {
+            console.error(`error: ${message}`);
+        }
+    }
+
+    if (report.formatted === 0 && report.unchanged > 0 && report.errors.length === 0) {
+        console.log(`format: no changes needed (preset ${resolved.preset})`);
+    } else if (report.errors.length === 0) {
+        console.log(
+            `format: ${report.formatted} file(s) updated, ${report.unchanged} unchanged (preset ${resolved.preset})`,
+        );
+    }
+
+    return report.errors.length > 0 ? 1 : 0;
+}

package/src/cli/index.ts

@@ -1,9 +1,9 @@
-export { runCli } from "./main.js";
-export { bumpSemver, bumpWorkspace, runBump, type BumpKind, type BumpOptions, type BumpReport } from "./bump.js";
-export { runPublish, type PublishOptions, type PublishReport } from "./publish.js";
-export { runTrust, type TrustReport } from "./trust.js";
-export { runUpdate } from "./update.js";
-export { runLint } from "./lint.js";
-export { runUpload } from "./upload.js";
-export { installNativeFromOptions, type InstallNativeOptions } from "./install-native.js";
-export { findWorkspaceRoot, listWorkspacePackages, type WorkspacePackage } from "./workspace.js";
+export { runCli } from "./main.js";
+export { bumpSemver, bumpWorkspace, runBump, type BumpKind, type BumpOptions, type BumpReport } from "./bump.js";
+export { runPublish, type PublishOptions, type PublishReport } from "./publish.js";
+export { runTrust, type TrustReport } from "./trust.js";
+export { runUpdate } from "./update.js";
+export { runLint } from "./lint.js";
+export { runUpload } from "./upload.js";
+export { installNativeFromOptions, type InstallNativeOptions } from "./install-native.js";
+export { findWorkspaceRoot, listWorkspacePackages, type WorkspacePackage } from "./workspace.js";

package/src/cli/install-native-cmd.ts

@@ -1,22 +1,22 @@
-import type { Cli, ParsedOptions } from "@vmz/commander";
-
-import { installNativeFromOptions } from "./install-native.js";
-import { cwdFrom, str } from "./options.js";
-
-export function registerInstallNativeCommand(cli: Cli): void {
-    cli.command("install-native", "cli.cmd.install-native")
-        .option("--from <dir>", "cli.opt.from-artifacts")
-        .action(async (options) => cmdInstallNative(options));
-}
-
-export async function cmdInstallNative(options: ParsedOptions): Promise<number> {
-    const from =
-        str(options, "from") ??
-        process.env.NATIVE_ARTIFACT_ROOT ??
-        "native-artifacts";
-    installNativeFromOptions({
-        from,
-        cwd: cwdFrom(options),
-    });
-    return 0;
-}
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { installNativeFromOptions } from "./install-native.js";
+import { cwdFrom, str } from "./options.js";
+
+export function registerInstallNativeCommand(cli: Cli): void {
+    cli.command("install-native", "cli.cmd.install-native")
+        .option("--from <dir>", "cli.opt.from-artifacts")
+        .action(async (options) => cmdInstallNative(options));
+}
+
+export async function cmdInstallNative(options: ParsedOptions): Promise<number> {
+    const from =
+        str(options, "from") ??
+        process.env.NATIVE_ARTIFACT_ROOT ??
+        "native-artifacts";
+    installNativeFromOptions({
+        from,
+        cwd: cwdFrom(options),
+    });
+    return 0;
+}