@intlayer/lsp 8.11.4 → 9.0.0-canary.12

package/dist/esm/_virtual/_rolldown/runtime.mjs

@@ -0,0 +1,36 @@
+//#region \0rolldown/runtime.js
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) {
+		__defProp(target, name, {
+			get: all[name],
+			enumerable: true
+		});
+	}
+	if (!no_symbols) {
+		__defProp(target, Symbol.toStringTag, { value: "Module" });
+	}
+	return target;
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+			key = keys[i];
+			if (!__hasOwnProp.call(to, key) && key !== except) {
+				__defProp(to, key, {
+					get: ((k) => from[k]).bind(null, key),
+					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+				});
+			}
+		}
+	}
+	return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+
+//#endregion
+export { __exportAll, __reExport };

package/dist/esm/callers/index.mjs

@@ -0,0 +1,12 @@
+import { __exportAll, __reExport } from "../_virtual/_rolldown/runtime.mjs";
+
+export * from "@intlayer/config/callers"
+
+//#region src/callers/index.ts
+var callers_exports = /* @__PURE__ */ __exportAll({});
+import * as import__intlayer_config_callers from "@intlayer/config/callers";
+__reExport(callers_exports, import__intlayer_config_callers);
+
+//#endregion
+export { callers_exports };
+//# sourceMappingURL=index.mjs.map

package/dist/esm/callers/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","names":[],"sources":["../../../src/callers/index.ts"],"sourcesContent":["/**\n * Caller registry — re-exported from the shared source of truth in\n * `@intlayer/config/callers`.\n *\n * The descriptors are shared with `@intlayer/babel` (usage analysis + optimize\n * rewrite), `@intlayer/swc` (via `toSwcExtraCallers`) and every compat\n * package's bundler plugin, so a compat library declared once in\n * `@intlayer/config/src/callers/compat/<lib>.ts` is supported everywhere.\n *\n * Editor-specific matching helpers built on top of the registry live in\n * `./patterns.ts`.\n */\nexport * from '@intlayer/config/callers';\n"],"mappings":""}

package/dist/esm/callers/patterns.mjs

@@ -0,0 +1,37 @@
+import { callers_exports } from "./index.mjs";
+import { escapeRegularExpression } from "../findFieldInFile.mjs";
+
+//#region src/callers/patterns.ts
+/**
+* Alternation of every caller name whose dictionary key appears as a
+* positional string argument — for building text-search patterns.
+*/
+const getCallerNamesAlternation = () => (0, callers_exports.getPositionalKeyCallerNames)().join("|");
+/**
+* Regexes matching call sites that reference the dictionary `key` in project
+* source files. Used by "find all references" (content file → call sites).
+*
+* Two shapes are covered:
+*  1. Positional key argument, with optional TypeScript generic:
+*     `useIntlayer("key")`, `useTranslations<T>("key")`, `getFixedT("en", "key")`
+*  2. Options/descriptor object property:
+*     `getTranslations({ namespace: 'key' })`, `useI18n({ namespace: 'key' })`,
+*     `formatMessage({ id: 'key.field' })`
+*
+* @param key - The dictionary key to search for.
+*/
+const buildKeyUsagePatterns = (key) => {
+	const escapedKey = escapeRegularExpression(key);
+	return [new RegExp(`\\b(?:${getCallerNamesAlternation()})\\b\\s*(?:<[^<>()]*>)?\\s*\\(\\s*(['"\`])${escapedKey}\\1`, "g"), new RegExp(`\\{\\s*(?:id|namespace)\\s*:\\s*(['"\`])${escapedKey}(?:\\.[^'"\`\\n]*)?\\1`, "g")];
+};
+/**
+* Regex testing whether a file contains a caller invoked with the given
+* dictionary key — a cheap pre-filter before running field-level analysis.
+*
+* @param key - The dictionary key.
+*/
+const buildCallerWithKeyPattern = (key) => new RegExp(`\\b(?:${getCallerNamesAlternation()})\\b(?:<[^<>()]*>)?\\s*\\(\\s*['"\`]${escapeRegularExpression(key)}['"\`]`);
+
+//#endregion
+export { buildCallerWithKeyPattern, buildKeyUsagePatterns, getCallerNamesAlternation };
+//# sourceMappingURL=patterns.mjs.map

package/dist/esm/callers/patterns.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"patterns.mjs","names":[],"sources":["../../../src/callers/patterns.ts"],"sourcesContent":["import { escapeRegularExpression } from '../findFieldInFile';\nimport { getPositionalKeyCallerNames } from './index';\n\n/**\n * Alternation of every caller name whose dictionary key appears as a\n * positional string argument — for building text-search patterns.\n */\nexport const getCallerNamesAlternation = (): string =>\n  getPositionalKeyCallerNames().join('|');\n\n/**\n * Regexes matching call sites that reference the dictionary `key` in project\n * source files. Used by \"find all references\" (content file → call sites).\n *\n * Two shapes are covered:\n *  1. Positional key argument, with optional TypeScript generic:\n *     `useIntlayer(\"key\")`, `useTranslations<T>(\"key\")`, `getFixedT(\"en\", \"key\")`\n *  2. Options/descriptor object property:\n *     `getTranslations({ namespace: 'key' })`, `useI18n({ namespace: 'key' })`,\n *     `formatMessage({ id: 'key.field' })`\n *\n * @param key - The dictionary key to search for.\n */\nexport const buildKeyUsagePatterns = (key: string): RegExp[] => {\n  const escapedKey = escapeRegularExpression(key);\n\n  return [\n    new RegExp(\n      `\\\\b(?:${getCallerNamesAlternation()})\\\\b\\\\s*(?:<[^<>()]*>)?\\\\s*\\\\(\\\\s*(['\"\\`])${escapedKey}\\\\1`,\n      'g'\n    ),\n    new RegExp(\n      `\\\\{\\\\s*(?:id|namespace)\\\\s*:\\\\s*(['\"\\`])${escapedKey}(?:\\\\.[^'\"\\`\\\\n]*)?\\\\1`,\n      'g'\n    ),\n  ];\n};\n\n/**\n * Regex testing whether a file contains a caller invoked with the given\n * dictionary key — a cheap pre-filter before running field-level analysis.\n *\n * @param key - The dictionary key.\n */\nexport const buildCallerWithKeyPattern = (key: string): RegExp =>\n  new RegExp(\n    `\\\\b(?:${getCallerNamesAlternation()})\\\\b(?:<[^<>()]*>)?\\\\s*\\\\(\\\\s*['\"\\`]${escapeRegularExpression(key)}['\"\\`]`\n  );\n"],"mappings":";;;;;;;;AAOA,MAAa,oFACkB,CAAC,KAAK,IAAI;;;;;;;;;;;;;;AAezC,MAAa,yBAAyB,QAA0B;CAC9D,MAAM,aAAa,wBAAwB,IAAI;AAE/C,QAAO,CACL,IAAI,OACF,SAAS,2BAA2B,CAAC,4CAA4C,WAAW,MAC5F,IACD,EACD,IAAI,OACF,2CAA2C,WAAW,yBACtD,IACD,CACF;;;;;;;;AASH,MAAa,6BAA6B,QACxC,IAAI,OACF,SAAS,2BAA2B,CAAC,sCAAsC,wBAAwB,IAAI,CAAC,QACzG"}

package/dist/esm/dictionaryUtils.mjs

@@ -0,0 +1,84 @@
+//#region src/dictionaryUtils.ts
+const LOCALE_PATTERN = /^[a-z]{2}(-[A-Z]{2})?$/;
+const META_KEYS = new Set([
+	"nodeType",
+	"translation",
+	"enumeration",
+	"condition",
+	"plural",
+	"insertion",
+	"nested",
+	"markdown",
+	"html",
+	"file",
+	"composite",
+	"dictionaryKey"
+]);
+const isTypedNode = (val) => typeof val === "object" && val !== null && typeof val["nodeType"] === "string";
+const getTypedNodeSummary = (node) => {
+	const nodeType = node["nodeType"];
+	const inner = node[nodeType];
+	if (inner && typeof inner === "object") {
+		const map = inner;
+		const localeEntries = Object.entries(map).filter(([key]) => LOCALE_PATTERN.test(key));
+		const entries = localeEntries.length > 0 ? localeEntries : Object.entries(map);
+		if (entries.length > 0) return entries.slice(0, 5).map(([k, v]) => `**${k}**: ${typeof v === "string" ? v : JSON.stringify(v)}`).join("\n\n");
+	}
+	return `*(${nodeType})*`;
+};
+const formatFieldValue = (value) => {
+	if (value === null || value === void 0) return `\`${String(value)}\``;
+	if (typeof value === "string") return `"${value}"`;
+	if (typeof value === "number" || typeof value === "boolean") return String(value);
+	if (typeof value === "object") {
+		const obj = value;
+		if (isTypedNode(obj)) return getTypedNodeSummary(obj);
+		const fields = Object.keys(obj).filter((key) => !META_KEYS.has(key) && !LOCALE_PATTERN.test(key));
+		return fields.length > 0 ? `{ ${fields.slice(0, 8).join(", ")} }` : "{}";
+	}
+	return JSON.stringify(value);
+};
+const getFieldByPath = (content, path) => {
+	let current = content;
+	for (const key of path) {
+		if (current === null || typeof current !== "object") return void 0;
+		current = current[key];
+	}
+	return current;
+};
+const isNavigableField = (key) => !META_KEYS.has(key) && !LOCALE_PATTERN.test(key);
+const getTopLevelFields = (content) => {
+	if (!content || typeof content !== "object") return [];
+	return Object.keys(content).filter(isNavigableField);
+};
+const getFieldsAtPath = (content, path) => {
+	const value = path.length === 0 ? content : getFieldByPath(content, path);
+	if (!value || typeof value !== "object") return [];
+	if (isTypedNode(value)) return [];
+	return Object.keys(value).filter(isNavigableField);
+};
+const formatDictionaryHover = (dictionaries, key) => {
+	const primary = dictionaries[0];
+	const lines = [`**Intlayer dictionary** \`${key}\``];
+	if (primary.title) lines.push(`*${primary.title}*`);
+	if (primary.description) lines.push(primary.description);
+	const fields = getTopLevelFields(primary.content);
+	if (fields.length > 0) {
+		lines.push("");
+		lines.push(`**Fields:** ${fields.map((field) => `\`${field}\``).join(", ")}`);
+	}
+	if (dictionaries.length > 1) lines.push(`*(${dictionaries.length} source files)*`);
+	return lines.join("\n\n");
+};
+const formatFieldHover = (dictionaries, dictionaryKey, fieldPath) => {
+	for (const dict of dictionaries) {
+		const value = getFieldByPath(dict.content, fieldPath);
+		if (value === void 0) continue;
+		return [`**\`${dictionaryKey}.${fieldPath.join(".")}\`**`, formatFieldValue(value)].join("\n\n");
+	}
+	return null;
+};
+
+//#endregion
+export { formatDictionaryHover, formatFieldHover, formatFieldValue, getFieldByPath, getFieldsAtPath, getTopLevelFields };
+//# sourceMappingURL=dictionaryUtils.mjs.map

package/dist/esm/dictionaryUtils.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"dictionaryUtils.mjs","names":[],"sources":["../../src/dictionaryUtils.ts"],"sourcesContent":["import type { Dictionary } from '@intlayer/types/dictionary';\n\ntype ContentObj = Record<string, unknown>;\n\nconst LOCALE_PATTERN = /^[a-z]{2}(-[A-Z]{2})?$/;\nconst META_KEYS: ReadonlySet<string> = new Set([\n  'nodeType',\n  'translation',\n  'enumeration',\n  'condition',\n  'plural',\n  'insertion',\n  'nested',\n  'markdown',\n  'html',\n  'file',\n  'composite',\n  'dictionaryKey',\n]);\n\nconst isTypedNode = (val: unknown): val is ContentObj =>\n  typeof val === 'object' &&\n  val !== null &&\n  typeof (val as ContentObj)['nodeType'] === 'string';\n\nconst getTypedNodeSummary = (node: ContentObj): string => {\n  const nodeType = node['nodeType'] as string;\n  const inner = node[nodeType];\n\n  if (inner && typeof inner === 'object') {\n    const map = inner as Record<string, unknown>;\n    const localeEntries = Object.entries(map).filter(([key]) =>\n      LOCALE_PATTERN.test(key)\n    );\n\n    const entries =\n      localeEntries.length > 0 ? localeEntries : Object.entries(map);\n\n    if (entries.length > 0) {\n      return entries\n        .slice(0, 5)\n        .map(\n          ([k, v]) =>\n            `**${k}**: ${typeof v === 'string' ? v : JSON.stringify(v)}`\n        )\n        .join('\\n\\n');\n    }\n  }\n\n  return `*(${nodeType})*`;\n};\n\nexport const formatFieldValue = (value: unknown): string => {\n  if (value === null || value === undefined) return `\\`${String(value)}\\``;\n\n  if (typeof value === 'string') return `\"${value}\"`;\n\n  if (typeof value === 'number' || typeof value === 'boolean')\n    return String(value);\n\n  if (typeof value === 'object') {\n    const obj = value as ContentObj;\n\n    if (isTypedNode(obj)) return getTypedNodeSummary(obj);\n    const fields = Object.keys(obj).filter(\n      (key) => !META_KEYS.has(key) && !LOCALE_PATTERN.test(key)\n    );\n    return fields.length > 0 ? `{ ${fields.slice(0, 8).join(', ')} }` : '{}';\n  }\n  return JSON.stringify(value);\n};\n\nexport const getFieldByPath = (content: unknown, path: string[]): unknown => {\n  let current = content;\n  for (const key of path) {\n    if (current === null || typeof current !== 'object') return undefined;\n    current = (current as ContentObj)[key];\n  }\n  return current;\n};\n\nconst isNavigableField = (key: string): boolean =>\n  !META_KEYS.has(key) && !LOCALE_PATTERN.test(key);\n\nexport const getTopLevelFields = (content: unknown): string[] => {\n  if (!content || typeof content !== 'object') return [];\n  return Object.keys(content as ContentObj).filter(isNavigableField);\n};\n\nexport const getFieldsAtPath = (content: unknown, path: string[]): string[] => {\n  const value = path.length === 0 ? content : getFieldByPath(content, path);\n\n  if (!value || typeof value !== 'object') return [];\n\n  if (isTypedNode(value as ContentObj)) return [];\n  return Object.keys(value as ContentObj).filter(isNavigableField);\n};\n\nexport const formatDictionaryHover = (\n  dictionaries: Dictionary[],\n  key: string\n): string => {\n  const primary = dictionaries[0]!;\n  const lines: string[] = [`**Intlayer dictionary** \\`${key}\\``];\n\n  if (primary.title) lines.push(`*${primary.title}*`);\n\n  if (primary.description) lines.push(primary.description);\n\n  const fields = getTopLevelFields(primary.content);\n\n  if (fields.length > 0) {\n    lines.push('');\n    lines.push(\n      `**Fields:** ${fields.map((field) => `\\`${field}\\``).join(', ')}`\n    );\n  }\n\n  if (dictionaries.length > 1) {\n    lines.push(`*(${dictionaries.length} source files)*`);\n  }\n\n  return lines.join('\\n\\n');\n};\n\nexport const formatFieldHover = (\n  dictionaries: Dictionary[],\n  dictionaryKey: string,\n  fieldPath: string[]\n): string | null => {\n  for (const dict of dictionaries) {\n    const value = getFieldByPath(dict.content, fieldPath);\n\n    if (value === undefined) continue;\n    return [\n      `**\\`${dictionaryKey}.${fieldPath.join('.')}\\`**`,\n      formatFieldValue(value),\n    ].join('\\n\\n');\n  }\n  return null;\n};\n"],"mappings":"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"}

package/dist/esm/findFieldInFile.mjs

@@ -1,5 +1,5 @@
-import { getFirstStringArg, isIntlayerCall, parseText, walkAst } from "./oxcUtils.mjs";
-import { Position, Range } from "vscode-languageserver/node.js";
+import { collectMessageUsages } from "./usageAnalyzer.mjs";
+import { Position, Range } from "vscode-languageserver/node";
 
 //#region src/findFieldInFile.ts
 const escapeRegularExpression = (content) => content.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -12,100 +12,20 @@ const offsetToRange = (text, start, end) => {
 	const endCharacter = end - (beforeEnd.lastIndexOf("\n") + 1);
 	return Range.create(Position.create(startLine, startCharacter), Position.create(endLine, endCharacter));
 };
-const isComputedAccess = (node) => !!node["computed"];
-/**
-* Walk up a chain of MemberExpressions to find the root Identifier name.
-* Returns null for computed access (`a[b]`) or non-Identifier roots.
-*/
-const getChainRoot = (node) => {
-	let current = node;
-	while (current["type"] === "MemberExpression") {
-		if (isComputedAccess(current)) return null;
-		current = current["object"];
-	}
-	return current["type"] === "Identifier" ? current["name"] : null;
-};
-/**
-* Collect the property names in a chain of MemberExpressions, excluding the
-* root Identifier.  Returns null for any computed access.
-* e.g.  `content.searchInput.text` → `['searchInput', 'text']`
-*/
-const getChainProperties = (node) => {
-	const chain = [];
-	let current = node;
-	while (current["type"] === "MemberExpression") {
-		if (isComputedAccess(current)) return null;
-		const name = current["property"]["name"];
-		if (!name) return null;
-		chain.unshift(name);
-		current = current["object"];
-	}
-	return chain;
-};
-/**
-* Recursively search for a field at `path[depth]` inside an ObjectPattern
-* (destructure).  Returns the Range of the matched key node, or null.
-*
-* e.g.  `{ searchInput: { text } }` with path `['searchInput', 'text']` depth 0
-*       → returns the range of the `text` identifier inside the nested pattern.
-*/
-const findInObjectPattern = (pattern, path, depth, text) => {
-	if (pattern["type"] !== "ObjectPattern") return null;
-	if (depth >= path.length) return null;
-	const targetName = path[depth];
-	for (const prop of pattern["properties"] ?? []) {
-		if (prop["type"] !== "Property" && prop["type"] !== "ObjectProperty") continue;
-		const keyNode = prop["key"];
-		if (!keyNode) continue;
-		if ((keyNode["name"] ?? keyNode["value"]) !== targetName) continue;
-		if (depth === path.length - 1) return offsetToRange(text, keyNode["start"], keyNode["end"]);
-		const valueNode = prop["value"];
-		if (!valueNode) return null;
-		return findInObjectPattern(valueNode, path, depth + 1, text);
-	}
-	return null;
-};
-/**
-* Recursively collect variables that were destructured out of an ObjectPattern,
-* recording the "remaining intlayer path" each variable represents.
-*
-* e.g. given `{ searchInput }` with basePath `[]`, the variable `searchInput`
-* maps to remaining path `['searchInput']` (meaning it holds the searchInput
-* branch of the dictionary).
-*
-* e.g. given `{ searchInput: { text: alias } }` with basePath `[]`, the
-* variable `alias` maps to remaining path `['searchInput', 'text']`.
-*/
-const collectDestructuredVariables = (pattern, basePath, map) => {
-	if (pattern["type"] !== "ObjectPattern") return;
-	for (const prop of pattern["properties"] ?? []) {
-		if (prop["type"] !== "Property" && prop["type"] !== "ObjectProperty") continue;
-		const keyNode = prop["key"];
-		const valueNode = prop["value"];
-		if (!keyNode || !valueNode) continue;
-		const keyName = keyNode["name"] ?? keyNode["value"];
-		if (!keyName) continue;
-		const thisPath = [...basePath, keyName];
-		if (valueNode["type"] === "Identifier") map.set(valueNode["name"], thisPath);
-		else if (valueNode["type"] === "ObjectPattern") collectDestructuredVariables(valueNode, thisPath, map);
-	}
-};
 /**
 * Within a single file's text, find all positions where `fieldPath` (or legacy
-* `fieldName`) is used as a destructured property or member access on a
-* `useIntlayer(key)` / `getIntlayer(key)` result.
+* `fieldName`) is consumed from the dictionary `escapedKey` — through any
+* registered caller.
 *
-* Covers four patterns:
-*   1. Direct destructure:
-*        const { field } = useIntlayer("key")
-*   2. Nested destructure:
-*        const { parent: { child } } = useIntlayer("key")
-*   3. Indirect variable + member access:
-*        const { parent } = useIntlayer("key")
-*        parent.child
-*   4. Full chain member access:
-*        const content = useIntlayer("key")
-*        content.parent.child
+* Covers base-intlayer patterns:
+*   1. Direct destructure:      const { field } = useIntlayer("key")
+*   2. Nested destructure:      const { parent: { child } } = useIntlayer("key")
+*   3. Indirect member access:  const { parent } = useIntlayer("key"); parent.child
+*   4. Full chain access:       const content = useIntlayer("key"); content.parent.child
+*
+* …and every compat form resolved by `collectMessageUsages`: translation
+* calls (`t('parent.child')`), self calls (`formatMessage({ id })`), JSX
+* message components and lingui tagged templates.
 *
 * `fieldPath` (optional 5th parameter) is the preferred input; when omitted
 * the function derives the single-element path from `escapedField`, preserving
@@ -115,39 +35,16 @@ const findFieldRangesInFile = (text, escapedKey, _fieldName, escapedField, field
 	const dictionaryKey = escapedKey.replace(/\\([.*+?^${}()|[\]\\])/g, "$1");
 	const unescapedLeaf = escapedField.replace(/\\([.*+?^${}()|[\]\\])/g, "$1");
 	const path = fieldPath && fieldPath.length > 0 ? fieldPath : [unescapedLeaf];
-	const program = parseText(text);
-	if (!program) return [];
 	const ranges = [];
-	const variableToRemainingPath = /* @__PURE__ */ new Map();
-	walkAst(program, (node) => {
-		if (node["type"] !== "VariableDeclarator") return;
-		const initializer = node["init"];
-		if (!initializer || !isIntlayerCall(initializer)) return;
-		if (getFirstStringArg(initializer) !== dictionaryKey) return;
-		const idNode = node["id"];
-		if (!idNode) return;
-		if (idNode["type"] === "Identifier") variableToRemainingPath.set(idNode["name"], []);
-		if (idNode["type"] === "ObjectPattern") {
-			const range = findInObjectPattern(idNode, path, 0, text);
-			if (range) ranges.push(range);
-			collectDestructuredVariables(idNode, [], variableToRemainingPath);
-		}
-	});
-	walkAst(program, (node) => {
-		if (node["type"] !== "MemberExpression") return;
-		if (isComputedAccess(node)) return;
-		const root = getChainRoot(node);
-		if (!root) return;
-		const remainingPath = variableToRemainingPath.get(root);
-		if (remainingPath === void 0) return;
-		const chain = getChainProperties(node);
-		if (!chain) return;
-		const fullPath = [...remainingPath, ...chain];
-		if (fullPath.length !== path.length) return;
-		if (!fullPath.every((segment, i) => segment === path[i])) return;
-		const leafPropertyNode = node["property"];
-		ranges.push(offsetToRange(text, leafPropertyNode["start"], leafPropertyNode["end"]));
-	});
+	for (const usage of collectMessageUsages(text)) {
+		if (usage.dictionaryKey !== dictionaryKey) continue;
+		if (usage.isBareReference) continue;
+		if (usage.fieldPath.length !== path.length) continue;
+		if (!usage.fieldPath.every((segment, index) => segment === path[index])) continue;
+		const lastFieldSpan = usage.fieldSpans?.[usage.fieldSpans.length - 1];
+		if (usage.kind === "member" && lastFieldSpan) ranges.push(offsetToRange(text, lastFieldSpan.start, lastFieldSpan.end));
+		else ranges.push(offsetToRange(text, usage.start, usage.end));
+	}
 	return ranges;
 };
 

package/dist/esm/findFieldInFile.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"findFieldInFile.mjs","names":[],"sources":["../../src/findFieldInFile.ts"],"sourcesContent":["import { Position, Range } from 'vscode-languageserver/node.js';\nimport {\n  getFirstStringArg,\n  isIntlayerCall,\n  type OxcNode,\n  parseText,\n  walkAst,\n} from './oxcUtils';\n\nexport const escapeRegularExpression = (content: string): string =>\n  content.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');\n\nexport const offsetToRange = (\n  text: string,\n  start: number,\n  end: number\n): Range => {\n  const beforeStart = text.slice(0, start);\n  const startLine = (beforeStart.match(/\\n/g) ?? []).length;\n  const startCharacter = start - (beforeStart.lastIndexOf('\\n') + 1);\n  const beforeEnd = text.slice(0, end);\n  const endLine = (beforeEnd.match(/\\n/g) ?? []).length;\n  const endCharacter = end - (beforeEnd.lastIndexOf('\\n') + 1);\n\n  return Range.create(\n    Position.create(startLine, startCharacter),\n    Position.create(endLine, endCharacter)\n  );\n};\n\n// ---------------------------------------------------------------------------\n// Helpers for nested path matching\n// ---------------------------------------------------------------------------\n\nconst isComputedAccess = (node: OxcNode): boolean =>\n  !!(node['computed'] as boolean);\n\n/**\n * Walk up a chain of MemberExpressions to find the root Identifier name.\n * Returns null for computed access (`a[b]`) or non-Identifier roots.\n */\nconst getChainRoot = (node: OxcNode): string | null => {\n  let current = node;\n  while (current['type'] === 'MemberExpression') {\n    if (isComputedAccess(current)) return null;\n    current = current['object'] as OxcNode;\n  }\n  return current['type'] === 'Identifier' ? (current['name'] as string) : null;\n};\n\n/**\n * Collect the property names in a chain of MemberExpressions, excluding the\n * root Identifier.  Returns null for any computed access.\n * e.g.  `content.searchInput.text` → `['searchInput', 'text']`\n */\nconst getChainProperties = (node: OxcNode): string[] | null => {\n  const chain: string[] = [];\n  let current = node;\n  while (current['type'] === 'MemberExpression') {\n    if (isComputedAccess(current)) return null;\n    const prop = current['property'] as OxcNode;\n    const name = prop['name'] as string | undefined;\n    if (!name) return null;\n    chain.unshift(name);\n    current = current['object'] as OxcNode;\n  }\n  return chain;\n};\n\n/**\n * Recursively search for a field at `path[depth]` inside an ObjectPattern\n * (destructure).  Returns the Range of the matched key node, or null.\n *\n * e.g.  `{ searchInput: { text } }` with path `['searchInput', 'text']` depth 0\n *       → returns the range of the `text` identifier inside the nested pattern.\n */\nconst findInObjectPattern = (\n  pattern: OxcNode,\n  path: string[],\n  depth: number,\n  text: string\n): Range | null => {\n  if (pattern['type'] !== 'ObjectPattern') return null;\n  if (depth >= path.length) return null;\n\n  const targetName = path[depth]!;\n\n  for (const prop of (pattern['properties'] as OxcNode[]) ?? []) {\n    if (prop['type'] !== 'Property' && prop['type'] !== 'ObjectProperty')\n      continue;\n    const keyNode = prop['key'] as OxcNode | undefined;\n    if (!keyNode) continue;\n\n    const keyName =\n      (keyNode['name'] as string | undefined) ??\n      (keyNode['value'] as string | undefined);\n    if (keyName !== targetName) continue;\n\n    if (depth === path.length - 1) {\n      return offsetToRange(\n        text,\n        keyNode['start'] as number,\n        keyNode['end'] as number\n      );\n    }\n\n    const valueNode = prop['value'] as OxcNode | undefined;\n    if (!valueNode) return null;\n    return findInObjectPattern(valueNode, path, depth + 1, text);\n  }\n\n  return null;\n};\n\n/**\n * Recursively collect variables that were destructured out of an ObjectPattern,\n * recording the \"remaining intlayer path\" each variable represents.\n *\n * e.g. given `{ searchInput }` with basePath `[]`, the variable `searchInput`\n * maps to remaining path `['searchInput']` (meaning it holds the searchInput\n * branch of the dictionary).\n *\n * e.g. given `{ searchInput: { text: alias } }` with basePath `[]`, the\n * variable `alias` maps to remaining path `['searchInput', 'text']`.\n */\nconst collectDestructuredVariables = (\n  pattern: OxcNode,\n  basePath: string[],\n  map: Map<string, string[]>\n): void => {\n  if (pattern['type'] !== 'ObjectPattern') return;\n\n  for (const prop of (pattern['properties'] as OxcNode[]) ?? []) {\n    if (prop['type'] !== 'Property' && prop['type'] !== 'ObjectProperty')\n      continue;\n    const keyNode = prop['key'] as OxcNode | undefined;\n    const valueNode = prop['value'] as OxcNode | undefined;\n    if (!keyNode || !valueNode) continue;\n\n    const keyName =\n      (keyNode['name'] as string | undefined) ??\n      (keyNode['value'] as string | undefined);\n    if (!keyName) continue;\n\n    const thisPath = [...basePath, keyName];\n\n    if (valueNode['type'] === 'Identifier') {\n      // `{ a }` or `{ a: alias }` → variable name is valueNode.name\n      map.set(valueNode['name'] as string, thisPath);\n    } else if (valueNode['type'] === 'ObjectPattern') {\n      // `{ a: { b } }` → 'a' is consumed as a pattern level; recurse\n      collectDestructuredVariables(valueNode, thisPath, map);\n    }\n    // AssignmentPattern defaults (`{ a = 'x' }`) are ignored for simplicity\n  }\n};\n\n// ---------------------------------------------------------------------------\n// Main export\n// ---------------------------------------------------------------------------\n\n/**\n * Within a single file's text, find all positions where `fieldPath` (or legacy\n * `fieldName`) is used as a destructured property or member access on a\n * `useIntlayer(key)` / `getIntlayer(key)` result.\n *\n * Covers four patterns:\n *   1. Direct destructure:\n *        const { field } = useIntlayer(\"key\")\n *   2. Nested destructure:\n *        const { parent: { child } } = useIntlayer(\"key\")\n *   3. Indirect variable + member access:\n *        const { parent } = useIntlayer(\"key\")\n *        parent.child\n *   4. Full chain member access:\n *        const content = useIntlayer(\"key\")\n *        content.parent.child\n *\n * `fieldPath` (optional 5th parameter) is the preferred input; when omitted\n * the function derives the single-element path from `escapedField`, preserving\n * backward compatibility.\n */\nexport const findFieldRangesInFile = (\n  text: string,\n  escapedKey: string,\n  _fieldName: string,\n  escapedField: string,\n  fieldPath?: string[]\n): Range[] => {\n  const dictionaryKey = escapedKey.replace(/\\\\([.*+?^${}()|[\\]\\\\])/g, '$1');\n  const unescapedLeaf = escapedField.replace(/\\\\([.*+?^${}()|[\\]\\\\])/g, '$1');\n\n  // Effective path: use the provided fieldPath when available, else single-element\n  const path = fieldPath && fieldPath.length > 0 ? fieldPath : [unescapedLeaf];\n\n  const program = parseText(text);\n  if (!program) return [];\n\n  const ranges: Range[] = [];\n\n  // variable name → \"remaining intlayer path\" represented by this variable\n  // '' (root) entry would map to [] for `const v = useIntlayer('key')`\n  const variableToRemainingPath = new Map<string, string[]>();\n\n  // First pass: collect useIntlayer / getIntlayer variable assignments and\n  // destructures, and emit ranges for direct/nested ObjectPattern matches.\n  walkAst(program, (node) => {\n    if (node['type'] !== 'VariableDeclarator') return;\n\n    const initializer = node['init'] as OxcNode | undefined;\n    if (!initializer || !isIntlayerCall(initializer)) return;\n\n    const dk = getFirstStringArg(initializer);\n    if (dk !== dictionaryKey) return;\n\n    const idNode = node['id'] as OxcNode | undefined;\n    if (!idNode) return;\n\n    if (idNode['type'] === 'Identifier') {\n      // `const content = useIntlayer('key')` → root variable, remaining path []\n      variableToRemainingPath.set(idNode['name'] as string, []);\n    }\n\n    if (idNode['type'] === 'ObjectPattern') {\n      // Check if the target path is matched directly in the destructure pattern\n      const range = findInObjectPattern(idNode, path, 0, text);\n      if (range) ranges.push(range);\n\n      // Collect destructured variables for the member-access pass\n      collectDestructuredVariables(idNode, [], variableToRemainingPath);\n    }\n  });\n\n  // Second pass: find member-access chains that, combined with the variable's\n  // remaining path, equal the target path.\n  walkAst(program, (node) => {\n    if (node['type'] !== 'MemberExpression') return;\n    if (isComputedAccess(node)) return;\n\n    const root = getChainRoot(node);\n    if (!root) return;\n\n    const remainingPath = variableToRemainingPath.get(root);\n    if (remainingPath === undefined) return;\n\n    const chain = getChainProperties(node);\n    if (!chain) return;\n\n    const fullPath = [...remainingPath, ...chain];\n    if (fullPath.length !== path.length) return;\n    if (!fullPath.every((segment, i) => segment === path[i])) return;\n\n    // Highlight the last (leaf) property in the chain\n    const leafPropertyNode = node['property'] as OxcNode;\n    ranges.push(\n      offsetToRange(\n        text,\n        leafPropertyNode['start'] as number,\n        leafPropertyNode['end'] as number\n      )\n    );\n  });\n\n  return ranges;\n};\n"],"mappings":"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"}
+{"version":3,"file":"findFieldInFile.mjs","names":[],"sources":["../../src/findFieldInFile.ts"],"sourcesContent":["import { Position, Range } from 'vscode-languageserver/node';\nimport { collectMessageUsages } from './usageAnalyzer';\n\nexport const escapeRegularExpression = (content: string): string =>\n  content.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');\n\nexport const offsetToRange = (\n  text: string,\n  start: number,\n  end: number\n): Range => {\n  const beforeStart = text.slice(0, start);\n  const startLine = (beforeStart.match(/\\n/g) ?? []).length;\n  const startCharacter = start - (beforeStart.lastIndexOf('\\n') + 1);\n  const beforeEnd = text.slice(0, end);\n  const endLine = (beforeEnd.match(/\\n/g) ?? []).length;\n  const endCharacter = end - (beforeEnd.lastIndexOf('\\n') + 1);\n\n  return Range.create(\n    Position.create(startLine, startCharacter),\n    Position.create(endLine, endCharacter)\n  );\n};\n\n/**\n * Within a single file's text, find all positions where `fieldPath` (or legacy\n * `fieldName`) is consumed from the dictionary `escapedKey` — through any\n * registered caller.\n *\n * Covers base-intlayer patterns:\n *   1. Direct destructure:      const { field } = useIntlayer(\"key\")\n *   2. Nested destructure:      const { parent: { child } } = useIntlayer(\"key\")\n *   3. Indirect member access:  const { parent } = useIntlayer(\"key\"); parent.child\n *   4. Full chain access:       const content = useIntlayer(\"key\"); content.parent.child\n *\n * …and every compat form resolved by `collectMessageUsages`: translation\n * calls (`t('parent.child')`), self calls (`formatMessage({ id })`), JSX\n * message components and lingui tagged templates.\n *\n * `fieldPath` (optional 5th parameter) is the preferred input; when omitted\n * the function derives the single-element path from `escapedField`, preserving\n * backward compatibility.\n */\nexport const findFieldRangesInFile = (\n  text: string,\n  escapedKey: string,\n  _fieldName: string,\n  escapedField: string,\n  fieldPath?: string[]\n): Range[] => {\n  const dictionaryKey = escapedKey.replace(/\\\\([.*+?^${}()|[\\]\\\\])/g, '$1');\n  const unescapedLeaf = escapedField.replace(/\\\\([.*+?^${}()|[\\]\\\\])/g, '$1');\n\n  // Effective path: use the provided fieldPath when available, else single-element\n  const path = fieldPath && fieldPath.length > 0 ? fieldPath : [unescapedLeaf];\n\n  const ranges: Range[] = [];\n\n  for (const usage of collectMessageUsages(text)) {\n    if (usage.dictionaryKey !== dictionaryKey) continue;\n\n    // Bare variable references don't spell the field name — one hit per\n    // declaration site, not per flow of the variable.\n    if (usage.isBareReference) continue;\n\n    if (usage.fieldPath.length !== path.length) continue;\n\n    if (!usage.fieldPath.every((segment, index) => segment === path[index])) {\n      continue;\n    }\n\n    // Member chains highlight the leaf property; other usages highlight the\n    // whole expression (call, JSX element, tagged template, destructure key).\n    const lastFieldSpan = usage.fieldSpans?.[usage.fieldSpans.length - 1];\n\n    if (usage.kind === 'member' && lastFieldSpan) {\n      ranges.push(offsetToRange(text, lastFieldSpan.start, lastFieldSpan.end));\n    } else {\n      ranges.push(offsetToRange(text, usage.start, usage.end));\n    }\n  }\n\n  return ranges;\n};\n"],"mappings":";;;;AAGA,MAAa,2BAA2B,YACtC,QAAQ,QAAQ,uBAAuB,OAAO;AAEhD,MAAa,iBACX,MACA,OACA,QACU;CACV,MAAM,cAAc,KAAK,MAAM,GAAG,MAAM;CACxC,MAAM,aAAa,YAAY,MAAM,MAAM,IAAI,EAAE,EAAE;CACnD,MAAM,iBAAiB,SAAS,YAAY,YAAY,KAAK,GAAG;CAChE,MAAM,YAAY,KAAK,MAAM,GAAG,IAAI;CACpC,MAAM,WAAW,UAAU,MAAM,MAAM,IAAI,EAAE,EAAE;CAC/C,MAAM,eAAe,OAAO,UAAU,YAAY,KAAK,GAAG;AAE1D,QAAO,MAAM,OACX,SAAS,OAAO,WAAW,eAAe,EAC1C,SAAS,OAAO,SAAS,aAAa,CACvC;;;;;;;;;;;;;;;;;;;;;AAsBH,MAAa,yBACX,MACA,YACA,YACA,cACA,cACY;CACZ,MAAM,gBAAgB,WAAW,QAAQ,2BAA2B,KAAK;CACzE,MAAM,gBAAgB,aAAa,QAAQ,2BAA2B,KAAK;CAG3E,MAAM,OAAO,aAAa,UAAU,SAAS,IAAI,YAAY,CAAC,cAAc;CAE5E,MAAM,SAAkB,EAAE;AAE1B,MAAK,MAAM,SAAS,qBAAqB,KAAK,EAAE;AAC9C,MAAI,MAAM,kBAAkB,cAAe;AAI3C,MAAI,MAAM,gBAAiB;AAE3B,MAAI,MAAM,UAAU,WAAW,KAAK,OAAQ;AAE5C,MAAI,CAAC,MAAM,UAAU,OAAO,SAAS,UAAU,YAAY,KAAK,OAAO,CACrE;EAKF,MAAM,gBAAgB,MAAM,aAAa,MAAM,WAAW,SAAS;AAEnE,MAAI,MAAM,SAAS,YAAY,cAC7B,QAAO,KAAK,cAAc,MAAM,cAAc,OAAO,cAAc,IAAI,CAAC;MAExE,QAAO,KAAK,cAAc,MAAM,MAAM,OAAO,MAAM,IAAI,CAAC;;AAI5D,QAAO"}

package/dist/esm/findKeyAtOffset.mjs

@@ -1,33 +1,29 @@
-import { getFirstStringArg, isIntlayerCall, parseText, walkAst } from "./oxcUtils.mjs";
+import { collectNamespaceReferences } from "./usageAnalyzer.mjs";
 
 //#region src/findKeyAtOffset.ts
 /**
-* Scan `text` for a useIntlayer / getIntlayer call whose AST span contains
-* `offset`.  Returns the dictionary key string, or `null` when the cursor is
-* not inside any recognised call.
+* Scan `text` for a caller whose namespace (dictionary key) is addressed at
+* `offset`. Returns the namespace string when the cursor is on the caller
+* name or on the namespace argument itself, `null` otherwise.
 *
-* Handles:
-*   useIntlayer("my-key")
-*   getIntlayer<Type>("my-key", locale)
-*   useIntlayer(
-*     "my-key"          ← multi-line
-*   )
-*   useIntlayer(`my-key`)
+* Handles every registered caller with a positional or options-object
+* namespace:
+*   useIntlayer("my-key")                 ← cursor on "my-key" or the callee
+*   useTranslations("namespace")          ← idem
+*   getFixedT("en", "namespace")          ← cursor on "namespace", not "en"
+*   useI18n({ namespace: "ns" })          ← cursor on "ns" or the callee
+*   getTranslations({ namespace: "ns" })  ← idem
+*
+* Self callers (`formatMessage`, lingui `t`/`_`) are message *usages*, not
+* namespace declarations — they are resolved by `findMessageUsageAtOffset`.
 */
 const findKeyAtOffset = (text, offset) => {
-	const program = parseText(text);
-	if (!program) return null;
-	let result = null;
-	walkAst(program, (node) => {
-		if (result) return true;
-		if (!isIntlayerCall(node)) return;
-		const start = node["start"];
-		const end = node["end"];
-		if (offset < start || offset > end) return true;
-		result = getFirstStringArg(node);
-		return true;
-	});
-	return result;
+	for (const reference of collectNamespaceReferences(text)) {
+		const isOnCalleeName = offset >= reference.calleeStart && offset <= reference.calleeEnd;
+		const isOnNamespaceArgument = offset >= reference.namespaceStart && offset <= reference.namespaceEnd;
+		if (isOnCalleeName || isOnNamespaceArgument) return reference.dictionaryKey;
+	}
+	return null;
 };
 
 //#endregion

package/dist/esm/findKeyAtOffset.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"findKeyAtOffset.mjs","names":[],"sources":["../../src/findKeyAtOffset.ts"],"sourcesContent":["import {\n  getFirstStringArg,\n  isIntlayerCall,\n  parseText,\n  walkAst,\n} from './oxcUtils';\n\n/**\n * Scan `text` for a useIntlayer / getIntlayer call whose AST span contains\n * `offset`.  Returns the dictionary key string, or `null` when the cursor is\n * not inside any recognised call.\n *\n * Handles:\n *   useIntlayer(\"my-key\")\n *   getIntlayer<Type>(\"my-key\", locale)\n *   useIntlayer(\n *     \"my-key\"          ← multi-line\n *   )\n *   useIntlayer(`my-key`)\n */\nexport const findKeyAtOffset = (\n  text: string,\n  offset: number\n): string | null => {\n  const program = parseText(text);\n  if (!program) return null;\n\n  let result: string | null = null;\n\n  walkAst(program, (node) => {\n    if (result) return true; // already found — prune remaining\n    if (!isIntlayerCall(node)) return;\n\n    const start = node['start'] as number;\n    const end = node['end'] as number;\n    if (offset < start || offset > end) return true; // outside span — prune\n\n    result = getFirstStringArg(node);\n    return true;\n  });\n\n  return result;\n};\n"],"mappings":";;;;;;;;;;;;;;;;AAoBA,MAAa,mBACX,MACA,WACkB;CAClB,MAAM,UAAU,UAAU,IAAI;CAC9B,IAAI,CAAC,SAAS,OAAO;CAErB,IAAI,SAAwB;CAE5B,QAAQ,UAAU,SAAS;EACzB,IAAI,QAAQ,OAAO;EACnB,IAAI,CAAC,eAAe,IAAI,GAAG;EAE3B,MAAM,QAAQ,KAAK;EACnB,MAAM,MAAM,KAAK;EACjB,IAAI,SAAS,SAAS,SAAS,KAAK,OAAO;EAE3C,SAAS,kBAAkB,IAAI;EAC/B,OAAO;CACT,CAAC;CAED,OAAO;AACT"}
+{"version":3,"file":"findKeyAtOffset.mjs","names":[],"sources":["../../src/findKeyAtOffset.ts"],"sourcesContent":["import { collectNamespaceReferences } from './usageAnalyzer';\n\n/**\n * Scan `text` for a caller whose namespace (dictionary key) is addressed at\n * `offset`. Returns the namespace string when the cursor is on the caller\n * name or on the namespace argument itself, `null` otherwise.\n *\n * Handles every registered caller with a positional or options-object\n * namespace:\n *   useIntlayer(\"my-key\")                 ← cursor on \"my-key\" or the callee\n *   useTranslations(\"namespace\")          ← idem\n *   getFixedT(\"en\", \"namespace\")          ← cursor on \"namespace\", not \"en\"\n *   useI18n({ namespace: \"ns\" })          ← cursor on \"ns\" or the callee\n *   getTranslations({ namespace: \"ns\" })  ← idem\n *\n * Self callers (`formatMessage`, lingui `t`/`_`) are message *usages*, not\n * namespace declarations — they are resolved by `findMessageUsageAtOffset`.\n */\nexport const findKeyAtOffset = (\n  text: string,\n  offset: number\n): string | null => {\n  for (const reference of collectNamespaceReferences(text)) {\n    const isOnCalleeName =\n      offset >= reference.calleeStart && offset <= reference.calleeEnd;\n    const isOnNamespaceArgument =\n      offset >= reference.namespaceStart && offset <= reference.namespaceEnd;\n\n    if (isOnCalleeName || isOnNamespaceArgument) {\n      return reference.dictionaryKey;\n    }\n  }\n\n  return null;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAkBA,MAAa,mBACX,MACA,WACkB;AAClB,MAAK,MAAM,aAAa,2BAA2B,KAAK,EAAE;EACxD,MAAM,iBACJ,UAAU,UAAU,eAAe,UAAU,UAAU;EACzD,MAAM,wBACJ,UAAU,UAAU,kBAAkB,UAAU,UAAU;AAE5D,MAAI,kBAAkB,sBACpB,QAAO,UAAU;;AAIrB,QAAO"}