@traqula/rules-sparql-1-1 0.0.3 → 0.0.4

package/lib/grammar/solutionModifier.js

@@ -9,10 +9,10 @@ import { constraint, functionCall } from './whereClause';
 export const solutionModifier = {
     name: 'solutionModifier',
     impl: ({ ACTION, SUBRULE, OPTION1, OPTION2, OPTION3, OPTION4 }) => () => {
-        const group = OPTION1(() => SUBRULE(groupClause, undefined));
-        const having = OPTION2(() => SUBRULE(havingClause, undefined));
-        const order = OPTION3(() => SUBRULE(orderClause, undefined));
-        const limitOffset = OPTION4(() => SUBRULE(limitOffsetClauses, undefined));
+        const group = OPTION1(() => SUBRULE(groupClause));
+        const having = OPTION2(() => SUBRULE(havingClause));
+        const order = OPTION3(() => SUBRULE(orderClause));
+        const limitOffset = OPTION4(() => SUBRULE(limitOffsetClauses));
         return ACTION(() => ({
             ...(limitOffset && { limitOffset }),
             ...(group && { group }),
@@ -22,16 +22,16 @@ export const solutionModifier = {
     },
     gImpl: ({ SUBRULE }) => (ast) => {
         if (ast.group) {
-            SUBRULE(groupClause, ast.group, undefined);
+            SUBRULE(groupClause, ast.group);
         }
         if (ast.having) {
-            SUBRULE(havingClause, ast.having, undefined);
+            SUBRULE(havingClause, ast.having);
         }
         if (ast.order) {
-            SUBRULE(orderClause, ast.order, undefined);
+            SUBRULE(orderClause, ast.order);
         }
         if (ast.limitOffset) {
-            SUBRULE(limitOffsetClauses, ast.limitOffset, undefined);
+            SUBRULE(limitOffsetClauses, ast.limitOffset);
         }
     },
 };
@@ -45,7 +45,7 @@ export const groupClause = {
         const start = CONSUME(l.groupByGroup);
         CONSUME(l.by);
         AT_LEAST_ONE(() => {
-            groupings.push(SUBRULE1(groupCondition, undefined));
+            groupings.push(SUBRULE1(groupCondition));
         });
         return ACTION(() => ({
             type: 'solutionModifier',
@@ -58,13 +58,13 @@ export const groupClause = {
         F.printFilter(ast, () => PRINT_WORDS('GROUP', 'BY'));
         for (const grouping of ast.groupings) {
             if (F.isExpression(grouping)) {
-                SUBRULE(expression, grouping, undefined);
+                SUBRULE(expression, grouping);
             }
             else {
                 F.printFilter(ast, () => PRINT_WORDS('('));
-                SUBRULE(expression, grouping.value, undefined);
+                SUBRULE(expression, grouping.value);
                 F.printFilter(ast, () => PRINT_WORDS('AS'));
-                SUBRULE(var_, grouping.variable, undefined);
+                SUBRULE(var_, grouping.variable);
                 F.printFilter(ast, () => PRINT_WORDS(')'));
             }
         }
@@ -76,17 +76,17 @@ export const groupClause = {
 export const groupCondition = {
     name: 'groupCondition',
     impl: ({ ACTION, SUBRULE, CONSUME, SUBRULE1, SUBRULE2, OPTION, OR }) => C => OR([
-        { ALT: () => SUBRULE(builtInCall, undefined) },
-        { ALT: () => SUBRULE(functionCall, undefined) },
-        { ALT: () => SUBRULE2(var_, undefined) },
+        { ALT: () => SUBRULE(builtInCall) },
+        { ALT: () => SUBRULE(functionCall) },
+        { ALT: () => SUBRULE2(var_) },
         {
             ALT: () => {
                 // Creates a bracketted expression or a Bind.
                 const open = CONSUME(l.symbols.LParen);
-                const expressionValue = SUBRULE(expression, undefined);
+                const expressionValue = SUBRULE(expression);
                 const variable = OPTION(() => {
                     CONSUME(l.as);
-                    return SUBRULE1(var_, undefined);
+                    return SUBRULE1(var_);
                 });
                 const close = CONSUME(l.symbols.RParen);
                 return ACTION(() => {
@@ -113,7 +113,7 @@ export const havingClause = {
         const expressions = [];
         const couldParseAgg = ACTION(() => C.parseMode.has('canParseAggregate') || !C.parseMode.add('canParseAggregate'));
         AT_LEAST_ONE(() => {
-            expressions.push(SUBRULE(havingCondition, undefined));
+            expressions.push(SUBRULE(havingCondition));
         });
         ACTION(() => !couldParseAgg && C.parseMode.delete('canParseAggregate'));
         return ACTION(() => C.factory.solutionModifierHaving(expressions, C.factory.sourceLocation(having, expressions.at(-1))));
@@ -121,7 +121,7 @@ export const havingClause = {
     gImpl: ({ PRINT_WORD, SUBRULE }) => (ast, { factory: F }) => {
         F.printFilter(ast, () => PRINT_WORD('HAVING'));
         for (const having of ast.having) {
-            SUBRULE(expression, having, undefined);
+            SUBRULE(expression, having);
         }
     },
 };
@@ -130,7 +130,7 @@ export const havingClause = {
  */
 export const havingCondition = {
     name: 'havingCondition',
-    impl: ({ SUBRULE }) => () => SUBRULE(constraint, undefined),
+    impl: ({ SUBRULE }) => () => SUBRULE(constraint),
 };
 /**
  * [[23]](https://www.w3.org/TR/sparql11-query/#rOrderClause)
@@ -143,7 +143,7 @@ export const orderClause = {
         const orderings = [];
         const couldParseAgg = ACTION(() => C.parseMode.has('canParseAggregate') || !C.parseMode.add('canParseAggregate'));
         AT_LEAST_ONE(() => {
-            orderings.push(SUBRULE1(orderCondition, undefined));
+            orderings.push(SUBRULE1(orderCondition));
         });
         ACTION(() => !couldParseAgg && C.parseMode.delete('canParseAggregate'));
         return ACTION(() => C.factory.solutionModifierOrder(orderings, C.factory.sourceLocation(order, orderings.at(-1))));
@@ -158,7 +158,7 @@ export const orderClause = {
                 F.printFilter(ast, () => PRINT_WORDS('ASC'));
             }
             F.printFilter(ast, () => PRINT_WORDS('('));
-            SUBRULE(expression, ordering.expression, undefined);
+            SUBRULE(expression, ordering.expression);
             F.printFilter(ast, () => PRINT_WORDS(')'));
         }
     },
@@ -180,7 +180,7 @@ export const orderCondition = {
                             return [true, token];
                         } },
                 ]);
-                const expr = SUBRULE(brackettedExpression, undefined);
+                const expr = SUBRULE(brackettedExpression);
                 return ACTION(() => ({
                     expression: expr,
                     descending: descending[0],
@@ -188,11 +188,11 @@ export const orderCondition = {
                 }));
             } },
         { ALT: () => {
-                const expr = SUBRULE(constraint, undefined);
+                const expr = SUBRULE(constraint);
                 return ACTION(() => ({ expression: expr, descending: false, loc: expr.loc }));
             } },
         { ALT: () => {
-                const expr = SUBRULE(var_, undefined);
+                const expr = SUBRULE(var_);
                 return ACTION(() => ({ expression: expr, descending: false, loc: expr.loc }));
             } },
     ]),
@@ -205,13 +205,13 @@ export const limitOffsetClauses = {
     name: 'limitOffsetClauses',
     impl: ({ ACTION, SUBRULE1, SUBRULE2, OPTION1, OPTION2, OR }) => C => OR([
         { ALT: () => {
-                const limit = SUBRULE1(limitClause, undefined);
-                const offset = OPTION1(() => SUBRULE1(offsetClause, undefined));
+                const limit = SUBRULE1(limitClause);
+                const offset = OPTION1(() => SUBRULE1(offsetClause));
                 return ACTION(() => C.factory.solutionModifierLimitOffset(limit.val, offset?.val, C.factory.sourceLocation(limit, ...(offset ? [offset] : []))));
             } },
         { ALT: () => {
-                const offset = SUBRULE2(offsetClause, undefined);
-                const limit = OPTION2(() => SUBRULE2(limitClause, undefined));
+                const offset = SUBRULE2(offsetClause);
+                const limit = OPTION2(() => SUBRULE2(limitClause));
                 return ACTION(() => C.factory.solutionModifierLimitOffset(limit?.val, offset.val, C.factory.sourceLocation(offset, limit)));
             } },
     ]),

package/lib/grammar/solutionModifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"solutionModifier.js","sourceRoot":"","sources":["solutionModifier.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IToken } from '@chevrotain/types';\nimport type { Wrap } from '@traqula/core';\nimport * as l from '../lexer';\nimport type {\n  Expression,\n  SolutionModifierGroup,\n  SolutionModifierGroupBind,\n  SolutionModifierHaving,\n  SolutionModifierOrder,\n  Ordering,\n  SolutionModifierLimitOffset,\n  SolutionModifiers,\n} from '../RoundTripTypes';\nimport type { SparqlGrammarRule, SparqlRule } from '../Sparql11types';\nimport { builtInCall } from './builtIn';\nimport { brackettedExpression, expression } from './expression';\nimport { var_ } from './general';\nimport { constraint, functionCall } from './whereClause';\n\n/**\n * [[18]](https://www.w3.org/TR/sparql11-query/#rSolutionModifier)\n */\nexport const solutionModifier: SparqlRule<'solutionModifier', SolutionModifiers> = <const> {\n  name: 'solutionModifier',\n  impl: ({ ACTION, SUBRULE, OPTION1, OPTION2, OPTION3, OPTION4 }) => () => {\n    const group = OPTION1(() => SUBRULE(groupClause, undefined));\n    const having = OPTION2(() => SUBRULE(havingClause, undefined));\n    const order = OPTION3(() => SUBRULE(orderClause, undefined));\n    const limitOffset = OPTION4(() => SUBRULE(limitOffsetClauses, undefined));\n    return ACTION(() => ({\n      ...(limitOffset && { limitOffset }),\n      ...(group && { group }),\n      ...(having && { having }),\n      ...(order && { order }),\n    }));\n  },\n  gImpl: ({ SUBRULE }) => (ast) => {\n    if (ast.group) {\n      SUBRULE(groupClause, ast.group, undefined);\n    }\n    if (ast.having) {\n      SUBRULE(havingClause, ast.having, undefined);\n    }\n    if (ast.order) {\n      SUBRULE(orderClause, ast.order, undefined);\n    }\n    if (ast.limitOffset) {\n      SUBRULE(limitOffsetClauses, ast.limitOffset, undefined);\n    }\n  },\n};\n\n/**\n * [[19]](https://www.w3.org/TR/sparql11-query/#rGroupClause)\n */\nexport const groupClause: SparqlRule<'groupClause', SolutionModifierGroup> = <const> {\n  name: 'groupClause',\n  impl: ({ ACTION, AT_LEAST_ONE, SUBRULE1, CONSUME }) => (C) => {\n    const groupings: (Expression | SolutionModifierGroupBind)[] = [];\n    const start = CONSUME(l.groupByGroup);\n    CONSUME(l.by);\n    AT_LEAST_ONE(() => {\n      groupings.push(SUBRULE1(groupCondition, undefined));\n    });\n\n    return ACTION(() => ({\n      type: 'solutionModifier',\n      subType: 'group',\n      groupings,\n      loc: C.factory.sourceLocation(start, groupings.at(-1)),\n    }));\n  },\n  gImpl: ({ PRINT_WORDS, SUBRULE }) => (ast, { factory: F }) => {\n    F.printFilter(ast, () => PRINT_WORDS('GROUP', 'BY'));\n    for (const grouping of ast.groupings) {\n      if (F.isExpression(grouping)) {\n        SUBRULE(expression, grouping, undefined);\n      } else {\n        F.printFilter(ast, () => PRINT_WORDS('('));\n        SUBRULE(expression, grouping.value, undefined);\n        F.printFilter(ast, () => PRINT_WORDS('AS'));\n        SUBRULE(var_, grouping.variable, undefined);\n        F.printFilter(ast, () => PRINT_WORDS(')'));\n      }\n    }\n  },\n};\n\n/**\n * [[20]](https://www.w3.org/TR/sparql11-query/#rGroupCondition)\n */\nexport const groupCondition: SparqlGrammarRule<'groupCondition', Expression | SolutionModifierGroupBind> = <const>{\n  name: 'groupCondition',\n  impl: ({ ACTION, SUBRULE, CONSUME, SUBRULE1, SUBRULE2, OPTION, OR }) => C =>\n    OR<Expression | SolutionModifierGroupBind>([\n      { ALT: () => SUBRULE(builtInCall, undefined) },\n      { ALT: () => SUBRULE(functionCall, undefined) },\n      { ALT: () => SUBRULE2(var_, undefined) },\n      {\n        ALT: () => {\n          // Creates a bracketted expression or a Bind.\n          const open = CONSUME(l.symbols.LParen);\n          const expressionValue = SUBRULE(expression, undefined);\n          const variable = OPTION(() => {\n            CONSUME(l.as);\n            return SUBRULE1(var_, undefined);\n          });\n          const close = CONSUME(l.symbols.RParen);\n          return ACTION(() => {\n            if (variable !== undefined) {\n              return {\n                variable,\n                value: expressionValue,\n                loc: C.factory.sourceLocation(open, close),\n              } satisfies SolutionModifierGroupBind;\n            }\n            return expressionValue;\n          });\n        },\n      },\n    ]),\n};\n\n/**\n * [[21]](https://www.w3.org/TR/sparql11-query/#rHavingClause)\n */\nexport const havingClause: SparqlRule<'havingClause', SolutionModifierHaving> = <const> {\n  name: 'havingClause',\n  impl: ({ ACTION, AT_LEAST_ONE, SUBRULE, CONSUME }) => (C) => {\n    const having = CONSUME(l.having);\n    const expressions: Expression[] = [];\n\n    const couldParseAgg = ACTION(() =>\n      C.parseMode.has('canParseAggregate') || !C.parseMode.add('canParseAggregate'));\n    AT_LEAST_ONE(() => {\n      expressions.push(SUBRULE(havingCondition, undefined));\n    });\n    ACTION(() => !couldParseAgg && C.parseMode.delete('canParseAggregate'));\n\n    return ACTION(() =>\n      C.factory.solutionModifierHaving(expressions, C.factory.sourceLocation(having, expressions.at(-1))));\n  },\n  gImpl: ({ PRINT_WORD, SUBRULE }) => (ast, { factory: F }) => {\n    F.printFilter(ast, () => PRINT_WORD('HAVING'));\n    for (const having of ast.having) {\n      SUBRULE(expression, having, undefined);\n    }\n  },\n};\n\n/**\n * [[22]](https://www.w3.org/TR/sparql11-query/#rHavingCondition)\n */\nexport const havingCondition: SparqlGrammarRule<'havingCondition', Expression> = <const> {\n  name: 'havingCondition',\n  impl: ({ SUBRULE }) => () => SUBRULE(constraint, undefined),\n};\n\n/**\n * [[23]](https://www.w3.org/TR/sparql11-query/#rOrderClause)\n */\nexport const orderClause: SparqlRule<'orderClause', SolutionModifierOrder> = <const> {\n  name: 'orderClause',\n  impl: ({ ACTION, AT_LEAST_ONE, SUBRULE1, CONSUME }) => (C) => {\n    const order = CONSUME(l.order);\n    CONSUME(l.by);\n    const orderings: Ordering[] = [];\n\n    const couldParseAgg = ACTION(() =>\n      C.parseMode.has('canParseAggregate') || !C.parseMode.add('canParseAggregate'));\n    AT_LEAST_ONE(() => {\n      orderings.push(SUBRULE1(orderCondition, undefined));\n    });\n    ACTION(() => !couldParseAgg && C.parseMode.delete('canParseAggregate'));\n\n    return ACTION(() =>\n      C.factory.solutionModifierOrder(orderings, C.factory.sourceLocation(order, orderings.at(-1))));\n  },\n  gImpl: ({ PRINT_WORDS, SUBRULE }) => (ast, { factory: F }) => {\n    F.printFilter(ast, () => PRINT_WORDS('ORDER', 'BY'));\n    for (const ordering of ast.orderDefs) {\n      if (ordering.descending) {\n        F.printFilter(ast, () => PRINT_WORDS('DESC'));\n      } else {\n        F.printFilter(ast, () => PRINT_WORDS('ASC'));\n      }\n      F.printFilter(ast, () => PRINT_WORDS('('));\n      SUBRULE(expression, ordering.expression, undefined);\n      F.printFilter(ast, () => PRINT_WORDS(')'));\n    }\n  },\n};\n\n/**\n * [[24]](https://www.w3.org/TR/sparql11-query/#rOrderCondition)\n */\nexport const orderCondition: SparqlGrammarRule<'orderCondition', Ordering> = <const> {\n  name: 'orderCondition',\n  impl: ({ ACTION, SUBRULE, CONSUME, OR1, OR2 }) => C => OR1<Ordering>([\n    { ALT: () => {\n      const descending = OR2<[boolean, IToken]>([\n        { ALT: () => {\n          const token = CONSUME(l.orderAsc);\n          return <const>[ false, token ];\n        } },\n        { ALT: () => {\n          const token = CONSUME(l.orderDesc);\n          return <const> [ true, token ];\n        } },\n      ]);\n\n      const expr = SUBRULE(brackettedExpression, undefined);\n\n      return ACTION(() => ({\n        expression: expr,\n        descending: descending[0],\n        loc: C.factory.sourceLocation(descending[1], expr),\n      }));\n    } },\n    { ALT: () => {\n      const expr = SUBRULE(constraint, undefined);\n      return ACTION(() => ({ expression: expr, descending: false, loc: expr.loc }));\n    } },\n    { ALT: () => {\n      const expr = SUBRULE(var_, undefined);\n      return ACTION(() => ({ expression: expr, descending: false, loc: expr.loc }));\n    } },\n  ]),\n};\n\n/**\n * Parses limit and or offset in any order.\n * [[25]](https://www.w3.org/TR/sparql11-query/#rLimitOffsetClauses)\n */\nexport const limitOffsetClauses: SparqlRule<'limitOffsetClauses', SolutionModifierLimitOffset> = <const> {\n  name: 'limitOffsetClauses',\n  impl: ({ ACTION, SUBRULE1, SUBRULE2, OPTION1, OPTION2, OR }) => C => OR([\n    { ALT: () => {\n      const limit = SUBRULE1(limitClause, undefined);\n      const offset = OPTION1(() => SUBRULE1(offsetClause, undefined));\n      return ACTION(() => C.factory.solutionModifierLimitOffset(\n        limit.val,\n        offset?.val,\n        C.factory.sourceLocation(limit, ...(offset ? [ offset ] : [])),\n      ));\n    } },\n    { ALT: () => {\n      const offset = SUBRULE2(offsetClause, undefined);\n      const limit = OPTION2(() => SUBRULE2(limitClause, undefined));\n      return ACTION(() => C.factory.solutionModifierLimitOffset(\n        limit?.val,\n        offset.val,\n        C.factory.sourceLocation(offset, limit),\n      ));\n    } },\n  ]),\n  gImpl: ({ PRINT_WORDS }) => (ast, { factory: F }) => {\n    F.printFilter(ast, () => {\n      if (ast.limit) {\n        PRINT_WORDS('LIMIT', String(ast.limit));\n      }\n      if (ast.offset) {\n        PRINT_WORDS('OFFSET', String(ast.offset));\n      }\n    });\n  },\n};\n\n/**\n * [[26]](https://www.w3.org/TR/sparql11-query/#rLimitClause)\n */\nexport const limitClause: SparqlGrammarRule<'limitClause', Wrap<number>> = <const> {\n  name: 'limitClause',\n  impl: ({ ACTION, CONSUME }) => (C) => {\n    const offset = CONSUME(l.limit);\n    const value = CONSUME(l.terminals.integer);\n    const val = Number.parseInt(value.image, 10);\n    return ACTION(() => C.factory.wrap(val, C.factory.sourceLocation(offset, value)));\n  },\n};\n\n/**\n * [[27]](https://www.w3.org/TR/sparql11-query/#rWhereClause)\n */\nexport const offsetClause: SparqlGrammarRule<'offsetClause', Wrap<number>> = <const> {\n  name: <const> 'offsetClause',\n  impl: ({ CONSUME, ACTION }) => (C) => {\n    const offset = CONSUME(l.offset);\n    const value = CONSUME(l.terminals.integer);\n    const val = Number.parseInt(value.image, 10);\n    return ACTION(() => C.factory.wrap(val, C.factory.sourceLocation(offset, value)));\n  },\n};\n"]}
+{"version":3,"file":"solutionModifier.js","sourceRoot":"","sources":["solutionModifier.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IToken } from '@chevrotain/types';\nimport type { Wrap } from '@traqula/core';\nimport * as l from '../lexer';\nimport type { SparqlGrammarRule, SparqlRule } from '../sparql11HelperTypes';\nimport type {\n  Expression,\n  SolutionModifierGroup,\n  SolutionModifierGroupBind,\n  SolutionModifierHaving,\n  SolutionModifierOrder,\n  Ordering,\n  SolutionModifierLimitOffset,\n  SolutionModifiers,\n} from '../Sparql11types';\nimport { builtInCall } from './builtIn';\nimport { brackettedExpression, expression } from './expression';\nimport { var_ } from './general';\nimport { constraint, functionCall } from './whereClause';\n\n/**\n * [[18]](https://www.w3.org/TR/sparql11-query/#rSolutionModifier)\n */\nexport const solutionModifier: SparqlRule<'solutionModifier', SolutionModifiers> = <const> {\n  name: 'solutionModifier',\n  impl: ({ ACTION, SUBRULE, OPTION1, OPTION2, OPTION3, OPTION4 }) => () => {\n    const group = OPTION1(() => SUBRULE(groupClause));\n    const having = OPTION2(() => SUBRULE(havingClause));\n    const order = OPTION3(() => SUBRULE(orderClause));\n    const limitOffset = OPTION4(() => SUBRULE(limitOffsetClauses));\n    return ACTION(() => ({\n      ...(limitOffset && { limitOffset }),\n      ...(group && { group }),\n      ...(having && { having }),\n      ...(order && { order }),\n    }));\n  },\n  gImpl: ({ SUBRULE }) => (ast) => {\n    if (ast.group) {\n      SUBRULE(groupClause, ast.group);\n    }\n    if (ast.having) {\n      SUBRULE(havingClause, ast.having);\n    }\n    if (ast.order) {\n      SUBRULE(orderClause, ast.order);\n    }\n    if (ast.limitOffset) {\n      SUBRULE(limitOffsetClauses, ast.limitOffset);\n    }\n  },\n};\n\n/**\n * [[19]](https://www.w3.org/TR/sparql11-query/#rGroupClause)\n */\nexport const groupClause: SparqlRule<'groupClause', SolutionModifierGroup> = <const> {\n  name: 'groupClause',\n  impl: ({ ACTION, AT_LEAST_ONE, SUBRULE1, CONSUME }) => (C) => {\n    const groupings: (Expression | SolutionModifierGroupBind)[] = [];\n    const start = CONSUME(l.groupByGroup);\n    CONSUME(l.by);\n    AT_LEAST_ONE(() => {\n      groupings.push(SUBRULE1(groupCondition));\n    });\n\n    return ACTION(() => ({\n      type: 'solutionModifier',\n      subType: 'group',\n      groupings,\n      loc: C.factory.sourceLocation(start, groupings.at(-1)),\n    }));\n  },\n  gImpl: ({ PRINT_WORDS, SUBRULE }) => (ast, { factory: F }) => {\n    F.printFilter(ast, () => PRINT_WORDS('GROUP', 'BY'));\n    for (const grouping of ast.groupings) {\n      if (F.isExpression(grouping)) {\n        SUBRULE(expression, grouping);\n      } else {\n        F.printFilter(ast, () => PRINT_WORDS('('));\n        SUBRULE(expression, grouping.value);\n        F.printFilter(ast, () => PRINT_WORDS('AS'));\n        SUBRULE(var_, grouping.variable);\n        F.printFilter(ast, () => PRINT_WORDS(')'));\n      }\n    }\n  },\n};\n\n/**\n * [[20]](https://www.w3.org/TR/sparql11-query/#rGroupCondition)\n */\nexport const groupCondition: SparqlGrammarRule<'groupCondition', Expression | SolutionModifierGroupBind> = <const>{\n  name: 'groupCondition',\n  impl: ({ ACTION, SUBRULE, CONSUME, SUBRULE1, SUBRULE2, OPTION, OR }) => C =>\n    OR<Expression | SolutionModifierGroupBind>([\n      { ALT: () => SUBRULE(builtInCall) },\n      { ALT: () => SUBRULE(functionCall) },\n      { ALT: () => SUBRULE2(var_) },\n      {\n        ALT: () => {\n          // Creates a bracketted expression or a Bind.\n          const open = CONSUME(l.symbols.LParen);\n          const expressionValue = SUBRULE(expression);\n          const variable = OPTION(() => {\n            CONSUME(l.as);\n            return SUBRULE1(var_);\n          });\n          const close = CONSUME(l.symbols.RParen);\n          return ACTION(() => {\n            if (variable !== undefined) {\n              return {\n                variable,\n                value: expressionValue,\n                loc: C.factory.sourceLocation(open, close),\n              } satisfies SolutionModifierGroupBind;\n            }\n            return expressionValue;\n          });\n        },\n      },\n    ]),\n};\n\n/**\n * [[21]](https://www.w3.org/TR/sparql11-query/#rHavingClause)\n */\nexport const havingClause: SparqlRule<'havingClause', SolutionModifierHaving> = <const> {\n  name: 'havingClause',\n  impl: ({ ACTION, AT_LEAST_ONE, SUBRULE, CONSUME }) => (C) => {\n    const having = CONSUME(l.having);\n    const expressions: Expression[] = [];\n\n    const couldParseAgg = ACTION(() =>\n      C.parseMode.has('canParseAggregate') || !C.parseMode.add('canParseAggregate'));\n    AT_LEAST_ONE(() => {\n      expressions.push(SUBRULE(havingCondition));\n    });\n    ACTION(() => !couldParseAgg && C.parseMode.delete('canParseAggregate'));\n\n    return ACTION(() =>\n      C.factory.solutionModifierHaving(expressions, C.factory.sourceLocation(having, expressions.at(-1))));\n  },\n  gImpl: ({ PRINT_WORD, SUBRULE }) => (ast, { factory: F }) => {\n    F.printFilter(ast, () => PRINT_WORD('HAVING'));\n    for (const having of ast.having) {\n      SUBRULE(expression, having);\n    }\n  },\n};\n\n/**\n * [[22]](https://www.w3.org/TR/sparql11-query/#rHavingCondition)\n */\nexport const havingCondition: SparqlGrammarRule<'havingCondition', Expression> = <const> {\n  name: 'havingCondition',\n  impl: ({ SUBRULE }) => () => SUBRULE(constraint),\n};\n\n/**\n * [[23]](https://www.w3.org/TR/sparql11-query/#rOrderClause)\n */\nexport const orderClause: SparqlRule<'orderClause', SolutionModifierOrder> = <const> {\n  name: 'orderClause',\n  impl: ({ ACTION, AT_LEAST_ONE, SUBRULE1, CONSUME }) => (C) => {\n    const order = CONSUME(l.order);\n    CONSUME(l.by);\n    const orderings: Ordering[] = [];\n\n    const couldParseAgg = ACTION(() =>\n      C.parseMode.has('canParseAggregate') || !C.parseMode.add('canParseAggregate'));\n    AT_LEAST_ONE(() => {\n      orderings.push(SUBRULE1(orderCondition));\n    });\n    ACTION(() => !couldParseAgg && C.parseMode.delete('canParseAggregate'));\n\n    return ACTION(() =>\n      C.factory.solutionModifierOrder(orderings, C.factory.sourceLocation(order, orderings.at(-1))));\n  },\n  gImpl: ({ PRINT_WORDS, SUBRULE }) => (ast, { factory: F }) => {\n    F.printFilter(ast, () => PRINT_WORDS('ORDER', 'BY'));\n    for (const ordering of ast.orderDefs) {\n      if (ordering.descending) {\n        F.printFilter(ast, () => PRINT_WORDS('DESC'));\n      } else {\n        F.printFilter(ast, () => PRINT_WORDS('ASC'));\n      }\n      F.printFilter(ast, () => PRINT_WORDS('('));\n      SUBRULE(expression, ordering.expression);\n      F.printFilter(ast, () => PRINT_WORDS(')'));\n    }\n  },\n};\n\n/**\n * [[24]](https://www.w3.org/TR/sparql11-query/#rOrderCondition)\n */\nexport const orderCondition: SparqlGrammarRule<'orderCondition', Ordering> = <const> {\n  name: 'orderCondition',\n  impl: ({ ACTION, SUBRULE, CONSUME, OR1, OR2 }) => C => OR1<Ordering>([\n    { ALT: () => {\n      const descending = OR2<[boolean, IToken]>([\n        { ALT: () => {\n          const token = CONSUME(l.orderAsc);\n          return <const>[ false, token ];\n        } },\n        { ALT: () => {\n          const token = CONSUME(l.orderDesc);\n          return <const> [ true, token ];\n        } },\n      ]);\n\n      const expr = SUBRULE(brackettedExpression);\n\n      return ACTION(() => ({\n        expression: expr,\n        descending: descending[0],\n        loc: C.factory.sourceLocation(descending[1], expr),\n      }));\n    } },\n    { ALT: () => {\n      const expr = SUBRULE(constraint);\n      return ACTION(() => ({ expression: expr, descending: false, loc: expr.loc }));\n    } },\n    { ALT: () => {\n      const expr = SUBRULE(var_);\n      return ACTION(() => ({ expression: expr, descending: false, loc: expr.loc }));\n    } },\n  ]),\n};\n\n/**\n * Parses limit and or offset in any order.\n * [[25]](https://www.w3.org/TR/sparql11-query/#rLimitOffsetClauses)\n */\nexport const limitOffsetClauses: SparqlRule<'limitOffsetClauses', SolutionModifierLimitOffset> = <const> {\n  name: 'limitOffsetClauses',\n  impl: ({ ACTION, SUBRULE1, SUBRULE2, OPTION1, OPTION2, OR }) => C => OR([\n    { ALT: () => {\n      const limit = SUBRULE1(limitClause);\n      const offset = OPTION1(() => SUBRULE1(offsetClause));\n      return ACTION(() => C.factory.solutionModifierLimitOffset(\n        limit.val,\n        offset?.val,\n        C.factory.sourceLocation(limit, ...(offset ? [ offset ] : [])),\n      ));\n    } },\n    { ALT: () => {\n      const offset = SUBRULE2(offsetClause);\n      const limit = OPTION2(() => SUBRULE2(limitClause));\n      return ACTION(() => C.factory.solutionModifierLimitOffset(\n        limit?.val,\n        offset.val,\n        C.factory.sourceLocation(offset, limit),\n      ));\n    } },\n  ]),\n  gImpl: ({ PRINT_WORDS }) => (ast, { factory: F }) => {\n    F.printFilter(ast, () => {\n      if (ast.limit) {\n        PRINT_WORDS('LIMIT', String(ast.limit));\n      }\n      if (ast.offset) {\n        PRINT_WORDS('OFFSET', String(ast.offset));\n      }\n    });\n  },\n};\n\n/**\n * [[26]](https://www.w3.org/TR/sparql11-query/#rLimitClause)\n */\nexport const limitClause: SparqlGrammarRule<'limitClause', Wrap<number>> = <const> {\n  name: 'limitClause',\n  impl: ({ ACTION, CONSUME }) => (C) => {\n    const offset = CONSUME(l.limit);\n    const value = CONSUME(l.terminals.integer);\n    const val = Number.parseInt(value.image, 10);\n    return ACTION(() => C.factory.wrap(val, C.factory.sourceLocation(offset, value)));\n  },\n};\n\n/**\n * [[27]](https://www.w3.org/TR/sparql11-query/#rWhereClause)\n */\nexport const offsetClause: SparqlGrammarRule<'offsetClause', Wrap<number>> = <const> {\n  name: <const> 'offsetClause',\n  impl: ({ CONSUME, ACTION }) => (C) => {\n    const offset = CONSUME(l.offset);\n    const value = CONSUME(l.terminals.integer);\n    const val = Number.parseInt(value.image, 10);\n    return ACTION(() => C.factory.wrap(val, C.factory.sourceLocation(offset, value)));\n  },\n};\n"]}

package/lib/grammar/tripleBlock.d.ts

@@ -1,5 +1,5 @@
-import type { BasicGraphPattern, Path, PatternBgp, Term, TermVariable, TripleCollection, TripleCollectionBlankNodeProperties, TripleCollectionList, TripleNesting } from '../RoundTripTypes';
-import type { SparqlGrammarRule, SparqlRule } from '../Sparql11types';
+import type { SparqlGrammarRule, SparqlRule } from '../sparql11HelperTypes';
+import type { BasicGraphPattern, GraphNode, Path, PatternBgp, Term, TermVariable, TripleCollection, TripleCollectionBlankNodeProperties, TripleCollectionList, TripleNesting } from '../Sparql11types';
 /**
  * [[55]](https://www.w3.org/TR/sparql11-query/#rTriplesBlock)
  */
@@ -10,10 +10,10 @@ export declare const triplesSameSubjectPath: SparqlGrammarRule<"triplesSameSubje
  * [[52]](https://www.w3.org/TR/sparql11-query/#rTriplesTemplate)
  */
 export declare const triplesTemplate: SparqlGrammarRule<'triplesTemplate', PatternBgp>;
-export declare const propertyList: SparqlGrammarRule<"propertyList", TripleNesting[], Pick<TripleNesting, "subject">>;
-export declare const propertyListPath: SparqlGrammarRule<"propertyListPath", TripleNesting[], Pick<TripleNesting, "subject">>;
-export declare const propertyListNotEmpty: SparqlGrammarRule<"propertyListNotEmpty", TripleNesting[], Pick<TripleNesting, "subject">>;
-export declare const propertyListPathNotEmpty: SparqlGrammarRule<"propertyListPathNotEmpty", TripleNesting[], Pick<TripleNesting, "subject">>;
+export declare const propertyList: SparqlGrammarRule<"propertyList", TripleNesting[], [GraphNode]>;
+export declare const propertyListPath: SparqlGrammarRule<"propertyListPath", TripleNesting[], [GraphNode]>;
+export declare const propertyListNotEmpty: SparqlGrammarRule<"propertyListNotEmpty", TripleNesting[], [GraphNode]>;
+export declare const propertyListPathNotEmpty: SparqlGrammarRule<"propertyListPathNotEmpty", TripleNesting[], [GraphNode]>;
 /**
  * [[84]](https://www.w3.org/TR/sparql11-query/#rVerbPath)
  */
@@ -22,10 +22,10 @@ export declare const verbPath: SparqlGrammarRule<'verbPath', Path>;
  * [[85]](https://www.w3.org/TR/sparql11-query/#rVerbSimple)
  */
 export declare const verbSimple: SparqlGrammarRule<'verbSimple', TermVariable>;
-export declare const objectList: SparqlGrammarRule<"objectList", TripleNesting[], Pick<TripleNesting, "subject" | "predicate">>;
-export declare const objectListPath: SparqlGrammarRule<"objectListPath", TripleNesting[], Pick<TripleNesting, "subject" | "predicate">>;
-export declare const object: SparqlGrammarRule<"object", TripleNesting, Pick<TripleNesting, "subject" | "predicate">>;
-export declare const objectPath: SparqlGrammarRule<"objectPath", TripleNesting, Pick<TripleNesting, "subject" | "predicate">>;
+export declare const objectList: SparqlGrammarRule<"objectList", TripleNesting[], [GraphNode, import("..").TermIriFull | import("..").TermIriPrefixed | TermVariable | import("..").PropertyPathChain | import("..").PathModified | import("..").PathNegated]>;
+export declare const objectListPath: SparqlGrammarRule<"objectListPath", TripleNesting[], [GraphNode, import("..").TermIriFull | import("..").TermIriPrefixed | TermVariable | import("..").PropertyPathChain | import("..").PathModified | import("..").PathNegated]>;
+export declare const object: SparqlGrammarRule<"object", TripleNesting, [GraphNode, import("..").TermIriFull | import("..").TermIriPrefixed | TermVariable | import("..").PropertyPathChain | import("..").PathModified | import("..").PathNegated]>;
+export declare const objectPath: SparqlGrammarRule<"objectPath", TripleNesting, [GraphNode, import("..").TermIriFull | import("..").TermIriPrefixed | TermVariable | import("..").PropertyPathChain | import("..").PathModified | import("..").PathNegated]>;
 export declare const collection: SparqlRule<"collection", TripleCollectionList>;
 export declare const collectionPath: SparqlRule<"collectionPath", TripleCollectionList>;
 export declare const triplesNode: SparqlRule<"triplesNode", TripleCollection>;

package/lib/grammar/tripleBlock.js

@@ -1,5 +1,5 @@
-import { CommonIRIs } from '../grammar-helpers/utils';
 import * as l from '../lexer';
+import { CommonIRIs } from '../utils';
 import { var_, varOrTerm, verb } from './general';
 import { path, pathGenerator } from './propertyPaths';
 function triplesDotSeperated(triplesSameSubjectSubrule) {
@@ -11,7 +11,7 @@ function triplesDotSeperated(triplesSameSubjectSubrule) {
             GATE: () => parsedDot,
             DEF: () => {
                 parsedDot = false;
-                const template = SUBRULE(triplesSameSubjectSubrule, undefined);
+                const template = SUBRULE(triplesSameSubjectSubrule);
                 ACTION(() => {
                     triples.push(...template);
                 });
@@ -29,28 +29,28 @@ function triplesDotSeperated(triplesSameSubjectSubrule) {
  */
 export const triplesBlock = {
     name: 'triplesBlock',
-    impl: implArgs => C => triplesDotSeperated(triplesSameSubjectPath)(implArgs)(C, undefined),
+    impl: implArgs => C => triplesDotSeperated(triplesSameSubjectPath)(implArgs)(C),
     gImpl: ({ SUBRULE, PRINT_WORD, HANDLE_LOC }) => (ast, { factory: F }) => {
         for (const [index, triple] of ast.triples.entries()) {
             HANDLE_LOC(triple, () => {
                 const nextTriple = ast.triples.at(index);
                 if (F.isTripleCollection(triple)) {
-                    SUBRULE(graphNodePath, triple, undefined);
+                    SUBRULE(graphNodePath, triple);
                     // A top level tripleCollection block means that it is not used in a triple. So you end with DOT.
                     F.printFilter(triple, () => PRINT_WORD('.'));
                 }
                 else {
                     // Subject
-                    SUBRULE(graphNodePath, triple.subject, undefined);
+                    SUBRULE(graphNodePath, triple.subject);
                     // Predicate
                     if (F.isTerm(triple.predicate) && F.isTermVariable(triple.predicate)) {
-                        SUBRULE(varOrTerm, triple.predicate, undefined);
+                        SUBRULE(varOrTerm, triple.predicate);
                     }
                     else {
                         SUBRULE(pathGenerator, triple.predicate, undefined);
                     }
                     // Object
-                    SUBRULE(graphNodePath, triple.object, undefined);
+                    SUBRULE(graphNodePath, triple.object);
                     // If no more things, or a top level collection (only possible if new block was part), or new subject: add DOT
                     if (nextTriple === undefined || F.isTripleCollection(nextTriple) ||
                         !F.isSourceLocationNoMaterialize(nextTriple.subject.loc)) {
@@ -78,8 +78,8 @@ function triplesSameSubjectImpl(name, allowPaths) {
         name,
         impl: ({ ACTION, SUBRULE, OR }) => C => OR([
             { ALT: () => {
-                    const subject = SUBRULE(varOrTerm, undefined);
-                    const res = SUBRULE(allowPaths ? propertyListPathNotEmpty : propertyListNotEmpty, { subject: ACTION(() => C.factory.dematerialized(subject)) });
+                    const subject = SUBRULE(varOrTerm);
+                    const res = SUBRULE(allowPaths ? propertyListPathNotEmpty : propertyListNotEmpty, ACTION(() => C.factory.dematerialized(subject)));
                     // Only the first occurrence of a subject is actually materialized.
                     return ACTION(() => {
                         if (res.length > 0) {
@@ -90,8 +90,8 @@ function triplesSameSubjectImpl(name, allowPaths) {
                     });
                 } },
             { ALT: () => {
-                    const subjectNode = SUBRULE(allowPaths ? triplesNodePath : triplesNode, undefined);
-                    const restNode = SUBRULE(allowPaths ? propertyListPath : propertyList, { subject: ACTION(() => C.factory.graphNodeIdentifier(subjectNode)) });
+                    const subjectNode = SUBRULE(allowPaths ? triplesNodePath : triplesNode);
+                    const restNode = SUBRULE(allowPaths ? propertyListPath : propertyList, ACTION(() => C.factory.graphNodeIdentifier(subjectNode)));
                     return ACTION(() => {
                         if (restNode.length === 0) {
                             return [subjectNode];
@@ -120,7 +120,7 @@ export const triplesTemplate = {
 function propertyListImpl(name, allowPaths) {
     return {
         name,
-        impl: ({ SUBRULE, OPTION }) => (_, arg) => OPTION(() => SUBRULE(allowPaths ? propertyListPathNotEmpty : propertyListNotEmpty, arg)) ?? [],
+        impl: ({ SUBRULE, OPTION }) => (_, subject) => OPTION(() => SUBRULE(allowPaths ? propertyListPathNotEmpty : propertyListNotEmpty, subject)) ?? [],
     };
 }
 export const propertyList = propertyListImpl('propertyList', false);
@@ -134,7 +134,7 @@ export const propertyListPath = propertyListImpl('propertyListPath', true);
 function propertyListNotEmptyImplementation(name, allowPaths) {
     return {
         name,
-        impl: ({ ACTION, CONSUME, AT_LEAST_ONE, SUBRULE1, MANY2, OR1 }) => (_, arg) => {
+        impl: ({ ACTION, CONSUME, AT_LEAST_ONE, SUBRULE1, MANY2, OR1 }) => (_, subject) => {
             const result = [];
             let parsedSemi = true;
             AT_LEAST_ONE({
@@ -143,11 +143,11 @@ function propertyListNotEmptyImplementation(name, allowPaths) {
                     parsedSemi = false;
                     const predicate = allowPaths ?
                         OR1([
-                            { ALT: () => SUBRULE1(verbPath, undefined) },
-                            { ALT: () => SUBRULE1(verbSimple, undefined) },
+                            { ALT: () => SUBRULE1(verbPath) },
+                            { ALT: () => SUBRULE1(verbSimple) },
                         ]) :
-                        SUBRULE1(verb, undefined);
-                    const triples = SUBRULE1(allowPaths ? objectListPath : objectList, ACTION(() => ({ subject: arg.subject, predicate })));
+                        SUBRULE1(verb);
+                    const triples = SUBRULE1(allowPaths ? objectListPath : objectList, subject, predicate);
                     MANY2(() => {
                         CONSUME(l.symbols.semi);
                         parsedSemi = true;
@@ -168,14 +168,14 @@ export const propertyListPathNotEmpty = propertyListNotEmptyImplementation('prop
  */
 export const verbPath = {
     name: 'verbPath',
-    impl: ({ SUBRULE }) => () => SUBRULE(path, undefined),
+    impl: ({ SUBRULE }) => () => SUBRULE(path),
 };
 /**
  * [[85]](https://www.w3.org/TR/sparql11-query/#rVerbSimple)
  */
 export const verbSimple = {
     name: 'verbSimple',
-    impl: ({ SUBRULE }) => () => SUBRULE(var_, undefined),
+    impl: ({ SUBRULE }) => () => SUBRULE(var_),
 };
 /**
  * [[79]](https://www.w3.org/TR/sparql11-query/#rObjectList)
@@ -184,12 +184,12 @@ export const verbSimple = {
 function objectListImpl(name, allowPaths) {
     return {
         name,
-        impl: ({ ACTION, SUBRULE, AT_LEAST_ONE_SEP }) => (_, arg) => {
+        impl: ({ ACTION, SUBRULE, AT_LEAST_ONE_SEP }) => (_, subj, pred) => {
             const objects = [];
             AT_LEAST_ONE_SEP({
                 SEP: l.symbols.comma,
                 DEF: () => {
-                    const objectTriple = SUBRULE(allowPaths ? objectPath : object, arg);
+                    const objectTriple = SUBRULE(allowPaths ? objectPath : object, subj, pred);
                     ACTION(() => {
                         objects.push(objectTriple);
                     });
@@ -208,9 +208,9 @@ export const objectListPath = objectListImpl('objectListPath', true);
 function objectImpl(name, allowPaths) {
     return {
         name,
-        impl: ({ ACTION, SUBRULE }) => (C, arg) => {
-            const node = SUBRULE(allowPaths ? graphNodePath : graphNode, undefined);
-            return ACTION(() => C.factory.triple(arg.subject, arg.predicate, node));
+        impl: ({ ACTION, SUBRULE }) => (C, subject, predicate) => {
+            const node = SUBRULE(allowPaths ? graphNodePath : graphNode);
+            return ACTION(() => C.factory.triple(subject, predicate, node));
         },
     };
 }
@@ -229,7 +229,7 @@ function collectionImpl(name, allowPaths) {
             const terms = [];
             const startToken = CONSUME(l.symbols.LParen);
             AT_LEAST_ONE(() => {
-                terms.push(SUBRULE(allowPaths ? graphNodePath : graphNode, undefined));
+                terms.push(SUBRULE(allowPaths ? graphNodePath : graphNode));
             });
             const endToken = CONSUME(l.symbols.RParen);
             return ACTION(() => {
@@ -265,7 +265,7 @@ function collectionImpl(name, allowPaths) {
             // Only every 2 triple is relevant. The odd triples are linking triples.
             for (const [idx, triple] of ast.triples.entries()) {
                 if (idx % 2 === 0) {
-                    SUBRULE(allowPaths ? graphNodePath : graphNode, triple.object, undefined);
+                    SUBRULE(allowPaths ? graphNodePath : graphNode, triple.object);
                 }
             }
             F.printFilter(ast, () => PRINT_WORD(')'));
@@ -282,12 +282,12 @@ function triplesNodeImpl(name, allowPaths) {
     return {
         name,
         impl: ({ SUBRULE, OR }) => () => OR([
-            { ALT: () => SUBRULE(allowPaths ? collectionPath : collection, undefined) },
-            { ALT: () => SUBRULE(allowPaths ? blankNodePropertyListPath : blankNodePropertyList, undefined) },
+            { ALT: () => SUBRULE(allowPaths ? collectionPath : collection) },
+            { ALT: () => SUBRULE(allowPaths ? blankNodePropertyListPath : blankNodePropertyList) },
         ]),
         gImpl: ({ SUBRULE }) => ast => ast.subType === 'list' ?
-            SUBRULE(allowPaths ? collectionPath : collection, ast, undefined) :
-            SUBRULE(allowPaths ? blankNodePropertyListPath : blankNodePropertyList, ast, undefined),
+            SUBRULE(allowPaths ? collectionPath : collection, ast) :
+            SUBRULE(allowPaths ? blankNodePropertyListPath : blankNodePropertyList, ast),
     };
 }
 export const triplesNode = triplesNodeImpl('triplesNode', false);
@@ -303,7 +303,7 @@ function blankNodePropertyListImpl(name, allowPaths) {
         impl: ({ ACTION, SUBRULE, CONSUME }) => (C) => {
             const startToken = CONSUME(l.symbols.LSquare);
             const blankNode = ACTION(() => C.factory.blankNode(undefined, C.factory.sourceLocationNoMaterialize()));
-            const propList = SUBRULE(propertyPathNotEmptyImpl, { subject: blankNode });
+            const propList = SUBRULE(propertyPathNotEmptyImpl, blankNode);
             const endToken = CONSUME(l.symbols.RSquare);
             return ACTION(() => C.factory.tripleCollectionBlankNodeProperties(blankNode, propList, C.factory.sourceLocation(startToken, endToken)));
         },
@@ -312,12 +312,12 @@ function blankNodePropertyListImpl(name, allowPaths) {
             for (const triple of ast.triples) {
                 HANDLE_LOC(triple, () => {
                     if (F.isTerm(triple.predicate) && F.isTermVariable(triple.predicate)) {
-                        SUBRULE(varOrTerm, triple.predicate, undefined);
+                        SUBRULE(varOrTerm, triple.predicate);
                     }
                     else {
                         SUBRULE(pathGenerator, triple.predicate, undefined);
                     }
-                    SUBRULE(graphNodePath, triple.object, undefined);
+                    SUBRULE(graphNodePath, triple.object);
                     F.printFilter(ast, () => PRINT_WORD(';'));
                 });
             }
@@ -336,18 +336,18 @@ function graphNodeImpl(name, allowPaths) {
     return {
         name,
         impl: ({ SUBRULE, OR }) => C => OR([
-            { ALT: () => SUBRULE(varOrTerm, undefined) },
+            { ALT: () => SUBRULE(varOrTerm) },
             {
                 GATE: () => C.parseMode.has('canCreateBlankNodes'),
-                ALT: () => SUBRULE(triplesNodeRule, undefined),
+                ALT: () => SUBRULE(triplesNodeRule),
             },
         ]),
         gImpl: ({ SUBRULE }) => (ast, { factory: F }) => {
             if (F.isTerm(ast)) {
-                SUBRULE(varOrTerm, ast, undefined);
+                SUBRULE(varOrTerm, ast);
             }
             else {
-                SUBRULE(triplesNodeRule, ast, undefined);
+                SUBRULE(triplesNodeRule, ast);
             }
         },
     };