@doki-land/nifty 0.0.0 → 0.0.1

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

package/src/cli/trust-cmd.ts

@@ -0,0 +1,35 @@
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { loadNiftyNative } from "../native.js";
+import { authPayload } from "./authArgs.js";
+import { bootstrapFromOptions } from "./context.js";
+import { printTrustReport } from "./trust.js";
+import { authFromOptions, cwdFrom, flag, str } from "./options.js";
+
+export function registerTrustCommand(cli: Cli): void {
+    cli.command("trust", "cli.cmd.trust")
+        .option("--dry-run", "cli.opt.dry-run")
+        .option("--refresh", "cli.opt.refresh")
+        .option("--only <package>", "cli.opt.only")
+        .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) => cmdTrust(options));
+}
+
+export async function cmdTrust(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const native = loadNiftyNative();
+    const report = native.publisher["trust-workspace"]({
+        cwd: cwdFrom(options),
+        dryRun: flag(options, "dry-run"),
+        refresh: flag(options, "refresh"),
+        only: str(options, "only"),
+        ...authPayload(authFromOptions(options)),
+    });
+    printTrustReport(report);
+    if (report.failed.length > 0) {
+        throw new Error(`trust failed for ${report.failed.length} package(s)`);
+    }
+    return 0;
+}

package/src/cli/trust.ts

@@ -1,77 +1,83 @@
-import { loadNiftyNative } from "../native.js";
-import { authPayload, parseAuthArgs } from "./authArgs.js";
-
-export type TrustReport = {
-    root: string;
-    configured: string[];
-    skipped: string[];
-    failed: string[];
-};
-
-export async function runTrust(argv: string[]): Promise<void> {
-    const options = parseTrustArgs(argv);
-    const native = loadNiftyNative();
-    const report = native.publisher["trust-workspace"]({
-        cwd: options.cwd,
-        dryRun: options.dryRun,
-        only: options.only,
-        ...authPayload(options.auth),
-    });
-    printReport(report);
-}
-
-function parseTrustArgs(argv: string[]) {
-    let cwd: string | undefined;
-    let dryRun = false;
-    let only: string | undefined;
-    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 === "-C" || arg === "--cwd") {
-            cwd = argv[++i];
-        } else if (arg === "--only") {
-            only = argv[++i];
-        } else if (arg === "-h" || arg === "--help") {
-            printTrustHelp();
-            process.exit(0);
-        }
-    }
-
-    return { cwd, dryRun, only, auth };
-}
-
-function printReport(report: TrustReport): void {
-    console.log(`trust workspace ${report.root}`);
-    console.log(`  configured: ${report.configured.length}`);
-    for (const name of report.configured) {
-        console.log(`    + ${name}`);
-    }
-    console.log(`  skipped: ${report.skipped.length}`);
-    for (const name of report.skipped) {
-        console.log(`    = ${name}`);
-    }
-    if (report.failed.length > 0) {
-        console.log(`  failed: ${report.failed.length}`);
-        for (const name of report.failed) {
-            console.log(`    ! ${name}`);
-        }
-    }
-}
-
-function printTrustHelp(): void {
-    console.log(`nifty trust — configure npm Trusted Publisher for workspace packages
-
-Reads NPM_TOTP_SECRET / NPM_OTP / NPM_TOKEN from env or .env.placeholder.local.
-
-Usage:
-  nifty trust
-  nifty trust --only @doki-land/nifty
-  nifty trust --dry-run
-  nifty trust --totp-secret <base32>
-  nifty trust --otp 123456
-  nifty trust -C <cwd>
-`);
-}
+import { loadNiftyNative } from "../native.js";
+import { authPayload, parseAuthArgs } from "./authArgs.js";
+
+export type TrustReport = {
+    root: string;
+    configured: string[];
+    skipped: string[];
+    failed: string[];
+};
+
+export async function runTrust(argv: string[]): Promise<void> {
+    const options = parseTrustArgs(argv);
+    const native = loadNiftyNative();
+    const report = native.publisher["trust-workspace"]({
+        cwd: options.cwd,
+        dryRun: options.dryRun,
+        refresh: options.refresh,
+        only: options.only,
+        ...authPayload(options.auth),
+    });
+    printTrustReport(report);
+}
+
+function parseTrustArgs(argv: string[]) {
+    let cwd: string | undefined;
+    let dryRun = false;
+    let refresh = false;
+    let only: string | undefined;
+    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 === "--only") {
+            only = argv[++i];
+        } else if (arg === "-h" || arg === "--help") {
+            printTrustHelp();
+            process.exit(0);
+        }
+    }
+
+    return { cwd, dryRun, refresh, only, auth };
+}
+
+export function printTrustReport(report: TrustReport): void {
+    console.log(`trust workspace ${report.root}`);
+    console.log(`  configured: ${report.configured.length}`);
+    for (const name of report.configured) {
+        console.log(`    + ${name}`);
+    }
+    console.log(`  skipped: ${report.skipped.length}`);
+    for (const name of report.skipped) {
+        console.log(`    = ${name}`);
+    }
+    if (report.failed.length > 0) {
+        console.log(`  failed: ${report.failed.length}`);
+        for (const name of report.failed) {
+            console.log(`    ! ${name}`);
+        }
+    }
+}
+
+function printTrustHelp(): void {
+    console.log(`nifty trust — configure npm Trusted Publisher for workspace packages
+
+Reads NPM_TOTP_SECRET / NPM_OTP / NPM_TOKEN from env or .env.placeholder.local.
+Trust list cache lives in .cache/npm-placeholder.json.
+
+Usage:
+  nifty trust
+  nifty trust --only @doki-land/nifty
+  nifty trust --dry-run
+  nifty trust --refresh
+  nifty trust --totp-secret <base32>
+  nifty trust --otp 123456
+  nifty trust -C <cwd>
+`);
+}

package/src/cli/update-cmd.ts

@@ -0,0 +1,20 @@
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { bootstrapFromOptions } from "./context.js";
+import { updateWorkspace } from "./update.js";
+import { cwdFrom, flag } from "./options.js";
+
+export function registerUpdateCommand(cli: Cli): void {
+    cli.command("update", "cli.cmd.update")
+        .option("-i, --interactive", "cli.opt.interactive")
+        .action(async (options) => cmdUpdate(options));
+}
+
+export async function cmdUpdate(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    await updateWorkspace({
+        interactive: flag(options, "interactive"),
+        cwd: cwdFrom(options),
+    });
+    return 0;
+}

package/src/cli/update.ts

@@ -1,182 +1,185 @@
-import { spawnSync } from "node:child_process";
-import { stdin as input, stdout as output } from "node:process";
-import { createInterface } from "node:readline/promises";
-import { dirname } from "node:path";
-
-import { detectProjectLayout, discoverPackageDirs } from "../config/detectProject.js";
-
-type UpdateOptions = {
-    interactive: boolean;
-    cwd?: string;
-};
-
-type CargoUpgrade = {
-    crate: string;
-    from: string;
-    to: string;
-};
-
-type NpmOutdated = {
-    name: string;
-    current: string;
-    wanted: string;
-    latest: string;
-};
-
-export async function runUpdate(argv: string[]): Promise<void> {
-    const options = parseUpdateArgs(argv);
-    const cwd = options.cwd ?? process.cwd();
-    const layout = detectProjectLayout(cwd);
-
-    if (layout.kind === "unknown") {
-        throw new Error(`no Cargo.toml or package.json found from ${cwd}`);
-    }
-
-    if (layout.kind === "cargo" || layout.kind === "hybrid") {
-        await updateCargo(layout, options.interactive);
-    }
-    if (layout.kind === "npm" || layout.kind === "hybrid") {
-        await updateNpm(layout, options.interactive);
-    }
-}
-
-function parseUpdateArgs(argv: string[]): UpdateOptions {
-    let interactive = false;
-    let cwd: string | undefined;
-    for (let i = 0; i < argv.length; i += 1) {
-        const arg = argv[i];
-        if (arg === "-i" || arg === "--interactive") {
-            interactive = true;
-        } else if (arg === "-C" || arg === "--cwd") {
-            cwd = argv[++i];
-        }
-    }
-    return { interactive, cwd };
-}
-
-function cargoRoot(layout: ReturnType<typeof detectProjectLayout>): string | undefined {
-    return (
-        layout.cargoWorkspaceRoot ??
-        (layout.cargoManifest ? dirname(layout.cargoManifest) : undefined)
-    );
-}
-
-async function updateCargo(layout: ReturnType<typeof detectProjectLayout>, interactive: boolean): Promise<void> {
-    const root = cargoRoot(layout);
-    if (!root) {
-        throw new Error("cargo project not found");
-    }
-
-    const dry = spawnSync("cargo", ["upgrade", "--workspace", "--dry-run"], {
-        cwd: root,
-        encoding: "utf8",
-    });
-    const combined = `${dry.stdout ?? ""}${dry.stderr ?? ""}`;
-    const upgrades = parseCargoUpgrades(combined);
-    if (dry.status !== 0 && !combined.includes("no upgrades found") && upgrades.length === 0) {
-        throw new Error(`cargo upgrade --dry-run failed:\n${combined}`);
-    }
-
-    if (upgrades.length === 0) {
-        console.log("cargo: dependencies already up to date");
-        return;
-    }
-
-    if (interactive) {
-        const selected = await pickItems(
-            "Select cargo upgrades",
-            upgrades.map((item) => `${item.crate} ${item.from} -> ${item.to}`),
-        );
-        for (const index of selected) {
-            const item = upgrades[index];
-            run("cargo", ["upgrade", "--workspace", "-p", item.crate], root);
-        }
-    } else {
-        run("cargo", ["upgrade", "--workspace"], root);
-    }
-}
-
-async function updateNpm(layout: ReturnType<typeof detectProjectLayout>, interactive: boolean): Promise<void> {
-    const packages = discoverPackageDirs(layout);
-    if (packages.length === 0) {
-        console.log("npm: no package.json directories found");
-        return;
-    }
-    for (const packageDir of packages) {
-        await updateNpmDir(packageDir, interactive);
-    }
-}
-
-async function updateNpmDir(packageDir: string, interactive: boolean): Promise<void> {
-    const outdated = listNpmOutdated(packageDir);
-    if (outdated.length === 0) {
-        console.log(`npm (${packageDir}): dependencies already up to date`);
-        return;
-    }
-
-    if (interactive) {
-        const selected = await pickItems(
-            `Select npm upgrades (${packageDir})`,
-            outdated.map((item) => `${item.name} ${item.current} -> ${item.wanted}`),
-        );
-        for (const index of selected) {
-            const item = outdated[index];
-            run("npm", ["install", `${item.name}@${item.wanted}`], packageDir);
-        }
-    } else {
-        run("npm", ["update"], packageDir);
-    }
-}
-
-function parseCargoUpgrades(text: string): CargoUpgrade[] {
-    const upgrades: CargoUpgrade[] = [];
-    for (const line of text.split(/\r?\n/)) {
-        const match = line.match(/^\s*(\S+)\s+v(\S+)\s+->\s+v(\S+)/);
-        if (match) {
-            upgrades.push({ crate: match[1], from: match[2], to: match[3] });
-        }
-    }
-    return upgrades;
-}
-
-function listNpmOutdated(packageDir: string): NpmOutdated[] {
-    const result = spawnSync("npm", ["outdated", "--json"], { cwd: packageDir, encoding: "utf8" });
-    if (!result.stdout?.trim()) {
-        return [];
-    }
-    const parsed = JSON.parse(result.stdout) as Record<
-        string,
-        { current: string; wanted: string; latest: string }
-    >;
-    return Object.entries(parsed).map(([name, entry]) => ({
-        name,
-        current: entry.current,
-        wanted: entry.wanted,
-        latest: entry.latest,
-    }));
-}
-
-async function pickItems(prompt: string, labels: string[]): Promise<number[]> {
-    console.log(prompt);
-    for (const [index, label] of labels.entries()) {
-        console.log(`  [${index}] ${label}`);
-    }
-    const rl = createInterface({ input, output });
-    const answer = await rl.question("Indexes (comma-separated, empty = all): ");
-    rl.close();
-    const trimmed = answer.trim();
-    if (!trimmed) {
-        return labels.map((_, index) => index);
-    }
-    return trimmed
-        .split(",")
-        .map((part) => Number.parseInt(part.trim(), 10))
-        .filter((index) => Number.isInteger(index) && index >= 0 && index < labels.length);
-}
-
-function run(command: string, args: string[], cwd: string): void {
-    const result = spawnSync(command, args, { cwd, stdio: "inherit" });
-    if (result.status !== 0) {
-        throw new Error(`${command} ${args.join(" ")} failed`);
-    }
-}
+import { spawnSync } from "node:child_process";
+import { stdin as input, stdout as output } from "node:process";
+import { createInterface } from "node:readline/promises";
+import { dirname } from "node:path";
+
+import { detectProjectLayout, discoverPackageDirs } from "../config/detectProject.js";
+
+type UpdateOptions = {
+    interactive: boolean;
+    cwd?: string;
+};
+
+type CargoUpgrade = {
+    crate: string;
+    from: string;
+    to: string;
+};
+
+type NpmOutdated = {
+    name: string;
+    current: string;
+    wanted: string;
+    latest: string;
+};
+
+export async function runUpdate(argv: string[]): Promise<void> {
+    await updateWorkspace(parseUpdateArgs(argv));
+}
+
+export async function updateWorkspace(options: UpdateOptions): Promise<void> {
+    const cwd = options.cwd ?? process.cwd();
+    const layout = detectProjectLayout(cwd);
+
+    if (layout.kind === "unknown") {
+        throw new Error(`no Cargo.toml or package.json found from ${cwd}`);
+    }
+
+    if (layout.kind === "cargo" || layout.kind === "hybrid") {
+        await updateCargo(layout, options.interactive);
+    }
+    if (layout.kind === "npm" || layout.kind === "hybrid") {
+        await updateNpm(layout, options.interactive);
+    }
+}
+
+function parseUpdateArgs(argv: string[]): UpdateOptions {
+    let interactive = false;
+    let cwd: string | undefined;
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        if (arg === "-i" || arg === "--interactive") {
+            interactive = true;
+        } else if (arg === "-C" || arg === "--cwd") {
+            cwd = argv[++i];
+        }
+    }
+    return { interactive, cwd };
+}
+
+function cargoRoot(layout: ReturnType<typeof detectProjectLayout>): string | undefined {
+    return (
+        layout.cargoWorkspaceRoot ??
+        (layout.cargoManifest ? dirname(layout.cargoManifest) : undefined)
+    );
+}
+
+async function updateCargo(layout: ReturnType<typeof detectProjectLayout>, interactive: boolean): Promise<void> {
+    const root = cargoRoot(layout);
+    if (!root) {
+        throw new Error("cargo project not found");
+    }
+
+    const dry = spawnSync("cargo", ["upgrade", "--workspace", "--dry-run"], {
+        cwd: root,
+        encoding: "utf8",
+    });
+    const combined = `${dry.stdout ?? ""}${dry.stderr ?? ""}`;
+    const upgrades = parseCargoUpgrades(combined);
+    if (dry.status !== 0 && !combined.includes("no upgrades found") && upgrades.length === 0) {
+        throw new Error(`cargo upgrade --dry-run failed:\n${combined}`);
+    }
+
+    if (upgrades.length === 0) {
+        console.log("cargo: dependencies already up to date");
+        return;
+    }
+
+    if (interactive) {
+        const selected = await pickItems(
+            "Select cargo upgrades",
+            upgrades.map((item) => `${item.crate} ${item.from} -> ${item.to}`),
+        );
+        for (const index of selected) {
+            const item = upgrades[index];
+            run("cargo", ["upgrade", "--workspace", "-p", item.crate], root);
+        }
+    } else {
+        run("cargo", ["upgrade", "--workspace"], root);
+    }
+}
+
+async function updateNpm(layout: ReturnType<typeof detectProjectLayout>, interactive: boolean): Promise<void> {
+    const packages = discoverPackageDirs(layout);
+    if (packages.length === 0) {
+        console.log("npm: no package.json directories found");
+        return;
+    }
+    for (const packageDir of packages) {
+        await updateNpmDir(packageDir, interactive);
+    }
+}
+
+async function updateNpmDir(packageDir: string, interactive: boolean): Promise<void> {
+    const outdated = listNpmOutdated(packageDir);
+    if (outdated.length === 0) {
+        console.log(`npm (${packageDir}): dependencies already up to date`);
+        return;
+    }
+
+    if (interactive) {
+        const selected = await pickItems(
+            `Select npm upgrades (${packageDir})`,
+            outdated.map((item) => `${item.name} ${item.current} -> ${item.wanted}`),
+        );
+        for (const index of selected) {
+            const item = outdated[index];
+            run("npm", ["install", `${item.name}@${item.wanted}`], packageDir);
+        }
+    } else {
+        run("npm", ["update"], packageDir);
+    }
+}
+
+function parseCargoUpgrades(text: string): CargoUpgrade[] {
+    const upgrades: CargoUpgrade[] = [];
+    for (const line of text.split(/\r?\n/)) {
+        const match = line.match(/^\s*(\S+)\s+v(\S+)\s+->\s+v(\S+)/);
+        if (match) {
+            upgrades.push({ crate: match[1], from: match[2], to: match[3] });
+        }
+    }
+    return upgrades;
+}
+
+function listNpmOutdated(packageDir: string): NpmOutdated[] {
+    const result = spawnSync("npm", ["outdated", "--json"], { cwd: packageDir, encoding: "utf8" });
+    if (!result.stdout?.trim()) {
+        return [];
+    }
+    const parsed = JSON.parse(result.stdout) as Record<
+        string,
+        { current: string; wanted: string; latest: string }
+    >;
+    return Object.entries(parsed).map(([name, entry]) => ({
+        name,
+        current: entry.current,
+        wanted: entry.wanted,
+        latest: entry.latest,
+    }));
+}
+
+async function pickItems(prompt: string, labels: string[]): Promise<number[]> {
+    console.log(prompt);
+    for (const [index, label] of labels.entries()) {
+        console.log(`  [${index}] ${label}`);
+    }
+    const rl = createInterface({ input, output });
+    const answer = await rl.question("Indexes (comma-separated, empty = all): ");
+    rl.close();
+    const trimmed = answer.trim();
+    if (!trimmed) {
+        return labels.map((_, index) => index);
+    }
+    return trimmed
+        .split(",")
+        .map((part) => Number.parseInt(part.trim(), 10))
+        .filter((index) => Number.isInteger(index) && index >= 0 && index < labels.length);
+}
+
+function run(command: string, args: string[], cwd: string): void {
+    const result = spawnSync(command, args, { cwd, stdio: "inherit" });
+    if (result.status !== 0) {
+        throw new Error(`${command} ${args.join(" ")} failed`);
+    }
+}