create-done-coding 0.4.8 → 0.5.0

package/es/handler.mjs

@@ -1,81 +1,97 @@
 #!/usr/bin/env node
-import { CUSTOM_TEMPLATE_NAME as j } from "./utils/const.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 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 { CUSTOM_TEMPLATE_NAME as $ } from "./utils/const.mjs";
+import { projectNameForm as h, getRemoveDirForm as y, getTemplateForm as N, getTemplateChoices as T, saveGitHistoryForm as G } from "./utils/question.mjs";
+import r from "prompts";
+import { execSync as g } from "node:child_process";
+import { existsSync as p, rmSync as l } from "node:fs";
+import f, { resolve as j } from "node:path";
 import t from "chalk";
-const J = async (u) => {
-  const {
-    projectName: d,
-    template: w,
-    saveGitHistory: $,
-    shallowClone: h
-  } = u, r = ((d ?? (await n(E)).projectName) || "").trim();
-  if (!r.trim()) {
+import { getConfigPath as x, batchHandler as R } from "@done-coding/cli-template";
+import { lookForParentTarget as C } from "@done-coding/node-tools";
+const k = async (u) => {
+  const { projectName: d, template: v } = u, o = ((d ?? (await r(h)).projectName) || "").trim();
+  if (!o.trim()) {
     console.log(t.red("项目名称不能为空"));
     return;
   }
-  if (r.includes(" ") || r.includes("\\") || r.includes("/")) {
+  if (o.includes(" ") || o.includes("\\") || o.includes("/")) {
     console.log(t.red("项目名称不能包含空格或者\\或者/"));
     return;
   }
-  const e = M(process.cwd(), r);
-  if (p(e)) {
-    const { isRemove: o } = await n(S());
-    if (o === !0)
-      i(e, { recursive: !0, force: !0 });
+  const i = j(process.cwd(), o);
+  if (p(i)) {
+    const { isRemove: e } = await r(y());
+    if (e === !0)
+      l(i, { recursive: !0, force: !0 });
     else
       return console.log(t.red("项目已存在")), process.exit(1);
   }
-  const s = w ?? (await n(await x())).template;
-  let l = "";
-  if (s === j) {
-    const { customUrl: o } = await n({
+  const n = v ?? (await r(await N())).template;
+  let c = "";
+  if (n === $) {
+    const { customUrl: e } = await r({
       type: "text",
       name: "customUrl",
       message: "请输入自定义模板路径"
     });
-    l = o;
+    c = e;
   } else {
-    const o = (await F()).find(
-      (C) => C.name === s
+    const e = (await T()).find(
+      (s) => s.name === n
     );
-    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;
+    if (!e)
+      return console.log(t.red(`模板${n}不存在`)), process.exit(1);
+    if (!e.url)
+      return console.log(t.red(`模板${n}仓库地址不存在`)), process.exit(1);
+    c = e.url;
   }
-  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))
+  const m = C(".git");
+  console.log(t.green("正在初始化项目，请稍等...")), g(`git clone ${c} ${o} --depth=1`);
+  const a = x(i);
+  if (a) {
+    await R({
+      rootDir: i
+    });
+    const { isRemoveTemplateConfig: e } = await r({
+      type: "confirm",
+      name: "isRemoveTemplateConfig",
+      message: `已成功将模板项目配置注入到当前项目，是否删除模板项目配置文件(${a})`
+    });
+    e && l(a, { force: !0 });
+  }
+  if (console.log(t.green("项目初始化完成")), m) {
+    const e = f.resolve(i), s = f.resolve(e, ".git");
+    if (!p(s))
       throw new Error("git目录不存在");
-    i(`${e}/.git`, { recursive: !0, force: !0 });
+    const { isRemoveGit: w } = await r({
+      type: "confirm",
+      name: "isRemoveGit",
+      message: `项目创建在父级git仓库${m}中，是否删除${o}目录下的.git(${s})`
+    });
+    w ? (l(s, { recursive: !0, force: !0 }), console.log(t.green("已删除当前项目git目录"))) : console.log(
+      t.yellow(
+        `项目创建在父级git仓库${m}中，请手动删除${o}目录下的.git(${s})，否则会影响后续的git操作`
+      )
+    );
   } else
-    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(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 && ((h ? (await n(k)).shallowClone : !1) ? console.log(
-    t.yellow("当前使用浅克隆，后续不能与模板git仓库有完整的交互")
-  ) : (c(`cd ${e} && git fetch --unshallow`), console.log(
-    t.green("已完整克隆项目，后续可以与模板git仓库有完整的交互")
-  ))), console.log(
+    (await r(G)).saveGitHistory && (g(
+      `cd ${i} && git remote rename origin upstream && git fetch --unshallow`
+    ), console.log(
+      t.green(
+        "已经将origin重命名为upstream，后续可以与模板git仓库有完整的交互"
+      )
+    ), console.log(
+      t.green("已保存git历史记录，后续可以与模板git仓库有完整的交互")
+    ));
+  console.log(
     t.blue(`
 使用步骤: 
-  1. cd ${r}
+  1. cd ${o}
   2. pnpm install
   3. pnpm run dev
   `)
   );
 };
 export {
-  J as handler
+  k as handler
 };

package/es/injectInfo.json.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 const e = {
-  version: "0.4.8",
+  version: "0.5.0",
   name: "create-done-coding",
   description: "项目创建命令行工具",
   cliConfig: {

package/es/main.mjs

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

package/es/utils/question.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-done-coding",
-  "version": "0.4.8",
+  "version": "0.5.0",
   "description": "项目创建命令行工具",
   "module": "es/index.mjs",
   "type": "module",
@@ -38,7 +38,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.4.0",
+    "@done-coding/cli-inject": "^0.4.1",
     "@types/node": "^18.0.0",
     "@types/prompts": "^2.4.6",
     "@types/yargs": "^17.0.28",
@@ -51,9 +51,11 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
+    "@done-coding/cli-template": "^0.4.0",
+    "@done-coding/node-tools": "^0.0.1",
     "chalk": "^5.3.0",
     "prompts": "^2.4.2",
     "yargs": "^17.7.2"
   },
-  "gitHead": "b3311b79a55322e4689718d59c072388e2866e17"
+  "gitHead": "1778df27cf625b5588b1de38d260cfed75e123f2"
 }

package/types/injectInfo.json.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-  "version": "0.4.8",
+  "version": "0.5.0",
   "name": "create-done-coding",
   "description": "项目创建命令行工具",
   "cliConfig": {

package/types/utils/question.d.ts

@@ -14,6 +14,7 @@ export declare const saveGitHistoryForm: {
     type: "confirm";
     name: string;
     message: string;
+    initial: boolean;
 };
 export declare const shallowCloneForm: {
     type: "confirm";

package/types/utils/types.d.ts

@@ -3,8 +3,4 @@ export interface Options {
     projectName: string;
     /** 项目模板 */
     template: string;
-    /** 保存git历史记录 */
-    saveGitHistory: boolean;
-    /** 是否使用shallow clone */
-    shallowClone: boolean;
 }