@platformos/liquid-html-parser 0.0.15 → 0.0.16

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

@@ -63,7 +63,6 @@ export declare enum ConcreteNodeTypes {
     Comparison = "Comparison",
     Condition = "Condition",
     AssignMarkup = "AssignMarkup",
-    AssignPushRhs = "AssignPushRhs",
     HashAssignMarkup = "HashAssignMarkup",
     ContentForMarkup = "ContentForMarkup",
     CycleMarkup = "CycleMarkup",
@@ -267,15 +266,11 @@ 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 | ConcreteLiquidTagAssignPushRhs;
+    value: ConcreteLiquidVariable;
 }
 export interface ConcreteLiquidTagHashAssign extends ConcreteLiquidTagNode<NamedTags.hash_assign, ConcreteLiquidTagHashAssignMarkup> {
 }

package/dist/stage-1-cst.js

@@ -71,7 +71,6 @@ var ConcreteNodeTypes;
     ConcreteNodeTypes["Comparison"] = "Comparison";
     ConcreteNodeTypes["Condition"] = "Condition";
     ConcreteNodeTypes["AssignMarkup"] = "AssignMarkup";
-    ConcreteNodeTypes["AssignPushRhs"] = "AssignPushRhs";
     ConcreteNodeTypes["HashAssignMarkup"] = "HashAssignMarkup";
     ConcreteNodeTypes["ContentForMarkup"] = "ContentForMarkup";
     ConcreteNodeTypes["CycleMarkup"] = "CycleMarkup";
@@ -368,25 +367,6 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         },
         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,
@@ -633,6 +613,8 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         liquidTagResponseHeadersMarkup: 0,
         liquidTagRollback: 0,
         renderArguments: 1,
+        functionRenderArguments: 1,
+        functionTagArguments: 0,
         completionModeRenderArguments: function (_0, namedArguments, _2, _3, _4, _5, variableLookup, _7) {
             const self = this;
             // variableLookup.sourceString can be '' when there are no incomplete params
@@ -726,6 +708,9 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         tagArguments: 0,
         graphqlArguments: 0,
         graphqlRenderArguments: 1,
+        // Pass-through: delegates to whichever alternative matched (liquidJsonHashLiteral,
+        // liquidJsonArrayLiteral, or liquidExpression). Index 0 = first (and only) child.
+        liquidExpressionOrJsonLiteral: 0,
         positionalArgument: 0,
         namedArgument: {
             type: ConcreteNodeTypes.NamedArgument,
@@ -736,6 +721,9 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             source,
         },
         namedArgumentValue: 0,
+        // Handles nested key:value pairs within a named argument value, e.g. `filter: type: "string"`.
+        // Only fires when the namedArgumentValue starts with `identifier:`.
+        // Produces a NamedArgument so linters can inspect the nested pair.
         hashPairValue: {
             type: ConcreteNodeTypes.NamedArgument,
             name: 0,
@@ -799,7 +787,9 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         liquidDoubleQuotedString: {
             type: ConcreteNodeTypes.String,
             single: () => false,
-            value: 1,
+            // body is an iteration node (strings now support `\X` escape pairs); use
+            // `.sourceString` to get the raw text between quotes.
+            value: (tokens) => tokens[1].sourceString,
             locStart,
             locEnd,
             source,
@@ -807,7 +797,7 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         liquidSingleQuotedString: {
             type: ConcreteNodeTypes.String,
             single: () => true,
-            value: 1,
+            value: (tokens) => tokens[1].sourceString,
             locStart,
             locEnd,
             source,

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 | 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;
+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;
 /** The root node of all LiquidHTML ASTs. */
 export interface DocumentNode extends ASTNode<NodeTypes.Document> {
     children: LiquidHtmlNode[];
@@ -143,15 +143,8 @@ export interface AssignMarkup extends ASTNode<NodeTypes.AssignMarkup> {
     lookups: LiquidExpression[];
     /** '=' for assignment, '<<' for array append */
     operator: '=' | '<<';
-    /** 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;
+    /** the value of the variable that is being assigned */
+    value: LiquidVariable;
 }
 export interface LiquidTagHashAssign extends LiquidTagNode<NamedTags.hash_assign, HashAssignMarkup> {
 }

package/dist/stage-2-ast.js

@@ -913,24 +913,12 @@ 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,
-        position: position(node),
-        source: node.source,
-    };
-}
-function toAssignPushRhs(node) {
-    return {
-        type: types_1.NodeTypes.AssignPushRhs,
-        pushSource: toLiquidVariable(node.pushSource),
-        pushValue: toLiquidVariable(node.pushValue),
+        value: toLiquidVariable(node.value),
         position: position(node),
         source: node.source,
     };

package/dist/types.d.ts

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

package/dist/types.js

@@ -34,7 +34,6 @@ 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

@@ -130,16 +130,14 @@ Liquid <: Helpers {
 
   // Assign-specific sub-rules
   assignTarget<delim> = variableSegment lookup<delim>*
+  // Only one operator per assign: either `=` (regular assignment) or `<<` (push).
+  // The two forms are mutually exclusive — `{% assign a << "item" %}` pushes onto `a`,
+  // and `{% assign a = value %}` assigns to `a`. A compound shape like
+  // `{% assign a = b << c %}` is INVALID per the platformOS runtime.
   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*
+  // The RHS of an assign: a regular value (expression + optional filters).
+  liquidAssignValue<delim> = liquidAssignVariable<delim>
 
   // Assign variable: like liquidVariable but expression allows JSON literals
   liquidAssignVariable<delim> = liquidAssignExpression<delim> liquidFilter<delim>* space* &delim
@@ -148,7 +146,7 @@ Liquid <: Helpers {
     | liquidJsonArrayLiteral<delim>
     | liquidComplexExpression<delim>
 
-  // JSON literal rules (assign-only, recursive)
+  // JSON literal rules (assign, return, and named argument values; recursive)
   liquidJsonHashLiteral<delim> =
     "{" space* listOf<liquidJsonKeyValue<delim>, liquidJsonSep> space* "}"
   liquidJsonKeyValue<delim> =
@@ -415,8 +413,17 @@ Liquid <: Helpers {
   booleanExpressionCondition<delim> = comparison<delim> | liquidExpression<delim>
 
   liquidString<delim> = liquidSingleQuotedString<delim> | liquidDoubleQuotedString<delim>
-  liquidSingleQuotedString<delim> = "'" anyExceptStar<("'"| delim)> "'"
-  liquidDoubleQuotedString<delim> = "\"" anyExceptStar<("\""| delim)> "\""
+  // Strings support backslash-X escape pairs (any character after a backslash is
+  // consumed as part of the string). This matches the platformOS runtime, which parses
+  // hash/array literal string values with Ruby's JSON library — so an escaped quote or
+  // an escaped backslash is valid inside a double-quoted string.
+  liquidSingleQuotedString<delim> = "'" liquidSingleQuotedStringBody<delim> "'"
+  liquidDoubleQuotedString<delim> = "\"" liquidDoubleQuotedStringBody<delim> "\""
+  liquidSingleQuotedStringBody<delim> = (liquidStringEscape | liquidSingleQuotedStringChar<delim>)*
+  liquidDoubleQuotedStringBody<delim> = (liquidStringEscape | liquidDoubleQuotedStringChar<delim>)*
+  liquidSingleQuotedStringChar<delim> = ~("'" | delim) any
+  liquidDoubleQuotedStringChar<delim> = ~("\"" | delim) any
+  liquidStringEscape = "\\" any
 
   liquidNumber = liquidFloat | liquidInteger
   liquidInteger = "-"? digit+
@@ -449,9 +456,18 @@ Liquid <: Helpers {
   arguments<delim> = nonemptyOrderedListOf<positionalArgument<delim>, namedArgument<delim>, argumentSeparator>
   argumentSeparator = space* "," space*
   argumentSeparatorOptionalComma = space* ","? space*
-  positionalArgument<delim> = liquidExpression<delim> ~(space* ":")
+  // liquidExpressionOrJsonLiteral: used in argument value positions where JSON hash/array
+  // literals are accepted (named args, filter positional args). Does NOT extend liquidExpression
+  // itself so that {{ ["x"] }} drop expressions are still parsed as VariableLookup (empty lookup).
+  liquidExpressionOrJsonLiteral<delim> = liquidJsonHashLiteral<delim> | liquidJsonArrayLiteral<delim> | liquidExpression<delim>
+  positionalArgument<delim> = liquidExpressionOrJsonLiteral<delim> ~(space* ":")
   namedArgument<delim> = variableSegment space* ":" space* namedArgumentValue<delim>
-  namedArgumentValue<delim> = hashPairValue<delim> | liquidExpression<delim>
+  namedArgumentValue<delim> = hashPairValue<delim> | liquidExpressionOrJsonLiteral<delim>
+  // hashPairValue handles nested key:value pairs within a named argument value, e.g.
+  //   {% function res = 'path', filter: type: "string" %}
+  // where `type: "string"` is the hashPairValue. Only fires when the value starts with
+  // `identifier:` — otherwise namedArgumentValue falls through to liquidExpressionOrJsonLiteral.
+  // Produces a NamedArgument node so linters can inspect nested argument pairs.
   hashPairValue<delim> = variableSegment space* ":" space* liquidExpression<delim>
   tagArguments = listOf<namedArgument<delimTag>, argumentSeparatorOptionalComma>
   graphqlArguments = listOf<graphqlNamedArgument, argumentSeparatorOptionalComma>
@@ -574,10 +590,11 @@ LiquidStatement <: Liquid {
 
   // Override string rules so that '#' inside string content is never mistaken for a
   // delimTag inline-comment marker. In LiquidStatement, delimTag includes `# ...` which
-  // would otherwise cause anyExceptStar<delim> to stop inside strings like '##label##'.
-  // Strings in liquid blocks end at the matching quote or at a newline (no multi-line strings).
-  liquidSingleQuotedString<delim> := "'" anyExceptStar<("'" | newline | end)> "'"
-  liquidDoubleQuotedString<delim> := "\"" anyExceptStar<("\"" | newline | end)> "\""
+  // would otherwise cause the body rule to stop inside strings like '##label##'.
+  // Strings in liquid blocks end at the matching quote or at a newline (no multi-line
+  // strings), but still support `\X` escape pairs.
+  liquidSingleQuotedStringChar<delim> := ~("'" | newline | end) any
+  liquidDoubleQuotedStringChar<delim> := ~("\"" | newline | end) any
 
   // trailing whitespace, newline, + optional leading `;` and `# comment` before the next tag
   statementSep = space* ";"? space* ("#" (~newline any)*)? newline (space | newline)*
@@ -585,6 +602,27 @@ LiquidStatement <: Liquid {
   // delimTag is used as &delim lookahead in expression rules; it must succeed before `;` and `#`
   liquidStatementEnd = ";"? space* ("#" (~newline any)*)? (newline | end)
   delimTag := liquidStatementEnd
+
+  // Allow newlines inside hash/array literals within {% liquid %} blocks.
+  // The base Liquid grammar restricts `space` to horizontal whitespace only, but hash/array
+  // literals written across multiple lines need to match newlines between `{`/`[` and entries,
+  // between entries (around commas), and between the last entry and the closing `}`/`]`.
+  liquidJsonSep := (space | newline)* "," (space | newline)*
+  liquidJsonHashLiteral<delim> := "{" (space | newline)* listOf<liquidJsonKeyValue<delim>, liquidJsonSep> (space | newline)* "}"
+  liquidJsonArrayLiteral<delim> := "[" (space | newline)* listOf<liquidJsonValue<delim>, liquidJsonSep> (space | newline)* "]"
+
+  // Only the function tag supports multi-line named arguments in {% liquid %} blocks.
+  // render, include, and other tags use the base argumentSeparatorOptionalComma (horizontal-
+  // only), which prevents their argument lists from spanning lines. Function uses a dedicated
+  // separator that allows newlines ONLY after a comma, preventing the next statement from
+  // being swallowed as an argument when no comma is present.
+  //
+  // Both alternatives have 3 components (space, comma, space) to match each other's arity,
+  // ensuring consistent visitor child indexing.
+  functionArgumentSeparatorOptionalComma = space* "," (space | newline)* | space* ","? space*
+  functionTagArguments = listOf<namedArgument<delimTag>, functionArgumentSeparatorOptionalComma>
+  functionRenderArguments = (functionArgumentSeparatorOptionalComma functionTagArguments) (space* ",")? space*
+  liquidTagFunctionMarkup := liquidVariableLookup<delimTag> space* "=" space* partialExpression functionRenderArguments liquidFilter<delimTag>* space*
 }
 
 LiquidDoc <: Helpers {

package/grammar/liquid-html.ohm.js

@@ -130,16 +130,14 @@ Liquid <: Helpers {
 
   // Assign-specific sub-rules
   assignTarget<delim> = variableSegment lookup<delim>*
+  // Only one operator per assign: either ${"`"}=${"`"} (regular assignment) or ${"`"}<<${"`"} (push).
+  // The two forms are mutually exclusive — ${"`"}{% assign a << "item" %}${"`"} pushes onto ${"`"}a${"`"},
+  // and ${"`"}{% assign a = value %}${"`"} assigns to ${"`"}a${"`"}. A compound shape like
+  // ${"`"}{% assign a = b << c %}${"`"} is INVALID per the platformOS runtime.
   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*
+  // The RHS of an assign: a regular value (expression + optional filters).
+  liquidAssignValue<delim> = liquidAssignVariable<delim>
 
   // Assign variable: like liquidVariable but expression allows JSON literals
   liquidAssignVariable<delim> = liquidAssignExpression<delim> liquidFilter<delim>* space* &delim
@@ -148,7 +146,7 @@ Liquid <: Helpers {
     | liquidJsonArrayLiteral<delim>
     | liquidComplexExpression<delim>
 
-  // JSON literal rules (assign-only, recursive)
+  // JSON literal rules (assign, return, and named argument values; recursive)
   liquidJsonHashLiteral<delim> =
     "{" space* listOf<liquidJsonKeyValue<delim>, liquidJsonSep> space* "}"
   liquidJsonKeyValue<delim> =
@@ -415,8 +413,17 @@ Liquid <: Helpers {
   booleanExpressionCondition<delim> = comparison<delim> | liquidExpression<delim>
 
   liquidString<delim> = liquidSingleQuotedString<delim> | liquidDoubleQuotedString<delim>
-  liquidSingleQuotedString<delim> = "'" anyExceptStar<("'"| delim)> "'"
-  liquidDoubleQuotedString<delim> = "\"" anyExceptStar<("\""| delim)> "\""
+  // Strings support backslash-X escape pairs (any character after a backslash is
+  // consumed as part of the string). This matches the platformOS runtime, which parses
+  // hash/array literal string values with Ruby's JSON library — so an escaped quote or
+  // an escaped backslash is valid inside a double-quoted string.
+  liquidSingleQuotedString<delim> = "'" liquidSingleQuotedStringBody<delim> "'"
+  liquidDoubleQuotedString<delim> = "\"" liquidDoubleQuotedStringBody<delim> "\""
+  liquidSingleQuotedStringBody<delim> = (liquidStringEscape | liquidSingleQuotedStringChar<delim>)*
+  liquidDoubleQuotedStringBody<delim> = (liquidStringEscape | liquidDoubleQuotedStringChar<delim>)*
+  liquidSingleQuotedStringChar<delim> = ~("'" | delim) any
+  liquidDoubleQuotedStringChar<delim> = ~("\"" | delim) any
+  liquidStringEscape = "\\" any
 
   liquidNumber = liquidFloat | liquidInteger
   liquidInteger = "-"? digit+
@@ -449,9 +456,18 @@ Liquid <: Helpers {
   arguments<delim> = nonemptyOrderedListOf<positionalArgument<delim>, namedArgument<delim>, argumentSeparator>
   argumentSeparator = space* "," space*
   argumentSeparatorOptionalComma = space* ","? space*
-  positionalArgument<delim> = liquidExpression<delim> ~(space* ":")
+  // liquidExpressionOrJsonLiteral: used in argument value positions where JSON hash/array
+  // literals are accepted (named args, filter positional args). Does NOT extend liquidExpression
+  // itself so that {{ ["x"] }} drop expressions are still parsed as VariableLookup (empty lookup).
+  liquidExpressionOrJsonLiteral<delim> = liquidJsonHashLiteral<delim> | liquidJsonArrayLiteral<delim> | liquidExpression<delim>
+  positionalArgument<delim> = liquidExpressionOrJsonLiteral<delim> ~(space* ":")
   namedArgument<delim> = variableSegment space* ":" space* namedArgumentValue<delim>
-  namedArgumentValue<delim> = hashPairValue<delim> | liquidExpression<delim>
+  namedArgumentValue<delim> = hashPairValue<delim> | liquidExpressionOrJsonLiteral<delim>
+  // hashPairValue handles nested key:value pairs within a named argument value, e.g.
+  //   {% function res = 'path', filter: type: "string" %}
+  // where ${"`"}type: "string"${"`"} is the hashPairValue. Only fires when the value starts with
+  // ${"`"}identifier:${"`"} — otherwise namedArgumentValue falls through to liquidExpressionOrJsonLiteral.
+  // Produces a NamedArgument node so linters can inspect nested argument pairs.
   hashPairValue<delim> = variableSegment space* ":" space* liquidExpression<delim>
   tagArguments = listOf<namedArgument<delimTag>, argumentSeparatorOptionalComma>
   graphqlArguments = listOf<graphqlNamedArgument, argumentSeparatorOptionalComma>
@@ -574,10 +590,11 @@ LiquidStatement <: Liquid {
 
   // Override string rules so that '#' inside string content is never mistaken for a
   // delimTag inline-comment marker. In LiquidStatement, delimTag includes ${"`"}# ...${"`"} which
-  // would otherwise cause anyExceptStar<delim> to stop inside strings like '##label##'.
-  // Strings in liquid blocks end at the matching quote or at a newline (no multi-line strings).
-  liquidSingleQuotedString<delim> := "'" anyExceptStar<("'" | newline | end)> "'"
-  liquidDoubleQuotedString<delim> := "\"" anyExceptStar<("\"" | newline | end)> "\""
+  // would otherwise cause the body rule to stop inside strings like '##label##'.
+  // Strings in liquid blocks end at the matching quote or at a newline (no multi-line
+  // strings), but still support ${"`"}\X${"`"} escape pairs.
+  liquidSingleQuotedStringChar<delim> := ~("'" | newline | end) any
+  liquidDoubleQuotedStringChar<delim> := ~("\"" | newline | end) any
 
   // trailing whitespace, newline, + optional leading ${"`"};${"`"} and ${"`"}# comment${"`"} before the next tag
   statementSep = space* ";"? space* ("#" (~newline any)*)? newline (space | newline)*
@@ -585,6 +602,27 @@ LiquidStatement <: Liquid {
   // delimTag is used as &delim lookahead in expression rules; it must succeed before ${"`"};${"`"} and ${"`"}#${"`"}
   liquidStatementEnd = ";"? space* ("#" (~newline any)*)? (newline | end)
   delimTag := liquidStatementEnd
+
+  // Allow newlines inside hash/array literals within {% liquid %} blocks.
+  // The base Liquid grammar restricts ${"`"}space${"`"} to horizontal whitespace only, but hash/array
+  // literals written across multiple lines need to match newlines between ${"`"}{${"`"}/${"`"}[${"`"} and entries,
+  // between entries (around commas), and between the last entry and the closing ${"`"}}${"`"}/${"`"}]${"`"}.
+  liquidJsonSep := (space | newline)* "," (space | newline)*
+  liquidJsonHashLiteral<delim> := "{" (space | newline)* listOf<liquidJsonKeyValue<delim>, liquidJsonSep> (space | newline)* "}"
+  liquidJsonArrayLiteral<delim> := "[" (space | newline)* listOf<liquidJsonValue<delim>, liquidJsonSep> (space | newline)* "]"
+
+  // Only the function tag supports multi-line named arguments in {% liquid %} blocks.
+  // render, include, and other tags use the base argumentSeparatorOptionalComma (horizontal-
+  // only), which prevents their argument lists from spanning lines. Function uses a dedicated
+  // separator that allows newlines ONLY after a comma, preventing the next statement from
+  // being swallowed as an argument when no comma is present.
+  //
+  // Both alternatives have 3 components (space, comma, space) to match each other's arity,
+  // ensuring consistent visitor child indexing.
+  functionArgumentSeparatorOptionalComma = space* "," (space | newline)* | space* ","? space*
+  functionTagArguments = listOf<namedArgument<delimTag>, functionArgumentSeparatorOptionalComma>
+  functionRenderArguments = (functionArgumentSeparatorOptionalComma functionTagArguments) (space* ",")? space*
+  liquidTagFunctionMarkup := liquidVariableLookup<delimTag> space* "=" space* partialExpression functionRenderArguments liquidFilter<delimTag>* space*
 }
 
 LiquidDoc <: Helpers {

package/package.json

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