@doki-land/nifty 0.0.4 → 0.0.6

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,35 +1,35 @@
-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;
-}
+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,102 +1,108 @@
-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;
-}
+import { loadConfig } from "../config/loadConfig.js";
+import { loadNiftyNative } from "../native.js";
+
+export type LintOptions = {
+    subjects: string[];
+    from?: string;
+    to?: string;
+    cwd?: string;
+    scanCargo?: boolean;
+    commitOnly?: 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,
+    commitOnly = options.commitOnly ?? false,
+): 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,
+        commitOnly: commitOnly || options.commitOnly,
+    });
+
+    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,38 +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, 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;
-}
+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;
+}