create-done-coding 0.4.0 → 0.4.2

package/README.md

@@ -1,6 +1,6 @@
 # create-done-coding
 
-done-coding项目脚手架
+项目创建命令行工具
 
 ## 使用
 

package/es/handler.mjs

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 import { CUSTOM_TEMPLATE_NAME as j } from "./utils/const.mjs";
-import { projectNameForm as E, templateForm as S, templateChoices as x, saveGitHistoryForm as k, shallowCloneForm as F } from "./utils/question.mjs";
+import { projectNameForm as E, getRemoveDirForm as S, getTemplateForm as x, getTemplateChoices as F, saveGitHistoryForm as T, shallowCloneForm as k } from "./utils/question.mjs";
 import n from "prompts";
-import { execSync as a } from "node:child_process";
+import { execSync as c } from "node:child_process";
 import { existsSync as p, rmSync as i, readFileSync as g, writeFileSync as f } from "node:fs";
 import { resolve as M } from "node:path";
 import t from "chalk";
-const b = async (u) => {
+const J = async (u) => {
   const {
     projectName: d,
     template: w,
-    saveGitHistory: y,
-    shallowClone: $
+    saveGitHistory: $,
+    shallowClone: h
   } = u, r = ((d ?? (await n(E)).projectName) || "").trim();
   if (!r.trim()) {
     console.log(t.red("项目名称不能为空"));
@@ -23,17 +23,13 @@ const b = async (u) => {
   }
   const e = M(process.cwd(), r);
   if (p(e)) {
-    const { isRemove: o } = await n({
-      type: "confirm",
-      name: "isRemove",
-      message: "项目已存在，是否删除"
-    });
+    const { isRemove: o } = await n(S());
     if (o === !0)
       i(e, { recursive: !0, force: !0 });
     else
       return console.log(t.red("项目已存在")), process.exit(1);
   }
-  const s = w ?? (await n(S)).template;
+  const s = w ?? (await n(await x())).template;
   let l = "";
   if (s === j) {
     const { customUrl: o } = await n({
@@ -43,31 +39,33 @@ const b = async (u) => {
     });
     l = o;
   } else {
-    const o = x.find((C) => C.name === s);
+    const o = (await F()).find(
+      (C) => C.name === s
+    );
     if (!o)
       return console.log(t.red(`模板${s}不存在`)), process.exit(1);
     if (!o.url)
       return console.log(t.red(`模板${s}仓库地址不存在`)), process.exit(1);
     l = o.url;
   }
-  console.log(t.green("正在初始化项目，请稍等...")), a(`git clone ${l} ${r} --depth=1`);
-  const m = y ?? (await n(k)).saveGitHistory;
+  console.log(t.green("正在初始化项目，请稍等...")), c(`git clone ${l} ${r} --depth=1`);
+  const m = $ ?? (await n(T)).saveGitHistory;
   if (m === !1) {
     const o = `${e}/.git`;
     if (!p(o))
       throw new Error("git目录不存在");
     i(`${e}/.git`, { recursive: !0, force: !0 });
   } else
-    a(`cd ${e} && git remote rename origin upstream`);
-  const h = g(`${e}/package.json`, "utf-8"), c = JSON.parse(h), { name: N } = c;
-  c.name = r, i(`${e}/package.json`), f(
+    c(`cd ${e} && git remote rename origin upstream`);
+  const y = g(`${e}/package.json`, "utf-8"), a = JSON.parse(y), { name: N } = a;
+  a.name = r, i(`${e}/package.json`), f(
     `${e}/package.json`,
-    JSON.stringify(c, null, 2)
+    JSON.stringify(a, null, 2)
   );
   const v = g(`${e}/README.md`, "utf-8").replace(N, r);
-  i(`${e}/README.md`), f(`${e}/README.md`, v), console.log(t.green("项目初始化完成")), m && (($ ? (await n(F)).shallowClone : !1) ? console.log(
+  i(`${e}/README.md`), f(`${e}/README.md`, v), console.log(t.green("项目初始化完成")), m && ((h ? (await n(k)).shallowClone : !1) ? console.log(
     t.yellow("当前使用浅克隆，后续不能与模板git仓库有完整的交互")
-  ) : (a(`cd ${e} && git fetch --unshallow`), console.log(
+  ) : (c(`cd ${e} && git fetch --unshallow`), console.log(
     t.green("已完整克隆项目，后续可以与模板git仓库有完整的交互")
   ))), console.log(
     t.blue(`
@@ -79,5 +77,5 @@ const b = async (u) => {
   );
 };
 export {
-  b as handler
+  J as handler
 };

package/es/index.mjs

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+import { handler as e } from "./handler.mjs";
+import { command as m } from "./main.mjs";
+export {
+  m as command,
+  e as handler
+};

package/es/injectInfo.json.mjs

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+const e = {
+  name: "create-done-coding",
+  version: "0.4.2",
+  description: "项目创建命令行工具"
+};
+export {
+  e as default
+};

package/es/main.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import r from "yargs";
-import { hideBin as a } from "yargs/helpers";
-import { handler as i } from "./handler.mjs";
-import o from "chalk";
-import { getVersion as n } from "./utils/packageInfo.mjs";
-import { projectNameForm as l, templateChoices as m, templateForm as c, saveGitHistoryForm as p, shallowCloneForm as g } from "./utils/question.mjs";
-const d = () => ({
+import c from "yargs";
+import { hideBin as m } from "yargs/helpers";
+import { handler as a } from "./handler.mjs";
+import s from "chalk";
+import { projectNameForm as l, getTemplateChoices as p, getTemplateForm as d, saveGitHistoryForm as g, shallowCloneForm as h } from "./utils/question.mjs";
+import t from "./injectInfo.json.mjs";
+const f = async () => ({
   projectName: {
     type: "string",
     alias: "p",
@@ -14,29 +14,35 @@ const d = () => ({
   template: {
     type: "string",
     alias: "t",
-    choices: m.map((e) => e.name),
-    describe: c.message
+    choices: (await p()).map((e) => e.name),
+    describe: (await d()).message
   },
   saveGitHistory: {
     type: "boolean",
     alias: "s",
-    describe: p.message
+    describe: g.message
   },
   shallowClone: {
     type: "boolean",
     alias: "c",
-    describe: g.message,
+    describe: h.message,
     default: !0
   }
-}), h = (e, s) => {
-  console.log(e ? o.red(e) : o.red(s.message)), process.exit(1);
-}, f = "Usage: $0 [options]", v = (e, s) => {
-  const t = d();
-  return e.strict().usage(s).help("help").version(n()).alias("v", "version").alias("h", "help").options(t).fail(h).argv;
-}, H = async () => {
-  const e = r(a(process.argv)), s = await v(e, f);
-  return i(s);
+}), r = "create", y = (e, o) => {
+  console.log(e ? s.red(e) : s.red(o.message)), process.exit(1);
+}, b = t.description, u = `Usage: $0 ${r} [options]`, v = "Usage: $0 [options]", i = async (e, o) => {
+  const n = await f();
+  return e.strict().usage(o).help("help").version(t.version).alias("v", "version").alias("h", "help").options(n).fail(y).argv;
+}, C = (e) => i(e, u), $ = {
+  command: r,
+  describe: b,
+  builder: C,
+  handler: a
+}, x = async () => {
+  const e = c(m(process.argv)), o = await i(e, v);
+  return a(o);
 };
 export {
-  H as createCli
+  $ as command,
+  x as createCli
 };

package/es/utils/const.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-const o = "git@gitee.com:justsosu/done-coding-cli-config-json.git", n = "自定义模版路径", t = "./config_temp";
+const o = "git@gitee.com:justsosu/done-coding-cli-config-json.git", n = "自定义模版路径", e = "./.create-done-coding_temp";
 export {
   o as CONFIG_GIT_REPO,
   n as CUSTOM_TEMPLATE_NAME,
-  t as READ_CONFIG_TEMPORARY_DIRECTORY
+  e as READ_CONFIG_TEMPORARY_DIRECTORY
 };

package/es/utils/question.mjs

@@ -2,36 +2,38 @@
 import { CUSTOM_TEMPLATE_NAME as o } from "./const.mjs";
 import { readConfig as m } from "./readConfig.mjs";
 let t;
-const a = () => (t || (t = m().templateList), t), s = [
-  ...a(),
-  { name: o }
-], r = {
+const s = async () => (t || (t = (await m()).templateList), t), n = async () => [...await s(), { name: o }], c = {
   type: "text",
   name: "projectName",
   message: "请输入项目名称",
   validate: (e) => e.trim().length > 0 || "项目名称不能为空"
-}, l = {
+}, l = async () => ({
   type: "select",
   name: "template",
   message: "请选择模板",
-  choices: s.map((e) => ({
-    title: e.name,
-    value: e.name
+  choices: (await n()).map((a) => ({
+    title: a.name,
+    value: a.name
   }))
-}, c = {
+}), p = {
   type: "confirm",
   name: "saveGitHistory",
   message: "是否保留git历史"
-}, p = {
+}, g = {
   type: "confirm",
   name: "shallowClone",
   message: "是否使用浅克隆(后续期望与模板git仓库有完整的交互，请选择'N')"
-};
+}, y = (e = "项目已存在，是否删除") => ({
+  type: "confirm",
+  name: "isRemove",
+  message: e
+});
 export {
-  a as getTemplateList,
-  r as projectNameForm,
-  c as saveGitHistoryForm,
-  p as shallowCloneForm,
-  s as templateChoices,
-  l as templateForm
+  y as getRemoveDirForm,
+  n as getTemplateChoices,
+  l as getTemplateForm,
+  s as getTemplateList,
+  c as projectNameForm,
+  p as saveGitHistoryForm,
+  g as shallowCloneForm
 };

package/es/utils/readConfig.mjs

@@ -1,22 +1,28 @@
 #!/usr/bin/env node
-import e from "chalk";
-import { execSync as s } from "node:child_process";
-import t from "node:path";
-import n from "node:fs";
-import { READ_CONFIG_TEMPORARY_DIRECTORY as m, CONFIG_GIT_REPO as f } from "./const.mjs";
-import { getPkgName as p } from "./packageInfo.mjs";
-const d = () => {
-  console.log(e.blue("拉取模板列表，请稍等..."));
-  const r = t.resolve(
+import o from "chalk";
+import { execSync as f } from "node:child_process";
+import s from "node:path";
+import r from "node:fs";
+import { READ_CONFIG_TEMPORARY_DIRECTORY as p, CONFIG_GIT_REPO as l } from "./const.mjs";
+import a from "../injectInfo.json.mjs";
+import { getRemoveDirForm as g } from "./question.mjs";
+import u from "prompts";
+const E = async () => {
+  console.log(o.blue("拉取模板列表，请稍等..."));
+  const e = s.resolve(
     process.cwd(),
-    m
+    p
   );
-  s(`git clone ${f} ${r} --depth=1`);
-  const c = p(), i = t.resolve(r, `${c}.json`), o = JSON.parse(n.readFileSync(i, "utf-8"));
-  if (!Array.isArray(o.templateList))
+  if (console.log(o.blue(`配置目录：${e}`)), r.existsSync(e)) {
+    const i = `${e}目录已存在，是否删除？`, { isRemove: m } = await u(g(i));
+    m ? r.rmSync(e, { recursive: !0, force: !0 }) : (console.log(o.red(`${e}已存在，请手动删除后再试！`)), process.exit(1));
+  }
+  f(`git clone ${l} ${e} --depth=1`);
+  const n = a.name, c = s.resolve(e, `${n}.json`), t = JSON.parse(r.readFileSync(c, "utf-8"));
+  if (!Array.isArray(t.templateList))
     throw new Error("远程配置文件出错，templateList 不是数组");
-  return console.log(e.green("模板列表拉取成功！")), n.rmSync(r, { recursive: !0, force: !0 }), o;
+  return console.log(o.green("模板列表拉取成功！")), r.rmSync(e, { recursive: !0, force: !0 }), t;
 };
 export {
-  d as readConfig
+  E as readConfig
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-done-coding",
-  "version": "0.4.0",
-  "description": "done-coding项目脚手架",
+  "version": "0.4.2",
+  "description": "项目创建命令行工具",
   "module": "es/cli.mjs",
   "type": "module",
   "types": "types/cli.d.ts",
@@ -9,6 +9,10 @@
   "exports": {
     ".": {
       "import": "./es/cli.mjs"
+    },
+    "./assets": {
+      "import": "./es/index.mjs",
+      "types": "./types/index.d.ts"
     }
   },
   "files": [
@@ -34,9 +38,10 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@types/node": "^16.18.58",
+    "@done-coding/cli-inject": "^0.1.1",
+    "@types/node": "^20.0.0",
     "@types/prompts": "^2.4.6",
-    "@types/yargs": "^17.0.33",
+    "@types/yargs": "^17.0.28",
     "rimraf": "^6.0.1",
     "typescript": "^5.2.2",
     "vite": "^4.4.11",
@@ -50,5 +55,5 @@
     "prompts": "^2.4.2",
     "yargs": "^17.7.2"
   },
-  "gitHead": "505e67277f0f24385c0942bbbdbfde17e9076f63"
+  "gitHead": "454bb76eb20c9b732331c273435e0bf56c8c3f25"
 }

package/types/index.d.ts

@@ -0,0 +1,2 @@
+export { handler } from "./handler";
+export { command } from "./main";

package/types/injectInfo.json.d.ts

@@ -0,0 +1,7 @@
+declare const _default: {
+  "name": "create-done-coding",
+  "version": "0.4.2",
+  "description": "项目创建命令行工具"
+};
+
+export default _default;

package/types/utils/const.d.ts

@@ -3,4 +3,4 @@ export declare const CONFIG_GIT_REPO: string;
 /** 自定义模板路径 */
 export declare const CUSTOM_TEMPLATE_NAME = "\u81EA\u5B9A\u4E49\u6A21\u7248\u8DEF\u5F84";
 /** 临时目录 */
-export declare const READ_CONFIG_TEMPORARY_DIRECTORY = "./config_temp";
+export declare const READ_CONFIG_TEMPORARY_DIRECTORY = "./.create-done-coding_temp";

package/types/utils/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./readConfig";
-export * from "./packageInfo";
 export * from "./const";
 export * from "./types";
 export * from "./question";

package/types/utils/question.d.ts

@@ -5,11 +5,11 @@ export interface TemplateChoiceItem {
     url?: string;
 }
 /** 获取模版选项 */
-export declare const getTemplateList: () => TemplateChoiceItem[];
+export declare const getTemplateList: () => Promise<TemplateChoiceItem[]>;
 /** 模版选项 */
-export declare const templateChoices: TemplateChoiceItem[];
+export declare const getTemplateChoices: () => Promise<TemplateChoiceItem[]>;
 export declare const projectNameForm: PromptObject<string>;
-export declare const templateForm: PromptObject<string>;
+export declare const getTemplateForm: () => Promise<PromptObject<string>>;
 export declare const saveGitHistoryForm: {
     type: "confirm";
     name: string;
@@ -20,3 +20,9 @@ export declare const shallowCloneForm: {
     name: string;
     message: string;
 };
+/** 获取删除目录的表单 */
+export declare const getRemoveDirForm: (message?: string) => {
+    type: "confirm";
+    name: string;
+    message: string;
+};

package/types/utils/readConfig.d.ts

@@ -1,7 +1,7 @@
-import type { TemplateChoiceItem } from "./question";
+import { type TemplateChoiceItem } from "./question";
 /** 配置文件 */
 export interface ConfigJson {
     templateList: TemplateChoiceItem[];
 }
 /** 读取配置 */
-export declare const readConfig: () => ConfigJson;
+export declare const readConfig: () => Promise<ConfigJson>;

package/es/utils/packageInfo.mjs

@@ -1,15 +0,0 @@
-#!/usr/bin/env node
-import n, { dirname as t } from "node:path";
-import o from "node:fs";
-import { fileURLToPath as a } from "node:url";
-const i = a(import.meta.url), m = t(i), r = () => {
-  const e = o.readFileSync(
-    n.join(m, "../../package.json"),
-    "utf-8"
-  );
-  return JSON.parse(e);
-}, f = () => r().version, g = () => r().name;
-export {
-  g as getPkgName,
-  f as getVersion
-};

package/types/utils/packageInfo.d.ts

@@ -1,9 +0,0 @@
-/** 包信息 */
-export interface PackageInfo {
-    name: string;
-    version: string;
-}
-/** 获取版本号 */
-export declare const getVersion: () => string;
-/** 获取包名 */
-export declare const getPkgName: () => string;