@doki-land/nifty 0.0.5 → 0.0.6

package/locales/en-US/cli.json

@@ -9,9 +9,11 @@
   "cli.cmd.bump": "Align workspace crate and package versions",
   "cli.cmd.publish": "Publish workspace npm packages (OIDC or token + TOTP)",
   "cli.cmd.trust": "Configure npm Trusted Publisher for workspace packages",
-  "cli.cmd.reword": "Rewrite commit messages at the git object layer",
-  "cli.cmd.reword.export": "Export a JSON reword map template",
-  "cli.cmd.reword.rewrite": "Rewrite commits from a JSON map and update the branch ref",
+  "cli.cmd.commit": "Commit message export, apply, scan, and audit",
+  "cli.cmd.commit.export": "Export a JSON commit message map template",
+  "cli.cmd.commit.apply": "Apply commit message edits from a JSON map and update the branch ref",
+  "cli.cmd.commit.scan": "Scan commit messages for gitmoji and hygiene issues",
+  "cli.cmd.commit.audit": "Audit commit messages and fail on errors",
   "cli.cmd.retime": "Spread commit timestamps across a date range on a new branch",
   "cli.cmd.retime.root": "Retime all commits from repository root through tip",
   "cli.cmd.change-logs": "Draft release reference changelogs from git tags",
@@ -51,7 +53,7 @@
   "cli.opt.npm-token": "npm auth token (overrides NPM_TOKEN)",
   "cli.opt.base": "Exclusive range start commit (e.g. 34e1e665^)",
   "cli.opt.ref": "Branch ref to rewrite (default: HEAD)",
-  "cli.opt.path": "Path to reword JSON map (default: reword.pending.json)",
+  "cli.opt.path": "Path to commit JSON map (default: commit.pending.json)",
   "cli.opt.start-date": "Random window start (YYYY-MM-DD or ISO datetime)",
   "cli.opt.end-date": "Random window end",
   "cli.opt.branch": "Output branch name (default: time-travel)",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doki-land/nifty",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Gitmoji-first commit conventions and release helpers (Node-API + TypeScript)",
   "type": "module",
   "license": "MPL-2.0",
@@ -24,9 +24,9 @@
     "jiti": "^2.4.2"
   },
   "optionalDependencies": {
-    "@doki-land/nifty-win32-x64": "0.0.5",
-    "@doki-land/nifty-linux-x64": "0.0.5",
-    "@doki-land/nifty-darwin-arm64": "0.0.5"
+    "@doki-land/nifty-win32-x64": "0.0.6",
+    "@doki-land/nifty-linux-x64": "0.0.6",
+    "@doki-land/nifty-darwin-arm64": "0.0.6"
   },
   "publishConfig": {
     "access": "public"

package/src/cli/cli.ts

@@ -10,7 +10,7 @@ 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 { registerCommitCommand } from "./commit-cmd.js";
 import { registerTrustCommand } from "./trust-cmd.js";
 import { registerUpdateCommand } from "./update-cmd.js";
 import { registerUploadCommand } from "./upload-cmd.js";
@@ -30,7 +30,7 @@ function buildNiftyCli() {
     registerBumpCommand(cli);
     registerPublishCommand(cli);
     registerTrustCommand(cli);
-    registerRewordCommand(cli);
+    registerCommitCommand(cli);
     registerRetimeCommand(cli);
     registerChangeLogsCommand(cli);
 

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

@@ -2,33 +2,48 @@ import type { Cli, ParsedOptions } from "@vmz/commander";
 
 import { loadNiftyNative } from "../native.js";
 import { bootstrapFromOptions } from "./context.js";
-import { cwdFrom, flag, str } from "./options.js";
+import { lintCommits, type LintOptions } from "./lint.js";
+import { cwdFrom, flag, str, strList } from "./options.js";
 
-export function registerRewordCommand(cli: Cli): void {
-    const reword = cli.command("reword", "cli.cmd.reword");
+export function registerCommitCommand(cli: Cli): void {
+    const commit = cli.command("commit", "cli.cmd.commit");
 
-    reword
-        .command("export", "cli.cmd.reword.export")
+    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) => cmdRewordExport(options));
+        .action(async (options) => cmdCommitExport(options));
 
-    reword
-        .command("rewrite", "cli.cmd.reword.rewrite")
+    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) => cmdRewordRewrite(options));
+        .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 cmdRewordExport(options: ParsedOptions): Promise<number> {
+export async function cmdCommitExport(options: ParsedOptions): Promise<number> {
     await bootstrapFromOptions(options);
     const base = requireStr(options, "base");
-    const path = str(options, "path") ?? "reword.pending.json";
+    const path = str(options, "path") ?? "commit.pending.json";
     const native = loadNiftyNative();
-    const report = native.history["reword-export"]({
+    const report = native.history["commit-export"]({
         cwd: cwdFrom(options),
         base,
         ref: str(options, "ref"),
@@ -38,13 +53,13 @@ export async function cmdRewordExport(options: ParsedOptions): Promise<number> {
     return 0;
 }
 
-export async function cmdRewordRewrite(options: ParsedOptions): Promise<number> {
+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["reword-rewrite"]({
+    const report = native.history["commit-apply"]({
         cwd: cwdFrom(options),
         base,
         ref: str(options, "ref"),
@@ -70,7 +85,7 @@ export async function cmdRewordRewrite(options: ParsedOptions): Promise<number>
     }
 
     console.log(
-        `rewrote ${report.changes.length} commit object(s); ${report.oldTip} -> ${report.newTip ?? report.oldTip}`,
+        `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}`);
@@ -78,6 +93,32 @@ export async function cmdRewordRewrite(options: ParsedOptions): Promise<number>
     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) {

package/src/cli/format.ts

@@ -1,3 +1,4 @@
+import { loadConfig, resolveFormatConfig } from "../config/index.js";
 import { loadNiftyNative } from "../native.js";
 
 export type FormatOptions = {
@@ -6,10 +7,18 @@ export type FormatOptions = {
 };
 
 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: options.cwd,
+        cwd,
         check: options.check,
+        includes: resolved.includes,
+        excludes: resolved.excludes,
+        rust: resolved.rust,
+        javascript: resolved.javascript,
+        styleConfig: resolved.style,
     });
 
     if (report.errors.length > 0) {
@@ -19,9 +28,11 @@ export async function formatWorkspace(options: FormatOptions): Promise<number> {
     }
 
     if (report.formatted === 0 && report.unchanged > 0 && report.errors.length === 0) {
-        console.log("format: no changes needed");
+        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`);
+        console.log(
+            `format: ${report.formatted} file(s) updated, ${report.unchanged} unchanged (preset ${resolved.preset})`,
+        );
     }
 
     return report.errors.length > 0 ? 1 : 0;

package/src/cli/lint.ts

@@ -7,6 +7,7 @@ export type LintOptions = {
     to?: string;
     cwd?: string;
     scanCargo?: boolean;
+    commitOnly?: boolean;
 };
 
 type LintDiagnostic = {
@@ -33,7 +34,11 @@ export async function runLint(argv: string[], check: boolean): Promise<void> {
     }
 }
 
-export async function lintCommits(options: LintOptions, check: boolean): Promise<number> {
+export async function lintCommits(
+    options: LintOptions,
+    check: boolean,
+    commitOnly = options.commitOnly ?? false,
+): Promise<number> {
     const native = loadNiftyNative();
     const cwd = options.cwd ?? process.cwd();
     const { config } = await loadConfig({ cwd, createIfMissing: false });
@@ -51,6 +56,7 @@ export async function lintCommits(options: LintOptions, check: boolean): Promise
         subjects: options.subjects.length > 0 ? options.subjects : undefined,
         rules,
         scanCargo: options.scanCargo,
+        commitOnly: commitOnly || options.commitOnly,
     });
 
     for (const item of report.diagnostics) {

package/src/config/formatPresets.ts

@@ -0,0 +1,55 @@
+import type { NiftyFormatConfig, NiftyFormatPreset } from "./types.js";
+
+export type ResolvedFormatOptions = {
+    preset: NiftyFormatPreset;
+    includes?: string[];
+    excludes?: string[];
+    rust?: boolean;
+    javascript?: boolean;
+    style?: string;
+};
+
+const NPM_TOOLS_INCLUDES = [
+    "scripts/**",
+    "projects/packages/**",
+    "projects/conformance/**",
+    "projects/dashboard/**",
+    "package.json",
+    "biome.json",
+    "nifty.config.ts",
+] as const;
+
+/** VMZ hybrid monorepo — JS/TS surfaces only, never whole-repo walk. */
+const VMZ_INCLUDES = [
+    "scripts/**",
+    "packages/runtimes/**",
+    "packages/examples/**",
+    "packages/editors/**",
+    "packages/ui/**",
+    "packages/plugins/**",
+    "packages/content/**",
+    "packages/homepage/**",
+    "package.json",
+    "biome.json",
+    "nifty.config.ts",
+] as const;
+
+const PRESET_INCLUDES: Record<NiftyFormatPreset, readonly string[] | undefined> = {
+    default: undefined,
+    "npm-tools": NPM_TOOLS_INCLUDES,
+    vmz: VMZ_INCLUDES,
+};
+
+/** Merge `nifty.config` `format` with built-in preset defaults. */
+export function resolveFormatConfig(format: NiftyFormatConfig | undefined): ResolvedFormatOptions {
+    const preset = format?.preset ?? "default";
+    const presetIncludes = PRESET_INCLUDES[preset];
+    return {
+        preset,
+        includes: format?.includes ?? (presetIncludes ? [...presetIncludes] : undefined),
+        excludes: format?.excludes,
+        rust: format?.rust,
+        javascript: format?.javascript,
+        style: format?.style,
+    };
+}

package/src/config/index.ts

@@ -16,10 +16,13 @@ export {
     type LoadConfigOptions,
     type LoadedNiftyConfig,
 } from "./loadConfig.js";
+export { resolveFormatConfig, type ResolvedFormatOptions } from "./formatPresets.js";
 export {
     CONFIG_FILE_NAMES,
     type NiftyAuthorEntry,
     type NiftyConfig,
     type NiftyConfigEnv,
     type NiftyConfigExport,
+    type NiftyFormatConfig,
+    type NiftyFormatPreset,
 } from "./types.js";

package/src/config/loadConfig.ts

@@ -28,7 +28,7 @@ export type LoadedNiftyConfig = {
 };
 
 const DEFAULT_CONFIG_TEMPLATE = `// Nifty project configuration.
-// See @doki-land/nifty for defineConfig, githubToken, authorMap, and lint rules.
+// See @doki-land/nifty for defineConfig, format presets, authorMap, and lint rules.
 export default {};
 `;
 

package/src/config/types.ts

@@ -4,6 +4,25 @@ export type NiftyAuthorEntry = {
     login?: string;
 };
 
+/** Built-in workspace format presets (`nifty.config` `format.preset`). */
+export type NiftyFormatPreset = "default" | "npm-tools" | "vmz";
+
+/** Workspace format options (`nifty format` reads `nifty.config` `format`). */
+export type NiftyFormatConfig = {
+    /** Select built-in include roots. Use `vmz` for the VMZ hybrid monorepo. */
+    preset?: NiftyFormatPreset;
+    /** Extra include globs (override preset list when set alone). */
+    includes?: string[];
+    /** Skip paths under these globs after includes expand. */
+    excludes?: string[];
+    /** Run `cargo fmt` (default: true when a Cargo workspace is detected). */
+    rust?: boolean;
+    /** Run `oxc_formatter` on JS/TS targets (default: true). */
+    javascript?: boolean;
+    /** Biome-style formatter config for oxc (default: `biome.json` at project root). */
+    style?: string;
+};
+
 /** Nifty project configuration (`nifty.config.ts` / `nifty.config.js`). */
 export type NiftyConfig = {
     /** GitHub personal access token for email search / profile fetch. */
@@ -38,6 +57,8 @@ export type NiftyConfig = {
             severity?: "error" | "warning" | "info";
         }>;
     };
+    /** Workspace format targets and engines (`nifty format`). */
+    format?: NiftyFormatConfig;
 };
 
 export type NiftyConfigExport = NiftyConfig | ((env: NiftyConfigEnv) => NiftyConfig | Promise<NiftyConfig>);

package/src/index.ts

@@ -28,9 +28,13 @@ export {
     findPackageManifest,
     type LoadConfigOptions,
     type LoadedNiftyConfig,
+    resolveFormatConfig,
     type NiftyAuthorEntry,
     type NiftyConfig,
     type NiftyConfigEnv,
+    type NiftyFormatConfig,
+    type NiftyFormatPreset,
     type ProjectKind,
     type ProjectLayout,
+    type ResolvedFormatOptions,
 } from "./config/index.js";

package/src/native.ts

@@ -85,12 +85,27 @@ export type RewordRewriteReport = {
 };
 
 export type HistoryExports = {
+    "commit-export": (options: {
+        cwd?: string;
+        base: string;
+        ref?: string;
+        path: string;
+    }) => { count: number; path: string };
+    "commit-apply": (options: {
+        cwd?: string;
+        base: string;
+        ref?: string;
+        path: string;
+        dryRun?: boolean;
+    }) => RewordRewriteReport;
+    /** @deprecated use `commit-export` */
     "reword-export": (options: {
         cwd?: string;
         base: string;
         ref?: string;
         path: string;
     }) => { count: number; path: string };
+    /** @deprecated use `commit-apply` */
     "reword-rewrite": (options: {
         cwd?: string;
         base: string;
@@ -160,6 +175,7 @@ export type LintRunOptions = {
     subjects?: string[];
     rules?: Array<{ id: string; enabled?: boolean; severity?: "error" | "warning" | "info" }>;
     scanCargo?: boolean;
+    commitOnly?: boolean;
 };
 
 export type LintReportRecord = {
@@ -183,8 +199,18 @@ export type FormatReportRecord = {
     errors: string[];
 };
 
+export type FormatterRunOptions = {
+    cwd?: string;
+    check?: boolean;
+    includes?: string[];
+    excludes?: string[];
+    rust?: boolean;
+    javascript?: boolean;
+    styleConfig?: string;
+};
+
 export type FormatterExports = {
-    run: (options: { cwd?: string; check?: boolean }) => FormatReportRecord;
+    run: (options: FormatterRunOptions) => FormatReportRecord;
 };
 
 export type PublisherExports = {
@@ -280,6 +306,31 @@ type NativeBinding = {
         totpSecret?: string | null;
         token?: string | null;
     }) => TrustReport;
+    gitToolsCommitExport: (options: {
+        cwd?: string | null;
+        base: string;
+        ref?: string | null;
+        path: string;
+    }) => { count: number; path: string };
+    gitToolsCommitApply: (options: {
+        cwd?: string | null;
+        base: string;
+        ref?: string | null;
+        path: string;
+        dryRun?: boolean | null;
+    }) => {
+        changes: Array<{
+            oldOid: string;
+            oldSubject: string;
+            newSubject: string;
+            parentsRelinked: boolean;
+            messageChanged: boolean;
+        }>;
+        oldTip: string;
+        newTip?: string | null;
+        refName: string;
+        dryRun: boolean;
+    };
     gitToolsRewordExport: (options: {
         cwd?: string | null;
         base: string;
@@ -355,6 +406,7 @@ type NativeBinding = {
         subjects?: string[] | null;
         rules?: Array<{ id: string; enabled?: boolean | null; severity?: string | null }> | null;
         scanCargo?: boolean | null;
+        commitOnly?: boolean | null;
         check?: boolean | null;
     }) => {
         diagnostics: Array<{
@@ -376,6 +428,7 @@ type NativeBinding = {
         subjects?: string[] | null;
         rules?: Array<{ id: string; enabled?: boolean | null; severity?: string | null }> | null;
         scanCargo?: boolean | null;
+        commitOnly?: boolean | null;
         check?: boolean | null;
     }) => {
         diagnostics: Array<{
@@ -391,7 +444,15 @@ type NativeBinding = {
         warningCount: number;
     };
     updaterRun: (options: { cwd?: string | null; interactive?: boolean | null }) => void;
-    formatterRun: (options: { cwd?: string | null; check?: boolean | null }) => {
+    formatterRun: (options: {
+        cwd?: string | null;
+        check?: boolean | null;
+        includes?: string[] | null;
+        excludes?: string[] | null;
+        rust?: boolean | null;
+        javascript?: boolean | null;
+        styleConfig?: string | null;
+    }) => {
         formatted: number;
         unchanged: number;
         errors: string[];
@@ -424,6 +485,7 @@ function mapLintOptions(options: LintRunOptions) {
         ...(options.subjects !== undefined ? { subjects: options.subjects } : {}),
         ...(options.rules !== undefined ? { rules: options.rules } : {}),
         ...(options.scanCargo !== undefined ? { scanCargo: options.scanCargo } : {}),
+        ...(options.commitOnly !== undefined ? { commitOnly: options.commitOnly } : {}),
     };
 }
 
@@ -498,6 +560,29 @@ function wrapBinding(binding: NativeBinding): NiftyNative {
             "parse-github-remote": (url) => binding.gitParseGithubRemote(url) ?? undefined,
         },
         history: {
+            "commit-export": (options) =>
+                binding.gitToolsCommitExport({
+                    ...(options.cwd !== undefined ? { cwd: options.cwd } : {}),
+                    base: options.base,
+                    ...(options.ref !== undefined ? { ref: options.ref } : {}),
+                    path: options.path,
+                }),
+            "commit-apply": (options) => {
+                const report = binding.gitToolsCommitApply({
+                    ...(options.cwd !== undefined ? { cwd: options.cwd } : {}),
+                    base: options.base,
+                    ...(options.ref !== undefined ? { ref: options.ref } : {}),
+                    path: options.path,
+                    ...(options.dryRun !== undefined ? { dryRun: options.dryRun } : {}),
+                });
+                return {
+                    changes: report.changes,
+                    oldTip: report.oldTip,
+                    newTip: report.newTip ?? undefined,
+                    refName: report.refName,
+                    dryRun: report.dryRun,
+                };
+            },
             "reword-export": (options) =>
                 binding.gitToolsRewordExport({
                     ...(options.cwd !== undefined ? { cwd: options.cwd } : {}),
@@ -586,10 +671,16 @@ function wrapBinding(binding: NativeBinding): NiftyNative {
             },
         },
         formatter: {
-            run: (options) => binding.formatterRun({
-                ...(options.cwd !== undefined ? { cwd: options.cwd } : {}),
-                ...(options.check !== undefined ? { check: options.check } : {}),
-            }),
+            run: (options) =>
+                binding.formatterRun({
+                    ...(options.cwd !== undefined ? { cwd: options.cwd } : {}),
+                    ...(options.check !== undefined ? { check: options.check } : {}),
+                    ...(options.includes !== undefined ? { includes: options.includes } : {}),
+                    ...(options.excludes !== undefined ? { excludes: options.excludes } : {}),
+                    ...(options.rust !== undefined ? { rust: options.rust } : {}),
+                    ...(options.javascript !== undefined ? { javascript: options.javascript } : {}),
+                    ...(options.styleConfig !== undefined ? { styleConfig: options.styleConfig } : {}),
+                }),
         },
         publisher: {
             "publish-workspace": (options) =>