create-done-coding 0.11.17 → 0.11.18

package/es/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as m } from "./index-4bae0d72.js";
+import { c as m } from "./index-d1258ba5.js";
 import "@done-coding/cli-utils";
 import "node:child_process";
 import "node:fs";

package/es/{index-4bae0d72.js → index-d1258ba5.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { readCliConfig as To, log as R, HooksNameEnum as v, createSubcommand as St, getRootScriptName as Gn, xPrompts as C, getConfigFileCommonOptions as Tt, addHuskyHooks as Co, initHandlerCommon as Ao, readConfigFile as ge, lookForParentTarget as qn, decryptAES as $o, encryptAES as No, getCurrentBranchName as Po, getCommitByHookName as jo, resolveMergeInfoByGitReflogAction as xo, checkCurrentIsRebasing as Fo, resolveMergeInfoByCommitMsg as Bo, getCurrentBranchLastCommitList as Uo, getLastReflogList as Do, createMainCommand as Lo } from "@done-coding/cli-utils";
+import { readCliConfig as To, log as R, HooksNameEnum as v, createSubcommand as St, getRootScriptName as Gn, xPrompts as T, getConfigFileCommonOptions as Tt, addHuskyHooks as Co, initHandlerCommon as Ao, readConfigFile as ge, lookForParentTarget as qn, decryptAES as $o, encryptAES as No, getCurrentBranchName as Po, getCommitByHookName as jo, resolveMergeInfoByGitReflogAction as xo, checkCurrentIsRebasing as Fo, resolveMergeInfoByCommitMsg as Bo, getCurrentBranchLastCommitList as Uo, getLastReflogList as Do, createMainCommand as Lo } from "@done-coding/cli-utils";
 import { execSync as Y } from "node:child_process";
 import gt, { existsSync as on, rmSync as je } from "node:fs";
 import Ee, { resolve as Io } from "node:path";
@@ -7,7 +7,7 @@ import { getConfigPath as Mo, batchCompileHandler as ko, MODULE_DEFAULT_CONFIG_R
 import { getTargetRepoUrl as Go } from "@done-coding/cli-git";
 const Kn = "自定义模版路径", Wn = "某个git平台用户仓库", se = {
   name: "create-done-coding",
-  version: "0.11.17",
+  version: "0.11.18",
   description: "项目创建命令行工具",
   bin: "es/cli.mjs",
   cliConfig: {
@@ -319,8 +319,8 @@ function zs(e, t, n, r) {
     for (; ++o < a; ) {
       var c = e[o], p = n ? n(c) : c;
       if (c = r || c !== 0 ? c : 0, i && p === p) {
-        for (var g = f; g--; )
-          if (t[g] === p)
+        for (var m = f; m--; )
+          if (t[m] === p)
             continue e;
         u.push(c);
       } else
@@ -774,12 +774,12 @@ function Aa(e, t, n, r) {
   return c;
 }
 function $a(e, t, n, r) {
-  for (var o = -1, s = e.length, i = -1, a = n.length, u = -1, f = t.length, c = Le(s - a, 0), p = Array(c + f), g = !r; ++o < c; )
+  for (var o = -1, s = e.length, i = -1, a = n.length, u = -1, f = t.length, c = Le(s - a, 0), p = Array(c + f), m = !r; ++o < c; )
     p[o] = e[o];
-  for (var m = o; ++u < f; )
-    p[m + u] = t[u];
+  for (var y = o; ++u < f; )
+    p[y + u] = t[u];
   for (; ++i < a; )
-    (g || o < s) && (p[m + n[i]] = e[o++]);
+    (m || o < s) && (p[y + n[i]] = e[o++]);
   return p;
 }
 function Na(e, t) {
@@ -846,13 +846,13 @@ function ja(e, t, n) {
   return o;
 }
 function Ft(e, t, n, r, o, s, i, a, u, f) {
-  var c = t & dr, p = t & z, g = t & Je, m = t & (K | be), h = t & mr, y = g ? void 0 : ve(e);
+  var c = t & dr, p = t & z, m = t & Je, y = t & (K | be), h = t & mr, g = m ? void 0 : ve(e);
   function d() {
     for (var b = arguments.length, E = Array(b), O = b; O--; )
       E[O] = arguments[O];
-    if (m)
+    if (y)
       var $ = Or(d), S = Ea(E, $);
-    if (r && (E = Aa(E, r, o, m)), s && (E = $a(E, s, i, m)), b -= S, m && b < f) {
+    if (r && (E = Aa(E, r, o, y)), s && (E = $a(E, s, i, y)), b -= S, y && b < f) {
       var F = yr(E, $);
       return Rr(
         e,
@@ -867,27 +867,27 @@ function Ft(e, t, n, r, o, s, i, a, u, f) {
         f - b
       );
     }
-    var B = p ? n : this, I = g ? B[e] : e;
-    return b = E.length, a ? E = Ia(E, a) : h && b > 1 && E.reverse(), c && u < b && (E.length = u), this && this !== $e && this instanceof d && (I = y || ve(I)), I.apply(B, E);
+    var B = p ? n : this, I = m ? B[e] : e;
+    return b = E.length, a ? E = Ia(E, a) : h && b > 1 && E.reverse(), c && u < b && (E.length = u), this && this !== $e && this instanceof d && (I = g || ve(I)), I.apply(B, E);
   }
   return d;
 }
 function xa(e, t, n, r) {
   var o = t & z, s = ve(e);
   function i() {
-    for (var a = -1, u = arguments.length, f = -1, c = r.length, p = Array(c + u), g = this && this !== $e && this instanceof i ? s : e; ++f < c; )
+    for (var a = -1, u = arguments.length, f = -1, c = r.length, p = Array(c + u), m = this && this !== $e && this instanceof i ? s : e; ++f < c; )
       p[f] = r[f];
     for (; u--; )
       p[f++] = arguments[++a];
-    return gr(g, o ? n : this, p);
+    return gr(m, o ? n : this, p);
   }
   return i;
 }
 function Rr(e, t, n, r, o, s, i, a, u, f) {
-  var c = t & K, p = c ? i : void 0, g = c ? void 0 : i, m = c ? s : void 0, h = c ? void 0 : s;
+  var c = t & K, p = c ? i : void 0, m = c ? void 0 : i, y = c ? s : void 0, h = c ? void 0 : s;
   t |= c ? te : we, t &= ~(c ? we : te), t & Wi || (t &= ~(z | Je));
-  var y = n(e, t, o, m, p, h, g, a, u, f);
-  return y.placeholder = r, wr(y, e, t);
+  var g = n(e, t, o, y, p, h, m, a, u, f);
+  return g.placeholder = r, wr(g, e, t);
 }
 function Fa(e, t, n, r, o, s, i, a) {
   var u = t & Je;
@@ -898,7 +898,7 @@ function Fa(e, t, n, r, o, s, i, a) {
     var c = r, p = o;
     r = o = void 0;
   }
-  var g = [
+  var m = [
     e,
     t,
     n,
@@ -910,11 +910,11 @@ function Fa(e, t, n, r, o, s, i, a) {
     i,
     a
   ];
-  if (e = g[0], t = g[1], n = g[2], r = g[3], o = g[4], a = g[9] = g[9] == null ? u ? 0 : e.length : Le(g[9] - f, 0), !a && t & (K | be) && (t &= ~(K | be)), !t || t == z)
-    var m = Pa(e, t, n);
+  if (e = m[0], t = m[1], n = m[2], r = m[3], o = m[4], a = m[9] = m[9] == null ? u ? 0 : e.length : Le(m[9] - f, 0), !a && t & (K | be) && (t &= ~(K | be)), !t || t == z)
+    var y = Pa(e, t, n);
   else
-    t == K || t == be ? m = ja(e, t, a) : (t == te || t == (z | te)) && !o.length ? m = xa(e, t, n, r) : m = Ft.apply(void 0, g);
-  return wr(m, e, t);
+    t == K || t == be ? y = ja(e, t, a) : (t == te || t == (z | te)) && !o.length ? y = xa(e, t, n, r) : y = Ft.apply(void 0, m);
+  return wr(y, e, t);
 }
 function Or(e) {
   var t = e;
@@ -1088,38 +1088,38 @@ class Ya {
       });
       if (c)
         return c;
-      const g = {
+      const m = {
         uiConfig: u,
         cacheConfig: f
-      }, m = {
+      }, y = {
         ...a,
         BASE_PATH: this.basePath,
         TIMEOUT: this.timeout,
         debug: r
       };
       try {
-        const h = await this.issue(m, g);
+        const h = await this.issue(y, m);
         return p == null || p(h, f), h;
       } catch (h) {
-        const y = await Za(() => {
+        const g = await Za(() => {
           var d;
           return r && P({
             stage: N.DEAL_ERROR,
             data: h
           }), ((d = this.beforeError) == null ? void 0 : d.call(this, h, {
             apiConfig: n,
-            extendConfig: g
+            extendConfig: m
           })) || {
             canShowErrorToast: !0,
             newError: h
           };
         }, r);
-        if (y.reload)
+        if (g.reload)
           return r && P({
             stage: N.DEAL_ERROR_RESULT_RELOAD
           }), this.request(n, r);
         {
-          const { newError: d, canShowErrorToast: b = !0 } = y;
+          const { newError: d, canShowErrorToast: b = !0 } = g;
           b && (u.errorToast ?? !0) && ((o = this.showToast) == null || o.call(this, d.message));
           let E;
           return d instanceof re ? E = d : d.isBusinessError ? E = new Jn(d) : E = new Re(d), r && P({
@@ -1380,8 +1380,8 @@ function Jc(e, t, n, r) {
     for (; ++o < a; ) {
       var c = e[o], p = n ? n(c) : c;
       if (c = r || c !== 0 ? c : 0, i && p === p) {
-        for (var g = f; g--; )
-          if (t[g] === p)
+        for (var m = f; m--; )
+          if (t[m] === p)
             continue e;
         u.push(c);
       } else
@@ -1799,25 +1799,25 @@ const yl = /* @__PURE__ */ vr(gl), qr = ({
     ...a,
     basePath: e,
     timeout: t,
-    issue: ({ TIMEOUT: c, DEBUG: p, ...g }) => u({
+    issue: ({ TIMEOUT: c, DEBUG: p, ...m }) => u({
       timeout: c,
-      ..._u(g, ["BASE_PATH"])
-    }).then((m) => _i(m, a, p)).catch((m) => {
-      if (m instanceof re)
+      ..._u(m, ["BASE_PATH"])
+    }).then((y) => _i(y, a, p)).catch((y) => {
+      if (y instanceof re)
         return p && P(
           {
             stage: N.NETWORK_ERROR_ORIGIN,
-            data: m
+            data: y
           },
           H.ERROR
-        ), Promise.reject(m);
-      const { response: h, request: y } = m;
+        ), Promise.reject(y);
+      const { response: h, request: g } = y;
       let d, b;
-      h ? (d = h.status, b = h.statusText) : y ? (d = M.NO_RESPONSE, i.isAxiosError(m) ? m.message.includes("timeout of") ? (d = M.NO_RESPONSE_TIMEOUT, b = "请求超时") : yl(globalThis, "navigator.onLine") === !1 ? (d = M.NO_RESPONSE_OFFLINE, b = "网络未连接") : b = m.message : b = _e(m) ?? "未响应") : (d = M.REQUEST_ERROR, b = _e(m) ?? "发起请求出错");
+      h ? (d = h.status, b = h.statusText) : g ? (d = M.NO_RESPONSE, i.isAxiosError(y) ? y.message.includes("timeout of") ? (d = M.NO_RESPONSE_TIMEOUT, b = "请求超时") : yl(globalThis, "navigator.onLine") === !1 ? (d = M.NO_RESPONSE_OFFLINE, b = "网络未连接") : b = y.message : b = _e(y) ?? "未响应") : (d = M.REQUEST_ERROR, b = _e(y) ?? "发起请求出错");
       const E = new Re({
         code: d,
         message: b,
-        cause: m
+        cause: y
       });
       return p && P(
         {
@@ -2131,8 +2131,8 @@ function rt(e, t, n) {
     metaTokens: !0,
     dots: !1,
     indexes: !1
-  }, !1, function(y, d) {
-    return !l.isUndefined(d[y]);
+  }, !1, function(g, d) {
+    return !l.isUndefined(d[g]);
   });
   const r = n.metaTokens, o = n.visitor || c, s = n.dots, i = n.indexes, u = (n.Blob || typeof Blob < "u" && Blob) && l.isSpecCompliantForm(t);
   if (!l.isFunction(o))
@@ -2146,45 +2146,45 @@ function rt(e, t, n) {
       throw new _("Blob is not supported. Use a Buffer instead.");
     return l.isArrayBuffer(h) || l.isTypedArray(h) ? u && typeof Blob == "function" ? new Blob([h]) : Buffer.from(h) : h;
   }
-  function c(h, y, d) {
+  function c(h, g, d) {
     let b = h;
     if (h && !d && typeof h == "object") {
-      if (l.endsWith(y, "{}"))
-        y = r ? y : y.slice(0, -2), h = JSON.stringify(h);
-      else if (l.isArray(h) && rf(h) || (l.isFileList(h) || l.endsWith(y, "[]")) && (b = l.toArray(h)))
-        return y = eo(y), b.forEach(function(O, $) {
+      if (l.endsWith(g, "{}"))
+        g = r ? g : g.slice(0, -2), h = JSON.stringify(h);
+      else if (l.isArray(h) && rf(h) || (l.isFileList(h) || l.endsWith(g, "[]")) && (b = l.toArray(h)))
+        return g = eo(g), b.forEach(function(O, $) {
           !(l.isUndefined(O) || O === null) && t.append(
             // eslint-disable-next-line no-nested-ternary
-            i === !0 ? $n([y], $, s) : i === null ? y : y + "[]",
+            i === !0 ? $n([g], $, s) : i === null ? g : g + "[]",
             f(O)
           );
         }), !1;
     }
-    return bt(h) ? !0 : (t.append($n(d, y, s), f(h)), !1);
+    return bt(h) ? !0 : (t.append($n(d, g, s), f(h)), !1);
   }
-  const p = [], g = Object.assign(of, {
+  const p = [], m = Object.assign(of, {
     defaultVisitor: c,
     convertValue: f,
     isVisitable: bt
   });
-  function m(h, y) {
+  function y(h, g) {
     if (!l.isUndefined(h)) {
       if (p.indexOf(h) !== -1)
-        throw Error("Circular reference detected in " + y.join("."));
+        throw Error("Circular reference detected in " + g.join("."));
       p.push(h), l.forEach(h, function(b, E) {
         (!(l.isUndefined(b) || b === null) && o.call(
           t,
           b,
           l.isString(E) ? E.trim() : E,
-          y,
-          g
-        )) === !0 && m(b, y ? y.concat(E) : [E]);
+          g,
+          m
+        )) === !0 && y(b, g ? g.concat(E) : [E]);
       }), p.pop();
     }
   }
   if (!l.isObject(e))
     throw new TypeError("data must be an object");
-  return m(e), t;
+  return y(e), t;
 }
 function Nn(e) {
   const t = {
@@ -2307,14 +2307,14 @@ self instanceof WorkerGlobalScope && typeof self.importScripts == "function")(),
   hasStandardBrowserWebWorkerEnv: hf,
   navigator: Rt,
   origin: df
-}, Symbol.toStringTag, { value: "Module" })), T = {
+}, Symbol.toStringTag, { value: "Module" })), C = {
   ...mf,
   ...ff
 };
 function gf(e, t) {
-  return rt(e, new T.classes.URLSearchParams(), Object.assign({
+  return rt(e, new C.classes.URLSearchParams(), Object.assign({
     visitor: function(n, r, o, s) {
-      return T.isNode && l.isBuffer(n) ? (this.append(r, n.toString("base64")), !1) : s.defaultVisitor.apply(this, arguments);
+      return C.isNode && l.isBuffer(n) ? (this.append(r, n.toString("base64")), !1) : s.defaultVisitor.apply(this, arguments);
     }
   }, t));
 }
@@ -2409,8 +2409,8 @@ const Vt = {
   maxContentLength: -1,
   maxBodyLength: -1,
   env: {
-    FormData: T.classes.FormData,
-    Blob: T.classes.Blob
+    FormData: C.classes.FormData,
+    Blob: C.classes.Blob
   },
   validateStatus: function(t) {
     return t >= 200 && t < 300;
@@ -2656,13 +2656,13 @@ function Cf(e, t) {
   return t = t !== void 0 ? t : 1e3, function(u) {
     const f = Date.now(), c = r[s];
     i || (i = f), n[o] = u, r[o] = f;
-    let p = s, g = 0;
+    let p = s, m = 0;
     for (; p !== o; )
-      g += n[p++], p = p % e;
+      m += n[p++], p = p % e;
     if (o = (o + 1) % e, o === s && (s = (s + 1) % e), f - i < t)
       return;
-    const m = c && f - c;
-    return m ? Math.round(g * 1e3 / m) : void 0;
+    const y = c && f - c;
+    return y ? Math.round(m * 1e3 / y) : void 0;
   };
 }
 function Af(e, t) {
@@ -2703,10 +2703,10 @@ const Me = (e, t, n = 3) => {
     total: e,
     loaded: r
   }), t[1]];
-}, Fn = (e) => (...t) => l.asap(() => e(...t)), $f = T.hasStandardBrowserEnv ? ((e, t) => (n) => (n = new URL(n, T.origin), e.protocol === n.protocol && e.host === n.host && (t || e.port === n.port)))(
-  new URL(T.origin),
-  T.navigator && /(msie|trident)/i.test(T.navigator.userAgent)
-) : () => !0, Nf = T.hasStandardBrowserEnv ? (
+}, Fn = (e) => (...t) => l.asap(() => e(...t)), $f = C.hasStandardBrowserEnv ? ((e, t) => (n) => (n = new URL(n, C.origin), e.protocol === n.protocol && e.host === n.host && (t || e.port === n.port)))(
+  new URL(C.origin),
+  C.navigator && /(msie|trident)/i.test(C.navigator.userAgent)
+) : () => !0, Nf = C.hasStandardBrowserEnv ? (
   // Standard browser envs support document.cookie
   {
     write(e, t, n, r, o, s) {
@@ -2747,15 +2747,15 @@ const Bn = (e) => e instanceof j ? { ...e } : e;
 function X(e, t) {
   t = t || {};
   const n = {};
-  function r(f, c, p, g) {
-    return l.isPlainObject(f) && l.isPlainObject(c) ? l.merge.call({ caseless: g }, f, c) : l.isPlainObject(c) ? l.merge({}, c) : l.isArray(c) ? c.slice() : c;
+  function r(f, c, p, m) {
+    return l.isPlainObject(f) && l.isPlainObject(c) ? l.merge.call({ caseless: m }, f, c) : l.isPlainObject(c) ? l.merge({}, c) : l.isArray(c) ? c.slice() : c;
   }
-  function o(f, c, p, g) {
+  function o(f, c, p, m) {
     if (l.isUndefined(c)) {
       if (!l.isUndefined(f))
-        return r(void 0, f, p, g);
+        return r(void 0, f, p, m);
     } else
-      return r(f, c, p, g);
+      return r(f, c, p, m);
   }
   function s(f, c) {
     if (!l.isUndefined(c))
@@ -2806,8 +2806,8 @@ function X(e, t) {
     headers: (f, c, p) => o(Bn(f), Bn(c), p, !0)
   };
   return l.forEach(Object.keys(Object.assign({}, e, t)), function(c) {
-    const p = u[c] || o, g = p(e[c], t[c], c);
-    l.isUndefined(g) && p !== a || (n[c] = g);
+    const p = u[c] || o, m = p(e[c], t[c], c);
+    l.isUndefined(m) && p !== a || (n[c] = m);
   }), n;
 }
 const co = (e) => {
@@ -2819,14 +2819,14 @@ const co = (e) => {
   );
   let u;
   if (l.isFormData(n)) {
-    if (T.hasStandardBrowserEnv || T.hasStandardBrowserWebWorkerEnv)
+    if (C.hasStandardBrowserEnv || C.hasStandardBrowserWebWorkerEnv)
       i.setContentType(void 0);
     else if ((u = i.getContentType()) !== !1) {
       const [f, ...c] = u ? u.split(";").map((p) => p.trim()).filter(Boolean) : [];
       i.setContentType([f || "multipart/form-data", ...c].join("; "));
     }
   }
-  if (T.hasStandardBrowserEnv && (r && l.isFunction(r) && (r = r(t)), r || r !== !1 && $f(t.url))) {
+  if (C.hasStandardBrowserEnv && (r && l.isFunction(r) && (r = r(t)), r || r !== !1 && $f(t.url))) {
     const f = o && s && Nf.read(s);
     f && i.set(o, f);
   }
@@ -2836,9 +2836,9 @@ const co = (e) => {
     const o = co(e);
     let s = o.data;
     const i = j.from(o.headers).normalize();
-    let { responseType: a, onUploadProgress: u, onDownloadProgress: f } = o, c, p, g, m, h;
-    function y() {
-      m && m(), h && h(), o.cancelToken && o.cancelToken.unsubscribe(c), o.signal && o.signal.removeEventListener("abort", c);
+    let { responseType: a, onUploadProgress: u, onDownloadProgress: f } = o, c, p, m, y, h;
+    function g() {
+      y && y(), h && h(), o.cancelToken && o.cancelToken.unsubscribe(c), o.signal && o.signal.removeEventListener("abort", c);
     }
     let d = new XMLHttpRequest();
     d.open(o.method.toUpperCase(), o.url, !0), d.timeout = o.timeout;
@@ -2856,9 +2856,9 @@ const co = (e) => {
         request: d
       };
       io(function(B) {
-        n(B), y();
+        n(B), g();
       }, function(B) {
-        r(B), y();
+        r(B), g();
       }, S), d = null;
     }
     "onloadend" in d ? d.onloadend = b : d.onreadystatechange = function() {
@@ -2878,11 +2878,11 @@ const co = (e) => {
       )), d = null;
     }, s === void 0 && i.setContentType(null), "setRequestHeader" in d && l.forEach(i.toJSON(), function($, S) {
       d.setRequestHeader(S, $);
-    }), l.isUndefined(o.withCredentials) || (d.withCredentials = !!o.withCredentials), a && a !== "json" && (d.responseType = o.responseType), f && ([g, h] = Me(f, !0), d.addEventListener("progress", g)), u && d.upload && ([p, m] = Me(u), d.upload.addEventListener("progress", p), d.upload.addEventListener("loadend", m)), (o.cancelToken || o.signal) && (c = (O) => {
+    }), l.isUndefined(o.withCredentials) || (d.withCredentials = !!o.withCredentials), a && a !== "json" && (d.responseType = o.responseType), f && ([m, h] = Me(f, !0), d.addEventListener("progress", m)), u && d.upload && ([p, y] = Me(u), d.upload.addEventListener("progress", p), d.upload.addEventListener("loadend", y)), (o.cancelToken || o.signal) && (c = (O) => {
       d && (r(!O || O.type ? new de(null, e, d) : O), d.abort(), d = null);
     }, o.cancelToken && o.cancelToken.subscribe(c), o.signal && (o.signal.aborted ? c() : o.signal.addEventListener("abort", c)));
     const E = Tf(o.url);
-    if (E && T.protocols.indexOf(E) === -1) {
+    if (E && C.protocols.indexOf(E) === -1) {
       r(new _("Unsupported protocol " + E + ":", _.ERR_BAD_REQUEST, e));
       return;
     }
@@ -2954,8 +2954,8 @@ const co = (e) => {
         }
         let p = c.byteLength;
         if (n) {
-          let g = s += p;
-          n(g);
+          let m = s += p;
+          n(m);
         }
         u.enqueue(new Uint8Array(c));
       } catch (f) {
@@ -2976,7 +2976,7 @@ const co = (e) => {
   }
 }, kf = uo && lo(() => {
   let e = !1;
-  const t = new Request(T.origin, {
+  const t = new Request(C.origin, {
     body: new ReadableStream(),
     method: "POST",
     get duplex() {
@@ -3000,7 +3000,7 @@ const Hf = async (e) => {
   if (l.isBlob(e))
     return e.size;
   if (l.isSpecCompliantForm(e))
-    return (await new Request(T.origin, {
+    return (await new Request(C.origin, {
       method: "POST",
       body: e
     }).arrayBuffer()).byteLength;
@@ -3024,12 +3024,12 @@ const Hf = async (e) => {
     responseType: f,
     headers: c,
     withCredentials: p = "same-origin",
-    fetchOptions: g
+    fetchOptions: m
   } = co(e);
   f = f ? (f + "").toLowerCase() : "text";
-  let m = Uf([o, s && s.toAbortSignal()], i), h;
-  const y = m && m.unsubscribe && (() => {
-    m.unsubscribe();
+  let y = Uf([o, s && s.toAbortSignal()], i), h;
+  const g = y && y.unsubscribe && (() => {
+    y.unsubscribe();
   });
   let d;
   try {
@@ -3050,8 +3050,8 @@ const Hf = async (e) => {
     l.isString(p) || (p = p ? "include" : "omit");
     const b = "credentials" in Request.prototype;
     h = new Request(t, {
-      ...g,
-      signal: m,
+      ...m,
+      signal: y,
       method: n.toUpperCase(),
       headers: c.normalize().toJSON(),
       body: r,
@@ -3060,7 +3060,7 @@ const Hf = async (e) => {
     });
     let E = await fetch(h);
     const O = Ot && (f === "stream" || f === "response");
-    if (Ot && (a || O && y)) {
+    if (Ot && (a || O && g)) {
       const S = {};
       ["status", "statusText", "headers"].forEach((rn) => {
         S[rn] = E[rn];
@@ -3071,14 +3071,14 @@ const Hf = async (e) => {
       ) || [];
       E = new Response(
         Un(E.body, Dn, B, () => {
-          I && I(), y && y();
+          I && I(), g && g();
         }),
         S
       );
     }
     f = f || "text";
     let $ = await ke[l.findKey(ke, f) || "text"](E, e);
-    return !O && y && y(), await new Promise((S, F) => {
+    return !O && g && g(), await new Promise((S, F) => {
       io(S, F, {
         data: $,
         headers: j.from(E.headers),
@@ -3089,7 +3089,7 @@ const Hf = async (e) => {
       });
     });
   } catch (b) {
-    throw y && y(), b && b.name === "TypeError" && /fetch/i.test(b.message) ? Object.assign(
+    throw g && g(), b && b.name === "TypeError" && /fetch/i.test(b.message) ? Object.assign(
       new _("Network Error", _.ERR_NETWORK, e, h),
       {
         cause: b.cause || b
@@ -3272,37 +3272,37 @@ class He {
     ), n.headers = j.concat(i, s);
     const a = [];
     let u = !0;
-    this.interceptors.request.forEach(function(y) {
-      typeof y.runWhen == "function" && y.runWhen(n) === !1 || (u = u && y.synchronous, a.unshift(y.fulfilled, y.rejected));
+    this.interceptors.request.forEach(function(g) {
+      typeof g.runWhen == "function" && g.runWhen(n) === !1 || (u = u && g.synchronous, a.unshift(g.fulfilled, g.rejected));
     });
     const f = [];
-    this.interceptors.response.forEach(function(y) {
-      f.push(y.fulfilled, y.rejected);
+    this.interceptors.response.forEach(function(g) {
+      f.push(g.fulfilled, g.rejected);
     });
-    let c, p = 0, g;
+    let c, p = 0, m;
     if (!u) {
       const h = [In.bind(this), void 0];
-      for (h.unshift.apply(h, a), h.push.apply(h, f), g = h.length, c = Promise.resolve(n); p < g; )
+      for (h.unshift.apply(h, a), h.push.apply(h, f), m = h.length, c = Promise.resolve(n); p < m; )
         c = c.then(h[p++], h[p++]);
       return c;
     }
-    g = a.length;
-    let m = n;
-    for (p = 0; p < g; ) {
-      const h = a[p++], y = a[p++];
+    m = a.length;
+    let y = n;
+    for (p = 0; p < m; ) {
+      const h = a[p++], g = a[p++];
       try {
-        m = h(m);
+        y = h(y);
       } catch (d) {
-        y.call(this, d);
+        g.call(this, d);
         break;
       }
     }
     try {
-      c = In.call(this, m);
+      c = In.call(this, y);
     } catch (h) {
       return Promise.reject(h);
     }
-    for (p = 0, g = f.length; p < g; )
+    for (p = 0, m = f.length; p < m; )
       c = c.then(f[p++], f[p++]);
     return c;
   }
@@ -3648,7 +3648,7 @@ const Zf = 3e4, kn = Math.random(), mo = {
     platform: e,
     username: t
   };
-  e || (n.platform = (await C(en())).platform), t || (n.username = (await C(tn())).username);
+  e || (n.platform = (await T(en())).platform), t || (n.username = (await T(tn())).username);
   const { platform: r, username: o } = n;
   let s = [];
   const i = sp({
@@ -3688,7 +3688,7 @@ const Zf = 3e4, kn = Math.random(), mo = {
     return;
   } else
     R.stage(`共${s.length}个仓库`);
-  const { repoUrl: f } = await C({
+  const { repoUrl: f } = await T({
     name: "repoUrl",
     type: "select",
     message: "选择仓库",
@@ -3789,7 +3789,7 @@ const Zf = 3e4, kn = Math.random(), mo = {
       });
     }
     case ne.CLONE_CONFIG: {
-      const { rootDir: n } = e, { platform: r } = await C(en()), { username: o } = await C(tn()), { accessToken: s } = await C(ap);
+      const { rootDir: n } = e, { platform: r } = await T(en()), { username: o } = await T(tn()), { accessToken: s } = await T(ap);
       return ip({
         rootDir: n,
         platform: r,
@@ -3910,19 +3910,19 @@ const Zf = 3e4, kn = Math.random(), mo = {
   o.forEach((u, f) => {
     var c;
     const p = u.mergeInfo || ((c = a[u.hash]) == null ? void 0 : c.mergeInfo);
-    p && Object.entries(n).forEach(([g]) => {
-      const m = s[g];
-      if (f > m) {
-        R.skip(`${g} 只检测${m + 1}条， 超出不再检测`);
+    p && Object.entries(n).forEach(([m]) => {
+      const y = s[m];
+      if (f > y) {
+        R.skip(`${m} 只检测${y + 1}条， 超出不再检测`);
         return;
       }
       const h = nn({
         mergeInfo: p,
         configMap: n,
         currentBranch: t
-      }), { fromBranch: y } = p;
+      }), { fromBranch: g } = p;
       if (h) {
-        const d = `发现${y}被合并
+        const d = `发现${g}被合并
   本次提交版本 ${u.hash}
   提交注释 ${u.message}
   提交人: ${u.committer}
@@ -4083,9 +4083,9 @@ const Zf = 3e4, kn = Math.random(), mo = {
 ].map(St), Gn({ packageJson: Zt });
 const Bp = async (e) => {
   console.log("克隆done-coding系列项目"), console.log("选择平台:");
-  const { platform: t } = await C(en(L.GITEE));
+  const { platform: t } = await T(en(L.GITEE));
   console.log("选择用户名:");
-  const { username: n } = await C(
+  const { username: n } = await T(
     tn(
       {
         [L.GITHUB]: "done-coding",
@@ -4117,74 +4117,84 @@ const Bp = async (e) => {
     R.info("仅仅(从done-coding系列项目列表中)克隆远程仓库"), await Bp(t);
     return;
   }
-  const o = ((t ?? (await C(Ko)).projectName) || "").trim();
+  const o = ((t ?? (await T(Ko)).projectName) || "").trim();
   if (!o)
     return R.error("项目名称不能为空"), process.exit(1);
   if (o.includes(" ") || o.includes("\\") || o.includes("/"))
     return R.error(`项目名称\`${o}\`不能包含空格或者\\或者/`), process.exit(1);
   const s = Io(process.cwd(), o);
   if (on(s)) {
-    const { isRemove: m } = await C(Vo());
-    if (m === !0)
+    const { isRemove: h } = await T(Vo());
+    if (h === !0)
       je(s, { recursive: !0, force: !0 });
     else
       return R.error(`项目${o}已存在`), process.exit(1);
   }
-  const { template: i } = await C(await zo());
+  const { template: i } = await T(await zo());
   let a = "", u = "";
   if (i === Kn) {
-    const { customUrl: m } = await C(Xo);
-    a = m;
+    const { customUrl: h } = await T(Xo);
+    a = h;
   } else if (i === Wn)
     a = await Go();
   else {
-    const m = (await zn()).find(
-      (h) => h.name === i
+    const h = (await zn()).find(
+      (g) => g.name === i
     );
-    if (!m)
+    if (!h)
       return R.error(`模板${i}不存在`), process.exit(1);
-    if (!m.url)
+    if (!h.url)
       return R.error(`模板${i}仓库地址不存在`), process.exit(1);
-    if (a = m.url, typeof m.branch == "string")
-      u = m.branch;
-    else if (Array.isArray(m.branch) && m.branch.length > 0) {
-      const { targetBranch: h } = await C({
+    if (a = h.url, typeof h.branch == "string")
+      u = h.branch;
+    else if (Array.isArray(h.branch) && h.branch.length > 0) {
+      const { targetBranch: g } = await T({
         type: "select",
         name: "targetBranch",
         message: "请选择模板分支",
-        choices: m.branch.map((y) => ({
-          title: y.name,
-          value: y.name,
-          description: y.description
+        choices: h.branch.map((d) => ({
+          title: d.name,
+          value: d.name,
+          description: d.description
         }))
         // initial: 0,
       });
-      u = h;
+      u = g;
     }
   }
   const f = qn(".git");
+  let c = "";
+  if (!f && u) {
+    const { localBranchName: h } = await T({
+      type: "text",
+      name: "localBranchName",
+      message: "请输入克隆到本地后的分支名",
+      initial: "master"
+    });
+    c = h;
+  }
   R.stage("正在初始化项目，请稍等..."), Y(
-    `git clone${u ? ` -b ${u}` : ""} ${a} ${o} --depth=1`,
+    `git clone${u ? ` -b ${u} ${c}` : ""} ${a} ${o} --depth=1`,
     { stdio: "inherit" }
   );
-  const c = Ho, p = Mo({
+  const p = Ho, m = Mo({
     rootDir: s,
-    configPath: c
+    configPath: p
   });
-  if (p && (await ko({
+  if (m && (await ko({
     rootDir: s,
-    configPath: c,
+    configPath: p,
     extraEnvData: {
       $projectName: o
     }
-  }), je(p, { force: !0 }), R.stage("模板项目配置注入成功, 模版项目配置文件已删除")), R.stage("项目初始化完成"), f) {
-    const m = Ee.resolve(s), h = Ee.resolve(m, ".git");
-    if (!on(h))
+  }), je(m, { force: !0 }), R.stage("模板项目配置注入成功, 模版项目配置文件已删除")), R.stage("项目初始化完成"), f) {
+    const h = Ee.resolve(s), g = Ee.resolve(h, ".git");
+    if (!on(g))
       throw new Error("git目录不存在");
-    je(h, { recursive: !0, force: !0 }), R.stage(
-      `项目创建在父级git仓库${f}中，已删除${o}目录下的.git(${h})`
+    je(g, { recursive: !0, force: !0 }), R.stage(
+      `项目创建在父级git仓库${f}中，已删除${o}目录下的.git(${g})`
     );
-  } else if ((await C(Jo)).saveGitHistory)
+  } else if ((await T(Jo)).saveGitHistory)
     Y("git remote rename origin upstream && git fetch --unshallow", {
       cwd: s,
       stdio: "inherit"
@@ -4192,16 +4202,16 @@ const Bp = async (e) => {
       "已经将origin重命名为upstream，后续可以与模板git仓库有完整的交互"
     ), R.success("已保存git历史记录");
   else {
-    const h = Ee.resolve(s, ".git");
-    je(h, { recursive: !0, force: !0 }), Y("git init", {
+    const g = Ee.resolve(s, ".git");
+    je(g, { recursive: !0, force: !0 }), Y("git init", {
       cwd: s,
       stdio: "inherit"
     });
   }
-  const { gitCommitMessage: g } = await C(
+  const { gitCommitMessage: y } = await T(
     Qo(o)
   );
-  Y(`git add . && git commit -m '${g}'`, {
+  Y(`git add . && git commit -m '${y}'`, {
     cwd: s,
     stdio: "inherit"
   }), R.success(`项目${o}初始化完成`), R.info(`

package/es/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { S as d, e as s, a as p, b as c, h as b, d as l } from "./index-4bae0d72.js";
+import { S as d, e as s, a as p, b as c, h as b, d as l } from "./index-d1258ba5.js";
 import "@done-coding/cli-utils";
 import "node:child_process";
 import "node:fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-done-coding",
-  "version": "0.11.17",
+  "version": "0.11.18",
   "description": "项目创建命令行工具",
   "module": "es/index.mjs",
   "type": "module",
@@ -54,5 +54,5 @@
     "@done-coding/cli-template": "0.8.4",
     "@done-coding/cli-utils": "0.7.7"
   },
-  "gitHead": "aaabd543abd7c48cdb8aae0d3c90019eee2a0cb5"
+  "gitHead": "85266dee9219d30f35adba2a02dcaf2e2ff4ed52"
 }