@soybeanjs/cli 0.6.1 → 0.6.3

package/dist/index.cjs

@@ -10,6 +10,7 @@ const rimraf = require('rimraf');
 const changelog = require('@soybeanjs/changelog');
 const versionBump = require('bumpp');
 const c12 = require('c12');
+const promises = require('fs/promises');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -18,7 +19,7 @@ const enquirer__default = /*#__PURE__*/_interopDefaultCompat(enquirer);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const versionBump__default = /*#__PURE__*/_interopDefaultCompat(versionBump);
 
-const version = "0.6.1";
+const version = "0.6.3";
 
 async function execCommand(cmd, args, options) {
   const { execa } = await import('execa');
@@ -102,7 +103,7 @@ async function prettierWrite(writeGlob) {
   });
 }
 
-async function eslintPretter() {
+async function eslintPrettier() {
   await execCommand("npx", ["eslint", ".", "--fix"], {
     stdio: "inherit"
   });
@@ -194,10 +195,9 @@ const defaultOptions = {
   lintStagedConfig: {
     [eslintExt]: "eslint --fix",
     "*": "soy prettier-write"
-  },
-  useSoybeanToken: false
+  }
 };
-const SOYBEAN_GITHUB_TOKEN = "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";
+const SOYBEAN_GITHUB_TOKEN = "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";
 async function loadCliOptions(overrides, cwd = process.cwd()) {
   const { config } = await c12.loadConfig({
     name: "soybean",
@@ -206,11 +206,23 @@ async function loadCliOptions(overrides, cwd = process.cwd()) {
     cwd,
     packageJson: true
   });
-  if (config?.useSoybeanToken) {
+  const has = await hasSoybeanInfoFromPkgJson(cwd);
+  if (config && has) {
     config.changelogOptions = { ...config.changelogOptions, github: { repo: "", token: SOYBEAN_GITHUB_TOKEN } };
   }
   return config;
 }
+async function hasSoybeanInfoFromPkgJson(cwd) {
+  let hasSoybeanInfo = false;
+  const REG = "soybean";
+  try {
+    const pkgJson = await promises.readFile(`${cwd}/package.json`, "utf-8");
+    const pkg = JSON.parse(pkgJson);
+    hasSoybeanInfo = pkg.name?.includes(REG) || pkg.repository?.url?.includes(REG) || pkg.author?.includes(REG) || pkg.author?.name?.includes(REG) || pkg.author?.url?.includes(REG);
+  } catch {
+  }
+  return hasSoybeanInfo;
+}
 
 async function setupCli() {
   const cliOptions = await loadCliOptions();
@@ -218,13 +230,13 @@ async function setupCli() {
   cli.version(version).option("--total", "Generate changelog by total tags").help();
   const commands = {
     "git-commit": {
-      desc: "\u751F\u6210\u7B26\u5408 Angular \u89C4\u8303\u7684 git commit",
+      desc: "\u751F\u6210\u7B26\u5408 Conventional Commits \u89C4\u8303\u7684\u63D0\u4EA4\u4FE1\u606F",
       action: () => {
         gitCommit(cliOptions.gitCommitTypes, cliOptions.gitCommitScopes);
       }
     },
     "git-commit-verify": {
-      desc: "\u6821\u9A8C git \u7684 commit \u662F\u5426\u7B26\u5408 Angular \u89C4\u8303",
+      desc: "\u6821\u9A8C git \u63D0\u4EA4\u4FE1\u606F\u662F\u5426\u7B26\u5408 Conventional Commits \u89C4\u8303",
       action: () => {
         gitCommitVerify();
       }
@@ -304,7 +316,7 @@ async function setupCli() {
      */
     "eslint-prettier": {
       desc: "\u8BE5\u547D\u4EE4\u5DF2\u5E9F\u5F03",
-      action: eslintPretter
+      action: eslintPrettier
     }
   };
   for await (const [command, { desc, action }] of Object.entries(commands)) {

package/dist/index.d.ts

@@ -41,10 +41,6 @@ interface CliOption {
      * lint-staged config
      */
     lintStagedConfig: Record<string, string | string[]>;
-    /**
-     * use soybean token
-     */
-    useSoybeanToken: boolean;
 }
 
 declare function defineConfig(config?: Partial<CliOption>): Partial<CliOption> | undefined;

package/dist/index.mjs

@@ -8,8 +8,9 @@ import { rimraf } from 'rimraf';
 import { generateTotalChangelog, generateChangelog } from '@soybeanjs/changelog';
 import versionBump from 'bumpp';
 import { loadConfig } from 'c12';
+import { readFile } from 'fs/promises';
 
-const version = "0.6.1";
+const version = "0.6.3";
 
 async function execCommand(cmd, args, options) {
   const { execa } = await import('execa');
@@ -93,7 +94,7 @@ async function prettierWrite(writeGlob) {
   });
 }
 
-async function eslintPretter() {
+async function eslintPrettier() {
   await execCommand("npx", ["eslint", ".", "--fix"], {
     stdio: "inherit"
   });
@@ -185,10 +186,9 @@ const defaultOptions = {
   lintStagedConfig: {
     [eslintExt]: "eslint --fix",
     "*": "soy prettier-write"
-  },
-  useSoybeanToken: false
+  }
 };
-const SOYBEAN_GITHUB_TOKEN = "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";
+const SOYBEAN_GITHUB_TOKEN = "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";
 async function loadCliOptions(overrides, cwd = process.cwd()) {
   const { config } = await loadConfig({
     name: "soybean",
@@ -197,11 +197,23 @@ async function loadCliOptions(overrides, cwd = process.cwd()) {
     cwd,
     packageJson: true
   });
-  if (config?.useSoybeanToken) {
+  const has = await hasSoybeanInfoFromPkgJson(cwd);
+  if (config && has) {
     config.changelogOptions = { ...config.changelogOptions, github: { repo: "", token: SOYBEAN_GITHUB_TOKEN } };
   }
   return config;
 }
+async function hasSoybeanInfoFromPkgJson(cwd) {
+  let hasSoybeanInfo = false;
+  const REG = "soybean";
+  try {
+    const pkgJson = await readFile(`${cwd}/package.json`, "utf-8");
+    const pkg = JSON.parse(pkgJson);
+    hasSoybeanInfo = pkg.name?.includes(REG) || pkg.repository?.url?.includes(REG) || pkg.author?.includes(REG) || pkg.author?.name?.includes(REG) || pkg.author?.url?.includes(REG);
+  } catch {
+  }
+  return hasSoybeanInfo;
+}
 
 async function setupCli() {
   const cliOptions = await loadCliOptions();
@@ -209,13 +221,13 @@ async function setupCli() {
   cli.version(version).option("--total", "Generate changelog by total tags").help();
   const commands = {
     "git-commit": {
-      desc: "\u751F\u6210\u7B26\u5408 Angular \u89C4\u8303\u7684 git commit",
+      desc: "\u751F\u6210\u7B26\u5408 Conventional Commits \u89C4\u8303\u7684\u63D0\u4EA4\u4FE1\u606F",
       action: () => {
         gitCommit(cliOptions.gitCommitTypes, cliOptions.gitCommitScopes);
       }
     },
     "git-commit-verify": {
-      desc: "\u6821\u9A8C git \u7684 commit \u662F\u5426\u7B26\u5408 Angular \u89C4\u8303",
+      desc: "\u6821\u9A8C git \u63D0\u4EA4\u4FE1\u606F\u662F\u5426\u7B26\u5408 Conventional Commits \u89C4\u8303",
       action: () => {
         gitCommitVerify();
       }
@@ -295,7 +307,7 @@ async function setupCli() {
      */
     "eslint-prettier": {
       desc: "\u8BE5\u547D\u4EE4\u5DF2\u5E9F\u5F03",
-      action: eslintPretter
+      action: eslintPrettier
     }
   };
   for await (const [command, { desc, action }] of Object.entries(commands)) {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@soybeanjs/cli",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "SoybeanJS's command line tools",
   "author": {
     "name": "Soybean",
-    "email": "honghuangdc@gmail.com",
-    "url": "https://github.com/honghuangdc"
+    "email": "soybeanjs@outlook.com",
+    "url": "https://github.com/soybeanjs"
   },
   "license": "MIT",
   "homepage": "https://github.com/soybeanjs/cli",
@@ -36,35 +36,28 @@
     "dist"
   ],
   "dependencies": {
-    "@soybeanjs/changelog": "0.0.3",
+    "@soybeanjs/changelog": "0.0.7",
     "bumpp": "9.1.1",
-    "c12": "1.4.1",
+    "c12": "1.4.2",
     "cac": "6.7.14",
-    "enquirer": "2.3.6",
-    "execa": "7.1.1",
+    "enquirer": "2.4.0",
+    "execa": "7.2.0",
     "kolorist": "1.8.0",
-    "lint-staged": "13.2.2",
+    "lint-staged": "13.2.3",
     "minimist": "1.2.8",
-    "npm-check-updates": "16.10.12",
+    "npm-check-updates": "16.10.17",
     "rimraf": "5.0.1"
   },
   "devDependencies": {
     "@soybeanjs/cli": "link:",
-    "@types/node": "20.3.0",
-    "eslint": "8.42.0",
-    "eslint-config-soybeanjs": "0.4.9",
-    "simple-git-hooks": "2.8.1",
+    "@types/node": "20.4.5",
+    "eslint": "8.45.0",
+    "eslint-config-soybeanjs": "0.5.3",
+    "simple-git-hooks": "2.9.0",
     "tsx": "3.12.7",
-    "typescript": "5.1.3",
+    "typescript": "5.1.6",
     "unbuild": "1.2.1"
   },
-  "simple-git-hooks": {
-    "commit-msg": "pnpm soy git-commit-verify",
-    "pre-commit": "pnpm typecheck && pnpm soy lint-staged"
-  },
-  "soybean": {
-    "useSoybeanToken": true
-  },
   "scripts": {
     "build": "pnpm typecheck && unbuild",
     "lint": "eslint . --fix",