xcstrings-cli 2.7.1 → 2.7.2

package/dist/index.js

@@ -436,7 +436,7 @@ function Mi(e) {
   return e === null ? !1 : ir.exec(e) !== null || tr.exec(e) !== null;
 }
 function Di(e) {
-  var n, r, i, t, o, l, a, s = 0, c = null, f, u, h;
+  var n, r, i, t, o, l, a, s = 0, c = null, f, u, g;
   if (n = ir.exec(e), n === null && (n = tr.exec(e)), n === null) throw new Error("Date resolve error");
   if (r = +n[1], i = +n[2] - 1, t = +n[3], !n[4])
     return new Date(Date.UTC(r, i, t));
@@ -445,7 +445,7 @@ function Di(e) {
       s += "0";
     s = +s;
   }
-  return n[9] && (f = +n[10], u = +(n[11] || 0), c = (f * 60 + u) * 6e4, n[9] === "-" && (c = -c)), h = new Date(Date.UTC(r, i, t, o, l, a, s)), c && h.setTime(h.getTime() - c), h;
+  return n[9] && (f = +n[10], u = +(n[11] || 0), c = (f * 60 + u) * 6e4, n[9] === "-" && (c = -c)), g = new Date(Date.UTC(r, i, t, o, l, a, s)), c && g.setTime(g.getTime() - c), g;
 }
 function zi(e) {
   return e.toISOString();
@@ -709,31 +709,31 @@ function on(e, n) {
 `, n - 1));
 }
 function ut(e, n, r) {
-  var i, t, o, l, a, s, c, f, u = e.kind, h = e.result, g;
-  if (g = e.input.charCodeAt(e.position), B(g) || te(g) || g === 35 || g === 38 || g === 42 || g === 33 || g === 124 || g === 62 || g === 39 || g === 34 || g === 37 || g === 64 || g === 96 || (g === 63 || g === 45) && (t = e.input.charCodeAt(e.position + 1), B(t) || r && te(t)))
+  var i, t, o, l, a, s, c, f, u = e.kind, g = e.result, h;
+  if (h = e.input.charCodeAt(e.position), B(h) || te(h) || h === 35 || h === 38 || h === 42 || h === 33 || h === 124 || h === 62 || h === 39 || h === 34 || h === 37 || h === 64 || h === 96 || (h === 63 || h === 45) && (t = e.input.charCodeAt(e.position + 1), B(t) || r && te(t)))
     return !1;
-  for (e.kind = "scalar", e.result = "", o = l = e.position, a = !1; g !== 0; ) {
-    if (g === 58) {
+  for (e.kind = "scalar", e.result = "", o = l = e.position, a = !1; h !== 0; ) {
+    if (h === 58) {
       if (t = e.input.charCodeAt(e.position + 1), B(t) || r && te(t))
         break;
-    } else if (g === 35) {
+    } else if (h === 35) {
       if (i = e.input.charCodeAt(e.position - 1), B(i))
         break;
     } else {
-      if (e.position === e.lineStart && Pe(e) || r && te(g))
+      if (e.position === e.lineStart && Pe(e) || r && te(h))
         break;
-      if (H(g))
+      if (H(h))
         if (s = e.line, c = e.lineStart, f = e.lineIndent, F(e, !1, -1), e.lineIndent >= n) {
-          a = !0, g = e.input.charCodeAt(e.position);
+          a = !0, h = e.input.charCodeAt(e.position);
           continue;
         } else {
           e.position = l, e.line = s, e.lineStart = c, e.lineIndent = f;
           break;
         }
     }
-    a && (q(e, o, l, !1), on(e, e.line - s), o = l = e.position, a = !1), J(g) || (l = e.position + 1), g = e.input.charCodeAt(++e.position);
+    a && (q(e, o, l, !1), on(e, e.line - s), o = l = e.position, a = !1), J(h) || (l = e.position + 1), h = e.input.charCodeAt(++e.position);
   }
-  return q(e, o, l, !1), e.result ? !0 : (e.kind = u, e.result = h, !1);
+  return q(e, o, l, !1), e.result ? !0 : (e.kind = u, e.result = g, !1);
 }
 function ft(e, n) {
   var r, i, t;
@@ -772,17 +772,17 @@ function pt(e, n) {
   x(e, "unexpected end of the stream within a double quoted scalar");
 }
 function dt(e, n) {
-  var r = !0, i, t, o, l = e.tag, a, s = e.anchor, c, f, u, h, g, m = /* @__PURE__ */ Object.create(null), d, w, k, v;
+  var r = !0, i, t, o, l = e.tag, a, s = e.anchor, c, f, u, g, h, m = /* @__PURE__ */ Object.create(null), d, w, k, v;
   if (v = e.input.charCodeAt(e.position), v === 91)
-    f = 93, g = !1, a = [];
+    f = 93, h = !1, a = [];
   else if (v === 123)
-    f = 125, g = !0, a = {};
+    f = 125, h = !0, a = {};
   else
     return !1;
   for (e.anchor !== null && (e.anchorMap[e.anchor] = a), v = e.input.charCodeAt(++e.position); v !== 0; ) {
     if (F(e, !0, n), v = e.input.charCodeAt(e.position), v === f)
-      return e.position++, e.tag = l, e.anchor = s, e.kind = g ? "mapping" : "sequence", e.result = a, !0;
-    r ? v === 44 && x(e, "expected the node content, but found ','") : x(e, "missed comma between flow collection entries"), w = d = k = null, u = h = !1, v === 63 && (c = e.input.charCodeAt(e.position + 1), B(c) && (u = h = !0, e.position++, F(e, !0, n))), i = e.line, t = e.lineStart, o = e.position, se(e, n, Oe, !1, !0), w = e.tag, d = e.result, F(e, !0, n), v = e.input.charCodeAt(e.position), (h || e.line === i) && v === 58 && (u = !0, v = e.input.charCodeAt(++e.position), F(e, !0, n), se(e, n, Oe, !1, !0), k = e.result), g ? oe(e, a, m, w, d, k, i, t, o) : u ? a.push(oe(e, null, m, w, d, k, i, t, o)) : a.push(d), F(e, !0, n), v = e.input.charCodeAt(e.position), v === 44 ? (r = !0, v = e.input.charCodeAt(++e.position)) : r = !1;
+      return e.position++, e.tag = l, e.anchor = s, e.kind = h ? "mapping" : "sequence", e.result = a, !0;
+    r ? v === 44 && x(e, "expected the node content, but found ','") : x(e, "missed comma between flow collection entries"), w = d = k = null, u = g = !1, v === 63 && (c = e.input.charCodeAt(e.position + 1), B(c) && (u = g = !0, e.position++, F(e, !0, n))), i = e.line, t = e.lineStart, o = e.position, se(e, n, Oe, !1, !0), w = e.tag, d = e.result, F(e, !0, n), v = e.input.charCodeAt(e.position), (g || e.line === i) && v === 58 && (u = !0, v = e.input.charCodeAt(++e.position), F(e, !0, n), se(e, n, Oe, !1, !0), k = e.result), h ? oe(e, a, m, w, d, k, i, t, o) : u ? a.push(oe(e, null, m, w, d, k, i, t, o)) : a.push(d), F(e, !0, n), v = e.input.charCodeAt(e.position), v === 44 ? (r = !0, v = e.input.charCodeAt(++e.position)) : r = !1;
   }
   x(e, "unexpected end of the stream within a flow collection");
 }
@@ -849,11 +849,11 @@ function En(e, n) {
   return a ? (e.tag = i, e.anchor = t, e.kind = "sequence", e.result = o, !0) : !1;
 }
 function gt(e, n, r) {
-  var i, t, o, l, a, s, c = e.tag, f = e.anchor, u = {}, h = /* @__PURE__ */ Object.create(null), g = null, m = null, d = null, w = !1, k = !1, v;
+  var i, t, o, l, a, s, c = e.tag, f = e.anchor, u = {}, g = /* @__PURE__ */ Object.create(null), h = null, m = null, d = null, w = !1, k = !1, v;
   if (e.firstTabInLine !== -1) return !1;
   for (e.anchor !== null && (e.anchorMap[e.anchor] = u), v = e.input.charCodeAt(e.position); v !== 0; ) {
     if (!w && e.firstTabInLine !== -1 && (e.position = e.firstTabInLine, x(e, "tab characters must not be used in indentation")), i = e.input.charCodeAt(e.position + 1), o = e.line, (v === 63 || v === 58) && B(i))
-      v === 63 ? (w && (oe(e, u, h, g, m, null, l, a, s), g = m = d = null), k = !0, w = !0, t = !0) : w ? (w = !1, t = !0) : x(e, "incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"), e.position += 1, v = i;
+      v === 63 ? (w && (oe(e, u, g, h, m, null, l, a, s), h = m = d = null), k = !0, w = !0, t = !0) : w ? (w = !1, t = !0) : x(e, "incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"), e.position += 1, v = i;
     else {
       if (l = e.line, a = e.lineStart, s = e.position, !se(e, r, fr, !1, !0))
         break;
@@ -861,7 +861,7 @@ function gt(e, n, r) {
         for (v = e.input.charCodeAt(e.position); J(v); )
           v = e.input.charCodeAt(++e.position);
         if (v === 58)
-          v = e.input.charCodeAt(++e.position), B(v) || x(e, "a whitespace character is expected after the key-value separator within a block mapping"), w && (oe(e, u, h, g, m, null, l, a, s), g = m = d = null), k = !0, w = !1, t = !1, g = e.tag, m = e.result;
+          v = e.input.charCodeAt(++e.position), B(v) || x(e, "a whitespace character is expected after the key-value separator within a block mapping"), w && (oe(e, u, g, h, m, null, l, a, s), h = m = d = null), k = !0, w = !1, t = !1, h = e.tag, m = e.result;
         else if (k)
           x(e, "can not read an implicit mapping pair; a colon is missed");
         else
@@ -871,12 +871,12 @@ function gt(e, n, r) {
       else
         return e.tag = c, e.anchor = f, !0;
     }
-    if ((e.line === o || e.lineIndent > n) && (w && (l = e.line, a = e.lineStart, s = e.position), se(e, n, _e, !0, t) && (w ? m = e.result : d = e.result), w || (oe(e, u, h, g, m, d, l, a, s), g = m = d = null), F(e, !0, -1), v = e.input.charCodeAt(e.position)), (e.line === o || e.lineIndent > n) && v !== 0)
+    if ((e.line === o || e.lineIndent > n) && (w && (l = e.line, a = e.lineStart, s = e.position), se(e, n, _e, !0, t) && (w ? m = e.result : d = e.result), w || (oe(e, u, g, h, m, d, l, a, s), h = m = d = null), F(e, !0, -1), v = e.input.charCodeAt(e.position)), (e.line === o || e.lineIndent > n) && v !== 0)
       x(e, "bad indentation of a mapping entry");
     else if (e.lineIndent < n)
       break;
   }
-  return w && oe(e, u, h, g, m, null, l, a, s), k && (e.tag = c, e.anchor = f, e.kind = "mapping", e.result = u), k;
+  return w && oe(e, u, g, h, m, null, l, a, s), k && (e.tag = c, e.anchor = f, e.kind = "mapping", e.result = u), k;
 }
 function mt(e) {
   var n, r = !1, i = !1, t, o, l;
@@ -914,14 +914,14 @@ function vt(e) {
   return e.position === n && x(e, "name of an alias node must contain at least one character"), r = e.input.slice(n, e.position), G.call(e.anchorMap, r) || x(e, 'unidentified alias "' + r + '"'), e.result = e.anchorMap[r], F(e, !0, -1), !0;
 }
 function se(e, n, r, i, t) {
-  var o, l, a, s = 1, c = !1, f = !1, u, h, g, m, d, w;
+  var o, l, a, s = 1, c = !1, f = !1, u, g, h, m, d, w;
   if (e.listener !== null && e.listener("open", e), e.tag = null, e.anchor = null, e.kind = null, e.result = null, o = l = a = _e === r || pr === r, i && F(e, !0, -1) && (c = !0, e.lineIndent > n ? s = 1 : e.lineIndent === n ? s = 0 : e.lineIndent < n && (s = -1)), s === 1)
     for (; mt(e) || yt(e); )
       F(e, !0, -1) ? (c = !0, a = o, e.lineIndent > n ? s = 1 : e.lineIndent === n ? s = 0 : e.lineIndent < n && (s = -1)) : a = !1;
   if (a && (a = c || t), (s === 1 || _e === r) && (Oe === r || fr === r ? d = n : d = n + 1, w = e.position - e.lineStart, s === 1 ? a && (En(e, w) || gt(e, w, d)) || dt(e, d) ? f = !0 : (l && ht(e, d) || ft(e, d) || pt(e, d) ? f = !0 : vt(e) ? (f = !0, (e.tag !== null || e.anchor !== null) && x(e, "alias node should not have any properties")) : ut(e, d, Oe === r) && (f = !0, e.tag === null && (e.tag = "?")), e.anchor !== null && (e.anchorMap[e.anchor] = e.result)) : s === 0 && (f = a && En(e, w))), e.tag === null)
     e.anchor !== null && (e.anchorMap[e.anchor] = e.result);
   else if (e.tag === "?") {
-    for (e.result !== null && e.kind !== "scalar" && x(e, 'unacceptable node kind for !<?> tag; it should be "scalar", not "' + e.kind + '"'), u = 0, h = e.implicitTypes.length; u < h; u += 1)
+    for (e.result !== null && e.kind !== "scalar" && x(e, 'unacceptable node kind for !<?> tag; it should be "scalar", not "' + e.kind + '"'), u = 0, g = e.implicitTypes.length; u < g; u += 1)
       if (m = e.implicitTypes[u], m.resolve(e.result)) {
         e.result = m.construct(e.result), e.tag = m.tag, e.anchor !== null && (e.anchorMap[e.anchor] = e.result);
         break;
@@ -930,9 +930,9 @@ function se(e, n, r, i, t) {
     if (G.call(e.typeMap[e.kind || "fallback"], e.tag))
       m = e.typeMap[e.kind || "fallback"][e.tag];
     else
-      for (m = null, g = e.typeMap.multi[e.kind || "fallback"], u = 0, h = g.length; u < h; u += 1)
-        if (e.tag.slice(0, g[u].tag.length) === g[u].tag) {
-          m = g[u];
+      for (m = null, h = e.typeMap.multi[e.kind || "fallback"], u = 0, g = h.length; u < g; u += 1)
+        if (e.tag.slice(0, h[u].tag.length) === h[u].tag) {
+          m = h[u];
           break;
         }
     m || x(e, "unknown tag !<" + e.tag + ">"), e.result !== null && m.kind !== e.kind && x(e, "unacceptable node kind for !<" + e.tag + '> tag; it should be "' + m.kind + '", not "' + e.kind + '"'), m.resolve(e.result, e.tag) ? (e.result = m.construct(e.result, e.tag), e.anchor !== null && (e.anchorMap[e.anchor] = e.result)) : x(e, "cannot resolve a node with !<" + e.tag + "> explicit tag");
@@ -1108,7 +1108,7 @@ function _r(e) {
 }
 var Fr = 1, Ve = 2, Tr = 3, Lr = 4, ie = 5;
 function Vt(e, n, r, i, t, o, l, a) {
-  var s, c = 0, f = null, u = !1, h = !1, g = i !== -1, m = -1, d = qt(he(e, 0)) && Gt(he(e, e.length - 1));
+  var s, c = 0, f = null, u = !1, g = !1, h = i !== -1, m = -1, d = qt(he(e, 0)) && Gt(he(e, e.length - 1));
   if (n || l)
     for (s = 0; s < e.length; c >= 65536 ? s += 2 : s++) {
       if (c = he(e, s), !ve(c))
@@ -1118,15 +1118,15 @@ function Vt(e, n, r, i, t, o, l, a) {
   else {
     for (s = 0; s < e.length; c >= 65536 ? s += 2 : s++) {
       if (c = he(e, s), c === me)
-        u = !0, g && (h = h || // Foldable line = too long, and not more-indented.
+        u = !0, h && (g = g || // Foldable line = too long, and not more-indented.
         s - m - 1 > i && e[m + 1] !== " ", m = s);
       else if (!ve(c))
         return ie;
       d = d && Fn(c, f, a), f = c;
     }
-    h = h || g && s - m - 1 > i && e[m + 1] !== " ";
+    g = g || h && s - m - 1 > i && e[m + 1] !== " ";
   }
-  return !u && !h ? d && !l && !t(e) ? Fr : o === ye ? ie : Ve : r > 9 && _r(e) ? ie : l ? o === ye ? ie : Ve : h ? Lr : Tr;
+  return !u && !g ? d && !l && !t(e) ? Fr : o === ye ? ie : Ve : r > 9 && _r(e) ? ie : l ? o === ye ? ie : Ve : g ? Lr : Tr;
 }
 function Xt(e, n, r, i, t) {
   e.dump = (function() {
@@ -1221,7 +1221,7 @@ function eo(e, n, r) {
   e.tag = t, e.dump = "{" + i + "}";
 }
 function no(e, n, r, i) {
-  var t = "", o = e.tag, l = Object.keys(r), a, s, c, f, u, h;
+  var t = "", o = e.tag, l = Object.keys(r), a, s, c, f, u, g;
   if (e.sortKeys === !0)
     l.sort();
   else if (typeof e.sortKeys == "function")
@@ -1229,7 +1229,7 @@ function no(e, n, r, i) {
   else if (e.sortKeys)
     throw new M("sortKeys must be a boolean or a function");
   for (a = 0, s = l.length; a < s; a += 1)
-    h = "", (!i || t !== "") && (h += Ge(e, n)), c = l[a], f = r[c], e.replacer && (f = e.replacer.call(r, c, f)), W(e, n + 1, c, !0, !0, !0) && (u = e.tag !== null && e.tag !== "?" || e.dump && e.dump.length > 1024, u && (e.dump && me === e.dump.charCodeAt(0) ? h += "?" : h += "? "), h += e.dump, u && (h += Ge(e, n)), W(e, n + 1, f, !0, u) && (e.dump && me === e.dump.charCodeAt(0) ? h += ":" : h += ": ", h += e.dump, t += h));
+    g = "", (!i || t !== "") && (g += Ge(e, n)), c = l[a], f = r[c], e.replacer && (f = e.replacer.call(r, c, f)), W(e, n + 1, c, !0, !0, !0) && (u = e.tag !== null && e.tag !== "?" || e.dump && e.dump.length > 1024, u && (e.dump && me === e.dump.charCodeAt(0) ? g += "?" : g += "? "), g += e.dump, u && (g += Ge(e, n)), W(e, n + 1, f, !0, u) && (e.dump && me === e.dump.charCodeAt(0) ? g += ":" : g += ": ", g += e.dump, t += g));
   e.tag = o, e.dump = t || "{}";
 }
 function Nn(e, n, r) {
@@ -1253,14 +1253,14 @@ function W(e, n, r, i, t, o, l) {
   e.tag = null, e.dump = r, Nn(e, r, !1) || Nn(e, r, !0);
   var a = br.call(e.dump), s = i, c;
   i && (i = e.flowLevel < 0 || e.flowLevel > n);
-  var f = a === "[object Object]" || a === "[object Array]", u, h;
-  if (f && (u = e.duplicates.indexOf(r), h = u !== -1), (e.tag !== null && e.tag !== "?" || h || e.indent !== 2 && n > 0) && (t = !1), h && e.usedDuplicates[u])
+  var f = a === "[object Object]" || a === "[object Array]", u, g;
+  if (f && (u = e.duplicates.indexOf(r), g = u !== -1), (e.tag !== null && e.tag !== "?" || g || e.indent !== 2 && n > 0) && (t = !1), g && e.usedDuplicates[u])
     e.dump = "*ref_" + u;
   else {
-    if (f && h && !e.usedDuplicates[u] && (e.usedDuplicates[u] = !0), a === "[object Object]")
-      i && Object.keys(e.dump).length !== 0 ? (no(e, n, e.dump, t), h && (e.dump = "&ref_" + u + e.dump)) : (eo(e, n, e.dump), h && (e.dump = "&ref_" + u + " " + e.dump));
+    if (f && g && !e.usedDuplicates[u] && (e.usedDuplicates[u] = !0), a === "[object Object]")
+      i && Object.keys(e.dump).length !== 0 ? (no(e, n, e.dump, t), g && (e.dump = "&ref_" + u + e.dump)) : (eo(e, n, e.dump), g && (e.dump = "&ref_" + u + " " + e.dump));
     else if (a === "[object Array]")
-      i && e.dump.length !== 0 ? (e.noArrayIndent && !l && n > 0 ? In(e, n - 1, e.dump, t) : In(e, n, e.dump, t), h && (e.dump = "&ref_" + u + e.dump)) : (Zt(e, n, e.dump), h && (e.dump = "&ref_" + u + " " + e.dump));
+      i && e.dump.length !== 0 ? (e.noArrayIndent && !l && n > 0 ? In(e, n - 1, e.dump, t) : In(e, n, e.dump, t), g && (e.dump = "&ref_" + u + e.dump)) : (Zt(e, n, e.dump), g && (e.dump = "&ref_" + u + " " + e.dump));
     else if (a === "[object String]")
       e.tag !== "?" && Xt(e, e.dump, n, o, s);
     else {
@@ -1474,51 +1474,51 @@ function Co() {
       return r;
     var f = i.length;
     if (f === 0) return r;
-    for (var u = "", h = 1 - l, g = -1, m = r && r.length || 0, d = 0; d < m; ) {
+    for (var u = "", g = 1 - l, h = -1, m = r && r.length || 0, d = 0; d < m; ) {
       if (r.charCodeAt(d) === 37 && d + 1 < m) {
-        switch (g = g > -1 ? g : 0, r.charCodeAt(d + 1)) {
+        switch (h = h > -1 ? h : 0, r.charCodeAt(d + 1)) {
           case 100:
           // 'd'
           case 102:
-            if (h >= f || i[h] == null) break;
-            g < d && (u += r.slice(g, d)), u += Number(i[h]), g = d + 2, d++;
+            if (g >= f || i[g] == null) break;
+            h < d && (u += r.slice(h, d)), u += Number(i[g]), h = d + 2, d++;
             break;
           case 105:
-            if (h >= f || i[h] == null) break;
-            g < d && (u += r.slice(g, d)), u += Math.floor(Number(i[h])), g = d + 2, d++;
+            if (g >= f || i[g] == null) break;
+            h < d && (u += r.slice(h, d)), u += Math.floor(Number(i[g])), h = d + 2, d++;
             break;
           case 79:
           // 'O'
           case 111:
           // 'o'
           case 106:
-            if (h >= f || i[h] === void 0) break;
-            g < d && (u += r.slice(g, d));
-            var w = typeof i[h];
+            if (g >= f || i[g] === void 0) break;
+            h < d && (u += r.slice(h, d));
+            var w = typeof i[g];
             if (w === "string") {
-              u += "'" + i[h] + "'", g = d + 2, d++;
+              u += "'" + i[g] + "'", h = d + 2, d++;
               break;
             }
             if (w === "function") {
-              u += i[h].name || "<anonymous>", g = d + 2, d++;
+              u += i[g].name || "<anonymous>", h = d + 2, d++;
               break;
             }
-            u += o(i[h]), g = d + 2, d++;
+            u += o(i[g]), h = d + 2, d++;
             break;
           case 115:
-            if (h >= f)
+            if (g >= f)
               break;
-            g < d && (u += r.slice(g, d)), u += String(i[h]), g = d + 2, d++;
+            h < d && (u += r.slice(h, d)), u += String(i[g]), h = d + 2, d++;
             break;
           case 37:
-            g < d && (u += r.slice(g, d)), u += "%", g = d + 2, d++, h--;
+            h < d && (u += r.slice(h, d)), u += "%", h = d + 2, d++, g--;
             break;
         }
-        ++h;
+        ++g;
       }
       ++d;
     }
-    return g === -1 ? r : (g < m && (u += r.slice(g)), u);
+    return h === -1 ? r : (h < m && (u += r.slice(h)), u);
   }
   return $e;
 }
@@ -1632,13 +1632,13 @@ function Eo() {
     return b;
   }
   function u(p) {
-    const y = p.customLevels || {}, A = Object.assign({}, f.levels.values, y), C = Object.assign({}, f.levels.labels, h(y));
+    const y = p.customLevels || {}, A = Object.assign({}, f.levels.values, y), C = Object.assign({}, f.levels.labels, g(y));
     return {
       values: A,
       labels: C
     };
   }
-  function h(p) {
+  function g(p) {
     const y = {};
     return Object.keys(p).forEach(function(A) {
       y[p[A]] = A;
@@ -1662,7 +1662,7 @@ function Eo() {
       60: "fatal"
     }
   }, f.stdSerializers = r, f.stdTimeFunctions = Object.assign({}, { nullTime: fn, epochTime: pn, unixTime: $r, isoTime: Ur });
-  function g(p) {
+  function h(p) {
     const y = [];
     p.bindings && y.push(p.bindings);
     let A = p[o];
@@ -1679,7 +1679,7 @@ function Eo() {
     }), !y.transmit && p[C] === fe)
       return;
     p[C] = w(p, y, A, C);
-    const E = g(p);
+    const E = h(p);
     E.length !== 0 && (p[C] = d(E, p[C]));
   }
   function d(p, y) {
@@ -2117,18 +2117,18 @@ async function zo({
       state: u
     });
   }
-  const h = await Rr(
+  const g = await Rr(
     i,
     a,
     t
   );
-  if (h?.kind === "multi") {
+  if (g?.kind === "multi") {
     if (n || r || o !== void 0 || l)
       throw new ae(
         "When adding multiple strings via --strings payload, omit --key, --comment, --text, and --language."
       );
     const w = [];
-    for (const [k, v] of Object.entries(h.entries))
+    for (const [k, v] of Object.entries(g.entries))
       await Ie(
         e,
         k,
@@ -2141,22 +2141,22 @@ async function zo({
       ), w.push(k);
     return { kind: "multi", keys: w };
   }
-  const g = n;
-  if (!g)
+  const h = n;
+  if (!h)
     throw new ae(
       "--key is required unless the --strings payload contains multiple keys."
     );
-  const m = h?.kind === "single" ? h.translations : void 0, d = h?.kind === "single" ? h.comment : void 0;
+  const m = g?.kind === "single" ? g.translations : void 0, d = g?.kind === "single" ? g.comment : void 0;
   return await Ie(
     e,
-    g,
+    h,
     r ?? d,
     m,
     s,
     o,
     l,
     u
-  ), { kind: "single", keys: [g] };
+  ), { kind: "single", keys: [h] };
 }
 const $o = (e) => {
   const n = Object.entries(e).sort(
@@ -2230,8 +2230,8 @@ async function Ie(e, n, r, i, t, o, l, a) {
   const c = s.sourceLanguage;
   s.strings || (s.strings = {});
   const u = (await sn(t))?.missingLanguagePolicy || "skip";
-  let h;
-  const g = async (O) => u === "include" ? !0 : (h || (h = await jr(e, t)), h.includes(O)), m = (O) => {
+  let g;
+  const h = async (O) => u === "include" ? !0 : (g || (g = await jr(e, t)), g.includes(O)), m = (O) => {
     X.warn(
       `Language "${O}" is not supported. Skipped adding its translation (missingLanguagePolicy=skip).`
     );
@@ -2246,7 +2246,7 @@ async function Ie(e, n, r, i, t, o, l, a) {
   };
   if (o !== void 0) {
     const O = l ?? c;
-    if (!await g(O))
+    if (!await h(O))
       m(O);
     else {
       d.localizations = d.localizations || {};
@@ -2265,7 +2265,7 @@ async function Ie(e, n, r, i, t, o, l, a) {
     for (const [L, P] of Object.entries(v)) {
       if (o !== void 0 && L === (l ?? c))
         continue;
-      if (u === "include" ? !0 : L === c || await g(L)) {
+      if (u === "include" ? !0 : L === c || await h(L)) {
         const I = k(P);
         I && O.push([L, I]);
       } else
@@ -2344,8 +2344,8 @@ async function Ho(e, n, r, i = !1) {
     if (!f)
       continue;
     if (!r || r.length === 0) {
-      const g = Object.keys(f.localizations ?? {});
-      o[c] = g, i || delete l[c], s = !0;
+      const h = Object.keys(f.localizations ?? {});
+      o[c] = h, i || delete l[c], s = !0;
       continue;
     }
     Yo(f, r, i, c, o);
@@ -2519,11 +2519,11 @@ function sl(e, n) {
       o = [];
     l = !1, a = !1;
   }
-  var u, h, g;
+  var u, g, h;
   function m(I) {
     if (typeof I == "string" && (I = I.split(ol, 2)), !ue(I) || I.length !== 2)
       throw new Error("Invalid tags: " + I);
-    u = new RegExp(Be(I[0]) + "\\s*"), h = new RegExp("\\s*" + Be(I[1])), g = new RegExp("\\s*" + Be("}" + I[1]));
+    u = new RegExp(Be(I[0]) + "\\s*"), g = new RegExp("\\s*" + Be(I[1])), h = new RegExp("\\s*" + Be("}" + I[1]));
   }
   m(n || D.tags);
   for (var d = new we(e), w, k, v, O, L, P; !d.eos(); ) {
@@ -2533,7 +2533,7 @@ function sl(e, n) {
 ` && (f(), s = "", c = 0, r = !1);
     if (!d.scan(u))
       break;
-    if (l = !0, k = d.scan(al) || "name", d.scan(tl), k === "=" ? (v = d.scanUntil($n), d.scan($n), d.scanUntil(h)) : k === "{" ? (v = d.scanUntil(g), d.scan(ll), d.scanUntil(h), k = "&") : v = d.scanUntil(h), !d.scan(h))
+    if (l = !0, k = d.scan(al) || "name", d.scan(tl), k === "=" ? (v = d.scanUntil($n), d.scan($n), d.scanUntil(g)) : k === "{" ? (v = d.scanUntil(h), d.scan(ll), d.scanUntil(g), k = "&") : v = d.scanUntil(g), !d.scan(g))
       throw new Error("Unclosed tag at " + d.pos);
     if (k == ">" ? L = [k, v, w, d.pos, s, c, r] : L = [k, v, w, d.pos], c++, t.push(L), k === "#" || k === "^")
       i.push(L);
@@ -2654,8 +2654,8 @@ z.prototype.renderTokens = function(n, r, i, t, o) {
 };
 z.prototype.renderSection = function(n, r, i, t, o) {
   var l = this, a = "", s = r.lookup(n[1]);
-  function c(h) {
-    return l.render(h, r, i, o);
+  function c(g) {
+    return l.render(g, r, i, o);
   }
   if (s) {
     if (ue(s))
@@ -2890,10 +2890,10 @@ async function hl(e) {
   const r = (await Q(e.path)).strings ?? {}, i = le(e.keyFilter), t = le(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;
-    const u = r[c]?.localizations ?? {}, h = Object.keys(u), g = l ? Array.from(l).some(
+    const u = r[c]?.localizations ?? {}, g = Object.keys(u), h = l ? Array.from(l).some(
       (d) => !(d in u)
     ) : !0, m = [];
-    for (const d of h) {
+    for (const d of g) {
       if (o && !o.has(d)) continue;
       const w = u[d]?.stringUnit?.value ?? "";
       t(w) && (a && e.format ? m.push(
@@ -2904,7 +2904,7 @@ async function hl(e) {
         })
       ) : m.push(`  ${d}: ${JSON.stringify(w)}`));
     }
-    m.length !== 0 && g && (a ? s.push(...m) : s.push(`${c}:`, ...m));
+    m.length !== 0 && h && (a ? s.push(...m) : s.push(`${c}:`, ...m));
   }
   return s.join(`
 `);
@@ -3016,8 +3016,8 @@ async function vl(e) {
             delete f.localizations[u];
             continue;
           }
-          const h = f.localizations[u]?.stringUnit?.value ?? "";
-          i(h) || delete f.localizations[u];
+          const g = f.localizations[u]?.stringUnit?.value ?? "";
+          i(g) || delete f.localizations[u];
         }
       if (!(f.localizations && Object.keys(f.localizations).length === 0))
         if (!l.strings[s])
@@ -3026,16 +3026,16 @@ async function vl(e) {
           const u = l.strings[s];
           if (e.mergePolicy === "output-first") {
             u.comment = f.comment ?? u.comment, u.extractionState = f.extractionState ?? u.extractionState, u.localizations = u.localizations ?? {};
-            const h = Object.entries(f.localizations ?? {});
-            if (h.length > 0)
-              for (const [g, m] of h)
-                u.localizations[g] = m;
+            const g = Object.entries(f.localizations ?? {});
+            if (g.length > 0)
+              for (const [h, m] of g)
+                u.localizations[h] = m;
           } else if (e.mergePolicy === "existing-first") {
             u.localizations = u.localizations ?? {};
-            const h = Object.entries(f.localizations ?? {});
-            if (h.length > 0)
-              for (const [g, m] of h)
-                u.localizations[g] || (u.localizations[g] = m);
+            const g = Object.entries(f.localizations ?? {});
+            if (g.length > 0)
+              for (const [h, m] of g)
+                u.localizations[h] || (u.localizations[h] = m);
           }
         }
     }
@@ -3048,10 +3048,10 @@ async function vl(e) {
     for (const [s, c] of Object.entries(n.strings ?? {})) {
       if (!r(s)) continue;
       const f = c.localizations ?? {};
-      for (const [u, h] of Object.entries(f)) {
+      for (const [u, g] of Object.entries(f)) {
         if (t && !t.has(u)) continue;
-        const g = h?.stringUnit?.value ?? "";
-        i(g) && (a.has(u) || a.set(u, /* @__PURE__ */ new Map()), a.get(u).set(s, g));
+        const h = g?.stringUnit?.value ?? "";
+        i(h) && (a.has(u) || a.set(u, /* @__PURE__ */ new Map()), a.get(u).set(s, { value: h, comment: c.comment }));
       }
     }
     if (e.mergePolicy === "error")
@@ -3063,23 +3063,34 @@ async function vl(e) {
           );
       }
     for (const [s, c] of a.entries()) {
-      const f = Ee(o, `${s}.lproj`), u = Ee(f, l), h = await Ye(u), g = /* @__PURE__ */ new Map();
-      if (h && (e.mergePolicy === "existing-first" || e.mergePolicy === "output-first"))
+      const f = Ee(o, `${s}.lproj`), u = Ee(f, l), g = await Ye(u), h = /* @__PURE__ */ new Map();
+      if (g && (e.mergePolicy === "existing-first" || e.mergePolicy === "output-first"))
         try {
           const d = await Ke(u, "utf8"), w = /"((?:[^"\\]|\\.)*)"\s*=\s*"((?:[^"\\]|\\.)*)";/g;
           let k;
           for (; (k = w.exec(d)) !== null; ) {
             const v = k[1].replace(/\\"/g, '"'), O = k[2].replace(/\\"/g, '"');
-            g.set(v, O);
+            h.set(v, { value: O });
           }
         } catch {
         }
-      for (const [d, w] of c.entries())
-        g.has(d) && e.mergePolicy === "existing-first" || g.set(d, w);
+      for (const [d, w] of c.entries()) {
+        if (h.has(d) && e.mergePolicy === "existing-first") {
+          const k = h.get(d);
+          h.set(d, { value: k.value, comment: w.comment });
+          continue;
+        }
+        h.set(d, w);
+      }
       let m = "";
-      for (const [d, w] of g.entries()) {
-        const k = d.replace(/"/g, '\\"').replace(/\n/g, "\\n"), v = w.replace(/"/g, '\\"').replace(/\n/g, "\\n");
-        m += `"${k}" = "${v}";
+      for (const [d, w] of h.entries()) {
+        m.length > 0 && (m += `
+`);
+        const k = w.comment ? ` ${w.comment} ` : " No comment provided by engineer. ";
+        m += `/*${k}*/
+`;
+        const v = d.replace(/"/g, '\\"').replace(/\n/g, "\\n"), O = w.value.replace(/"/g, '\\"').replace(/\n/g, "\\n");
+        m += `"${v}" = "${O}";
 `;
       }
       m.length > 0 && (await xn(f, { recursive: !0 }), await Ze(u, m, "utf8"));

package/package.json

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