@platformos/liquid-html-parser 0.0.8 → 0.0.9

package/dist/stage-1-cst.d.ts

@@ -62,6 +62,7 @@ export declare enum ConcreteNodeTypes {
     Comparison = "Comparison",
     Condition = "Condition",
     AssignMarkup = "AssignMarkup",
+    AssignPushRhs = "AssignPushRhs",
     HashAssignMarkup = "HashAssignMarkup",
     ContentForMarkup = "ContentForMarkup",
     CycleMarkup = "CycleMarkup",
@@ -262,11 +263,15 @@ export interface ConcreteLiquidTagLiquid extends ConcreteLiquidTagNode<NamedTags
 export type ConcreteLiquidLiquidTagNode = ConcreteLiquidTagOpen | ConcreteLiquidTagClose | ConcreteLiquidTag | ConcreteLiquidRawTag;
 export interface ConcreteLiquidTagAssign extends ConcreteLiquidTagNode<NamedTags.assign, ConcreteLiquidTagAssignMarkup> {
 }
+export interface ConcreteLiquidTagAssignPushRhs extends ConcreteBasicNode<ConcreteNodeTypes.AssignPushRhs> {
+    pushSource: ConcreteLiquidVariable;
+    pushValue: ConcreteLiquidVariable;
+}
 export interface ConcreteLiquidTagAssignMarkup extends ConcreteBasicNode<ConcreteNodeTypes.AssignMarkup> {
     name: string;
     target: ConcreteLiquidVariableLookup;
     operator: string;
-    value: ConcreteLiquidVariable;
+    value: ConcreteLiquidVariable | ConcreteLiquidTagAssignPushRhs;
 }
 export interface ConcreteLiquidTagHashAssign extends ConcreteLiquidTagNode<NamedTags.hash_assign, ConcreteLiquidTagHashAssignMarkup> {
 }
@@ -416,7 +421,7 @@ export interface ConcreteLiquidFilter extends ConcreteBasicNode<ConcreteNodeType
 export type ConcreteLiquidArgument = ConcreteLiquidExpression | ConcreteLiquidNamedArgument;
 export interface ConcreteLiquidNamedArgument extends ConcreteBasicNode<ConcreteNodeTypes.NamedArgument> {
     name: string;
-    value: ConcreteLiquidExpression;
+    value: ConcreteLiquidExpression | ConcreteLiquidVariable;
 }
 export type ConcreteLiquidExpression = ConcreteStringLiteral | ConcreteNumberLiteral | ConcreteLiquidLiteral | ConcreteLiquidRange | ConcreteLiquidVariableLookup | ConcreteJsonHashLiteral | ConcreteJsonArrayLiteral;
 export type ConcreteComplexLiquidExpression = ConcreteLiquidBooleanExpression | ConcreteLiquidExpression;
@@ -452,7 +457,7 @@ export interface ConcreteJsonKeyValuePair extends ConcreteBasicNode<ConcreteNode
 export interface ConcreteJsonArrayLiteral extends ConcreteBasicNode<ConcreteNodeTypes.JsonArrayLiteral> {
     elements: ConcreteJsonValue[];
 }
-export type ConcreteJsonValue = ConcreteJsonHashLiteral | ConcreteJsonArrayLiteral | ConcreteLiquidExpression;
+export type ConcreteJsonValue = ConcreteJsonHashLiteral | ConcreteJsonArrayLiteral | ConcreteLiquidVariable | ConcreteLiquidExpression;
 export type ConcreteHtmlNode = ConcreteHtmlDoctype | ConcreteHtmlComment | ConcreteHtmlRawTag | ConcreteHtmlVoidElement | ConcreteHtmlSelfClosingElement | ConcreteHtmlTagOpen | ConcreteHtmlTagClose;
 export interface ConcreteTextNode extends ConcreteBasicNode<ConcreteNodeTypes.TextNode> {
     value: string;

package/dist/stage-1-cst.js

@@ -70,6 +70,7 @@ var ConcreteNodeTypes;
     ConcreteNodeTypes["Comparison"] = "Comparison";
     ConcreteNodeTypes["Condition"] = "Condition";
     ConcreteNodeTypes["AssignMarkup"] = "AssignMarkup";
+    ConcreteNodeTypes["AssignPushRhs"] = "AssignPushRhs";
     ConcreteNodeTypes["HashAssignMarkup"] = "HashAssignMarkup";
     ConcreteNodeTypes["ContentForMarkup"] = "ContentForMarkup";
     ConcreteNodeTypes["CycleMarkup"] = "CycleMarkup";
@@ -365,6 +366,26 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             source,
         },
         assignOperator: (node) => node.sourceString,
+        liquidAssignValue: 0,
+        liquidAssignPushExpr: {
+            type: ConcreteNodeTypes.AssignPushRhs,
+            // tokens: [pushSource, space*, "<<", space*, pushValue]
+            pushSource: 0,
+            pushValue: 4,
+            locStart,
+            locEnd,
+            source,
+        },
+        liquidAssignPushSource: {
+            type: ConcreteNodeTypes.LiquidVariable,
+            expression: 0,
+            filters: 1,
+            // No &delim lookahead at end (unlike liquidAssignVariable), so last token is space*
+            rawSource: (tokens) => source.slice(locStart(tokens), tokens[tokens.length - 1].source.endIdx).trimEnd(),
+            locStart,
+            locEnd,
+            source,
+        },
         liquidAssignVariable: {
             type: ConcreteNodeTypes.LiquidVariable,
             expression: 0,
@@ -407,6 +428,16 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             source,
         },
         liquidJsonValue: 0,
+        liquidJsonItemVariable: {
+            type: ConcreteNodeTypes.LiquidVariable,
+            expression: 0,
+            filters: 1,
+            // No &delim lookahead at end (unlike liquidVariable), so last token is space*
+            rawSource: (tokens) => source.slice(locStart(tokens), tokens[tokens.length - 1].source.endIdx).trimEnd(),
+            locStart,
+            locEnd,
+            source,
+        },
         liquidJsonSep: 1,
         liquidTagHashAssignMarkup: {
             type: ConcreteNodeTypes.HashAssignMarkup,
@@ -637,6 +668,23 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
                 }
             },
         },
+        // Same as liquidFilter but without trailing comma — used inside JSON values to avoid
+        // consuming JSON entry separator commas as trailing filter argument commas.
+        liquidJsonFilter: {
+            type: ConcreteNodeTypes.LiquidFilter,
+            name: 3,
+            locStart,
+            locEnd,
+            source,
+            args(nodes) {
+                if (nodes[7].sourceString === '') {
+                    return [];
+                }
+                else {
+                    return nodes[7].toAST(this.args.mapping);
+                }
+            },
+        },
         filterArguments: 0,
         arguments: 0,
         complexArguments: function (completeParams, _space1, _comma, _space2, incompleteParam) {
@@ -647,6 +695,8 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         },
         simpleArgument: 0,
         tagArguments: 0,
+        graphqlArguments: 0,
+        graphqlRenderArguments: 1,
         positionalArgument: 0,
         namedArgument: {
             type: ConcreteNodeTypes.NamedArgument,
@@ -656,6 +706,23 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             locEnd,
             source,
         },
+        graphqlNamedArgument: {
+            type: ConcreteNodeTypes.NamedArgument,
+            name: 0,
+            value: 4,
+            locStart,
+            locEnd,
+            source,
+        },
+        graphqlNamedArgumentValue: {
+            type: ConcreteNodeTypes.LiquidVariable,
+            expression: 0,
+            filters: 1,
+            rawSource: (tokens) => source.slice(locStart(tokens), locEnd(tokens)),
+            locStart,
+            locEnd,
+            source,
+        },
         liquidBooleanExpression(initialCondition, subsequentConditions) {
             const initialConditionAst = initialCondition.toAST(this.args.mapping);
             const subsequentConditionAsts = subsequentConditions.toAST(this.args.mapping);

package/dist/stage-2-ast.d.ts

@@ -35,7 +35,7 @@
 import { ConcreteAttributeNode, ConcreteHtmlTagClose, ConcreteLiquidTagClose, LiquidCST, LiquidHtmlCST, ConcreteLiquidLiteral } from './stage-1-cst';
 import { Comparators, NamedTags, NodeTypes, Position } from './types';
 /** The union type of all possible node types inside a LiquidHTML AST. */
-export type LiquidHtmlNode = DocumentNode | YAMLFrontmatter | LiquidNode | HtmlDoctype | HtmlNode | AttributeNode | LiquidVariable | ComplexLiquidExpression | LiquidFilter | LiquidNamedArgument | AssignMarkup | HashAssignMarkup | ContentForMarkup | CycleMarkup | ForMarkup | RenderMarkup | FunctionMarkup | GraphQLMarkup | GraphQLInlineMarkup | RawMarkup | RenderVariableExpression | RenderAliasExpression | LiquidLogicalExpression | LiquidComparison | TextNode | LiquidDocParamNode | LiquidDocExampleNode | LiquidDocPromptNode | LiquidDocDescriptionNode | JsonHashLiteral | JsonArrayLiteral | JsonKeyValuePair | BackgroundMarkup | BackgroundInlineMarkup | CacheMarkup | LogMarkup | SessionMarkup | ExportMarkup | RedirectToMarkup | IncludeFormMarkup | SpamProtectionMarkup;
+export type LiquidHtmlNode = DocumentNode | YAMLFrontmatter | LiquidNode | HtmlDoctype | HtmlNode | AttributeNode | LiquidVariable | ComplexLiquidExpression | LiquidFilter | LiquidNamedArgument | AssignMarkup | AssignPushRhs | HashAssignMarkup | ContentForMarkup | CycleMarkup | ForMarkup | RenderMarkup | FunctionMarkup | GraphQLMarkup | GraphQLInlineMarkup | RawMarkup | RenderVariableExpression | RenderAliasExpression | LiquidLogicalExpression | LiquidComparison | TextNode | LiquidDocParamNode | LiquidDocExampleNode | LiquidDocPromptNode | LiquidDocDescriptionNode | JsonHashLiteral | JsonArrayLiteral | JsonKeyValuePair | BackgroundMarkup | BackgroundInlineMarkup | CacheMarkup | LogMarkup | SessionMarkup | ExportMarkup | RedirectToMarkup | IncludeFormMarkup | SpamProtectionMarkup;
 /** The root node of all LiquidHTML ASTs. */
 export interface DocumentNode extends ASTNode<NodeTypes.Document> {
     children: LiquidHtmlNode[];
@@ -143,8 +143,15 @@ export interface AssignMarkup extends ASTNode<NodeTypes.AssignMarkup> {
     lookups: LiquidExpression[];
     /** '=' for assignment, '<<' for array append */
     operator: '=' | '<<';
-    /** the value of the variable that is being assigned */
-    value: LiquidVariable;
+    /** the value of the variable that is being assigned, or a push expression */
+    value: LiquidVariable | AssignPushRhs;
+}
+/** The RHS of an explicit push assign: `assign a = source << value` */
+export interface AssignPushRhs extends ASTNode<NodeTypes.AssignPushRhs> {
+    /** the source array to push into */
+    pushSource: LiquidVariable;
+    /** the value being pushed */
+    pushValue: LiquidVariable;
 }
 export interface LiquidTagHashAssign extends LiquidTagNode<NamedTags.hash_assign, HashAssignMarkup> {
 }
@@ -498,12 +505,15 @@ export interface LiquidFilter extends ASTNode<NodeTypes.LiquidFilter> {
 }
 /** Represents the union type of positional and named arguments */
 export type LiquidArgument = LiquidExpression | LiquidNamedArgument;
-/** Named arguments are the ones used in kwargs, such as `name: value` */
+/** Named arguments are the ones used in kwargs, such as `name: value` or `name: value | filter` */
 export interface LiquidNamedArgument extends ASTNode<NodeTypes.NamedArgument> {
     /** name: value */
     name: string;
-    /** name: value */
-    value: LiquidExpression;
+    /**
+     * For regular tags (render, function, for, etc.): a plain LiquidExpression (no filters).
+     * For graphql tags: a LiquidVariable which may include filters (e.g. `name: val | fetch: "key"`).
+     */
+    value: LiquidExpression | LiquidVariable;
 }
 export interface LiquidBooleanExpression extends ASTNode<NodeTypes.BooleanExpression> {
     condition: LiquidConditionalExpression;
@@ -553,11 +563,11 @@ export interface JsonHashLiteral extends ASTNode<NodeTypes.JsonHashLiteral> {
 /** Represents a key-value pair in a JSON hash literal */
 export interface JsonKeyValuePair extends ASTNode<NodeTypes.JsonKeyValuePair> {
     key: LiquidExpression;
-    value: LiquidExpression;
+    value: LiquidExpression | LiquidVariable;
 }
 /** Represents a JSON array literal [el1, el2, ...] */
 export interface JsonArrayLiteral extends ASTNode<NodeTypes.JsonArrayLiteral> {
-    elements: LiquidExpression[];
+    elements: (LiquidExpression | LiquidVariable)[];
 }
 /** The union type of all HTML nodes */
 export type HtmlNode = HtmlComment | HtmlElement | HtmlDanglingMarkerClose | HtmlVoidElement | HtmlSelfClosingElement | HtmlRawNode;

package/dist/stage-2-ast.js

@@ -898,12 +898,24 @@ function toUnnamedLiquidBranch(parentNode) {
     };
 }
 function toAssignMarkup(node) {
+    const value = node.value.type === stage_1_cst_1.ConcreteNodeTypes.AssignPushRhs
+        ? toAssignPushRhs(node.value)
+        : toLiquidVariable(node.value);
     return {
         type: types_1.NodeTypes.AssignMarkup,
         name: node.name,
         lookups: node.target.lookups.map(toExpression),
         operator: node.operator,
-        value: toLiquidVariable(node.value),
+        value,
+        position: position(node),
+        source: node.source,
+    };
+}
+function toAssignPushRhs(node) {
+    return {
+        type: types_1.NodeTypes.AssignPushRhs,
+        pushSource: toLiquidVariable(node.pushSource),
+        pushValue: toLiquidVariable(node.pushValue),
         position: position(node),
         source: node.source,
     };
@@ -1316,7 +1328,7 @@ function toExpression(node) {
         case stage_1_cst_1.ConcreteNodeTypes.JsonArrayLiteral: {
             return {
                 type: types_1.NodeTypes.JsonArrayLiteral,
-                elements: node.elements.map(toExpression),
+                elements: node.elements.map(toJsonValue),
                 position: position(node),
                 source: node.source,
             };
@@ -1326,11 +1338,17 @@ function toExpression(node) {
         }
     }
 }
+function toJsonValue(node) {
+    if (node.type === stage_1_cst_1.ConcreteNodeTypes.LiquidVariable) {
+        return toLiquidVariable(node);
+    }
+    return toExpression(node);
+}
 function toJsonKeyValuePair(node) {
     return {
         type: types_1.NodeTypes.JsonKeyValuePair,
         key: toExpression(node.key),
-        value: toExpression(node.value),
+        value: toJsonValue(node.value),
         position: position(node),
         source: node.source,
     };
@@ -1358,7 +1376,9 @@ function toNamedArgument(node) {
     return {
         type: types_1.NodeTypes.NamedArgument,
         name: node.name,
-        value: toExpression(node.value),
+        value: node.value.type === stage_1_cst_1.ConcreteNodeTypes.LiquidVariable
+            ? toLiquidVariable(node.value)
+            : toExpression(node.value),
         position: position(node),
         source: node.source,
     };

package/dist/types.d.ts

@@ -35,6 +35,7 @@ export declare enum NodeTypes {
     Comparison = "Comparison",
     LogicalExpression = "LogicalExpression",
     AssignMarkup = "AssignMarkup",
+    AssignPushRhs = "AssignPushRhs",
     HashAssignMarkup = "HashAssignMarkup",
     ContentForMarkup = "ContentForMarkup",
     CycleMarkup = "CycleMarkup",

package/dist/types.js

@@ -33,6 +33,7 @@ var NodeTypes;
     NodeTypes["Comparison"] = "Comparison";
     NodeTypes["LogicalExpression"] = "LogicalExpression";
     NodeTypes["AssignMarkup"] = "AssignMarkup";
+    NodeTypes["AssignPushRhs"] = "AssignPushRhs";
     NodeTypes["HashAssignMarkup"] = "HashAssignMarkup";
     NodeTypes["ContentForMarkup"] = "ContentForMarkup";
     NodeTypes["CycleMarkup"] = "CycleMarkup";

package/grammar/liquid-html.ohm

@@ -106,7 +106,7 @@ Liquid <: Helpers {
 
   liquidTagOpenGraphQL = liquidTagOpenRule<"graphql", liquidTagGraphQLInlineMarkup>
   // Use negative lookahead to exclude file-based syntax (with "=")
-  liquidTagGraphQLInlineMarkup = variableSegment ~(space* "=") renderArguments
+  liquidTagGraphQLInlineMarkup = variableSegment ~(space* "=") graphqlRenderArguments
 
   liquidTagOpen =
     | liquidTagOpenStrict
@@ -126,12 +126,21 @@ Liquid <: Helpers {
   liquidTagEchoMarkup = liquidVariable<delimTag>
 
   liquidTagAssign = liquidTagRule<"assign", liquidTagAssignMarkup>
-  liquidTagAssignMarkup = assignTarget<delimTag> space* assignOperator space* liquidAssignVariable<delimTag>
+  liquidTagAssignMarkup = assignTarget<delimTag> space* assignOperator space* liquidAssignValue<delimTag>
 
   // Assign-specific sub-rules
   assignTarget<delim> = variableSegment lookup<delim>*
   assignOperator = "<<" | "="
 
+  // The RHS of an assign: either an explicit push expression (source << value) or a regular value
+  liquidAssignValue<delim> = liquidAssignPushExpr<delim> | liquidAssignVariable<delim>
+
+  // Explicit push: assign a = source << value (equivalent to assign a << value when source is a)
+  liquidAssignPushExpr<delim> = liquidAssignPushSource<delim> space* "<<" space* liquidAssignVariable<delim>
+
+  // The source expression for a push (no &delim lookahead since "<<" follows)
+  liquidAssignPushSource<delim> = liquidAssignExpression<delim> liquidFilter<delim>* space*
+
   // Assign variable: like liquidVariable but expression allows JSON literals
   liquidAssignVariable<delim> = liquidAssignExpression<delim> liquidFilter<delim>* space* &delim
   liquidAssignExpression<delim> =
@@ -151,7 +160,16 @@ Liquid <: Helpers {
   liquidJsonValue<delim> =
     | liquidJsonHashLiteral<delim>
     | liquidJsonArrayLiteral<delim>
+    | liquidJsonItemVariable<delim>
     | liquidExpression<delim>
+  // Like liquidVariable but without &delim lookahead, so it works inside JSON structures.
+  // Requires at least one filter (liquidJsonFilter+) so plain expressions fall through to liquidExpression.
+  // Uses liquidJsonFilter (no trailing comma) instead of liquidFilter to avoid consuming the
+  // JSON entry separator comma (e.g. the "," in { "a": x | filter: arg, "b": y }).
+  liquidJsonItemVariable<delim> = liquidComplexExpression<delim> liquidJsonFilter<delim>+ space*
+  // Like liquidFilter but without the trailing (space* ",")? so commas between JSON entries
+  // are not consumed as trailing filter argument commas.
+  liquidJsonFilter<delim> = space* "|" space* identifier (space* ":" space* arguments<delim>)?
   liquidJsonSep = space* "," space*
 
   liquidTagHashAssign = liquidTagRule<"hash_assign", liquidTagHashAssignMarkup>
@@ -186,17 +204,17 @@ Liquid <: Helpers {
   liquidTagInclude = liquidTagRule<"include", liquidTagRenderMarkup>
   liquidTagRender = liquidTagRule<"render", liquidTagRenderMarkup>
   liquidTagRenderMarkup =
-    snippetExpression renderVariableExpression? renderAliasExpression? renderArguments
+    partialExpression renderVariableExpression? renderAliasExpression? renderArguments
 
   liquidTagFunction = liquidTagRule<"function", liquidTagFunctionMarkup>
-  liquidTagFunctionMarkup = variableSegment space* "=" space* snippetExpression renderArguments
+  liquidTagFunctionMarkup = variableSegment space* "=" space* partialExpression renderArguments
 
   liquidTagGraphQL = liquidTagRule<"graphql", liquidTagGraphQLMarkup>
-  liquidTagGraphQLMarkup = variableSegment space* "=" space* snippetExpression renderArguments
+  liquidTagGraphQLMarkup = variableSegment space* "=" space* partialExpression graphqlRenderArguments
 
   // platformos simple tags
   liquidTagBackground = liquidTagRule<"background", liquidTagBackgroundMarkup>
-  liquidTagBackgroundMarkup = variableSegment space* "=" space* snippetExpression renderArguments
+  liquidTagBackgroundMarkup = variableSegment space* "=" space* partialExpression renderArguments
 
   liquidTagOpenBackground = liquidTagOpenRule<"background", liquidTagBackgroundInlineMarkup>
   // Use negative lookahead to exclude file-based syntax (with "=")
@@ -243,7 +261,7 @@ Liquid <: Helpers {
   liquidTagRedirectToMarkup = liquidExpression<delimTag> renderArguments
 
   liquidTagIncludeForm = liquidTagRule<"include_form", liquidTagIncludeFormMarkup>
-  liquidTagIncludeFormMarkup = snippetExpression renderArguments
+  liquidTagIncludeFormMarkup = partialExpression renderArguments
 
   liquidTagSpamProtection = liquidTagRule<"spam_protection", liquidTagSpamProtectionMarkup>
   liquidTagSpamProtectionMarkup = liquidExpression<delimTag> renderArguments
@@ -260,7 +278,6 @@ Liquid <: Helpers {
 
   renderArguments = (argumentSeparatorOptionalComma tagArguments) (space* ",")? space*
   completionModeRenderArguments = (argumentSeparatorOptionalComma tagArguments) (space* ",")? space* (argumentSeparator? liquidVariableLookup<delimTag> space*)?
-  snippetExpression = liquidString<delimTag> | variableSegmentAsLookup
   partialExpression = liquidString<delimTag> | variableSegmentAsLookup
   renderVariableExpression = space+ ("for" | "with") space+ liquidExpression<delimTag>
   renderAliasExpression = space+ "as" space+ variableSegment
@@ -322,7 +339,7 @@ Liquid <: Helpers {
     | ">="
     | "<="
     | ">"
-    | "<")
+    | "<" ~"<")
     | ("contains" ~identifier)
 
   liquidDrop = "{{" "-"? space* liquidDropCases "-"? "}}"
@@ -420,6 +437,10 @@ Liquid <: Helpers {
   positionalArgument<delim> = liquidExpression<delim> ~(space* ":")
   namedArgument<delim> = variableSegment space* ":" space* liquidExpression<delim>
   tagArguments = listOf<namedArgument<delimTag>, argumentSeparatorOptionalComma>
+  graphqlArguments = listOf<graphqlNamedArgument, argumentSeparatorOptionalComma>
+  graphqlNamedArgument = variableSegment space* ":" space* graphqlNamedArgumentValue
+  graphqlNamedArgumentValue = liquidExpression<delimTag> liquidFilter<delimTag>*
+  graphqlRenderArguments = (argumentSeparatorOptionalComma graphqlArguments) (space* ",")? space*
   filterArguments<delim> =
     | complexArguments<delim>
     | simpleArgument<delim>
@@ -709,7 +730,7 @@ StrictLiquidHTML <: LiquidHTML {
 WithPlaceholderLiquid <: Liquid {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
-    snippetExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+    partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
   liquidDoc :=
@@ -721,7 +742,7 @@ WithPlaceholderLiquid <: Liquid {
 WithPlaceholderLiquidStatement <: LiquidStatement {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
-    snippetExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+    partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
   liquidDoc :=
@@ -733,7 +754,7 @@ WithPlaceholderLiquidStatement <: LiquidStatement {
 WithPlaceholderLiquidHTML <: LiquidHTML {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
-    snippetExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+    partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
   leadingTagNameTextNode := (letter | "█") (alnum | "-" | ":" | "█")*

package/grammar/liquid-html.ohm.js

@@ -106,7 +106,7 @@ Liquid <: Helpers {
 
   liquidTagOpenGraphQL = liquidTagOpenRule<"graphql", liquidTagGraphQLInlineMarkup>
   // Use negative lookahead to exclude file-based syntax (with "=")
-  liquidTagGraphQLInlineMarkup = variableSegment ~(space* "=") renderArguments
+  liquidTagGraphQLInlineMarkup = variableSegment ~(space* "=") graphqlRenderArguments
 
   liquidTagOpen =
     | liquidTagOpenStrict
@@ -126,12 +126,21 @@ Liquid <: Helpers {
   liquidTagEchoMarkup = liquidVariable<delimTag>
 
   liquidTagAssign = liquidTagRule<"assign", liquidTagAssignMarkup>
-  liquidTagAssignMarkup = assignTarget<delimTag> space* assignOperator space* liquidAssignVariable<delimTag>
+  liquidTagAssignMarkup = assignTarget<delimTag> space* assignOperator space* liquidAssignValue<delimTag>
 
   // Assign-specific sub-rules
   assignTarget<delim> = variableSegment lookup<delim>*
   assignOperator = "<<" | "="
 
+  // The RHS of an assign: either an explicit push expression (source << value) or a regular value
+  liquidAssignValue<delim> = liquidAssignPushExpr<delim> | liquidAssignVariable<delim>
+
+  // Explicit push: assign a = source << value (equivalent to assign a << value when source is a)
+  liquidAssignPushExpr<delim> = liquidAssignPushSource<delim> space* "<<" space* liquidAssignVariable<delim>
+
+  // The source expression for a push (no &delim lookahead since "<<" follows)
+  liquidAssignPushSource<delim> = liquidAssignExpression<delim> liquidFilter<delim>* space*
+
   // Assign variable: like liquidVariable but expression allows JSON literals
   liquidAssignVariable<delim> = liquidAssignExpression<delim> liquidFilter<delim>* space* &delim
   liquidAssignExpression<delim> =
@@ -151,7 +160,16 @@ Liquid <: Helpers {
   liquidJsonValue<delim> =
     | liquidJsonHashLiteral<delim>
     | liquidJsonArrayLiteral<delim>
+    | liquidJsonItemVariable<delim>
     | liquidExpression<delim>
+  // Like liquidVariable but without &delim lookahead, so it works inside JSON structures.
+  // Requires at least one filter (liquidJsonFilter+) so plain expressions fall through to liquidExpression.
+  // Uses liquidJsonFilter (no trailing comma) instead of liquidFilter to avoid consuming the
+  // JSON entry separator comma (e.g. the "," in { "a": x | filter: arg, "b": y }).
+  liquidJsonItemVariable<delim> = liquidComplexExpression<delim> liquidJsonFilter<delim>+ space*
+  // Like liquidFilter but without the trailing (space* ",")? so commas between JSON entries
+  // are not consumed as trailing filter argument commas.
+  liquidJsonFilter<delim> = space* "|" space* identifier (space* ":" space* arguments<delim>)?
   liquidJsonSep = space* "," space*
 
   liquidTagHashAssign = liquidTagRule<"hash_assign", liquidTagHashAssignMarkup>
@@ -192,7 +210,7 @@ Liquid <: Helpers {
   liquidTagFunctionMarkup = variableSegment space* "=" space* snippetExpression renderArguments
 
   liquidTagGraphQL = liquidTagRule<"graphql", liquidTagGraphQLMarkup>
-  liquidTagGraphQLMarkup = variableSegment space* "=" space* snippetExpression renderArguments
+  liquidTagGraphQLMarkup = variableSegment space* "=" space* snippetExpression graphqlRenderArguments
 
   // platformos simple tags
   liquidTagBackground = liquidTagRule<"background", liquidTagBackgroundMarkup>
@@ -322,7 +340,7 @@ Liquid <: Helpers {
     | ">="
     | "<="
     | ">"
-    | "<")
+    | "<" ~"<")
     | ("contains" ~identifier)
 
   liquidDrop = "{{" "-"? space* liquidDropCases "-"? "}}"
@@ -420,6 +438,10 @@ Liquid <: Helpers {
   positionalArgument<delim> = liquidExpression<delim> ~(space* ":")
   namedArgument<delim> = variableSegment space* ":" space* liquidExpression<delim>
   tagArguments = listOf<namedArgument<delimTag>, argumentSeparatorOptionalComma>
+  graphqlArguments = listOf<graphqlNamedArgument, argumentSeparatorOptionalComma>
+  graphqlNamedArgument = variableSegment space* ":" space* graphqlNamedArgumentValue
+  graphqlNamedArgumentValue = liquidExpression<delimTag> liquidFilter<delimTag>*
+  graphqlRenderArguments = (argumentSeparatorOptionalComma graphqlArguments) (space* ",")? space*
   filterArguments<delim> =
     | complexArguments<delim>
     | simpleArgument<delim>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformos/liquid-html-parser",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Liquid HTML parser for platformOS",
   "author": "platformOS",
   "homepage": "https://github.com/Platform-OS/platformos-tools/tree/master/packages/liquid-html-parser#readme",