@platformos/platformos-language-server-common 0.0.12 → 0.0.16

package/dist/diagnostics/runChecks.d.ts

@@ -1,8 +1,10 @@
+import { RouteTable } from '@platformos/platformos-common';
 import { DocumentManager } from '../documents';
 import { Dependencies } from '../types';
 import { DiagnosticsManager } from './DiagnosticsManager';
 import { AppGraphManager } from '../server/AppGraphManager';
-export declare function makeRunChecks(documentManager: DocumentManager, diagnosticsManager: DiagnosticsManager, { fs, loadConfig, platformosDocset, jsonValidationSet, appGraphManager, includeFilesFromDisk, }: Pick<Dependencies, 'fs' | 'loadConfig' | 'platformosDocset' | 'jsonValidationSet'> & {
+export declare function makeRunChecks(documentManager: DocumentManager, diagnosticsManager: DiagnosticsManager, { fs, loadConfig, platformosDocset, jsonValidationSet, appGraphManager, includeFilesFromDisk, getRouteTable, }: Pick<Dependencies, 'fs' | 'loadConfig' | 'platformosDocset' | 'jsonValidationSet'> & {
     appGraphManager?: AppGraphManager;
     includeFilesFromDisk?: () => boolean;
+    getRouteTable?: () => RouteTable | undefined;
 }): (triggerURIs: string[]) => Promise<void>;

package/dist/diagnostics/runChecks.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeRunChecks = makeRunChecks;
 const platformos_check_common_1 = require("@platformos/platformos-check-common");
-function makeRunChecks(documentManager, diagnosticsManager, { fs, loadConfig, platformosDocset, jsonValidationSet, appGraphManager, includeFilesFromDisk, }) {
+function makeRunChecks(documentManager, diagnosticsManager, { fs, loadConfig, platformosDocset, jsonValidationSet, appGraphManager, includeFilesFromDisk, getRouteTable, }) {
     return async function runChecks(triggerURIs) {
         // This function takes an array of triggerURIs so that we can correctly
         // recheck on file renames that came from out of bounds in a
@@ -25,6 +25,7 @@ function makeRunChecks(documentManager, diagnosticsManager, { fs, loadConfig, pl
                 fs,
                 platformosDocset,
                 jsonValidationSet,
+                routeTable: getRouteTable?.(),
                 async getReferences(uri) {
                     if (!appGraphManager)
                         return [];

package/dist/diagnostics/runChecks.js.map

@@ -1 +1 @@
-{"version":3,"file":"runChecks.js","sourceRoot":"","sources":["../../src/diagnostics/runChecks.ts"],"names":[],"mappings":";;AAcA,sCA+DC;AA7ED,iFAO6C;AAO7C,SAAgB,aAAa,CAC3B,eAAgC,EAChC,kBAAsC,EACtC,EACE,EAAE,EACF,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,oBAAoB,GAIrB;IAED,OAAO,KAAK,UAAU,SAAS,CAAC,WAAqB;QACnD,uEAAuE;QACvE,4DAA4D;QAC5D,cAAc;QACd,EAAE;QACF,yBAAyB;QACzB,uCAAuC;QACvC,oCAAoC;QACpC,EAAE;QACF,uBAAuB;QACvB,MAAM,UAAU,GAAG,IAAA,wCAAc,EAAC,EAAE,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,kCAAQ,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QACxF,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvF,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEnE,OAAO;QAEP,KAAK,UAAU,gBAAgB,CAAC,iBAAyB;YACvD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;YACvD,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAC;YAE1E,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAK,EAAC,GAAG,EAAE,MAAM,EAAE;gBAC3C,EAAE;gBACF,gBAAgB;gBAChB,iBAAiB;gBAEjB,KAAK,CAAC,aAAa,CAAC,GAAW;oBAC7B,IAAI,CAAC,eAAe;wBAAE,OAAO,EAAE,CAAC;oBAChC,OAAO,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAC5C,CAAC;gBAED,KAAK,CAAC,gBAAgB,CAAC,YAAY;oBACjC,MAAM,GAAG,GAAG,8BAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBACpD,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACrC,IAAI,GAAG,EAAE,IAAI,KAAK,wCAAc,CAAC,UAAU;wBAAE,OAAO,SAAS,CAAC;oBAC9D,OAAO,GAAG,CAAC,YAAY,EAAE,CAAC;gBAC5B,CAAC;aACF,CAAC,CAAC;YAEH,oEAAoE;YACpE,sEAAsE;YACtE,QAAQ;YACR,KAAK,MAAM,UAAU,IAAI,GAAG,EAAE,CAAC;gBAC7B,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC3F,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"runChecks.js","sourceRoot":"","sources":["../../src/diagnostics/runChecks.ts"],"names":[],"mappings":";;AAeA,sCAkEC;AAjFD,iFAO6C;AAQ7C,SAAgB,aAAa,CAC3B,eAAgC,EAChC,kBAAsC,EACtC,EACE,EAAE,EACF,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,oBAAoB,EACpB,aAAa,GAKd;IAED,OAAO,KAAK,UAAU,SAAS,CAAC,WAAqB;QACnD,uEAAuE;QACvE,4DAA4D;QAC5D,cAAc;QACd,EAAE;QACF,yBAAyB;QACzB,uCAAuC;QACvC,oCAAoC;QACpC,EAAE;QACF,uBAAuB;QACvB,MAAM,UAAU,GAAG,IAAA,wCAAc,EAAC,EAAE,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,kCAAQ,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QACxF,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvF,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEnE,OAAO;QAEP,KAAK,UAAU,gBAAgB,CAAC,iBAAyB;YACvD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;YACvD,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAC;YAE1E,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAK,EAAC,GAAG,EAAE,MAAM,EAAE;gBAC3C,EAAE;gBACF,gBAAgB;gBAChB,iBAAiB;gBACjB,UAAU,EAAE,aAAa,EAAE,EAAE;gBAE7B,KAAK,CAAC,aAAa,CAAC,GAAW;oBAC7B,IAAI,CAAC,eAAe;wBAAE,OAAO,EAAE,CAAC;oBAChC,OAAO,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAC5C,CAAC;gBAED,KAAK,CAAC,gBAAgB,CAAC,YAAY;oBACjC,MAAM,GAAG,GAAG,8BAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBACpD,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACrC,IAAI,GAAG,EAAE,IAAI,KAAK,wCAAc,CAAC,UAAU;wBAAE,OAAO,SAAS,CAAC;oBAC9D,OAAO,GAAG,CAAC,YAAY,EAAE,CAAC;gBAC5B,CAAC;aACF,CAAC,CAAC;YAEH,oEAAoE;YACpE,sEAAsE;YACtE,QAAQ;YACR,KAAK,MAAM,UAAU,IAAI,GAAG,EAAE,CAAC;gBAC7B,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC3F,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/documentLinks/DocumentLinksProvider.d.ts

@@ -2,11 +2,13 @@ import { DocumentLink } from 'vscode-languageserver';
 import { DocumentManager } from '../documents';
 import { FindAppRootURI } from '../internal-types';
 import { DocumentsLocator, TranslationProvider } from '@platformos/platformos-common';
+import { SearchPathsLoader } from '../utils/searchPaths';
 export declare class DocumentLinksProvider {
     private documentManager;
     private findAppRootURI;
     private documentsLocator;
     private translationProvider;
-    constructor(documentManager: DocumentManager, findAppRootURI: FindAppRootURI, documentsLocator: DocumentsLocator, translationProvider: TranslationProvider);
+    private searchPathsCache;
+    constructor(documentManager: DocumentManager, findAppRootURI: FindAppRootURI, documentsLocator: DocumentsLocator, translationProvider: TranslationProvider, searchPathsCache: SearchPathsLoader);
     documentLinks(uriString: string): Promise<DocumentLink[]>;
 }

package/dist/documentLinks/DocumentLinksProvider.js

@@ -7,11 +7,12 @@ const vscode_languageserver_1 = require("vscode-languageserver");
 const vscode_uri_1 = require("vscode-uri");
 const platformos_check_common_2 = require("@platformos/platformos-check-common");
 class DocumentLinksProvider {
-    constructor(documentManager, findAppRootURI, documentsLocator, translationProvider) {
+    constructor(documentManager, findAppRootURI, documentsLocator, translationProvider, searchPathsCache) {
         this.documentManager = documentManager;
         this.findAppRootURI = findAppRootURI;
         this.documentsLocator = documentsLocator;
         this.translationProvider = translationProvider;
+        this.searchPathsCache = searchPathsCache;
     }
     async documentLinks(uriString) {
         const sourceCode = this.documentManager.get(uriString);
@@ -24,32 +25,29 @@ class DocumentLinksProvider {
         if (!rootUri) {
             return [];
         }
-        const visitor = documentLinksVisitor(sourceCode.textDocument, vscode_uri_1.URI.parse(rootUri), this.documentsLocator, this.translationProvider);
+        const root = vscode_uri_1.URI.parse(rootUri);
+        const searchPaths = await this.searchPathsCache.get(root);
+        const visitor = documentLinksVisitor(sourceCode.textDocument, root, this.documentsLocator, this.translationProvider, searchPaths);
         return (0, platformos_check_common_2.visit)(sourceCode.ast, visitor);
     }
 }
 exports.DocumentLinksProvider = DocumentLinksProvider;
-function documentLinksVisitor(textDocument, root, documentsLocator, translationProvider) {
+function documentLinksVisitor(textDocument, root, documentsLocator, translationProvider, searchPaths) {
     return {
         async LiquidTag(node) {
-            if ((node.name === 'render' || node.name === 'include') &&
-                typeof node.markup !== 'string' &&
-                isLiquidString(node.markup.partial)) {
-                const partial = node.markup.partial;
-                return vscode_languageserver_1.DocumentLink.create(range(textDocument, partial), await documentsLocator.locate(root, node.name, partial.value));
-            }
-            if (node.name === 'function' &&
-                typeof node.markup !== 'string' &&
-                isLiquidString(node.markup.partial)) {
-                const partial = node.markup.partial;
-                return vscode_languageserver_1.DocumentLink.create(range(textDocument, partial), await documentsLocator.locate(root, node.name, partial.value));
+            const markup = node.markup;
+            if (typeof markup === 'string' || markup === null)
+                return;
+            const name = node.name;
+            // render, include, function, theme_render_rc all have a .partial field
+            if ('partial' in markup && isLiquidString(markup.partial)) {
+                const uri = await documentsLocator.locateOrDefault(root, name, markup.partial.value, searchPaths);
+                return vscode_languageserver_1.DocumentLink.create(range(textDocument, markup.partial), uri);
             }
-            if (node.name === 'graphql' &&
-                typeof node.markup !== 'string' &&
-                'graphql' in node.markup &&
-                isLiquidString(node.markup.graphql)) {
-                const snippet = node.markup.graphql;
-                return vscode_languageserver_1.DocumentLink.create(range(textDocument, snippet), await documentsLocator.locate(root, node.name, snippet.value));
+            // graphql has a .graphql field
+            if ('graphql' in markup && isLiquidString(markup.graphql)) {
+                const uri = await documentsLocator.locateOrDefault(root, name, markup.graphql.value);
+                return vscode_languageserver_1.DocumentLink.create(range(textDocument, markup.graphql), uri);
             }
         },
         async LiquidVariable(node) {

package/dist/documentLinks/DocumentLinksProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"DocumentLinksProvider.js","sourceRoot":"","sources":["../../src/documentLinks/DocumentLinksProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DocumentLinksProvider.js","sourceRoot":"","sources":["../../src/documentLinks/DocumentLinksProvider.ts"],"names":[],"mappings":"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"}

package/dist/hover/HoverProvider.d.ts

@@ -12,6 +12,7 @@ export declare class HoverProvider {
     readonly getDocDefinitionForURI: GetDocDefinitionForURI;
     readonly findAppRootURI: FindAppRootURI;
     private providers;
+    private graphqlFieldHoverProvider;
     constructor(documentManager: DocumentManager, platformosDocset: PlatformOSDocset, translationProvider: TranslationProvider, getTranslationsForURI?: GetTranslationsForURI, getDocDefinitionForURI?: GetDocDefinitionForURI, findAppRootURI?: FindAppRootURI);
     hover(params: HoverParams): Promise<Hover | null>;
 }

package/dist/hover/HoverProvider.js

@@ -7,6 +7,7 @@ const providers_1 = require("./providers");
 const HtmlAttributeValueHoverProvider_1 = require("./providers/HtmlAttributeValueHoverProvider");
 const platformos_check_common_2 = require("@platformos/platformos-check-common");
 const LiquidDocTagHoverProvider_1 = require("./providers/LiquidDocTagHoverProvider");
+const GraphQLFieldHoverProvider_1 = require("./providers/GraphQLFieldHoverProvider");
 class HoverProvider {
     constructor(documentManager, platformosDocset, translationProvider, getTranslationsForURI = async () => ({}), getDocDefinitionForURI = async () => undefined, findAppRootURI = async () => null) {
         this.documentManager = documentManager;
@@ -17,6 +18,7 @@ class HoverProvider {
         this.findAppRootURI = findAppRootURI;
         this.providers = [];
         const typeSystem = new TypeSystem_1.TypeSystem(platformosDocset);
+        this.graphqlFieldHoverProvider = new GraphQLFieldHoverProvider_1.GraphQLFieldHoverProvider(platformosDocset, documentManager);
         this.providers = [
             new providers_1.LiquidTagHoverProvider(platformosDocset),
             new providers_1.LiquidFilterArgumentHoverProvider(platformosDocset),
@@ -35,6 +37,10 @@ class HoverProvider {
     async hover(params) {
         const uri = params.textDocument.uri;
         const document = this.documentManager.get(uri);
+        // GraphQL files get dedicated hover support
+        if (document?.type === platformos_check_common_1.SourceCodeType.GraphQL) {
+            return this.graphqlFieldHoverProvider.hover(params);
+        }
         // Supports only Liquid resources
         if (document?.type !== platformos_check_common_1.SourceCodeType.LiquidHtml || document.ast instanceof Error) {
             return null;

package/dist/hover/HoverProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"HoverProvider.js","sourceRoot":"","sources":["../../src/hover/HoverProvider.ts"],"names":[],"mappings":";;;AAAA,iFAI6C;AAE7C,8CAA2C;AAI3C,2CAWqB;AACrB,iGAA8F;AAC9F,iFAAsE;AACtE,qFAAkF;AAGlF,MAAa,aAAa;IAGxB,YACW,eAAgC,EAChC,gBAAkC,EAClC,mBAAwC,EACxC,wBAA+C,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAC/D,yBAAiD,KAAK,IAAI,EAAE,CAAC,SAAS,EACtE,iBAAiC,KAAK,IAAI,EAAE,CAAC,IAAI;QALjD,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,0BAAqB,GAArB,qBAAqB,CAA0C;QAC/D,2BAAsB,GAAtB,sBAAsB,CAAgD;QACtE,mBAAc,GAAd,cAAc,CAAmC;QARpD,cAAS,GAAwB,EAAE,CAAC;QAU1C,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,gBAAgB,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,GAAG;YACf,IAAI,kCAAsB,CAAC,gBAAgB,CAAC;YAC5C,IAAI,6CAAiC,CAAC,gBAAgB,CAAC;YACvD,IAAI,qCAAyB,CAAC,gBAAgB,CAAC;YAC/C,IAAI,qCAAyB,CAAC,UAAU,CAAC;YACzC,IAAI,8CAAkC,CAAC,UAAU,CAAC;YAClD,IAAI,gCAAoB,EAAE;YAC1B,IAAI,sCAA0B,EAAE;YAChC,IAAI,iEAA+B,EAAE;YACrC,IAAI,oCAAwB,CAAC,eAAe,EAAE,mBAAmB,EAAE,cAAc,CAAC;YAClF,IAAI,sCAA0B,CAAC,sBAAsB,CAAC;YACtD,IAAI,+CAAmC,CAAC,sBAAsB,CAAC;YAC/D,IAAI,qDAAyB,CAAC,eAAe,CAAC;SAC/C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAmB;QAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE/C,iCAAiC;QACjC,IAAI,QAAQ,EAAE,IAAI,KAAK,wCAAc,CAAC,UAAU,IAAI,QAAQ,CAAC,GAAG,YAAY,KAAK,EAAE,CAAC;YAClF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,IAAA,yCAAe,EAC9C,QAAQ,CAAC,GAAG,EACZ,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAChD,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;IACvC,CAAC;CACF;AA9CD,sCA8CC"}
+{"version":3,"file":"HoverProvider.js","sourceRoot":"","sources":["../../src/hover/HoverProvider.ts"],"names":[],"mappings":";;;AAAA,iFAI6C;AAE7C,8CAA2C;AAI3C,2CAWqB;AACrB,iGAA8F;AAC9F,iFAAsE;AACtE,qFAAkF;AAClF,qFAAkF;AAGlF,MAAa,aAAa;IAIxB,YACW,eAAgC,EAChC,gBAAkC,EAClC,mBAAwC,EACxC,wBAA+C,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAC/D,yBAAiD,KAAK,IAAI,EAAE,CAAC,SAAS,EACtE,iBAAiC,KAAK,IAAI,EAAE,CAAC,IAAI;QALjD,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,0BAAqB,GAArB,qBAAqB,CAA0C;QAC/D,2BAAsB,GAAtB,sBAAsB,CAAgD;QACtE,mBAAc,GAAd,cAAc,CAAmC;QATpD,cAAS,GAAwB,EAAE,CAAC;QAW1C,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,gBAAgB,CAAC,CAAC;QACpD,IAAI,CAAC,yBAAyB,GAAG,IAAI,qDAAyB,CAC5D,gBAAgB,EAChB,eAAe,CAChB,CAAC;QACF,IAAI,CAAC,SAAS,GAAG;YACf,IAAI,kCAAsB,CAAC,gBAAgB,CAAC;YAC5C,IAAI,6CAAiC,CAAC,gBAAgB,CAAC;YACvD,IAAI,qCAAyB,CAAC,gBAAgB,CAAC;YAC/C,IAAI,qCAAyB,CAAC,UAAU,CAAC;YACzC,IAAI,8CAAkC,CAAC,UAAU,CAAC;YAClD,IAAI,gCAAoB,EAAE;YAC1B,IAAI,sCAA0B,EAAE;YAChC,IAAI,iEAA+B,EAAE;YACrC,IAAI,oCAAwB,CAAC,eAAe,EAAE,mBAAmB,EAAE,cAAc,CAAC;YAClF,IAAI,sCAA0B,CAAC,sBAAsB,CAAC;YACtD,IAAI,+CAAmC,CAAC,sBAAsB,CAAC;YAC/D,IAAI,qDAAyB,CAAC,eAAe,CAAC;SAC/C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAmB;QAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE/C,4CAA4C;QAC5C,IAAI,QAAQ,EAAE,IAAI,KAAK,wCAAc,CAAC,OAAO,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtD,CAAC;QAED,iCAAiC;QACjC,IAAI,QAAQ,EAAE,IAAI,KAAK,wCAAc,CAAC,UAAU,IAAI,QAAQ,CAAC,GAAG,YAAY,KAAK,EAAE,CAAC;YAClF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,IAAA,yCAAe,EAC9C,QAAQ,CAAC,GAAG,EACZ,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAChD,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;IACvC,CAAC;CACF;AAxDD,sCAwDC"}

package/dist/hover/providers/GraphQLFieldHoverProvider.d.ts

@@ -0,0 +1,12 @@
+import { Hover, HoverParams } from 'vscode-languageserver';
+import { DocumentManager } from '../../documents';
+import { PlatformOSDocset } from '@platformos/platformos-check-common';
+export declare class GraphQLFieldHoverProvider {
+    private platformosDocset;
+    private documentManager;
+    private schemaCache;
+    private schemaLoaded;
+    constructor(platformosDocset: PlatformOSDocset, documentManager: DocumentManager);
+    private getSchema;
+    hover(params: HoverParams): Promise<Hover | null>;
+}

package/dist/hover/providers/GraphQLFieldHoverProvider.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLFieldHoverProvider = void 0;
+/**
+ * graphql-language-service and graphql must be loaded dynamically to avoid
+ * the "Cannot use GraphQLList from another module or realm" error that occurs
+ * when vitest transforms the graphql ESM module into separate instances.
+ * By requiring at runtime, we ensure a single shared module instance.
+ */
+let _glsMod;
+function getGLS() {
+    if (!_glsMod)
+        _glsMod = require('graphql-language-service');
+    return _glsMod;
+}
+let _graphqlMod;
+function getGraphQL() {
+    if (!_graphqlMod)
+        _graphqlMod = require('graphql');
+    return _graphqlMod;
+}
+class GraphQLFieldHoverProvider {
+    constructor(platformosDocset, documentManager) {
+        this.platformosDocset = platformosDocset;
+        this.documentManager = documentManager;
+        this.schemaLoaded = false;
+    }
+    async getSchema() {
+        if (!this.schemaLoaded) {
+            const sdl = await this.platformosDocset.graphQL();
+            if (sdl) {
+                try {
+                    this.schemaCache = getGraphQL().buildSchema(sdl);
+                }
+                catch {
+                    // Invalid schema SDL
+                }
+            }
+            this.schemaLoaded = true;
+        }
+        return this.schemaCache;
+    }
+    async hover(params) {
+        const uri = params.textDocument.uri;
+        const document = this.documentManager.get(uri);
+        if (!document)
+            return null;
+        const schema = await this.getSchema();
+        if (!schema)
+            return null;
+        const content = document.textDocument.getText();
+        const gls = getGLS();
+        // graphql-language-service's getHoverInformation uses the character *before* the cursor
+        // position to identify the token. We try offset +1 first, then the original position,
+        // to handle the case where the cursor is at the start of a token.
+        const positions = [
+            new gls.Position(params.position.line, params.position.character + 1),
+            new gls.Position(params.position.line, params.position.character),
+        ];
+        try {
+            let hoverInfo;
+            for (const position of positions) {
+                const info = gls.getHoverInformation(schema, content, position);
+                if (info && info !== '' && info !== 'null') {
+                    hoverInfo = typeof info === 'string' ? info : String(info);
+                    break;
+                }
+            }
+            if (!hoverInfo) {
+                return null;
+            }
+            return {
+                contents: {
+                    kind: 'markdown',
+                    value: hoverInfo,
+                },
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+}
+exports.GraphQLFieldHoverProvider = GraphQLFieldHoverProvider;
+//# sourceMappingURL=GraphQLFieldHoverProvider.js.map

package/dist/hover/providers/GraphQLFieldHoverProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GraphQLFieldHoverProvider.js","sourceRoot":"","sources":["../../../src/hover/providers/GraphQLFieldHoverProvider.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACH,IAAI,OAA8D,CAAC;AACnE,SAAS,MAAM;IACb,IAAI,CAAC,OAAO;QAAE,OAAO,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAC5D,OAAO,OAAQ,CAAC;AAClB,CAAC;AAED,IAAI,WAAiD,CAAC;AACtD,SAAS,UAAU;IACjB,IAAI,CAAC,WAAW;QAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnD,OAAO,WAAY,CAAC;AACtB,CAAC;AAED,MAAa,yBAAyB;IAIpC,YACU,gBAAkC,EAClC,eAAgC;QADhC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,oBAAe,GAAf,eAAe,CAAiB;QAJlC,iBAAY,GAAG,KAAK,CAAC;IAK1B,CAAC;IAEI,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAClD,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,CAAC;oBACH,IAAI,CAAC,WAAW,GAAG,UAAU,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACnD,CAAC;gBAAC,MAAM,CAAC;oBACP,qBAAqB;gBACvB,CAAC;YACH,CAAC;YACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAmB;QAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QAErB,wFAAwF;QACxF,sFAAsF;QACtF,kEAAkE;QAClE,MAAM,SAAS,GAAG;YAChB,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC;YACrE,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;SAClE,CAAC;QAEF,IAAI,CAAC;YACH,IAAI,SAA6B,CAAC;YAClC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,MAAM,IAAI,GAAG,GAAG,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAChE,IAAI,IAAI,IAAI,IAAI,KAAK,EAAE,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC3C,SAAS,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC3D,MAAM;gBACR,CAAC;YACH,CAAC;YAED,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO;gBACL,QAAQ,EAAE;oBACR,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,SAAS;iBACjB;aACF,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAnED,8DAmEC"}

package/dist/server/AppGraphManager.js

@@ -22,9 +22,7 @@ class AppGraphManager {
             const rootUri = await this.findAppRootURI(anyUri);
             if (!rootUri)
                 return;
-            const graph = await this.graphs.get(rootUri);
-            if (!graph)
-                return;
+            // Delete existing graph to force rebuild
             this.graphs.delete(rootUri);
             await this.getAppGraphForURI(rootUri);
             this.connection.sendNotification(types_1.AppGraphDidUpdateNotification.type, { uri: rootUri });
@@ -33,7 +31,8 @@ class AppGraphManager {
             const { documentManager } = this;
             await documentManager.preload(rootUri);
             const dependencies = await this.graphDependencies(rootUri);
-            return (0, platformos_graph_1.buildAppGraph)(rootUri, dependencies, entryPoints);
+            const graph = await (0, platformos_graph_1.buildAppGraph)(rootUri, dependencies, entryPoints);
+            return graph;
         };
         this.getSourceCode = async (uri) => {
             const doc = this.documentManager.get(uri);

package/dist/server/AppGraphManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppGraphManager.js","sourceRoot":"","sources":["../../src/server/AppGraphManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AppGraphManager.js","sourceRoot":"","sources":["../../src/server/AppGraphManager.ts"],"names":[],"mappings":"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"}

package/dist/server/CachedFileSystem.js

@@ -3,15 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CachedFileSystem = void 0;
 class CachedFileSystem {
     constructor(fs) {
-        this.readFile = cachedByUri(fs.readFile.bind(fs));
+        this.readFile = cachedByUri(fs.readFile.bind(fs), 
+        // app/config.yml can change externally (e.g. vim) without a file watcher
+        // notification. Always read it fresh — it's small and rarely accessed.
+        (uri) => uri.endsWith('/app/config.yml'));
         this.readDirectory = cachedByUri(fs.readDirectory.bind(fs));
         this.stat = cachedByUri(fs.stat.bind(fs));
     }
 }
 exports.CachedFileSystem = CachedFileSystem;
-function cachedByUri(fn) {
+function cachedByUri(fn, skipCache) {
     const cache = new Map();
     function cached(uri) {
+        if (skipCache?.(uri))
+            return fn(uri);
         if (!cache.has(uri)) {
             // I'm intentionally leaving this comment here for debugging purposes :)
             // console.error('cache miss', fn.name, uri);

package/dist/server/CachedFileSystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"CachedFileSystem.js","sourceRoot":"","sources":["../../src/server/CachedFileSystem.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAK3B,YAAY,EAAsB;QAChC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,CAAC;CACF;AAVD,4CAUC;AAOD,SAAS,WAAW,CAAI,EAA+B;IACrD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IAE5C,SAAS,MAAM,CAAC,GAAW;QACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,wEAAwE;YACxE,6CAA6C;YAC7C,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;QAClC,wEAAwE;QACxE,mDAAmD;QACnD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"CachedFileSystem.js","sourceRoot":"","sources":["../../src/server/CachedFileSystem.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAK3B,YAAY,EAAsB;QAChC,IAAI,CAAC,QAAQ,GAAG,WAAW,CACzB,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACpB,yEAAyE;QACzE,uEAAuE;QACvE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CACzC,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,CAAC;CACF;AAfD,4CAeC;AAOD,SAAS,WAAW,CAClB,EAA+B,EAC/B,SAAoC;IAEpC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IAE5C,SAAS,MAAM,CAAC,GAAW;QACzB,IAAI,SAAS,EAAE,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,wEAAwE;YACxE,6CAA6C;YAC7C,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;QAClC,wEAAwE;QACxE,mDAAmD;QACnD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/server/startServer.js

@@ -22,6 +22,7 @@ const RenameProvider_1 = require("../rename/RenameProvider");
 const RenameHandler_1 = require("../renamed/RenameHandler");
 const types_1 = require("../types");
 const utils_1 = require("../utils");
+const searchPaths_1 = require("../utils/searchPaths");
 const version_1 = require("../version");
 const CachedFileSystem_1 = require("./CachedFileSystem");
 const Configuration_1 = require("./Configuration");
@@ -30,6 +31,12 @@ const AppGraphManager_1 = require("./AppGraphManager");
 const platformos_common_2 = require("@platformos/platformos-common");
 const vscode_uri_1 = require("vscode-uri");
 const defaultLogger = () => { };
+/**
+ * When a file-watcher batch contains this many page-file changes, we
+ * assume a bulk operation (git checkout, branch switch, stash pop) and
+ * fully rebuild the route table instead of applying incremental updates.
+ */
+const BULK_PAGE_CHANGE_THRESHOLD = 10;
 /**
  * The `git:` VFS does not support the `fs.readDirectory` call and makes most things break.
  * `git` URIs are the ones you'd encounter when doing a git diff in VS Code. They're not
@@ -65,7 +72,8 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
     const diagnosticsManager = new diagnostics_1.DiagnosticsManager(connection);
     const documentsLocator = new platformos_common_2.DocumentsLocator(fs);
     const translationProvider = new platformos_common_1.TranslationProvider(fs);
-    const documentLinksProvider = new documentLinks_1.DocumentLinksProvider(documentManager, findAppRootURI, documentsLocator, translationProvider);
+    const searchPathsCache = new searchPaths_1.SearchPathsLoader(fs);
+    const documentLinksProvider = new documentLinks_1.DocumentLinksProvider(documentManager, findAppRootURI, documentsLocator, translationProvider, searchPathsCache);
     const codeActionsProvider = new codeActions_1.CodeActionsProvider(documentManager, diagnosticsManager);
     const onTypeFormattingProvider = new formatting_1.OnTypeFormattingProvider(documentManager, async function setCursorPosition(textDocument, position) {
         if (!clientCapabilities.hasShowDocumentSupport)
@@ -99,6 +107,7 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
         jsonValidationSet,
         appGraphManager,
         includeFilesFromDisk: () => configuration[Configuration_1.INCLUDE_FILES_FROM_DISK],
+        getRouteTable: () => definitionsProvider.getRouteTable(),
     }), 100);
     // In platformOS, there are no built-in system translations. User-defined translations
     // are resolved via TranslationProvider at the point of lookup.
@@ -137,7 +146,7 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
             return null;
         return documentManager.get(defaultLocaleFileUri) ?? null;
     }
-    const definitionsProvider = new DefinitionProvider_1.DefinitionProvider(documentManager, getDefaultLocaleSourceCode);
+    const definitionsProvider = new DefinitionProvider_1.DefinitionProvider(documentManager, getDefaultLocaleSourceCode, fs, findAppRootURI, documentsLocator, searchPathsCache);
     const jsonLanguageService = new JSONLanguageService_1.JSONLanguageService(documentManager, jsonValidationSet);
     const cssLanguageService = new CSSLanguageService_1.CSSLanguageService(documentManager);
     const completionsProvider = new completions_1.CompletionsProvider({
@@ -243,6 +252,9 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
                 {
                     globPattern: '**/*.css',
                 },
+                {
+                    globPattern: '**/app/config.yml',
+                },
             ],
         });
     });
@@ -287,7 +299,11 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
             cssLanguageService.change(uri, params.contentChanges[0].text, version);
             return;
         }
-        documentManager.change(uri, params.contentChanges[0].text, version);
+        const text = params.contentChanges[0].text;
+        documentManager.change(uri, text, version);
+        if ((0, platformos_common_1.isPage)(uri)) {
+            definitionsProvider.onPageFileChanged(uri, text);
+        }
         if (await configuration.shouldCheckOnChange()) {
             runChecks([uri]);
         }
@@ -300,6 +316,13 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
         if (hasUnsupportedDocument(params))
             return;
         const { uri } = params.textDocument;
+        // onDidChangeWatchedFiles also fires for in-editor saves, but it arrives after
+        // onDidSaveTextDocument. Invalidate the search-paths cache here immediately so
+        // that go-to-definition requests triggered by the same save don't see stale data
+        // while waiting for the file-watcher notification.
+        if (uri.endsWith('/app/config.yml')) {
+            searchPathsCache.invalidate();
+        }
         if (await configuration.shouldCheckOnSave()) {
             runChecks([uri]);
         }
@@ -418,6 +441,14 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
         if (params.changes.length === 0)
             return;
         const triggerUris = params.changes.map((change) => change.uri);
+        // When many page files change at once (e.g., git checkout, branch switch, stash pop),
+        // incremental updates aren't reliable — files not open in the editor won't get
+        // individual onDidChangeTextDocument events. VS Code reports branch-switch changes
+        // as FileChangeType.Changed, so we count all change types.
+        const bulkPageChanges = params.changes.filter((c) => (0, platformos_common_1.isPage)(c.uri));
+        if (bulkPageChanges.length >= BULK_PAGE_CHANGE_THRESHOLD) {
+            definitionsProvider.invalidateRouteTable();
+        }
         const updates = [];
         for (const change of params.changes) {
             // App Check config changes should clear the config cache
@@ -425,6 +456,19 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
                 loadConfig.clearCache();
                 continue;
             }
+            // app/config.yml changes should clear expanded search paths cache
+            // and force re-check of all open documents.
+            // Note: readFile for config.yml bypasses the CachedFileSystem cache,
+            // so we don't need to invalidate it — reads are always fresh.
+            if (change.uri.endsWith('/app/config.yml')) {
+                documentsLocator.clearExpandedPathsCache();
+                searchPathsCache.invalidate();
+                // Ensure open liquid files are re-checked with the new search paths
+                for (const doc of documentManager.openDocuments) {
+                    triggerUris.push(doc.uri);
+                }
+                continue;
+            }
             // Rename cache invalidation is handled by onDidRenameFiles
             if (documentManager.hasRecentRename(change.uri)) {
                 documentManager.clearRecentRename(change.uri);
@@ -438,7 +482,13 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
                     fs.stat.invalidate(change.uri);
                     appGraphManager.create(change.uri);
                     // If a file is created under out feet, we update its contents.
-                    updates.push(documentManager.changeFromDisk(change.uri));
+                    updates.push(documentManager.changeFromDisk(change.uri).then(() => {
+                        if ((0, platformos_common_1.isPage)(change.uri)) {
+                            const doc = documentManager.get(change.uri);
+                            if (doc)
+                                definitionsProvider.onPageFileChanged(change.uri, doc.source);
+                        }
+                    }));
                     break;
                 case vscode_languageserver_1.FileChangeType.Changed:
                     // A changed file invalidates readFile and stat (but not readDirectory)
@@ -449,7 +499,21 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
                     // If it is open, then we don't need to update it because the document manager
                     // will have the version from the editor.
                     if (documentManager.get(change.uri)?.version === undefined) {
-                        updates.push(documentManager.changeFromDisk(change.uri));
+                        updates.push(documentManager.changeFromDisk(change.uri).then(() => {
+                            if ((0, platformos_common_1.isPage)(change.uri)) {
+                                const doc = documentManager.get(change.uri);
+                                if (doc)
+                                    definitionsProvider.onPageFileChanged(change.uri, doc.source);
+                            }
+                        }));
+                    }
+                    else if ((0, platformos_common_1.isPage)(change.uri)) {
+                        // File is open in editor but changed externally (e.g. git checkout).
+                        // The doc manager already has the editor version, but the route table
+                        // may be stale — update it from whatever the doc manager holds.
+                        const doc = documentManager.get(change.uri);
+                        if (doc)
+                            definitionsProvider.onPageFileChanged(change.uri, doc.source);
                     }
                     break;
                 case vscode_languageserver_1.FileChangeType.Deleted:
@@ -458,6 +522,8 @@ function startServer(connection, { fs: injectedFs, loadConfig: injectedLoadConfi
                     fs.readFile.invalidate(change.uri);
                     fs.stat.invalidate(change.uri);
                     appGraphManager.delete(change.uri);
+                    if ((0, platformos_common_1.isPage)(change.uri))
+                        definitionsProvider.onPageFileDeleted(change.uri);
                     // If a file is deleted, it's removed from the document manager
                     documentManager.delete(change.uri);
                     break;