glotfile 0.8.6 → 0.8.7

package/dist/server/server.js

@@ -1515,17 +1515,57 @@ function extractPlaceholders(value) {
 function isIcuPluralOrSelect(value) {
   return ICU_PLURAL_SELECT.test(value);
 }
+function withLiterals(value, convertGap, emitLiteral) {
+  let out = "";
+  let gap = "";
+  const flushGap = () => {
+    if (gap) {
+      out += convertGap(gap);
+      gap = "";
+    }
+  };
+  for (let i = 0; i < value.length; ) {
+    if (value[i] === "'") {
+      const next = value[i + 1];
+      if (next === "'") {
+        gap += "'";
+        i += 2;
+        continue;
+      }
+      if (next === "{" || next === "}" || next === "#" || next === "|") {
+        flushGap();
+        let j = i + 1;
+        while (j < value.length && value[j] !== "'") j++;
+        out += emitLiteral(value.slice(i + 1, j));
+        i = j < value.length ? j + 1 : j;
+        continue;
+      }
+    }
+    gap += value[i];
+    i++;
+  }
+  flushGap();
+  return out;
+}
+function extractLiterals2(value) {
+  const out = [];
+  withLiterals(value, () => "", (lit) => {
+    out.push(lit);
+    return "";
+  });
+  return out;
+}
 function toLaravel(value) {
   if (isIcuPluralOrSelect(value)) return value;
-  return value.replace(/\{(\w+)\}/g, ":$1");
+  return withLiterals(value, (gap) => gap.replace(/\{(\w+)\}/g, ":$1"), (lit) => lit);
 }
 function toI18next(value) {
   if (isIcuPluralOrSelect(value)) return value;
-  return value.replace(/(?<!\{)\{(\w+)\}(?!\})/g, "{{$1}}");
+  return withLiterals(value, (gap) => gap.replace(/(?<!\{)\{(\w+)\}(?!\})/g, "{{$1}}"), (lit) => lit);
 }
 function toRuby(value) {
   if (isIcuPluralOrSelect(value)) return value;
-  return value.replace(/(?<!%)\{(\w+)\}/g, "%{$1}");
+  return withLiterals(value, (gap) => gap.replace(/(?<!%)\{(\w+)\}/g, "%{$1}"), (lit) => lit);
 }
 function placeholdersMatch(source, translation) {
   const a = extractPlaceholders(source).sort();
@@ -2266,6 +2306,20 @@ var laravelPhp = {
               message: "laravel-php cannot represent ICU plural/select; written unconverted"
             });
           }
+          if (raw) {
+            const names = new Set(extractPlaceholders(raw));
+            for (const m of raw.matchAll(/:([a-zA-Z][a-zA-Z0-9_]*)/g)) {
+              if (names.has(m[1])) {
+                warnings.push({
+                  code: "lossy-literal",
+                  key,
+                  locale,
+                  message: `literal ":${m[1]}" collides with the :${m[1]} placeholder; Laravel will interpolate both`
+                });
+                break;
+              }
+            }
+          }
           (tree[locale][namespace] ??= {})[inner] = toLaravel(raw);
         }
       }
@@ -2346,6 +2400,9 @@ var i18nextJson = {
         if (raw && isIcuPluralOrSelect(raw)) {
           warnings.push({ code: "lossy-plural", key, locale, message: "i18next-json does not yet convert ICU plural/select; written unconverted" });
         }
+        if (raw && extractLiterals2(raw).some((lit) => /\{\{\w+\}\}/.test(lit))) {
+          warnings.push({ code: "lossy-literal", key, locale, message: "i18next will interpolate a literal containing {{\u2026}}; i18next has no escape for it" });
+        }
         if (setNested(obj, segments, toI18next(raw))) collided.add(key);
       }
       files.push({ path: resolvePath(output.path, resolveLocaleToken(output, locale, DEFAULT_LOCALE_CASE3)), contents: serializeJson(obj, fmt) });
@@ -2362,7 +2419,9 @@ function poString(s) {
   return '"' + s.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\t/g, "\\t").replace(/\r/g, "\\r") + '"';
 }
 function toGettext(body, arg) {
-  return body.split(`{${arg}}`).join("%d");
+  const gap = (text) => text.replace(/%/g, "%%").split(`{${arg}}`).join("%d");
+  if (isIcuPluralOrSelect(body)) return gap(body);
+  return withLiterals(body, gap, (lit) => lit.replace(/%/g, "%%"));
 }
 var DEFAULT_LOCALE_CASE4 = "lower-hyphen";
 var gettextPo = {
@@ -2422,8 +2481,10 @@ var gettextPo = {
           blocks.push(
             [
               `msgctxt ${poString(key)}`,
-              `msgid ${poString(src?.value ?? "")}`,
-              `msgstr ${poString(lv?.value ?? "")}`
+              // Scalar keys carry no count arg; toGettext still strips literal
+              // spans and escapes a literal % to %%.
+              `msgid ${poString(toGettext(src?.value ?? "", ""))}`,
+              `msgstr ${poString(toGettext(lv?.value ?? "", ""))}`
             ].join("\n")
           );
         }
@@ -2447,7 +2508,9 @@ function xmlEscape(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 function toApple(body, arg) {
-  return body.split(`{${arg}}`).join("%d");
+  const gap = (text) => text.replace(/%/g, "%%").split(`{${arg}}`).join("%d");
+  if (isIcuPluralOrSelect(body)) return gap(body);
+  return withLiterals(body, gap, (lit) => lit.replace(/%/g, "%%"));
 }
 var DEFAULT_LOCALE_CASE5 = "lower-hyphen";
 var appleStringsdict = {
@@ -2511,6 +2574,11 @@ var DEFAULT_LOCALE_CASE6 = "bcp47-hyphen";
 function escape(s) {
   return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\t/g, "\\t").replace(/\r/g, "\\r");
 }
+function toApple2(value) {
+  const gap = (text) => text.replace(/%/g, "%%");
+  if (isIcuPluralOrSelect(value)) return gap(value);
+  return withLiterals(value, gap, (lit) => lit.replace(/%/g, "%%"));
+}
 var appleStrings = {
   name: "apple-strings",
   capabilities: {
@@ -2536,7 +2604,7 @@ var appleStrings = {
         if (entry.plural) continue;
         const value = resolveScalar(entry, locale, state.config.sourceLocale, emptyAs);
         if (value === null) continue;
-        lines.push(`"${escape(key)}" = "${escape(value)}";`);
+        lines.push(`"${escape(key)}" = "${escape(toApple2(value))}";`);
       }
       const contents = lines.length ? lines.join("\n") + "\n" : "";
       files.push({
@@ -2550,6 +2618,10 @@ var appleStrings = {
 
 // src/server/adapters/vue-i18n-json.ts
 var DEFAULT_LOCALE_CASE7 = "lower-hyphen";
+function toVueI18n(value) {
+  if (isIcuPluralOrSelect(value)) return value;
+  return withLiterals(value, (gap) => gap, (content) => `{'${content}'}`);
+}
 var vueI18nJson = {
   name: "vue-i18n-json",
   capabilities: {
@@ -2575,7 +2647,7 @@ var vueI18nJson = {
         if (entry.plural) {
           const forms = resolveForms(entry, locale, state.config.sourceLocale, emptyAs);
           if (!forms) continue;
-          const parts = PLURAL_CATEGORIES.map((c) => forms[c]).filter((v) => v !== void 0);
+          const parts = PLURAL_CATEGORIES.map((c) => forms[c]).filter((v) => v !== void 0).map(toVueI18n);
           flat[key] = parts.join(" | ");
         } else {
           const raw = resolveScalar(entry, locale, state.config.sourceLocale, emptyAs);
@@ -2588,7 +2660,7 @@ var vueI18nJson = {
               message: "vue-i18n-json does not yet convert ICU plural/select; written unconverted"
             });
           }
-          flat[key] = raw;
+          flat[key] = toVueI18n(raw);
         }
       }
       let payload = flat;
@@ -2623,27 +2695,30 @@ function angularXMeta(placeholders, name) {
   return /^[A-Z][A-Z0-9_]*$/.test(name) || meta?.origin === "x" ? meta : void 0;
 }
 function renderInterpolations(text, ids, placeholders) {
-  let out = "";
-  let last = 0;
-  for (const m of text.matchAll(/\{(\w+)\}/g)) {
-    const name = m[1];
-    out += xmlEscape2(text.slice(last, m.index));
-    const meta = angularXMeta(placeholders, name);
-    if (meta) {
-      const ctype = meta.type ? ` ctype="${attrEscape(meta.type)}"` : "";
-      const equiv = meta.example !== void 0 ? ` equiv-text="${attrEscape(meta.example)}"` : "";
-      out += `<x id="${attrEscape(name)}"${ctype}${equiv}/>`;
-    } else {
-      let id = ids.get(name);
-      if (id === void 0) {
-        id = ids.size === 0 ? "INTERPOLATION" : `INTERPOLATION_${ids.size}`;
-        ids.set(name, id);
+  const convertGap = (gap) => {
+    let out = "";
+    let last = 0;
+    for (const m of gap.matchAll(/\{(\w+)\}/g)) {
+      const name = m[1];
+      out += xmlEscape2(gap.slice(last, m.index));
+      const meta = angularXMeta(placeholders, name);
+      if (meta) {
+        const ctype = meta.type ? ` ctype="${attrEscape(meta.type)}"` : "";
+        const equiv = meta.example !== void 0 ? ` equiv-text="${attrEscape(meta.example)}"` : "";
+        out += `<x id="${attrEscape(name)}"${ctype}${equiv}/>`;
+      } else {
+        let id = ids.get(name);
+        if (id === void 0) {
+          id = ids.size === 0 ? "INTERPOLATION" : `INTERPOLATION_${ids.size}`;
+          ids.set(name, id);
+        }
+        out += `<x id="${id}" equiv-text="{{${name}}}"/>`;
       }
-      out += `<x id="${id}" equiv-text="{{${name}}}"/>`;
+      last = m.index + m[0].length;
     }
-    last = m.index + m[0].length;
-  }
-  return out + xmlEscape2(text.slice(last));
+    return out + xmlEscape2(gap.slice(last));
+  };
+  return withLiterals(text, convertGap, (lit) => xmlEscape2(`'${lit}'`));
 }
 function renderPluralIcu(forms, ids, placeholders) {
   const cats = [
@@ -4579,6 +4654,9 @@ function flattenObject(value, prefix, warnings) {
 
 // src/server/import/parsers/vue-i18n-json.ts
 var LOCALE_RE2 = /^[a-z]{2,3}([_-][A-Za-z]{2,4}){0,2}$/;
+function fromVueI18n(value) {
+  return value.replace(/\{'([^']*)'\}/g, "'$1'");
+}
 var vueI18nJson2 = {
   name: "vue-i18n-json",
   parse(localeRoot, opts) {
@@ -4599,7 +4677,7 @@ var vueI18nJson2 = {
       }
       if (!locales.includes(locale)) locales.push(locale);
       for (const [key, value] of Object.entries(flattenObject(data, "", warnings))) {
-        (keys[key] ??= { values: {} }).values[locale] = value;
+        (keys[key] ??= { values: {} }).values[locale] = fromVueI18n(value);
       }
     }
     return { locales, keys, warnings };
@@ -4612,8 +4690,14 @@ import { join as join8, relative as relative2 } from "path";
 import { execFileSync } from "child_process";
 
 // src/server/import/placeholders.ts
+function markBareBracesLiteral(value) {
+  return value.replace(/(?<!%)\{(\w+)\}/g, "'{$1}'");
+}
 function laravelToCanonical(value) {
-  return value.replace(/:([a-zA-Z][a-zA-Z0-9_]*)/g, "{$1}");
+  return markBareBracesLiteral(value).replace(/:([a-zA-Z][a-zA-Z0-9_]*)/g, "{$1}");
+}
+function railsToCanonical(value) {
+  return markBareBracesLiteral(value).replace(/%\{(\w+)\}/g, "{$1}");
 }
 
 // src/server/import/parsers/laravel-php.ts
@@ -4755,6 +4839,9 @@ function localeFromLproj(dir) {
   if (!m) return null;
   return LOCALE_RE4.test(m[1]) ? m[1] : null;
 }
+function printfToCanonical(s) {
+  return s.replace(/%%/g, "%");
+}
 function unescape(body) {
   return body.replace(/\\(U[0-9a-fA-F]{4}|u[0-9a-fA-F]{4}|.)/g, (_m, esc) => {
     const c = esc[0];
@@ -4874,7 +4961,7 @@ var appleStrings2 = {
         warnings.push(`apple-strings: ${dir} has other .strings tables (${others.join(", ")}); only ${TABLE} is imported`);
       }
       for (const { key, value } of parseStrings(text, file, warnings)) {
-        (keys[key] ??= { values: {} }).values[locale] = value;
+        (keys[key] ??= { values: {} }).values[locale] = printfToCanonical(value);
       }
     }
     return { locales, keys, warnings };
@@ -5006,6 +5093,24 @@ function unescapePo(s) {
     (_, c) => c === "n" ? "\n" : c === "t" ? "	" : c === "r" ? "\r" : c
   );
 }
+function printfToCanonical2(s, arg) {
+  let out = "";
+  for (let i = 0; i < s.length; ) {
+    if (s[i] === "%" && s[i + 1] === "%") {
+      out += "%";
+      i += 2;
+      continue;
+    }
+    if (arg && s[i] === "%" && s[i + 1] === "d") {
+      out += `{${arg}}`;
+      i += 2;
+      continue;
+    }
+    out += s[i];
+    i++;
+  }
+  return out;
+}
 function parseEntries(text) {
   const entries = [];
   let cur = null;
@@ -5126,13 +5231,13 @@ var gettextPo2 = {
               );
               continue;
             }
-            forms[cat] = body.split("%d").join("{count}");
+            forms[cat] = printfToCanonical2(body, "count");
           }
           if (!forms.other) continue;
           (keys[key] ??= { values: {} }).values[locale] = formsToIcu("count", forms);
         } else {
           if (!entry.msgstr) continue;
-          (keys[key] ??= { values: {} }).values[locale] = entry.msgstr;
+          (keys[key] ??= { values: {} }).values[locale] = printfToCanonical2(entry.msgstr, "");
         }
       }
     }
@@ -5233,9 +5338,6 @@ import { readdirSync as readdirSync11, readFileSync as readFileSync18 } from "fs
 import { join as join14 } from "path";
 var LOCALE_RE8 = /^[a-z]{2,3}([_-][A-Za-z]{2,4}){0,2}$/i;
 var CATEGORY_SET = new Set(PLURAL_CATEGORIES);
-function fromRuby(value) {
-  return value.replace(/%\{(\w+)\}/g, "{$1}");
-}
 function makeNode() {
   return /* @__PURE__ */ Object.create(null);
 }
@@ -5421,7 +5523,7 @@ function synthesizeIcu(forms, file, key, warnings) {
         `rails-yaml: ${file}: plural "${key}" form "${cat}" contains "#", which ICU reads as the count placeholder`
       );
     }
-    parts.push(`${cat} {${fromRuby(body)}}`);
+    parts.push(`${cat} {${railsToCanonical(body)}}`);
   }
   return `{count, plural, ${parts.join(" ")}}`;
 }
@@ -5439,7 +5541,7 @@ var railsYaml2 = {
       for (const [k, v] of Object.entries(node)) {
         const key = prefix ? `${prefix}.${k}` : k;
         if (typeof v === "string") {
-          if (v !== "") addValue(key, locale, fromRuby(v));
+          if (v !== "") addValue(key, locale, railsToCanonical(v));
           continue;
         }
         const forms = asPluralForms(v);
@@ -5566,6 +5668,24 @@ function parsePlistDict(xml) {
   return tag.selfClosing ? {} : readDict();
 }
 var VAR_RE = /%#@([^@]*)@/g;
+function printfToCanonical3(body, token, arg) {
+  let out = "";
+  for (let i = 0; i < body.length; ) {
+    if (body[i] === "%" && body[i + 1] === "%") {
+      out += "%";
+      i += 2;
+      continue;
+    }
+    if (body.startsWith(token, i)) {
+      out += `{${arg}}`;
+      i += token.length;
+      continue;
+    }
+    out += body[i];
+    i++;
+  }
+  return out;
+}
 function entryToIcu(key, entry, file, warnings) {
   const warn = (msg) => {
     warnings.push(`apple-stringsdict: ${file}: key "${key}": ${msg}`);
@@ -5594,7 +5714,7 @@ function entryToIcu(key, entry, file, warnings) {
   for (const cat of PLURAL_CATEGORIES) {
     const body = varDict[cat];
     if (typeof body !== "string") continue;
-    forms[cat] = prefix + body.split(token).join(`{${arg}}`) + suffix;
+    forms[cat] = prefix + printfToCanonical3(body, token, arg) + suffix;
   }
   if (forms.other === void 0) return warn(`variable "${arg}" has no "other" form; skipped`);
   return formsToIcu(arg, forms);