@done-coding/cli-utils 0.7.5 → 0.7.6

package/es/index.mjs

@@ -2,7 +2,7 @@
 import p from "chalk";
 import { default as se } from "chalk";
 import g from "node:path";
-import m, { existsSync as y, mkdirSync as W, writeFileSync as w, readFileSync as v, rmSync as X } from "node:fs";
+import m, { existsSync as y, mkdirSync as W, writeFileSync as D, readFileSync as v, rmSync as X } from "node:fs";
 import _ from "crypto";
 import q from "prompts";
 import z from "yargs";
@@ -40,13 +40,13 @@ const l = Object.assign(
   /** 优先找最远的父目录 */
   isFindFarthest: e = !0
 } = {}) => {
-  const o = g.resolve(r).split(g.sep).map((s, n, c) => n ? g.join(c.slice(0, n).join(g.sep), s) : s);
+  const o = g.resolve(r).split(g.sep).map((s, n, c) => c.slice(0, n).concat(s).join(g.sep) || g.sep);
   for (; o.length; ) {
     const s = e ? o.shift() : o.pop(), n = g.join(s, t);
     if (m.existsSync(n))
       return s;
   }
-}, N = "aes-256-cbc", F = 16, M = "hex", A = ":";
+}, N = "aes-256-cbc", F = 16, M = "hex", w = ":";
 function G(t) {
   return _.pbkdf2Sync(
     t,
@@ -68,7 +68,7 @@ function kt({
     let n = s.update(t);
     n = Buffer.concat([n, s.final()]);
     const c = o.toString(M), i = n.toString(M);
-    return `${c}${A}${i}`;
+    return `${c}${w}${i}`;
   } catch (e) {
     return l.error(
       `加密失败: ${e instanceof Error ? e.message : String(e)}`
@@ -80,9 +80,9 @@ function jt({
   secretKey: r
 }) {
   try {
-    if (!t.includes(A))
+    if (!t.includes(w))
       return "";
-    const e = G(r), [o, s] = t.split(A);
+    const e = G(r), [o, s] = t.split(w);
     if (o.length !== F * 2)
       return "";
     const n = Buffer.from(o, M), c = Buffer.from(s, M), i = _.createDecipheriv(N, e, n);
@@ -138,8 +138,8 @@ const L = (...t) => {
 }, a) => {
   let f = t.strict();
   r && (f = f.usage(`Usage: ${r}`)), o && (f = f.demandCommand(o));
-  const d = "help";
-  return f = f.help(d), e ? f = f.version(e).alias("h", d).alias("v", "version") : f = f.alias("h", d), s && (f = f.options(s)), n && (f = Object.entries(n).reduce((S, [P, h]) => S.positional(P, h), f)), c && (f = f.command(c)), a && i && (f = f.scriptName(i)), f;
+  const h = "help";
+  return f = f.help(h), e ? f = f.version(e).alias("h", h).alias("v", "version") : f = f.alias("h", h), s && (f = f.options(s)), n && (f = Object.entries(n).reduce((S, [P, d]) => S.positional(P, d), f)), c && (f = f.command(c)), a && i && (f = f.scriptName(i)), f;
 }, Ht = async ({ handler: t, ...r }) => {
   const e = await J(ot(), r, !0).fail(
     rt
@@ -228,7 +228,7 @@ const nt = async () => {
   const { configPath: e, rootDir: o } = r, s = g.resolve(o, e), n = g.dirname(s);
   return y(n) || W(n, {
     recursive: !0
-  }), s.endsWith(".json5") ? (l.info(`json5模式写入 ${s}`), w(s, H.stringify(t, null, 2)), s) : (l.info(`json模式写入 ${s}`), w(s, JSON.stringify(t, null, 2)), s);
+  }), s.endsWith(".json5") ? (l.info(`json5模式写入 ${s}`), D(s, H.stringify(t, null, 2)), s) : (l.info(`json模式写入 ${s}`), D(s, JSON.stringify(t, null, 2)), s);
 }, Gt = async (t, r, {
   onFileGenerated: e,
   edit: o = !1
@@ -255,7 +255,7 @@ const nt = async () => {
     initial: !0
   });
   return t;
-}, U = "package.json", D = ({
+}, U = "package.json", T = ({
   rootDir: t
 }) => {
   const r = g.resolve(t, U);
@@ -269,7 +269,7 @@ const nt = async () => {
   pkgName: e,
   isDevPkg: o
 }) => {
-  const s = r || D({ rootDir: t }), n = o ? s.devDependencies : s.dependencies;
+  const s = r || T({ rootDir: t }), n = o ? s.devDependencies : s.dependencies;
   let c = n == null ? void 0 : n[e];
   if (!c) {
     const i = o ? s.dependencies : s.devDependencies;
@@ -287,8 +287,8 @@ const nt = async () => {
 }) => {
   if (!t)
     return;
-  const e = D({ rootDir: r }), o = Z(e, t), s = g.resolve(r, U);
-  w(s, JSON.stringify(o, null, 2), "utf-8");
+  const e = T({ rootDir: r }), o = Z(e, t), s = g.resolve(r, U);
+  D(s, JSON.stringify(o, null, 2), "utf-8");
 }, O = (t) => {
   const e = u("git rev-parse --show-toplevel", {
     cwd: t
@@ -332,7 +332,7 @@ var R = /* @__PURE__ */ ((t) => (t.PRE_COMMIT = "pre-commit", t.PRE_MERGE_COMMIT
 const pt = "husky", ht = ".husky", dt = ({ rootDir: t }) => {
   const r = O(t), e = gt({
     rootDir: r,
-    pkgJson: D({ rootDir: r }),
+    pkgJson: T({ rootDir: r }),
     pkgName: pt,
     isDevPkg: !0
   });
@@ -455,9 +455,9 @@ ${i}
     };
   }
 }, Rt = (t) => {
-  if (t.startsWith(T.MERGE))
+  if (t.startsWith(A.MERGE))
     return {
-      fromBranch: t.replace(T.MERGE, "").trim()
+      fromBranch: t.replace(A.MERGE, "").trim()
     };
 }, qt = () => {
   const t = process.env.GIT_REFLOG_ACTION || "";
@@ -478,7 +478,7 @@ ${i}
     };
   }
 };
-var T = /* @__PURE__ */ ((t) => (t.CHECKOUT = "checkout", t.MERGE = "merge", t.COMMIT = "commit", t.COMMIT_MERGE = "commit (merge)", t.PULL = "pull", t.RESET = "reset", t.REBASE_START = "rebase (start)", t.REBASE_FINISH = "rebase (finish)", t.REBASE_ABORT = "rebase (abort)", t.REBASE_CONTINUE = "rebase (continue)", t))(T || {});
+var A = /* @__PURE__ */ ((t) => (t.CHECKOUT = "checkout", t.MERGE = "merge", t.COMMIT = "commit", t.COMMIT_MERGE = "commit (merge)", t.PULL = "pull", t.RESET = "reset", t.REBASE_START = "rebase (start)", t.REBASE_FINISH = "rebase (finish)", t.REBASE_ABORT = "rebase (abort)", t.REBASE_CONTINUE = "rebase (continue)", t))(A || {});
 const j = "__GIT_REPLACE_MARK__", $ = {
   stringify(t) {
     return JSON.stringify(t).replace(/"/g, j);
@@ -539,19 +539,19 @@ const j = "__GIT_REPLACE_MARK__", $ = {
     )}"`
   ).toString().split(`
 `).map((i) => $.parse(i)).filter(r).map((i) => {
-    const { fullMessage: a, ...f } = i, d = ":", [S] = a.split(d, 1), P = a.slice(`${S}${d}`.length), h = S.trim(), C = P.trim();
+    const { fullMessage: a, ...f } = i, h = ":", [S] = a.split(h, 1), P = a.slice(`${S}${h}`.length), d = S.trim(), C = P.trim();
     let b, B, V;
-    if (h.startsWith(
+    if (d.startsWith(
       "checkout"
       /* CHECKOUT */
     ))
       B = ut(C);
-    else if (h.startsWith(
+    else if (d.startsWith(
       "merge"
       /* MERGE */
     ))
-      b = Rt(h);
-    else if (h.startsWith(
+      b = Rt(d);
+    else if (d.startsWith(
       "commit (merge)"
       /* COMMIT_MERGE */
     )) {
@@ -562,7 +562,7 @@ const j = "__GIT_REPLACE_MARK__", $ = {
     }
     return {
       ...f,
-      type: h,
+      type: d,
       message: C,
       mergeInfo: b,
       checkoutInfo: B,
@@ -627,7 +627,7 @@ const j = "__GIT_REPLACE_MARK__", $ = {
 };
 export {
   st as EditorTypeEnum,
-  T as GitRefLogTypeEnum,
+  A as GitRefLogTypeEnum,
   R as HooksNameEnum,
   Vt as SUPPORT_GET_COMMIT_BY_HOOKS_NAMES,
   me as _curry,
@@ -650,7 +650,7 @@ export {
   Xt as getGitLastCommitInfo,
   O as getGitProjectDir,
   Qt as getLastReflogList,
-  D as getPackageJson,
+  T as getPackageJson,
   gt as getRelyPkgVersion,
   ft as getRootDirOptions,
   xt as getRootScriptName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@done-coding/cli-utils",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "cli utils",
   "private": false,
   "module": "es/index.mjs",
@@ -68,5 +68,5 @@
     "semver": "^7.5.4",
     "yargs": "^17.7.2"
   },
-  "gitHead": "fb405d55a9fe10014863d725b1f4e3bcd45412af"
+  "gitHead": "30721548bad7e10aaf8bf46762925954f40c5fd3"
 }