xcstrings-cli 2.5.0 → 2.5.1

package/README.md

@@ -266,6 +266,53 @@ These are the settings you can specify in the config file:
     * `skip`: Only add translations for languages included in the `xcs languages` output. (Default)
     * `include`: Add translations even when they are not recognized by the Xcode project or xcs language list.
 
+## Practical use cases
+
+### Case 1: Translate all missing strings using LLM
+
+Suppose you have a xcstrings file and want to add Japanese and Simplified Chinese translations generated by LLM.
+
+Firstly, list the strings missing those languages:
+
+```bash
+xcs strings --languages en --missing-languages ja zh-Hans
+# closeAction:
+#   en: "Close"
+# detailsAction:
+#   en: "Details"
+```
+
+Then, copy the output and use it as a prompt for the LLM to generate translations. We offer [xcstrings-cli Helper](https://chatgpt.com/g/g-69365945f8bc8191be3146f880238957-xcstrings-cli-helper), a Custom GPT that can help you generate translations in the form of an `xcs add` command. The prompt could be like this:
+
+```
+closeAction:
+  en: "Close"
+detailsAction:
+  en: "Details"
+
+Languages: ja, zh-Hans
+No comments needed.
+```
+
+Then the Custom GPT will generate an `xcs add` command like this:
+
+```bash
+xcs add --strings << EOF
+closeAction:
+    translations:
+        en: Close
+        ja: 閉じる
+        zh-Hans: 关闭
+detailsAction:
+    translations:
+        en: Details
+        ja: 詳細
+        zh-Hans: 详情
+EOF
+```
+
+Finally, copy the generated command and run it in your terminal to add the translations to your xcstrings file.
+
 ## Q&A
 
 **Q: Strings are not being added for some languages. Why?**

package/dist/index.js

@@ -7,7 +7,7 @@ import De from "json5";
 import { select as Pr, checkbox as an, confirm as Dr } from "@inquirer/prompts";
 import S from "chalk";
 import { readFile as $r, writeFile as Nn, readdir as Rn } from "node:fs/promises";
-import { XcodeProject as Br } from "@bacons/xcode";
+import { XcodeProject as zr } from "@bacons/xcode";
 const Le = "xcstrings-cli", sn = Mr(Le, {
   searchPlaces: [
     `${Le}.json`,
@@ -33,7 +33,7 @@ function cn(e, n) {
       return r.path;
   return null;
 }
-async function zr(e, n, r) {
+async function Br(e, n, r) {
   const i = n?.xcstringsPaths, t = i?.some((s) => typeof s != "string") ?? !1, o = e.startsWith("alias:") ? e.slice(6) : null;
   if (o) {
     const s = cn(i, o);
@@ -226,11 +226,11 @@ function Kr() {
     const A = p.browser.write || n;
     p.browser.write && (p.browser.asObject = !0);
     const k = p.serializers || {}, E = c(p.browser.serialize, k);
-    let B = p.browser.serialize;
-    Array.isArray(p.browser.serialize) && p.browser.serialize.indexOf("!stdSerializers.err") > -1 && (B = !1);
+    let z = p.browser.serialize;
+    Array.isArray(p.browser.serialize) && p.browser.serialize.indexOf("!stdSerializers.err") > -1 && (z = !1);
     const K = Object.keys(p.customLevels || {}), O = ["error", "fatal", "warn", "info", "debug", "trace"].concat(K);
-    typeof A == "function" && O.forEach(function(z) {
-      A[z] = A;
+    typeof A == "function" && O.forEach(function(B) {
+      A[B] = A;
     }), (p.enabled === !1 || p.browser.disabled) && (p.level = "silent");
     const M = p.level || "info", w = Object.create(A);
     w.log || (w.log = se), s(w, O, A), a({}, w), Object.defineProperty(w, "levelVal", {
@@ -247,32 +247,32 @@ function Kr() {
       levels: O,
       timestamp: J(p)
     };
-    w.levels = f(p), w.level = M, w.setMaxListeners = w.getMaxListeners = w.emit = w.addListener = w.on = w.prependListener = w.once = w.prependOnceListener = w.removeListener = w.removeAllListeners = w.listeners = w.listenerCount = w.eventNames = w.write = w.flush = se, w.serializers = k, w._serialize = E, w._stdErrSerialize = B, w.child = Ir, m && (w._logEvent = L());
+    w.levels = f(p), w.level = M, w.setMaxListeners = w.getMaxListeners = w.emit = w.addListener = w.on = w.prependListener = w.once = w.prependOnceListener = w.removeListener = w.removeAllListeners = w.listeners = w.listenerCount = w.eventNames = w.write = w.flush = se, w.serializers = k, w._serialize = E, w._stdErrSerialize = z, w.child = Ir, m && (w._logEvent = L());
     function ve() {
       return i(this.level, this);
     }
     function Z() {
       return this._level;
     }
-    function jr(z) {
-      if (z !== "silent" && !this.levels.values[z])
-        throw Error("unknown level " + z);
-      this._level = z, y(this, Y, w, "error"), y(this, Y, w, "fatal"), y(this, Y, w, "warn"), y(this, Y, w, "info"), y(this, Y, w, "debug"), y(this, Y, w, "trace"), K.forEach((ee) => {
+    function jr(B) {
+      if (B !== "silent" && !this.levels.values[B])
+        throw Error("unknown level " + B);
+      this._level = B, y(this, Y, w, "error"), y(this, Y, w, "fatal"), y(this, Y, w, "warn"), y(this, Y, w, "info"), y(this, Y, w, "debug"), y(this, Y, w, "trace"), K.forEach((ee) => {
         y(this, Y, w, ee);
       });
     }
-    function Ir(z, ee) {
-      if (!z)
+    function Ir(B, ee) {
+      if (!B)
         throw new Error("missing bindings for child Pino");
-      ee = ee || {}, E && z.serializers && (ee.serializers = z.serializers);
+      ee = ee || {}, E && B.serializers && (ee.serializers = B.serializers);
       const rn = ee.serializers;
       if (E && rn) {
         var xe = Object.assign({}, k, rn), tn = p.browser.serialize === !0 ? Object.keys(xe) : E;
-        delete z.serializers, x([z], tn, xe, this._stdErrSerialize);
+        delete B.serializers, x([B], tn, xe, this._stdErrSerialize);
       }
       function on(ln) {
-        this._childLevel = (ln._childLevel | 0) + 1, this.bindings = z, xe && (this.serializers = xe, this._serialize = tn), m && (this._logEvent = L(
-          [].concat(ln._logEvent.bindings, z)
+        this._childLevel = (ln._childLevel | 0) + 1, this.bindings = B, xe && (this.serializers = xe, this._serialize = tn), m && (this._logEvent = L(
+          [].concat(ln._logEvent.bindings, B)
         ));
       }
       on.prototype = this;
@@ -359,14 +359,14 @@ function Kr() {
   }
   function C(p, m, A, k, E = {}) {
     const {
-      level: B = () => p.levels.values[m],
+      level: z = () => p.levels.values[m],
       log: K = (Z) => Z
     } = E;
     p._serialize && x(A, p._serialize, p.serializers, p._stdErrSerialize);
     const O = A.slice();
     let M = O[0];
     const w = {};
-    k && (w.time = k), w.level = B(m, p.levels.values[m]);
+    k && (w.time = k), w.level = z(m, p.levels.values[m]);
     let Y = (p._childLevel | 0) + 1;
     if (Y < 1 && (Y = 1), M !== null && typeof M == "object") {
       for (; Y-- && typeof O[0] == "object"; )
@@ -380,11 +380,11 @@ function Kr() {
       if (k && p[E] instanceof Error)
         p[E] = u.stdSerializers.err(p[E]);
       else if (typeof p[E] == "object" && !Array.isArray(p[E]))
-        for (const B in p[E])
-          m && m.indexOf(B) > -1 && B in A && (p[E][B] = A[B](p[E][B]));
+        for (const z in p[E])
+          m && m.indexOf(z) > -1 && z in A && (p[E][z] = A[z](p[E][z]));
   }
   function _(p, m, A) {
-    const k = m.send, E = m.ts, B = m.methodLevel, K = m.methodValue, O = m.val, M = p._logEvent.bindings;
+    const k = m.send, E = m.ts, z = m.methodLevel, K = m.methodValue, O = m.val, M = p._logEvent.bindings;
     x(
       A,
       p._serialize || Object.keys(p.serializers),
@@ -392,7 +392,7 @@ function Kr() {
       p._stdErrSerialize === void 0 ? !0 : p._stdErrSerialize
     ), p._logEvent.ts = E, p._logEvent.messages = A.filter(function(w) {
       return M.indexOf(w) === -1;
-    }), p._logEvent.level.label = B, p._logEvent.level.value = K, k(B, p._logEvent, O), p._logEvent = L(M);
+    }), p._logEvent.level.label = z, p._logEvent.level.value = K, k(z, p._logEvent, O), p._logEvent = L(M);
   }
   function L(p) {
     return {
@@ -468,7 +468,7 @@ function Gr() {
 }
 function Vr(e) {
   const n = Oe(e, "project.pbxproj");
-  return (Br.open(n).rootObject.props.knownRegions ?? []).filter((o) => o !== "Base").sort();
+  return (zr.open(n).rootObject.props.knownRegions ?? []).filter((o) => o !== "Base").sort();
 }
 async function Xr(e) {
   const n = await me(e), r = /* @__PURE__ */ new Set();
@@ -651,10 +651,10 @@ function hi() {
     arguments[n].forEach(i);
   return e;
 }
-function Be(e) {
+function ze(e) {
   return this.extend(e);
 }
-Be.prototype.extend = function(n) {
+ze.prototype.extend = function(n) {
   var r = [], i = [];
   if (n instanceof j)
     i.push(n);
@@ -675,10 +675,10 @@ Be.prototype.extend = function(n) {
     if (!(o instanceof j))
       throw new P("Specified list of YAML types (or a single Type object) contains a non-Type object.");
   });
-  var t = Object.create(Be.prototype);
+  var t = Object.create(ze.prototype);
   return t.implicit = (this.implicit || []).concat(r), t.explicit = (this.explicit || []).concat(i), t.compiledImplicit = pn(t, "implicit"), t.compiledExplicit = pn(t, "explicit"), t.compiledTypeMap = hi(t.compiledImplicit, t.compiledExplicit), t;
 };
-var Bn = Be, zn = new j("tag:yaml.org,2002:str", {
+var zn = ze, Bn = new j("tag:yaml.org,2002:str", {
   kind: "scalar",
   construct: function(e) {
     return e !== null ? e : "";
@@ -693,9 +693,9 @@ var Bn = Be, zn = new j("tag:yaml.org,2002:str", {
   construct: function(e) {
     return e !== null ? e : {};
   }
-}), Hn = new Bn({
+}), Hn = new zn({
   explicit: [
-    zn,
+    Bn,
     Un,
     Yn
   ]
@@ -977,23 +977,23 @@ function $i(e) {
     i % 3 === 0 && i && (n += l[r >> 18 & 63], n += l[r >> 12 & 63], n += l[r >> 6 & 63], n += l[r & 63]), r = (r << 8) + e[i];
   return t = o % 3, t === 0 ? (n += l[r >> 18 & 63], n += l[r >> 12 & 63], n += l[r >> 6 & 63], n += l[r & 63]) : t === 2 ? (n += l[r >> 10 & 63], n += l[r >> 4 & 63], n += l[r << 2 & 63], n += l[64]) : t === 1 && (n += l[r >> 2 & 63], n += l[r << 4 & 63], n += l[64], n += l[64]), n;
 }
-function Bi(e) {
+function zi(e) {
   return Object.prototype.toString.call(e) === "[object Uint8Array]";
 }
 var nr = new j("tag:yaml.org,2002:binary", {
   kind: "scalar",
   resolve: Pi,
   construct: Di,
-  predicate: Bi,
+  predicate: zi,
   represent: $i
-}), zi = Object.prototype.hasOwnProperty, Ui = Object.prototype.toString;
+}), Bi = Object.prototype.hasOwnProperty, Ui = Object.prototype.toString;
 function Yi(e) {
   if (e === null) return !0;
   var n = [], r, i, t, o, l, a = e;
   for (r = 0, i = a.length; r < i; r += 1) {
     if (t = a[r], l = !1, Ui.call(t) !== "[object Object]") return !1;
     for (o in t)
-      if (zi.call(t, o))
+      if (Bi.call(t, o))
         if (!l) l = !0;
         else return !1;
     if (!l) return !1;
@@ -1488,7 +1488,7 @@ function yt(e, n) {
 var vt = mt, xt = yt, hr = {
   loadAll: vt,
   load: xt
-}, gr = Object.prototype.toString, mr = Object.prototype.hasOwnProperty, Qe = 65279, wt = 9, pe = 10, bt = 13, At = 32, Ct = 33, St = 34, ze = 35, kt = 37, Et = 38, _t = 39, Ot = 42, yr = 44, Ft = 45, Ee = 58, Tt = 61, Lt = 62, jt = 63, It = 64, vr = 91, xr = 93, Nt = 96, wr = 123, Rt = 124, br = 125, N = {};
+}, gr = Object.prototype.toString, mr = Object.prototype.hasOwnProperty, Qe = 65279, wt = 9, pe = 10, bt = 13, At = 32, Ct = 33, St = 34, Be = 35, kt = 37, Et = 38, _t = 39, Ot = 42, yr = 44, Ft = 45, Ee = 58, Tt = 61, Lt = 62, jt = 63, It = 64, vr = 91, xr = 93, Nt = 96, wr = 123, Rt = 124, br = 125, N = {};
 N[0] = "\\0";
 N[7] = "\\a";
 N[8] = "\\b";
@@ -1541,9 +1541,9 @@ function $t(e) {
     throw new P("code point within a string may not be greater than 0xFFFFFFFF");
   return "\\" + r + T.repeat("0", i - n.length) + n;
 }
-var Bt = 1, de = 2;
-function zt(e) {
-  this.schema = e.schema || Ge, this.indent = Math.max(1, e.indent || 2), this.noArrayIndent = e.noArrayIndent || !1, this.skipInvalid = e.skipInvalid || !1, this.flowLevel = T.isNothing(e.flowLevel) ? -1 : e.flowLevel, this.styleMap = Dt(this.schema, e.styles || null), this.sortKeys = e.sortKeys || !1, this.lineWidth = e.lineWidth || 80, this.noRefs = e.noRefs || !1, this.noCompatMode = e.noCompatMode || !1, this.condenseFlow = e.condenseFlow || !1, this.quotingType = e.quotingType === '"' ? de : Bt, this.forceQuotes = e.forceQuotes || !1, this.replacer = typeof e.replacer == "function" ? e.replacer : null, this.implicitTypes = this.schema.compiledImplicit, this.explicitTypes = this.schema.compiledExplicit, this.tag = null, this.result = "", this.duplicates = [], this.usedDuplicates = null;
+var zt = 1, de = 2;
+function Bt(e) {
+  this.schema = e.schema || Ge, this.indent = Math.max(1, e.indent || 2), this.noArrayIndent = e.noArrayIndent || !1, this.skipInvalid = e.skipInvalid || !1, this.flowLevel = T.isNothing(e.flowLevel) ? -1 : e.flowLevel, this.styleMap = Dt(this.schema, e.styles || null), this.sortKeys = e.sortKeys || !1, this.lineWidth = e.lineWidth || 80, this.noRefs = e.noRefs || !1, this.noCompatMode = e.noCompatMode || !1, this.condenseFlow = e.condenseFlow || !1, this.quotingType = e.quotingType === '"' ? de : zt, this.forceQuotes = e.forceQuotes || !1, this.replacer = typeof e.replacer == "function" ? e.replacer : null, this.implicitTypes = this.schema.compiledImplicit, this.explicitTypes = this.schema.compiledExplicit, this.tag = null, this.result = "", this.duplicates = [], this.usedDuplicates = null;
 }
 function xn(e, n) {
   for (var r = T.repeat(" ", n), i = 0, t = -1, o = "", l, a = e.length; i < a; )
@@ -1579,11 +1579,11 @@ function bn(e, n, r) {
     (r ? (
       // c = flow-in
       i
-    ) : i && e !== yr && e !== vr && e !== xr && e !== wr && e !== br) && e !== ze && !(n === Ee && !t) || wn(n) && !_e(n) && e === ze || n === Ee && t
+    ) : i && e !== yr && e !== vr && e !== xr && e !== wr && e !== br) && e !== Be && !(n === Ee && !t) || wn(n) && !_e(n) && e === Be || n === Ee && t
   );
 }
 function Yt(e) {
-  return he(e) && e !== Qe && !_e(e) && e !== Ft && e !== jt && e !== Ee && e !== yr && e !== vr && e !== xr && e !== wr && e !== br && e !== ze && e !== Et && e !== Ot && e !== Ct && e !== Rt && e !== Tt && e !== Lt && e !== _t && e !== St && e !== kt && e !== It && e !== Nt;
+  return he(e) && e !== Qe && !_e(e) && e !== Ft && e !== jt && e !== Ee && e !== yr && e !== vr && e !== xr && e !== wr && e !== br && e !== Be && e !== Et && e !== Ot && e !== Ct && e !== Rt && e !== Tt && e !== Lt && e !== _t && e !== St && e !== kt && e !== It && e !== Nt;
 }
 function Ht(e) {
   return !_e(e) && e !== Ee;
@@ -1785,7 +1785,7 @@ function He(e, n, r) {
 }
 function Zt(e, n) {
   n = n || {};
-  var r = new zt(n);
+  var r = new Bt(n);
   r.noRefs || Jt(e, r);
   var i = e;
   return r.replacer && (i = r.replacer.call({ "": i }, "", i)), W(r, 0, i, !0, !0) ? r.dump + `
@@ -1799,7 +1799,7 @@ function Je(e, n) {
     throw new Error("Function yaml." + e + " is removed in js-yaml 4. Use yaml." + n + " instead, which is now safe by default.");
   };
 }
-var ro = j, io = Bn, to = Hn, oo = Vn, lo = Xn, ao = Ge, so = hr.load, co = hr.loadAll, uo = no.dump, fo = P, po = {
+var ro = j, io = zn, to = Hn, oo = Vn, lo = Xn, ao = Ge, so = hr.load, co = hr.loadAll, uo = no.dump, fo = P, po = {
   binary: nr,
   float: Gn,
   map: Yn,
@@ -1812,7 +1812,7 @@ var ro = j, io = Bn, to = Hn, oo = Vn, lo = Xn, ao = Ge, so = hr.load, co = hr.l
   merge: er,
   omap: rr,
   seq: Un,
-  str: zn
+  str: Bn
 }, ho = Je("safeLoad", "load"), go = Je("safeLoadAll", "loadAll"), mo = Je("safeDump", "dump"), _n = {
   Type: ro,
   Schema: io,
@@ -2005,7 +2005,11 @@ async function So({
   const g = u?.kind === "single" ? u.translations : void 0, y = u?.kind === "single" ? u.comment : void 0;
   return await On(e, h, r ?? y, g, s, o, l, f), { kind: "single", keys: [h] };
 }
-function ko() {
+const ko = (e) => {
+  const n = Object.entries(e).sort(([r], [i]) => r.localeCompare(i, "en", { sensitivity: "case" }));
+  return Object.fromEntries(n);
+};
+function Eo() {
   return {
     command: "add",
     describe: "Add a string",
@@ -2112,9 +2116,9 @@ async function On(e, n, r, i, t, o, l, a) {
         };
     }
   }
-  s.strings[n] = d, await Mn(e, s);
+  s.strings[n] = d, d.localizations && (d.localizations = ko(d.localizations)), await Mn(e, s);
 }
-function Eo() {
+function _o() {
   return {
     command: "remove",
     describe: "Remove a string",
@@ -2138,7 +2142,7 @@ function Eo() {
       throw new Error("Either --key or --languages must be provided");
     }),
     handler: async (e) => {
-      const n = await Oo(
+      const n = await Fo(
         e.path,
         e.key,
         e.languages,
@@ -2155,14 +2159,14 @@ ${r}`));
     }
   };
 }
-function _o(e, n, r, i, t) {
+function Oo(e, n, r, i, t) {
   if (e.localizations) {
     for (const o of n)
       e.localizations[o] && (t[i] ??= [], t[i].push(o), r || delete e.localizations[o]);
     !r && e.localizations && Object.keys(e.localizations).length === 0 && delete e.localizations;
   }
 }
-async function Oo(e, n, r, i = !1) {
+async function Fo(e, n, r, i = !1) {
   const t = await me(e), o = {}, l = t.strings || {};
   t.strings = l;
   const a = n ? [n] : Object.keys(l);
@@ -2176,23 +2180,23 @@ async function Oo(e, n, r, i = !1) {
       o[c] = g, i || delete l[c], s = !0;
       continue;
     }
-    _o(u, r, i, c, o);
+    Oo(u, r, i, c, o);
     const f = o[c]?.length ?? 0;
     !(u.localizations && Object.keys(u.localizations).length > 0) && f > 0 && (i || delete l[c]), f > 0 && (s = !0);
   }
   return !i && s && await Mn(e, t), o;
 }
 const Me = "xcstrings-cli.json5";
-function Fo() {
+function To() {
   return {
     command: "init",
     describe: "Initialize configuration file",
     handler: async () => {
-      await jo();
+      await Io();
     }
   };
 }
-async function To(e) {
+async function Lo(e) {
   const n = [];
   async function r(i) {
     try {
@@ -2206,7 +2210,7 @@ async function To(e) {
   }
   return await r(e), n;
 }
-async function Lo(e) {
+async function jo(e) {
   const n = [];
   let r = e;
   try {
@@ -2217,12 +2221,12 @@ async function Lo(e) {
   }
   return n;
 }
-async function jo() {
+async function Io() {
   const e = process.cwd();
   console.log(), console.log(S.bold.cyan("🚀 xcstrings-cli Configuration Setup")), console.log(S.dim("─".repeat(40))), console.log(), console.log(S.yellow("🔍 Searching for .xcstrings files..."));
-  const n = await To(e);
+  const n = await Lo(e);
   console.log(S.yellow("🔍 Searching for .xcodeproj directories..."));
-  const r = await Lo(e);
+  const r = await jo(e);
   console.log();
   let i = [];
   if (n.length > 0) {
@@ -2277,13 +2281,13 @@ ${a}
 `;
   await Nn(Me, s, "utf-8"), console.log(), console.log(S.bold.green(`✓ Created ${Me}`)), console.log(S.dim(`   Run ${S.cyan("xcstrings --help")} to see available commands.`)), console.log();
 }
-var Io = Object.prototype.toString, ae = Array.isArray || function(n) {
-  return Io.call(n) === "[object Array]";
+var No = Object.prototype.toString, ae = Array.isArray || function(n) {
+  return No.call(n) === "[object Array]";
 };
 function Ze(e) {
   return typeof e == "function";
 }
-function No(e) {
+function Ro(e) {
   return ae(e) ? "array" : typeof e;
 }
 function Pe(e) {
@@ -2292,16 +2296,16 @@ function Pe(e) {
 function Fn(e, n) {
   return e != null && typeof e == "object" && n in e;
 }
-function Ro(e, n) {
+function Mo(e, n) {
   return e != null && typeof e != "object" && e.hasOwnProperty && e.hasOwnProperty(n);
 }
-var Mo = RegExp.prototype.test;
-function Po(e, n) {
-  return Mo.call(e, n);
+var Po = RegExp.prototype.test;
+function Do(e, n) {
+  return Po.call(e, n);
 }
-var Do = /\S/;
-function $o(e) {
-  return !Po(Do, e);
+var $o = /\S/;
+function zo(e) {
+  return !Do($o, e);
 }
 var Bo = {
   "&": "&amp;",
@@ -2313,13 +2317,13 @@ var Bo = {
   "`": "&#x60;",
   "=": "&#x3D;"
 };
-function zo(e) {
+function Uo(e) {
   return String(e).replace(/[&<>"'`=\/]/g, function(r) {
     return Bo[r];
   });
 }
-var Uo = /\s*/, Yo = /\s+/, Tn = /\s*=/, Ho = /\s*\}/, Ko = /#|\^|\/|>|\{|&|=|!/;
-function Wo(e, n) {
+var Yo = /\s*/, Ho = /\s+/, Tn = /\s*=/, Ko = /\s*\}/, Wo = /#|\^|\/|>|\{|&|=|!/;
+function qo(e, n) {
   if (!e)
     return [];
   var r = !1, i = [], t = [], o = [], l = !1, a = !1, s = "", c = 0;
@@ -2333,7 +2337,7 @@ function Wo(e, n) {
   }
   var f, h, g;
   function y(I) {
-    if (typeof I == "string" && (I = I.split(Yo, 2)), !ae(I) || I.length !== 2)
+    if (typeof I == "string" && (I = I.split(Ho, 2)), !ae(I) || I.length !== 2)
       throw new Error("Invalid tags: " + I);
     f = new RegExp(Pe(I[0]) + "\\s*"), h = new RegExp("\\s*" + Pe(I[1])), g = new RegExp("\\s*" + Pe("}" + I[1]));
   }
@@ -2341,11 +2345,11 @@ function Wo(e, n) {
   for (var d = new ye(e), b, C, x, _, L, R; !d.eos(); ) {
     if (b = d.pos, x = d.scanUntil(f), x)
       for (var J = 0, V = x.length; J < V; ++J)
-        _ = x.charAt(J), $o(_) ? (o.push(t.length), s += _) : (a = !0, r = !0, s += " "), t.push(["text", _, b, b + 1]), b += 1, _ === `
+        _ = x.charAt(J), zo(_) ? (o.push(t.length), s += _) : (a = !0, r = !0, s += " "), t.push(["text", _, b, b + 1]), b += 1, _ === `
 ` && (u(), s = "", c = 0, r = !1);
     if (!d.scan(f))
       break;
-    if (l = !0, C = d.scan(Ko) || "name", d.scan(Uo), C === "=" ? (x = d.scanUntil(Tn), d.scan(Tn), d.scanUntil(h)) : C === "{" ? (x = d.scanUntil(g), d.scan(Ho), d.scanUntil(h), C = "&") : x = d.scanUntil(h), !d.scan(h))
+    if (l = !0, C = d.scan(Wo) || "name", d.scan(Yo), C === "=" ? (x = d.scanUntil(Tn), d.scan(Tn), d.scanUntil(h)) : C === "{" ? (x = d.scanUntil(g), d.scan(Ko), d.scanUntil(h), C = "&") : x = d.scanUntil(h), !d.scan(h))
       throw new Error("Unclosed tag at " + d.pos);
     if (C == ">" ? L = [C, x, b, d.pos, s, c, r] : L = [C, x, b, d.pos], c++, t.push(L), C === "#" || C === "^")
       i.push(L);
@@ -2358,14 +2362,14 @@ function Wo(e, n) {
   }
   if (u(), R = i.pop(), R)
     throw new Error('Unclosed section "' + R[1] + '" at ' + d.pos);
-  return Go(qo(t));
+  return Vo(Go(t));
 }
-function qo(e) {
+function Go(e) {
   for (var n = [], r, i, t = 0, o = e.length; t < o; ++t)
     r = e[t], r && (r[0] === "text" && i && i[0] === "text" ? (i[1] += r[1], i[3] = r[3]) : (n.push(r), i = r));
   return n;
 }
-function Go(e) {
+function Vo(e) {
   for (var n = [], r = n, i = [], t, o, l = 0, a = e.length; l < a; ++l)
     switch (t = e[l], t[0]) {
       case "#":
@@ -2421,7 +2425,7 @@ le.prototype.lookup = function(n) {
     for (var t = this, o, l, a, s = !1; t; ) {
       if (n.indexOf(".") > 0)
         for (o = t.view, l = n.split("."), a = 0; o != null && a < l.length; )
-          a === l.length - 1 && (s = Fn(o, l[a]) || Ro(o, l[a])), o = o[l[a++]];
+          a === l.length - 1 && (s = Fn(o, l[a]) || Mo(o, l[a])), o = o[l[a++]];
       else
         o = t.view[n], s = Fn(t.view, n);
       if (s) {
@@ -2453,7 +2457,7 @@ $.prototype.clearCache = function() {
 };
 $.prototype.parse = function(n, r) {
   var i = this.templateCache, t = n + ":" + (r || D.tags).join(":"), o = typeof i < "u", l = o ? i.get(t) : void 0;
-  return l == null && (l = Wo(n, r), o && i.set(t, l)), l;
+  return l == null && (l = qo(n, r), o && i.set(t, l)), l;
 };
 $.prototype.render = function(n, r, i, t) {
   var o = this.getConfigTags(t), l = this.parse(n, o), a = r instanceof le ? r : new le(r, void 0);
@@ -2561,10 +2565,10 @@ D.parse = function(n, r) {
 };
 D.render = function(n, r, i, t) {
   if (typeof n != "string")
-    throw new TypeError('Invalid template! Template should be a "string" but "' + No(n) + '" was given as the first argument for mustache#render(template, view, partials)');
+    throw new TypeError('Invalid template! Template should be a "string" but "' + Ro(n) + '" was given as the first argument for mustache#render(template, view, partials)');
   return ge.render(n, r, i, t);
 };
-D.escape = zo;
+D.escape = Uo;
 D.Scanner = ye;
 D.Context = le;
 D.Writer = $;
@@ -2580,7 +2584,7 @@ function Ln(e, {
     return r !== void 0 ? { pattern: r, mode: "regex" } : i !== void 0 ? { pattern: i, mode: "substring" } : { pattern: n, mode: "glob" };
   }
 }
-function Vo() {
+function Xo() {
   return {
     command: "strings",
     describe: "List strings in the xcstrings file",
@@ -2638,7 +2642,7 @@ function Vo() {
         glob: r[0],
         regex: e["text-regex"],
         substring: e["text-substring"]
-      }), o = await Jo({
+      }), o = await Zo({
         path: e.path,
         languages: e.languages,
         missingLanguages: e["missing-languages"],
@@ -2650,7 +2654,7 @@ function Vo() {
     }
   };
 }
-function Xo(e) {
+function Qo(e) {
   const n = e.replace(/[.+^${}()|\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
   return new RegExp(`^${n}$`);
 }
@@ -2664,10 +2668,10 @@ function jn(e) {
     const r = e.pattern;
     return (i) => i.includes(r);
   }
-  const n = Xo(e.pattern);
+  const n = Qo(e.pattern);
   return (r) => n.test(r);
 }
-function Qo(e, n) {
+function Jo(e, n) {
   const r = D.escape;
   D.escape = (i) => i;
   try {
@@ -2676,7 +2680,7 @@ function Qo(e, n) {
     D.escape = r;
   }
 }
-async function Jo(e) {
+async function Zo(e) {
   const r = (await me(e.path)).strings ?? {}, i = jn(e.keyFilter), t = jn(e.textFilter), o = e.languages ? new Set(e.languages) : null, l = e.missingLanguages ? new Set(e.missingLanguages) : null, a = !!e.format, s = [];
   for (const c of Object.keys(r)) {
     if (!i(c)) continue;
@@ -2684,7 +2688,7 @@ async function Jo(e) {
     for (const d of h) {
       if (o && !o.has(d)) continue;
       const b = f[d]?.stringUnit?.value ?? "";
-      t(b) && (a && e.format ? y.push(Qo(e.format, { language: d, key: c, text: b })) : y.push(`  ${d}: ${JSON.stringify(b)}`));
+      t(b) && (a && e.format ? y.push(Jo(e.format, { language: d, key: c, text: b })) : y.push(`  ${d}: ${JSON.stringify(b)}`));
     }
     y.length !== 0 && g && (a ? s.push(...y) : s.push(`${c}:`, ...y));
   }
@@ -2701,13 +2705,13 @@ Nr(Rr(process.argv)).scriptName("xcstrings").usage("$0 <cmd> [args]").option("co
   default: In
 }).middleware(async (e) => {
   const n = await We(e.config);
-  e.path = await zr(e.path, n, In);
+  e.path = await Br(e.path, n, In);
 }).command([
-  ko(),
   Eo(),
-  Fo(),
+  _o(),
+  To(),
   Gr(),
-  Vo()
+  Xo()
 ]).demandCommand(1, "").strictCommands().recommendCommands().showHelpOnFail(!0).fail((e, n, r) => {
   const i = e || n?.message;
   i && (console.error(S.red(i)), console.log(), r.showHelp(), process.exit(1)), n && (console.error(n), process.exit(1)), r.showHelp(), process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcstrings-cli",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "A command line tool for handling xcstrings files.",
   "type": "module",
   "bin": {