@done-coding/cli-template 0.6.2-alpha.0 → 0.7.0-alpha.0

package/es/cli.mjs

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
-import { c as r } from "./index-694fa5e1.js";
+import { c as m } from "./index-6bc0fa40.js";
 import "node:path";
 import "node:fs";
 import "lodash.template";
 import "lodash.assign";
 import "@done-coding/cli-utils";
-import "yargs";
-import "yargs/helpers";
-r();
+m();

package/es/{index-694fa5e1.js → index-6bc0fa40.js}

@@ -1,28 +1,26 @@
 #!/usr/bin/env node
 import $ from "node:path";
 import l from "node:fs";
-import D from "lodash.template";
-import T from "lodash.assign";
-import { log as n, xPrompts as N } from "@done-coding/cli-utils";
-import A from "yargs";
-import { hideBin as U } from "yargs/helpers";
+import E from "lodash.template";
+import A from "lodash.assign";
+import { log as n, xPrompts as N, createMainCommand as T, createSubcommand as M } from "@done-coding/cli-utils";
 var v = /* @__PURE__ */ ((e) => (e.OVERWRITE = "overwrite", e.APPEND = "append", e.REPLACE = "replace", e.RETURN = "return", e))(v || {});
-const g = {
+const y = {
   rollback: !1,
   dealMarkdown: !1,
   mode: v.OVERWRITE,
   batch: !1
 }, P = (e) => {
-  const { rollback: r, dealMarkdown: i, mode: s, batch: u, ...c } = e;
+  const { rollback: r, dealMarkdown: i, mode: a, batch: u, ...c } = e;
   return {
-    rollback: r ?? g.rollback,
-    dealMarkdown: i ?? g.dealMarkdown,
-    mode: s ?? g.mode,
-    batch: u ?? g.batch,
+    rollback: r ?? y.rollback,
+    dealMarkdown: i ?? y.dealMarkdown,
+    mode: a ?? y.mode,
+    batch: u ?? y.batch,
     ...c
   };
-}, E = {
-  version: "0.6.2-alpha.0",
+}, C = {
+  version: "0.7.0-alpha.0",
   name: "@done-coding/cli-template",
   description: "预编译命令行工具",
   cliConfig: {
@@ -30,31 +28,31 @@ const g = {
     moduleName: "template"
   }
 }, W = (e) => {
-  const { namespaceDir: r, moduleName: i } = E.cliConfig, s = [r, `${i}.json`];
-  e && s.unshift(e);
-  const u = $.resolve(...s);
+  const { namespaceDir: r, moduleName: i } = C.cliConfig, a = [r, `${i}.json`];
+  e && a.unshift(e);
+  const u = $.resolve(...a);
   if (l.existsSync(u))
     return u;
-}, C = ({
+}, I = ({
   filePath: e,
   dataInit: r,
   limitJson: i,
-  filePathKey: s,
+  filePathKey: a,
   dataInitKey: u,
   dealMarkdown: c = !1
 }) => {
   if (e) {
     if (i && !e.endsWith(".json"))
-      return n.error(`${s}必须是json文件，请检查文件后缀名`), process.exit(1);
-    const a = l.readFileSync($.resolve(e), "utf-8");
-    let p = a;
-    return c && e.endsWith(".md") && (p = a.replace(
+      return n.error(`${a}必须是json文件，请检查文件后缀名`), process.exit(1);
+    const s = l.readFileSync($.resolve(e), "utf-8");
+    let p = s;
+    return c && e.endsWith(".md") && (p = s.replace(
       /^\s*```[a-zA-Z0-9]+\s*[\r\n]+([\s\S]+?)```\s*$/,
       "$1"
     )), i ? JSON.parse(p) : p;
   } else
-    return r ? (n.info(`${s} 为空，将使用${u}作为数据`), i ? JSON.parse(r) : r) : (n.error(`${s}与${u}不能同时为空`), process.exit(1));
-}, R = (e, r) => {
+    return r ? (n.info(`${a} 为空，将使用${u}作为数据`), i ? JSON.parse(r) : r) : (n.error(`${a}与${u}不能同时为空`), process.exit(1));
+}, D = (e, r) => {
   if (!r)
     return n.error(`${e}模式下output不能为空`), process.exit(1);
 }, S = (e, r) => {
@@ -68,55 +66,55 @@ const g = {
 } = {}) => {
   const {
     env: i,
-    input: s,
+    input: a,
     inputData: u,
     output: c,
-    mode: a,
+    mode: s,
     rollback: p,
-    dealMarkdown: y,
+    dealMarkdown: g,
     envData: h
   } = e;
   if (p)
-    switch (a) {
+    switch (s) {
       case v.REPLACE:
       case v.RETURN: {
-        n.error(`${a}模式不支持回滚`);
+        n.error(`${s}模式不支持回滚`);
         return;
       }
     }
   n.stage(`开始处理模板
-mode: ${a}
+mode: ${s}
 rollback: ${p}
 `);
-  const w = C({
-    filePath: s,
+  const k = I({
+    filePath: a,
     dataInit: u,
     limitJson: !1,
     filePathKey: "input",
     dataInitKey: "inputData",
-    dealMarkdown: y
-  }), o = D(w), d = typeof h == "function" ? h() : h, m = o(d);
-  switch (a) {
+    dealMarkdown: g
+  }), o = E(k), f = typeof h == "function" ? h() : h, m = o(f);
+  switch (s) {
     case v.OVERWRITE: {
-      R(a, c), S(c, s);
+      D(s, c), S(c, a);
       const t = $.resolve(c);
       if (l.mkdirSync($.dirname(t), { recursive: !0 }), l.existsSync(t)) {
         if (p)
           if (r || (await N({
             type: "confirm",
             name: "remove",
-            message: `${a}模式下回滚将删除${t}，是否继续？`
+            message: `${s}模式下回滚将删除${t}，是否继续？`
           })).remove) {
-            l.rmSync(t, { force: !0 }), n.success(`${a}模式下${t}已删除`);
+            l.rmSync(t, { force: !0 }), n.success(`${s}模式下${t}已删除`);
             return;
           } else {
-            n.warn(`${a}模式下${t}回滚取消`);
+            n.warn(`${s}模式下${t}回滚取消`);
             return;
           }
         n.info(`output:${t} 已存在，将覆盖`);
       } else {
         if (p) {
-          n.warn(`${a}模式下${t}不存在，无需回滚`);
+          n.warn(`${s}模式下${t}不存在，无需回滚`);
           return;
         }
         n.stage(`output:${t} 不存在，将创建`);
@@ -125,23 +123,23 @@ rollback: ${p}
       break;
     }
     case v.APPEND: {
-      R(a, c), S(c, s);
+      D(s, c), S(c, a);
       const t = $.resolve(c);
       if (l.mkdirSync($.dirname(t), { recursive: !0 }), l.existsSync(t)) {
-        const f = l.readFileSync(t, "utf-8");
+        const d = l.readFileSync(t, "utf-8");
         if (p) {
           l.writeFileSync(
             t,
-            f.replace(m, ""),
+            d.replace(m, ""),
             "utf-8"
-          ), n.success(`${a}模式下${t}回滚完成`);
+          ), n.success(`${s}模式下${t}回滚完成`);
           return;
         }
-        const b = f + m;
+        const b = d + m;
         l.writeFileSync(t, b, "utf-8"), n.success(`模板处理完成，追加到 ${t}`);
       } else {
         if (p) {
-          n.warn(`${a}模式下${t}不存在，无需回滚`);
+          n.warn(`${s}模式下${t}不存在，无需回滚`);
           return;
         }
         n.stage(`output:${t} 不存在，将创建`), l.writeFileSync(t, m, "utf-8"), n.success(`模板处理完成，输出到 ${t}`);
@@ -149,118 +147,122 @@ rollback: ${p}
       break;
     }
     case v.REPLACE: {
-      if (c && n.warn(`output ${c} 将被忽略`), J(a, s), i && i === s)
+      if (c && n.warn(`output ${c} 将被忽略`), J(s, a), i && i === a)
         return n.error("env 与 input 不能相同"), process.exit(1);
-      const t = $.resolve(s);
-      let f = t;
-      const b = s.replace(`${process.cwd()}/`, ""), k = D(b)(d);
-      k !== b && (n.success(`检测输入文件名也需要替换
-            ./${b} => ./${k} `), l.rmSync(t), f = $.resolve(`./${k}`)), l.mkdirSync($.dirname(f), { recursive: !0 }), l.writeFileSync(f, m, "utf-8"), n.success(`模板处理完成，输出到 ${f}`);
+      const t = $.resolve(a);
+      let d = t;
+      const b = a.replace(`${process.cwd()}/`, ""), w = E(b)(f);
+      w !== b && (n.success(`检测输入文件名也需要替换
+            ./${b} => ./${w} `), l.rmSync(t), d = $.resolve(`./${w}`)), l.mkdirSync($.dirname(d), { recursive: !0 }), l.writeFileSync(d, m, "utf-8"), n.success(`模板处理完成，输出到 ${d}`);
       break;
     }
     case v.RETURN:
       return n.success("模板处理完成，返回结果(函数调用才会拿到返回值)"), m;
     default:
-      return n.error(`mode ${a} 不支持`), process.exit(1);
+      return n.error(`mode ${s} 不支持`), process.exit(1);
   }
   return m;
-}, M = async ({
+}, U = async ({
   rootDir: e = process.cwd(),
   itemDefaultRollback: r = !1,
   extraEnvData: i = {}
-} = {}, s) => {
+} = {}, a) => {
   let u;
-  if (s)
-    u = s;
+  if (a)
+    u = a;
   else {
     const o = W(e);
     if (!o)
       return n.error(`配置文件${o}不存在`), process.exit(1);
-    const d = l.readFileSync(o, "utf-8");
-    u = JSON.parse(d);
+    const f = l.readFileSync(o, "utf-8");
+    u = JSON.parse(f);
   }
   const {
     list: c,
-    globalEnvData: a = {},
+    globalEnvData: s = {},
     collectEnvDataForm: p = []
-  } = u, y = {};
+  } = u, g = {};
   for (const o of p) {
-    let d, m, t;
-    typeof o == "string" ? (d = o, m = o, t = void 0) : (d = o.key, m = o.label, t = o.initial), y[d] = (await N({
+    let f, m, t;
+    typeof o == "string" ? (f = o, m = o, t = void 0) : (f = o.key, m = o.label, t = o.initial), g[f] = (await N({
       type: "text",
-      name: d,
+      name: f,
       message: `请输入${m}`,
       initial: t,
-      format: (f) => f.trim(),
-      validate: (f) => f.length > 0 || `${m}不能为空`
-    }))[d];
+      format: (d) => d.trim(),
+      validate: (d) => d.length > 0 || `${m}不能为空`
+    }))[f];
   }
   const h = c.map((o) => {
-    const { rollback: d = r } = o, {
+    const { rollback: f = r } = o, {
       envData: m,
       env: t,
-      input: f,
+      input: d,
       output: b,
-      ...k
+      ...w
     } = P(o);
     return t && n.warn(`批量处理中 env:${t} 将被忽略，只读envData`), {
-      ...k,
+      ...w,
       env: t,
-      input: e && f ? $.resolve(e, f) : f,
+      input: e && d ? $.resolve(e, d) : d,
       output: e && b ? $.resolve(e, b) : b,
-      envData: T(
+      envData: A(
         {},
         i,
-        a,
-        y,
+        s,
+        g,
         m
       ),
-      rollback: d
+      rollback: f
     };
-  }), w = [];
+  }), k = [];
   for (const o of h) {
-    const d = await x(o, {
+    const f = await x(o, {
       rollbackDelFileAgree: !0
     });
-    w.push(d);
+    k.push(f);
   }
-  return w;
-}, I = async (e) => {
+  return k;
+}, j = async (e) => {
   const {
     envData: r,
     env: i,
-    input: s,
+    input: a,
     inputData: u,
     output: c,
-    mode: a,
+    mode: s,
     rollback: p,
-    dealMarkdown: y,
+    dealMarkdown: g,
     batch: h
   } = P(e);
   if (h)
-    return n.stage("开始批量处理"), M({
+    return n.stage("开始批量处理"), U({
       // 回滚默认值 基于全局
       itemDefaultRollback: p
     });
   n.stage("开始单个处理");
-  const w = C({
+  const k = I({
     filePath: i,
     dataInit: r,
     limitJson: !0,
     filePathKey: "env",
     dataInitKey: "envData",
-    dealMarkdown: y
+    dealMarkdown: g
   });
   return x({
-    input: s,
+    input: a,
     inputData: u,
     output: c,
-    mode: a,
+    mode: s,
     rollback: p,
-    dealMarkdown: y,
-    envData: w
+    dealMarkdown: g,
+    envData: k
   });
-}, j = () => ({
+}, {
+  version: L,
+  description: V,
+  cliConfig: { moduleName: R }
+} = C, _ = () => ({
   env: {
     alias: "e",
     describe: "环境数据文件JSON文件相对路径(优先级高于envData)",
@@ -291,7 +293,7 @@ rollback: ${p}
       v.REPLACE,
       v.RETURN
     ],
-    default: g.mode
+    default: y.mode
   },
   output: {
     alias: "o",
@@ -302,39 +304,40 @@ rollback: ${p}
     alias: "r",
     describe: "是否回滚",
     type: "boolean",
-    default: g.rollback
+    default: y.rollback
   },
   dealMarkdown: {
     alias: "d",
     describe: "(检测是markdown)是否处理(单个)代码块包裹",
     type: "boolean",
-    default: g.dealMarkdown
+    default: y.dealMarkdown
   },
   batch: {
     alias: "b",
     describe: "是否批量处理",
     type: "boolean",
-    default: g.batch
+    default: y.batch
   }
-}), F = E.cliConfig.moduleName, L = (e, r) => {
-  e ? n.error(e) : n.error(r.message), process.exit(1);
-}, V = E.description, H = `Usage: $0 ${F} [options]`, _ = "Usage: $0 [options]", O = (e, r) => {
-  const i = j();
-  return e.strict().usage(r).help("help").version(E.version).alias("v", "version").alias("h", "help").options(i).fail(L).argv;
-}, q = (e) => O(e, H), Y = {
-  command: F,
+}), F = {
   describe: V,
-  builder: q,
-  handler: I
-}, ee = async () => {
-  const e = A(U(process.argv)), r = await O(e, _);
-  return I(r);
-};
+  version: L,
+  options: _(),
+  handler: j
+}, O = (e = !1) => {
+  const r = e ? R : void 0, i = `$0${e ? ` ${R}` : ""} [options]`;
+  return { command: r, usage: i };
+}, B = async () => T({
+  ...F,
+  ...O()
+}), G = () => M({
+  ...F,
+  ...O(!0)
+});
 export {
   v as O,
-  Y as a,
-  M as b,
-  ee as c,
+  G as a,
+  U as b,
+  B as c,
   W as g,
-  I as h
+  j as h
 };

package/es/index.mjs

@@ -1,16 +1,14 @@
 #!/usr/bin/env node
-import { O as s, b as d, a as h, g as u, h as b } from "./index-694fa5e1.js";
+import { O as i, b as p, a as s, g as d, h as u } from "./index-6bc0fa40.js";
 import "node:path";
 import "node:fs";
 import "lodash.template";
 import "lodash.assign";
 import "@done-coding/cli-utils";
-import "yargs";
-import "yargs/helpers";
 export {
-  s as OutputModeEnum,
-  d as batchHandler,
-  h as command,
-  u as getConfigPath,
-  b as handler
+  i as OutputModeEnum,
+  p as batchHandler,
+  s as crateAsSubcommand,
+  d as getConfigPath,
+  u as handler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-template",
-  "version": "0.6.2-alpha.0",
+  "version": "0.7.0-alpha.0",
   "description": "预编译命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.4.7-alpha.0",
+    "@done-coding/cli-inject": "^0.5.0-alpha.0",
     "@types/lodash.assign": "^4.2.9",
     "@types/lodash.get": "^4.4.9",
     "@types/lodash.set": "^4.3.9",
@@ -57,12 +57,11 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "^0.2.2-alpha.0",
+    "@done-coding/cli-utils": "^0.3.0-alpha.0",
     "lodash.assign": "^4.2.0",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "lodash.template": "^4.5.0",
-    "yargs": "^17.7.2"
+    "lodash.template": "^4.5.0"
   },
-  "gitHead": "2e59e86ee192e023138e7475f4abbb5e7c42b29e"
+  "gitHead": "c5a54bdf08759425701a2024442a923883065189"
 }

package/types/handler.d.ts

@@ -1,6 +1,6 @@
 import type { CompileTemplateConfig } from './utils';
 import { type Options } from './utils';
-import type { ArgumentsCamelCase } from "yargs";
+import type { CliHandlerArgv } from "@done-coding/cli-utils";
 export declare const batchHandler: ({ rootDir, itemDefaultRollback, extraEnvData, }?: {
     /** 根目录 */
     rootDir?: string | undefined;
@@ -9,4 +9,4 @@ export declare const batchHandler: ({ rootDir, itemDefaultRollback, extraEnvData
     /** 额外环境变量 */
     extraEnvData?: object | undefined;
 }, paramsConfig?: CompileTemplateConfig) => Promise<(string | undefined)[]>;
-export declare const handler: (argv: ArgumentsCamelCase<Options> | Options) => Promise<string | (string | undefined)[] | undefined>;
+export declare const handler: (argv: CliHandlerArgv<Options>) => Promise<string | (string | undefined)[] | undefined>;

package/types/index.d.ts

@@ -1,4 +1,4 @@
 export { handler, batchHandler } from "./handler";
-export { command } from "./main";
+export { crateAsSubcommand } from "./main";
 export * from './utils/types';
 export * from './utils/config';

package/types/injectInfo.json.d.ts

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

package/types/main.d.ts

@@ -1,4 +1,9 @@
-import type { CommandModule } from "yargs";
-import type { Options } from './utils';
-export declare const command: CommandModule<Options, Options>;
-export declare const createCli: () => Promise<string | (string | undefined)[] | undefined>;
+/// <reference types="yargs" />
+/** 作为主命令创建 */
+export declare const createCommand: () => Promise<void | {
+    [x: string]: unknown;
+    _: (string | number)[];
+    $0: string;
+}>;
+/** 作为子命令创建 */
+export declare const crateAsSubcommand: () => import("yargs").CommandModule<{}, {}>;