glotfile 0.8.5 → 0.8.7

package/README.md

@@ -6,6 +6,8 @@ web UI, and you export to whatever locale formats your apps consume — no SaaS,
 no hosted database, nothing leaves your machine except the AI calls you choose
 to make.
 
+**[glotfile.dev](https://glotfile.dev)** · [Docs](https://glotfile.dev/docs/) · [npm](https://www.npmjs.com/package/glotfile)
+
 - **One source of truth** — every string and translation lives in `glotfile.json`, committed alongside your code. Versioning, review, and rollback come from git. For large catalogs, run `glotfile split` to store the catalog as a `glotfile/` directory with one file per locale — so a one-locale change is a one-file `git diff` instead of a multi-megabyte one. The in-app experience is identical.
 - **Local web UI** — run one command, edit in the browser, changes save straight back to the file.
 - **AI translation** — fill in missing languages with Anthropic, OpenAI, AWS Bedrock, OpenRouter, or a local Ollama model, using per-key context, a glossary, and screenshots.
@@ -19,21 +21,19 @@ to make.
 
 ## Getting started
 
-Glotfile is designed to run with no install via `npx glotfile`. It's pre-1.0 and
-not yet published to npm, so for now run it from a checkout of this repo:
+Glotfile runs with no install via `npx`. It's pre-1.0, so expect rough edges:
 
 ```bash
-npm install
-npm run build          # builds the UI + server into dist/
-node bin/glotfile.js   # same as the `glotfile` command
+npx glotfile
 ```
 
 That starts a local server bound to `127.0.0.1`, opens your browser, and — if
 there's no `glotfile.json` in the current directory yet — starts from sensible
 defaults and writes the file as soon as you make your first edit.
 
-> Working on Glotfile itself? `npm run dev` runs the Vite UI with hot-reload and
-> the server side-by-side.
+> Working on Glotfile itself? Clone the repo, then `npm install` and `npm run dev`
+> to run the Vite UI with hot-reload alongside the server. `npm run build` followed
+> by `node bin/glotfile.js` runs the built CLI exactly like the published `glotfile`.
 
 ---
 

package/dist/server/cli.js

@@ -959,17 +959,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 extractLiterals(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();
@@ -1146,7 +1186,7 @@ var init_laravel_php = __esm({
     init_options();
     init_placeholders();
     init_schema();
-    DEFAULT_LOCALE_CASE2 = "lower-hyphen";
+    DEFAULT_LOCALE_CASE2 = "bcp47-underscore";
     laravelPhp = {
       name: "laravel-php",
       capabilities: {
@@ -1186,6 +1226,20 @@ var init_laravel_php = __esm({
                   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);
             }
           }
@@ -1277,6 +1331,9 @@ var init_i18next_json = __esm({
             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 && extractLiterals(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) });
@@ -1295,7 +1352,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, gettextPo;
 var init_gettext_po = __esm({
@@ -1304,6 +1363,7 @@ var init_gettext_po = __esm({
     init_adapters();
     init_options();
     init_plurals();
+    init_placeholders();
     DEFAULT_LOCALE_CASE4 = "lower-hyphen";
     gettextPo = {
       name: "gettext-po",
@@ -1362,8 +1422,10 @@ var init_gettext_po = __esm({
               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")
               );
             }
@@ -1389,7 +1451,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, appleStringsdict;
 var init_apple_stringsdict = __esm({
@@ -1398,6 +1462,7 @@ var init_apple_stringsdict = __esm({
     init_adapters();
     init_options();
     init_schema();
+    init_placeholders();
     DEFAULT_LOCALE_CASE5 = "lower-hyphen";
     appleStringsdict = {
       name: "apple-stringsdict",
@@ -1461,12 +1526,18 @@ var init_apple_stringsdict = __esm({
 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 DEFAULT_LOCALE_CASE6, appleStrings;
 var init_apple_strings = __esm({
   "src/server/adapters/apple-strings.ts"() {
     "use strict";
     init_adapters();
     init_options();
+    init_placeholders();
     DEFAULT_LOCALE_CASE6 = "bcp47-hyphen";
     appleStrings = {
       name: "apple-strings",
@@ -1493,7 +1564,7 @@ var init_apple_strings = __esm({
             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({
@@ -1508,6 +1579,10 @@ var init_apple_strings = __esm({
 });
 
 // src/server/adapters/vue-i18n-json.ts
+function toVueI18n(value) {
+  if (isIcuPluralOrSelect(value)) return value;
+  return withLiterals(value, (gap) => gap, (content) => `{'${content}'}`);
+}
 var DEFAULT_LOCALE_CASE7, vueI18nJson;
 var init_vue_i18n_json = __esm({
   "src/server/adapters/vue-i18n-json.ts"() {
@@ -1544,7 +1619,7 @@ var init_vue_i18n_json = __esm({
             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);
@@ -1557,7 +1632,7 @@ var init_vue_i18n_json = __esm({
                   message: "vue-i18n-json does not yet convert ICU plural/select; written unconverted"
                 });
               }
-              flat[key] = raw;
+              flat[key] = toVueI18n(raw);
             }
           }
           let payload = flat;
@@ -1594,27 +1669,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 = [
@@ -4065,7 +4143,7 @@ function extractPrefixes(content, scanner) {
   result.sort((a, b) => a.line - b.line || a.col - b.col);
   return result;
 }
-function extractLiterals(content) {
+function extractLiterals2(content) {
   const starts = lineStartOffsets(content);
   const result = [];
   const seen = /* @__PURE__ */ new Set();
@@ -4166,7 +4244,7 @@ function runScan(projectRoot, opts, existing) {
       size,
       refs: extractRefs(content, scanner, opts),
       prefixes: extractPrefixes(content, scanner),
-      literals: extractLiterals(content)
+      literals: extractLiterals2(content)
     };
   }
   saveUsageCache(projectRoot, cache2);
@@ -4554,6 +4632,9 @@ var init_flatten = __esm({
 // src/server/import/parsers/vue-i18n-json.ts
 import { readdirSync as readdirSync5, readFileSync as readFileSync13 } from "fs";
 import { join as join7 } from "path";
+function fromVueI18n(value) {
+  return value.replace(/\{'([^']*)'\}/g, "'$1'");
+}
 var LOCALE_RE2, vueI18nJson2;
 var init_vue_i18n_json2 = __esm({
   "src/server/import/parsers/vue-i18n-json.ts"() {
@@ -4580,7 +4661,7 @@ var init_vue_i18n_json2 = __esm({
           }
           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 };
@@ -4590,8 +4671,14 @@ var init_vue_i18n_json2 = __esm({
 });
 
 // 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}");
 }
 var init_placeholders2 = __esm({
   "src/server/import/placeholders.ts"() {
@@ -4753,6 +4840,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];
@@ -4878,7 +4968,7 @@ var init_apple_strings2 = __esm({
             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 };
@@ -5015,6 +5105,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;
@@ -5143,13 +5251,13 @@ var init_gettext_po2 = __esm({
                   );
                   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, "");
             }
           }
         }
@@ -5259,9 +5367,6 @@ var init_i18next_json2 = __esm({
 // src/server/import/parsers/rails-yaml.ts
 import { readdirSync as readdirSync12, readFileSync as readFileSync19 } from "fs";
 import { join as join14 } from "path";
-function fromRuby(value) {
-  return value.replace(/%\{(\w+)\}/g, "{$1}");
-}
 function makeNode() {
   return /* @__PURE__ */ Object.create(null);
 }
@@ -5447,7 +5552,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(" ")}}`;
 }
@@ -5456,6 +5561,7 @@ var init_rails_yaml2 = __esm({
   "src/server/import/parsers/rails-yaml.ts"() {
     "use strict";
     init_schema();
+    init_placeholders2();
     LOCALE_RE8 = /^[a-z]{2,3}([_-][A-Za-z]{2,4}){0,2}$/i;
     CATEGORY_SET = new Set(PLURAL_CATEGORIES);
     railsYaml2 = {
@@ -5472,7 +5578,7 @@ var init_rails_yaml2 = __esm({
           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);
@@ -5598,6 +5704,24 @@ function parsePlistDict(xml) {
   if (tag.name !== "dict" || tag.closing) throw new Error("expected a root <dict>");
   return tag.selfClosing ? {} : readDict();
 }
+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}`);
@@ -5626,7 +5750,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);