@platformos/platformos-language-server-common 0.0.18 → 0.0.20

package/src/server/AppGraphManager.ts

@@ -2,11 +2,9 @@ import { path, SourceCodeType } from '@platformos/platformos-check-common';
 import { AbstractFileSystem } from '@platformos/platformos-common';
 import {
   buildAppGraph,
-  getWebComponentMap,
   IDependencies as GraphDependencies,
   Location,
   toSourceCode,
-  WebComponentMap,
 } from '@platformos/platformos-graph';
 import { Range } from 'vscode-json-languageservice';
 import { Connection } from 'vscode-languageserver';
@@ -162,7 +160,7 @@ export class AppGraphManager {
     const { documentManager } = this;
     await documentManager.preload(rootUri);
 
-    const dependencies = await this.graphDependencies(rootUri);
+    const dependencies = this.graphDependencies();
     const graph = await buildAppGraph(rootUri, dependencies, entryPoints);
     return graph;
   };
@@ -175,20 +173,8 @@ export class AppGraphManager {
     return toSourceCode(uri, source);
   };
 
-  private getWebComponentMap(rootUri: string): Promise<WebComponentMap> {
+  private graphDependencies(): GraphDependencies {
     const { fs, getSourceCode } = this;
-    return getWebComponentMap(rootUri, { fs, getSourceCode });
-  }
-
-  private async graphDependencies(rootUri: string): Promise<GraphDependencies> {
-    const { fs, getSourceCode } = this;
-    const webComponentDefs = await this.getWebComponentMap(rootUri);
-    return {
-      fs: fs,
-      getSourceCode: getSourceCode,
-      getWebComponentDefinitionReference(customElementName: string) {
-        return webComponentDefs.get(customElementName);
-      },
-    };
+    return { fs, getSourceCode };
   }
 }

package/src/server/DocumentBackedFileSystem.spec.ts

@@ -0,0 +1,54 @@
+import { AbstractFileSystem, FileType } from '@platformos/platformos-common';
+import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
+import { beforeEach, describe, expect, it } from 'vitest';
+import { DocumentManager } from '../documents';
+import { DocumentBackedFileSystem } from './DocumentBackedFileSystem';
+
+describe('Module: DocumentBackedFileSystem', () => {
+  const rootUri = 'mock-fs:';
+  const fooUri = 'mock-fs:/app/views/partials/foo.liquid';
+  const barUri = 'mock-fs:/app/views/partials/bar.liquid';
+  let diskFs: AbstractFileSystem;
+  let documentManager: DocumentManager;
+  let fs: DocumentBackedFileSystem;
+
+  beforeEach(() => {
+    diskFs = new MockFileSystem(
+      {
+        'app/views/partials/foo.liquid': 'saved foo',
+        'app/views/partials/bar.liquid': 'saved bar',
+      },
+      rootUri,
+    );
+    documentManager = new DocumentManager(diskFs);
+    fs = new DocumentBackedFileSystem(diskFs, documentManager);
+  });
+
+  it('serves the in-editor buffer for a tracked document instead of the disk content', async () => {
+    documentManager.open(fooUri, 'edited foo', 1);
+
+    expect(await fs.readFile(fooUri)).to.equal('edited foo');
+  });
+
+  it('reflects later edits to a tracked document without any cache invalidation', async () => {
+    documentManager.open(fooUri, 'edited foo', 1);
+    documentManager.change(fooUri, 'edited foo again', 2);
+
+    expect(await fs.readFile(fooUri)).to.equal('edited foo again');
+  });
+
+  it('falls back to the underlying filesystem for untracked documents', async () => {
+    expect(await fs.readFile(barUri)).to.equal('saved bar');
+  });
+
+  it('delegates readDirectory to the underlying filesystem', async () => {
+    expect(await fs.readDirectory('mock-fs:/app/views/partials')).to.deep.equal([
+      ['mock-fs:/app/views/partials/foo.liquid', FileType.File],
+      ['mock-fs:/app/views/partials/bar.liquid', FileType.File],
+    ]);
+  });
+
+  it('delegates stat to the underlying filesystem', async () => {
+    expect(await fs.stat(fooUri)).to.deep.equal({ type: FileType.File, size: 'saved foo'.length });
+  });
+});

package/src/server/DocumentBackedFileSystem.ts

@@ -0,0 +1,40 @@
+import { AbstractFileSystem, FileStat, FileTuple } from '@platformos/platformos-common';
+import { DocumentManager } from '../documents';
+
+/**
+ * A filesystem layer that serves the content of tracked documents from the
+ * DocumentManager and delegates everything else to the underlying filesystem.
+ *
+ * Checks read the files they reference (e.g. the partial targeted by a
+ * `render`/`function` call) through `context.fs.readFile`. Without this layer
+ * those reads hit the disk-backed CachedFileSystem, which returns the last saved
+ * — and cached — version of the file. As a result, an edit to a partial did not
+ * update cross-file diagnostics on the *calling* file until the partial was saved
+ * and its cache entry invalidated.
+ *
+ * The DocumentManager always holds the latest in-editor buffer for open documents
+ * (and the latest disk content for preloaded ones), so preferring it keeps
+ * cross-file checks in sync with what the user is actually editing.
+ */
+export class DocumentBackedFileSystem implements AbstractFileSystem {
+  constructor(
+    private readonly fs: AbstractFileSystem,
+    private readonly documentManager: DocumentManager,
+  ) {}
+
+  async readFile(uri: string): Promise<string> {
+    const document = this.documentManager.get(uri);
+    if (document) {
+      return document.source;
+    }
+    return this.fs.readFile(uri);
+  }
+
+  readDirectory(uri: string): Promise<FileTuple[]> {
+    return this.fs.readDirectory(uri);
+  }
+
+  stat(uri: string): Promise<FileStat> {
+    return this.fs.stat(uri);
+  }
+}

package/src/server/startServer.ts

@@ -47,6 +47,7 @@ import { debounce } from '../utils';
 import { SearchPathsLoader } from '../utils/searchPaths';
 import { VERSION } from '../version';
 import { CachedFileSystem } from './CachedFileSystem';
+import { DocumentBackedFileSystem } from './DocumentBackedFileSystem';
 import { Configuration, INCLUDE_FILES_FROM_DISK } from './Configuration';
 import { safe } from './safe';
 import { AppGraphManager } from './AppGraphManager';
@@ -163,9 +164,14 @@ export function startServer(
 
   // These are augmented here so that the caching is maintained over different runs.
   const platformosDocset = new AugmentedPlatformOSDocset(remotePlatformOSDocset);
+  // Checks read the files they reference (e.g. the partial targeted by a
+  // render/function call) through `context.fs`. Serve those reads from the
+  // DocumentManager so cross-file diagnostics reflect the latest in-editor buffer
+  // rather than a stale, disk-cached copy.
+  const checksFs = new DocumentBackedFileSystem(fs, documentManager);
   const runChecks = debounce(
     makeRunChecks(documentManager, diagnosticsManager, {
-      fs,
+      fs: checksFs,
       loadConfig,
       platformosDocset,
       jsonValidationSet,

package/src/test/CompletionItemsAssertion.ts

@@ -70,7 +70,9 @@ export const complete: RawMatcherFn<MatcherState> = async function (
 };
 
 function asCompleteContextObject(context: string | CompleteContext): CompleteContext {
-  if (typeof context === 'string') return { source: context, relativePath: 'file.liquid' };
+  if (typeof context === 'string') {
+    return { source: context, relativePath: 'app/views/layouts/file.liquid' };
+  }
   return context;
 }
 

package/src/test/HoverAssertion.ts

@@ -79,6 +79,8 @@ export const hover: RawMatcherFn<MatcherState> = async function (
 };
 
 function asHoverContext(context: string | HoverContext): HoverContext {
-  if (typeof context === 'string') return { source: context, relativePath: 'app/file.liquid' };
+  if (typeof context === 'string') {
+    return { source: context, relativePath: 'app/views/layouts/file.liquid' };
+  }
   return context;
 }