@done-coding/cli-utils 0.3.2 → 0.3.3

package/es/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import P from "chalk";
-import { default as ar } from "chalk";
+import { default as ae } from "chalk";
 import f from "node:path";
 import b, { existsSync as h, mkdirSync as k, writeFileSync as g, readFileSync as m } from "node:fs";
 import l from "crypto";
@@ -10,42 +10,42 @@ import { hideBin as F } from "yargs/helpers";
 import { execSync as y } from "node:child_process";
 import v from "json5";
 export * from "json5";
-import { default as lr } from "json5";
-import { default as dr } from "lodash.get";
-import { default as mr } from "lodash.set";
-import { default as hr } from "lodash.curry";
+import { default as le } from "json5";
+import { default as de } from "lodash.get";
+import { default as me } from "lodash.set";
+import { default as he } from "lodash.curry";
 const c = Object.assign(
-  (r, ...e) => console.log(...e.map((t) => P[r](t))),
+  (e, ...r) => console.log(...r.map((t) => P[e](t))),
   {
     /** 成功 */
-    success: (...r) => c("green", ...r),
+    success: (...e) => c("green", ...e),
     /** /步骤 */
-    stage: (...r) => c("blue", ...r),
+    stage: (...e) => c("blue", ...e),
     /** 提示信息 */
-    info: (...r) => c("cyan", ...r),
+    info: (...e) => c("cyan", ...e),
     /** 警告 */
-    warn: (...r) => c("yellow", ...r),
+    warn: (...e) => c("yellow", ...e),
     /** 错误 */
-    error: (...r) => c("red", ...r),
+    error: (...e) => c("red", ...e),
     /** 跳过 */
-    skip: (...r) => c("gray", ...r)
+    skip: (...e) => c("gray", ...e)
   }
-), Q = (r, {
+), Q = (e, {
   /** 当前目录 */
-  currentDir: e = process.cwd(),
+  currentDir: r = process.cwd(),
   /** 优先找最远的父目录 */
   isFindFarthest: t = !0
 } = {}) => {
-  const o = f.resolve(e).split(f.sep).map((n, i, a) => i ? f.join(a.slice(0, i).join(f.sep), n) : n);
+  const o = f.resolve(r).split(f.sep).map((n, i, a) => i ? f.join(a.slice(0, i).join(f.sep), n) : n);
   for (; o.length; ) {
-    const n = t ? o.shift() : o.pop(), i = f.join(n, r);
+    const n = t ? o.shift() : o.pop(), i = f.join(n, e);
     if (b.existsSync(i))
       return n;
   }
 }, C = "aes-256-cbc", S = 16, p = "hex", d = ":";
-function $(r) {
+function $(e) {
   return l.pbkdf2Sync(
-    r,
+    e,
     "done-coding-cli-salt",
     // 使用固定的盐值
     1e4,
@@ -56,12 +56,12 @@ function $(r) {
   );
 }
 function X({
-  text: r,
-  secretKey: e
+  text: e,
+  secretKey: r
 }) {
   try {
-    const t = $(e), o = l.randomBytes(S), n = l.createCipheriv(C, t, o);
-    let i = n.update(r);
+    const t = $(r), o = l.randomBytes(S), n = l.createCipheriv(C, t, o);
+    let i = n.update(e);
     i = Buffer.concat([i, n.final()]);
     const a = o.toString(p), s = i.toString(p);
     return `${a}${d}${s}`;
@@ -72,13 +72,13 @@ function X({
   }
 }
 function Z({
-  encryptedText: r,
-  secretKey: e
+  encryptedText: e,
+  secretKey: r
 }) {
   try {
-    if (!r.includes(d))
+    if (!e.includes(d))
       return "";
-    const t = $(e), [o, n] = r.split(d);
+    const t = $(r), [o, n] = e.split(d);
     if (o.length !== S * 2)
       return "";
     const i = Buffer.from(o, p), a = Buffer.from(n, p), s = l.createDecipheriv(C, t, i);
@@ -90,39 +90,39 @@ function Z({
     ), "";
   }
 }
-const x = (...r) => {
-  const [e, t = {}] = r;
-  return H(e, {
+const x = (...e) => {
+  const [r, t = {}] = e;
+  return H(r, {
     onCancel(o) {
       return c.error(`退出${o == null ? void 0 : o.name}输入`), process.exit(1);
     },
     ...t
   });
-}, R = (r, e) => {
-  r ? c.error(r) : c.error(e.message), e != null && e.stack && c.error(e.stack), process.exit(1);
+}, R = (e, r) => {
+  e ? c.error(e) : c.error(r.message), r != null && r.stack && c.error(r.stack), process.exit(1);
 }, T = () => {
-  const r = F(process.argv);
-  return E(r);
-}, j = (r, {
-  usage: e,
+  const e = F(process.argv);
+  return E(e);
+}, j = (e, {
+  usage: r,
   version: t,
   demandCommandCount: o,
   options: n,
   positionals: i,
   subcommands: a
 }) => {
-  let s = r.strict();
-  e && (s = s.usage(`Usage: ${e}`)), o && (s = s.demandCommand(o));
+  let s = e.strict();
+  r && (s = s.usage(`Usage: ${r}`)), o && (s = s.demandCommand(o));
   const u = "help";
   return s = s.help(u), t ? s = s.version(t).alias("h", u).alias("v", "version") : s = s.alias("h", u), n && (s = s.options(n)), i && (s = Object.entries(i).reduce((w, [D, O]) => w.positional(D, O), s)), a && (s = s.command(a)), s;
-}, rr = async ({ handler: r, ...e }) => {
-  const t = await j(T(), e).fail(R).argv;
-  return r ? r(t) : t;
-}, er = (r) => {
-  const { command: e, describe: t, handler: o = () => {
-  }, ...n } = r;
+}, ee = async ({ handler: e, ...r }) => {
+  const t = await j(T(), r).fail(R).argv;
+  return e ? e(t) : t;
+}, re = (e) => {
+  const { command: r, describe: t, handler: o = () => {
+  }, ...n } = e;
   return {
-    command: e,
+    command: r,
     describe: t,
     builder(i) {
       return j(i, n);
@@ -130,9 +130,9 @@ const x = (...r) => {
     handler: o
   };
 };
-var _ = /* @__PURE__ */ ((r) => (r.VSCODE = "VsCode", r.CURSOR = "Cursor", r.OTHER = "其他", r))(_ || {});
+var _ = /* @__PURE__ */ ((e) => (e.VSCODE = "VsCode", e.CURSOR = "Cursor", e.OTHER = "其他", e))(_ || {});
 const A = async () => {
-  const { editorType: r } = await x([
+  const { editorType: e } = await x([
     {
       name: "editorType",
       type: "select",
@@ -142,31 +142,31 @@ const A = async () => {
         "VsCode",
         "其他"
         /* OTHER */
-      ].map((e) => ({
-        title: e,
-        value: e
+      ].map((r) => ({
+        title: r,
+        value: r
       }))
     }
   ]);
-  return r;
+  return e;
 }, B = {
   Cursor: "cursor",
   VsCode: "code"
-}, N = (r, e, t) => {
+}, N = (e, r, t) => {
   try {
-    y(`${r} -v`, { stdio: "ignore" }), y(`${r} ${e}`);
+    y(`${e} -v`, { stdio: "ignore" }), y(`${e} ${r}`);
   } catch {
     t();
   }
-}, V = (r, e) => {
+}, V = (e, r) => {
   const t = (o) => c.info(`
-      ${o}, 请用编辑器打开 ${r} 进行编辑
+      ${o}, 请用编辑器打开 ${e} 进行编辑
 `);
-  switch (e) {
+  switch (r) {
     case "Cursor":
     case "VsCode": {
-      const o = B[e];
-      N(o, r, () => {
+      const o = B[r];
+      N(o, e, () => {
         t(`${o}命令未安装`);
       });
       break;
@@ -174,77 +174,79 @@ const A = async () => {
     default:
       t("其他编辑器");
   }
-}, L = (r = process.cwd()) => ({
+}, L = (e = process.cwd()) => ({
   /** 必须保留 */
   rootDir: {
     type: "string",
     alias: "r",
     describe: "运行目录",
     /** 必须设置默认值 */
-    default: r
+    default: e
   }
-}), tr = ({
-  configPathDefault: r,
-  rootDirDefault: e
+}), te = ({
+  configPathDefault: e,
+  rootDirDefault: r
 }) => ({
   /** 必须保留 */
-  ...L(e),
+  ...L(r),
   /** 必须保留 */
   configPath: {
     type: "string",
     alias: "c",
     describe: "配置文件相对路径",
     /** 必须设置默认值 */
-    default: r
+    default: e
   }
-}), I = async (r, e) => {
-  const { configPath: t, rootDir: o } = e, n = f.resolve(o, t), i = f.dirname(n);
+}), I = async (e, r) => {
+  const { configPath: t, rootDir: o } = r, n = f.resolve(o, t), i = f.dirname(n);
   return h(i) || k(i, {
     recursive: !0
-  }), n.endsWith(".json5") ? (c.info(`json5模式写入 ${n}`), g(n, v.stringify(r, null, 2)), n) : (c.info(`json模式写入 ${n}`), g(n, JSON.stringify(r, null, 2)), n);
-}, or = async (r, e, {
-  onFileGenerated: t
+  }), n.endsWith(".json5") ? (c.info(`json5模式写入 ${n}`), g(n, v.stringify(e, null, 2)), n) : (c.info(`json模式写入 ${n}`), g(n, JSON.stringify(e, null, 2)), n);
+}, oe = async (e, r, {
+  onFileGenerated: t,
+  edit: o = !1
 } = {}) => {
-  const o = await I(r, e);
-  t == null || t(o);
-  const n = await A();
-  V(e.configPath, n);
-}, nr = async (r) => {
-  const { configPath: e, rootDir: t } = r, o = f.resolve(t, e);
+  const n = await I(e, r);
+  if (t == null || t(n), o) {
+    const i = await A();
+    V(r.configPath, i);
+  }
+}, ne = async (e) => {
+  const { configPath: r, rootDir: t } = e, o = f.resolve(t, r);
   if (!h(o)) {
     c.warn(`配置文件不存在 ${o}`);
     return;
   }
   return o.endsWith(".json5") ? (c.info(`json5模式解析 ${o}`), v.parse(m(o, "utf8"))) : (c.info(`json模式解析 ${o}`), JSON.parse(m(o, "utf8")));
-}, sr = async () => {
-  const { useDefaultConfig: r } = await x({
+}, se = async () => {
+  const { useDefaultConfig: e } = await x({
     name: "useDefaultConfig",
     type: "confirm",
     message: "使用默认模板配置",
     initial: !0
   });
-  return r;
+  return e;
 };
 export {
   _ as EditorTypeEnum,
-  hr as _curry,
-  dr as _get,
-  mr as _set,
-  ar as chalk,
-  rr as createMainCommand,
-  er as createSubcommand,
+  he as _curry,
+  de as _get,
+  me as _set,
+  ae as chalk,
+  ee as createMainCommand,
+  re as createSubcommand,
   Z as decryptAES,
   X as encryptAES,
-  tr as getConfigFileCommonOptions,
+  te as getConfigFileCommonOptions,
   A as getEditorType,
   L as getRootDirOptions,
-  sr as getUseDefaultConfig,
+  se as getUseDefaultConfig,
   I as initConfigFile,
-  or as initHandlerCommon,
-  lr as json5,
+  oe as initHandlerCommon,
+  le as json5,
   c as log,
   Q as lookForParentTarget,
   V as openFileInEditor,
-  nr as readConfigFile,
+  ne as readConfigFile,
   x as xPrompts
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-utils",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "cli utils",
   "private": false,
   "module": "es/index.mjs",
@@ -61,5 +61,5 @@
     "prompts": "^2.4.2",
     "yargs": "^17.7.2"
   },
-  "gitHead": "7a8d554748b844c8b7694c587983b21af902d5d1"
+  "gitHead": "3caf888c1978970b95d95219ac63d0a3ed2b2912"
 }

package/types/config-file.d.ts

@@ -26,9 +26,10 @@ export declare const getConfigFileCommonOptions: ({ configPathDefault, rootDirDe
 /** 初始化配置文件 */
 export declare const initConfigFile: <T>(content: T, argv: CliHandlerArgv<InitConfigFileOptions>) => Promise<string>;
 /** 初始化配置文件通用处理器 */
-export declare const initHandlerCommon: <T>(content: T, argv: CliHandlerArgv<InitConfigFileOptions>, { onFileGenerated, }?: {
+export declare const initHandlerCommon: <T>(content: T, argv: CliHandlerArgv<InitConfigFileOptions>, { onFileGenerated, edit, }?: {
     /** 文件已生成 */
     onFileGenerated?: ((path: string) => void) | undefined;
+    edit?: boolean | undefined;
 }) => Promise<void>;
 /** 读取配置文件 */
 export declare const readConfigFile: <T>(argv: CliHandlerArgv<ReadConfigFileOptions>) => Promise<T | undefined>;