@platformos/liquid-html-parser 0.0.10 → 0.0.11

package/dist/grammar.js

@@ -31,5 +31,5 @@ exports.RAW_TAGS = (() => {
 })();
 // see ../../grammar/liquid-html.ohm for full list
 exports.VOID_ELEMENTS = exports.strictGrammars.LiquidHTML.rules.voidElementName.body.factors[0].terms.map((x) => x.args[0].obj);
-exports.TAGS_WITHOUT_MARKUP = ['else', 'break', 'continue', 'comment', 'raw', 'doc'];
+exports.TAGS_WITHOUT_MARKUP = ['else', 'break', 'continue', 'comment', 'raw', 'doc', 'try'];
 //# sourceMappingURL=grammar.js.map

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

@@ -34,6 +34,7 @@ import { Comparators, NamedTags } from './types';
 export declare enum ConcreteNodeTypes {
     HtmlDoctype = "HtmlDoctype",
     HtmlComment = "HtmlComment",
+    HtmlProcessingInstruction = "HtmlProcessingInstruction",
     HtmlRawTag = "HtmlRawTag",
     HtmlVoidElement = "HtmlVoidElement",
     HtmlSelfClosingElement = "HtmlSelfClosingElement",
@@ -144,6 +145,9 @@ export interface ConcreteHtmlDoctype extends ConcreteBasicNode<ConcreteNodeTypes
 export interface ConcreteHtmlComment extends ConcreteBasicNode<ConcreteNodeTypes.HtmlComment> {
     body: string;
 }
+export interface ConcreteHtmlProcessingInstruction extends ConcreteBasicNode<ConcreteNodeTypes.HtmlProcessingInstruction> {
+    body: string;
+}
 export interface ConcreteHtmlRawTag extends ConcreteHtmlNodeBase<ConcreteNodeTypes.HtmlRawTag> {
     name: string;
     body: string;
@@ -297,7 +301,7 @@ export interface ConcreteLiquidTagGraphQL extends ConcreteLiquidTagNode<NamedTag
 }
 export interface ConcreteLiquidTagBackground extends ConcreteLiquidTagNode<NamedTags.background, ConcreteLiquidTagBackgroundMarkup> {
 }
-export interface ConcreteLiquidTagCatch extends ConcreteLiquidTagNode<NamedTags.catch, ConcreteLiquidVariableLookup> {
+export interface ConcreteLiquidTagCatch extends ConcreteLiquidTagNode<NamedTags.catch, ConcreteLiquidVariableLookup | null> {
 }
 export interface ConcreteLiquidTagContext extends ConcreteLiquidTagNode<NamedTags.context, ConcreteLiquidNamedArgument[]> {
 }
@@ -313,9 +317,9 @@ export interface ConcreteLiquidTagRedirectTo extends ConcreteLiquidTagNode<Named
 }
 export interface ConcreteLiquidTagResponseHeaders extends ConcreteLiquidTagNode<NamedTags.response_headers, ConcreteLiquidExpression> {
 }
-export interface ConcreteLiquidTagResponseStatus extends ConcreteLiquidTagNode<NamedTags.response_status, ConcreteNumberLiteral> {
+export interface ConcreteLiquidTagResponseStatus extends ConcreteLiquidTagNode<NamedTags.response_status, ConcreteNumberLiteral | ConcreteLiquidVariableLookup> {
 }
-export interface ConcreteLiquidTagReturn extends ConcreteLiquidTagNode<NamedTags.return, ConcreteLiquidVariable> {
+export interface ConcreteLiquidTagReturn extends ConcreteLiquidTagNode<NamedTags.return, ConcreteLiquidVariable | null> {
 }
 export interface ConcreteLiquidTagRollback extends ConcreteLiquidTagNode<NamedTags.rollback, string> {
 }
@@ -349,18 +353,21 @@ export interface ConcreteLiquidTagRenderMarkup extends ConcreteBasicNode<Concret
     renderArguments: ConcreteLiquidNamedArgument[];
 }
 export interface ConcreteLiquidTagFunctionMarkup extends ConcreteBasicNode<ConcreteNodeTypes.FunctionMarkup> {
-    name: string;
+    name: ConcreteLiquidVariableLookup;
     partial: ConcreteStringLiteral | ConcreteLiquidVariableLookup;
     functionArguments: ConcreteLiquidNamedArgument[];
+    filters: ConcreteLiquidFilter[];
 }
 export interface ConcreteLiquidTagGraphQLMarkup extends ConcreteBasicNode<ConcreteNodeTypes.GraphQLMarkup> {
     name: string;
     graphql: ConcreteStringLiteral | ConcreteLiquidVariableLookup;
     functionArguments: ConcreteLiquidNamedArgument[];
+    filters: ConcreteLiquidFilter[];
 }
 export interface ConcreteLiquidTagGraphQLInlineMarkup extends ConcreteBasicNode<ConcreteNodeTypes.GraphQLInlineMarkup> {
     name: string;
     args: ConcreteLiquidNamedArgument[];
+    filters: ConcreteLiquidFilter[];
 }
 export interface ConcreteLiquidTagBackgroundMarkup extends ConcreteBasicNode<ConcreteNodeTypes.BackgroundMarkup> {
     jobId: string;
@@ -368,7 +375,6 @@ export interface ConcreteLiquidTagBackgroundMarkup extends ConcreteBasicNode<Con
     args: ConcreteLiquidNamedArgument[];
 }
 export interface ConcreteLiquidTagBackgroundInlineMarkup extends ConcreteBasicNode<ConcreteNodeTypes.BackgroundInlineMarkup> {
-    jobId: ConcreteLiquidVariableLookup;
     args: ConcreteLiquidNamedArgument[];
 }
 export interface ConcreteLiquidTagCacheMarkup extends ConcreteBasicNode<ConcreteNodeTypes.CacheMarkup> {
@@ -377,15 +383,15 @@ export interface ConcreteLiquidTagCacheMarkup extends ConcreteBasicNode<Concrete
 }
 export interface ConcreteLiquidTagLogMarkup extends ConcreteBasicNode<ConcreteNodeTypes.LogMarkup> {
     value: ConcreteLiquidExpression;
-    args: ConcreteLiquidNamedArgument[];
+    args: ConcreteLiquidArgument[];
 }
 export interface ConcreteLiquidTagSessionMarkup extends ConcreteBasicNode<ConcreteNodeTypes.SessionMarkup> {
     name: string;
-    value: ConcreteLiquidExpression;
+    value: ConcreteLiquidVariable;
 }
 export interface ConcreteLiquidTagExportMarkup extends ConcreteBasicNode<ConcreteNodeTypes.ExportMarkup> {
     variables: ConcreteLiquidVariableLookup[];
-    namespace: ConcreteLiquidNamedArgument;
+    namespace: ConcreteLiquidNamedArgument | null;
 }
 export interface ConcreteLiquidTagRedirectToMarkup extends ConcreteBasicNode<ConcreteNodeTypes.RedirectToMarkup> {
     url: ConcreteLiquidExpression;
@@ -421,7 +427,7 @@ export interface ConcreteLiquidFilter extends ConcreteBasicNode<ConcreteNodeType
 export type ConcreteLiquidArgument = ConcreteLiquidExpression | ConcreteLiquidNamedArgument;
 export interface ConcreteLiquidNamedArgument extends ConcreteBasicNode<ConcreteNodeTypes.NamedArgument> {
     name: string;
-    value: ConcreteLiquidExpression | ConcreteLiquidVariable;
+    value: ConcreteLiquidExpression | ConcreteLiquidVariable | ConcreteLiquidNamedArgument;
 }
 export type ConcreteLiquidExpression = ConcreteStringLiteral | ConcreteNumberLiteral | ConcreteLiquidLiteral | ConcreteLiquidRange | ConcreteLiquidVariableLookup | ConcreteJsonHashLiteral | ConcreteJsonArrayLiteral;
 export type ConcreteComplexLiquidExpression = ConcreteLiquidBooleanExpression | ConcreteLiquidExpression;
@@ -458,7 +464,7 @@ export interface ConcreteJsonArrayLiteral extends ConcreteBasicNode<ConcreteNode
     elements: ConcreteJsonValue[];
 }
 export type ConcreteJsonValue = ConcreteJsonHashLiteral | ConcreteJsonArrayLiteral | ConcreteLiquidVariable | ConcreteLiquidExpression;
-export type ConcreteHtmlNode = ConcreteHtmlDoctype | ConcreteHtmlComment | ConcreteHtmlRawTag | ConcreteHtmlVoidElement | ConcreteHtmlSelfClosingElement | ConcreteHtmlTagOpen | ConcreteHtmlTagClose;
+export type ConcreteHtmlNode = ConcreteHtmlDoctype | ConcreteHtmlComment | ConcreteHtmlProcessingInstruction | ConcreteHtmlRawTag | ConcreteHtmlVoidElement | ConcreteHtmlSelfClosingElement | ConcreteHtmlTagOpen | ConcreteHtmlTagClose;
 export interface ConcreteTextNode extends ConcreteBasicNode<ConcreteNodeTypes.TextNode> {
     value: string;
 }

package/dist/stage-1-cst.js

@@ -42,6 +42,7 @@ var ConcreteNodeTypes;
 (function (ConcreteNodeTypes) {
     ConcreteNodeTypes["HtmlDoctype"] = "HtmlDoctype";
     ConcreteNodeTypes["HtmlComment"] = "HtmlComment";
+    ConcreteNodeTypes["HtmlProcessingInstruction"] = "HtmlProcessingInstruction";
     ConcreteNodeTypes["HtmlRawTag"] = "HtmlRawTag";
     ConcreteNodeTypes["HtmlVoidElement"] = "HtmlVoidElement";
     ConcreteNodeTypes["HtmlSelfClosingElement"] = "HtmlSelfClosingElement";
@@ -474,11 +475,22 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             locEnd,
             source,
         },
+        liquidTagIncludeMarkup: {
+            type: ConcreteNodeTypes.RenderMarkup,
+            partial: 0,
+            variable: 1,
+            alias: 2,
+            renderArguments: 3,
+            locStart,
+            locEnd,
+            source,
+        },
         liquidTagFunctionMarkup: {
             type: ConcreteNodeTypes.FunctionMarkup,
             name: 0,
             partial: 4,
             functionArguments: 5,
+            filters: 6,
             locStart,
             locEnd,
             source,
@@ -488,6 +500,7 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             name: 0,
             graphql: 4,
             functionArguments: 5,
+            filters: 6,
             locStart,
             locEnd,
             source,
@@ -496,6 +509,7 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             type: ConcreteNodeTypes.GraphQLInlineMarkup,
             name: 0,
             args: 1,
+            filters: 2,
             locStart,
             locEnd,
             source,
@@ -514,8 +528,7 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         liquidTagOpenBackground: 0,
         liquidTagBackgroundInlineMarkup: {
             type: ConcreteNodeTypes.BackgroundInlineMarkup,
-            jobId: 0,
-            args: 2,
+            args: 1,
             locStart,
             locEnd,
             source,
@@ -534,6 +547,7 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         liquidTagOpenTransactionMarkup: 0,
         liquidTagOpenTry: 0,
         liquidTagCatch: 0,
+        liquidTagCatchMarkup: 0,
         liquidTagLog: 0,
         liquidTagLogMarkup: {
             type: ConcreteNodeTypes.LogMarkup,
@@ -543,8 +557,22 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             locEnd,
             source,
         },
+        liquidTagLogArguments: 1,
+        logArguments: 0,
+        logArgument: 0,
         liquidTagPrint: 0,
         liquidTagReturn: 0,
+        liquidTagReturnMarkup: 0,
+        liquidReturnVariable: {
+            type: ConcreteNodeTypes.LiquidVariable,
+            expression: 0,
+            filters: 1,
+            rawSource: (tokens) => source.slice(locStart(tokens), tokens[tokens.length - 2].source.endIdx).trimEnd(),
+            locStart,
+            locEnd: locEndSecondToLast,
+            source,
+        },
+        liquidReturnExpression: 0,
         liquidTagYield: 0,
         liquidTagYieldMarkup: 0,
         liquidTagSession: 0,
@@ -560,11 +588,12 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         liquidTagExportMarkup: {
             type: ConcreteNodeTypes.ExportMarkup,
             variables: 0,
-            namespace: 2,
+            namespace: 1,
             locStart,
             locEnd,
             source,
         },
+        liquidTagExportNamespace: 1,
         exportVariable: 0,
         liquidTagContext: 0,
         liquidTagContextMarkup: 0,
@@ -706,6 +735,15 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             locEnd,
             source,
         },
+        namedArgumentValue: 0,
+        hashPairValue: {
+            type: ConcreteNodeTypes.NamedArgument,
+            name: 0,
+            value: 4,
+            locStart,
+            locEnd,
+            source,
+        },
         graphqlNamedArgument: {
             type: ConcreteNodeTypes.NamedArgument,
             name: 0,
@@ -717,7 +755,7 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         graphqlNamedArgumentValue: {
             type: ConcreteNodeTypes.LiquidVariable,
             expression: 0,
-            filters: 1,
+            filters: () => [],
             rawSource: (tokens) => source.slice(locStart(tokens), locEnd(tokens)),
             locStart,
             locEnd,
@@ -958,6 +996,13 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
             locEnd,
             source,
         },
+        HtmlProcessingInstruction: {
+            type: ConcreteNodeTypes.HtmlProcessingInstruction,
+            body: markup(1),
+            locStart,
+            locEnd,
+            source,
+        },
         HtmlRawTagImpl: {
             type: ConcreteNodeTypes.HtmlRawTag,
             name: (tokens) => tokens[0].children[1].sourceString,

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

@@ -281,8 +281,8 @@ export interface RenderMarkup extends ASTNode<NodeTypes.RenderMarkup> {
 }
 /** {% function res = 'partial', [...namedArguments] %} */
 export interface FunctionMarkup extends ASTNode<NodeTypes.FunctionMarkup> {
-    /** {% function res = 'partial' %} */
-    name: string;
+    /** {% function res = 'partial' %} or {% function hash['key'] = 'partial' %} */
+    name: LiquidVariableLookup;
     partial: LiquidString | LiquidVariableLookup;
     /**
      * WARNING: `args` could contain LiquidVariableLookup when we are in a completion context
@@ -292,6 +292,8 @@ export interface FunctionMarkup extends ASTNode<NodeTypes.FunctionMarkup> {
      * @example {% function res = 'partial', arg1: value1, arg2: value2 %}
      */
     args: LiquidNamedArgument[];
+    /** Filters applied to the result variable, e.g. {% function res = 'path' | dig: 'key' %} */
+    filters: LiquidFilter[];
 }
 /** {% graphql res = 'path/to/graphql/file', [...namedArguments] %} (file-based) */
 export interface GraphQLMarkup extends ASTNode<NodeTypes.GraphQLMarkup> {
@@ -306,6 +308,8 @@ export interface GraphQLMarkup extends ASTNode<NodeTypes.GraphQLMarkup> {
      * @example {% graphql res = 'file', arg1: value1, arg2: value2 %}
      */
     args: LiquidNamedArgument[];
+    /** Filters applied to the result variable, e.g. {% graphql res = 'path' | dig: 'key' %} */
+    filters: LiquidFilter[];
 }
 /** {% graphql res, [...namedArguments] %}...{% endgraphql %} (inline) */
 export interface GraphQLInlineMarkup extends ASTNode<NodeTypes.GraphQLInlineMarkup> {
@@ -319,6 +323,8 @@ export interface GraphQLInlineMarkup extends ASTNode<NodeTypes.GraphQLInlineMark
      * @example {% graphql res, arg1: value1, arg2: value2 %}
      */
     args: LiquidNamedArgument[];
+    /** Filters applied to the result variable, e.g. {% graphql res | dig: 'key' %} */
+    filters: LiquidFilter[];
 }
 export interface LiquidTagBackground extends LiquidTagNode<NamedTags.background, BackgroundMarkup | BackgroundInlineMarkup> {
 }
@@ -340,9 +346,9 @@ export interface LiquidTagRedirectTo extends LiquidTagNode<NamedTags.redirect_to
 }
 export interface LiquidTagResponseHeaders extends LiquidTagNode<NamedTags.response_headers, LiquidExpression> {
 }
-export interface LiquidTagResponseStatus extends LiquidTagNode<NamedTags.response_status, LiquidNumber> {
+export interface LiquidTagResponseStatus extends LiquidTagNode<NamedTags.response_status, LiquidNumber | LiquidVariableLookup> {
 }
-export interface LiquidTagReturn extends LiquidTagNode<NamedTags.return, LiquidVariable> {
+export interface LiquidTagReturn extends LiquidTagNode<NamedTags.return, LiquidVariable | null> {
 }
 export interface LiquidTagRollback extends LiquidTagNode<NamedTags.rollback, string> {
 }
@@ -360,7 +366,7 @@ export interface LiquidTagTry extends LiquidTagNode<NamedTags.try, string> {
 }
 export interface LiquidTagYield extends LiquidTagNode<NamedTags.yield, LiquidExpression> {
 }
-export interface LiquidBranchCatch extends LiquidBranchNode<NamedTags.catch, LiquidVariableLookup> {
+export interface LiquidBranchCatch extends LiquidBranchNode<NamedTags.catch, LiquidVariableLookup | null> {
 }
 /** {% background job_id = 'partial', [...namedArguments] %} (file-based) */
 export interface BackgroundMarkup extends ASTNode<NodeTypes.BackgroundMarkup> {
@@ -368,9 +374,8 @@ export interface BackgroundMarkup extends ASTNode<NodeTypes.BackgroundMarkup> {
     partial: LiquidString | LiquidVariableLookup;
     args: LiquidNamedArgument[];
 }
-/** {% background jobId[, ...namedArguments] %}...{% endbackground %} (inline) */
+/** {% background ...namedArguments %}...{% endbackground %} (inline) */
 export interface BackgroundInlineMarkup extends ASTNode<NodeTypes.BackgroundInlineMarkup> {
-    jobId: LiquidVariableLookup;
     args: LiquidNamedArgument[];
 }
 /** {% cache 'key', [...namedArguments] %}...{% endcache %} */
@@ -378,20 +383,20 @@ export interface CacheMarkup extends ASTNode<NodeTypes.CacheMarkup> {
     key: LiquidExpression;
     args: LiquidNamedArgument[];
 }
-/** {% log value, [...namedArguments] %} */
+/** {% log value, [...arguments] %} */
 export interface LogMarkup extends ASTNode<NodeTypes.LogMarkup> {
     value: LiquidExpression;
-    args: LiquidNamedArgument[];
+    args: LiquidArgument[];
 }
-/** {% session name = value %} */
+/** {% session name = value [| filter] %} */
 export interface SessionMarkup extends ASTNode<NodeTypes.SessionMarkup> {
     name: string;
-    value: LiquidExpression;
+    value: LiquidVariable;
 }
-/** {% export a, b, namespace: 'ns' %} */
+/** {% export a, b[, namespace: 'ns'] %} */
 export interface ExportMarkup extends ASTNode<NodeTypes.ExportMarkup> {
     variables: LiquidVariableLookup[];
-    namespace: LiquidNamedArgument;
+    namespace: LiquidNamedArgument | null;
 }
 /** {% redirect_to '/path', [...namedArguments] %} */
 export interface RedirectToMarkup extends ASTNode<NodeTypes.RedirectToMarkup> {
@@ -512,8 +517,9 @@ export interface LiquidNamedArgument extends ASTNode<NodeTypes.NamedArgument> {
     /**
      * 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"`).
+     * For hash pair values (e.g. `key: 'val'`): a nested LiquidNamedArgument.
      */
-    value: LiquidExpression | LiquidVariable;
+    value: LiquidExpression | LiquidVariable | LiquidNamedArgument;
 }
 export interface LiquidBooleanExpression extends ASTNode<NodeTypes.BooleanExpression> {
     condition: LiquidConditionalExpression;
@@ -570,7 +576,7 @@ export interface JsonArrayLiteral extends ASTNode<NodeTypes.JsonArrayLiteral> {
     elements: (LiquidExpression | LiquidVariable)[];
 }
 /** The union type of all HTML nodes */
-export type HtmlNode = HtmlComment | HtmlElement | HtmlDanglingMarkerClose | HtmlVoidElement | HtmlSelfClosingElement | HtmlRawNode;
+export type HtmlNode = HtmlComment | HtmlProcessingInstruction | HtmlElement | HtmlDanglingMarkerClose | HtmlVoidElement | HtmlSelfClosingElement | HtmlRawNode;
 /** The basic HTML node with an opening and closing tags. */
 export interface HtmlElement extends HtmlNodeBase<NodeTypes.HtmlElement> {
     /**
@@ -666,6 +672,10 @@ export interface HtmlDoctype extends ASTNode<NodeTypes.HtmlDoctype> {
 export interface HtmlComment extends ASTNode<NodeTypes.HtmlComment> {
     body: string;
 }
+/** Represents XML declarations and processing instructions: `<?xml ... ?>`, `<?...?>` */
+export interface HtmlProcessingInstruction extends ASTNode<NodeTypes.HtmlProcessingInstruction> {
+    body: string;
+}
 export interface HtmlNodeBase<T> extends ASTNode<T> {
     /** the HTML and Liquid attributes of the HTML tag */
     attributes: AttributeNode[];

package/dist/stage-2-ast.js

@@ -381,6 +381,15 @@ function buildAst(cst, options) {
                 });
                 break;
             }
+            case stage_1_cst_1.ConcreteNodeTypes.HtmlProcessingInstruction: {
+                builder.push({
+                    type: types_1.NodeTypes.HtmlProcessingInstruction,
+                    body: node.body,
+                    position: position(node),
+                    source: node.source,
+                });
+                break;
+            }
             case stage_1_cst_1.ConcreteNodeTypes.HtmlRawTag: {
                 builder.push({
                     type: types_1.NodeTypes.HtmlRawNode,
@@ -768,7 +777,7 @@ function toNamedLiquidTag(node, options) {
             return {
                 ...liquidBranchBaseAttributes(node),
                 name: node.name,
-                markup: toExpression(node.markup),
+                markup: node.markup ? toExpression(node.markup) : null,
             };
         }
         case types_1.NamedTags.log: {
@@ -778,14 +787,20 @@ function toNamedLiquidTag(node, options) {
                 markup: toLogMarkup(node.markup),
             };
         }
-        case types_1.NamedTags.print:
-        case types_1.NamedTags.return: {
+        case types_1.NamedTags.print: {
             return {
                 ...liquidTagBaseAttributes(node),
                 name: node.name,
                 markup: toLiquidVariable(node.markup),
             };
         }
+        case types_1.NamedTags.return: {
+            return {
+                ...liquidTagBaseAttributes(node),
+                name: node.name,
+                markup: node.markup ? toLiquidVariable(node.markup) : null,
+            };
+        }
         case types_1.NamedTags.yield: {
             return {
                 ...liquidTagBaseAttributes(node),
@@ -1044,7 +1059,7 @@ function toRenderMarkup(node) {
 }
 function toFunctionMarkup(node) {
     return {
-        name: node.name,
+        name: toExpression(node.name),
         type: types_1.NodeTypes.FunctionMarkup,
         partial: toExpression(node.partial),
         /**
@@ -1056,6 +1071,7 @@ function toFunctionMarkup(node) {
          * but this is the compromise we're making to get completions to work.
          */
         args: node.functionArguments.map(toLiquidArgument),
+        filters: node.filters.map(toFilter),
         position: position(node),
         source: node.source,
     };
@@ -1074,6 +1090,7 @@ function toGraphQLMarkup(node) {
          * but this is the compromise we're making to get completions to work.
          */
         args: node.functionArguments.map(toLiquidArgument),
+        filters: node.filters.map(toFilter),
         position: position(node),
         source: node.source,
     };
@@ -1091,6 +1108,7 @@ function toGraphQLInlineMarkup(node) {
          * but this is the compromise we're making to get completions to work.
          */
         args: node.args.map(toLiquidArgument),
+        filters: node.filters.map(toFilter),
         position: position(node),
         source: node.source,
     };
@@ -1109,7 +1127,6 @@ function toBackgroundMarkup(node) {
 function toBackgroundInlineMarkup(node) {
     return {
         type: types_1.NodeTypes.BackgroundInlineMarkup,
-        jobId: toExpression(node.jobId),
         args: node.args.map(toLiquidArgument),
         position: position(node),
         source: node.source,
@@ -1137,7 +1154,7 @@ function toSessionMarkup(node) {
     return {
         type: types_1.NodeTypes.SessionMarkup,
         name: node.name,
-        value: toExpression(node.value),
+        value: toLiquidVariable(node.value),
         position: position(node),
         source: node.source,
     };
@@ -1146,7 +1163,7 @@ function toExportMarkup(node) {
     return {
         type: types_1.NodeTypes.ExportMarkup,
         variables: node.variables.map((v) => toExpression(v)),
-        namespace: toNamedArgument(node.namespace),
+        namespace: node.namespace ? toNamedArgument(node.namespace) : null,
         position: position(node),
         source: node.source,
     };
@@ -1373,12 +1390,20 @@ function toLiquidArgument(node) {
     }
 }
 function toNamedArgument(node) {
+    let value;
+    if (node.value.type === stage_1_cst_1.ConcreteNodeTypes.LiquidVariable) {
+        value = toLiquidVariable(node.value);
+    }
+    else if (node.value.type === stage_1_cst_1.ConcreteNodeTypes.NamedArgument) {
+        value = toNamedArgument(node.value);
+    }
+    else {
+        value = toExpression(node.value);
+    }
     return {
         type: types_1.NodeTypes.NamedArgument,
         name: node.name,
-        value: node.value.type === stage_1_cst_1.ConcreteNodeTypes.LiquidVariable
-            ? toLiquidVariable(node.value)
-            : toExpression(node.value),
+        value,
         position: position(node),
         source: node.source,
     };

package/dist/types.d.ts

@@ -14,6 +14,7 @@ export declare enum NodeTypes {
     HtmlVoidElement = "HtmlVoidElement",
     HtmlDoctype = "HtmlDoctype",
     HtmlComment = "HtmlComment",
+    HtmlProcessingInstruction = "HtmlProcessingInstruction",
     HtmlElement = "HtmlElement",
     HtmlDanglingMarkerClose = "HtmlDanglingMarkerClose",
     HtmlRawNode = "HtmlRawNode",

package/dist/types.js

@@ -12,6 +12,7 @@ var NodeTypes;
     NodeTypes["HtmlVoidElement"] = "HtmlVoidElement";
     NodeTypes["HtmlDoctype"] = "HtmlDoctype";
     NodeTypes["HtmlComment"] = "HtmlComment";
+    NodeTypes["HtmlProcessingInstruction"] = "HtmlProcessingInstruction";
     NodeTypes["HtmlElement"] = "HtmlElement";
     NodeTypes["HtmlDanglingMarkerClose"] = "HtmlDanglingMarkerClose";
     NodeTypes["HtmlRawNode"] = "HtmlRawNode";

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* "=") graphqlRenderArguments
+  liquidTagGraphQLInlineMarkup = variableSegment ~(space* "=") graphqlRenderArguments liquidFilter<delimTag>* space*
 
   liquidTagOpen =
     | liquidTagOpenStrict
@@ -201,25 +201,28 @@ Liquid <: Helpers {
   liquidTagContentForMarkup = contentForType space*
   contentForType = liquidString<delimTag>
 
-  liquidTagInclude = liquidTagRule<"include", liquidTagRenderMarkup>
+  liquidTagInclude = liquidTagRule<"include", liquidTagIncludeMarkup>
+  liquidTagIncludeMarkup =
+    partialExpression renderVariableExpression? renderAliasExpression? renderArguments
+
   liquidTagRender = liquidTagRule<"render", liquidTagRenderMarkup>
   liquidTagRenderMarkup =
-    partialExpression renderVariableExpression? renderAliasExpression? renderArguments
+    liquidString<delimTag> renderVariableExpression? renderAliasExpression? renderArguments
 
   liquidTagFunction = liquidTagRule<"function", liquidTagFunctionMarkup>
-  liquidTagFunctionMarkup = variableSegment space* "=" space* partialExpression renderArguments
+  liquidTagFunctionMarkup = liquidVariableLookup<delimTag> space* "=" space* partialExpression renderArguments liquidFilter<delimTag>* space*
 
   liquidTagGraphQL = liquidTagRule<"graphql", liquidTagGraphQLMarkup>
-  liquidTagGraphQLMarkup = variableSegment space* "=" space* partialExpression graphqlRenderArguments
+  liquidTagGraphQLMarkup = variableSegment space* "=" space* partialExpression graphqlRenderArguments liquidFilter<delimTag>* space*
 
   // platformos simple tags
   liquidTagBackground = liquidTagRule<"background", liquidTagBackgroundMarkup>
   liquidTagBackgroundMarkup = variableSegment space* "=" space* partialExpression renderArguments
 
   liquidTagOpenBackground = liquidTagOpenRule<"background", liquidTagBackgroundInlineMarkup>
+  // Block form: only named arguments, no result variable (matches Ruby inline syntax)
   // Use negative lookahead to exclude file-based syntax (with "=")
-  // jobId is required before any arguments
-  liquidTagBackgroundInlineMarkup = ~(variableSegment space* "=") variableSegmentAsLookup argumentSeparatorOptionalComma tagArguments space*
+  liquidTagBackgroundInlineMarkup = ~(variableSegment space* "=") argumentSeparatorOptionalComma tagArguments space*
 
   liquidTagOpenCache = liquidTagOpenRule<"cache", liquidTagCacheMarkup>
   liquidTagCacheMarkup = liquidExpression<delimTag> renderArguments
@@ -231,23 +234,34 @@ Liquid <: Helpers {
 
   liquidTagOpenTry = liquidTagOpenRule<"try", empty>
 
-  liquidTagCatch = liquidTagRule<"catch", variableSegmentAsLookupMarkup>
+  liquidTagCatch = liquidTagRule<"catch", liquidTagCatchMarkup>
+  liquidTagCatchMarkup = variableSegmentAsLookup? space*
 
   liquidTagLog = liquidTagRule<"log", liquidTagLogMarkup>
-  liquidTagLogMarkup = liquidExpression<delimTag> renderArguments
+  liquidTagLogMarkup = liquidExpression<delimTag> liquidTagLogArguments
+  liquidTagLogArguments = (argumentSeparatorOptionalComma logArguments) (space* ",")? space*
+  logArguments = listOf<logArgument<delimTag>, argumentSeparatorOptionalComma>
+  logArgument<delim> = namedArgument<delim> | positionalArgument<delim>
 
   liquidTagPrint = liquidTagRule<"print", liquidTagEchoMarkup>
 
-  liquidTagReturn = liquidTagRule<"return", liquidTagEchoMarkup>
+  liquidTagReturn = liquidTagRule<"return", liquidTagReturnMarkup>
+  liquidTagReturnMarkup = liquidReturnVariable<delimTag>? space*
+  liquidReturnVariable<delim> = liquidReturnExpression<delim> liquidFilter<delim>* space* &delim
+  liquidReturnExpression<delim> =
+    | liquidJsonHashLiteral<delim>
+    | liquidJsonArrayLiteral<delim>
+    | liquidComplexExpression<delim>
 
   liquidTagYield = liquidTagRule<"yield", liquidTagYieldMarkup>
   liquidTagYieldMarkup = liquidExpression<delimTag> space*
 
   liquidTagSession = liquidTagRule<"session", liquidTagSessionMarkup>
-  liquidTagSessionMarkup = variableSegment space* "=" space* liquidExpression<delimTag> space*
+  liquidTagSessionMarkup = variableSegment space* "=" space* liquidVariable<delimTag> space*
 
   liquidTagExport = liquidTagRule<"export", liquidTagExportMarkup>
-  liquidTagExportMarkup = nonemptyListOf<exportVariable, argumentSeparator> argumentSeparatorOptionalComma namedArgument<delimTag> space*
+  liquidTagExportMarkup = nonemptyListOf<exportVariable, argumentSeparator> liquidTagExportNamespace? space*
+  liquidTagExportNamespace = argumentSeparatorOptionalComma namedArgument<delimTag>
   // Variable lookup that is NOT followed by ":" (to distinguish from named arguments)
   exportVariable = variableSegmentAsLookup ~(space* ":")
 
@@ -269,7 +283,7 @@ Liquid <: Helpers {
   liquidTagThemeRenderRc = liquidTagRule<"theme_render_rc", liquidTagRenderMarkup>
 
   liquidTagResponseStatus = liquidTagRule<"response_status", liquidTagResponseStatusMarkup>
-  liquidTagResponseStatusMarkup = liquidNumber space*
+  liquidTagResponseStatusMarkup = (liquidNumber | liquidVariableLookup<delimTag>) space*
 
   liquidTagResponseHeaders = liquidTagRule<"response_headers", liquidTagResponseHeadersMarkup>
   liquidTagResponseHeadersMarkup = liquidExpression<delimTag> space*
@@ -278,7 +292,7 @@ Liquid <: Helpers {
 
   renderArguments = (argumentSeparatorOptionalComma tagArguments) (space* ",")? space*
   completionModeRenderArguments = (argumentSeparatorOptionalComma tagArguments) (space* ",")? space* (argumentSeparator? liquidVariableLookup<delimTag> space*)?
-  partialExpression = liquidString<delimTag> | variableSegmentAsLookup
+  partialExpression = liquidString<delimTag> | liquidVariableLookup<delimTag>
   renderVariableExpression = space+ ("for" | "with") space+ liquidExpression<delimTag>
   renderAliasExpression = space+ "as" space+ variableSegment
 
@@ -427,7 +441,8 @@ Liquid <: Helpers {
     | indexLookup<delim>
     | dotLookup
   indexLookup<delim> = space* "[" space* liquidExpression<delim> space* "]"
-  dotLookup = space* "." space* identifier
+  dotLookup = space* "." space* dotLookupName
+  dotLookupName = (alnum | "_") (~endOfTagName identifierCharacter)* "?"?
 
   liquidFilter<delim> = space* "|" space* identifier (space* ":" space* arguments<delim> (space* ",")?)?
 
@@ -435,11 +450,13 @@ Liquid <: Helpers {
   argumentSeparator = space* "," space*
   argumentSeparatorOptionalComma = space* ","? space*
   positionalArgument<delim> = liquidExpression<delim> ~(space* ":")
-  namedArgument<delim> = variableSegment space* ":" space* liquidExpression<delim>
+  namedArgument<delim> = variableSegment space* ":" space* namedArgumentValue<delim>
+  namedArgumentValue<delim> = hashPairValue<delim> | liquidExpression<delim>
+  hashPairValue<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>*
+  graphqlNamedArgumentValue = liquidExpression<delimTag>
   graphqlRenderArguments = (argumentSeparatorOptionalComma graphqlArguments) (space* ",")? space*
   filterArguments<delim> =
     | complexArguments<delim>
@@ -481,7 +498,10 @@ Liquid <: Helpers {
 }
 
 LiquidStatement <: Liquid {
-  Node := listOf<LiquidStatement, statementSep> (space | newline)*
+  // Trailing ";"? and "#..." comment are consumed by Node and statementSep; the `;?`/`#` in
+  // liquidStatementEnd make &delimTag succeed before them so expression rules terminate correctly.
+  // tagMarkup uses liquidLineEnd (newline|end only) so inline-comment text is never truncated.
+  Node := listOf<LiquidStatement, statementSep> ";"? ("#" (~newline any)*)? (space | newline)*
 
   // This is the big brains moment: we redefine space to exclude newlines.
   //
@@ -547,12 +567,23 @@ LiquidStatement <: Liquid {
   liquidInlineComment
     := "#" space? tagMarkup &liquidStatementEnd
 
-  tagMarkup := anyExceptStar<liquidStatementEnd>
+  // tagMarkup uses liquidLineEnd (newline|end) so that raw # text is never cut off
+  // (liquidInlineComment content, base-case tag markup, close-tag markup).
+  liquidLineEnd = newline | end
+  tagMarkup := anyExceptStar<liquidLineEnd>
 
-  // trailing whitespace, newline, + anything else before the next tag
-  statementSep = space* newline (space | newline)*
+  // 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)> "\""
 
-  liquidStatementEnd = newline | end
+  // trailing whitespace, newline, + optional leading `;` and `# comment` before the next tag
+  statementSep = space* ";"? space* ("#" (~newline any)*)? newline (space | newline)*
+
+  // delimTag is used as &delim lookahead in expression rules; it must succeed before `;` and `#`
+  liquidStatementEnd = ";"? space* ("#" (~newline any)*)? (newline | end)
   delimTag := liquidStatementEnd
 }
 
@@ -611,6 +642,7 @@ LiquidHTML <: Liquid {
   HtmlNode =
     | HtmlDoctype
     | HtmlComment
+    | HtmlProcessingInstruction
     | HtmlRawTag
     | HtmlVoidElement
     | HtmlSelfClosingElement
@@ -625,6 +657,9 @@ LiquidHTML <: Liquid {
 
   HtmlComment = "<!--" #(anyExceptStar<"-->"> "-->")
 
+  // Handles XML declarations (<?xml ...?>) and other processing instructions (<?...?>)
+  HtmlProcessingInstruction = "<?" #(anyExceptStar<"?>"> "?>")
+
   // These are black holes, we'll ignore what's in them
   HtmlRawTag =
     | HtmlRawTagImpl<"script">
@@ -730,9 +765,12 @@ StrictLiquidHTML <: LiquidHTML {
 WithPlaceholderLiquid <: Liquid {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
+    liquidString<delimTag> renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+  liquidTagIncludeMarkup :=
     partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
+  dotLookupName := (alnum | "_" | "█") (~endOfTagName (identifierCharacter | "█"))* "?"?
   liquidDoc :=
     liquidDocStart
       liquidDocBody
@@ -742,9 +780,12 @@ WithPlaceholderLiquid <: Liquid {
 WithPlaceholderLiquidStatement <: LiquidStatement {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
+    liquidString<delimTag> renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+  liquidTagIncludeMarkup :=
     partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
+  dotLookupName := (alnum | "_" | "█") (~endOfTagName (identifierCharacter | "█"))* "?"?
   liquidDoc :=
     liquidDocStart
       liquidDocBody
@@ -754,9 +795,12 @@ WithPlaceholderLiquidStatement <: LiquidStatement {
 WithPlaceholderLiquidHTML <: LiquidHTML {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
+    liquidString<delimTag> renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+  liquidTagIncludeMarkup :=
     partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
+  dotLookupName := (alnum | "_" | "█") (~endOfTagName (identifierCharacter | "█"))* "?"?
   leadingTagNameTextNode := (letter | "█") (alnum | "-" | ":" | "█")*
   trailingTagNameTextNode := (alnum | "-" | ":" | "█")+
   liquidDoc :=

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* "=") graphqlRenderArguments
+  liquidTagGraphQLInlineMarkup = variableSegment ~(space* "=") graphqlRenderArguments liquidFilter<delimTag>* space*
 
   liquidTagOpen =
     | liquidTagOpenStrict
@@ -201,25 +201,28 @@ Liquid <: Helpers {
   liquidTagContentForMarkup = contentForType space*
   contentForType = liquidString<delimTag>
 
-  liquidTagInclude = liquidTagRule<"include", liquidTagRenderMarkup>
+  liquidTagInclude = liquidTagRule<"include", liquidTagIncludeMarkup>
+  liquidTagIncludeMarkup =
+    partialExpression renderVariableExpression? renderAliasExpression? renderArguments
+
   liquidTagRender = liquidTagRule<"render", liquidTagRenderMarkup>
   liquidTagRenderMarkup =
-    partialExpression renderVariableExpression? renderAliasExpression? renderArguments
+    liquidString<delimTag> renderVariableExpression? renderAliasExpression? renderArguments
 
   liquidTagFunction = liquidTagRule<"function", liquidTagFunctionMarkup>
-  liquidTagFunctionMarkup = variableSegment space* "=" space* partialExpression renderArguments
+  liquidTagFunctionMarkup = liquidVariableLookup<delimTag> space* "=" space* partialExpression renderArguments liquidFilter<delimTag>* space*
 
   liquidTagGraphQL = liquidTagRule<"graphql", liquidTagGraphQLMarkup>
-  liquidTagGraphQLMarkup = variableSegment space* "=" space* partialExpression graphqlRenderArguments
+  liquidTagGraphQLMarkup = variableSegment space* "=" space* partialExpression graphqlRenderArguments liquidFilter<delimTag>* space*
 
   // platformos simple tags
   liquidTagBackground = liquidTagRule<"background", liquidTagBackgroundMarkup>
   liquidTagBackgroundMarkup = variableSegment space* "=" space* partialExpression renderArguments
 
   liquidTagOpenBackground = liquidTagOpenRule<"background", liquidTagBackgroundInlineMarkup>
+  // Block form: only named arguments, no result variable (matches Ruby inline syntax)
   // Use negative lookahead to exclude file-based syntax (with "=")
-  // jobId is required before any arguments
-  liquidTagBackgroundInlineMarkup = ~(variableSegment space* "=") variableSegmentAsLookup argumentSeparatorOptionalComma tagArguments space*
+  liquidTagBackgroundInlineMarkup = ~(variableSegment space* "=") argumentSeparatorOptionalComma tagArguments space*
 
   liquidTagOpenCache = liquidTagOpenRule<"cache", liquidTagCacheMarkup>
   liquidTagCacheMarkup = liquidExpression<delimTag> renderArguments
@@ -231,23 +234,34 @@ Liquid <: Helpers {
 
   liquidTagOpenTry = liquidTagOpenRule<"try", empty>
 
-  liquidTagCatch = liquidTagRule<"catch", variableSegmentAsLookupMarkup>
+  liquidTagCatch = liquidTagRule<"catch", liquidTagCatchMarkup>
+  liquidTagCatchMarkup = variableSegmentAsLookup? space*
 
   liquidTagLog = liquidTagRule<"log", liquidTagLogMarkup>
-  liquidTagLogMarkup = liquidExpression<delimTag> renderArguments
+  liquidTagLogMarkup = liquidExpression<delimTag> liquidTagLogArguments
+  liquidTagLogArguments = (argumentSeparatorOptionalComma logArguments) (space* ",")? space*
+  logArguments = listOf<logArgument<delimTag>, argumentSeparatorOptionalComma>
+  logArgument<delim> = namedArgument<delim> | positionalArgument<delim>
 
   liquidTagPrint = liquidTagRule<"print", liquidTagEchoMarkup>
 
-  liquidTagReturn = liquidTagRule<"return", liquidTagEchoMarkup>
+  liquidTagReturn = liquidTagRule<"return", liquidTagReturnMarkup>
+  liquidTagReturnMarkup = liquidReturnVariable<delimTag>? space*
+  liquidReturnVariable<delim> = liquidReturnExpression<delim> liquidFilter<delim>* space* &delim
+  liquidReturnExpression<delim> =
+    | liquidJsonHashLiteral<delim>
+    | liquidJsonArrayLiteral<delim>
+    | liquidComplexExpression<delim>
 
   liquidTagYield = liquidTagRule<"yield", liquidTagYieldMarkup>
   liquidTagYieldMarkup = liquidExpression<delimTag> space*
 
   liquidTagSession = liquidTagRule<"session", liquidTagSessionMarkup>
-  liquidTagSessionMarkup = variableSegment space* "=" space* liquidExpression<delimTag> space*
+  liquidTagSessionMarkup = variableSegment space* "=" space* liquidVariable<delimTag> space*
 
   liquidTagExport = liquidTagRule<"export", liquidTagExportMarkup>
-  liquidTagExportMarkup = nonemptyListOf<exportVariable, argumentSeparator> argumentSeparatorOptionalComma namedArgument<delimTag> space*
+  liquidTagExportMarkup = nonemptyListOf<exportVariable, argumentSeparator> liquidTagExportNamespace? space*
+  liquidTagExportNamespace = argumentSeparatorOptionalComma namedArgument<delimTag>
   // Variable lookup that is NOT followed by ":" (to distinguish from named arguments)
   exportVariable = variableSegmentAsLookup ~(space* ":")
 
@@ -269,7 +283,7 @@ Liquid <: Helpers {
   liquidTagThemeRenderRc = liquidTagRule<"theme_render_rc", liquidTagRenderMarkup>
 
   liquidTagResponseStatus = liquidTagRule<"response_status", liquidTagResponseStatusMarkup>
-  liquidTagResponseStatusMarkup = liquidNumber space*
+  liquidTagResponseStatusMarkup = (liquidNumber | liquidVariableLookup<delimTag>) space*
 
   liquidTagResponseHeaders = liquidTagRule<"response_headers", liquidTagResponseHeadersMarkup>
   liquidTagResponseHeadersMarkup = liquidExpression<delimTag> space*
@@ -278,7 +292,7 @@ Liquid <: Helpers {
 
   renderArguments = (argumentSeparatorOptionalComma tagArguments) (space* ",")? space*
   completionModeRenderArguments = (argumentSeparatorOptionalComma tagArguments) (space* ",")? space* (argumentSeparator? liquidVariableLookup<delimTag> space*)?
-  partialExpression = liquidString<delimTag> | variableSegmentAsLookup
+  partialExpression = liquidString<delimTag> | liquidVariableLookup<delimTag>
   renderVariableExpression = space+ ("for" | "with") space+ liquidExpression<delimTag>
   renderAliasExpression = space+ "as" space+ variableSegment
 
@@ -427,7 +441,8 @@ Liquid <: Helpers {
     | indexLookup<delim>
     | dotLookup
   indexLookup<delim> = space* "[" space* liquidExpression<delim> space* "]"
-  dotLookup = space* "." space* identifier
+  dotLookup = space* "." space* dotLookupName
+  dotLookupName = (alnum | "_") (~endOfTagName identifierCharacter)* "?"?
 
   liquidFilter<delim> = space* "|" space* identifier (space* ":" space* arguments<delim> (space* ",")?)?
 
@@ -435,11 +450,13 @@ Liquid <: Helpers {
   argumentSeparator = space* "," space*
   argumentSeparatorOptionalComma = space* ","? space*
   positionalArgument<delim> = liquidExpression<delim> ~(space* ":")
-  namedArgument<delim> = variableSegment space* ":" space* liquidExpression<delim>
+  namedArgument<delim> = variableSegment space* ":" space* namedArgumentValue<delim>
+  namedArgumentValue<delim> = hashPairValue<delim> | liquidExpression<delim>
+  hashPairValue<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>*
+  graphqlNamedArgumentValue = liquidExpression<delimTag>
   graphqlRenderArguments = (argumentSeparatorOptionalComma graphqlArguments) (space* ",")? space*
   filterArguments<delim> =
     | complexArguments<delim>
@@ -481,7 +498,10 @@ Liquid <: Helpers {
 }
 
 LiquidStatement <: Liquid {
-  Node := listOf<LiquidStatement, statementSep> (space | newline)*
+  // Trailing ";"? and "#..." comment are consumed by Node and statementSep; the ${"`"};?${"`"}/${"`"}#${"`"} in
+  // liquidStatementEnd make &delimTag succeed before them so expression rules terminate correctly.
+  // tagMarkup uses liquidLineEnd (newline|end only) so inline-comment text is never truncated.
+  Node := listOf<LiquidStatement, statementSep> ";"? ("#" (~newline any)*)? (space | newline)*
 
   // This is the big brains moment: we redefine space to exclude newlines.
   //
@@ -547,12 +567,23 @@ LiquidStatement <: Liquid {
   liquidInlineComment
     := "#" space? tagMarkup &liquidStatementEnd
 
-  tagMarkup := anyExceptStar<liquidStatementEnd>
+  // tagMarkup uses liquidLineEnd (newline|end) so that raw # text is never cut off
+  // (liquidInlineComment content, base-case tag markup, close-tag markup).
+  liquidLineEnd = newline | end
+  tagMarkup := anyExceptStar<liquidLineEnd>
 
-  // trailing whitespace, newline, + anything else before the next tag
-  statementSep = space* newline (space | newline)*
+  // 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)> "\""
 
-  liquidStatementEnd = newline | end
+  // trailing whitespace, newline, + optional leading ${"`"};${"`"} and ${"`"}# comment${"`"} before the next tag
+  statementSep = space* ";"? space* ("#" (~newline any)*)? newline (space | newline)*
+
+  // delimTag is used as &delim lookahead in expression rules; it must succeed before ${"`"};${"`"} and ${"`"}#${"`"}
+  liquidStatementEnd = ";"? space* ("#" (~newline any)*)? (newline | end)
   delimTag := liquidStatementEnd
 }
 
@@ -611,6 +642,7 @@ LiquidHTML <: Liquid {
   HtmlNode =
     | HtmlDoctype
     | HtmlComment
+    | HtmlProcessingInstruction
     | HtmlRawTag
     | HtmlVoidElement
     | HtmlSelfClosingElement
@@ -625,6 +657,9 @@ LiquidHTML <: Liquid {
 
   HtmlComment = "<!--" #(anyExceptStar<"-->"> "-->")
 
+  // Handles XML declarations (<?xml ...?>) and other processing instructions (<?...?>)
+  HtmlProcessingInstruction = "<?" #(anyExceptStar<"?>"> "?>")
+
   // These are black holes, we'll ignore what's in them
   HtmlRawTag =
     | HtmlRawTagImpl<"script">
@@ -730,9 +765,12 @@ StrictLiquidHTML <: LiquidHTML {
 WithPlaceholderLiquid <: Liquid {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
+    liquidString<delimTag> renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+  liquidTagIncludeMarkup :=
     partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
+  dotLookupName := (alnum | "_" | "█") (~endOfTagName (identifierCharacter | "█"))* "?"?
   liquidDoc :=
     liquidDocStart
       liquidDocBody
@@ -742,9 +780,12 @@ WithPlaceholderLiquid <: Liquid {
 WithPlaceholderLiquidStatement <: LiquidStatement {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
+    liquidString<delimTag> renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+  liquidTagIncludeMarkup :=
     partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
+  dotLookupName := (alnum | "_" | "█") (~endOfTagName (identifierCharacter | "█"))* "?"?
   liquidDoc :=
     liquidDocStart
       liquidDocBody
@@ -754,9 +795,12 @@ WithPlaceholderLiquidStatement <: LiquidStatement {
 WithPlaceholderLiquidHTML <: LiquidHTML {
   liquidFilter<delim> := space* "|" space* identifier (space* ":" space* filterArguments<delim> (space* ",")?)?
   liquidTagRenderMarkup :=
+    liquidString<delimTag> renderVariableExpression? renderAliasExpression? completionModeRenderArguments
+  liquidTagIncludeMarkup :=
     partialExpression renderVariableExpression? renderAliasExpression? completionModeRenderArguments
   liquidTagName := (letter | "█") (alnum | "_")*
   variableSegment := (letter | "_" | "█") (identifierCharacter | "█")*
+  dotLookupName := (alnum | "_" | "█") (~endOfTagName (identifierCharacter | "█"))* "?"?
   leadingTagNameTextNode := (letter | "█") (alnum | "-" | ":" | "█")*
   trailingTagNameTextNode := (alnum | "-" | ":" | "█")+
   liquidDoc :=

package/package.json

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