@soybeanjs/cli 0.3.2 → 0.4.0

package/README.md

@@ -20,16 +20,16 @@ pnpm soy -h
 
 ## 命令介绍
 
-| 命令              | 作用                                          |
-| ----------------- | --------------------------------------------- |
-| help              | 查看全部命令用法                              |
-| git-commit        | 生成符合 Angular 规范的 git 提交信息          |
-| git-commit-verify | 校验 git 的提交信息是否符合 Angular 规范      |
-| cleanup           | 清空依赖和构建产物                            |
-| cleanup-deep      | 清空依赖和构建产物(包含 深层级)               |
-| init-git-hooks    | 初始化 simple-gi t-hooks 钩子                 |
-| update-pkg        | 升级依赖                                      |
-| prettier-format   | prettier 格式化                               |
+| 命令              | 作用                                     |
+| ----------------- | ---------------------------------------- |
+| help              | 查看全部命令用法                         |
+| git-commit        | 生成符合 Angular 规范的 git 提交信息     |
+| git-commit-verify | 校验 git 的提交信息是否符合 Angular 规范 |
+| cleanup           | 清空依赖和构建产物                       |
+| cleanup-deep      | 清空依赖和构建产物(包含 深层级)          |
+| init-git-hooks    | 初始化 simple-gi t-hooks 钩子            |
+| update-pkg        | 升级依赖                                 |
+| prettier-format   | prettier 格式化                          |
 
 ### prettier-format
 

package/dist/index.cjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 'use strict';
 
-const commander = require('commander');
-const kolorist = require('kolorist');
+const cac = require('cac');
 const enquirer = require('enquirer');
 const execa = require('execa');
 const actualFS = require('fs');
+const kolorist = require('kolorist');
 const rimraf = require('rimraf');
 const path$1 = require('path');
 const url = require('url');
@@ -28,95 +28,14 @@ function _interopNamespaceCompat(e) {
   return n;
 }
 
+const cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
 const enquirer__default = /*#__PURE__*/_interopDefaultCompat(enquirer);
 const actualFS__namespace = /*#__PURE__*/_interopNamespaceCompat(actualFS);
 const EE__default = /*#__PURE__*/_interopDefaultCompat(EE);
 const Stream__default = /*#__PURE__*/_interopDefaultCompat(Stream);
 const stringdecoder__default = /*#__PURE__*/_interopDefaultCompat(stringdecoder);
 
-const name = "@soybeanjs/cli";
-const version = "0.3.2";
-const description = "SoybeanJS's command line tools";
-const author = {
-	name: "Soybean",
-	email: "honghuangdc@gmail.com",
-	url: "https://github.com/honghuangdc"
-};
-const license = "MIT";
-const homepage = "https://github.com/honghuangdc/soybean-cli";
-const repository = {
-	url: "https://github.com/honghuangdc/soybean-cli.git"
-};
-const bugs = {
-	url: "https://github.com/honghuangdc/soybean-cli/issues"
-};
-const publishConfig = {
-	registry: "https://registry.npmjs.org/"
-};
-const bin = {
-	soybean: "dist/index.mjs",
-	soy: "dist/index.mjs"
-};
-const files = [
-	"dist"
-];
-const scripts = {
-	build: "pnpm typecheck && unbuild",
-	lint: "eslint . --fix",
-	format: "soy prettier-format",
-	commit: "soy git-commit",
-	cleanup: "soy cleanup",
-	"update-pkg": "soy update-pkg",
-	"update-version": "bumpp --commit --push --tag",
-	"publish-pkg": "pnpm -r publish --access public",
-	typecheck: "tsc --noEmit",
-	release: "pnpm update-version && pnpm build && pnpm publish-pkg"
-};
-const dependencies = {
-	commander: "10.0.1",
-	enquirer: "2.3.6",
-	execa: "7.1.1",
-	kolorist: "1.8.0",
-	minimist: "1.2.8",
-	"npm-check-updates": "16.10.12",
-	rimraf: "5.0.1"
-};
-const devDependencies = {
-	"@soybeanjs/cli": "link:",
-	"@types/node": "20.2.5",
-	bumpp: "9.1.0",
-	eslint: "8.41.0",
-	"eslint-config-soybeanjs": "0.4.7",
-	"lint-staged": "13.2.2",
-	"simple-git-hooks": "2.8.1",
-	tsx: "3.12.7",
-	typescript: "5.0.4",
-	unbuild: "1.2.1"
-};
-const pkg = {
-	name: name,
-	version: version,
-	description: description,
-	author: author,
-	license: license,
-	homepage: homepage,
-	repository: repository,
-	bugs: bugs,
-	publishConfig: publishConfig,
-	bin: bin,
-	files: files,
-	scripts: scripts,
-	dependencies: dependencies,
-	devDependencies: devDependencies,
-	"simple-git-hooks": {
-	"commit-msg": "pnpm soy git-commit-verify",
-	"pre-commit": "pnpm typecheck && pnpm lint-staged"
-},
-	"lint-staged": {
-	"*.{js,mjs,jsx,ts,mts,tsx,json,vue,svelte,astro}": "eslint . --fix",
-	"*.!{js,mjs,jsx,ts,mts,tsx,json,vue,svelte,astro}": "format"
-}
-};
+const version = "0.4.0";
 
 const gitCommitTypes = [
   { value: "init", title: "init:     \u9879\u76EE\u521D\u59CB\u5316" },
@@ -7542,23 +7461,56 @@ function prettierFormat() {
   });
 }
 
-commander.program.command("git-commit").description("\u751F\u6210\u7B26\u5408 Angular \u89C4\u8303\u7684 git commit").action(() => {
-  gitCommit();
-});
-commander.program.command("git-commit-verify").description("\u6821\u9A8Cgit\u7684commit\u662F\u5426\u7B26\u5408 Angular \u89C4\u8303").action(() => {
-  gitCommitVerify();
-});
-commander.program.command("cleanup").description("\u6E05\u7A7A\u4F9D\u8D56\u548C\u6784\u5EFA\u4EA7\u7269").action(() => {
-  cleanup();
-});
-commander.program.command("init-git-hooks").description("\u521D\u59CB\u5316simple-git-hooks\u94A9\u5B50").action(() => {
-  initSimpleGitHooks();
-});
-commander.program.command("update-pkg").description("\u5347\u7EA7\u4F9D\u8D56").action(() => {
-  updatePkg();
-});
-commander.program.command("prettier-format").description("prettier\u683C\u5F0F\u5316").action(() => {
-  prettierFormat();
+async function eslintPretter() {
+  await execa.execa("npx", ["eslint", ".", "--fix"], {
+    stdio: "inherit"
+  });
+  await execa.execa("npx", ["soy", "prettier-format"], {
+    stdio: "inherit"
+  });
+}
+
+function lintStaged() {
+  execa.execa("npx", ["lint-staged", "--config", "@soybeanjs/cli/lint-staged"], { stdio: "inherit" });
+}
+
+const cli = cac__default("soybean");
+cli.version(version).help();
+const commands = {
+  "git-commit": {
+    desc: "\u751F\u6210\u7B26\u5408 Angular \u89C4\u8303\u7684 git commit",
+    action: gitCommit
+  },
+  "git-commit-verify": {
+    desc: "\u6821\u9A8Cgit\u7684commit\u662F\u5426\u7B26\u5408 Angular \u89C4\u8303",
+    action: gitCommitVerify
+  },
+  cleanup: {
+    desc: "\u6E05\u7A7A\u4F9D\u8D56\u548C\u6784\u5EFA\u4EA7\u7269",
+    action: cleanup
+  },
+  "init-git-hooks": {
+    desc: "\u521D\u59CB\u5316simple-git-hooks\u94A9\u5B50",
+    action: initSimpleGitHooks
+  },
+  "update-pkg": {
+    desc: "\u5347\u7EA7\u4F9D\u8D56",
+    action: updatePkg
+  },
+  "prettier-format": {
+    desc: "prettier\u683C\u5F0F\u5316",
+    action: prettierFormat
+  },
+  "eslint-prettier": {
+    desc: "eslint\u548Cprettier\u683C\u5F0F\u5316",
+    action: eslintPretter
+  },
+  "lint-staged": {
+    desc: "\u6267\u884Clint-staged",
+    action: lintStaged
+  }
+};
+Object.entries(commands).forEach(([command, { desc, action }]) => {
+  cli.command(command, desc).action(action);
 });
-commander.program.version(pkg.version).description(kolorist.blue("soybean alias soy\n\nhttps://github.com/soybeanjs/cli"));
-commander.program.parse(process.argv);
+cli.parse();

package/dist/index.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { program } from 'commander';
-import { bgRed, red, green, blue } from 'kolorist';
+import cac from 'cac';
 import enquirer from 'enquirer';
 import { execa } from 'execa';
 import * as actualFS from 'fs';
 import { readFileSync, realpathSync as realpathSync$1, lstatSync, readdir, readdirSync, readlinkSync, existsSync } from 'fs';
+import { bgRed, red, green } from 'kolorist';
 import { rimraf } from 'rimraf';
 import { win32, posix } from 'path';
 import { fileURLToPath } from 'url';
@@ -13,89 +13,7 @@ import EE from 'events';
 import Stream from 'stream';
 import stringdecoder from 'string_decoder';
 
-const name = "@soybeanjs/cli";
-const version = "0.3.2";
-const description = "SoybeanJS's command line tools";
-const author = {
-	name: "Soybean",
-	email: "honghuangdc@gmail.com",
-	url: "https://github.com/honghuangdc"
-};
-const license = "MIT";
-const homepage = "https://github.com/honghuangdc/soybean-cli";
-const repository = {
-	url: "https://github.com/honghuangdc/soybean-cli.git"
-};
-const bugs = {
-	url: "https://github.com/honghuangdc/soybean-cli/issues"
-};
-const publishConfig = {
-	registry: "https://registry.npmjs.org/"
-};
-const bin = {
-	soybean: "dist/index.mjs",
-	soy: "dist/index.mjs"
-};
-const files = [
-	"dist"
-];
-const scripts = {
-	build: "pnpm typecheck && unbuild",
-	lint: "eslint . --fix",
-	format: "soy prettier-format",
-	commit: "soy git-commit",
-	cleanup: "soy cleanup",
-	"update-pkg": "soy update-pkg",
-	"update-version": "bumpp --commit --push --tag",
-	"publish-pkg": "pnpm -r publish --access public",
-	typecheck: "tsc --noEmit",
-	release: "pnpm update-version && pnpm build && pnpm publish-pkg"
-};
-const dependencies = {
-	commander: "10.0.1",
-	enquirer: "2.3.6",
-	execa: "7.1.1",
-	kolorist: "1.8.0",
-	minimist: "1.2.8",
-	"npm-check-updates": "16.10.12",
-	rimraf: "5.0.1"
-};
-const devDependencies = {
-	"@soybeanjs/cli": "link:",
-	"@types/node": "20.2.5",
-	bumpp: "9.1.0",
-	eslint: "8.41.0",
-	"eslint-config-soybeanjs": "0.4.7",
-	"lint-staged": "13.2.2",
-	"simple-git-hooks": "2.8.1",
-	tsx: "3.12.7",
-	typescript: "5.0.4",
-	unbuild: "1.2.1"
-};
-const pkg = {
-	name: name,
-	version: version,
-	description: description,
-	author: author,
-	license: license,
-	homepage: homepage,
-	repository: repository,
-	bugs: bugs,
-	publishConfig: publishConfig,
-	bin: bin,
-	files: files,
-	scripts: scripts,
-	dependencies: dependencies,
-	devDependencies: devDependencies,
-	"simple-git-hooks": {
-	"commit-msg": "pnpm soy git-commit-verify",
-	"pre-commit": "pnpm typecheck && pnpm lint-staged"
-},
-	"lint-staged": {
-	"*.{js,mjs,jsx,ts,mts,tsx,json,vue,svelte,astro}": "eslint . --fix",
-	"*.!{js,mjs,jsx,ts,mts,tsx,json,vue,svelte,astro}": "format"
-}
-};
+const version = "0.4.0";
 
 const gitCommitTypes = [
   { value: "init", title: "init:     \u9879\u76EE\u521D\u59CB\u5316" },
@@ -7521,23 +7439,56 @@ function prettierFormat() {
   });
 }
 
-program.command("git-commit").description("\u751F\u6210\u7B26\u5408 Angular \u89C4\u8303\u7684 git commit").action(() => {
-  gitCommit();
-});
-program.command("git-commit-verify").description("\u6821\u9A8Cgit\u7684commit\u662F\u5426\u7B26\u5408 Angular \u89C4\u8303").action(() => {
-  gitCommitVerify();
-});
-program.command("cleanup").description("\u6E05\u7A7A\u4F9D\u8D56\u548C\u6784\u5EFA\u4EA7\u7269").action(() => {
-  cleanup();
-});
-program.command("init-git-hooks").description("\u521D\u59CB\u5316simple-git-hooks\u94A9\u5B50").action(() => {
-  initSimpleGitHooks();
-});
-program.command("update-pkg").description("\u5347\u7EA7\u4F9D\u8D56").action(() => {
-  updatePkg();
-});
-program.command("prettier-format").description("prettier\u683C\u5F0F\u5316").action(() => {
-  prettierFormat();
+async function eslintPretter() {
+  await execa("npx", ["eslint", ".", "--fix"], {
+    stdio: "inherit"
+  });
+  await execa("npx", ["soy", "prettier-format"], {
+    stdio: "inherit"
+  });
+}
+
+function lintStaged() {
+  execa("npx", ["lint-staged", "--config", "@soybeanjs/cli/lint-staged"], { stdio: "inherit" });
+}
+
+const cli = cac("soybean");
+cli.version(version).help();
+const commands = {
+  "git-commit": {
+    desc: "\u751F\u6210\u7B26\u5408 Angular \u89C4\u8303\u7684 git commit",
+    action: gitCommit
+  },
+  "git-commit-verify": {
+    desc: "\u6821\u9A8Cgit\u7684commit\u662F\u5426\u7B26\u5408 Angular \u89C4\u8303",
+    action: gitCommitVerify
+  },
+  cleanup: {
+    desc: "\u6E05\u7A7A\u4F9D\u8D56\u548C\u6784\u5EFA\u4EA7\u7269",
+    action: cleanup
+  },
+  "init-git-hooks": {
+    desc: "\u521D\u59CB\u5316simple-git-hooks\u94A9\u5B50",
+    action: initSimpleGitHooks
+  },
+  "update-pkg": {
+    desc: "\u5347\u7EA7\u4F9D\u8D56",
+    action: updatePkg
+  },
+  "prettier-format": {
+    desc: "prettier\u683C\u5F0F\u5316",
+    action: prettierFormat
+  },
+  "eslint-prettier": {
+    desc: "eslint\u548Cprettier\u683C\u5F0F\u5316",
+    action: eslintPretter
+  },
+  "lint-staged": {
+    desc: "\u6267\u884Clint-staged",
+    action: lintStaged
+  }
+};
+Object.entries(commands).forEach(([command, { desc, action }]) => {
+  cli.command(command, desc).action(action);
 });
-program.version(pkg.version).description(blue("soybean alias soy\n\nhttps://github.com/soybeanjs/cli"));
-program.parse(process.argv);
+cli.parse();

package/dist/lint-staged.config.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+const config = {
+  "*": "soy eslint-prettier"
+};
+
+module.exports = config;

package/dist/lint-staged.config.mjs

@@ -0,0 +1,5 @@
+const config = {
+  "*": "soy eslint-prettier"
+};
+
+export { config as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soybeanjs/cli",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "SoybeanJS's command line tools",
   "author": {
     "name": "Soybean",
@@ -8,16 +8,22 @@
     "url": "https://github.com/honghuangdc"
   },
   "license": "MIT",
-  "homepage": "https://github.com/honghuangdc/soybean-cli",
+  "homepage": "https://github.com/soybeanjs/soybean-cli",
   "repository": {
-    "url": "https://github.com/honghuangdc/soybean-cli.git"
+    "url": "https://github.com/soybeanjs/soybean-cli.git"
   },
   "bugs": {
-    "url": "https://github.com/honghuangdc/soybean-cli/issues"
+    "url": "https://github.com/soybeanjs/soybean-cli/issues"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
+  "exports": {
+    "./lint-staged": {
+      "import": "./dist/lint-staged.config.mjs",
+      "require": "./dist/lint-staged.config.cjs"
+    }
+  },
   "bin": {
     "soybean": "dist/index.mjs",
     "soy": "dist/index.mjs"
@@ -26,10 +32,11 @@
     "dist"
   ],
   "dependencies": {
-    "commander": "10.0.1",
+    "cac": "^6.7.14",
     "enquirer": "2.3.6",
     "execa": "7.1.1",
     "kolorist": "1.8.0",
+    "lint-staged": "13.2.2",
     "minimist": "1.2.8",
     "npm-check-updates": "16.10.12",
     "rimraf": "5.0.1"
@@ -40,7 +47,6 @@
     "bumpp": "9.1.0",
     "eslint": "8.41.0",
     "eslint-config-soybeanjs": "0.4.7",
-    "lint-staged": "13.2.2",
     "simple-git-hooks": "2.8.1",
     "tsx": "3.12.7",
     "typescript": "5.0.4",
@@ -48,11 +54,7 @@
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm soy git-commit-verify",
-    "pre-commit": "pnpm typecheck && pnpm lint-staged"
-  },
-  "lint-staged": {
-    "*.{js,mjs,jsx,ts,mts,tsx,json,vue,svelte,astro}": "eslint . --fix",
-    "*.!{js,mjs,jsx,ts,mts,tsx,json,vue,svelte,astro}": "format"
+    "pre-commit": "pnpm typecheck && pnpm soy lint-staged"
   },
   "scripts": {
     "build": "pnpm typecheck && unbuild",