glotfile 0.6.1 → 0.6.3

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`);
@@ -3225,13 +3225,35 @@ 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 matchers = [];
+  const seenLiterals = /* @__PURE__ */ new Set();
+  for (const entry of Object.values(cache2.files)) {
+    for (const l of entry.literals ?? []) {
+      if (!l.literal || seenLiterals.has(l.literal)) continue;
+      seenLiterals.add(l.literal);
+      matchers.push(literalMatcher(l.literal));
+    }
+  }
+  const keep = (state.config.scan?.keep ?? []).map(globToRegExp);
+  return Object.keys(state.keys).filter((key) => exact.has(key) || prefixes.some((p) => key.startsWith(p)) || matchers.some((matches) => matches(key)) || keep.some((re) => re.test(key))).sort();
+}
+function escapeRe(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function literalMatcher(literal) {
+  if (/%[sd]/.test(literal)) {
+    const re = new RegExp(`^${literal.split(/%[sd]/).map(escapeRe).join("[^.]+")}$`);
+    return (key) => re.test(key);
+  }
+  if (literal.endsWith(".")) return (key) => key.startsWith(literal);
+  return (key) => key === literal || key.startsWith(literal + ".");
 }
 var init_scan = __esm({
   "src/server/scan.ts"() {
     "use strict";
     init_atomic_write();
     init_glotfile_dir();
+    init_glob();
   }
 });
 
@@ -3241,7 +3263,7 @@ import { join as join3, extname as extname2, relative } from "path";
 function scannerForExt(ext) {
   return EXT_SCANNER[ext] ?? null;
 }
-function escapeRe(s) {
+function escapeRe2(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function detectFlutterAccessors(content) {
@@ -3258,7 +3280,7 @@ function flutterPatterns(content, opts) {
     ...FLUTTER_ACCESSOR_DEFAULTS,
     ...detectFlutterAccessors(content),
     ...opts?.accessors ?? []
-  ])].map(escapeRe);
+  ])].map(escapeRe2);
   return [
     // AppLocalizations.of(context)!.key — tolerates the !/? null-assertion.
     /AppLocalizations\.of\([^)]*\)[!?]?\.([a-zA-Z_][a-zA-Z0-9_]*)/g,
@@ -3343,6 +3365,32 @@ function extractPrefixes(content, scanner) {
   result.sort((a, b) => a.line - b.line || a.col - b.col);
   return result;
 }
+function extractLiterals(content) {
+  const starts = lineStartOffsets(content);
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const pattern of STRING_LITERALS) {
+    const re = new RegExp(pattern.source, "g");
+    let m;
+    while ((m = re.exec(content)) !== null) {
+      let text = m[1];
+      const marker = text.search(/\{\$|\$\{/);
+      if (marker !== -1) {
+        text = text.slice(0, marker);
+        if (!text.endsWith(".")) continue;
+      }
+      if (!KEY_SHAPE.test(text)) continue;
+      const { line, col } = offsetToLineCol(starts, m.index);
+      const dedup = `${line}:${col}:${text}`;
+      if (!seen.has(dedup)) {
+        seen.add(dedup);
+        result.push({ literal: text, line, col });
+      }
+    }
+  }
+  result.sort((a, b) => a.line - b.line || a.col - b.col);
+  return result;
+}
 function matchesGlob(relPath, glob) {
   const escaped = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "\0").replace(/\*/g, "[^/]*").replace(//g, ".*");
   return new RegExp(`^${escaped}$`).test(relPath);
@@ -3417,13 +3465,14 @@ function runScan(projectRoot, opts, existing) {
       mtime,
       size,
       refs: extractRefs(content, scanner, opts),
-      prefixes: extractPrefixes(content, scanner)
+      prefixes: extractPrefixes(content, scanner),
+      literals: extractLiterals(content)
     };
   }
   saveUsageCache(projectRoot, cache2);
   return cache2;
 }
-var PATTERNS, PREFIX_PATTERNS, CACHE_VERSION, EXT_SCANNER, ALWAYS_EXCLUDE, FLUTTER_ACCESSOR_DEFAULTS;
+var PATTERNS, PREFIX_PATTERNS, CACHE_VERSION, EXT_SCANNER, ALWAYS_EXCLUDE, FLUTTER_ACCESSOR_DEFAULTS, KEY_SHAPE, STRING_LITERALS;
 var init_scanner = __esm({
   "src/server/scanner.ts"() {
     "use strict";
@@ -3480,7 +3529,7 @@ var init_scanner = __esm({
         /(?<!\.)(?<![a-zA-Z0-9_$])\bt\s*\(\s*`([^`$]*)\$\{/g
       ]
     };
-    CACHE_VERSION = 5;
+    CACHE_VERSION = 6;
     EXT_SCANNER = {
       ".php": "laravel",
       ".vue": "js-i18n",
@@ -3514,6 +3563,12 @@ var init_scanner = __esm({
       "__pycache__"
     ]);
     FLUTTER_ACCESSOR_DEFAULTS = ["l10n", "loc", "localizations", "translations"];
+    KEY_SHAPE = /^[A-Za-z0-9_][A-Za-z0-9_/-]*(?:\.(?:[A-Za-z0-9_-]+|%[sd]))+\.?$/;
+    STRING_LITERALS = [
+      /'([^'\\\n]+)'/g,
+      /"([^"\\\n]+)"/g,
+      /`([^`\\\n]+)`/g
+    ];
   }
 });
 
@@ -6726,23 +6781,34 @@ function createApi(deps) {
   app.get("/scan/usage", (c) => {
     const key = c.req.query("key") ?? "";
     const cache2 = loadUsageCache(projectRoot);
-    if (!cache2) return c.json({ indexed: false, count: 0, refs: [], prefixCount: 0, prefixRefs: [] });
+    if (!cache2) return c.json({ indexed: false, count: 0, refs: [], prefixCount: 0, prefixRefs: [], literalCount: 0, literalRefs: [] });
     const refs = [];
     const prefixRefs = [];
+    const literalRefs = [];
     for (const [file, entry] of Object.entries(cache2.files)) {
       const abs = resolve9(projectRoot, file);
+      const refLines = /* @__PURE__ */ new Set();
       for (const r of entry.refs) {
-        if (r.key === key) refs.push({ file, abs, line: r.line, col: r.col, scanner: r.scanner });
+        if (r.key === key) {
+          refs.push({ file, abs, line: r.line, col: r.col, scanner: r.scanner });
+          refLines.add(r.line);
+        }
       }
       for (const p of entry.prefixes) {
         if (key.startsWith(p.prefix)) {
           prefixRefs.push({ file, abs, line: p.line, col: p.col, scanner: p.scanner, prefix: p.prefix });
         }
       }
+      for (const l of entry.literals ?? []) {
+        if (literalMatcher(l.literal)(key) && !refLines.has(l.line)) {
+          literalRefs.push({ file, abs, line: l.line, col: l.col, literal: l.literal });
+        }
+      }
     }
     const byFileLine = (a, b) => a.file.localeCompare(b.file) || a.line - b.line;
     refs.sort(byFileLine);
     prefixRefs.sort(byFileLine);
+    literalRefs.sort(byFileLine);
     return c.json({
       indexed: true,
       scannedAt: cache2.scannedAt,
@@ -6750,7 +6816,9 @@ function createApi(deps) {
       count: refs.length,
       refs,
       prefixCount: prefixRefs.length,
-      prefixRefs
+      prefixRefs,
+      literalCount: literalRefs.length,
+      literalRefs
     });
   });
   app.get("/scan/used", (c) => {

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,28 @@ 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 matchers = [];
+  const seenLiterals = /* @__PURE__ */ new Set();
+  for (const entry of Object.values(cache2.files)) {
+    for (const l of entry.literals ?? []) {
+      if (!l.literal || seenLiterals.has(l.literal)) continue;
+      seenLiterals.add(l.literal);
+      matchers.push(literalMatcher(l.literal));
+    }
+  }
+  const keep = (state.config.scan?.keep ?? []).map(globToRegExp);
+  return Object.keys(state.keys).filter((key) => exact.has(key) || prefixes.some((p) => key.startsWith(p)) || matchers.some((matches) => matches(key)) || keep.some((re) => re.test(key))).sort();
+}
+function escapeRe(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function literalMatcher(literal) {
+  if (/%[sd]/.test(literal)) {
+    const re = new RegExp(`^${literal.split(/%[sd]/).map(escapeRe).join("[^.]+")}$`);
+    return (key) => re.test(key);
+  }
+  if (literal.endsWith(".")) return (key) => key.startsWith(literal);
+  return (key) => key === literal || key.startsWith(literal + ".");
 }
 
 // src/server/scanner.ts
@@ -912,7 +939,7 @@ var PREFIX_PATTERNS = {
     /(?<!\.)(?<![a-zA-Z0-9_$])\bt\s*\(\s*`([^`$]*)\$\{/g
   ]
 };
-var CACHE_VERSION = 5;
+var CACHE_VERSION = 6;
 var EXT_SCANNER = {
   ".php": "laravel",
   ".vue": "js-i18n",
@@ -949,7 +976,7 @@ function scannerForExt(ext) {
   return EXT_SCANNER[ext] ?? null;
 }
 var FLUTTER_ACCESSOR_DEFAULTS = ["l10n", "loc", "localizations", "translations"];
-function escapeRe(s) {
+function escapeRe2(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function detectFlutterAccessors(content) {
@@ -966,7 +993,7 @@ function flutterPatterns(content, opts) {
     ...FLUTTER_ACCESSOR_DEFAULTS,
     ...detectFlutterAccessors(content),
     ...opts?.accessors ?? []
-  ])].map(escapeRe);
+  ])].map(escapeRe2);
   return [
     // AppLocalizations.of(context)!.key — tolerates the !/? null-assertion.
     /AppLocalizations\.of\([^)]*\)[!?]?\.([a-zA-Z_][a-zA-Z0-9_]*)/g,
@@ -1051,6 +1078,38 @@ function extractPrefixes(content, scanner) {
   result.sort((a, b) => a.line - b.line || a.col - b.col);
   return result;
 }
+var KEY_SHAPE = /^[A-Za-z0-9_][A-Za-z0-9_/-]*(?:\.(?:[A-Za-z0-9_-]+|%[sd]))+\.?$/;
+var STRING_LITERALS = [
+  /'([^'\\\n]+)'/g,
+  /"([^"\\\n]+)"/g,
+  /`([^`\\\n]+)`/g
+];
+function extractLiterals(content) {
+  const starts = lineStartOffsets(content);
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const pattern of STRING_LITERALS) {
+    const re = new RegExp(pattern.source, "g");
+    let m;
+    while ((m = re.exec(content)) !== null) {
+      let text = m[1];
+      const marker = text.search(/\{\$|\$\{/);
+      if (marker !== -1) {
+        text = text.slice(0, marker);
+        if (!text.endsWith(".")) continue;
+      }
+      if (!KEY_SHAPE.test(text)) continue;
+      const { line, col } = offsetToLineCol(starts, m.index);
+      const dedup = `${line}:${col}:${text}`;
+      if (!seen.has(dedup)) {
+        seen.add(dedup);
+        result.push({ literal: text, line, col });
+      }
+    }
+  }
+  result.sort((a, b) => a.line - b.line || a.col - b.col);
+  return result;
+}
 function matchesGlob(relPath, glob) {
   const escaped = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "\0").replace(/\*/g, "[^/]*").replace(//g, ".*");
   return new RegExp(`^${escaped}$`).test(relPath);
@@ -1125,7 +1184,8 @@ function runScan(projectRoot, opts, existing) {
       mtime,
       size,
       refs: extractRefs(content, scanner, opts),
-      prefixes: extractPrefixes(content, scanner)
+      prefixes: extractPrefixes(content, scanner),
+      literals: extractLiterals(content)
     };
   }
   saveUsageCache(projectRoot, cache2);
@@ -1139,7 +1199,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 +1242,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 +1738,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 +1987,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;
@@ -3461,7 +3515,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;
@@ -6198,23 +6252,34 @@ function createApi(deps) {
   app.get("/scan/usage", (c) => {
     const key = c.req.query("key") ?? "";
     const cache2 = loadUsageCache(projectRoot);
-    if (!cache2) return c.json({ indexed: false, count: 0, refs: [], prefixCount: 0, prefixRefs: [] });
+    if (!cache2) return c.json({ indexed: false, count: 0, refs: [], prefixCount: 0, prefixRefs: [], literalCount: 0, literalRefs: [] });
     const refs = [];
     const prefixRefs = [];
+    const literalRefs = [];
     for (const [file, entry] of Object.entries(cache2.files)) {
       const abs = resolve9(projectRoot, file);
+      const refLines = /* @__PURE__ */ new Set();
       for (const r of entry.refs) {
-        if (r.key === key) refs.push({ file, abs, line: r.line, col: r.col, scanner: r.scanner });
+        if (r.key === key) {
+          refs.push({ file, abs, line: r.line, col: r.col, scanner: r.scanner });
+          refLines.add(r.line);
+        }
       }
       for (const p of entry.prefixes) {
         if (key.startsWith(p.prefix)) {
           prefixRefs.push({ file, abs, line: p.line, col: p.col, scanner: p.scanner, prefix: p.prefix });
         }
       }
+      for (const l of entry.literals ?? []) {
+        if (literalMatcher(l.literal)(key) && !refLines.has(l.line)) {
+          literalRefs.push({ file, abs, line: l.line, col: l.col, literal: l.literal });
+        }
+      }
     }
     const byFileLine = (a, b) => a.file.localeCompare(b.file) || a.line - b.line;
     refs.sort(byFileLine);
     prefixRefs.sort(byFileLine);
+    literalRefs.sort(byFileLine);
     return c.json({
       indexed: true,
       scannedAt: cache2.scannedAt,
@@ -6222,7 +6287,9 @@ function createApi(deps) {
       count: refs.length,
       refs,
       prefixCount: prefixRefs.length,
-      prefixRefs
+      prefixRefs,
+      literalCount: literalRefs.length,
+      literalRefs
     });
   });
   app.get("/scan/used", (c) => {