@intlayer/lsp 9.5.11 → 9.6.0

package/dist/esm/callers/editorCallers.mjs

@@ -0,0 +1,39 @@
+import { COMPAT_CALLERS } from "@intlayer/config/callers";
+
+//#region src/callers/editorCallers.ts
+/**
+* Every module a compat adapter is imported from (original library names and
+* their `@intlayer/*` equivalents), derived from the shared registry so a new
+* compat library is covered without touching this file.
+*/
+const COMPAT_IMPORT_SOURCES = [...new Set(COMPAT_CALLERS.flatMap((descriptor) => descriptor.importSources))];
+/**
+* Callers recognised by the editor tooling only (go-to-definition, hover,
+* references) — deliberately kept out of the shared registry in
+* `@intlayer/config/callers`, because the babel/swc optimize and purge passes
+* would otherwise start binding them.
+*
+* Their message ids carry no namespace, so the dictionary is the first id
+* segment; `resolveDictionaryTarget` then falls back to the whole-file catalog
+* (`index`) when that segment names no dictionary.
+*/
+const EDITOR_CALLERS = [{
+	callerName: "t",
+	library: "i18next",
+	importSources: COMPAT_IMPORT_SOURCES,
+	requiresImport: true,
+	matchAsMethod: true,
+	namespaceSources: [{ from: "path-first-segment" }],
+	translationFunction: "self"
+}, {
+	callerName: "$t",
+	library: "vue-i18n",
+	importSources: ["vue-i18n", "@intlayer/vue-i18n"],
+	matchAsMethod: true,
+	namespaceSources: [{ from: "path-first-segment" }],
+	translationFunction: "self"
+}];
+
+//#endregion
+export { EDITOR_CALLERS };
+//# sourceMappingURL=editorCallers.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"editorCallers.mjs","names":[],"sources":["../../../src/callers/editorCallers.ts"],"sourcesContent":["import {\n  type CallerDescriptor,\n  COMPAT_CALLERS,\n} from '@intlayer/config/callers';\n\n/**\n * Every module a compat adapter is imported from (original library names and\n * their `@intlayer/*` equivalents), derived from the shared registry so a new\n * compat library is covered without touching this file.\n */\nconst COMPAT_IMPORT_SOURCES = [\n  ...new Set(COMPAT_CALLERS.flatMap((descriptor) => descriptor.importSources)),\n];\n\n/**\n * Callers recognised by the editor tooling only (go-to-definition, hover,\n * references) — deliberately kept out of the shared registry in\n * `@intlayer/config/callers`, because the babel/swc optimize and purge passes\n * would otherwise start binding them.\n *\n * Their message ids carry no namespace, so the dictionary is the first id\n * segment; `resolveDictionaryTarget` then falls back to the whole-file catalog\n * (`index`) when that segment names no dictionary.\n */\nexport const EDITOR_CALLERS: CallerDescriptor[] = [\n  {\n    // `i18n.t('home.title')`, `i18next.t(…)`, `i18n.global.t(…)`, or a bare\n    // `t` in a file importing any compat library. A `t` bound by\n    // `useTranslation()` / `useTranslations()` resolves as a translator\n    // binding first, and a library's own `t` caller wins over this one.\n    callerName: 't',\n    library: 'i18next',\n    importSources: COMPAT_IMPORT_SOURCES,\n    requiresImport: true,\n    matchAsMethod: true,\n    namespaceSources: [{ from: 'path-first-segment' }],\n    translationFunction: 'self',\n  },\n  {\n    // vue-i18n / @nuxtjs/i18n global `$t('home.title')` / `this.$t(…)` —\n    // templates never import it, so no import is required.\n    callerName: '$t',\n    library: 'vue-i18n',\n    importSources: ['vue-i18n', '@intlayer/vue-i18n'],\n    matchAsMethod: true,\n    namespaceSources: [{ from: 'path-first-segment' }],\n    translationFunction: 'self',\n  },\n];\n"],"mappings":";;;;;;;;AAUA,MAAM,wBAAwB,CAC5B,GAAG,IAAI,IAAI,eAAe,SAAS,eAAe,WAAW,aAAa,CAAC,CAC7E;;;;;;;;;;;AAYA,MAAa,iBAAqC,CAChD;CAKE,YAAY;CACZ,SAAS;CACT,eAAe;CACf,gBAAgB;CAChB,eAAe;CACf,kBAAkB,CAAC,EAAE,MAAM,qBAAqB,CAAC;CACjD,qBAAqB;AACvB,GACA;CAGE,YAAY;CACZ,SAAS;CACT,eAAe,CAAC,YAAY,oBAAoB;CAChD,eAAe;CACf,kBAAkB,CAAC,EAAE,MAAM,qBAAqB,CAAC;CACjD,qBAAqB;AACvB,CACF"}

package/dist/esm/findFieldDeclaration.mjs

@@ -0,0 +1,152 @@
+import { getPropertyKeyName, nodeEnd, nodeStart, parseText } from "./oxcUtils.mjs";
+import { escapeRegularExpression } from "./findFieldInFile.mjs";
+import { extname } from "node:path";
+
+//#region src/findFieldDeclaration.ts
+const JSON_EXTENSIONS = /* @__PURE__ */ new Set([
+	".json",
+	".jsonc",
+	".json5"
+]);
+const SCRIPT_EXTENSIONS = /* @__PURE__ */ new Set([
+	".ts",
+	".tsx",
+	".js",
+	".jsx",
+	".mjs",
+	".cjs",
+	".mts",
+	".cts"
+]);
+/** Strip `x as T`, `x satisfies T` and `(x)` wrappers. */
+const unwrapExpression = (node) => {
+	let current = node;
+	while (current?.["type"] === "TSAsExpression" || current?.["type"] === "TSSatisfiesExpression" || current?.["type"] === "ParenthesizedExpression") current = current["expression"];
+	return current;
+};
+/**
+* The object literal properties are read from: the node itself, or the first
+* object argument of a wrapping call (`t({ … })`, `enu({ … })`).
+*/
+const getObjectLiteral = (node) => {
+	const expression = unwrapExpression(node);
+	if (expression?.["type"] === "ObjectExpression") return expression;
+	if (expression?.["type"] === "CallExpression") {
+		const firstArgument = unwrapExpression(expression["arguments"]?.[0]);
+		if (firstArgument?.["type"] === "ObjectExpression") return firstArgument;
+	}
+};
+const findPropertyByName = (objectNode, propertyName) => (objectNode["properties"] ?? []).find((property) => (property["type"] === "Property" || property["type"] === "ObjectProperty") && getPropertyKeyName(property["key"]) === propertyName);
+/**
+* Deepest property reached by walking `segments` through nested object
+* literals, where one property may consume several segments when its name is
+* their dotted join (flat `'profile.title'` keys).
+*/
+const findDeepestProperty = (objectNode, segments, consumedSegmentCount = 0) => {
+	let best = null;
+	const remaining = segments.length - consumedSegmentCount;
+	for (let length = 1; length <= remaining; length++) {
+		const propertyName = segments.slice(consumedSegmentCount, consumedSegmentCount + length).join(".");
+		const property = findPropertyByName(objectNode, propertyName);
+		if (!property) continue;
+		const matchedSegmentCount = consumedSegmentCount + length;
+		let match = {
+			keyNode: property["key"],
+			matchedSegmentCount
+		};
+		const childObject = getObjectLiteral(property["value"]);
+		if (matchedSegmentCount < segments.length && childObject) match = findDeepestProperty(childObject, segments, matchedSegmentCount) ?? match;
+		if (match.matchedSegmentCount === segments.length) return match;
+		if (!best || match.matchedSegmentCount > best.matchedSegmentCount) best = match;
+	}
+	return best;
+};
+/** The root object literal of a JSON document. */
+const getJsonRootObject = (text) => {
+	const statement = (parseText(`(${text}\n)`)?.["body"])?.[0];
+	const rootObject = getObjectLiteral(statement?.["expression"]);
+	return rootObject ? {
+		rootObject,
+		offsetShift: 1
+	} : null;
+};
+/** The object literal a content declaration file exports. */
+const getContentFileRootObject = (text) => {
+	const body = parseText(text)?.["body"] ?? [];
+	const exportDefault = body.find((statement) => statement["type"] === "ExportDefaultDeclaration");
+	let declaration = unwrapExpression(exportDefault?.["declaration"]);
+	if (declaration?.["type"] === "Identifier") {
+		const variableName = declaration["name"];
+		for (const statement of body) {
+			const variableDeclaration = statement["type"] === "ExportNamedDeclaration" ? statement["declaration"] : statement;
+			if (variableDeclaration?.["type"] !== "VariableDeclaration") continue;
+			const declarator = (variableDeclaration["declarations"] ?? []).find((candidate) => candidate["id"]?.["name"] === variableName);
+			if (declarator) {
+				declaration = unwrapExpression(declarator["init"]);
+				break;
+			}
+		}
+	}
+	return getObjectLiteral(declaration) ?? null;
+};
+/**
+* Regex fallback for formats with no AST (YAML, Markdown frontmatter): the
+* leaf field name written as a property key.
+*/
+const findLeafPropertyByText = (text, fieldPath) => {
+	const leafName = fieldPath[fieldPath.length - 1];
+	if (!leafName) return null;
+	const match = new RegExp(`(?<![.\\w])(['"\`]?)${escapeRegularExpression(leafName)}\\1\\s*:`, "m").exec(text);
+	if (!match) return null;
+	const start = match.index + match[1].length;
+	return {
+		start,
+		end: start + leafName.length
+	};
+};
+const toSpan = (match, offsetShift) => ({
+	start: nodeStart(match.keyNode) - offsetShift,
+	end: nodeEnd(match.keyNode) - offsetShift
+});
+/**
+* Locate where a dictionary field is declared in its source file.
+*
+* - JSON catalogs may hold the dictionary at their root or under a property
+*   named after it (one file splitting into several dictionaries); both are
+*   tried, with nested and flat dotted keys.
+* - Content declaration files (`.content.ts`) are walked from the exported
+*   object's `content` property.
+* - Other formats fall back to a text search on the leaf name.
+*
+* With an empty `fieldPath`, the dictionary itself is located: its namespace
+* property in a JSON catalog, or the `key` property of a content file.
+*
+* @returns The span of the property key, or `null` when not found.
+*/
+const findFieldDeclaration = (text, filePath, dictionaryKey, fieldPath) => {
+	const extension = extname(filePath).toLowerCase();
+	const segments = fieldPath.flatMap((propertyName) => propertyName.split("."));
+	if (JSON_EXTENSIONS.has(extension)) {
+		const json = getJsonRootObject(text);
+		if (!json) return findLeafPropertyByText(text, fieldPath);
+		const underNamespace = findDeepestProperty(json.rootObject, [dictionaryKey, ...segments]);
+		const atRoot = segments.length > 0 ? findDeepestProperty(json.rootObject, segments) : null;
+		const isComplete = (match, segmentCount) => match?.matchedSegmentCount === segmentCount;
+		if (isComplete(underNamespace, segments.length + 1)) return toSpan(underNamespace, json.offsetShift);
+		if (isComplete(atRoot, segments.length)) return toSpan(atRoot, json.offsetShift);
+		const partial = underNamespace ?? atRoot;
+		return partial ? toSpan(partial, json.offsetShift) : null;
+	}
+	if (SCRIPT_EXTENSIONS.has(extension)) {
+		const rootObject = getContentFileRootObject(text);
+		if (rootObject) {
+			const match = findDeepestProperty(rootObject, segments.length > 0 ? ["content", ...segments] : ["key"]);
+			if (match) return toSpan(match, 0);
+		}
+	}
+	return findLeafPropertyByText(text, fieldPath);
+};
+
+//#endregion
+export { findFieldDeclaration };
+//# sourceMappingURL=findFieldDeclaration.mjs.map

package/dist/esm/findFieldDeclaration.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"findFieldDeclaration.mjs","names":[],"sources":["../../src/findFieldDeclaration.ts"],"sourcesContent":["import { extname } from 'node:path';\nimport { escapeRegularExpression } from './findFieldInFile';\nimport {\n  getPropertyKeyName,\n  nodeEnd,\n  nodeStart,\n  type OxcNode,\n  parseText,\n} from './oxcUtils';\n\n/** Offsets of a declaration inside a file's text. */\nexport type OffsetSpan = { start: number; end: number };\n\nconst JSON_EXTENSIONS = new Set(['.json', '.jsonc', '.json5']);\nconst SCRIPT_EXTENSIONS = new Set([\n  '.ts',\n  '.tsx',\n  '.js',\n  '.jsx',\n  '.mjs',\n  '.cjs',\n  '.mts',\n  '.cts',\n]);\n\n/** A property matched while walking an object literal. */\ntype PropertyMatch = {\n  keyNode: OxcNode;\n  /** Number of path segments consumed up to this property. */\n  matchedSegmentCount: number;\n};\n\n/** Strip `x as T`, `x satisfies T` and `(x)` wrappers. */\nconst unwrapExpression = (node: OxcNode | undefined): OxcNode | undefined => {\n  let current = node;\n\n  while (\n    current?.['type'] === 'TSAsExpression' ||\n    current?.['type'] === 'TSSatisfiesExpression' ||\n    current?.['type'] === 'ParenthesizedExpression'\n  ) {\n    current = current['expression'] as OxcNode | undefined;\n  }\n\n  return current;\n};\n\n/**\n * The object literal properties are read from: the node itself, or the first\n * object argument of a wrapping call (`t({ … })`, `enu({ … })`).\n */\nconst getObjectLiteral = (node: OxcNode | undefined): OxcNode | undefined => {\n  const expression = unwrapExpression(node);\n\n  if (expression?.['type'] === 'ObjectExpression') return expression;\n\n  if (expression?.['type'] === 'CallExpression') {\n    const firstArgument = unwrapExpression(\n      (expression['arguments'] as OxcNode[] | undefined)?.[0]\n    );\n\n    if (firstArgument?.['type'] === 'ObjectExpression') return firstArgument;\n  }\n\n  return undefined;\n};\n\nconst findPropertyByName = (\n  objectNode: OxcNode,\n  propertyName: string\n): OxcNode | undefined =>\n  ((objectNode['properties'] as OxcNode[] | undefined) ?? []).find(\n    (property) =>\n      (property['type'] === 'Property' ||\n        property['type'] === 'ObjectProperty') &&\n      getPropertyKeyName(property['key'] as OxcNode | undefined) ===\n        propertyName\n  );\n\n/**\n * Deepest property reached by walking `segments` through nested object\n * literals, where one property may consume several segments when its name is\n * their dotted join (flat `'profile.title'` keys).\n */\nconst findDeepestProperty = (\n  objectNode: OxcNode,\n  segments: string[],\n  consumedSegmentCount = 0\n): PropertyMatch | null => {\n  let best: PropertyMatch | null = null;\n  const remaining = segments.length - consumedSegmentCount;\n\n  for (let length = 1; length <= remaining; length++) {\n    const propertyName = segments\n      .slice(consumedSegmentCount, consumedSegmentCount + length)\n      .join('.');\n    const property = findPropertyByName(objectNode, propertyName);\n\n    if (!property) continue;\n\n    const matchedSegmentCount = consumedSegmentCount + length;\n    let match: PropertyMatch = {\n      keyNode: property['key'] as OxcNode,\n      matchedSegmentCount,\n    };\n\n    const childObject = getObjectLiteral(property['value'] as OxcNode);\n\n    if (matchedSegmentCount < segments.length && childObject) {\n      match =\n        findDeepestProperty(childObject, segments, matchedSegmentCount) ??\n        match;\n    }\n\n    if (match.matchedSegmentCount === segments.length) return match;\n\n    if (!best || match.matchedSegmentCount > best.matchedSegmentCount) {\n      best = match;\n    }\n  }\n\n  return best;\n};\n\n/** The root object literal of a JSON document. */\nconst getJsonRootObject = (\n  text: string\n): { rootObject: OxcNode; offsetShift: number } | null => {\n  // Parsed as a parenthesised expression so a bare `{…}` is not read as a\n  // block statement; every offset is then shifted by the added `(`.\n  const program = parseText(`(${text}\\n)`);\n  const statement = (program?.['body'] as OxcNode[] | undefined)?.[0];\n  const rootObject = getObjectLiteral(\n    statement?.['expression'] as OxcNode | undefined\n  );\n\n  return rootObject ? { rootObject, offsetShift: 1 } : null;\n};\n\n/** The object literal a content declaration file exports. */\nconst getContentFileRootObject = (text: string): OxcNode | null => {\n  const program = parseText(text);\n  const body = (program?.['body'] as OxcNode[] | undefined) ?? [];\n\n  const exportDefault = body.find(\n    (statement) => statement['type'] === 'ExportDefaultDeclaration'\n  );\n  let declaration = unwrapExpression(\n    exportDefault?.['declaration'] as OxcNode | undefined\n  );\n\n  // `const content = { … } satisfies Dictionary; export default content;`\n  if (declaration?.['type'] === 'Identifier') {\n    const variableName = declaration['name'] as string;\n\n    for (const statement of body) {\n      const variableDeclaration =\n        statement['type'] === 'ExportNamedDeclaration'\n          ? (statement['declaration'] as OxcNode | undefined)\n          : statement;\n\n      if (variableDeclaration?.['type'] !== 'VariableDeclaration') continue;\n\n      const declarator = (\n        (variableDeclaration['declarations'] as OxcNode[]) ?? []\n      ).find(\n        (candidate) =>\n          (candidate['id'] as OxcNode | undefined)?.['name'] === variableName\n      );\n\n      if (declarator) {\n        declaration = unwrapExpression(\n          declarator['init'] as OxcNode | undefined\n        );\n        break;\n      }\n    }\n  }\n\n  return getObjectLiteral(declaration) ?? null;\n};\n\n/**\n * Regex fallback for formats with no AST (YAML, Markdown frontmatter): the\n * leaf field name written as a property key.\n */\nconst findLeafPropertyByText = (\n  text: string,\n  fieldPath: string[]\n): OffsetSpan | null => {\n  const leafName = fieldPath[fieldPath.length - 1];\n\n  if (!leafName) return null;\n\n  const match = new RegExp(\n    `(?<![.\\\\w])(['\"\\`]?)${escapeRegularExpression(leafName)}\\\\1\\\\s*:`,\n    'm'\n  ).exec(text);\n\n  if (!match) return null;\n\n  const start = match.index + match[1]!.length;\n\n  return { start, end: start + leafName.length };\n};\n\nconst toSpan = (match: PropertyMatch, offsetShift: number): OffsetSpan => ({\n  start: nodeStart(match.keyNode) - offsetShift,\n  end: nodeEnd(match.keyNode) - offsetShift,\n});\n\n/**\n * Locate where a dictionary field is declared in its source file.\n *\n * - JSON catalogs may hold the dictionary at their root or under a property\n *   named after it (one file splitting into several dictionaries); both are\n *   tried, with nested and flat dotted keys.\n * - Content declaration files (`.content.ts`) are walked from the exported\n *   object's `content` property.\n * - Other formats fall back to a text search on the leaf name.\n *\n * With an empty `fieldPath`, the dictionary itself is located: its namespace\n * property in a JSON catalog, or the `key` property of a content file.\n *\n * @returns The span of the property key, or `null` when not found.\n */\nexport const findFieldDeclaration = (\n  text: string,\n  filePath: string,\n  dictionaryKey: string,\n  fieldPath: string[]\n): OffsetSpan | null => {\n  const extension = extname(filePath).toLowerCase();\n  const segments = fieldPath.flatMap((propertyName) => propertyName.split('.'));\n\n  if (JSON_EXTENSIONS.has(extension)) {\n    const json = getJsonRootObject(text);\n\n    if (!json) return findLeafPropertyByText(text, fieldPath);\n\n    const underNamespace = findDeepestProperty(json.rootObject, [\n      dictionaryKey,\n      ...segments,\n    ]);\n    const atRoot =\n      segments.length > 0\n        ? findDeepestProperty(json.rootObject, segments)\n        : null;\n\n    const isComplete = (\n      match: PropertyMatch | null,\n      segmentCount: number\n    ): match is PropertyMatch => match?.matchedSegmentCount === segmentCount;\n\n    if (isComplete(underNamespace, segments.length + 1)) {\n      return toSpan(underNamespace, json.offsetShift);\n    }\n\n    if (isComplete(atRoot, segments.length)) {\n      return toSpan(atRoot, json.offsetShift);\n    }\n\n    const partial = underNamespace ?? atRoot;\n\n    return partial ? toSpan(partial, json.offsetShift) : null;\n  }\n\n  if (SCRIPT_EXTENSIONS.has(extension)) {\n    const rootObject = getContentFileRootObject(text);\n\n    if (rootObject) {\n      const match = findDeepestProperty(\n        rootObject,\n        segments.length > 0 ? ['content', ...segments] : ['key']\n      );\n\n      if (match) return toSpan(match, 0);\n    }\n  }\n\n  return findLeafPropertyByText(text, fieldPath);\n};\n"],"mappings":"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"}

package/dist/esm/index.mjs

@@ -1,20 +1,22 @@
 #!/usr/bin/env node
 import { parseText, walkAst } from "./oxcUtils.mjs";
 import { DICTIONARIES_NOT_BUILT_NOTIFICATION } from "./protocol.mjs";
-import { formatDictionaryHover, formatFieldHover, formatFieldValue, getFieldByPath, getFieldsAtPath } from "./dictionaryUtils.mjs";
 import { collectNamespaceReferences, findMessageUsageAtOffset, matchCallNamespace } from "./usageAnalyzer.mjs";
 import { escapeRegularExpression, findFieldRangesInFile, offsetToRange } from "./findFieldInFile.mjs";
+import { findFieldDeclaration } from "./findFieldDeclaration.mjs";
+import { formatDictionaryHover, formatFieldHover, formatFieldValue, getFieldByPath, getFieldsAtPath } from "./dictionaryUtils.mjs";
+import { resolveDictionaryTarget } from "./resolveDictionaryTarget.mjs";
 import { buildCallerWithKeyPattern, buildKeyUsagePatterns, getCallerNamesAlternation } from "./callers/patterns.mjs";
 import { findKeyAtOffset } from "./findKeyAtOffset.mjs";
 import { findContentFieldAtOffset, findKeyInContentFile } from "./findKeyInContentFile.mjs";
-import { existsSync } from "node:fs";
-import { readFile } from "node:fs/promises";
 import { dirname, isAbsolute, join } from "node:path";
+import { CompletionItemKind, DiagnosticSeverity, Location, MarkupKind, Position, ProposedFeatures, Range, TextDocumentSyncKind, TextDocuments, createConnection } from "vscode-languageserver/node";
+import { readFile } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import { getConfiguration, searchConfigurationFile } from "@intlayer/config/node";
+import { clearAllCache } from "@intlayer/config/utils";
 import { getUnmergedDictionaries } from "@intlayer/dictionaries-entry/unmerged";
 import { buildComponentFilesList } from "@intlayer/engine/utils";
-import { CompletionItemKind, DiagnosticSeverity, Location, MarkupKind, Position, ProposedFeatures, Range, TextDocumentSyncKind, TextDocuments, createConnection } from "vscode-languageserver/node";
 import { TextDocument } from "vscode-languageserver-textdocument";
 
 //#region src/index.ts
@@ -49,6 +51,7 @@ const projectRoots = /* @__PURE__ */ new Map();
 */
 const buildRequestedProjects = /* @__PURE__ */ new Set();
 const invalidateConfigCaches = () => {
+	clearAllCache();
 	projectConfigs.clear();
 	projectDictionaries.clear();
 	projectRoots.clear();
@@ -75,14 +78,15 @@ const getProjectRoot = (fileDirectory) => {
 const getProjectConfig = (absolutePath) => {
 	try {
 		const baseDir = getProjectRoot(dirname(absolutePath));
-		const { system, build, content, compiler } = getConfiguration({ baseDir });
+		const { system, build, content, compiler, internationalization } = getConfiguration({ baseDir });
 		const cacheKey = system.baseDir;
 		if (!projectConfigs.has(cacheKey)) {
 			projectConfigs.set(cacheKey, {
 				system,
 				build,
 				content,
-				compiler
+				compiler,
+				internationalization
 			});
 			log(`getProjectConfig — OK baseDir=${system.baseDir} unmergedDictionariesDir=${system.unmergedDictionariesDir}`);
 		}
@@ -127,36 +131,33 @@ const runConcurrent = async (items, callback, limit = 50) => {
 	};
 	await Promise.all(Array.from({ length: Math.min(limit, items.length) }, worker));
 };
-/** Find the `key: "<key>"` line inside a content file so the cursor lands on it. */
-const getKeyRange = async (absolutePath, key) => {
-	try {
-		const lines = (await readFile(absolutePath, "utf-8")).split(/\r?\n/);
-		const keyRegularExpression = new RegExp(`key\\s*:\\s*['"\`]${key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}['"\`]`);
-		for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
-			const column = lines[lineIndex]?.search(keyRegularExpression);
-			if (column !== void 0 && column !== -1) return Range.create(Position.create(lineIndex, column), Position.create(lineIndex, lines[lineIndex].length));
-		}
-	} catch {}
-	return Range.create(Position.create(0, 0), Position.create(0, 0));
-};
+/** Built dictionaries registered under `dictionaryKey`. */
+const getDictionariesForKey = (config, dictionaryKey) => getUnmergedDictionariesCached(config)[dictionaryKey] ?? [];
 /**
-* Return every `.content` file location that declares the given key.
-* A key can be split across several content files (merged dictionaries), so we
-* return one `Location` per source file, pointing at the `key:` declaration.
+* Match a usage (or a bare dictionary key) against the built dictionaries,
+* following the compat adapters' fallbacks (`index` whole-file catalog, flat
+* dotted keys) — see `resolveDictionaryTarget`.
 */
-const getContentDeclarationLocations = async (key, absolutePath) => {
+const resolveTarget = (target, config) => resolveDictionaryTarget(target, (dictionaryKey) => getDictionariesForKey(config, dictionaryKey));
+/**
+* Where a resolved target is declared: one location per source file (content
+* file, or one JSON catalog per locale), the default locale first so VS Code
+* previews it.
+*/
+const getDeclarationLocations = async (target, absolutePath) => {
 	const config = getProjectConfig(absolutePath);
 	if (!config) return [];
-	const unmergedDictionaries = getUnmergedDictionariesCached(config);
-	const dictionaries = Object.values(unmergedDictionaries).flat().filter((dictionary) => dictionary?.key === key && dictionary.filePath);
-	const locations = [];
-	await runConcurrent(dictionaries, async (dictionary) => {
-		const filePath = dictionary.filePath;
-		const absolutePath = isAbsolute(filePath) ? filePath : join(config.system.baseDir, filePath);
-		if (!existsSync(absolutePath)) return;
-		locations.push(Location.create(pathToFileURL(absolutePath).href, await getKeyRange(absolutePath, key)));
-	});
-	return locations;
+	const resolved = await resolveTarget(target, config);
+	if (!resolved) return [];
+	const defaultLocale = config.internationalization?.defaultLocale;
+	const sourcePaths = [...new Set([...resolved.dictionaries].sort((first, second) => Number(second.locale === defaultLocale) - Number(first.locale === defaultLocale)).map((dictionary) => dictionary.filePath).filter((filePath) => Boolean(filePath)).map((filePath) => isAbsolute(filePath) ? filePath : join(config.system.baseDir, filePath)))];
+	return (await Promise.all(sourcePaths.map(async (sourcePath) => {
+		const text = await tryReadFile(sourcePath);
+		if (text === null) return null;
+		const span = findFieldDeclaration(text, sourcePath, resolved.dictionaryKey, resolved.fieldPath);
+		const range = span ? offsetToRange(text, span.start, span.end) : Range.create(Position.create(0, 0), Position.create(0, 0));
+		return Location.create(pathToFileURL(sourcePath).href, range);
+	}))).filter((location) => location !== null);
 };
 /**
 * Return the cached source-file list, re-scanning only when the cache has
@@ -244,46 +245,6 @@ const getFieldUsageLocations = async (dictionaryKey, fieldPath, absolutePath) =>
 	log(`getFieldUsageLocations("${dictionaryKey}.${fieldPath.join(".")}") — ${filePaths.length} file(s) searched in ${Date.now() - startTime}ms → ${locations.length} hit(s)`);
 	return locations;
 };
-/**
-* Find the line/column of the field's leaf name as a property key inside a
-* content file. Looks for `fieldName:` or `'field.name':` (flat keys with
-* dots, as used by lingui catalogs), not just any occurrence. Falls back to
-* the top of the file if the field cannot be located.
-*/
-const getFieldRangeInContentFile = async (absolutePath, fieldPath) => {
-	const content = await tryReadFile(absolutePath);
-	const fieldName = fieldPath[fieldPath.length - 1];
-	if (!content || !fieldName) return Range.create(Position.create(0, 0), Position.create(0, 0));
-	const fieldRegularExpression = new RegExp(`(?<![.\\w])(['"\`]?)${escapeRegularExpression(fieldName)}\\1\\s*:`);
-	const lines = content.split(/\r?\n/);
-	for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
-		const line = lines[lineIndex];
-		const matchPosition = line.search(fieldRegularExpression);
-		if (matchPosition === -1) continue;
-		const column = line.indexOf(fieldName, matchPosition);
-		if (column === -1) continue;
-		return Range.create(Position.create(lineIndex, column), Position.create(lineIndex, column + fieldName.length));
-	}
-	return Range.create(Position.create(0, 0), Position.create(0, 0));
-};
-/**
-* Return every content-file location where the field at `fieldPath` is
-* defined as a property of the dictionary with the given `dictionaryKey`.
-*/
-const getContentFieldLocations = async (dictionaryKey, fieldPath, absolutePath) => {
-	const config = getProjectConfig(absolutePath);
-	if (!config) return [];
-	const unmergedDictionaries = getUnmergedDictionariesCached(config);
-	const dictionaries = Object.values(unmergedDictionaries).flat().filter((dictionary) => dictionary?.key === dictionaryKey && dictionary.filePath);
-	const locations = [];
-	await runConcurrent(dictionaries, async (dictionary) => {
-		const filePath = dictionary.filePath;
-		const absolutePath = isAbsolute(filePath) ? filePath : join(config.system.baseDir, filePath);
-		if (!existsSync(absolutePath)) return;
-		locations.push(Location.create(pathToFileURL(absolutePath).href, await getFieldRangeInContentFile(absolutePath, fieldPath)));
-	});
-	return locations;
-};
 const DIAGNOSTIC_DEBOUNCE_MS = 300;
 const diagnosticTimers = /* @__PURE__ */ new Map();
 /**
@@ -425,19 +386,18 @@ connection.onDefinition(async (parameters) => {
 	const key = findKeyAtOffset(text, offset);
 	if (key) {
 		log(`onDefinition — useIntlayer key: "${key}" → searching content declarations`);
-		const locations = await getContentDeclarationLocations(key, absolutePath);
+		const locations = await getDeclarationLocations({
+			dictionaryKey: key,
+			fieldPath: []
+		}, absolutePath);
 		log(`onDefinition — found ${locations.length} content declaration(s) for key "${key}"`);
 		return locations.length ? locations : null;
 	}
 	const usage = findMessageUsageAtOffset(text, offset);
-	if (usage && usage.fieldPath.length > 0) {
-		log(`onDefinition — usage field: "${usage.dictionaryKey}.${usage.fieldPath.join(".")}" (${usage.callerName}) → searching content field`);
-		const locations = await getContentFieldLocations(usage.dictionaryKey, usage.fieldPath, absolutePath);
-		log(`onDefinition — found ${locations.length} content file(s) with field "${usage.fieldPath.join(".")}"`);
-		return locations.length ? locations : null;
-	}
 	if (usage) {
-		const locations = await getContentDeclarationLocations(usage.dictionaryKey, absolutePath);
+		log(`onDefinition — usage: "${[usage.dictionaryKey, ...usage.fieldPath].join(".")}" (${usage.callerName}) → searching declaration`);
+		const locations = await getDeclarationLocations(usage, absolutePath);
+		log(`onDefinition — found ${locations.length} declaration(s)`);
 		return locations.length ? locations : null;
 	}
 	log("onDefinition — no Intlayer key at cursor, no result");
@@ -482,13 +442,16 @@ connection.onReferences(async (parameters) => {
 	}
 	const key = findKeyAtOffset(text, offset);
 	if (key) {
-		const locations = await getContentDeclarationLocations(key, absolutePath);
+		const locations = await getDeclarationLocations({
+			dictionaryKey: key,
+			fieldPath: []
+		}, absolutePath);
 		log(`onReferences — key "${key}" → ${locations.length} declaration(s)`);
 		return locations.length ? locations : null;
 	}
 	const usage = findMessageUsageAtOffset(text, offset);
 	if (usage && usage.fieldPath.length > 0) {
-		const locations = await getContentFieldLocations(usage.dictionaryKey, usage.fieldPath, absolutePath);
+		const locations = await getDeclarationLocations(usage, absolutePath);
 		log(`onReferences — field "${usage.fieldPath.join(".")}" → ${locations.length} content definition(s)`);
 		return locations.length ? locations : null;
 	}
@@ -503,12 +466,10 @@ connection.onHover(async (parameters) => {
 	const offset = document.offsetAt(parameters.position);
 	const config = getProjectConfig(absolutePath);
 	if (!config) return null;
-	const unmergedDictionaries = getUnmergedDictionariesCached(config);
-	const getDicts = (key) => Object.values(unmergedDictionaries).flat().filter((d) => d?.key === key);
 	if (isContentFile(uri, config)) {
 		const key = findKeyInContentFile(text, offset);
 		if (key) {
-			const dicts = getDicts(key);
+			const dicts = getDictionariesForKey(config, key);
 			if (dicts.length > 0) return { contents: {
 				kind: MarkupKind.Markdown,
 				value: formatDictionaryHover(dicts, key)
@@ -517,7 +478,7 @@ connection.onHover(async (parameters) => {
 		const ext = uri.match(/\.[^.]+$/)?.[0] ?? "";
 		const fieldInfo = findContentFieldAtOffset(text, offset, ext);
 		if (fieldInfo) {
-			const dicts = getDicts(fieldInfo.dictionaryKey);
+			const dicts = getDictionariesForKey(config, fieldInfo.dictionaryKey);
 			if (dicts.length > 0) {
 				const hoverText = formatFieldHover(dicts, fieldInfo.dictionaryKey, fieldInfo.fieldPath);
 				if (hoverText) return { contents: {
@@ -529,30 +490,22 @@ connection.onHover(async (parameters) => {
 		return null;
 	}
 	const key = findKeyAtOffset(text, offset);
-	if (key) {
-		const dicts = getDicts(key);
-		if (dicts.length > 0) return { contents: {
-			kind: MarkupKind.Markdown,
-			value: formatDictionaryHover(dicts, key)
-		} };
-		return null;
-	}
-	const usage = findMessageUsageAtOffset(text, offset);
-	if (usage) {
-		const dicts = getDicts(usage.dictionaryKey);
-		if (dicts.length > 0) {
-			if (usage.fieldPath.length === 0) return { contents: {
-				kind: MarkupKind.Markdown,
-				value: formatDictionaryHover(dicts, usage.dictionaryKey)
-			} };
-			const hoverText = formatFieldHover(dicts, usage.dictionaryKey, usage.fieldPath);
-			if (hoverText) return { contents: {
-				kind: MarkupKind.Markdown,
-				value: hoverText
-			} };
-		}
-	}
-	return null;
+	const target = key ? {
+		dictionaryKey: key,
+		fieldPath: []
+	} : findMessageUsageAtOffset(text, offset);
+	if (!target) return null;
+	const resolved = await resolveTarget(target, config);
+	if (!resolved) return null;
+	if (resolved.fieldPath.length === 0) return { contents: {
+		kind: MarkupKind.Markdown,
+		value: formatDictionaryHover(resolved.dictionaries, resolved.dictionaryKey)
+	} };
+	const hoverText = formatFieldHover(resolved.dictionaries, resolved.dictionaryKey, resolved.fieldPath);
+	return hoverText ? { contents: {
+		kind: MarkupKind.Markdown,
+		value: hoverText
+	} } : null;
 });
 connection.onCompletion(async (parameters) => {
 	const uri = parameters.textDocument.uri;