@platformos/platformos-check-common 0.0.7 → 0.0.9

package/src/checks/liquid-html-syntax-error/index.spec.ts

@@ -86,7 +86,7 @@ describe('Module: LiquidHTMLSyntaxError', () => {
     const offenses = await runLiquidCheck(LiquidHTMLSyntaxError, sourceCode);
     expect(offenses).to.have.length(1);
     expect(offenses[0].message).to.equal(
-      `SyntaxError: expected "#", a letter, "yield", "theme_render_rc", "spam_protection", "sign_in", "session", "rollback", "return", "response_status", "response_headers", "redirect_to", "print", "log", "include_form", "export", "context", "catch", "background", "when", "sections", "section", "graphql", "function", "render", "liquid", "layout", "increment", "include", "elsif", "else", "echo", "decrement", "content_for", "cycle", "continue", "break", "hash_assign", "assign", "try", "transaction", "parse_json", "cache", "tablerow", "unless", "if", "ifchanged", "for", "case", "capture", "paginate", "form", "end", "style", "stylesheet", "schema", "javascript", "raw", "comment", or "doc"`,
+      `SyntaxError: expected "#", a letter, "yield", "theme_render_rc", "spam_protection", "sign_in", "session", "rollback", "return", "response_status", "response_headers", "redirect_to", "print", "log", "include_form", "export", "context", "catch", "background", "when", "graphql", "function", "render", "liquid", "layout", "increment", "include", "elsif", "else", "echo", "decrement", "cycle", "continue", "break", "hash_assign", "assign", "try", "transaction", "parse_json", "cache", "tablerow", "unless", "if", "ifchanged", "for", "case", "capture", "form", "content_for", "end", "raw", "comment", or "doc"`,
     );
   });
 
@@ -95,11 +95,6 @@ describe('Module: LiquidHTMLSyntaxError', () => {
       {% if some_variable %}
         Hello, world!
       {% endif %}
-      {% schema %}
-      {
-        "settings": [{ "visible_if": "{{ foo.bar == true }}" }]
-      }
-      {% endschema %}
     `;
 
     const offenses = await runLiquidCheck(LiquidHTMLSyntaxError, sourceCode);

package/src/checks/liquid-html-syntax-error/index.ts

@@ -9,6 +9,8 @@ import { detectInvalidLoopArguments } from './checks/InvalidLoopArguments';
 import { detectConditionalNodeUnsupportedParenthesis } from './checks/InvalidConditionalNodeParenthesis';
 import { detectInvalidFilterName } from './checks/InvalidFilterName';
 import { detectInvalidPipeSyntax } from './checks/InvalidPipeSyntax';
+import { detectUnknownTag } from './checks/UnknownTag';
+import { detectInvalidTagSyntax } from './checks/InvalidTagSyntax';
 import { isWithinRawTagThatDoesNotParseItsContents } from '../utils';
 
 type LineColPosition = {
@@ -45,8 +47,8 @@ export const LiquidHTMLSyntaxError: LiquidCheckDefinition = {
 
   create(context) {
     const ast = context.file.ast;
-    const filtersPromise = context.themeDocset?.filters();
-    const tagsPromise = context.themeDocset?.tags();
+    const filtersPromise = context.platformosDocset?.filters();
+    const tagsPromise = context.platformosDocset?.tags();
 
     if (!isError(ast)) {
       return {
@@ -64,11 +66,21 @@ export const LiquidHTMLSyntaxError: LiquidCheckDefinition = {
         async LiquidTag(node, ancestors) {
           if (isWithinRawTagThatDoesNotParseItsContents(ancestors)) return;
 
+          const tags = (await tagsPromise) ?? [];
+
+          // Unknown tags are fatal — no point in further syntax checks.
+          const unknownTagProblem = detectUnknownTag(node, tags);
+          if (unknownTagProblem) {
+            context.report(unknownTagProblem);
+            return;
+          }
+
+          // Run specific sub-checks first — they provide better error messages and autofixes.
           const problems = [
             detectMultipleAssignValues(node),
             detectInvalidEchoValue(node),
             detectInvalidLoopRange(node),
-            detectInvalidLoopArguments(node, await tagsPromise),
+            detectInvalidLoopArguments(node, tags),
           ].filter(Boolean) as Problem<SourceCodeType.LiquidHtml>[];
 
           // Fixers for `detectConditionalNodeUnsupportedParenthesis` and `detectInvalidConditionalNode` consume
@@ -80,9 +92,18 @@ export const LiquidHTMLSyntaxError: LiquidCheckDefinition = {
             problems.push(conditionalNodeProblem);
           }
 
+          // InvalidTagSyntax is a catch-all for known tags with unparseable markup.
+          // Only fire it if no more specific sub-check already reported on this tag.
+          if (problems.length === 0) {
+            const invalidSyntaxProblem = detectInvalidTagSyntax(node, tags);
+            if (invalidSyntaxProblem) {
+              problems.push(invalidSyntaxProblem);
+            }
+          }
+
           problems.forEach(context.report);
 
-          const filterProblems = await detectInvalidFilterName(node, await filtersPromise);
+          const filterProblems = await detectInvalidFilterName(node, (await filtersPromise) ?? []);
           if (filterProblems.length > 0) {
             filterProblems.forEach((filterProblem) => context.report(filterProblem));
           }
@@ -108,7 +129,7 @@ export const LiquidHTMLSyntaxError: LiquidCheckDefinition = {
         async LiquidVariableOutput(node, ancestors) {
           if (isWithinRawTagThatDoesNotParseItsContents(ancestors)) return;
 
-          const filterProblems = await detectInvalidFilterName(node, await filtersPromise);
+          const filterProblems = await detectInvalidFilterName(node, (await filtersPromise) ?? []);
           if (filterProblems.length > 0) {
             filterProblems.forEach((problem) => context.report(problem));
           }