packages/codemirror-language-client/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @shopify/codemirror-language-client
 
+## 0.7.1
+
+### Patch Changes
+
+- 0b7534b: Add way to pass LSP initialization options to the server with the initialize request
+
 ## 0.7.0
 
 ### Minor Changes

packages/codemirror-language-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/codemirror-language-client",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "A Language Client for CodeMirror",
   "author": "CP Clermont <cp.clermont@shopify.com>",
   "homepage": "https://github.com/Shopify/theme-tools/tree/main/packages/codemirror-language-client#readme",
@@ -51,8 +51,8 @@
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.9.2",
     "@replit/codemirror-vim": "^6.2.1",
-    "@shopify/theme-check-docs-updater": "^3.0.0",
-    "@shopify/theme-language-server-browser": "^2.0.0",
+    "@shopify/theme-check-docs-updater": "^3.2.0",
+    "@shopify/theme-language-server-browser": "^2.2.0",
     "@shopify/lang-jsonc": "^1.0.0",
     "@types/markdown-it": "^13.0.4",
     "codemirror": "^6.0.1",

packages/codemirror-language-client/playground/src/playground.ts

@@ -88,7 +88,11 @@ async function main() {
 
   const client = new CodeMirrorLanguageClient(
     worker,
-    {},
+    {
+      initializationOptions: {
+        'themeCheck.preloadOnBoot': false,
+      },
+    },
     {
       autocompleteOptions: {
         activateOnTyping: true,
@@ -125,16 +129,24 @@ async function main() {
         return JSON.stringify(exampleTranslations, null, 2);
       case 'browser:/locales/en.default.schema.json':
         return JSON.stringify(exampleSchemaTranslations, null, 2);
+      case 'browser:/snippets/article-card.liquid':
+      case 'browser:/snippets/product-card.liquid':
+      case 'browser:/snippets/product.liquid':
+        return '';
       default:
         throw new Error(`File does not exist ${uri}`);
     }
   });
 
   client.client.onRequest('fs/stat' as any, ([uri]: string) => {
     switch (uri) {
-      case 'browser:/sections/section.liquid':
+      case 'browser:/.theme-check.yml':
       case 'browser:/locales/en.default.json':
       case 'browser:/locales/en.schema.default.json':
+      case 'browser:/sections/section.liquid':
+      case 'browser:/snippets/article-card.liquid':
+      case 'browser:/snippets/product-card.liquid':
+      case 'browser:/snippets/product.liquid':
         return { fileType: 1, size: 1 };
       default:
         throw new Error(`File does not exist: ${uri}`);
@@ -151,6 +163,9 @@ async function main() {
           ['browser:/.theme-check.yml', 1],
         ];
       }
+      case 'browser:/sections': {
+        return [['browser:/sections/section.liquid', 1]];
+      }
       case 'browser:/snippets': {
         return [
           ['browser:/snippets/article-card.liquid', 1],

packages/codemirror-language-client/src/CodeMirrorLanguageClient.ts

@@ -114,7 +114,7 @@ export class CodeMirrorLanguageClient {
 
   constructor(
     private readonly worker: Worker,
-    { log = defaultLogger }: ClientDependencies = {},
+    { log = defaultLogger, initializationOptions }: ClientDependencies = {},
     {
       infoRenderer,
       autocompleteOptions,
@@ -126,6 +126,7 @@ export class CodeMirrorLanguageClient {
   ) {
     this.client = new LanguageClient(worker, {
       clientCapabilities,
+      initializationOptions,
       log,
     });
     this.worker = worker;

packages/codemirror-language-client/src/LanguageClient.ts

@@ -30,6 +30,7 @@ export interface PromiseCompletion {
 
 export interface Dependencies {
   clientCapabilities: ClientCapabilities;
+  initializationOptions?: any;
   log(...args: any[]): void;
 }
 
@@ -48,6 +49,7 @@ export interface AbstractLanguageClient {
 
 export class LanguageClient extends EventTarget implements AbstractLanguageClient {
   public readonly clientCapabilities: ClientCapabilities;
+  public readonly initializationOptions: any;
   public serverCapabilities: ServerCapabilities | null;
   public serverInfo: any;
 
@@ -64,6 +66,7 @@ export class LanguageClient extends EventTarget implements AbstractLanguageClien
     this.dispose = () => {};
     this.disposables = [];
     this.clientCapabilities = dependencies.clientCapabilities;
+    this.initializationOptions = dependencies.initializationOptions;
     this.log = dependencies.log;
     this.serverCapabilities = null;
     this.serverInfo = null;
@@ -91,6 +94,7 @@ export class LanguageClient extends EventTarget implements AbstractLanguageClien
      */
     const response = await this.sendRequest(InitializeRequest.type, {
       capabilities: this.clientCapabilities,
+      initializationOptions: this.initializationOptions,
       processId: 0,
       rootUri: 'browser:///',
     });

packages/liquid-html-parser/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @shopify/liquid-html-parser
 
+## 2.1.1
+
+### Patch Changes
+
+- c4813ff: Fix LiquidComparison types
+
 ## 2.1.0
 
 ### Minor Changes

packages/liquid-html-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/liquid-html-parser",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Liquid HTML parser by Shopify",
   "author": "CP Clermont <cp.clermont@shopify.com>",
   "homepage": "https://github.com/Shopify/theme-tools/tree/main/packages/liquid-html-parser#readme",

packages/liquid-html-parser/src/stage-2-ast.ts

@@ -345,8 +345,8 @@ export interface LiquidLogicalExpression extends ASTNode<NodeTypes.LogicalExpres
 /** Represents `left (<|<=|=|>=|>|contains) right` conditional expressions */
 export interface LiquidComparison extends ASTNode<NodeTypes.Comparison> {
   comparator: Comparators;
-  left: LiquidConditionalExpression;
-  right: LiquidConditionalExpression;
+  left: LiquidExpression;
+  right: LiquidExpression;
 }
 
 /** https://shopify.dev/docs/api/liquid/tags#paginate */

packages/prettier-plugin-liquid/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @shopify/prettier-plugin-liquid
 
+## 1.6.1
+
+### Patch Changes
+
+- Patch bump because it depends on @shopify/liquid-html-parser
+- Updated dependencies [c4813ff]
+  - @shopify/liquid-html-parser@2.1.1
+
 ## 1.6.0
 
 ### Minor Changes

packages/prettier-plugin-liquid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/prettier-plugin-liquid",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Prettier Liquid/HTML plugin by Shopify",
   "author": "CP Clermont <cp.clermont@shopify.com>",
   "homepage": "https://github.com/Shopify/theme-tools/tree/main/packages/prettier-plugin-liquid#readme",
@@ -59,7 +59,7 @@
     "tsconfig-paths": "^3.14.1"
   },
   "dependencies": {
-    "@shopify/liquid-html-parser": "^2.1.0",
+    "@shopify/liquid-html-parser": "^2.1.1",
     "html-styles": "^1.0.0"
   }
 }

packages/theme-check-browser/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @shopify/theme-check-browser
 
+## 3.2.0
+
+### Patch Changes
+
+- Updated dependencies [3f7680e]
+- Updated dependencies [add2445]
+- Updated dependencies [8a0bf78]
+- Updated dependencies [7a6dfe8]
+- Updated dependencies [7317830]
+- Updated dependencies [c4813ff]
+- Updated dependencies [b558bfe]
+- Updated dependencies [9a07208]
+- Updated dependencies [f09c923]
+  - @shopify/theme-check-common@3.2.0
+
 ## 3.1.0
 
 ### Minor Changes

packages/theme-check-browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/theme-check-browser",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
@@ -26,6 +26,6 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@shopify/theme-check-common": "3.1.0"
+    "@shopify/theme-check-common": "3.2.0"
   }
 }

packages/theme-check-common/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @shopify/theme-check-common
 
+## 3.2.0
+
+### Minor Changes
+
+- 3f7680e: Add the `ValidBlockTarget` Check
+- 8a0bf78: Add the `ValidLocalBlocks` Check
+- c4813ff: Add the `BlockIdUsage` check
+- 7317830: Add translation checking to `ValidSchemaName` check
+- add2445: [Internal] Add better building blocks for dealing with `{% schema %}` content
+
+### Patch Changes
+
+- 7a6dfe8: Fix weird root URI loading bug
+- b558bfe: Fixup `CaptureOnContentForBlock` check
+- 9a07208: [Bug fix] Metafield definitions should use `namespace.key` for auto-completion
+- f09c923: Moving internal methods around
+- Updated dependencies [c4813ff]
+  - @shopify/liquid-html-parser@2.1.1
+
 ## 3.1.0
 
 ### Minor Changes

packages/theme-check-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/theme-check-common",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@shopify/liquid-html-parser": "2.1.0",
+    "@shopify/liquid-html-parser": "2.1.1",
     "cross-fetch": "^4.0.0",
     "json-to-ast": "^2.1.0",
     "jsonc-parser": "^3.2.0",

packages/theme-check-common/src/JSONValidator.ts

@@ -1,11 +1,19 @@
 import { LanguageService, TextDocument, getLanguageService } from 'vscode-json-languageservice';
-import { SchemaDefinition, SourceCodeType, ValidateJSON } from './types';
+import { Config, Dependencies, IsValidSchema, SchemaDefinition, ValidateJSON } from './types';
 import { indexBy } from './utils';
 
 export class JSONValidator {
   private service: LanguageService;
   private schemas: Record<string, SchemaDefinition>;
 
+  static async create(
+    jsonValidationSet: Dependencies['jsonValidationSet'],
+    config: Config,
+  ): Promise<JSONValidator | undefined> {
+    if (!jsonValidationSet) return;
+    return new JSONValidator(await jsonValidationSet.schemas(config.context));
+  }
+
   constructor(schemas: SchemaDefinition[]) {
     this.schemas = indexBy((x) => x.uri, schemas);
     this.service = getLanguageService({
@@ -31,24 +39,44 @@ export class JSONValidator {
    * It's up to the caller to determine where in the file those should be.
    * (presumably by doing some offset logic)
    */
-  public validate: ValidateJSON<SourceCodeType> = async (sourceCode, jsonString) => {
-    const jsonTextDocument = TextDocument.create('file:' + sourceCode.uri, 'json', 0, jsonString);
-    const jsonDocument = this.service.parseJSONDocument(jsonTextDocument);
-    const diagnostics = await this.service.doValidation(jsonTextDocument, jsonDocument, {
-      schemaValidation: 'error',
-      trailingCommas: 'ignore',
-      comments: 'ignore',
-    });
+  public validate: ValidateJSON = async (uri: string, jsonString: string) => {
+    const jsonTextDocument = TextDocument.create(uri, 'json', 0, jsonString);
+    const diagnostics = await this.getOffsetDiagnostics(jsonTextDocument);
     return diagnostics.map((diagnostic) => ({
       message: diagnostic.message,
       startIndex: jsonTextDocument.offsetAt(diagnostic.range.start),
       endIndex: jsonTextDocument.offsetAt(diagnostic.range.end),
     }));
   };
 
+  public isValid: IsValidSchema = async (uri: string, jsonString: string) => {
+    return isValid(this.service, uri, jsonString);
+  };
+
+  private async getOffsetDiagnostics(jsonTextDocument: TextDocument) {
+    const jsonDocument = this.service.parseJSONDocument(jsonTextDocument);
+    return this.service.doValidation(jsonTextDocument, jsonDocument, {
+      schemaValidation: 'error',
+      trailingCommas: 'ignore',
+      comments: 'ignore',
+    });
+  }
+
   private async getSchemaForURI(uri: string): Promise<string> {
     const schema = this.schemas[uri]?.schema;
     if (!schema) return `No schema for '${uri}' found`;
     return schema;
   }
 }
+
+/** We'll reuse this in the language server */
+export async function isValid(service: LanguageService, uri: string, jsonString: string) {
+  const jsonTextDocument = TextDocument.create(uri, 'json', 0, jsonString);
+  const jsonDocument = service.parseJSONDocument(jsonTextDocument);
+  const diagnostics = await service.doValidation(jsonTextDocument, jsonDocument, {
+    schemaValidation: 'error',
+    trailingCommas: 'ignore',
+    comments: 'ignore',
+  });
+  return diagnostics.every((diagnostic) => diagnostic.severity !== 1);
+}