@doki-land/nifty 0.0.0 → 0.0.1

package/Readme.md

@@ -1,30 +1,30 @@
-# @doki-land/nifty
-
-**Gitmoji is the default Nifty convention.**
-
-| Layer | Role |
-| --- | --- |
-| `@doki-land/nifty-<platform>` | Node-API `.node`（gitmoji + gix） |
-| `nifty-publisher` | Rust：`petgraph` 拓扑排序 + `npm publish` |
-| `src/cli/` | CLI 实现（`update` / `lint` / `check` / `upload` / `bump` / `publish`） |
-| `cli/nifty.mjs` | npm `bin` shim（jiti 加载 `src/cli`） |
-| `src/` | TypeScript API |
-
-Rust 侧无 `bin` / `cli`。
-
-**本仓开发**（pnpm workspace，`projects/packages/*`）：
-
-```bash
-pnpm install          # 链接 @doki-land/nifty → node_modules/.bin/nifty
-pnpm run build:napi   # 构建 native addon
-pnpm exec nifty bump
-pnpm exec nifty publish --dry-run
-```
-
-**发布后消费**：
-
-```bash
-npm install @doki-land/nifty
-nifty bump
-nifty publish --dry-run
-```
+# @doki-land/nifty
+
+**Gitmoji is the default Nifty convention.**
+
+| Layer | Role |
+| --- | --- |
+| `@doki-land/nifty-<platform>` | Node-API `.node`（gitmoji + gix） |
+| `nifty-publisher` | Rust：`petgraph` 拓扑排序 + `npm publish` |
+| `src/cli/` | CLI 实现（`update` / `lint` / `check` / `upload` / `bump` / `publish`） |
+| `cli/nifty.mjs` | npm `bin` shim（jiti 加载 `src/cli`） |
+| `src/` | TypeScript API |
+
+Rust 侧无 `bin` / `cli`。
+
+**本仓开发**（pnpm workspace，`projects/packages/*`）：
+
+```bash
+pnpm install          # 链接 @doki-land/nifty → node_modules/.bin/nifty
+pnpm run build:napi   # 构建 native addon
+pnpm exec nifty bump
+pnpm exec nifty publish --dry-run
+```
+
+**发布后消费**：
+
+```bash
+npm install @doki-land/nifty
+nifty bump
+nifty publish --dry-run
+```

package/cli/nifty.mjs

@@ -1,11 +1,11 @@
-#!/usr/bin/env node
-
-import { createJiti } from "jiti";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const here = dirname(fileURLToPath(import.meta.url));
-const jiti = createJiti(import.meta.url, { interopDefault: true });
-const { runCli } = await jiti.import(join(here, "../src/cli/main.ts"));
-
-process.exit(await runCli(process.argv.slice(2)));
+#!/usr/bin/env node
+
+import { createJiti } from "jiti";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = dirname(fileURLToPath(import.meta.url));
+const jiti = createJiti(import.meta.url, { interopDefault: true });
+const { runCli } = await jiti.import(join(here, "../src/cli/main.ts"));
+
+process.exit(await runCli(process.argv.slice(2)));

package/locales/en-US/cli.json

@@ -0,0 +1,41 @@
+{
+  "cli.intro": "nifty — gitmoji-first release tooling for hybrid cargo + npm workspaces",
+  "cli.cmd.update": "Bump cargo and npm dependencies",
+  "cli.cmd.lint": "Lint commit subjects (gitmoji rules)",
+  "cli.cmd.check": "Lint commit subjects and fail on errors",
+  "cli.cmd.upload": "Upload generic assets to GitHub Release or GitHub Pages",
+  "cli.cmd.install-native": "Stage matrix .node artifacts into platform npm packages",
+  "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.opt.cwd": "Working directory",
+  "cli.opt.interactive": "Prompt before applying dependency updates",
+  "cli.opt.from": "Start git ref for commit range",
+  "cli.opt.to": "End git ref for commit range",
+  "cli.opt.subject": "Lint a single subject string (repeatable)",
+  "cli.opt.release": "Upload files from --dir to the GitHub Release for --tag",
+  "cli.opt.pages": "Push --dir to gh-pages",
+  "cli.opt.both": "GitHub Release upload and GitHub Pages deploy",
+  "cli.opt.dir": "Directory tree for --release/--pages",
+  "cli.opt.from-artifacts": "Downloaded CI artifact root (default: native-artifacts or NATIVE_ARTIFACT_ROOT)",
+  "cli.opt.tag": "Git tag name (e.g. v0.0.1)",
+  "cli.opt.repo": "GitHub repo owner/name",
+  "cli.opt.token": "GitHub or npm token",
+  "cli.opt.name": "GitHub Release title",
+  "cli.opt.notes": "Release notes body",
+  "cli.opt.notes-file": "Read release notes from file",
+  "cli.opt.draft": "Create a draft GitHub Release",
+  "cli.opt.no-generate-notes": "Skip auto-generated release notes",
+  "cli.opt.github-action": "Read GITHUB_TOKEN, GITHUB_REPOSITORY, GITHUB_REF_NAME",
+  "cli.opt.dry-run": "Print actions without writing or publishing",
+  "cli.opt.refresh": "Ignore publish/trust cache and re-check registry",
+  "cli.opt.version": "Explicit semver target version",
+  "cli.opt.patch": "Bump patch segment",
+  "cli.opt.minor": "Bump minor segment",
+  "cli.opt.major": "Bump major segment",
+  "cli.opt.access": "npm publish --access",
+  "cli.opt.only": "Limit trust to one package name",
+  "cli.opt.otp": "One-time npm password (6 digits)",
+  "cli.opt.totp-secret": "Base32 TOTP secret (overrides env)",
+  "cli.opt.npm-token": "npm auth token (overrides NPM_TOKEN)"
+}

package/locales/locales.json

@@ -0,0 +1,4 @@
+{
+  "defaultLocale": "en-US",
+  "locales": [{ "id": "en-US", "label": "English", "direction": "ltr" }]
+}

package/package.json

@@ -3,6 +3,7 @@
     "nifty": "cli/nifty.mjs"
   },
   "dependencies": {
+    "@vmz/commander": "^0.2.0",
     "jiti": "^2.4.2"
   },
   "description": "Gitmoji-first commit conventions and release helpers (Node-API + TypeScript)",
@@ -16,20 +17,26 @@
   },
   "files": [
     "cli/nifty.mjs",
+    "locales",
     "src"
   ],
   "license": "MPL-2.0",
   "name": "@doki-land/nifty",
   "optionalDependencies": {
-    "@doki-land/nifty-darwin-arm64": "0.0.0",
-    "@doki-land/nifty-darwin-x64": "0.0.0",
-    "@doki-land/nifty-linux-arm64": "0.0.0",
-    "@doki-land/nifty-linux-x64": "0.0.0",
-    "@doki-land/nifty-win32-x64": "0.0.0"
+    "@doki-land/nifty-darwin-arm64": "0.0.1",
+    "@doki-land/nifty-linux-x64": "0.0.1",
+    "@doki-land/nifty-win32-x64": "0.0.1"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/oovm/npm-tools.git"
   },
   "scripts": {
     "typecheck": "tsc --noEmit"
   },
   "type": "module",
-  "version": "0.0.0"
+  "version": "0.0.1"
 }

package/src/cli/authArgs.ts

@@ -1,52 +1,52 @@
-import { resolveNpmExecutable } from "./resolveNpm.js";
-
-export type AuthCliOptions = {
-    otp?: string;
-    totpSecret?: string;
-    token?: string;
-    npm: string;
-};
-
-export function parseAuthArgs(argv: string[]): AuthCliOptions {
-    let otp: string | undefined;
-    let totpSecret: string | undefined;
-    let token: string | undefined;
-
-    for (let i = 0; i < argv.length; i += 1) {
-        const arg = argv[i];
-        if (arg === "--otp") {
-            otp = argv[++i];
-        } else if (arg === "--totp-secret") {
-            totpSecret = argv[++i];
-        } else if (arg === "--token") {
-            token = argv[++i];
-        } else if (arg.startsWith("--otp=")) {
-            otp = arg.slice("--otp=".length);
-        } else if (arg.startsWith("--totp-secret=")) {
-            totpSecret = arg.slice("--totp-secret=".length);
-        } else if (arg.startsWith("--token=")) {
-            token = arg.slice("--token=".length);
-        }
-    }
-
-    return {
-        otp,
-        totpSecret,
-        token,
-        npm: resolveNpmExecutable(),
-    };
-}
-
-export function authPayload(options: AuthCliOptions): {
-    otp?: string;
-    totpSecret?: string;
-    token?: string;
-    npm: string;
-} {
-    return {
-        ...(options.otp !== undefined ? { otp: options.otp } : {}),
-        ...(options.totpSecret !== undefined ? { totpSecret: options.totpSecret } : {}),
-        ...(options.token !== undefined ? { token: options.token } : {}),
-        npm: options.npm,
-    };
-}
+import { resolveNpmExecutable } from "./resolveNpm.js";
+
+export type AuthCliOptions = {
+    otp?: string;
+    totpSecret?: string;
+    token?: string;
+    npm: string;
+};
+
+export function parseAuthArgs(argv: string[]): AuthCliOptions {
+    let otp: string | undefined;
+    let totpSecret: string | undefined;
+    let token: string | undefined;
+
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        if (arg === "--otp") {
+            otp = argv[++i];
+        } else if (arg === "--totp-secret") {
+            totpSecret = argv[++i];
+        } else if (arg === "--token") {
+            token = argv[++i];
+        } else if (arg.startsWith("--otp=")) {
+            otp = arg.slice("--otp=".length);
+        } else if (arg.startsWith("--totp-secret=")) {
+            totpSecret = arg.slice("--totp-secret=".length);
+        } else if (arg.startsWith("--token=")) {
+            token = arg.slice("--token=".length);
+        }
+    }
+
+    return {
+        otp,
+        totpSecret,
+        token,
+        npm: resolveNpmExecutable(),
+    };
+}
+
+export function authPayload(options: AuthCliOptions): {
+    otp?: string;
+    totpSecret?: string;
+    token?: string;
+    npm: string;
+} {
+    return {
+        ...(options.otp !== undefined ? { otp: options.otp } : {}),
+        ...(options.totpSecret !== undefined ? { totpSecret: options.totpSecret } : {}),
+        ...(options.token !== undefined ? { token: options.token } : {}),
+        npm: options.npm,
+    };
+}

package/src/cli/bump-cmd.ts

@@ -0,0 +1,55 @@
+import type { Cli, ParsedOptions } from "@vmz/commander";
+
+import { bumpWorkspace, printBumpReport, type BumpKind, type BumpOptions } from "./bump.js";
+import { bootstrapFromOptions } from "./context.js";
+import { cwdFrom, flag, str } from "./options.js";
+
+export function registerBumpCommand(cli: Cli): void {
+    cli.command("bump", "cli.cmd.bump")
+        .option("--dry-run", "cli.opt.dry-run")
+        .option("--version, -v <version>", "cli.opt.version")
+        .option("--patch", "cli.opt.patch")
+        .option("--minor", "cli.opt.minor")
+        .option("--major", "cli.opt.major")
+        .action(async (options) => cmdBump(options));
+}
+
+export async function cmdBump(options: ParsedOptions): Promise<number> {
+    await bootstrapFromOptions(options);
+    const bumpOptions = bumpOptionsFromParsed(options);
+    const report = bumpWorkspace(bumpOptions);
+    printBumpReport(report, bumpOptions.dryRun);
+    return 0;
+}
+
+function bumpOptionsFromParsed(options: ParsedOptions): BumpOptions {
+    let version = str(options, "version");
+    let kind: BumpKind = "patch";
+    if (flag(options, "major")) {
+        kind = "major";
+    } else if (flag(options, "minor")) {
+        kind = "minor";
+    } else if (flag(options, "patch")) {
+        kind = "patch";
+    }
+    for (const positional of options._) {
+        if (isBumpKind(positional)) {
+            kind = positional;
+        } else if (positional) {
+            version = positional;
+        }
+    }
+    if (version && !/^\d+\.\d+\.\d+(-[\w.-]+)?$/.test(version)) {
+        throw new Error(`invalid version ${version}, expected semver like 0.0.0`);
+    }
+    return {
+        version,
+        kind,
+        cwd: cwdFrom(options),
+        dryRun: flag(options, "dry-run"),
+    };
+}
+
+function isBumpKind(value: string): value is BumpKind {
+    return value === "patch" || value === "minor" || value === "major";
+}