@done-coding/cli-inject 0.5.7-alpha.0 → 0.5.8-alpha.1

package/es/cli.mjs

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

package/es/{index-80e9c302.js → index-3bb4131e.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { I as r, S as a } from "./types-a1ee6691.js";
-import { log as n, _get as I, getConfigFileCommonOptions as h, initHandlerCommon as _, _set as b, readConfigFile as k, _curry as A, createSubcommand as D, createMainCommand as w } from "@done-coding/cli-utils";
+import { I as c, S as a } from "./types-a1ee6691.js";
+import { log as n, _get as I, getConfigFileCommonOptions as h, initHandlerCommon as _, _set as b, readConfigFile as k, _curry as A, createSubcommand as N, createMainCommand as w } from "@done-coding/cli-utils";
 import F from "node:path";
 import m from "node:fs";
 const G = ({
@@ -10,139 +10,141 @@ const G = ({
 }) => {
   let s;
   typeof t == "string" ? s = {
-    type: r.FIXED,
+    type: c.FIXED,
     value: t
   } : s = t;
-  const { type: l = r.READ } = s;
+  const { type: l = c.READ } = s;
   switch (l) {
-    case r.REG: {
-      const { sourceKey: i, pattern: d, replaceValue: p, flags: g } = s, E = new RegExp(d, g ?? void 0), c = I(e, i);
-      return typeof c == "string" ? c.replace(E, p) : (n.warn(
-        `${c}不是字符串类型，无法使用正则表达式进行替换，此处将直接返回原值`
-      ), c);
+    case c.REG: {
+      const { sourceKey: r, pattern: d, replaceValue: p, flags: g } = s, E = new RegExp(d, g ?? void 0), i = I(e, r);
+      return typeof i == "string" ? i.replace(E, p) : (n.warn(
+        `${i}不是字符串类型，无法使用正则表达式进行替换，此处将直接返回原值`
+      ), i);
     }
-    case r.FIXED: {
-      const { value: i } = s;
-      return i;
+    case c.FIXED: {
+      const { value: r } = s;
+      return r;
+    }
+    case c.READ: {
+      const { sourceKey: r = o } = s;
+      return I(e, r);
     }
-    case r.READ:
-      return I(e, o);
     default: {
       n.warn(`未知的配置类型${l}`);
       return;
     }
   }
-}, M = {
+}, D = {
   sourceFilePath: "./package.json",
   keyConfigMap: {
     name: {
-      type: r.READ
+      type: c.READ
     },
     version: {
-      type: r.READ
+      type: c.READ
     },
     description: {
-      type: r.READ
+      type: c.READ
     }
   },
   injectFilePath: "./src/injectInfo.json"
-}, N = M, R = {
+}, R = {
   name: "@done-coding/cli-inject",
-  version: "0.5.7-alpha.0",
+  version: "0.5.8-alpha.1",
   description: "信息(JSON)注入命令行工具",
   cliConfig: {
     namespaceDir: ".done-coding",
     moduleName: "inject"
   }
 }, {
-  cliConfig: { namespaceDir: x, moduleName: H }
-} = R, L = `./${x}/${H}`, T = `${L}.json`, J = () => h({
+  cliConfig: { namespaceDir: M, moduleName: x }
+} = R, H = `./${M}/${x}`, T = `${H}.json`, L = () => h({
   configPathDefault: T
-}), U = async (e) => _(N, e, {
+}), J = async (e) => _(D, e, {
   onFileGenerated: () => {
     n.info("文件生成成功");
   }
-}), V = () => ({
+}), U = () => ({
   ...h({
     configPathDefault: T
   })
-}), W = async ({
+}), V = async ({
   rootDir: e = process.cwd(),
-  config: o = N,
+  config: o = D,
   keyConfigMap: t = {}
 } = {}) => {
   const {
     sourceFilePath: s,
     keyConfigMap: l,
-    injectFilePath: i
+    injectFilePath: r
   } = o, d = {
     ...l,
     ...t
   };
   if (!s.endsWith(".json"))
     return n.error("源文件必须是json"), process.exit(1);
-  if (!i.endsWith(".json"))
+  if (!r.endsWith(".json"))
     return n.error("注入文件必须是json"), process.exit(1);
-  const p = F.resolve(e, s), g = m.readFileSync(p, "utf-8"), E = JSON.parse(g), c = Object.entries(d).reduce(
+  const p = F.resolve(e, s), g = m.readFileSync(p, "utf-8"), E = JSON.parse(g), i = Object.entries(d).reduce(
     (f, [C, $]) => {
       const P = G({ sourceJson: E, targetKey: C, keyConfig: $ });
       return b(f, C, P), f;
     },
     {}
-  ), u = F.resolve(e, i), y = JSON.stringify(c, null, 2);
+  ), u = F.resolve(e, r), y = JSON.stringify(i, null, 2);
   if (m.existsSync(u)) {
     const f = m.readFileSync(u, "utf-8");
     if (y === f)
-      return n.skip("注入文件已存在且内容相同，无需重复注入"), c;
+      return n.skip("注入文件已存在且内容相同，无需重复注入"), i;
     n.stage("文件内容变化,开始覆盖注入文件");
   } else
     n.stage("开始注入文件");
   m.writeFileSync(u, y), n.success(`文件注入成功: ${u}`), n.info(y);
-}, X = async (e) => {
+}, K = async (e) => {
   const o = await k(e);
   if (!o)
     return n.error("配置文件为空"), process.exit(1);
   const { rootDir: t } = e;
-  await W({ rootDir: t, config: o });
-}, v = async (e, o) => e === a.INIT ? U(o) : e === a.GENERATE ? X(o) : (n.error(`无效的命令: ${e}`), process.exit(1)), {
-  version: K,
-  description: q,
+  await V({ rootDir: t, config: o });
+}, v = async (e, o) => e === a.INIT ? J(o) : e === a.GENERATE ? K(o) : (n.error(`无效的命令: ${e}`), process.exit(1)), {
+  version: W,
+  description: X,
   cliConfig: { moduleName: j }
-} = R, z = {
+} = R, q = {
   command: a.INIT,
   describe: "初始化提取配置文件",
-  options: J(),
+  options: L(),
   handler: A(v)(
     a.INIT
   )
-}, B = {
+}, z = {
   command: a.GENERATE,
   describe: "提取信息",
-  options: V(),
+  options: U(),
   handler: A(v)(
     a.GENERATE
   )
 }, O = {
-  describe: q,
-  version: K,
-  subcommands: [z, B].map(
-    D
+  describe: X,
+  version: W,
+  subcommands: [q, z].map(
+    N
   ),
   demandCommandCount: 1
 }, S = (e = !1) => {
   const o = e ? j : void 0, t = `$0${e ? ` ${j}` : ""} <command> [options]`;
   return { command: o, usage: t };
-}, ne = async () => w({
+}, ee = async () => w({
   ...O,
   ...S()
-}), oe = () => D({
+}), ne = () => N({
   ...O,
   ...S(!0)
 });
 export {
-  oe as a,
-  ne as c,
-  W as g,
+  ne as a,
+  ee as c,
+  V as g,
   v as h,
   G as k
 };

package/es/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as r, g as s, h as t, k as i } from "./index-80e9c302.js";
+import { a as r, g as s, h as t, k as i } from "./index-3bb4131e.js";
 import { I as u, S as c } from "./types-a1ee6691.js";
 import "@done-coding/cli-utils";
 import "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-inject",
-  "version": "0.5.7-alpha.0",
+  "version": "0.5.8-alpha.1",
   "description": "信息(JSON)注入命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -62,7 +62,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "^0.5.0-alpha.0"
+    "@done-coding/cli-utils": "^0.7.0-alpha.0"
   },
-  "gitHead": "86cdd3eaf8cc8be3e48a812b93fd7c2110fcc879"
+  "gitHead": "ff1616738586a268b50f46dce762774fa5fa6d52"
 }

package/types/injectInfo.json.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
   "name": "@done-coding/cli-inject",
-  "version": "0.5.7-alpha.0",
+  "version": "0.5.8-alpha.1",
   "description": "信息(JSON)注入命令行工具",
   "cliConfig": {
     "namespaceDir": ".done-coding",

package/types/utils/types.d.ts

@@ -55,13 +55,16 @@ export interface InjectKeyConfigFixed extends InjectKeyConfigBase<InjectTypeEnum
     value: string;
 }
 /** 注入配置-读取类型 */
-export type InjectKeyConfigRead = InjectKeyConfigBase<InjectTypeEnum.READ>;
+export interface InjectKeyConfigRead extends InjectKeyConfigBase<InjectTypeEnum.READ> {
+    /** 源key */
+    sourceKey?: string;
+}
 /**
  * 注入配置
  * ---
  * 为 string 时 解析为 InjectKeyConfigFixed, 其中InjectKeyConfigFixed.value = string
  */
-export type InjectKeyConfig = InjectKeyConfigReg | InjectKeyConfigFixed | string | InjectKeyConfigRead;
+export type InjectKeyConfig = InjectKeyConfigReg | (InjectKeyConfigFixed | string) | InjectKeyConfigRead;
 /** @deprecated */
 export interface Options {
     /** json文件相对路径 */