@doki-land/nifty 0.0.1 → 0.0.3

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

@@ -0,0 +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;
+}

package/src/cli/format.ts

@@ -0,0 +1,28 @@
+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;
+}

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;
+}

package/src/cli/install-native.ts

@@ -1,80 +1,80 @@
-import { copyFileSync, existsSync, mkdirSync, readdirSync } from "node:fs";
-import { basename, dirname, join, relative, resolve } from "node:path";
-
-import { detectProjectLayout } from "../config/detectProject.js";
-
-/** Basename of a built .node file → platform package directory under projects/packages/. */
-const PACKAGE_BY_ASSET: Record<string, string> = {
-    "nifty-win32-x64-msvc.node": "nifty-win32-x64",
-    "nifty-linux-x64-gnu.node": "nifty-linux-x64",
-    "nifty-linux-arm64-gnu.node": "nifty-linux-arm64",
-    "nifty-darwin-x64.node": "nifty-darwin-x64",
-    "nifty-darwin-arm64.node": "nifty-darwin-arm64",
-};
-
-/** Matrix platforms that must be present after install (matches publish-npm.yml). */
-const REQUIRED_PACKAGES = ["nifty-win32-x64", "nifty-linux-x64", "nifty-darwin-arm64"];
-
-export type InstallNativeOptions = {
-    /** Downloaded CI artifact tree (walked recursively for .node files). */
-    from: string;
-    cwd?: string;
-};
-
-function walkNodes(dir: string): string[] {
-    const out: string[] = [];
-    if (!existsSync(dir)) {
-        return out;
-    }
-    for (const entry of readdirSync(dir, { withFileTypes: true })) {
-        const full = join(dir, entry.name);
-        if (entry.isDirectory()) {
-            out.push(...walkNodes(full));
-        } else if (entry.isFile() && entry.name.endsWith(".node")) {
-            out.push(full);
-        }
-    }
-    return out;
-}
-
-function libHasNode(libDir: string): boolean {
-    return existsSync(libDir) && readdirSync(libDir).some((name) => name.endsWith(".node"));
-}
-
-/** Copy matrix .node artifacts into platform package lib dirs for npm publish. */
-export function installNativeFromOptions(options: InstallNativeOptions): void {
-    const layout = detectProjectLayout(options.cwd ?? process.cwd());
-    const artifactRoot = resolve(layout.root, options.from);
-    const nodes = walkNodes(artifactRoot);
-    if (nodes.length === 0) {
-        throw new Error(`install-native: no .node files under ${artifactRoot}`);
-    }
-
-    let installed = 0;
-    for (const file of nodes) {
-        const base = basename(file);
-        const packageDir = PACKAGE_BY_ASSET[base];
-        if (!packageDir) {
-            console.log(`skip unmapped artifact ${relative(artifactRoot, file)}`);
-            continue;
-        }
-        const dest = join(layout.root, "projects/packages", packageDir, "lib", base);
-        mkdirSync(dirname(dest), { recursive: true });
-        copyFileSync(file, dest);
-        console.log(`installed ${relative(layout.root, dest)}`);
-        installed += 1;
-    }
-
-    if (installed === 0) {
-        throw new Error("install-native: no mapped platform .node files installed");
-    }
-
-    for (const packageDir of REQUIRED_PACKAGES) {
-        const libDir = join(layout.root, "projects/packages", packageDir, "lib");
-        if (!libHasNode(libDir)) {
-            throw new Error(`install-native: missing .node under ${packageDir}/lib`);
-        }
-    }
-
-    console.log(`install-native: ${installed} native binary(ies) ready for npm publish`);
-}
+import { copyFileSync, existsSync, mkdirSync, readdirSync } from "node:fs";
+import { basename, dirname, join, relative, resolve } from "node:path";
+
+import { detectProjectLayout } from "../config/detectProject.js";
+
+/** Basename of a built .node file → platform package directory under projects/packages/. */
+const PACKAGE_BY_ASSET: Record<string, string> = {
+    "nifty-win32-x64-msvc.node": "nifty-win32-x64",
+    "nifty-linux-x64-gnu.node": "nifty-linux-x64",
+    "nifty-linux-arm64-gnu.node": "nifty-linux-arm64",
+    "nifty-darwin-x64.node": "nifty-darwin-x64",
+    "nifty-darwin-arm64.node": "nifty-darwin-arm64",
+};
+
+/** Matrix platforms that must be present after install (matches publish-npm.yml). */
+const REQUIRED_PACKAGES = ["nifty-win32-x64", "nifty-linux-x64", "nifty-darwin-arm64"];
+
+export type InstallNativeOptions = {
+    /** Downloaded CI artifact tree (walked recursively for .node files). */
+    from: string;
+    cwd?: string;
+};
+
+function walkNodes(dir: string): string[] {
+    const out: string[] = [];
+    if (!existsSync(dir)) {
+        return out;
+    }
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+        const full = join(dir, entry.name);
+        if (entry.isDirectory()) {
+            out.push(...walkNodes(full));
+        } else if (entry.isFile() && entry.name.endsWith(".node")) {
+            out.push(full);
+        }
+    }
+    return out;
+}
+
+function libHasNode(libDir: string): boolean {
+    return existsSync(libDir) && readdirSync(libDir).some((name) => name.endsWith(".node"));
+}
+
+/** Copy matrix .node artifacts into platform package lib dirs for npm publish. */
+export function installNativeFromOptions(options: InstallNativeOptions): void {
+    const layout = detectProjectLayout(options.cwd ?? process.cwd());
+    const artifactRoot = resolve(layout.root, options.from);
+    const nodes = walkNodes(artifactRoot);
+    if (nodes.length === 0) {
+        throw new Error(`install-native: no .node files under ${artifactRoot}`);
+    }
+
+    let installed = 0;
+    for (const file of nodes) {
+        const base = basename(file);
+        const packageDir = PACKAGE_BY_ASSET[base];
+        if (!packageDir) {
+            console.log(`skip unmapped artifact ${relative(artifactRoot, file)}`);
+            continue;
+        }
+        const dest = join(layout.root, "projects/packages", packageDir, "lib", base);
+        mkdirSync(dirname(dest), { recursive: true });
+        copyFileSync(file, dest);
+        console.log(`installed ${relative(layout.root, dest)}`);
+        installed += 1;
+    }
+
+    if (installed === 0) {
+        throw new Error("install-native: no mapped platform .node files installed");
+    }
+
+    for (const packageDir of REQUIRED_PACKAGES) {
+        const libDir = join(layout.root, "projects/packages", packageDir, "lib");
+        if (!libHasNode(libDir)) {
+            throw new Error(`install-native: missing .node under ${packageDir}/lib`);
+        }
+    }
+
+    console.log(`install-native: ${installed} native binary(ies) ready for npm publish`);
+}

package/src/cli/lint-cmd.ts

@@ -1,33 +1,35 @@
-import type { Cli, ParsedOptions } from "@vmz/commander";
-
-import { bootstrapFromOptions } from "./context.js";
-import { lintCommits, type LintOptions } from "./lint.js";
-import { cwdFrom, str, strList } from "./options.js";
-
-export function registerLintCommands(cli: Cli): void {
-    registerLintLike(cli, "lint", "cli.cmd.lint", false);
-    registerLintLike(cli, "check", "cli.cmd.check", true);
-}
-
-function registerLintLike(cli: Cli, name: string, helpId: string, check: boolean): void {
-    cli.command(name, helpId)
-        .option("--from <ref>", "cli.opt.from")
-        .option("--to <ref>", "cli.opt.to")
-        .option("-s, --subject <text>...", "cli.opt.subject")
-        .action(async (options) => cmdLint(options, check));
-}
-
-export async function cmdLint(options: ParsedOptions, check: boolean): Promise<number> {
-    await bootstrapFromOptions(options);
-    const lintOptions: LintOptions = {
-        subjects: strList(options, "subject"),
-        from: str(options, "from"),
-        to: str(options, "to"),
-        cwd: cwdFrom(options),
-    };
-    const errorCount = await lintCommits(lintOptions, check);
-    if (check && errorCount > 0) {
-        throw new Error(`found ${errorCount} lint error(s)`);
-    }
-    return 0;
-}
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { bootstrapFromOptions } from "./context.js";
+import { lintCommits, type LintOptions } from "./lint.js";
+import { cwdFrom, flag, str, strList } from "./options.js";
+
+export function registerLintCommands(cli: Cli): void {
+    registerLintLike(cli, "lint", "cli.cmd.lint", false);
+    registerLintLike(cli, "check", "cli.cmd.check", true);
+}
+
+function registerLintLike(cli: Cli, name: string, helpId: string, check: boolean): void {
+    cli.command(name, helpId)
+        .option("--from <ref>", "cli.opt.from")
+        .option("--to <ref>", "cli.opt.to")
+        .option("-s, --subject <text>...", "cli.opt.subject")
+        .option("--no-cargo", "cli.opt.no-cargo")
+        .action(async (options) => cmdLint(options, check));
+}
+
+export async function cmdLint(options: ParsedOptions, check: boolean): Promise<number> {
+    await bootstrapFromOptions(options);
+    const lintOptions: LintOptions = {
+        subjects: strList(options, "subject"),
+        from: str(options, "from"),
+        to: str(options, "to"),
+        cwd: cwdFrom(options),
+        scanCargo: flag(options, "no-cargo") ? false : undefined,
+    };
+    const errorCount = await lintCommits(lintOptions, check);
+    if (check && errorCount > 0) {
+        throw new Error(`found ${errorCount} lint error(s)`);
+    }
+    return 0;
+}

package/src/cli/lint.ts

@@ -1,113 +1,102 @@
-import { loadNiftyNative } from "../native.js";
-
-const KNOWN_GITMOJIS = ["✨", "🎨", "🚀", "🐛", "🚑", "🔥", "💥", "♻️", "🔧", "📝", "👷", "🧹", "⬆️", "🧪", "🔨", "📦"];
-
-export type LintOptions = {
-    subjects: string[];
-    from?: string;
-    to?: string;
-    cwd?: string;
-};
-
-type LintDiagnostic = {
-    rule: string;
-    severity: "error" | "warning";
-    message: string;
-    subject?: string;
-};
-
-export async function runLint(argv: string[], check: boolean): Promise<void> {
-    const options = parseLintArgs(argv);
-    const errorCount = await lintCommits(options, check);
-    if (check && errorCount > 0) {
-        throw new Error(`found ${errorCount} lint error(s)`);
-    }
-}
-
-export async function lintCommits(options: LintOptions, check: boolean): Promise<number> {
-    const native = loadNiftyNative();
-    const subjects: string[] = [];
-
-    if (options.subjects.length > 0) {
-        subjects.push(...options.subjects);
-    } else {
-        const cwd = options.cwd ?? process.cwd();
-        const repoRoot = native.git["discover-root"](cwd);
-        const toRef = options.to ?? "HEAD";
-        const commits = native.git["collect-commits"](repoRoot, options.from, toRef);
-        subjects.push(...commits.map((commit) => commit.subject));
-    }
-
-    const diagnostics = subjects.flatMap((subject) => lintSubject(subject, native));
-    for (const item of diagnostics) {
-        const prefix = item.severity === "error" ? "error" : "warning";
-        const suffix = item.subject ? ` (${item.subject})` : "";
-        console.log(`${prefix} [${item.rule}] ${item.message}${suffix}`);
-    }
-
-    return diagnostics.filter((item) => item.severity === "error").length;
-}
-
-function parseLintArgs(argv: string[]): LintOptions {
-    const options: LintOptions = { subjects: [] };
-    for (let i = 0; i < argv.length; i += 1) {
-        const arg = argv[i];
-        if (arg === "--from") {
-            options.from = argv[++i];
-        } else if (arg === "--to") {
-            options.to = argv[++i];
-        } else if (arg === "-C" || arg === "--cwd") {
-            options.cwd = argv[++i];
-        } else if (arg === "-s" || arg === "--subject") {
-            options.subjects.push(argv[++i]);
-        }
-    }
-    return options;
-}
-
-function lintSubject(subject: string, native: ReturnType<typeof loadNiftyNative>): LintDiagnostic[] {
-    const out: LintDiagnostic[] = [];
-    if (!native.gitmoji["validate-subject"](subject)) {
-        out.push({
-            rule: "gitmoji/subject",
-            severity: "error",
-            message: "commit subject must start with a known gitmoji followed by a space",
-            subject,
-        });
-        return out;
-    }
-
-    const gitmoji = native.gitmoji["leading-gitmoji"](subject);
-    if (gitmoji && !KNOWN_GITMOJIS.includes(gitmoji)) {
-        out.push({
-            rule: "gitmoji/known",
-            severity: "error",
-            message: `gitmoji ${gitmoji} is not in the Nifty known gitmoji list`,
-            subject,
-        });
-    }
-
-    const body = native.gitmoji["strip-gitmoji"](subject).trim();
-    if (!body) {
-        out.push({
-            rule: "gitmoji/body",
-            severity: "warning",
-            message: "commit subject body must not be empty after the gitmoji prefix",
-            subject,
-        });
-    }
-
-    if (gitmoji) {
-        const expected = native.gitmoji["format-subject"](gitmoji, body);
-        if (expected !== subject.trim()) {
-            out.push({
-                rule: "gitmoji/format",
-                severity: "warning",
-                message: `subject should be formatted as ${expected}`,
-                subject,
-            });
-        }
-    }
-
-    return out;
-}
+import { loadConfig } from "../config/loadConfig.js";
+import { loadNiftyNative } from "../native.js";
+
+export type LintOptions = {
+    subjects: string[];
+    from?: string;
+    to?: string;
+    cwd?: string;
+    scanCargo?: boolean;
+};
+
+type LintDiagnostic = {
+    rule: string;
+    severity: "error" | "warning" | "info";
+    message: string;
+    subject?: string;
+    hash?: string;
+    path?: string;
+    line?: number;
+};
+
+type LintRuleConfig = {
+    id: string;
+    enabled?: boolean;
+    severity?: "error" | "warning" | "info";
+};
+
+export async function runLint(argv: string[], check: boolean): Promise<void> {
+    const options = parseLintArgs(argv);
+    const errorCount = await lintCommits(options, check);
+    if (check && errorCount > 0) {
+        throw new Error(`found ${errorCount} lint error(s)`);
+    }
+}
+
+export async function lintCommits(options: LintOptions, check: boolean): Promise<number> {
+    const native = loadNiftyNative();
+    const cwd = options.cwd ?? process.cwd();
+    const { config } = await loadConfig({ cwd, createIfMissing: false });
+    const rules: LintRuleConfig[] | undefined = config.lint?.rules?.map((rule) => ({
+        id: rule.id,
+        enabled: rule.enabled,
+        severity: rule.severity,
+    }));
+
+    const runner = check ? native.lint.check : native.lint.run;
+    const report = runner({
+        cwd,
+        fromRef: options.from,
+        toRef: options.to,
+        subjects: options.subjects.length > 0 ? options.subjects : undefined,
+        rules,
+        scanCargo: options.scanCargo,
+    });
+
+    for (const item of report.diagnostics) {
+        printDiagnostic(item);
+    }
+
+    if (report.diagnostics.length > 0) {
+        console.log(`lint: ${report.errorCount} error(s), ${report.warningCount} warning(s)`);
+    } else {
+        console.log("lint: no issues found");
+    }
+
+    return report.errorCount;
+}
+
+function printDiagnostic(item: LintDiagnostic): void {
+    const prefix = item.severity === "error" ? "error" : item.severity === "warning" ? "warning" : "info";
+    if (item.subject) {
+        console.log(`${prefix} [${item.rule}] ${item.message} (${item.subject})`);
+        return;
+    }
+    const location =
+        item.path !== undefined
+            ? item.line !== undefined
+                ? `${item.path}:${item.line}`
+                : item.path
+            : undefined;
+    const suffix = location ? ` @ ${location}` : "";
+    console.log(`${prefix} [${item.rule}] ${item.message}${suffix}`);
+}
+
+function parseLintArgs(argv: string[]): LintOptions {
+    const options: LintOptions = { subjects: [] };
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        if (arg === "--from") {
+            options.from = argv[++i];
+        } else if (arg === "--to") {
+            options.to = argv[++i];
+        } else if (arg === "-C" || arg === "--cwd") {
+            options.cwd = argv[++i];
+        } else if (arg === "-s" || arg === "--subject") {
+            options.subjects.push(argv[++i]);
+        } else if (arg === "--no-cargo") {
+            options.scanCargo = false;
+        }
+    }
+    return options;
+}

package/src/cli/main.ts

@@ -1 +1 @@
-export { runCli } from "./cli.js";
+export { runCli } from "./cli.js";