Add content_for tag parser support + ValidContentForArguments check

Fixes #466
Shopify · Nov 8, 2024 · f80a511 · f80a511
1 parent 6af0983
commit f80a511
Show file tree

Hide file tree

Showing 29 changed files with 499 additions and 62 deletions.
diff --git a/.changeset/purple-pears-report.md b/.changeset/purple-pears-report.md
@@ -0,0 +1,7 @@
+---
+'@shopify/theme-check-browser': minor
+'@shopify/theme-check-common': minor
+'@shopify/theme-check-node': minor
+---
+
+Add the `ValidContentForArguments` check
diff --git a/.changeset/tasty-mugs-behave.md b/.changeset/tasty-mugs-behave.md
@@ -0,0 +1,7 @@
+---
+'@shopify/liquid-html-parser': minor
+'@shopify/prettier-plugin-liquid': minor
+'@shopify/theme-language-server-common': minor
+---
+
+Add support for the `content_for` Liquid tag
diff --git a/packages/liquid-html-parser/grammar/liquid-html.ohm b/packages/liquid-html-parser/grammar/liquid-html.ohm
@@ -50,6 +50,7 @@ Liquid <: Helpers {
     | liquidTagBreak
     | liquidTagContinue
     | liquidTagCycle
+    | liquidTagContentFor
     | liquidTagDecrement
     | liquidTagEcho
     | liquidTagElse
@@ -125,6 +126,11 @@ Liquid <: Helpers {
   liquidTagLiquid = liquidTagRule<"liquid", liquidTagLiquidMarkup>
   liquidTagLiquidMarkup = tagMarkup
 
+  liquidTagContentFor = liquidTagRule<"content_for", liquidTagContentForMarkup>
+  liquidTagContentForMarkup =
+    contentForType (argumentSeparatorOptionalComma tagArguments) (space* ",")? space*
+  contentForType = liquidString<delimTag>
+
   liquidTagInclude = liquidTagRule<"include", liquidTagRenderMarkup>
   liquidTagRender = liquidTagRule<"render", liquidTagRenderMarkup>
   liquidTagRenderMarkup =

diff --git a/packages/liquid-html-parser/src/stage-1-cst.spec.ts b/packages/liquid-html-parser/src/stage-1-cst.spec.ts
@@ -586,6 +586,45 @@ describe('Unit: Stage 1 (CST)', () => {
           expectPath(cst, '0.markup.expression.lookups').to.eql([]);
         }
       });
+
+      it('should parse content_for "blocks"', () => {
+        for (const { toCST, expectPath } of testCases) {
+          cst = toCST(`{% content_for "blocks" -%}`);
+          expectPath(cst, '0.type').to.equal('LiquidTag');
+          expectPath(cst, '0.name').to.equal('content_for');
+          expectPath(cst, '0.markup.type').to.equal('ContentForMarkup');
+          expectPath(cst, '0.markup.contentForType.type').to.equal('String');
+          expectPath(cst, '0.markup.contentForType.value').to.equal('blocks');
+          expectPath(cst, '0.markup.contentForType.single').to.equal(false);
+          expectPath(cst, '0.markup.args').to.have.lengthOf(0);
+          expectPath(cst, '0.whitespaceStart').to.equal(null);
+          expectPath(cst, '0.whitespaceEnd').to.equal('-');
+        }
+      });
+
+      it('should parse content_for "block", id: "my-id", type: "my-block"', () => {
+        for (const { toCST, expectPath } of testCases) {
+          cst = toCST(`{% content_for "block", id: "block-id", type: "block-type" -%}`);
+          expectPath(cst, '0.type').to.equal('LiquidTag');
+          expectPath(cst, '0.name').to.equal('content_for');
+          expectPath(cst, '0.markup.type').to.equal('ContentForMarkup');
+          expectPath(cst, '0.markup.contentForType.type').to.equal('String');
+          expectPath(cst, '0.markup.contentForType.value').to.equal('block');
+          expectPath(cst, '0.markup.contentForType.single').to.equal(false);
+          expectPath(cst, '0.markup.args').to.have.lengthOf(2);
+          const namedArguments = [
+            { name: 'id', valueType: 'String' },
+            { name: 'type', valueType: 'String' },
+          ];
+          namedArguments.forEach(({ name, valueType }, i) => {
+            expectPath(cst, `0.markup.args.${i}.type`).to.equal('NamedArgument');
+            expectPath(cst, `0.markup.args.${i}.name`).to.equal(name);
+            expectPath(cst, `0.markup.args.${i}.value.type`).to.equal(valueType);
+          });
+          expectPath(cst, '0.whitespaceStart').to.equal(null);
+          expectPath(cst, '0.whitespaceEnd').to.equal('-');
+        }
+      });
     });
 
     describe('Case: LiquidTagOpen', () => {

diff --git a/packages/liquid-html-parser/src/stage-1-cst.ts b/packages/liquid-html-parser/src/stage-1-cst.ts
@@ -75,6 +75,7 @@ export enum ConcreteNodeTypes {
   Condition = 'Condition',
 
   AssignMarkup = 'AssignMarkup',
+  ContentForMarkup = 'ContentForMarkup',
   CycleMarkup = 'CycleMarkup',
   ForMarkup = 'ForMarkup',
   RenderMarkup = 'RenderMarkup',
@@ -265,6 +266,7 @@ export type ConcreteLiquidTag = ConcreteLiquidTagNamed | ConcreteLiquidTagBaseCa
 export type ConcreteLiquidTagNamed =
   | ConcreteLiquidTagAssign
   | ConcreteLiquidTagCycle
+  | ConcreteLiquidTagContentFor
   | ConcreteLiquidTagEcho
   | ConcreteLiquidTagIncrement
   | ConcreteLiquidTagDecrement
@@ -321,11 +323,20 @@ export interface ConcreteLiquidTagCycleMarkup
   args: ConcreteLiquidExpression[];
 }
 
+export interface ConcreteLiquidTagContentFor
+  extends ConcreteLiquidTagNode<NamedTags.content_for, ConcreteLiquidTagContentForMarkup> {}
+
 export interface ConcreteLiquidTagRender
   extends ConcreteLiquidTagNode<NamedTags.render, ConcreteLiquidTagRenderMarkup> {}
 export interface ConcreteLiquidTagInclude
   extends ConcreteLiquidTagNode<NamedTags.include, ConcreteLiquidTagRenderMarkup> {}
 
+export interface ConcreteLiquidTagContentForMarkup
+  extends ConcreteBasicNode<ConcreteNodeTypes.ContentForMarkup> {
+  contentForType: ConcreteStringLiteral;
+  args: ConcreteLiquidNamedArgument[];
+}
+
 export interface ConcreteLiquidTagRenderMarkup
   extends ConcreteBasicNode<ConcreteNodeTypes.RenderMarkup> {
   snippet: ConcreteStringLiteral | ConcreteLiquidVariableLookup;
@@ -715,6 +726,7 @@ function toCST<T>(
     liquidTagBaseCase: 0,
     liquidTagAssign: 0,
     liquidTagEcho: 0,
+    liquidTagContentFor: 0,
     liquidTagCycle: 0,
     liquidTagIncrement: 0,
     liquidTagDecrement: 0,
@@ -775,6 +787,16 @@ function toCST<T>(
       source,
     },
 
+    liquidTagContentForMarkup: {
+      type: ConcreteNodeTypes.ContentForMarkup,
+      contentForType: 0,
+      args: 2,
+      locStart,
+      locEnd,
+      source,
+    },
+    contentForType: 0,
+
     liquidTagRenderMarkup: {
       type: ConcreteNodeTypes.RenderMarkup,
       snippet: 0,

diff --git a/packages/liquid-html-parser/src/stage-2-ast.spec.ts b/packages/liquid-html-parser/src/stage-2-ast.spec.ts
@@ -579,6 +579,47 @@ describe('Unit: Stage 2 (AST)', () => {
           });
         });
       });
+
+      describe('Case: content_for', () => {
+        it('should parse content_for tags with no arguments', () => {
+          for (const { toAST, expectPath, expectPosition } of testCases) {
+            ast = toAST(`{% content_for "blocks" %}`);
+            expectPath(ast, 'children.0.type').to.equal('LiquidTag');
+            expectPath(ast, 'children.0.name').to.equal('content_for');
+            expectPath(ast, 'children.0.markup.type').to.equal('ContentForMarkup');
+            expectPath(ast, 'children.0.markup.contentForType.type').to.equal('String');
+            expectPath(ast, 'children.0.markup.contentForType.value').to.equal('blocks');
+            expectPosition(ast, 'children.0');
+            expectPosition(ast, 'children.0.markup');
+          }
+        });
+
+        it('should parse content_for named expression arguments', () => {
+          for (const { toAST, expectPath, expectPosition } of testCases) {
+            ast = toAST(`{% content_for "snippet", s: 'string', n: 10, r: (1..2), v: variable %}`);
+            expectPath(ast, 'children.0.type').to.equal('LiquidTag');
+            expectPath(ast, 'children.0.name').to.equal('content_for');
+            expectPath(ast, 'children.0.markup.type').to.equal('ContentForMarkup');
+            expectPath(ast, 'children.0.markup.contentForType.type').to.equal('String');
+            expectPath(ast, 'children.0.markup.contentForType.value').to.equal('snippet');
+            expectPath(ast, 'children.0.markup.args').to.have.lengthOf(4);
+            expectPath(ast, 'children.0.markup.args.0.type').to.equal('NamedArgument');
+            expectPath(ast, 'children.0.markup.args.0.name').to.equal('s');
+            expectPath(ast, 'children.0.markup.args.0.value.type').to.equal('String');
+            expectPath(ast, 'children.0.markup.args.1.type').to.equal('NamedArgument');
+            expectPath(ast, 'children.0.markup.args.1.name').to.equal('n');
+            expectPath(ast, 'children.0.markup.args.1.value.type').to.equal('Number');
+            expectPath(ast, 'children.0.markup.args.2.type').to.equal('NamedArgument');
+            expectPath(ast, 'children.0.markup.args.2.name').to.equal('r');
+            expectPath(ast, 'children.0.markup.args.2.value.type').to.equal('Range');
+            expectPath(ast, 'children.0.markup.args.3.type').to.equal('NamedArgument');
+            expectPath(ast, 'children.0.markup.args.3.name').to.equal('v');
+            expectPath(ast, 'children.0.markup.args.3.value.type').to.equal('VariableLookup');
+            expectPosition(ast, 'children.0');
+            expectPosition(ast, 'children.0.markup');
+          }
+        });
+      });
     });
 
     it(`should parse liquid inline comments`, () => {

diff --git a/packages/liquid-html-parser/src/stage-2-ast.ts b/packages/liquid-html-parser/src/stage-2-ast.ts
@@ -72,6 +72,7 @@ import {
   ConcreteLiquidRawTag,
   LiquidHtmlConcreteNode,
   ConcreteLiquidTagBaseCase,
+  ConcreteLiquidTagContentForMarkup,
 } from './stage-1-cst';
 import { Comparators, NamedTags, NodeTypes, nonTraversableProperties, Position } from './types';
 import { assertNever, deepGet, dropLast } from './utils';
@@ -97,6 +98,7 @@ export type LiquidHtmlNode =
   | LiquidFilter
   | LiquidNamedArgument
   | AssignMarkup
+  | ContentForMarkup
   | CycleMarkup
   | ForMarkup
   | RenderMarkup
@@ -188,6 +190,7 @@ export type LiquidTagNamed =
   | LiquidTagAssign
   | LiquidTagCase
   | LiquidTagCapture
+  | LiquidTagContentFor
   | LiquidTagCycle
   | LiquidTagDecrement
   | LiquidTagEcho
@@ -359,6 +362,10 @@ export interface PaginateMarkup extends ASTNode<NodeTypes.PaginateMarkup> {
   args: LiquidNamedArgument[];
 }
 
+/** https://shopify.dev/docs/api/liquid/tags#content_for */
+export interface LiquidTagContentFor
+  extends LiquidTagNode<NamedTags.content_for, ContentForMarkup> {}
+
 /** https://shopify.dev/docs/api/liquid/tags#render */
 export interface LiquidTagRender extends LiquidTagNode<NamedTags.render, RenderMarkup> {}
 
@@ -377,6 +384,14 @@ export interface LiquidTagLayout extends LiquidTagNode<NamedTags.layout, LiquidE
 /** https://shopify.dev/docs/api/liquid/tags#liquid */
 export interface LiquidTagLiquid extends LiquidTagNode<NamedTags.liquid, LiquidStatement[]> {}
 
+/** {% content_for 'contentForType' [...namedArguments] %} */
+export interface ContentForMarkup extends ASTNode<NodeTypes.ContentForMarkup> {
+  /** {% content_for 'contentForType' %} */
+  contentForType: LiquidString;
+  /** {% content_for 'contentForType', arg1: value1, arg2: value2 %} */
+  args: LiquidNamedArgument[];
+}
+
 /** {% render 'snippet' [(with|for) variable [as alias]], [...namedArguments] %} */
 export interface RenderMarkup extends ASTNode<NodeTypes.RenderMarkup> {
   /** {% render snippet %} */
@@ -1408,6 +1423,14 @@ function toNamedLiquidTag(
       };
     }
 
+    case NamedTags.content_for: {
+      return {
+        ...liquidTagBaseAttributes(node),
+        name: node.name,
+        markup: toContentForMarkup(node.markup),
+      };
+    }
+
     case NamedTags.include:
     case NamedTags.render: {
       return {
@@ -1684,6 +1707,16 @@ function toRawMarkupKindFromLiquidNode(node: ConcreteLiquidRawTag): RawMarkupKin
   }
 }
 
+function toContentForMarkup(node: ConcreteLiquidTagContentForMarkup): ContentForMarkup {
+  return {
+    type: NodeTypes.ContentForMarkup,
+    contentForType: toExpression(node.contentForType) as LiquidString,
+    args: node.args.map(toNamedArgument),
+    position: position(node),
+    source: node.source,
+  };
+}
+
 function toRenderMarkup(node: ConcreteLiquidTagRenderMarkup): RenderMarkup {
   return {
     type: NodeTypes.RenderMarkup,

diff --git a/packages/liquid-html-parser/src/types.ts b/packages/liquid-html-parser/src/types.ts
@@ -37,6 +37,7 @@ export enum NodeTypes {
   LogicalExpression = 'LogicalExpression',
 
   AssignMarkup = 'AssignMarkup',
+  ContentForMarkup = 'ContentForMarkup',
   CycleMarkup = 'CycleMarkup',
   ForMarkup = 'ForMarkup',
   PaginateMarkup = 'PaginateMarkup',
@@ -50,6 +51,7 @@ export enum NamedTags {
   assign = 'assign',
   capture = 'capture',
   case = 'case',
+  content_for = 'content_for',
   cycle = 'cycle',
   decrement = 'decrement',
   echo = 'echo',

diff --git a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-css-properties.ts b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-css-properties.ts
@@ -121,6 +121,7 @@ function getCssDisplay(node: AugmentedNode<WithSiblings>, options: LiquidParserO
     case NodeTypes.VariableLookup:
     case NodeTypes.AssignMarkup:
     case NodeTypes.CycleMarkup:
+    case NodeTypes.ContentForMarkup:
     case NodeTypes.ForMarkup:
     case NodeTypes.PaginateMarkup:
     case NodeTypes.RenderMarkup:
@@ -225,6 +226,7 @@ function getNodeCssStyleWhiteSpace(
     case NodeTypes.VariableLookup:
     case NodeTypes.AssignMarkup:
     case NodeTypes.CycleMarkup:
+    case NodeTypes.ContentForMarkup:
     case NodeTypes.ForMarkup:
     case NodeTypes.PaginateMarkup:
     case NodeTypes.RenderMarkup:

diff --git a/packages/prettier-plugin-liquid/src/printer/print/liquid.ts b/packages/prettier-plugin-liquid/src/printer/print/liquid.ts
@@ -165,6 +165,12 @@ function printNamedLiquidBlockStart(
       ]);
     }
 
+    case NamedTags.content_for: {
+      const markup = node.markup;
+      const trailingWhitespace = markup.args.length > 0 ? line : ' ';
+      return tag(trailingWhitespace);
+    }
+
     case NamedTags.include:
     case NamedTags.render: {
       const markup = node.markup;

diff --git a/packages/prettier-plugin-liquid/src/printer/printer-liquid-html.ts b/packages/prettier-plugin-liquid/src/printer/printer-liquid-html.ts
@@ -378,6 +378,23 @@ function printNode(
       return doc;
     }
 
+    case NodeTypes.ContentForMarkup: {
+      const contentForType = path.call((p: any) => print(p), 'contentForType');
+      const doc: Doc = [contentForType];
+      if (node.args.length > 0) {
+        doc.push(
+          ',',
+          line,
+          join(
+            [',', line],
+            path.map((p) => print(p), 'args'),
+          ),
+        );
+      }
+
+      return doc;
+    }
+
     case NodeTypes.RenderMarkup: {
       const snippet = path.call((p: any) => print(p), 'snippet');
       const doc: Doc = [snippet];

diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-content-for/fixed.liquid b/packages/prettier-plugin-liquid/src/test/liquid-tag-content-for/fixed.liquid
@@ -0,0 +1,21 @@
+It should never break a name
+printWidth: 1
+{% content_for 'block' %}
+{%- content_for 'blocks' -%}
+
+It should break on named args
+printWidth: 1
+{% content_for 'block',
+  key1: val1,
+  key2: (0..1)
+%}
+
+It should not require commas (as per syntax) but add them when pretty printed
+{% content_for 'block', key1: val1, key2: (0..1) %}
+
+It should not require spaces (as per syntax) but add them when pretty printed
+{% content_for 'block', key1: val1, key2: (0..1) %}
+
+It should strip trailing commas by default
+{% content_for 'foo' %}
+{% content_for 'foo', product: product %}
diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-content-for/index.liquid b/packages/prettier-plugin-liquid/src/test/liquid-tag-content-for/index.liquid
@@ -0,0 +1,18 @@
+It should never break a name
+printWidth: 1
+{% content_for "block" %}
+{%- content_for "blocks" -%}
+
+It should break on named args
+printWidth: 1
+{% content_for "block", key1: val1, key2: (0..1) %}
+
+It should not require commas (as per syntax) but add them when pretty printed
+{% content_for "block" key1: val1 key2: (0..1) %}
+
+It should not require spaces (as per syntax) but add them when pretty printed
+{%content_for "block",key1:val1,key2:(0..1)%}
+
+It should strip trailing commas by default
+{% content_for "foo", %}
+{% content_for "foo",product:product, %}
diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-content-for/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-content-for/index.spec.ts
@@ -0,0 +1,6 @@
+import { test } from 'vitest';
+import { assertFormattedEqualsFixed } from '../test-helpers';
+
+test('Unit: liquid-tag-content-for', async () => {
+  await assertFormattedEqualsFixed(__dirname);
+});