@platformos/platformos-language-server-common 0.0.5 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformos/platformos-language-server-common",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "platformOS",
@@ -27,9 +27,9 @@
     "type-check": "tsc --noEmit -p ./tsconfig.json"
   },
   "dependencies": {
-    "@platformos/liquid-html-parser": "^0.0.5",
-    "@platformos/platformos-check-common": "0.0.5",
-    "@platformos/platformos-graph": "0.0.5",
+    "@platformos/liquid-html-parser": "^0.0.6",
+    "@platformos/platformos-check-common": "0.0.6",
+    "@platformos/platformos-graph": "0.0.6",
     "@vscode/web-custom-data": "^0.4.6",
     "vscode-json-languageservice": "^5.3.10",
     "vscode-languageserver": "^8.0.2",

package/src/ClientCapabilities.ts

@@ -44,7 +44,7 @@ export class ClientCapabilities {
   }
 
   initializationOption<T>(key: string, defaultValue: T): T {
-    // { 'themeCheck.checkOnSave': true }
+    // { 'platformosCheck.checkOnSave': true }
     const direct = this.initializationOptions?.[key];
     if (direct !== undefined) return direct;
 

package/src/diagnostics/runChecks.ts

@@ -29,10 +29,15 @@ export function makeRunChecks(
     getMetafieldDefinitions,
     cssLanguageService,
     themeGraphManager,
+    includeFilesFromDisk,
   }: Pick<
     Dependencies,
     'fs' | 'loadConfig' | 'themeDocset' | 'jsonValidationSet' | 'getMetafieldDefinitions'
-  > & { cssLanguageService?: CSSLanguageService; themeGraphManager?: ThemeGraphManager },
+  > & {
+    cssLanguageService?: CSSLanguageService;
+    themeGraphManager?: ThemeGraphManager;
+    includeFilesFromDisk?: () => boolean;
+  },
 ) {
   return async function runChecks(triggerURIs: string[]): Promise<void> {
     // This function takes an array of triggerURIs so that we can correctly
@@ -53,7 +58,7 @@ export function makeRunChecks(
 
     async function runChecksForRoot(configFileRootUri: string) {
       const config = await loadConfig(configFileRootUri, fs);
-      const theme = documentManager.theme(config.rootUri);
+      const theme = documentManager.theme(config.rootUri, includeFilesFromDisk?.());
 
       const cssOffenses = cssLanguageService
         ? await Promise.all(

package/src/formatting/providers/HtmlElementAutoclosingOnTypeFormattingProvider.spec.ts

@@ -2,6 +2,7 @@ import { afterEach, assert, beforeEach, describe, expect, it, vi } from 'vitest'
 import { DocumentOnTypeFormattingParams } from 'vscode-languageserver';
 import { DocumentManager } from '../../documents';
 import { OnTypeFormattingProvider } from '../OnTypeFormattingProvider';
+import { SetCursorPosition } from '../types';
 
 const options: DocumentOnTypeFormattingParams['options'] = {
   insertSpaces: true,
@@ -11,11 +12,11 @@ const options: DocumentOnTypeFormattingParams['options'] = {
 describe('Module: HtmlElementAutoclosingOnTypeFormattingProvider', () => {
   let documentManager: DocumentManager;
   let onTypeFormattingProvider: OnTypeFormattingProvider;
-  let setCursorPositionSpy: ReturnType<typeof vi.fn>;
+  let setCursorPositionSpy: SetCursorPosition;
   const uri = 'file:///path/to/document.liquid';
 
   beforeEach(() => {
-    setCursorPositionSpy = vi.fn();
+    setCursorPositionSpy = vi.fn(async () => {}) as SetCursorPosition;
     documentManager = new DocumentManager();
     onTypeFormattingProvider = new OnTypeFormattingProvider(documentManager, setCursorPositionSpy);
     vi.useFakeTimers();

package/src/server/Configuration.ts

@@ -7,10 +7,11 @@ import {
 } from 'vscode-languageserver';
 import { ClientCapabilities } from '../ClientCapabilities';
 
-export const CHECK_ON_OPEN = 'themeCheck.checkOnOpen' as const;
-export const CHECK_ON_SAVE = 'themeCheck.checkOnSave' as const;
-export const CHECK_ON_CHANGE = 'themeCheck.checkOnChange' as const;
-export const PRELOAD_ON_BOOT = 'themeCheck.preloadOnBoot' as const;
+export const CHECK_ON_OPEN = 'platformosCheck.checkOnOpen' as const;
+export const CHECK_ON_SAVE = 'platformosCheck.checkOnSave' as const;
+export const CHECK_ON_CHANGE = 'platformosCheck.checkOnChange' as const;
+export const PRELOAD_ON_BOOT = 'platformosCheck.preloadOnBoot' as const;
+export const INCLUDE_FILES_FROM_DISK = 'platformosCheck.includeFilesFromDisk' as const;
 export const ConfigurationKeys = [
   CHECK_ON_OPEN,
   CHECK_ON_SAVE,
@@ -23,6 +24,7 @@ export class Configuration {
   [CHECK_ON_SAVE]: boolean = true;
   [CHECK_ON_CHANGE]: boolean = true;
   [PRELOAD_ON_BOOT]: boolean = true;
+  [INCLUDE_FILES_FROM_DISK]: boolean = false;
 
   constructor(private connection: Connection, private capabilities: ClientCapabilities) {
     this.connection = connection;
@@ -34,6 +36,10 @@ export class Configuration {
     this[CHECK_ON_SAVE] = this.capabilities.initializationOption(CHECK_ON_SAVE, true);
     this[CHECK_ON_CHANGE] = this.capabilities.initializationOption(CHECK_ON_CHANGE, true);
     this[PRELOAD_ON_BOOT] = this.capabilities.initializationOption(PRELOAD_ON_BOOT, true);
+    this[INCLUDE_FILES_FROM_DISK] = this.capabilities.initializationOption(
+      INCLUDE_FILES_FROM_DISK,
+      false,
+    );
   }
 
   async shouldCheckOnOpen() {

package/src/server/startServer.spec.ts

@@ -117,9 +117,9 @@ describe('Module: server', () => {
     connection.setup(
       {},
       {
-        'themeCheck.checkOnOpen': false,
-        'themeCheck.checkOnChange': false,
-        'themeCheck.checkOnSave': false,
+        'platformosCheck.checkOnOpen': false,
+        'platformosCheck.checkOnChange': false,
+        'platformosCheck.checkOnSave': false,
       },
     );
     await flushAsync();
@@ -154,9 +154,9 @@ describe('Module: server', () => {
         },
       },
       {
-        'themeCheck.checkOnOpen': false,
-        'themeCheck.checkOnChange': false,
-        'themeCheck.checkOnSave': false,
+        'platformosCheck.checkOnOpen': false,
+        'platformosCheck.checkOnChange': false,
+        'platformosCheck.checkOnSave': false,
       },
     );
     await flushAsync();

package/src/server/startServer.ts

@@ -54,7 +54,7 @@ import {
 import { debounce } from '../utils';
 import { VERSION } from '../version';
 import { CachedFileSystem } from './CachedFileSystem';
-import { Configuration } from './Configuration';
+import { Configuration, INCLUDE_FILES_FROM_DISK } from './Configuration';
 import { safe } from './safe';
 import { ThemeGraphManager } from './ThemeGraphManager';
 import { DocumentsLocator } from '@platformos/platformos-common';
@@ -194,6 +194,7 @@ export function startServer(
       getMetafieldDefinitions,
       cssLanguageService,
       themeGraphManager,
+      includeFilesFromDisk: () => configuration[INCLUDE_FILES_FROM_DISK],
     }),
     100,
   );
@@ -202,7 +203,7 @@ export function startServer(
     const rootURI = await findThemeRootURI(uri);
     if (!rootURI) return {};
 
-    const theme = documentManager.theme(rootURI);
+    const theme = documentManager.theme(rootURI, configuration[INCLUDE_FILES_FROM_DISK]);
     const getDefaultTranslations = makeGetDefaultTranslations(fs, theme, rootURI);
     const [defaultTranslations, shopifyTranslations] = await Promise.all([
       getDefaultTranslations(),
@@ -216,7 +217,7 @@ export function startServer(
     const rootURI = await findThemeRootURI(uri);
     if (!rootURI) return {};
 
-    const theme = documentManager.theme(rootURI);
+    const theme = documentManager.theme(rootURI, configuration[INCLUDE_FILES_FROM_DISK]);
     const getDefaultSchemaTranslations = makeGetDefaultSchemaTranslations(fs, theme, rootURI);
     return getDefaultSchemaTranslations();
   };