@done-coding/cli-extract 0.1.10 → 0.1.11

package/es/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as m } from "./index-e4f5918d.js";
+import { c as m } from "./index-3b483023.js";
 import "./index-a1ee6691-8c73eb4d.js";
 import "@done-coding/cli-utils";
 import "node:path";

package/es/{index-e4f5918d.js → index-3b483023.js}

@@ -1,43 +1,43 @@
 #!/usr/bin/env node
-import { a as r, e as T, E as u, S as h, G as $ } from "./index-a1ee6691-8c73eb4d.js";
-import { log as s, _get as b, createSubcommand as N, getConfigFileCommonOptions as D, initHandlerCommon as v, readConfigFile as F, _set as L, createMainCommand as V } from "@done-coding/cli-utils";
+import { a as r, e as T, E as u, S as h, G as F } from "./index-a1ee6691-8c73eb4d.js";
+import { log as s, _get as b, createSubcommand as I, getConfigFileCommonOptions as D, initHandlerCommon as v, readConfigFile as J, _set as V, createMainCommand as U } from "@done-coding/cli-utils";
 import j from "node:path";
 import y from "node:fs";
-import { OutputModeEnum as U, batchCompileHandler as W } from "@done-coding/cli-template";
-const O = {
+import { OutputModeEnum as W, batchCompileHandler as H } from "@done-coding/cli-template";
+const N = {
   name: "@done-coding/cli-extract",
-  version: "0.1.10",
+  version: "0.1.11",
   description: "信息提取命令行工具",
   cliConfig: {
     namespaceDir: ".done-coding",
     moduleName: "extract"
   }
 }, {
-  cliConfig: { namespaceDir: H, moduleName: X }
-} = O, K = `./${H}/${X}`, J = `${K}.json5`, C = ({
+  cliConfig: { namespaceDir: X, moduleName: K }
+} = N, q = `./${X}/${K}`, S = `${q}.json5`, C = ({
   sourceJson: e,
   targetKey: n,
-  keyConfig: o
+  keyConfig: t
 }) => {
-  let t;
-  typeof o == "string" ? t = {
+  let o;
+  typeof t == "string" ? o = {
     type: r.FIXED,
-    value: o
-  } : t = o;
-  const { type: a = r.READ } = t;
+    value: t
+  } : o = t;
+  const { type: a = r.READ } = o;
   switch (a) {
     case r.REG: {
-      const { sourceKey: c, pattern: p, replaceValue: l, flags: f } = t, d = new RegExp(p, f ?? void 0), i = b(e, c);
+      const { sourceKey: c, pattern: p, replaceValue: l, flags: f } = o, d = new RegExp(p, f ?? void 0), i = b(e, c);
       return typeof i == "string" ? i.replace(d, l) : (s.warn(
         `${i}不是字符串类型，无法使用正则表达式进行替换，此处将直接返回原值`
       ), i);
     }
     case r.FIXED: {
-      const { value: c } = t;
+      const { value: c } = o;
       return c;
     }
     case r.READ: {
-      const { sourceKey: c = n } = t;
+      const { sourceKey: c = n } = o;
       return b(e, c);
     }
     default: {
@@ -45,17 +45,17 @@ const O = {
       return;
     }
   }
-}, S = {
+}, A = {
   name: "@done-coding/cli-inject",
-  version: "0.5.10",
+  version: "0.5.11",
   description: "信息(JSON)注入命令行工具",
   cliConfig: {
     namespaceDir: ".done-coding",
     moduleName: "inject"
   }
 }, {
-  cliConfig: { namespaceDir: q, moduleName: z }
-} = S, B = `./${q}/${z}`, A = `${B}.json`, x = {
+  cliConfig: { namespaceDir: z, moduleName: B }
+} = A, Q = `./${z}/${B}`, x = `${Q}.json`, O = {
   sourceFilePath: "./package.json",
   keyConfigMap: {
     name: {
@@ -69,42 +69,42 @@ const O = {
     }
   },
   injectFilePath: "./src/injectInfo.json"
-}, Q = () => D({
-  configPathDefault: A
-}), Y = async (e) => v(x, e, {
+}, Y = () => D({
+  configPathDefault: x
+}), Z = async (e) => v(O, e, {
   onFileGenerated: () => {
     s.info("文件生成成功");
   }
-}), Z = {
+}), ee = {
   command: T.INIT,
   describe: "初始化配置文件",
-  options: Q(),
-  handler: Y
-}, ee = () => ({
+  options: Y(),
+  handler: Z
+}, ne = () => ({
   ...D({
-    configPathDefault: A
+    configPathDefault: x
   })
-}), ne = async ({
+}), oe = async ({
   rootDir: e = process.cwd(),
-  config: n = x,
-  keyConfigMap: o = {}
+  config: n = O,
+  keyConfigMap: t = {}
 } = {}) => {
   const {
-    sourceFilePath: t,
+    sourceFilePath: o,
     keyConfigMap: a,
     injectFilePath: c
   } = n, p = {
     ...a,
-    ...o
+    ...t
   };
-  if (!t.endsWith(".json"))
+  if (!o.endsWith(".json"))
     return s.error("源文件必须是json"), process.exit(1);
   if (!c.endsWith(".json"))
     return s.error("注入文件必须是json"), process.exit(1);
-  const l = j.resolve(e, t), f = y.readFileSync(l, "utf-8"), d = JSON.parse(f), i = Object.entries(p).reduce(
-    (g, [R, P]) => {
-      const M = C({ sourceJson: d, targetKey: R, keyConfig: P });
-      return L(g, R, M), g;
+  const l = j.resolve(e, o), f = y.readFileSync(l, "utf-8"), d = JSON.parse(f), i = Object.entries(p).reduce(
+    (g, [R, M]) => {
+      const L = C({ sourceJson: d, targetKey: R, keyConfig: M });
+      return V(g, R, L), g;
     },
     {}
   ), m = j.resolve(e, c), E = JSON.stringify(i, null, 2);
@@ -117,36 +117,36 @@ const O = {
     s.stage("开始注入文件");
   y.writeFileSync(m, E), s.success(`文件注入成功: ${m}`), s.info(E);
 }, te = async (e) => {
-  const n = await F(e);
+  const n = await J(e, () => (s.info("配置文件为空，使用默认配置"), O));
   if (!n)
     return s.error("配置文件为空"), process.exit(1);
-  const { rootDir: o } = e;
-  await ne({ rootDir: o, config: n });
-}, oe = {
+  const { rootDir: t } = e;
+  await oe({ rootDir: t, config: n });
+}, se = {
   command: T.GENERATE,
   describe: "生成文件",
-  options: ee(),
+  options: ne(),
   handler: te
-}, { version: se, description: re } = S;
-[Z, oe].map(
-  N
+}, { version: re, description: ce } = A;
+[ee, se].map(
+  I
 );
-const ce = ({
+const ie = ({
   input: e,
   rootDir: n
 }) => {
-  const o = j.resolve(n, e), t = y.readFileSync(o, "utf-8");
-  return e.endsWith(".json") || e.endsWith(".json5") ? JSON.parse(t) : t;
-}, ie = (e) => typeof e == "object" && !!e, ae = ({
+  const t = j.resolve(n, e), o = y.readFileSync(t, "utf-8");
+  return e.endsWith(".json") || e.endsWith(".json5") ? JSON.parse(o) : o;
+}, ae = (e) => typeof e == "object" && !!e, ue = ({
   content: e,
   targetKey: n,
-  keyConfig: o
+  keyConfig: t
 }) => {
-  const { type: t, ...a } = o;
-  switch (t) {
+  const { type: o, ...a } = t;
+  switch (o) {
     case u.REG: {
       if (typeof e != "string")
-        throw new Error(`${t} 类型的keyConfig需要content为字符串`);
+        throw new Error(`${o} 类型的keyConfig需要content为字符串`);
       return C({
         sourceJson: {
           [n]: e
@@ -160,12 +160,12 @@ const ce = ({
       });
     }
     case u.JSON_INJECT: {
-      if (!ie(e))
-        throw new Error(`${t} 类型的keyConfig需要content为json`);
+      if (!ae(e))
+        throw new Error(`${o} 类型的keyConfig需要content为json`);
       return C({
         sourceJson: e,
         targetKey: n,
-        keyConfig: o.inject
+        keyConfig: t.inject
       });
     }
     case u.FIXED:
@@ -178,13 +178,13 @@ const ce = ({
         }
       });
     default:
-      throw new Error(`不支持的类型${t}`);
+      throw new Error(`不支持的类型${o}`);
   }
-}, ue = {
+}, de = {
   name: "${name}",
   version: "${version}",
   description: "${description}"
-}, de = {
+}, G = {
   extractInput: {
     "./package.json": {
       name: {
@@ -222,15 +222,15 @@ const ce = ({
   extractOutput: {
     list: [
       {
-        mode: U.OVERWRITE,
-        inputData: JSON.stringify(ue, null, 2),
+        mode: W.OVERWRITE,
+        inputData: JSON.stringify(de, null, 2),
         output: "./src/extractInfo.json"
       }
     ]
   }
 }, me = () => D({
-  configPathDefault: J
-}), G = async (e) => v(de, e, {
+  configPathDefault: S
+}), k = async (e) => v(G, e, {
   onFileGenerated: () => {
     s.info("文件生成成功");
   }
@@ -238,31 +238,31 @@ const ce = ({
   command: h.INIT,
   describe: "初始化配置文件",
   options: me(),
-  handler: G
+  handler: k
 }, le = () => ({
   ...D({
-    configPathDefault: J
+    configPathDefault: S
   }),
   mode: {
     type: "string",
     alias: "m",
-    choices: Object.values($),
-    default: $.RESULT,
+    choices: Object.values(F),
+    default: F.RESULT,
     describe: "生成模式"
   }
 }), fe = async ({
   rootDir: e = process.cwd(),
   config: n
 }) => {
-  const { extractInput: o, extractOutput: t } = n, a = Object.entries(o).reduce(
+  const { extractInput: t, extractOutput: o } = n, a = Object.entries(t).reduce(
     (c, [p, l]) => {
-      const f = ce({
+      const f = ie({
         rootDir: e,
         input: p
       });
       return Object.entries(l).reduce(
         (d, [i, m]) => {
-          const E = ae({
+          const E = ue({
             content: f,
             targetKey: i,
             keyConfig: m
@@ -274,60 +274,60 @@ const ce = ({
     },
     {}
   );
-  await W(
+  await H(
     {
       rootDir: e,
       extraEnvData: a
     },
-    t
+    o
   );
-}, I = async (e) => {
-  const n = await F(e);
+}, $ = async (e) => {
+  const n = await J(e, () => (s.info("配置文件为空，使用默认配置"), G));
   if (!n)
     return s.error("配置文件为空"), process.exit(1);
-  const { rootDir: o } = e;
-  await fe({ rootDir: o, config: n });
+  const { rootDir: t } = e;
+  await fe({ rootDir: t, config: n });
 }, Ee = {
   command: h.GENERATE,
   describe: "生成文件",
   options: le(),
-  handler: I
-}, Ne = async (e, n) => {
+  handler: $
+}, Ie = async (e, n) => {
   switch (e) {
     case h.INIT:
-      return G(n);
+      return k(n);
     case h.GENERATE:
-      return I(n);
+      return $(n);
     default:
-      return I(n);
+      return $(n);
   }
-}, { version: ye, description: ge } = O, k = {
+}, { version: ye, description: ge } = N, _ = {
   describe: ge,
   version: ye,
   subcommands: [pe, Ee].map(
-    N
+    I
   ),
   demandCommandCount: 1
 }, {
   cliConfig: { moduleName: w }
-} = O, _ = (e = !1) => {
-  const n = e ? w : void 0, o = `$0${e ? ` ${w}` : ""} <command> [options]`;
-  return { command: n, usage: o };
-}, Oe = async () => V({
-  ...k,
-  ..._()
-}), Re = () => N({
-  ...k,
-  ..._(!0)
+} = N, P = (e = !1) => {
+  const n = e ? w : void 0, t = `$0${e ? ` ${w}` : ""} <command> [options]`;
+  return { command: n, usage: t };
+}, Ne = async () => U({
+  ..._,
+  ...P()
+}), Oe = () => I({
+  ..._,
+  ...P(!0)
 });
 export {
-  Re as a,
+  Oe as a,
   pe as b,
-  Oe as c,
-  I as d,
+  Ne as c,
+  $ as d,
   Ee as e,
-  Ne as f,
+  Ie as f,
   fe as g,
-  G as h,
-  k as i
+  k as h,
+  _ as i
 };

package/es/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as t, a as i, e as s, g as d, d as l, f as p, b as f, h as u } from "./index-e4f5918d.js";
+import { i as t, a as i, e as s, g as d, d as l, f as p, b as f, h as u } from "./index-3b483023.js";
 import { E as C, G as E, S as b } from "./index-a1ee6691-8c73eb4d.js";
 import "@done-coding/cli-utils";
 import "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-extract",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "信息提取命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -52,7 +52,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.5.10",
+    "@done-coding/cli-inject": "^0.5.11",
     "@types/node": "^18.0.0",
     "@types/yargs": "^17.0.28",
     "rimraf": "^6.0.1",
@@ -64,8 +64,8 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-template": "0.7.10",
-    "@done-coding/cli-utils": "^0.7.1"
+    "@done-coding/cli-template": "0.7.11",
+    "@done-coding/cli-utils": "^0.7.2"
   },
-  "gitHead": "299ab3991d6842c83d65816dfba6efd175aa885a"
+  "gitHead": "ad322da7f5d0897ee91a399aff9a14b111d62825"
 }