@done-coding/cli-config 0.1.10 → 0.1.11

package/es/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as m } from "./index-08808fce.js";
+import { c as m } from "./index-7d957358.js";
 import "@done-coding/cli-utils";
 import "node:fs";
 import "node:path";

package/es/{index-08808fce.js → index-7d957358.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { readConfigFile as B, log as i, getPackageJson as Q, getRelyPkgVersion as X, getConfigFileCommonOptions as Y, readCliConfig as Z, xPrompts as w, addPackageConfig as ee, addHuskyHooks as te, createSubcommand as J, getRootScriptName as ne, createMainCommand as oe } from "@done-coding/cli-utils";
+import { readConfigFile as B, log as i, getPackageJson as Q, getRelyPkgVersion as X, getConfigFileCommonOptions as Y, readCliModuleAssetsConfig as Z, xPrompts as w, addPackageConfig as ee, addHuskyHooks as te, createSubcommand as J, getRootScriptName as oe, createMainCommand as ne } from "@done-coding/cli-utils";
 import k, { existsSync as C } from "node:fs";
 import g from "node:path";
 import { execSync as N } from "node:child_process";
 var y = /* @__PURE__ */ ((e) => (e.CHECK = "check", e.ADD = "add", e))(y || {}), m = /* @__PURE__ */ ((e) => (e.ESLINT = "eslint", e.PRETTIER = "prettier", e.COMMITLINT = "commitlint", e.LSLINT = "ls-lint", e.MERGELINT = "merge-lint", e))(m || {});
 const L = {
   name: "@done-coding/cli-config",
-  version: "0.1.10",
+  version: "0.1.11",
   description: "工程化配置命令行工具",
   bin: {
     "dc-config": "es/cli.mjs"
@@ -36,59 +36,59 @@ const L = {
   [m.COMMITLINT]: "@commitlint/cli",
   [m.LSLINT]: "@ls-lint/ls-lint",
   [m.MERGELINT]: "@done-coding/cli-git"
-}, n = "_$_", le = {
+}, o = "_$_", le = {
   [m.ESLINT]: [
-    `${n}.config.js`,
-    `${n}.config.mjs`,
-    `${n}.config.cjs`,
-    `.${n}rc`,
-    `.${n}rc.js`,
-    `.${n}rc.json`,
-    `.${n}rc.mjs`,
-    `.${n}rc.cjs`,
-    `.${n}rc.yaml`,
-    `.${n}rc.yml`
+    `${o}.config.js`,
+    `${o}.config.mjs`,
+    `${o}.config.cjs`,
+    `.${o}rc`,
+    `.${o}rc.js`,
+    `.${o}rc.json`,
+    `.${o}rc.mjs`,
+    `.${o}rc.cjs`,
+    `.${o}rc.yaml`,
+    `.${o}rc.yml`
   ],
   [m.PRETTIER]: [
-    `${n}.config.js`,
-    `${n}.config.mjs`,
-    `${n}.config.cjs`,
-    `.${n}rc`,
-    `.${n}rc.js`,
-    `.${n}rc.json`,
-    `.${n}rc.json5`,
-    `.${n}rc.mjs`,
-    `.${n}rc.cjs`,
-    `.${n}rc.yaml`,
-    `.${n}rc.yml`,
-    `.${n}rc.toml`
+    `${o}.config.js`,
+    `${o}.config.mjs`,
+    `${o}.config.cjs`,
+    `.${o}rc`,
+    `.${o}rc.js`,
+    `.${o}rc.json`,
+    `.${o}rc.json5`,
+    `.${o}rc.mjs`,
+    `.${o}rc.cjs`,
+    `.${o}rc.yaml`,
+    `.${o}rc.yml`,
+    `.${o}rc.toml`
   ],
   [m.COMMITLINT]: [
-    `${n}.config.js`,
-    `${n}.config.mjs`,
-    `${n}.config.cjs`,
-    `.${n}rc`,
-    `.${n}rc.js`,
-    `.${n}rc.json`,
-    `.${n}rc.mjs`,
-    `.${n}rc.cjs`,
-    `.${n}rc.yaml`,
-    `.${n}rc.yml`
+    `${o}.config.js`,
+    `${o}.config.mjs`,
+    `${o}.config.cjs`,
+    `.${o}rc`,
+    `.${o}rc.js`,
+    `.${o}rc.json`,
+    `.${o}rc.mjs`,
+    `.${o}rc.cjs`,
+    `.${o}rc.yaml`,
+    `.${o}rc.yml`
   ],
-  [m.LSLINT]: [`.${n}.yaml`, `.${n}.yml`],
+  [m.LSLINT]: [`.${o}.yaml`, `.${o}.yml`],
   [m.MERGELINT]: [".done-coding/git.json"]
-}, me = (e, t) => t.filter((o) => C(g.resolve(e, o))), _ = (e) => e.filter((t) => {
-  const o = I.includes(t);
-  return o || i.warn(
+}, me = (e, t) => t.filter((n) => C(g.resolve(e, n))), _ = (e) => e.filter((t) => {
+  const n = I.includes(t);
+  return n || i.warn(
     `当前不支持${t}的配置检测, 支持的类型有${I.join(
       ", "
     )}`
-  ), o;
+  ), n;
 }), de = ({
   config: e,
   rootDir: t
 }) => {
-  const { moduleList: o = [] } = e, s = _(o);
+  const { moduleList: n = [] } = e, s = _(n);
   i.stage(`开始获取${s.join(", ")}配置信息...`);
   const r = Q({ rootDir: t });
   return s.reduce(
@@ -101,7 +101,7 @@ const L = {
       });
       if (!f)
         return a;
-      const c = le[l].map((u) => u.replace(n, l));
+      const c = le[l].map((u) => u.replace(o, l));
       return c.length ? (a[l] = {
         version: f,
         configFileRelativePathList: me(
@@ -126,11 +126,11 @@ const L = {
     )
   }
 }), E = async (e) => {
-  const t = await ae(e), o = de({ config: t, rootDir: e.rootDir });
+  const t = await ae(e), n = de({ config: t, rootDir: e.rootDir });
   return i.success(`检测到工程化配置信息: 
-${JSON.stringify(o, null, 2)}`), {
+${JSON.stringify(n, null, 2)}`), {
     config: t,
-    info: o
+    info: n
   };
 }, ue = {
   command: y.CHECK,
@@ -161,7 +161,7 @@ ${JSON.stringify(o, null, 2)}`), {
       `${e} 跳过版本选择: 仅有一个预设版本配置, 默认选择第一个(${s.version})`
     ), s;
   }
-  const { version: o } = await w({
+  const { version: n } = await w({
     type: "select",
     name: "version",
     message: `请选择需要添加的${e}版本`,
@@ -173,18 +173,18 @@ ${JSON.stringify(o, null, 2)}`), {
       };
     })
   });
-  return t.find((s) => s.version === o);
+  return t.find((s) => s.version === n);
 }, pe = async ({
   moduleName: e,
   moduleConfig: t
 }) => {
-  const { configFileInfoList: o } = t;
-  if (!Array.isArray(o) || o.length === 0) {
+  const { configFileInfoList: n } = t;
+  if (!Array.isArray(n) || n.length === 0) {
     i.error(`未找到 ${e} 配置文件信息列表`);
     return;
   }
-  if (o.length === 1) {
-    const r = o[0];
+  if (n.length === 1) {
+    const r = n[0];
     return i.skip(
       `${e} 跳过配置文件信息选择: 仅有一个配置文件信息, 默认选择第一个(${r.sourceFile})`
     ), r;
@@ -193,7 +193,7 @@ ${JSON.stringify(o, null, 2)}`), {
     type: "select",
     name: "info",
     message: "请选择需要添加的配置文件",
-    choices: o.map((r) => {
+    choices: n.map((r) => {
       const { sourceFile: a, description: l } = r;
       return {
         title: a,
@@ -202,10 +202,10 @@ ${JSON.stringify(o, null, 2)}`), {
       };
     })
   });
-  return o.find((r) => r.sourceFile === s.sourceFile);
+  return n.find((r) => r.sourceFile === s.sourceFile);
 }, ye = ({ rootDir: e, list: t }) => {
   i.stage(`开始安装依赖包: ${JSON.stringify(t, null, 2)}`);
-  const o = g.resolve(e, "pnpm-workspace.yaml"), s = C(o);
+  const n = g.resolve(e, "pnpm-workspace.yaml"), s = C(n);
   N(`pnpm add -D ${s ? "-w" : ""} ${t.join(" ")}`, {
     cwd: e,
     stdio: "inherit"
@@ -213,16 +213,16 @@ ${JSON.stringify(o, null, 2)}`), {
 }, Le = async ({
   hooksConfig: e,
   argv: t
-}) => Object.entries(e).forEach(async ([o, s]) => {
+}) => Object.entries(e).forEach(async ([n, s]) => {
   await te({
-    hookNames: [o],
+    hookNames: [n],
     rootDir: t.rootDir,
     getCode: () => s
   });
 }), he = async ({
   moduleName: e,
   moduleConfigList: t,
-  argv: o
+  argv: n
 }) => {
   const s = await $e({
     moduleName: e,
@@ -252,7 +252,7 @@ ${JSON.stringify(o, null, 2)}`), {
   return i.stage(`需要安装的依赖包: 
 ${JSON.stringify($, null, 2)}`), await ee({
     patchConfig: s.packageJson,
-    rootDir: o.rootDir
+    rootDir: n.rootDir
   }), {
     sourceFile: u,
     targetFile: j,
@@ -264,21 +264,21 @@ ${JSON.stringify($, null, 2)}`), await ee({
       var p;
       return Le({
         hooksConfig: ((p = s.husky) == null ? void 0 : p.hooks) || {},
-        argv: o
+        argv: n
       });
     }
   };
 }, ke = ({
   listConfig: e,
   moduleDir: t,
-  moduleName: o
+  moduleName: n
 }) => {
   if (typeof e == "string") {
     console.log(e);
     const s = g.resolve(t, e);
     if (!C(s))
       throw new Error(
-        `${o} 预设列表文件 ${s} 不存在`
+        `${n} 预设列表文件 ${s} 不存在`
       );
     const r = k.readFileSync(s, "utf-8");
     return JSON.parse(
@@ -287,13 +287,13 @@ ${JSON.stringify($, null, 2)}`), await ee({
   } else {
     if (!Array.isArray(e))
       throw new Error(
-        `(${o})预置项必须是数组或者是相对于当前工程化配置模块目录的相对路径`
+        `(${n})预置项必须是数组或者是相对于当前工程化配置模块目录的相对路径`
       );
     return e;
   }
 }, b = async (e) => {
-  const { config: t, info: o } = await E(e), { moduleList: s = [] } = t, a = _(s).filter((c) => {
-    const u = o[c];
+  const { config: t, info: n } = await E(e), { moduleList: s = [] } = t, a = _(s).filter((c) => {
+    const u = n[c];
     return u ? (i.skip(`
 检测到 ${c} 已配置, ${JSON.stringify(u, null, 2)},
 跳过添加 ${c}`), !1) : !0;
@@ -306,8 +306,10 @@ ${JSON.stringify($, null, 2)}`), await ee({
     moduleName: fe,
     onSuccess: async ({
       config: c,
-      configTemporaryDir: u,
-      cliConfigDirRelativePath: j
+      // configTemporaryDir,
+      // cliConfigDirRelativePath,
+      assetsConfigRepoTempDir: u,
+      moduleEntryFileRelativePath: j
     }) => {
       if (!(c != null && c.project))
         throw new Error("项目工程化预设不存在");
@@ -316,8 +318,7 @@ ${JSON.stringify($, null, 2)}`), await ee({
       for (let d of a) {
         const v = g.resolve(
           u,
-          j,
-          d
+          j
         ), D = ke({
           listConfig: S[d],
           moduleDir: v,
@@ -388,13 +389,13 @@ ${JSON.stringify($, null, 2)}`), await ee({
   version: Ie,
   subcommands: [ue, Ne].map(J),
   demandCommandCount: 1,
-  rootScriptName: ne({ packageJson: L })
+  rootScriptName: oe({ packageJson: L })
 }, {
   cliConfig: { moduleName: O }
 } = L, x = (e = !1) => {
-  const t = e ? O : void 0, o = `$0${e ? ` ${O}` : ""} <command> [options]`;
-  return { command: t, usage: o };
-}, Pe = async () => oe({
+  const t = e ? O : void 0, n = `$0${e ? ` ${O}` : ""} <command> [options]`;
+  return { command: t, usage: n };
+}, Pe = async () => ne({
   ...G,
   ...x()
 }), Te = () => J({

package/es/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as i, S as s, a as t, h as u } from "./index-08808fce.js";
+import { C as i, S as s, a as t, h as u } from "./index-7d957358.js";
 import "@done-coding/cli-utils";
 import "node:fs";
 import "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-config",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "工程化配置命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "0.5.18",
+    "@done-coding/cli-inject": "0.5.19",
     "@types/node": "^18.0.0",
     "@types/yargs": "^17.0.28",
     "rimraf": "^6.0.1",
@@ -53,7 +53,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "0.7.8"
+    "@done-coding/cli-utils": "0.8.0"
   },
-  "gitHead": "67d4fc202427c5b2f387b856cfe9507127a5b26c"
+  "gitHead": "e68f726aa899f75c4d294b11620f343c953a74c3"
 }