create-done-coding 0.6.0 → 0.7.0

package/es/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as r } from "./index-1b9ce6b1.js";
+import { c as r } from "./index-8034b5bc.js";
 import "chalk";
 import "node:child_process";
 import "node:path";
@@ -7,6 +7,7 @@ import "node:fs";
 import "prompts";
 import "@done-coding/cli-template";
 import "@done-coding/node-tools";
+import "@done-coding/cli-git";
 import "yargs";
 import "yargs/helpers";
 r();

package/es/{index-1b9ce6b1.js → index-8034b5bc.js}

@@ -1,62 +1,67 @@
 #!/usr/bin/env node
 import t from "chalk";
-import { execSync as m } from "node:child_process";
-import l, { resolve as b } from "node:path";
-import p, { existsSync as N, rmSync as f } from "node:fs";
+import { execSync as l } from "node:child_process";
+import g, { resolve as P } from "node:path";
+import u, { existsSync as N, rmSync as d } from "node:fs";
 import a from "prompts";
-import { getConfigPath as P, batchHandler as S } from "@done-coding/cli-template";
-import { lookForParentTarget as F } from "@done-coding/node-tools";
+import { getConfigPath as _, batchHandler as S } from "@done-coding/cli-template";
+import { lookForParentTarget as U } from "@done-coding/node-tools";
+import { getTargetRepoUrl as b } from "@done-coding/cli-git";
 import I from "yargs";
 import { hideBin as L } from "yargs/helpers";
-const O = "git@gitee.com:justsosu/done-coding-cli-config-json.git", C = "自定义模版路径", U = "./.create-done-coding_temp", u = {
-  version: "0.6.0",
+const p = {
+  version: "0.7.0",
   name: "create-done-coding",
   description: "项目创建命令行工具",
   cliConfig: {
     namespaceDir: ".done-coding",
     moduleName: "create"
   }
-};
+}, F = "git@gitee.com:justsosu/done-coding-cli-config-json.git", C = "自定义模版路径", j = "某个git平台用户仓库", A = `./.${p.name}_temp`;
 let w;
-const _ = async () => (w || (w = (await A()).templateList), w), $ = async () => [...await _(), { name: C }], j = {
+const H = async () => (w || (w = (await k()).templateList), w), $ = async () => [
+  ...await H(),
+  { name: C },
+  { name: j }
+], R = {
   type: "text",
   name: "projectName",
   message: "请输入项目名称",
   validate: (e) => e.trim().length > 0 || "项目名称不能为空"
-}, G = async () => ({
+}, T = async () => ({
   type: "select",
   name: "template",
   message: "请选择模板",
-  choices: (await $()).map((s) => ({
-    title: s.name,
-    value: s.name
+  choices: (await $()).map((i) => ({
+    title: i.name,
+    value: i.name
   }))
-}), H = {
+}), M = {
   type: "confirm",
   name: "saveGitHistory",
   message: "是否保留git历史",
   initial: !1
-}, R = (e = "项目已存在，是否删除") => ({
+}, E = (e = "项目已存在，是否删除") => ({
   type: "confirm",
   name: "isRemove",
   message: e
-}), A = async () => {
+}), k = async () => {
   console.log(t.blue("拉取模板列表，请稍等..."));
-  const e = l.resolve(
+  const e = g.resolve(
     process.cwd(),
-    U
+    A
   );
-  if (console.log(t.blue(`配置临时目录：${e}`)), p.existsSync(e)) {
-    const o = `${e}目录已存在，是否删除？`, { isRemove: r } = await a(R(o));
-    r ? p.rmSync(e, { recursive: !0, force: !0 }) : (console.log(t.red(`${e}已存在，请手动删除后再试！`)), process.exit(1));
+  if (console.log(t.blue(`配置临时目录：${e}`)), u.existsSync(e)) {
+    const o = `${e}目录已存在，是否删除？`, { isRemove: r } = await a(E(o));
+    r ? u.rmSync(e, { recursive: !0, force: !0 }) : (console.log(t.red(`${e}已存在，请手动删除后再试！`)), process.exit(1));
   }
-  m(`git clone ${O} ${e} --depth=1`);
-  const s = u.name, c = l.resolve(e, `${s}.json`), d = JSON.parse(p.readFileSync(c, "utf-8"));
-  if (!Array.isArray(d.templateList))
+  l(`git clone ${F} ${e} --depth=1`);
+  const i = p.name, c = g.resolve(e, `${i}.json`), v = JSON.parse(u.readFileSync(c, "utf-8"));
+  if (!Array.isArray(v.templateList))
     throw new Error("远程配置文件出错，templateList 不是数组");
-  return console.log(t.green("模板列表拉取成功！")), p.rmSync(e, { recursive: !0, force: !0 }), d;
-}, T = async (e) => {
-  const { projectName: s, template: c } = e, o = ((s ?? (await a(j)).projectName) || "").trim();
+  return console.log(t.green("模板列表拉取成功！")), u.rmSync(e, { recursive: !0, force: !0 }), v;
+}, G = async (e) => {
+  const { projectName: i, template: c } = e, o = ((i ?? (await a(R)).projectName) || "").trim();
   if (!o.trim()) {
     console.log(t.red("项目名称不能为空"));
     return;
@@ -65,36 +70,39 @@ const _ = async () => (w || (w = (await A()).templateList), w), $ = async () =>
     console.log(t.red("项目名称不能包含空格或者\\或者/"));
     return;
   }
-  const r = b(process.cwd(), o);
+  const r = P(process.cwd(), o);
   if (N(r)) {
-    const { isRemove: i } = await a(R());
-    if (i === !0)
-      f(r, { recursive: !0, force: !0 });
+    const { isRemove: s } = await a(E());
+    if (s === !0)
+      d(r, { recursive: !0, force: !0 });
     else
       return console.log(t.red("项目已存在")), process.exit(1);
   }
-  const g = c ?? (await a(await G())).template;
-  let v = "";
-  if (g === C) {
-    const { customUrl: i } = await a({
+  const m = c ?? (await a(await T())).template;
+  let f = "";
+  if (m === C) {
+    const { customUrl: s } = await a({
       type: "text",
       name: "customUrl",
       message: "请输入自定义模板路径"
     });
-    v = i;
-  } else {
-    const i = (await $()).find(
-      (n) => n.name === g
+    f = s;
+  }
+  if (m === j)
+    f = await b();
+  else {
+    const s = (await $()).find(
+      (n) => n.name === m
     );
-    if (!i)
-      return console.log(t.red(`模板${g}不存在`)), process.exit(1);
-    if (!i.url)
-      return console.log(t.red(`模板${g}仓库地址不存在`)), process.exit(1);
-    v = i.url;
+    if (!s)
+      return console.log(t.red(`模板${m}不存在`)), process.exit(1);
+    if (!s.url)
+      return console.log(t.red(`模板${m}仓库地址不存在`)), process.exit(1);
+    f = s.url;
   }
-  const y = F(".git");
-  console.log(t.green("正在初始化项目，请稍等...")), m(`git clone ${v} ${o} --depth=1`);
-  const h = P(r);
+  const y = U(".git");
+  console.log(t.green("正在初始化项目，请稍等...")), l(`git clone ${f} ${o} --depth=1`);
+  const h = _(r);
   if (h) {
     await S({
       rootDir: r,
@@ -102,32 +110,32 @@ const _ = async () => (w || (w = (await A()).templateList), w), $ = async () =>
         $projectName: o
       }
     });
-    const { isRemoveTemplateConfig: i } = await a({
+    const { isRemoveTemplateConfig: s } = await a({
       type: "confirm",
       name: "isRemoveTemplateConfig",
       message: `已成功将模板项目配置注入到当前项目，是否删除模板项目配置文件(${h})`,
       initial: !0
     });
-    i && f(h, { force: !0 });
+    s && d(h, { force: !0 });
   }
   if (console.log(t.green("项目初始化完成")), y) {
-    const i = l.resolve(r), n = l.resolve(i, ".git");
+    const s = g.resolve(r), n = g.resolve(s, ".git");
     if (!N(n))
       throw new Error("git目录不存在");
-    const { isRemoveGit: E } = await a({
+    const { isRemoveGit: O } = await a({
       type: "confirm",
       name: "isRemoveGit",
       message: `项目创建在父级git仓库${y}中，是否删除${o}目录下的.git(${n})`,
       initial: !0
     });
-    E ? (f(n, { recursive: !0, force: !0 }), console.log(t.green("已删除当前项目git目录"))) : console.log(
+    O ? (d(n, { recursive: !0, force: !0 }), console.log(t.green("已删除当前项目git目录"))) : console.log(
       t.yellow(
         `项目创建在父级git仓库${y}中，请手动删除${o}目录下的.git(${n})，否则会影响后续的git操作`
       )
     );
   } else {
-    if ((await a(H)).saveGitHistory)
-      m(
+    if ((await a(M)).saveGitHistory)
+      l(
         `cd ${r} && git remote rename origin upstream && git fetch --unshallow`
       ), console.log(
         t.green(
@@ -137,10 +145,10 @@ const _ = async () => (w || (w = (await A()).templateList), w), $ = async () =>
         t.green("已保存git历史记录，后续可以与模板git仓库有完整的交互")
       );
     else {
-      const n = l.resolve(r, ".git");
-      f(n, { recursive: !0, force: !0 }), m(`cd ${r} && git init`);
+      const n = g.resolve(r, ".git");
+      d(n, { recursive: !0, force: !0 }), l(`cd ${r} && git init`);
     }
-    m(
+    l(
       `cd ${r} && git add . && git commit -m '初始化${o}'`
     );
   }
@@ -152,34 +160,34 @@ const _ = async () => (w || (w = (await A()).templateList), w), $ = async () =>
   3. pnpm run dev
   `)
   );
-}, M = async () => ({
+}, B = async () => ({
   projectName: {
     type: "string",
     alias: "p",
-    describe: j.message
+    describe: R.message
   },
   template: {
     type: "string",
     alias: "t",
     choices: (await $()).map((e) => e.name),
-    describe: (await G()).message
+    describe: (await T()).message
   }
-}), x = u.cliConfig.moduleName, k = (e, s) => {
-  console.log(e ? t.red(e) : t.red(s.message)), process.exit(1);
-}, Y = u.description, B = `Usage: $0 ${x} [options]`, J = "Usage: $0 [options]", D = async (e, s) => {
-  const c = await M();
-  return e.strict().usage(s).help("help").version(u.version).alias("v", "version").alias("h", "help").options(c).fail(k).argv;
-}, q = (e) => D(e, B), oe = {
+}), x = p.cliConfig.moduleName, Y = (e, i) => {
+  console.log(e ? t.red(e) : t.red(i.message)), process.exit(1);
+}, J = p.description, q = `Usage: $0 ${x} [options]`, z = "Usage: $0 [options]", D = async (e, i) => {
+  const c = await B();
+  return e.strict().usage(i).help("help").version(p.version).alias("v", "version").alias("h", "help").options(c).fail(Y).argv;
+}, K = (e) => D(e, q), re = {
   command: x,
-  describe: Y,
-  builder: q,
-  handler: T
-}, se = async () => {
-  const e = I(L(process.argv)), s = await D(e, J);
-  return T(s);
+  describe: J,
+  builder: K,
+  handler: G
+}, ne = async () => {
+  const e = I(L(process.argv)), i = await D(e, z);
+  return G(i);
 };
 export {
-  oe as a,
-  se as c,
-  T as h
+  re as a,
+  ne as c,
+  G as h
 };

package/es/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as h, h as b } from "./index-1b9ce6b1.js";
+import { a as b, h as c } from "./index-8034b5bc.js";
 import "chalk";
 import "node:child_process";
 import "node:path";
@@ -7,9 +7,10 @@ import "node:fs";
 import "prompts";
 import "@done-coding/cli-template";
 import "@done-coding/node-tools";
+import "@done-coding/cli-git";
 import "yargs";
 import "yargs/helpers";
 export {
-  h as command,
-  b as handler
+  b as command,
+  c as handler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-done-coding",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "项目创建命令行工具",
   "module": "es/index.mjs",
   "type": "module",
@@ -38,7 +38,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.4.4",
+    "@done-coding/cli-inject": "^0.4.5",
     "@types/node": "^18.0.0",
     "@types/prompts": "^2.4.6",
     "@types/yargs": "^17.0.28",
@@ -51,11 +51,12 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-template": "^0.5.0",
-    "@done-coding/node-tools": "^0.0.3",
+    "@done-coding/cli-git": "^0.1.0",
+    "@done-coding/cli-template": "^0.5.1",
+    "@done-coding/node-tools": "^0.1.0",
     "chalk": "^5.3.0",
     "prompts": "^2.4.2",
     "yargs": "^17.7.2"
   },
-  "gitHead": "383ec04131808af21ca8fdf3652daa48d86cab1c"
+  "gitHead": "465ac238437ab8bd3803c5e6fe8ac5a30bc445f3"
 }

package/types/injectInfo.json.d.ts

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

package/types/utils/const.d.ts

@@ -2,5 +2,7 @@
 export declare const CONFIG_GIT_REPO: string;
 /** 自定义模板路径 */
 export declare const CUSTOM_TEMPLATE_NAME = "\u81EA\u5B9A\u4E49\u6A21\u7248\u8DEF\u5F84";
+/** 某个公共仓库 */
+export declare const SOMEONE_PUBLIC_REPO_NAME = "\u67D0\u4E2Agit\u5E73\u53F0\u7528\u6237\u4ED3\u5E93";
 /** 临时目录 */
-export declare const READ_CONFIG_TEMPORARY_DIRECTORY = "./.create-done-coding_temp";
+export declare const READ_CONFIG_TEMPORARY_DIRECTORY: string;