@doki-land/nifty 0.0.2 → 0.0.4

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";

package/src/cli/options.ts

@@ -1,40 +1,40 @@
-import { resolve } from "node:path";
-
-import type { ParsedOptions } from "@vmz/commander";
-
-import { resolveNpmExecutable } from "./resolveNpm.js";
-import type { AuthCliOptions } from "./authArgs.js";
-
-export function cwdFrom(options: ParsedOptions): string | undefined {
-    const value = options.cwd;
-    return typeof value === "string" && value.length > 0 ? resolve(value) : undefined;
-}
-
-export function flag(options: ParsedOptions, key: string): boolean {
-    return options[key] === true;
-}
-
-export function str(options: ParsedOptions, key: string): string | undefined {
-    const value = options[key];
-    return typeof value === "string" && value.length > 0 ? value : undefined;
-}
-
-export function strList(options: ParsedOptions, key: string): string[] {
-    const value = options[key];
-    if (Array.isArray(value)) {
-        return value.filter((entry): entry is string => typeof entry === "string" && entry.length > 0);
-    }
-    if (typeof value === "string" && value.length > 0) {
-        return [value];
-    }
-    return [];
-}
-
-export function authFromOptions(options: ParsedOptions): AuthCliOptions {
-    return {
-        otp: str(options, "otp"),
-        totpSecret: str(options, "totp-secret"),
-        token: str(options, "npm-token") ?? str(options, "token"),
-        npm: resolveNpmExecutable(),
-    };
-}
+import { resolve } from "node:path";
+
+import type { ParsedOptions } from "@vmz/commander";
+
+import { resolveNpmExecutable } from "./resolveNpm.js";
+import type { AuthCliOptions } from "./authArgs.js";
+
+export function cwdFrom(options: ParsedOptions): string | undefined {
+    const value = options.cwd;
+    return typeof value === "string" && value.length > 0 ? resolve(value) : undefined;
+}
+
+export function flag(options: ParsedOptions, key: string): boolean {
+    return options[key] === true;
+}
+
+export function str(options: ParsedOptions, key: string): string | undefined {
+    const value = options[key];
+    return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+
+export function strList(options: ParsedOptions, key: string): string[] {
+    const value = options[key];
+    if (Array.isArray(value)) {
+        return value.filter((entry): entry is string => typeof entry === "string" && entry.length > 0);
+    }
+    if (typeof value === "string" && value.length > 0) {
+        return [value];
+    }
+    return [];
+}
+
+export function authFromOptions(options: ParsedOptions): AuthCliOptions {
+    return {
+        otp: str(options, "otp"),
+        totpSecret: str(options, "totp-secret"),
+        token: str(options, "npm-token") ?? str(options, "token"),
+        npm: resolveNpmExecutable(),
+    };
+}

package/src/cli/publish-cmd.ts

@@ -1,34 +1,38 @@
-import type { Cli, ParsedOptions } from "@vmz/commander";
-
-import { loadNiftyNative } from "../native.js";
-import { authPayload } from "./authArgs.js";
-import { bootstrapFromOptions } from "./context.js";
-import { printPublishReport } from "./publish.js";
-import { authFromOptions, cwdFrom, flag, str } from "./options.js";
-
-export function registerPublishCommand(cli: Cli): void {
-    cli.command("publish", "cli.cmd.publish")
-        .option("--dry-run", "cli.opt.dry-run")
-        .option("--refresh", "cli.opt.refresh")
-        .option("--tag <tag>", "cli.opt.tag")
-        .option("--access <access>", "cli.opt.access")
-        .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) => cmdPublish(options));
-}
-
-export async function cmdPublish(options: ParsedOptions): Promise<number> {
-    await bootstrapFromOptions(options);
-    const native = loadNiftyNative();
-    const report = native.publisher["publish-workspace"]({
-        cwd: cwdFrom(options),
-        dryRun: flag(options, "dry-run"),
-        refresh: flag(options, "refresh"),
-        tag: str(options, "tag"),
-        access: str(options, "access") ?? "public",
-        ...authPayload(authFromOptions(options)),
-    });
-    printPublishReport(report, flag(options, "dry-run"));
-    return 0;
-}
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { loadNiftyNative } from "../native.js";
+import { authPayload } from "./authArgs.js";
+import { bootstrapFromOptions } from "./context.js";
+import { printPublishReport } from "./publish.js";
+import { authFromOptions, cwdFrom, flag, str, strList } from "./options.js";
+
+export function registerPublishCommand(cli: Cli): void {
+    cli.command("publish", "cli.cmd.publish")
+        .option("--dry-run", "cli.opt.dry-run")
+        .option("--refresh", "cli.opt.refresh")
+        .option("--package <name>", "cli.opt.package")
+        .option("--tag <tag>", "cli.opt.tag")
+        .option("--access <access>", "cli.opt.access")
+        .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) => cmdPublish(options));
+}
+
+export async function cmdPublish(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const packages = strList(options, "package");
+    const native = loadNiftyNative();
+    const report = native.publisher["publish-workspace"]({
+        cwd: cwdFrom(options),
+        dryRun: flag(options, "dry-run"),
+        refresh: flag(options, "refresh"),
+        tag: str(options, "tag"),
+        access: str(options, "access") ?? "public",
+        ...(packages.length === 1 ? { only: packages[0] } : {}),
+        ...(packages.length > 1 ? { packages } : {}),
+        ...authPayload(authFromOptions(options)),
+    });
+    printPublishReport(report, flag(options, "dry-run"));
+    return 0;
+}

package/src/cli/publish.ts

@@ -1,95 +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[];
-    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>
-`);
-}
+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";
+}