archiver-ts 0.3.3 → 0.3.4

package/dist/index.js

@@ -742,24 +742,24 @@ var S = /* @__PURE__ */ ((e) => (e.Valid = "Valid", e.Removed = "Removed", e.Pro
     status: S.Protected
   }, e.LogTail = 15;
 })(g || (g = {}));
-const Vt = () => process.env.ARCHIVER_PATH ?? D(gt(), ".archiver"), $ = Vt();
+const Vt = () => process.env.ARCHIVER_PATH ?? D(gt(), ".archiver"), T = Vt();
 var f;
 ((e) => {
   e.Dir = {
-    root: $,
-    vaults: D($, "vaults")
+    root: T,
+    vaults: D(T, "vaults")
   }, e.File = {
-    config: D($, "config.jsonc"),
-    autoIncr: D($, "auto-incr.jsonc"),
-    list: D($, "list.jsonl"),
-    vaults: D($, "vaults.jsonl"),
-    log: D($, "log.jsonl")
+    config: D(T, "config.jsonc"),
+    autoIncr: D(T, "auto-incr.jsonc"),
+    list: D(T, "list.jsonl"),
+    vaults: D(T, "vaults.jsonl"),
+    log: D(T, "log.jsonl")
   };
 })(f || (f = {}));
-var M;
+var O;
 ((e) => {
   e.CheckInterval = 1440 * 60 * 1e3, e.Repo = process.env.ARCHIVER_GITHUB_REPO ?? "aldia/archiver", e.Timeout = 1e4;
-})(M || (M = {}));
+})(O || (O = {}));
 const Rt = "archiver", z = (e) => e.toString().padStart(2, "0"), Lt = () => (/* @__PURE__ */ new Date()).toISOString();
 function we(e = /* @__PURE__ */ new Date()) {
   const t = e.getFullYear(), a = z(e.getMonth() + 1), i = z(e.getDate()), n = z(e.getHours()), o = z(e.getMinutes()), c = z(e.getSeconds());
@@ -784,7 +784,7 @@ function Re(e) {
     throw new Error(r("util.parse.error.duplicate_ids"));
   return t;
 }
-function Tt(e) {
+function $t(e) {
   if (!e)
     return { mode: "all" };
   if (["all", "*", "a"].includes(e.toLowerCase()))
@@ -820,7 +820,7 @@ function le(e) {
 function j(e) {
   console.error(`${ne(r("terminal.badge.error"), "red")} ${v.red(e)}`);
 }
-function $t(e, t) {
+function Tt(e, t) {
   return Array.from({ length: t }, (a, i) => e[i] ?? "");
 }
 function B(e, t) {
@@ -829,7 +829,7 @@ function B(e, t) {
   const a = e.length, i = [];
   i.push(v.bold(e.join("  "))), i.push(v.dim(e.map((n) => "-".repeat(Math.max(n.length, 3))).join("  ")));
   for (const n of t)
-    i.push($t(n, a).join("  "));
+    i.push(Tt(n, a).join("  "));
   return i.join(`
 `);
 }
@@ -860,7 +860,7 @@ async function V(e) {
   if (t.updateCheck === "on") {
     if (t.lastUpdateCheck) {
       const a = new Date(t.lastUpdateCheck);
-      if (!Number.isNaN(a.getTime()) && Date.now() - a.getTime() < M.CheckInterval)
+      if (!Number.isNaN(a.getTime()) && Date.now() - a.getTime() < O.CheckInterval)
         return;
     }
     try {
@@ -944,8 +944,8 @@ function Pt(e, t) {
     })
   );
 }
-const Mt = v.level;
-function Ot(e) {
+const Ot = v.level;
+function Mt(e) {
   if (typeof e != "string")
     return;
   const t = e.trim().toLowerCase();
@@ -953,14 +953,14 @@ function Ot(e) {
     return t;
 }
 function Ft(e, t = process.env) {
-  return Ot(t.ARCHIVER_STYLE) ?? e;
+  return Mt(t.ARCHIVER_STYLE) ?? e;
 }
 function jt(e) {
   if (e === "off") {
     v.level = 0;
     return;
   }
-  v.level = Math.max(Mt, 1);
+  v.level = Math.max(Ot, 1);
 }
 function ee(e, t = process.env) {
   const a = Ft(e.style, t);
@@ -985,10 +985,10 @@ function Yt(e) {
 function Ht(e = "") {
   return { value: e, cursor: e.length };
 }
-function Te(e, t) {
+function $e(e, t) {
   return t === "left" ? P(e.value, e.cursor - 1) : P(e.value, e.cursor + 1);
 }
-function $e(e, t, a) {
+function Te(e, t, a) {
   if (a.ctrl && a.name === "c")
     return { state: e, action: "cancel" };
   if (a.name === "escape")
@@ -996,9 +996,9 @@ function $e(e, t, a) {
   if (a.name === "return" || a.name === "enter")
     return { state: e, action: "submit" };
   if (a.name === "left")
-    return { state: Te(e, "left"), action: "continue" };
+    return { state: $e(e, "left"), action: "continue" };
   if (a.name === "right")
-    return { state: Te(e, "right"), action: "continue" };
+    return { state: $e(e, "right"), action: "continue" };
   if (a.name === "home")
     return { state: P(e.value, 0), action: "continue" };
   if (a.name === "end")
@@ -1061,7 +1061,7 @@ function et(e, t, a) {
       return o;
   }
 }
-function O(e, t) {
+function M(e, t) {
   if (e.length === 0)
     return { options: e, selectedIndex: 0 };
   let a = t === void 0 ? 0 : e.findIndex((i) => Object.is(i.value, t));
@@ -1093,7 +1093,7 @@ function R(e) {
   return v.black.bgWhite(` ${e} `);
 }
 async function Jt(e) {
-  const t = O(e.options, e.initialValue);
+  const t = M(e.options, e.initialValue);
   if (e.options.length === 0)
     return null;
   if (!ye())
@@ -1166,7 +1166,7 @@ function Zt(e) {
     return "command.config.vault_item_sep.error.empty";
 }
 function Qt() {
-  return !!(process.stdin.isTTY && process.stdout.isTTY && typeof process.stdin.setRawMode == "function");
+  return typeof process.stdin.setRawMode == "function";
 }
 function ea(e) {
   return [
@@ -1174,7 +1174,7 @@ function ea(e) {
       kind: "select",
       key: "updateCheck",
       label: r("command.config.edit.field.update_check"),
-      state: O(
+      state: M(
         [
           { value: "on", label: r("common.state.on") },
           { value: "off", label: r("common.state.off") }
@@ -1192,7 +1192,7 @@ function ea(e) {
       kind: "select",
       key: "style",
       label: r("command.config.edit.field.style"),
-      state: O(
+      state: M(
         [
           { value: "on", label: r("common.state.on") },
           { value: "off", label: r("common.state.off") }
@@ -1204,7 +1204,7 @@ function ea(e) {
       kind: "select",
       key: "language",
       label: r("command.config.edit.field.language"),
-      state: O(
+      state: M(
         [
           { value: "zh", label: "zh" },
           { value: "en", label: "en" }
@@ -1216,7 +1216,7 @@ function ea(e) {
       kind: "select",
       key: "noCommandAction",
       label: r("command.config.edit.field.no_command_action"),
-      state: O(
+      state: M(
         [
           { value: "list", label: r("common.action.list") },
           { value: "help", label: r("common.action.help") },
@@ -1272,7 +1272,7 @@ function N(e, t, a, i, n) {
     const x = e[L];
     if (!x)
       continue;
-    const T = L === t, re = T ? v.cyan(">") : " ", oe = T ? v.bold(x.label.padEnd(s, " ")) : x.label.padEnd(s, " "), ce = x.kind === "select" ? te(x.state, T) : Ut(x.state, T, r("command.config.edit.input.placeholder"));
+    const $ = L === t, re = $ ? v.cyan(">") : " ", oe = $ ? v.bold(x.label.padEnd(s, " ")) : x.label.padEnd(s, " "), ce = x.kind === "select" ? te(x.state, $) : Ut(x.state, $, r("command.config.edit.input.placeholder"));
     u.push(`${re} ${oe}  ${ce}`);
   }
   u.push(""), u.push(`${r("command.config.edit.action_prefix")} ${te(i, d)}`), u.push("");
@@ -1289,7 +1289,7 @@ async function aa(e) {
   if (!Qt())
     throw new Error(r("command.config.edit.error.no_tty"));
   const t = process.stdin, a = ea(e);
-  let i = O([
+  let i = M([
     { value: "save", label: r("command.config.edit.action.save") },
     { value: "cancel", label: r("command.config.edit.action.cancel") }
   ]), n = 0, o = "";
@@ -1349,11 +1349,11 @@ async function aa(e) {
         return;
       }
       if (u.name === "left" || u.name === "right") {
-        _.kind === "select" ? _.state = q(_.state, u.name) : _.state = $e(_.state, m, u).state, o = "", N(a, n, e, i, o);
+        _.kind === "select" ? _.state = q(_.state, u.name) : _.state = Te(_.state, m, u).state, o = "", N(a, n, e, i, o);
         return;
       }
       if (_.kind === "input") {
-        const A = $e(_.state, m, u);
+        const A = Te(_.state, m, u);
         if (_.state = A.state, A.action === "cancel") {
           s(null);
           return;
@@ -1505,7 +1505,7 @@ function fe(e, t) {
   return t === "enter" || t === "restore" ? e.status === y.Archived : !1;
 }
 function be(e, t) {
-  return O(
+  return M(
     [
       { value: "enter", label: De("enter"), disabled: !fe(e, "enter") },
       { value: "restore", label: De("restore"), disabled: !fe(e, "restore") }
@@ -1520,7 +1520,7 @@ function Pe(e, t, a) {
   const i = be(e, t), n = q(i, a);
   return H(n)?.value ?? t;
 }
-function Me(e, t, a) {
+function Oe(e, t, a) {
   return a <= 0 ? 0 : t === "up" ? (e - 1 + a) % a : (e + 1) % a;
 }
 function F(e, t, a, i) {
@@ -1535,20 +1535,20 @@ function F(e, t, a, i) {
   }), s = be(n, a), l = [
     `${r("command.list.interactive.action_prefix")} ${te(s)}`,
     ""
-  ], m = Math.max(o - l.length - 2, 2), u = Math.max(Math.floor(m / 2), 1), _ = Math.floor(u / 2), A = Math.max(e.length - u, 0), L = Math.min(Math.max(t - _, 0), A), x = Math.min(L + u, e.length), T = [...l];
+  ], m = Math.max(o - l.length - 2, 2), u = Math.max(Math.floor(m / 2), 1), _ = Math.floor(u / 2), A = Math.max(e.length - u, 0), L = Math.min(Math.max(t - _, 0), A), x = Math.min(L + u, e.length), $ = [...l];
   for (let W = L; W < x; W += 1) {
     const U = e[W];
     if (!U)
       continue;
     const Ce = W === t, dt = Ce ? v.cyan(">") : " ", ut = U.status === y.Archived ? v.green("A") : v.gray("R"), Ee = `${dt} [${String(U.id).padStart(4, " ")}] ${ut} ${U.title}`, Ae = `      ${v.dim(U.path)}`;
-    Ce ? (T.push(v.bold(Ee)), T.push(v.cyan(Ae))) : (T.push(Ee), T.push(Ae));
+    Ce ? ($.push(v.bold(Ee)), $.push(v.cyan(Ae))) : ($.push(Ee), $.push(Ae));
   }
   const re = r("command.list.interactive.showing", {
     start: L + 1,
     end: x,
     total: e.length
   }), oe = i ? v.yellow(i) : v.dim(re), ce = Ie({
-    contentLines: T,
+    contentLines: $,
     hintLine: c,
     statusLine: oe,
     rows: o
@@ -1571,11 +1571,11 @@ async function la(e) {
         return;
       }
       if (d.name === "up") {
-        a = Me(a, "up", e.length), n = "", F(e, a, i, n);
+        a = Oe(a, "up", e.length), n = "", F(e, a, i, n);
         return;
       }
       if (d.name === "down") {
-        a = Me(a, "down", e.length), n = "", F(e, a, i, n);
+        a = Oe(a, "down", e.length), n = "", F(e, a, i, n);
         return;
       }
       if (d.name === "left") {
@@ -1783,7 +1783,7 @@ function pa(e, t) {
         ));
         return;
       }
-      const n = Tt(a), o = await t.logService.getLogs(n);
+      const n = $t(a), o = await t.logService.getLogs(n);
       if (o.length === 0) {
         E(r("command.log.empty"));
         return;
@@ -1817,7 +1817,7 @@ function pa(e, t) {
 async function Y(e) {
   await p.mkdir(e, { recursive: !0 });
 }
-const C = (e) => p.access(e).then(() => !0).catch(() => !1), Oe = (e) => p.realpath(e).catch(() => h.resolve(e)), _a = (e, t) => h.normalize(e) === h.normalize(t);
+const C = (e) => p.access(e).then(() => !0).catch(() => !1), Me = (e) => p.realpath(e).catch(() => h.resolve(e)), _a = (e, t) => h.normalize(e) === h.normalize(t);
 function rt(e, t) {
   const a = h.relative(h.resolve(e), h.resolve(t));
   return a.length > 0 && !a.startsWith("..") && !h.isAbsolute(a);
@@ -2230,6 +2230,11 @@ const je = {
   endMarker: "# <<< archiver arv wrapper <<<",
   functionPattern: /(^|\n)\s*(function\s+)?arv\s*(\(\))?\s*\{/m,
   body: `arv() {
+  if [[ ! -t 0 || ! -t 1 ]]; then
+    command arv "$@"
+    return $?
+  fi
+
   local line target status
   while IFS= read -r line; do
     if [[ "$line" == *__ARCHIVER_CD__:* ]]; then
@@ -2255,6 +2260,15 @@ const je = {
   endMarker: "# <<< archiver arv wrapper <<<",
   functionPattern: /(^|\n)\s*function\s+arv\b/m,
   body: `function arv
+    if not test -t 0
+        command arv $argv
+        return $status
+    end
+    if not test -t 1
+        command arv $argv
+        return $status
+    end
+
     set -l target_tmp (mktemp)
     env ARCHIVER_FORCE_INTERACTIVE=1 command arv $argv | while read -l line
         if string match -q "__ARCHIVER_CD__:*" -- $line
@@ -2286,6 +2300,13 @@ end`
         [string[]]$argv
     )
 
+    if ([Console]::IsInputRedirected -or [Console]::IsOutputRedirected) {
+        $app = Get-Command arv -CommandType Application -ErrorAction Stop | Select-Object -First 1
+        & $app.Source @argv
+        $global:LASTEXITCODE = $LASTEXITCODE
+        return
+    }
+
     $target = $null
     $status = 1
     $oldForce = $env:ARCHIVER_FORCE_INTERACTIVE
@@ -2394,10 +2415,10 @@ function Ra(e, t) {
 function La(e) {
   return `'${e.replaceAll("'", "'\\''")}'`;
 }
-function Ta(e) {
+function $a(e) {
   return `'${e.replaceAll("'", "''")}'`;
 }
-async function $a(e) {
+async function Ta(e) {
   if (process.platform === "win32") {
     const t = [
       h.join(e, "Documents", "PowerShell", "Microsoft.PowerShell_profile.ps1"),
@@ -2416,7 +2437,7 @@ function G(e, t, a, i) {
     installed: i,
     shell: e,
     profilePath: n,
-    reloadCommand: `. ${Ta(t)}`
+    reloadCommand: `. ${$a(t)}`
   } : {
     installed: i,
     shell: e,
@@ -2451,7 +2472,7 @@ async function Na(e = {}) {
       const d = await J(l, Ca);
       return G(o, l, i, d);
     }
-    const c = await $a(i);
+    const c = await Ta(i);
     await Y(h.dirname(c));
     const s = await J(c, Ea);
     return G(o, c, i, s);
@@ -3071,7 +3092,7 @@ class Pa {
     };
   }
   async preValidatePutItems(t) {
-    const a = [], i = /* @__PURE__ */ new Set(), n = await Oe(f.Dir.root);
+    const a = [], i = /* @__PURE__ */ new Set(), n = await Me(f.Dir.root);
     for (const o of t) {
       const c = h.resolve(o), s = await ae(c);
       if (!s)
@@ -3080,7 +3101,7 @@ class Pa {
             path: o
           })
         );
-      const l = await Oe(c);
+      const l = await Me(c);
       if (wa(l, n) || rt(n, l))
         throw new Error(
           r("service.archive.error.path_forbidden_archiver_scope", {
@@ -3115,7 +3136,7 @@ class Pa {
     }
   }
 }
-class Ma {
+class Oa {
   constructor(t) {
     this.context = t;
   }
@@ -3141,7 +3162,7 @@ function de(e) {
 function I(e, t, a, i) {
   e.push({ level: t, code: a, message: i });
 }
-class Oa {
+class Ma {
   constructor(t) {
     this.context = t;
   }
@@ -3542,7 +3563,7 @@ class Ba {
   constructor(t) {
     this.currentVersion = ge(t);
   }
-  async checkLatest(t = M.Repo) {
+  async checkLatest(t = O.Repo) {
     const a = await this.fetchLatestRelease(t), i = ge(a.tag_name);
     return {
       currentVersion: this.currentVersion,
@@ -3552,7 +3573,7 @@ class Ba {
       publishedAt: a.published_at
     };
   }
-  async installLatest(t = M.Repo) {
+  async installLatest(t = O.Repo) {
     const i = (await this.fetchLatestRelease(t)).assets?.find((s) => /install.*\.sh$/i.test(s.name));
     if (!i)
       throw new Error(r("service.update.error.no_install_asset"));
@@ -3560,7 +3581,7 @@ class Ba {
       headers: {
         "user-agent": "archiver-ts"
       },
-      signal: AbortSignal.timeout(M.Timeout)
+      signal: AbortSignal.timeout(O.Timeout)
     });
     if (!n.ok)
       throw new Error(
@@ -3584,7 +3605,7 @@ class Ba {
         accept: "application/vnd.github+json",
         "user-agent": "archiver-ts"
       },
-      signal: AbortSignal.timeout(M.Timeout)
+      signal: AbortSignal.timeout(O.Timeout)
     });
     if (!i.ok)
       throw new Error(
@@ -3606,7 +3627,7 @@ class Ba {
 async function qa() {
   const e = new Da();
   await e.init();
-  const t = new Fa(e), a = new Ma(e), i = new Pa(e, a), n = new ya(e, t), o = new Ha(e), c = new Oa(e), s = "0.3.3", l = new Ba(s);
+  const t = new Fa(e), a = new Oa(e), i = new Pa(e, a), n = new ya(e, t), o = new Ha(e), c = new Ma(e), s = "0.3.4", l = new Ba(s);
   return {
     context: e,
     archiveService: i,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archiver-ts",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "A TypeScript rewrite of Archiver CLI",
   "description_zh": "用TypeScript重写的Archiver CLI",
   "type": "module",