glotfile 0.6.0 → 0.6.2

package/dist/server/cli.js

@@ -187,7 +187,7 @@ function validate(raw) {
   if (config.scan !== void 0) {
     const scan = config.scan;
     if (!isObject(scan)) fail("config.scan must be an object");
-    for (const f of ["include", "exclude", "accessors", "patterns"]) {
+    for (const f of ["include", "exclude", "accessors", "patterns", "keep"]) {
       const v = scan[f];
       if (v !== void 0 && (!Array.isArray(v) || !v.every((x) => typeof x === "string"))) {
         fail(`config.scan.${f} must be an array of strings`);
@@ -1981,7 +1981,7 @@ function buildSystemPrompt(hasPluralItems) {
     "- Preserve ICU plural/select structure verbatim (e.g. {count, plural, one {\u2026} other {\u2026}}); translate only the human-readable text inside each branch.",
     "- Glossary: a term marked do-not-translate MUST appear unchanged in the translation. A term with a forced translation for the target locale MUST use that exact translation.",
     "- Respect the max length (characters) when given; prefer a shorter natural phrasing over exceeding it.",
-    `- Quotation marks inside a translation MUST use the target language's typographic quote characters (e.g. \u201EGerman\u201C, \xABFrench\xBB, \u201CEnglish\u201D, \u2019 for apostrophes). Never emit a raw ASCII double-quote (") inside a translated string \u2014 it corrupts the JSON reply. If the source uses ASCII quotes, convert them to the target language's typographic quotes.`,
+    '- Quotation marks and apostrophes: punctuate exactly as a professional native translator instinctively would for the target language \u2014 its typographic conventions (e.g. \u201EGerman\u201C, \xABFrench\xBB, \u201CEnglish\u201D, \u2019 for apostrophes), applied with judgment about what is quoted prose versus a literal that must stay untouched. Never emit a raw ASCII double-quote (") inside a translated string \u2014 it corrupts the JSON reply.',
     "- Match the register and capitalization conventions of the target language and of UI microcopy.",
     "- Return ONLY the translated string for each item \u2014 no quotes, notes, or explanations."
   ];
@@ -2071,12 +2071,66 @@ var init_provider = __esm({
 });
 
 // src/server/ai/batch.ts
+function repairUnescapedQuotes(text) {
+  const skipWs = (from) => {
+    let i = from;
+    while (i < text.length && /\s/.test(text[i])) i++;
+    return i;
+  };
+  const stack = [];
+  let out = "";
+  let inString = false;
+  let isKey = false;
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+    const top = stack[stack.length - 1];
+    if (inString) {
+      if (ch === "\\") {
+        out += ch + (text[i + 1] ?? "");
+        i++;
+      } else if (ch !== '"') {
+        out += ch;
+      } else {
+        const next = text[skipWs(i + 1)];
+        const startsNextMember = () => {
+          const after = text[skipWs(skipWs(i + 1) + 1)];
+          return top?.type === "obj" ? after === '"' : after === "{" || after === "[" || after === '"';
+        };
+        const closes = isKey ? next === ":" : next === "}" || next === "]" || next === void 0 || next === "," && startsNextMember();
+        if (closes) {
+          inString = false;
+          out += ch;
+        } else {
+          out += '\\"';
+        }
+      }
+      continue;
+    }
+    out += ch;
+    if (ch === '"') {
+      inString = true;
+      isKey = top?.type === "obj" && top.expectingKey;
+    } else if (ch === "{") stack.push({ type: "obj", expectingKey: true });
+    else if (ch === "[") stack.push({ type: "arr", expectingKey: false });
+    else if (ch === "}" || ch === "]") stack.pop();
+    else if (ch === "," && top?.type === "obj") top.expectingKey = true;
+    else if (ch === ":" && top) top.expectingKey = false;
+  }
+  try {
+    JSON.parse(out);
+    return out;
+  } catch {
+    return void 0;
+  }
+}
 function parseReplyItems(text) {
   let parsed;
   try {
     parsed = JSON.parse(text);
   } catch {
-    throw new MalformedReplyError(text);
+    const repaired = repairUnescapedQuotes(text);
+    if (repaired === void 0) throw new MalformedReplyError(text);
+    parsed = JSON.parse(repaired);
   }
   if (!Array.isArray(parsed.items)) throw new MalformedReplyError(text);
   return parsed.items;
@@ -3171,13 +3225,15 @@ function computeUsedKeys(state, cache2) {
       if (p.prefix) prefixes.push(p.prefix);
     }
   }
-  return Object.keys(state.keys).filter((key) => exact.has(key) || prefixes.some((p) => key.startsWith(p))).sort();
+  const keep = (state.config.scan?.keep ?? []).map(globToRegExp);
+  return Object.keys(state.keys).filter((key) => exact.has(key) || prefixes.some((p) => key.startsWith(p)) || keep.some((re) => re.test(key))).sort();
 }
 var init_scan = __esm({
   "src/server/scan.ts"() {
     "use strict";
     init_atomic_write();
     init_glotfile_dir();
+    init_glob();
   }
 });
 

package/dist/server/server.js

@@ -186,7 +186,7 @@ function validate(raw) {
   if (config.scan !== void 0) {
     const scan = config.scan;
     if (!isObject(scan)) fail("config.scan must be an object");
-    for (const f of ["include", "exclude", "accessors", "patterns"]) {
+    for (const f of ["include", "exclude", "accessors", "patterns", "keep"]) {
       const v = scan[f];
       if (v !== void 0 && (!Array.isArray(v) || !v.every((x) => typeof x === "string"))) {
         fail(`config.scan.${f} must be an array of strings`);
@@ -817,6 +817,12 @@ function ensureGlotfileDir(projectRoot) {
   return dir;
 }
 
+// src/server/glob.ts
+function globToRegExp(glob) {
+  const escaped = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
+  return new RegExp(`^${escaped}$`);
+}
+
 // src/server/scan.ts
 function loadUsageCache(projectRoot) {
   const path = resolve2(projectRoot, ".glotfile", "usage.json");
@@ -854,7 +860,8 @@ function computeUsedKeys(state, cache2) {
       if (p.prefix) prefixes.push(p.prefix);
     }
   }
-  return Object.keys(state.keys).filter((key) => exact.has(key) || prefixes.some((p) => key.startsWith(p))).sort();
+  const keep = (state.config.scan?.keep ?? []).map(globToRegExp);
+  return Object.keys(state.keys).filter((key) => exact.has(key) || prefixes.some((p) => key.startsWith(p)) || keep.some((re) => re.test(key))).sort();
 }
 
 // src/server/scanner.ts
@@ -1139,7 +1146,7 @@ var MAX_CONTEXT_LENGTH = 500;
 var SNIPPET_WINDOW = 15;
 var MAX_SNIPPETS = 3;
 var EXCLUDED_DIRS = ["node_modules/", "vendor/", "dist/", ".git/", ".glotfile/"];
-function globToRegExp(glob) {
+function globToRegExp2(glob) {
   const escaped = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
   return new RegExp(`^${escaped}$`);
 }
@@ -1182,7 +1189,7 @@ function buildUsageIndex(cache2) {
 }
 function selectContextTargets(state, opts, cache2, lastRunAt) {
   const cutoff = opts.all ? void 0 : opts.since ?? lastRunAt;
-  const keyRe = opts.keyGlob ? globToRegExp(opts.keyGlob) : null;
+  const keyRe = opts.keyGlob ? globToRegExp2(opts.keyGlob) : null;
   const keySet = opts.keys ? new Set(opts.keys) : null;
   const usageIndex = buildUsageIndex(cache2);
   let candidates = [];
@@ -1678,12 +1685,6 @@ function runChecks(state, opts = {}) {
   return { issues: visible, spellPending };
 }
 
-// src/server/glob.ts
-function globToRegExp2(glob) {
-  const escaped = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
-  return new RegExp(`^${escaped}$`);
-}
-
 // src/server/lint/spelling.ts
 var spellingRule = {
   id: "spelling",
@@ -1933,7 +1934,7 @@ async function runLint(state, options = {}) {
     spellers,
     allowWords
   };
-  const ignoreRes = (config.ignore ?? []).map(globToRegExp2);
+  const ignoreRes = (config.ignore ?? []).map(globToRegExp);
   const localeFilter = options.locales ? new Set(options.locales) : null;
   const findings = [];
   let suppressed = 0;
@@ -2806,7 +2807,7 @@ function buildSystemPrompt(hasPluralItems) {
     "- Preserve ICU plural/select structure verbatim (e.g. {count, plural, one {\u2026} other {\u2026}}); translate only the human-readable text inside each branch.",
     "- Glossary: a term marked do-not-translate MUST appear unchanged in the translation. A term with a forced translation for the target locale MUST use that exact translation.",
     "- Respect the max length (characters) when given; prefer a shorter natural phrasing over exceeding it.",
-    `- Quotation marks inside a translation MUST use the target language's typographic quote characters (e.g. \u201EGerman\u201C, \xABFrench\xBB, \u201CEnglish\u201D, \u2019 for apostrophes). Never emit a raw ASCII double-quote (") inside a translated string \u2014 it corrupts the JSON reply. If the source uses ASCII quotes, convert them to the target language's typographic quotes.`,
+    '- Quotation marks and apostrophes: punctuate exactly as a professional native translator instinctively would for the target language \u2014 its typographic conventions (e.g. \u201EGerman\u201C, \xABFrench\xBB, \u201CEnglish\u201D, \u2019 for apostrophes), applied with judgment about what is quoted prose versus a literal that must stay untouched. Never emit a raw ASCII double-quote (") inside a translated string \u2014 it corrupts the JSON reply.',
     "- Match the register and capitalization conventions of the target language and of UI microcopy.",
     "- Return ONLY the translated string for each item \u2014 no quotes, notes, or explanations."
   ];
@@ -2898,12 +2899,66 @@ var MalformedReplyError = class extends Error {
   }
   raw;
 };
+function repairUnescapedQuotes(text) {
+  const skipWs = (from) => {
+    let i = from;
+    while (i < text.length && /\s/.test(text[i])) i++;
+    return i;
+  };
+  const stack = [];
+  let out = "";
+  let inString = false;
+  let isKey = false;
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+    const top = stack[stack.length - 1];
+    if (inString) {
+      if (ch === "\\") {
+        out += ch + (text[i + 1] ?? "");
+        i++;
+      } else if (ch !== '"') {
+        out += ch;
+      } else {
+        const next = text[skipWs(i + 1)];
+        const startsNextMember = () => {
+          const after = text[skipWs(skipWs(i + 1) + 1)];
+          return top?.type === "obj" ? after === '"' : after === "{" || after === "[" || after === '"';
+        };
+        const closes = isKey ? next === ":" : next === "}" || next === "]" || next === void 0 || next === "," && startsNextMember();
+        if (closes) {
+          inString = false;
+          out += ch;
+        } else {
+          out += '\\"';
+        }
+      }
+      continue;
+    }
+    out += ch;
+    if (ch === '"') {
+      inString = true;
+      isKey = top?.type === "obj" && top.expectingKey;
+    } else if (ch === "{") stack.push({ type: "obj", expectingKey: true });
+    else if (ch === "[") stack.push({ type: "arr", expectingKey: false });
+    else if (ch === "}" || ch === "]") stack.pop();
+    else if (ch === "," && top?.type === "obj") top.expectingKey = true;
+    else if (ch === ":" && top) top.expectingKey = false;
+  }
+  try {
+    JSON.parse(out);
+    return out;
+  } catch {
+    return void 0;
+  }
+}
 function parseReplyItems(text) {
   let parsed;
   try {
     parsed = JSON.parse(text);
   } catch {
-    throw new MalformedReplyError(text);
+    const repaired = repairUnescapedQuotes(text);
+    if (repaired === void 0) throw new MalformedReplyError(text);
+    parsed = JSON.parse(repaired);
   }
   if (!Array.isArray(parsed.items)) throw new MalformedReplyError(text);
   return parsed.items;
@@ -3407,7 +3462,7 @@ import { readFileSync as readFileSync7, existsSync as existsSync7 } from "fs";
 import { resolve as resolve5, extname as extname2 } from "path";
 function selectRequests(state, opts) {
   const targets = (opts.locales ?? state.config.locales).filter((l) => l !== state.config.sourceLocale);
-  const keyRe = opts.keyGlob ? globToRegExp2(opts.keyGlob) : null;
+  const keyRe = opts.keyGlob ? globToRegExp(opts.keyGlob) : null;
   const keySet = opts.keys ? new Set(opts.keys) : null;
   const reqs = [];
   let id = 0;