@done-coding/cli-template 0.5.1 → 0.6.0

package/es/cli.mjs

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-import { c as r } from "./index-dde3ea37.js";
+import { c as r } from "./index-07bb6534.js";
 import "node:path";
 import "node:fs";
 import "chalk";
 import "lodash.template";
 import "lodash.assign";
 import "prompts";
+import "@done-coding/node-tools";
 import "yargs";
 import "yargs/helpers";
 r();

package/es/{index-dde3ea37.js → index-07bb6534.js}

@@ -1,57 +1,58 @@
 #!/usr/bin/env node
 import v from "node:path";
-import i from "node:fs";
+import c from "node:fs";
 import o from "chalk";
-import D from "lodash.template";
-import T from "lodash.assign";
+import E from "lodash.template";
+import A from "lodash.assign";
 import N from "prompts";
-import A from "yargs";
-import { hideBin as U } from "yargs/helpers";
+import { onPromptFormStateForSigint as P } from "@done-coding/node-tools";
+import U from "yargs";
+import { hideBin as W } from "yargs/helpers";
 var g = /* @__PURE__ */ ((e) => (e.OVERWRITE = "overwrite", e.APPEND = "append", e.REPLACE = "replace", e.RETURN = "return", e))(g || {});
 const $ = {
   rollback: !1,
   dealMarkdown: !1,
   mode: g.OVERWRITE,
   batch: !1
-}, P = (e) => {
-  const { rollback: n, dealMarkdown: a, mode: s, batch: u, ...c } = e;
+}, C = (e) => {
+  const { rollback: n, dealMarkdown: a, mode: s, batch: u, ...i } = e;
   return {
     rollback: n ?? $.rollback,
     dealMarkdown: a ?? $.dealMarkdown,
     mode: s ?? $.mode,
     batch: u ?? $.batch,
-    ...c
+    ...i
   };
-}, E = {
-  version: "0.5.1",
+}, S = {
+  version: "0.6.0",
   name: "@done-coding/cli-template",
   description: "预编译命令行工具",
   cliConfig: {
     namespaceDir: ".done-coding",
     moduleName: "template"
   }
-}, W = (e) => {
-  const { namespaceDir: n, moduleName: a } = E.cliConfig, s = [n, `${a}.json`];
+}, J = (e) => {
+  const { namespaceDir: n, moduleName: a } = S.cliConfig, s = [n, `${a}.json`];
   e && s.unshift(e);
   const u = v.resolve(...s);
-  if (i.existsSync(u))
+  if (c.existsSync(u))
     return u;
-}, C = ({
+}, I = ({
   filePath: e,
   dataInit: n,
   limitJson: a,
   filePathKey: s,
   dataInitKey: u,
-  dealMarkdown: c = !1
+  dealMarkdown: i = !1
 }) => {
   if (e) {
     if (a && !e.endsWith(".json"))
       return console.log(
         o.red(`${s}必须是json文件，请检查文件后缀名`)
       ), process.exit(1);
-    const r = i.readFileSync(v.resolve(e), "utf-8");
+    const r = c.readFileSync(v.resolve(e), "utf-8");
     let p = r;
-    return c && e.endsWith(".md") && (p = r.replace(
+    return i && e.endsWith(".md") && (p = r.replace(
       /^\s*```[a-zA-Z0-9]+\s*[\r\n]+([\s\S]+?)```\s*$/,
       "$1"
     )), a ? JSON.parse(p) : p;
@@ -59,23 +60,23 @@ const $ = {
     return n ? (console.log(
       o.green(`${s} 为空，将使用${u}作为数据`)
     ), a ? JSON.parse(n) : n) : (console.log(o.red(`${s}与${u}不能同时为空`)), process.exit(1));
-}, R = (e, n) => {
+}, D = (e, n) => {
   if (!n)
     return console.log(o.red(`${e}模式下output不能为空`)), process.exit(1);
-}, S = (e, n) => {
+}, R = (e, n) => {
   if (n && e === n)
     return console.log(o.red("output与input不能相同")), process.exit(1);
-}, J = (e, n) => {
+}, M = (e, n) => {
   if (!n)
     return console.log(o.red(`${e}模式下input不能为空`)), process.exit(1);
-}, I = async (e, {
+}, x = async (e, {
   rollbackDelFileAgree: n = !1
 } = {}) => {
   const {
     env: a,
     input: s,
     inputData: u,
-    output: c,
+    output: i,
     mode: r,
     rollback: p,
     dealMarkdown: y,
@@ -95,26 +96,27 @@ mode: ${r}
 rollback: ${p}
 `)
   );
-  const k = C({
+  const k = I({
     filePath: s,
     dataInit: u,
     limitJson: !1,
     filePathKey: "input",
     dataInitKey: "inputData",
     dealMarkdown: y
-  }), l = D(k), f = typeof h == "function" ? h() : h, m = l(f);
+  }), l = E(k), m = typeof h == "function" ? h() : h, f = l(m);
   switch (r) {
     case g.OVERWRITE: {
-      R(r, c), S(c, s);
-      const t = v.resolve(c);
-      if (i.mkdirSync(v.dirname(t), { recursive: !0 }), i.existsSync(t)) {
+      D(r, i), R(i, s);
+      const t = v.resolve(i);
+      if (c.mkdirSync(v.dirname(t), { recursive: !0 }), c.existsSync(t)) {
         if (p)
           if (n || (await N({
             type: "confirm",
             name: "remove",
-            message: `${r}模式下回滚将删除${t}，是否继续？`
+            message: `${r}模式下回滚将删除${t}，是否继续？`,
+            onState: P
           })).remove) {
-            i.rmSync(t, { force: !0 }), console.log(o.green(`${r}模式下${t}已删除`));
+            c.rmSync(t, { force: !0 }), console.log(o.green(`${r}模式下${t}已删除`));
             return;
           } else {
             console.log(o.yellow(`${r}模式下${t}回滚取消`));
@@ -130,24 +132,24 @@ rollback: ${p}
         }
         console.log(o.blue(`output:${t} 不存在，将创建`));
       }
-      i.writeFileSync(t, m, "utf-8"), console.log(o.green(`模板处理完成，输出到 ${t}`));
+      c.writeFileSync(t, f, "utf-8"), console.log(o.green(`模板处理完成，输出到 ${t}`));
       break;
     }
     case g.APPEND: {
-      R(r, c), S(c, s);
-      const t = v.resolve(c);
-      if (i.mkdirSync(v.dirname(t), { recursive: !0 }), i.existsSync(t)) {
-        const d = i.readFileSync(t, "utf-8");
+      D(r, i), R(i, s);
+      const t = v.resolve(i);
+      if (c.mkdirSync(v.dirname(t), { recursive: !0 }), c.existsSync(t)) {
+        const d = c.readFileSync(t, "utf-8");
         if (p) {
-          i.writeFileSync(
+          c.writeFileSync(
             t,
-            d.replace(m, ""),
+            d.replace(f, ""),
             "utf-8"
           ), console.log(o.green(`${r}模式下${t}回滚完成`));
           return;
         }
-        const b = d + m;
-        i.writeFileSync(t, b, "utf-8"), console.log(o.green(`模板处理完成，追加到 ${t}`));
+        const b = d + f;
+        c.writeFileSync(t, b, "utf-8"), console.log(o.green(`模板处理完成，追加到 ${t}`));
       } else {
         if (p) {
           console.log(
@@ -155,31 +157,31 @@ rollback: ${p}
           );
           return;
         }
-        console.log(o.blue(`output:${t} 不存在，将创建`)), i.writeFileSync(t, m, "utf-8"), console.log(o.green(`模板处理完成，输出到 ${t}`));
+        console.log(o.blue(`output:${t} 不存在，将创建`)), c.writeFileSync(t, f, "utf-8"), console.log(o.green(`模板处理完成，输出到 ${t}`));
       }
       break;
     }
     case g.REPLACE: {
-      if (c && console.log(o.yellow(`output ${c} 将被忽略`)), J(r, s), a && a === s)
+      if (i && console.log(o.yellow(`output ${i} 将被忽略`)), M(r, s), a && a === s)
         return console.log(o.red("env 与 input 不能相同")), process.exit(1);
       const t = v.resolve(s);
       let d = t;
-      const b = s.replace(`${process.cwd()}/`, ""), w = D(b)(f);
+      const b = s.replace(`${process.cwd()}/`, ""), w = E(b)(m);
       w !== b && (console.log(
         o.green(`检测输入文件名也需要替换
             ./${b} => ./${w} `)
-      ), i.rmSync(t), d = v.resolve(`./${w}`)), i.mkdirSync(v.dirname(d), { recursive: !0 }), i.writeFileSync(d, m, "utf-8"), console.log(o.green(`模板处理完成，输出到 ${d}`));
+      ), c.rmSync(t), d = v.resolve(`./${w}`)), c.mkdirSync(v.dirname(d), { recursive: !0 }), c.writeFileSync(d, f, "utf-8"), console.log(o.green(`模板处理完成，输出到 ${d}`));
       break;
     }
     case g.RETURN:
       return console.log(
         o.green("模板处理完成，返回结果(函数调用才会拿到返回值)")
-      ), m;
+      ), f;
     default:
       return console.log(o.red(`mode ${r} 不支持`)), process.exit(1);
   }
-  return m;
-}, M = async ({
+  return f;
+}, j = async ({
   rootDir: e = process.cwd(),
   itemDefaultRollback: n = !1,
   extraEnvData: a = {}
@@ -188,77 +190,78 @@ rollback: ${p}
   if (s)
     u = s;
   else {
-    const l = W(e);
+    const l = J(e);
     if (!l)
       return console.log(o.red(`配置文件${l}不存在`)), process.exit(1);
-    const f = i.readFileSync(l, "utf-8");
-    u = JSON.parse(f);
+    const m = c.readFileSync(l, "utf-8");
+    u = JSON.parse(m);
   }
   const {
-    list: c,
+    list: i,
     globalEnvData: r = {},
     collectEnvDataForm: p = []
   } = u, y = {};
   for (const l of p) {
-    let f, m, t;
-    typeof l == "string" ? (f = l, m = l, t = void 0) : (f = l.key, m = l.label, t = l.initial), y[f] = (await N({
+    let m, f, t;
+    typeof l == "string" ? (m = l, f = l, t = void 0) : (m = l.key, f = l.label, t = l.initial), y[m] = (await N({
       type: "text",
-      name: f,
-      message: `请输入${m}`,
+      name: m,
+      message: `请输入${f}`,
       initial: t,
-      format: (d) => (d || "").trim(),
-      validate: (d) => d ? !0 : `${m}不能为空`
-    }))[f];
+      format: (d) => d.trim(),
+      validate: (d) => d.length > 0 || `${f}不能为空`,
+      onState: P
+    }))[m];
   }
-  const h = c.map((l) => {
-    const { rollback: f = n } = l, {
-      envData: m,
+  const h = i.map((l) => {
+    const { rollback: m = n } = l, {
+      envData: f,
       env: t,
       input: d,
       output: b,
       ...w
-    } = P(l);
+    } = C(l);
     return t && console.log(o.yellow(`批量处理中 env:${t} 将被忽略，只读envData`)), {
       ...w,
       env: t,
       input: e && d ? v.resolve(e, d) : d,
       output: e && b ? v.resolve(e, b) : b,
-      envData: T(
+      envData: A(
         {},
         a,
         r,
         y,
-        m
+        f
       ),
-      rollback: f
+      rollback: m
     };
   }), k = [];
   for (const l of h) {
-    const f = await I(l, {
+    const m = await x(l, {
       rollbackDelFileAgree: !0
     });
-    k.push(f);
+    k.push(m);
   }
   return k;
-}, x = async (e) => {
+}, F = async (e) => {
   const {
     envData: n,
     env: a,
     input: s,
     inputData: u,
-    output: c,
+    output: i,
     mode: r,
     rollback: p,
     dealMarkdown: y,
     batch: h
-  } = P(e);
+  } = C(e);
   if (h)
-    return console.log(o.blue("开始批量处理")), M({
+    return console.log(o.blue("开始批量处理")), j({
       // 回滚默认值 基于全局
       itemDefaultRollback: p
     });
   console.log(o.blue("开始单个处理"));
-  const k = C({
+  const k = I({
     filePath: a,
     dataInit: n,
     limitJson: !0,
@@ -266,16 +269,16 @@ rollback: ${p}
     dataInitKey: "envData",
     dealMarkdown: y
   });
-  return I({
+  return x({
     input: s,
     inputData: u,
-    output: c,
+    output: i,
     mode: r,
     rollback: p,
     dealMarkdown: y,
     envData: k
   });
-}, j = () => ({
+}, L = () => ({
   env: {
     alias: "e",
     describe: "环境数据文件JSON文件相对路径(优先级高于envData)",
@@ -331,25 +334,25 @@ rollback: ${p}
     type: "boolean",
     default: $.batch
   }
-}), F = E.cliConfig.moduleName, L = (e, n) => {
+}), O = S.cliConfig.moduleName, V = (e, n) => {
   console.log(e ? o.red(e) : o.red(n.message)), process.exit(1);
-}, V = E.description, H = `Usage: $0 ${F} [options]`, _ = "Usage: $0 [options]", O = (e, n) => {
-  const a = j();
-  return e.strict().usage(n).help("help").version(E.version).alias("v", "version").alias("h", "help").options(a).fail(L).argv;
-}, q = (e) => O(e, H), ee = {
-  command: F,
-  describe: V,
-  builder: q,
-  handler: x
-}, te = async () => {
-  const e = A(U(process.argv)), n = await O(e, _);
-  return x(n);
+}, H = S.description, _ = `Usage: $0 ${O} [options]`, q = "Usage: $0 [options]", T = (e, n) => {
+  const a = L();
+  return e.strict().usage(n).help("help").version(S.version).alias("v", "version").alias("h", "help").options(a).fail(V).argv;
+}, z = (e) => T(e, _), oe = {
+  command: O,
+  describe: H,
+  builder: z,
+  handler: F
+}, ne = async () => {
+  const e = U(W(process.argv)), n = await T(e, q);
+  return F(n);
 };
 export {
   g as O,
-  ee as a,
-  M as b,
-  te as c,
-  W as g,
-  x as h
+  oe as a,
+  j as b,
+  ne as c,
+  J as g,
+  F as h
 };

package/es/index.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-import { O as d, b as h, a as u, g as b, h as g } from "./index-dde3ea37.js";
+import { O as d, b as h, a as u, g as b, h as f } from "./index-07bb6534.js";
+export * from "@done-coding/node-tools";
 import "node:path";
 import "node:fs";
 import "chalk";
@@ -13,5 +14,5 @@ export {
   h as batchHandler,
   u as command,
   b as getConfigPath,
-  g as handler
+  f as handler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-template",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "预编译命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -58,6 +58,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
+    "@done-coding/node-tools": "^0.2.0",
     "chalk": "^5.3.0",
     "lodash.assign": "^4.2.0",
     "lodash.get": "^4.4.2",
@@ -66,5 +67,5 @@
     "prompts": "^2.4.2",
     "yargs": "^17.7.2"
   },
-  "gitHead": "465ac238437ab8bd3803c5e6fe8ac5a30bc445f3"
+  "gitHead": "0dde53af70143475f5149714152d714802f846f8"
 }

package/types/index.d.ts

@@ -2,3 +2,4 @@ export { handler, batchHandler } from "./handler";
 export { command } from "./main";
 export * from './utils/types';
 export * from './utils/config';
+export * from "@done-coding/node-tools";

package/types/injectInfo.json.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-  "version": "0.5.1",
+  "version": "0.6.0",
   "name": "@done-coding/cli-template",
   "description": "预编译命令行工具",
   "cliConfig": {