@platformos/liquid-html-parser 0.0.16 → 0.0.18

package/dist/index.d.ts

@@ -2,4 +2,5 @@ export * from './stage-2-ast';
 export * from './types';
 export * from './errors';
 export { TAGS_WITHOUT_MARKUP, RAW_TAGS, VOID_ELEMENTS, BLOCKS } from './grammar';
+export { LiquidLiteralValues } from './stage-1-cst';
 export { getConditionalComment } from './conditional-comment';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConditionalComment = exports.BLOCKS = exports.VOID_ELEMENTS = exports.RAW_TAGS = exports.TAGS_WITHOUT_MARKUP = void 0;
+exports.getConditionalComment = exports.LiquidLiteralValues = exports.BLOCKS = exports.VOID_ELEMENTS = exports.RAW_TAGS = exports.TAGS_WITHOUT_MARKUP = void 0;
 __exportStar(require("./stage-2-ast"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./errors"), exports);
@@ -23,6 +23,8 @@ Object.defineProperty(exports, "TAGS_WITHOUT_MARKUP", { enumerable: true, get: f
 Object.defineProperty(exports, "RAW_TAGS", { enumerable: true, get: function () { return grammar_1.RAW_TAGS; } });
 Object.defineProperty(exports, "VOID_ELEMENTS", { enumerable: true, get: function () { return grammar_1.VOID_ELEMENTS; } });
 Object.defineProperty(exports, "BLOCKS", { enumerable: true, get: function () { return grammar_1.BLOCKS; } });
+var stage_1_cst_1 = require("./stage-1-cst");
+Object.defineProperty(exports, "LiquidLiteralValues", { enumerable: true, get: function () { return stage_1_cst_1.LiquidLiteralValues; } });
 var conditional_comment_1 = require("./conditional-comment");
 Object.defineProperty(exports, "getConditionalComment", { enumerable: true, get: function () { return conditional_comment_1.getConditionalComment; } });
 //# sourceMappingURL=index.js.map

package/dist/stage-1-cst.js

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

package/grammar/liquid-html.ohm

@@ -220,7 +220,7 @@ Liquid <: Helpers {
   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 "=")
-  liquidTagBackgroundInlineMarkup = ~(variableSegment space* "=") argumentSeparatorOptionalComma tagArguments space*
+  liquidTagBackgroundInlineMarkup = ~(variableSegment space* "=") argumentSeparatorOptionalComma tagArguments (space* ",")? space*
 
   liquidTagOpenCache = liquidTagOpenRule<"cache", liquidTagCacheMarkup>
   liquidTagCacheMarkup = liquidExpression<delimTag> renderArguments
@@ -228,7 +228,7 @@ Liquid <: Helpers {
   liquidTagOpenParseJson = liquidTagOpenRule<"parse_json", variableSegmentAsLookupMarkup>
 
   liquidTagOpenTransaction = liquidTagOpenRule<"transaction", liquidTagOpenTransactionMarkup>
-  liquidTagOpenTransactionMarkup = tagArguments space*
+  liquidTagOpenTransactionMarkup = tagArguments (space* ",")? space*
 
   liquidTagOpenTry = liquidTagOpenRule<"try", empty>
 
@@ -264,10 +264,10 @@ Liquid <: Helpers {
   exportVariable = variableSegmentAsLookup ~(space* ":")
 
   liquidTagContext = liquidTagRule<"context", liquidTagContextMarkup>
-  liquidTagContextMarkup = tagArguments space*
+  liquidTagContextMarkup = tagArguments (space* ",")? space*
 
   liquidTagSignIn = liquidTagRule<"sign_in", liquidTagSignInMarkup>
-  liquidTagSignInMarkup = tagArguments space*
+  liquidTagSignInMarkup = tagArguments (space* ",")? space*
 
   liquidTagRedirectTo = liquidTagRule<"redirect_to", liquidTagRedirectToMarkup>
   liquidTagRedirectToMarkup = liquidExpression<delimTag> renderArguments
@@ -313,7 +313,12 @@ Liquid <: Helpers {
     ) endOfIdentifier
 
   liquidTagOpenForm = liquidTagOpenRule<"form", liquidTagOpenFormMarkup>
-  liquidTagOpenFormMarkup = arguments<delimTag> (space* ",")? space*
+  // Matches the platformOS runtime (FormForTag): an optional positional model name first
+  // ({% form form, method: 'delete' %}), then key: value attributes. The runtime scans
+  // `[\w-]+: value` pairs out of the markup, so keys may contain hyphens (html-class:,
+  // html-data-user-id:), commas between attributes are optional, and bare {% form %} is valid.
+  liquidTagOpenFormMarkup =
+    orderedListOf<positionalArgument<delimTag>, namedArgument<delimTag>, argumentSeparatorOptionalComma> (space* ",")? space*
 
   liquidTagOpenFor = liquidTagOpenRule<"for", liquidTagOpenForMarkup>
 
@@ -611,18 +616,27 @@ LiquidStatement <: Liquid {
   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.
+  // Inside {% liquid %} blocks, a tag's key:value argument list may span multiple lines.
+  // Every argument-list tag whose separator is argumentSeparatorOptionalComma — function,
+  // graphql, background, render, include, log, context, sign_in, transaction, cache, etc. —
+  // inherits this automatically; the base Liquid grammar keeps these horizontal-only outside
+  // {% liquid %}, so the standalone tag/block forms are unaffected (zero regression surface).
   //
-  // 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*
+  // A newline is only crossed AFTER a comma AND only when the next non-blank token is a
+  // named argument (`name:`). This mirrors the Ruby runtime's continuation guard
+  // (continuation_line? matches /\A[\w-]+\s*:/): a trailing comma followed by a new
+  // directive (another tag, an assign, an echo, a bare/positional value such as
+  // `log "second"`, …) does NOT look like `name:`, so the newline is not consumed, the list
+  // ends, and the comma is treated as a stylistic trailing comma — the next line stays a
+  // separate statement. This guard is essential for positional-accepting lists like log's,
+  // where a following directive would otherwise be swallowed as a positional argument.
+  //
+  // Both alternatives must have the same arity (3: space, comma, group) for Ohm's uniform-arity
+  // requirement and consistent visitor child indexing. The positive lookahead is written as
+  // ~(~(...)) so it contributes arity 0, keeping the first alternative's group at arity 3.
+  argumentSeparatorOptionalComma :=
+      space* "," ((space | newline)* ~(~(variableSegment space* ":")))
+    | space* ","? space*
 }
 
 LiquidDoc <: Helpers {

package/grammar/liquid-html.ohm.js

@@ -220,7 +220,7 @@ Liquid <: Helpers {
   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 "=")
-  liquidTagBackgroundInlineMarkup = ~(variableSegment space* "=") argumentSeparatorOptionalComma tagArguments space*
+  liquidTagBackgroundInlineMarkup = ~(variableSegment space* "=") argumentSeparatorOptionalComma tagArguments (space* ",")? space*
 
   liquidTagOpenCache = liquidTagOpenRule<"cache", liquidTagCacheMarkup>
   liquidTagCacheMarkup = liquidExpression<delimTag> renderArguments
@@ -228,7 +228,7 @@ Liquid <: Helpers {
   liquidTagOpenParseJson = liquidTagOpenRule<"parse_json", variableSegmentAsLookupMarkup>
 
   liquidTagOpenTransaction = liquidTagOpenRule<"transaction", liquidTagOpenTransactionMarkup>
-  liquidTagOpenTransactionMarkup = tagArguments space*
+  liquidTagOpenTransactionMarkup = tagArguments (space* ",")? space*
 
   liquidTagOpenTry = liquidTagOpenRule<"try", empty>
 
@@ -264,10 +264,10 @@ Liquid <: Helpers {
   exportVariable = variableSegmentAsLookup ~(space* ":")
 
   liquidTagContext = liquidTagRule<"context", liquidTagContextMarkup>
-  liquidTagContextMarkup = tagArguments space*
+  liquidTagContextMarkup = tagArguments (space* ",")? space*
 
   liquidTagSignIn = liquidTagRule<"sign_in", liquidTagSignInMarkup>
-  liquidTagSignInMarkup = tagArguments space*
+  liquidTagSignInMarkup = tagArguments (space* ",")? space*
 
   liquidTagRedirectTo = liquidTagRule<"redirect_to", liquidTagRedirectToMarkup>
   liquidTagRedirectToMarkup = liquidExpression<delimTag> renderArguments
@@ -313,7 +313,12 @@ Liquid <: Helpers {
     ) endOfIdentifier
 
   liquidTagOpenForm = liquidTagOpenRule<"form", liquidTagOpenFormMarkup>
-  liquidTagOpenFormMarkup = arguments<delimTag> (space* ",")? space*
+  // Matches the platformOS runtime (FormForTag): an optional positional model name first
+  // ({% form form, method: 'delete' %}), then key: value attributes. The runtime scans
+  // ${"`"}[\w-]+: value${"`"} pairs out of the markup, so keys may contain hyphens (html-class:,
+  // html-data-user-id:), commas between attributes are optional, and bare {% form %} is valid.
+  liquidTagOpenFormMarkup =
+    orderedListOf<positionalArgument<delimTag>, namedArgument<delimTag>, argumentSeparatorOptionalComma> (space* ",")? space*
 
   liquidTagOpenFor = liquidTagOpenRule<"for", liquidTagOpenForMarkup>
 
@@ -611,18 +616,27 @@ LiquidStatement <: Liquid {
   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.
+  // Inside {% liquid %} blocks, a tag's key:value argument list may span multiple lines.
+  // Every argument-list tag whose separator is argumentSeparatorOptionalComma — function,
+  // graphql, background, render, include, log, context, sign_in, transaction, cache, etc. —
+  // inherits this automatically; the base Liquid grammar keeps these horizontal-only outside
+  // {% liquid %}, so the standalone tag/block forms are unaffected (zero regression surface).
   //
-  // 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*
+  // A newline is only crossed AFTER a comma AND only when the next non-blank token is a
+  // named argument (${"`"}name:${"`"}). This mirrors the Ruby runtime's continuation guard
+  // (continuation_line? matches /\A[\w-]+\s*:/): a trailing comma followed by a new
+  // directive (another tag, an assign, an echo, a bare/positional value such as
+  // ${"`"}log "second"${"`"}, …) does NOT look like ${"`"}name:${"`"}, so the newline is not consumed, the list
+  // ends, and the comma is treated as a stylistic trailing comma — the next line stays a
+  // separate statement. This guard is essential for positional-accepting lists like log's,
+  // where a following directive would otherwise be swallowed as a positional argument.
+  //
+  // Both alternatives must have the same arity (3: space, comma, group) for Ohm's uniform-arity
+  // requirement and consistent visitor child indexing. The positive lookahead is written as
+  // ~(~(...)) so it contributes arity 0, keeping the first alternative's group at arity 3.
+  argumentSeparatorOptionalComma :=
+      space* "," ((space | newline)* ~(~(variableSegment space* ":")))
+    | space* ","? space*
 }
 
 LiquidDoc <: Helpers {

package/package.json

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