@soybeanjs/cli 1.7.1 → 1.7.3

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { ChangelogOption } from "@soybeanjs/changelog";
-
 //#region src/types/index.d.ts
 interface CliOption {
   /** The project root directory */
@@ -18,7 +17,7 @@ interface CliOption {
   /**
    * Npm-check-updates command args
    *
-   * @default ['--deep', '-u']
+   * If not set, soybean-cli will resolve workspace package.json files automatically and fall back to package.json in single-package repos.
    */
   ncuCommandArgs: string[];
   /**

package/dist/index.js

@@ -1,27 +1,61 @@
 #!/usr/bin/env node
 import { cac } from "cac";
-import path from "node:path";
+import process$1 from "node:process";
+import { loadConfig } from "c12";
 import { readFileSync } from "node:fs";
+import path, { join, posix } from "node:path";
 import enquirer from "enquirer";
 import { bgRed, green, red, yellow } from "kolorist";
 import { rimraf } from "rimraf";
-import { join } from "path";
+import { readFile } from "node:fs/promises";
+import { glob } from "tinyglobby";
 import { existsSync } from "fs";
+import { join as join$1 } from "path";
 import { generateChangelog, generateTotalChangelog } from "@soybeanjs/changelog";
 import { versionBump } from "bumpp";
-import process$1 from "node:process";
-import { loadConfig } from "c12";
-
 //#region package.json
-var version = "1.7.1";
-
+var version = "1.7.3";
+//#endregion
+//#region src/config/index.ts
+const defaultOptions = {
+	cwd: process$1.cwd(),
+	cleanupDirs: [
+		"**/dist",
+		"**/package-lock.json",
+		"**/yarn.lock",
+		"**/pnpm-lock.yaml",
+		"**/node_modules",
+		"!node_modules/**"
+	],
+	ncuCommandArgs: [],
+	changelogOptions: {},
+	gitCommitVerifyIgnores: [
+		/^((Merge pull request)|(Merge (.*?) into (.*?)|(Merge branch (.*?)))(?:\r?\n)*$)/m,
+		/^(Merge tag (.*?))(?:\r?\n)*$/m,
+		/^(R|r)evert (.*)/,
+		/^(amend|fixup|squash)!/,
+		/^(Merged (.*?)(in|into) (.*)|Merged PR (.*): (.*))/,
+		/^Merge remote-tracking branch(\s*)(.*)/,
+		/^Automatic merge(.*)/,
+		/^Auto-merged (.*?) into (.*)/
+	]
+};
+async function loadCliOptions(overrides, cwd = process$1.cwd()) {
+	const { config } = await loadConfig({
+		name: "soybean",
+		defaults: defaultOptions,
+		overrides,
+		cwd,
+		packageJson: true
+	});
+	return config;
+}
 //#endregion
 //#region src/shared/index.ts
 async function execCommand(cmd, args, options) {
 	const { execa } = await import("execa");
 	return ((await execa(cmd, args, options))?.stdout)?.trim() || "";
 }
-
 //#endregion
 //#region src/locales/index.ts
 const locales = {
@@ -94,7 +128,6 @@ const locales = {
 		gitCommitVerify: `${bgRed(" ERROR ")} ${red("git commit message must match the Conventional Commits standard!")}\n\n${green("Recommended to use the command `pnpm commit` to generate Conventional Commits compliant commit information.\nGet more info about Conventional Commits, follow this link: https://conventionalcommits.org")}`
 	}
 };
-
 //#endregion
 //#region src/command/git-commit.ts
 /**
@@ -151,28 +184,83 @@ async function gitCommitVerify(lang = "en-us", ignores = []) {
 		throw new Error(errorMsg);
 	}
 }
-
 //#endregion
 //#region src/command/cleanup.ts
 async function cleanup(paths) {
 	await rimraf(paths, { glob: true });
 }
-
 //#endregion
 //#region src/command/ncu.ts
-async function ncu(args = ["--deep", "-u"]) {
-	await execCommand("pnpm", ["npm-check-updates", ...args], { stdio: "inherit" });
+async function ncu(args = []) {
+	await execCommand("pnpm", ["npm-check-updates", ...args.length ? args : await resolveDefaultNcuArgs()], { stdio: "inherit" });
+}
+function parsePnpmWorkspacePackages(content) {
+	const lines = content.split(/\r?\n/u);
+	const packages = [];
+	let inPackages = false;
+	for (const line of lines) {
+		const trimmedLine = line.trim();
+		if (!inPackages) {
+			if (trimmedLine === "packages:") inPackages = true;
+			continue;
+		}
+		if (!trimmedLine || trimmedLine.startsWith("#")) continue;
+		if (/^\S/u.test(line)) break;
+		const match = line.match(/^\s*-\s*['"]?(.+?)['"]?\s*$/u);
+		if (match?.[1]) packages.push(match[1]);
+	}
+	return packages;
+}
+function resolveWorkspacePatterns(packageJson, pnpmWorkspaceContent) {
+	const workspaces = Array.isArray(packageJson?.workspaces) ? packageJson.workspaces : packageJson?.workspaces?.packages ?? [];
+	const pnpmWorkspacePackages = pnpmWorkspaceContent ? parsePnpmWorkspacePackages(pnpmWorkspaceContent) : [];
+	return [.../* @__PURE__ */ new Set([...workspaces, ...pnpmWorkspacePackages])];
+}
+function toPackageFilePattern(pattern) {
+	const normalizedPattern = pattern.trim();
+	if (!normalizedPattern) return "";
+	const isNegated = normalizedPattern.startsWith("!");
+	const cleanPattern = (isNegated ? normalizedPattern.slice(1) : normalizedPattern).replace(/\/$/u, "");
+	const packageFilePattern = cleanPattern.endsWith("package.json") ? cleanPattern : posix.join(cleanPattern, "package.json");
+	return isNegated ? `!${packageFilePattern}` : packageFilePattern;
+}
+async function resolveDefaultNcuArgs(cwd = process$1.cwd()) {
+	const [packageJsonContent, pnpmWorkspaceContent] = await Promise.all([readFile(join(cwd, "package.json"), "utf8").catch(() => null), readFile(join(cwd, "pnpm-workspace.yaml"), "utf8").catch(() => null)]);
+	const workspacePatterns = resolveWorkspacePatterns(packageJsonContent ? JSON.parse(packageJsonContent) : null, pnpmWorkspaceContent).map(toPackageFilePattern).filter(Boolean);
+	if (!workspacePatterns.length) return [
+		"-u",
+		"--packageFile",
+		"package.json"
+	];
+	const packageFiles = await glob(["package.json", ...workspacePatterns], {
+		cwd,
+		followSymbolicLinks: false,
+		onlyFiles: true
+	});
+	const uniquePackageFiles = [...new Set(packageFiles)].sort((left, right) => {
+		if (left === "package.json") return -1;
+		if (right === "package.json") return 1;
+		return left.localeCompare(right);
+	});
+	if (!uniquePackageFiles.length) return [
+		"-u",
+		"--packageFile",
+		"package.json"
+	];
+	return [
+		"-u",
+		"--packageFile",
+		`{${uniquePackageFiles.join(",")}}`
+	];
 }
-
 //#endregion
 //#region src/command/changelog.ts
 async function genChangelog(options, total = false) {
-	const hasChangelog = existsSync(join(process.cwd(), "CHANGELOG.md"));
+	const hasChangelog = existsSync(join$1(process.cwd(), "CHANGELOG.md"));
 	if (total) await generateTotalChangelog(options);
 	else await generateChangelog(options);
 	if (!hasChangelog) await execCommand("git", ["add", "CHANGELOG.md"]);
 }
-
 //#endregion
 //#region src/command/release.ts
 async function release(execute = "pnpm soy changelog", push = true) {
@@ -185,43 +273,6 @@ async function release(execute = "pnpm soy changelog", push = true) {
 		push
 	});
 }
-
-//#endregion
-//#region src/config/index.ts
-const defaultOptions = {
-	cwd: process$1.cwd(),
-	cleanupDirs: [
-		"**/dist",
-		"**/package-lock.json",
-		"**/yarn.lock",
-		"**/pnpm-lock.yaml",
-		"**/node_modules",
-		"!node_modules/**"
-	],
-	ncuCommandArgs: ["--deep", "-u"],
-	changelogOptions: {},
-	gitCommitVerifyIgnores: [
-		/^((Merge pull request)|(Merge (.*?) into (.*?)|(Merge branch (.*?)))(?:\r?\n)*$)/m,
-		/^(Merge tag (.*?))(?:\r?\n)*$/m,
-		/^(R|r)evert (.*)/,
-		/^(amend|fixup|squash)!/,
-		/^(Merged (.*?)(in|into) (.*)|Merged PR (.*): (.*))/,
-		/^Merge remote-tracking branch(\s*)(.*)/,
-		/^Automatic merge(.*)/,
-		/^Auto-merged (.*?) into (.*)/
-	]
-};
-async function loadCliOptions(overrides, cwd = process$1.cwd()) {
-	const { config } = await loadConfig({
-		name: "soybean",
-		defaults: defaultOptions,
-		overrides,
-		cwd,
-		packageJson: true
-	});
-	return config;
-}
-
 //#endregion
 //#region src/index.ts
 async function setupCli() {
@@ -284,6 +335,5 @@ setupCli();
 function defineConfig(config) {
 	return config;
 }
-
 //#endregion
-export { defineConfig };
+export { defineConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soybeanjs/cli",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "SoybeanJS's command line tools",
   "homepage": "https://github.com/soybeanjs/cli",
   "bugs": {
@@ -16,8 +16,8 @@
     "url": "https://github.com/soybeanjs/cli.git"
   },
   "bin": {
-    "soybean": "dist/index.js",
-    "soy": "dist/index.js"
+    "soy": "dist/index.js",
+    "soybean": "dist/index.js"
   },
   "files": [
     "dist"
@@ -37,48 +37,38 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@soybeanjs/changelog": "^0.4.5",
-    "bumpp": "^11.0.1",
-    "c12": "^3.3.3",
+    "@soybeanjs/changelog": "^0.4.7",
+    "bumpp": "^12.0.0",
+    "c12": "^3.3.4",
     "cac": "^7.0.0",
     "consola": "^3.4.2",
     "enquirer": "^2.4.1",
-    "execa": "^9.6.1",
+    "execa": "^10.0.0",
     "kolorist": "^1.8.0",
-    "npm-check-updates": "^19.6.5",
+    "npm-check-updates": "^22.2.9",
     "rimraf": "^6.1.3",
-    "tinyglobby": "^0.2.15"
+    "tinyglobby": "^0.2.17"
   },
   "devDependencies": {
     "@soybeanjs/cli": "link:",
-    "@types/node": "^25.5.0",
-    "lint-staged": "^16.4.0",
-    "oxfmt": "^0.41.0",
-    "oxlint": "^1.56.0",
-    "simple-git-hooks": "^2.13.1",
-    "tsdown": "^0.21.4",
-    "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
-  },
-  "simple-git-hooks": {
-    "commit-msg": "pnpm soy git-commit-verify",
-    "pre-commit": "pnpm typecheck && pnpm lint-staged"
-  },
-  "lint-staged": {
-    "*": "oxlint --fix && oxfmt"
+    "@soybeanjs/oxc-config": "^0.2.3",
+    "@types/node": "^26.1.1",
+    "oxfmt": "^0.60.0",
+    "oxlint": "^1.75.0",
+    "tsdown": "^0.22.14",
+    "tsx": "^4.23.1",
+    "typescript": "^7.0.2",
+    "vite-plus": "0.2.6"
   },
   "scripts": {
-    "build": "tsdown",
-    "cleanup": "soy cleanup",
+    "build": "vp pack",
     "commit": "soy git-commit",
     "commit:zh": "soy git-commit -l=zh-cn",
-    "lint": "oxlint --fix",
-    "fmt": "oxfmt",
+    "fmt": "vp fmt",
+    "lint": "vp lint",
     "publish-pkg": "pnpm -r publish --access public",
     "release": "soy release",
-    "stub": "pnpm -r run stub",
     "typecheck": "tsc --noEmit --skipLibCheck",
-    "upkg": "soy ncu",
-    "rei": "pnpm cleanup && pnpm i"
+    "upkg": "soy ncu"
   }
 }