@platformos/liquid-html-parser 0.0.5 → 0.0.7

package/dist/errors.d.ts

@@ -1,4 +1,4 @@
-import { MatchResult } from 'ohm-js';
+import { FailedMatchResult } from 'ohm-js';
 import { NodeTypes, Position } from './types';
 interface LineColPosition {
     line: number;
@@ -9,7 +9,7 @@ export declare class LiquidHTMLCSTParsingError extends SyntaxError {
         start: LineColPosition;
         end: LineColPosition;
     };
-    constructor(ohm: MatchResult);
+    constructor(ohm: FailedMatchResult);
 }
 export type UnclosedNode = {
     type: NodeTypes;

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

@@ -79,9 +79,6 @@ export declare enum ConcreteNodeTypes {
     LiquidDocDescriptionNode = "LiquidDocDescriptionNode",
     LiquidDocExampleNode = "LiquidDocExampleNode",
     LiquidDocPromptNode = "LiquidDocPromptNode",
-    JsonHashLiteral = "JsonHashLiteral",
-    JsonArrayLiteral = "JsonArrayLiteral",
-    JsonKeyValuePair = "JsonKeyValuePair",
     BackgroundMarkup = "BackgroundMarkup",
     BackgroundInlineMarkup = "BackgroundInlineMarkup",
     CacheMarkup = "CacheMarkup",
@@ -276,8 +273,6 @@ export interface ConcreteLiquidTagAssign extends ConcreteLiquidTagNode<NamedTags
 }
 export interface ConcreteLiquidTagAssignMarkup extends ConcreteBasicNode<ConcreteNodeTypes.AssignMarkup> {
     name: string;
-    target: ConcreteLiquidVariableLookup;
-    operator: string;
     value: ConcreteLiquidVariable;
 }
 export interface ConcreteLiquidTagHashAssign extends ConcreteLiquidTagNode<NamedTags.hash_assign, ConcreteLiquidTagHashAssignMarkup> {
@@ -431,7 +426,7 @@ export interface ConcreteLiquidNamedArgument extends ConcreteBasicNode<ConcreteN
     name: string;
     value: ConcreteLiquidExpression;
 }
-export type ConcreteLiquidExpression = ConcreteStringLiteral | ConcreteNumberLiteral | ConcreteLiquidLiteral | ConcreteLiquidRange | ConcreteLiquidVariableLookup | ConcreteJsonHashLiteral | ConcreteJsonArrayLiteral;
+export type ConcreteLiquidExpression = ConcreteStringLiteral | ConcreteNumberLiteral | ConcreteLiquidLiteral | ConcreteLiquidRange | ConcreteLiquidVariableLookup;
 export type ConcreteComplexLiquidExpression = ConcreteLiquidBooleanExpression | ConcreteLiquidExpression;
 export interface ConcreteLiquidBooleanExpression extends ConcreteBasicNode<ConcreteNodeTypes.BooleanExpression> {
     conditions: ConcreteLiquidCondition[];
@@ -455,17 +450,6 @@ export interface ConcreteLiquidVariableLookup extends ConcreteBasicNode<Concrete
     name: string | null;
     lookups: ConcreteLiquidExpression[];
 }
-export interface ConcreteJsonHashLiteral extends ConcreteBasicNode<ConcreteNodeTypes.JsonHashLiteral> {
-    entries: ConcreteJsonKeyValuePair[];
-}
-export interface ConcreteJsonKeyValuePair extends ConcreteBasicNode<ConcreteNodeTypes.JsonKeyValuePair> {
-    key: ConcreteLiquidExpression;
-    value: ConcreteJsonValue;
-}
-export interface ConcreteJsonArrayLiteral extends ConcreteBasicNode<ConcreteNodeTypes.JsonArrayLiteral> {
-    elements: ConcreteJsonValue[];
-}
-export type ConcreteJsonValue = ConcreteJsonHashLiteral | ConcreteJsonArrayLiteral | 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

@@ -87,9 +87,6 @@ var ConcreteNodeTypes;
     ConcreteNodeTypes["LiquidDocDescriptionNode"] = "LiquidDocDescriptionNode";
     ConcreteNodeTypes["LiquidDocExampleNode"] = "LiquidDocExampleNode";
     ConcreteNodeTypes["LiquidDocPromptNode"] = "LiquidDocPromptNode";
-    ConcreteNodeTypes["JsonHashLiteral"] = "JsonHashLiteral";
-    ConcreteNodeTypes["JsonArrayLiteral"] = "JsonArrayLiteral";
-    ConcreteNodeTypes["JsonKeyValuePair"] = "JsonKeyValuePair";
     // platformos markup types
     ConcreteNodeTypes["BackgroundMarkup"] = "BackgroundMarkup";
     ConcreteNodeTypes["BackgroundInlineMarkup"] = "BackgroundInlineMarkup";
@@ -377,66 +374,12 @@ function toCST(source /* the original file */, grammars, grammar, cstMappings, m
         liquidTagLayoutMarkup: 0,
         liquidTagAssignMarkup: {
             type: ConcreteNodeTypes.AssignMarkup,
-            name: (tokens) => tokens[0].children[0].sourceString,
-            target: 0,
-            operator: 2,
-            value: 4,
-            locStart,
-            locEnd,
-            source,
-        },
-        assignTarget: {
-            type: ConcreteNodeTypes.VariableLookup,
             name: 0,
-            lookups: 1,
-            locStart,
-            locEnd,
-            source,
-        },
-        assignOperator: (node) => node.sourceString,
-        liquidAssignVariable: {
-            type: ConcreteNodeTypes.LiquidVariable,
-            expression: 0,
-            filters: 1,
-            rawSource: (tokens) => source.slice(locStart(tokens), tokens[tokens.length - 2].source.endIdx).trimEnd(),
-            locStart,
-            locEnd: locEndSecondToLast,
-            source,
-        },
-        liquidAssignExpression: 0,
-        liquidJsonHashLiteral: {
-            type: ConcreteNodeTypes.JsonHashLiteral,
-            entries: 2,
-            locStart,
-            locEnd,
-            source,
-        },
-        liquidJsonKeyValue: {
-            type: ConcreteNodeTypes.JsonKeyValuePair,
-            key: 0,
             value: 4,
             locStart,
             locEnd,
             source,
         },
-        liquidJsonKey: 0,
-        liquidJsonBareKey: {
-            type: ConcreteNodeTypes.VariableLookup,
-            name: 0,
-            lookups: () => [],
-            locStart,
-            locEnd,
-            source,
-        },
-        liquidJsonArrayLiteral: {
-            type: ConcreteNodeTypes.JsonArrayLiteral,
-            elements: 2,
-            locStart,
-            locEnd,
-            source,
-        },
-        liquidJsonValue: 0,
-        liquidJsonSep: 1,
         liquidTagHashAssignMarkup: {
             type: ConcreteNodeTypes.HashAssignMarkup,
             target: 0,

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 | PaginateMarkup | 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 | PaginateMarkup | RawMarkup | RenderVariableExpression | RenderAliasExpression | LiquidLogicalExpression | LiquidComparison | TextNode | LiquidDocParamNode | LiquidDocExampleNode | LiquidDocPromptNode | LiquidDocDescriptionNode | 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[];
@@ -137,12 +137,8 @@ export interface LiquidTagAssign extends LiquidTagNode<NamedTags.assign, AssignM
 }
 /** {% assign name = value %} */
 export interface AssignMarkup extends ASTNode<NodeTypes.AssignMarkup> {
-    /** the base variable name (backward compatible) */
+    /** the name of the variable that is being assigned */
     name: string;
-    /** bracket/dot lookups on the target (empty for simple assignment) */
-    lookups: LiquidExpression[];
-    /** '=' for assignment, '<<' for array append */
-    operator: '=' | '<<';
     /** the value of the variable that is being assigned */
     value: LiquidVariable;
 }
@@ -510,7 +506,7 @@ export interface LiquidVariable extends ASTNode<NodeTypes.LiquidVariable> {
     rawSource: string;
 }
 /** The union type of all Liquid expression nodes */
-export type LiquidExpression = LiquidString | LiquidNumber | LiquidLiteral | LiquidRange | LiquidVariableLookup | JsonHashLiteral | JsonArrayLiteral;
+export type LiquidExpression = LiquidString | LiquidNumber | LiquidLiteral | LiquidRange | LiquidVariableLookup;
 export type ComplexLiquidExpression = LiquidBooleanExpression | LiquidExpression;
 /** https://shopify.dev/docs/api/liquid/filters */
 export interface LiquidFilter extends ASTNode<NodeTypes.LiquidFilter> {
@@ -569,19 +565,6 @@ export interface LiquidVariableLookup extends ASTNode<NodeTypes.VariableLookup>
     /** name.lookup1[lookup2] */
     lookups: LiquidExpression[];
 }
-/** Represents a JSON hash literal { key: value, ... } */
-export interface JsonHashLiteral extends ASTNode<NodeTypes.JsonHashLiteral> {
-    entries: JsonKeyValuePair[];
-}
-/** Represents a key-value pair in a JSON hash literal */
-export interface JsonKeyValuePair extends ASTNode<NodeTypes.JsonKeyValuePair> {
-    key: LiquidExpression;
-    value: LiquidExpression;
-}
-/** Represents a JSON array literal [el1, el2, ...] */
-export interface JsonArrayLiteral extends ASTNode<NodeTypes.JsonArrayLiteral> {
-    elements: LiquidExpression[];
-}
 /** The union type of all HTML nodes */
 export type HtmlNode = HtmlComment | HtmlElement | HtmlDanglingMarkerClose | HtmlVoidElement | HtmlSelfClosingElement | HtmlRawNode;
 /** The basic HTML node with an opening and closing tags. */

package/dist/stage-2-ast.js

@@ -916,8 +916,6 @@ function toAssignMarkup(node) {
     return {
         type: types_1.NodeTypes.AssignMarkup,
         name: node.name,
-        lookups: node.target.lookups.map(toExpression),
-        operator: node.operator,
         value: toLiquidVariable(node.value),
         position: position(node),
         source: node.source,
@@ -1352,36 +1350,11 @@ function toExpression(node) {
                 source: node.source,
             };
         }
-        case stage_1_cst_1.ConcreteNodeTypes.JsonHashLiteral: {
-            return {
-                type: types_1.NodeTypes.JsonHashLiteral,
-                entries: node.entries.map(toJsonKeyValuePair),
-                position: position(node),
-                source: node.source,
-            };
-        }
-        case stage_1_cst_1.ConcreteNodeTypes.JsonArrayLiteral: {
-            return {
-                type: types_1.NodeTypes.JsonArrayLiteral,
-                elements: node.elements.map(toExpression),
-                position: position(node),
-                source: node.source,
-            };
-        }
         default: {
             return (0, utils_1.assertNever)(node);
         }
     }
 }
-function toJsonKeyValuePair(node) {
-    return {
-        type: types_1.NodeTypes.JsonKeyValuePair,
-        key: toExpression(node.key),
-        value: toExpression(node.value),
-        position: position(node),
-        source: node.source,
-    };
-}
 function toFilter(node) {
     return {
         type: types_1.NodeTypes.LiquidFilter,

package/dist/types.d.ts

@@ -51,9 +51,6 @@ export declare enum NodeTypes {
     LiquidDocParamNode = "LiquidDocParamNode",
     LiquidDocExampleNode = "LiquidDocExampleNode",
     LiquidDocPromptNode = "LiquidDocPromptNode",
-    JsonHashLiteral = "JsonHashLiteral",
-    JsonArrayLiteral = "JsonArrayLiteral",
-    JsonKeyValuePair = "JsonKeyValuePair",
     BackgroundMarkup = "BackgroundMarkup",
     BackgroundInlineMarkup = "BackgroundInlineMarkup",
     CacheMarkup = "CacheMarkup",

package/dist/types.js

@@ -49,9 +49,6 @@ var NodeTypes;
     NodeTypes["LiquidDocParamNode"] = "LiquidDocParamNode";
     NodeTypes["LiquidDocExampleNode"] = "LiquidDocExampleNode";
     NodeTypes["LiquidDocPromptNode"] = "LiquidDocPromptNode";
-    NodeTypes["JsonHashLiteral"] = "JsonHashLiteral";
-    NodeTypes["JsonArrayLiteral"] = "JsonArrayLiteral";
-    NodeTypes["JsonKeyValuePair"] = "JsonKeyValuePair";
     // platformos markup types
     NodeTypes["BackgroundMarkup"] = "BackgroundMarkup";
     NodeTypes["BackgroundInlineMarkup"] = "BackgroundInlineMarkup";

package/grammar/liquid-html.ohm.js

@@ -129,33 +129,7 @@ Liquid <: Helpers {
   liquidTagEchoMarkup = liquidVariable<delimTag>
 
   liquidTagAssign = liquidTagRule<"assign", liquidTagAssignMarkup>
-  liquidTagAssignMarkup = assignTarget<delimTag> space* assignOperator space* liquidAssignVariable<delimTag>
-
-  // Assign-specific sub-rules
-  assignTarget<delim> = variableSegment lookup<delim>*
-  assignOperator = "<<" | "="
-
-  // Assign variable: like liquidVariable but expression allows JSON literals
-  liquidAssignVariable<delim> = liquidAssignExpression<delim> liquidFilter<delim>* space* &delim
-  liquidAssignExpression<delim> =
-    | liquidJsonHashLiteral<delim>
-    | liquidJsonArrayLiteral<delim>
-    | liquidComplexExpression<delim>
-
-  // JSON literal rules (assign-only, recursive)
-  liquidJsonHashLiteral<delim> =
-    "{" space* listOf<liquidJsonKeyValue<delim>, liquidJsonSep> space* "}"
-  liquidJsonKeyValue<delim> =
-    liquidJsonKey<delim> space* ":" space* liquidJsonValue<delim>
-  liquidJsonKey<delim> = liquidString<delim> | liquidJsonBareKey
-  liquidJsonBareKey = variableSegment
-  liquidJsonArrayLiteral<delim> =
-    "[" space* listOf<liquidJsonValue<delim>, liquidJsonSep> space* "]"
-  liquidJsonValue<delim> =
-    | liquidJsonHashLiteral<delim>
-    | liquidJsonArrayLiteral<delim>
-    | liquidExpression<delim>
-  liquidJsonSep = space* "," space*
+  liquidTagAssignMarkup = variableSegment space* "=" space* liquidVariable<delimTag>
 
   liquidTagHashAssign = liquidTagRule<"hash_assign", liquidTagHashAssignMarkup>
   liquidTagHashAssignMarkup = liquidVariableLookup<delimTag> space* "=" space* liquidVariable<delimTag>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformos/liquid-html-parser",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Liquid HTML parser for platformOS",
   "author": "platformOS",
   "homepage": "https://github.com/Platform-OS/platformos-tools/tree/master/packages/liquid-html-parser#readme",
@@ -33,9 +33,9 @@
   },
   "dependencies": {
     "line-column": "^1.0.2",
-    "ohm-js": "^17.0.0"
+    "ohm-js": "^17.5.0"
   },
   "devDependencies": {
-    "@types/line-column": "^1.0.0"
+    "@types/line-column": "^1.0.2"
   }
 }