@traqula/rules-sparql-1-1 0.0.1-alpha.176 → 0.0.1

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 * as l from '../lexer';\nimport type { Expression, Grouping, Ordering, SelectQuery, 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 type ISolutionModifier = Pick<SelectQuery, 'group' | 'having' | 'order' | 'limit' | 'offset'>;\nexport const solutionModifier: SparqlRule<'solutionModifier', ISolutionModifier> = <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 limitAndOffset = OPTION4(() => SUBRULE(limitOffsetClauses, undefined));\n\n    return ACTION(() => ({\n      ...limitAndOffset,\n      ...(group && { group }),\n      ...(having && { having }),\n      ...(order && { order }),\n    }));\n  },\n  gImpl: ({ SUBRULE }) => (ast) => {\n    const group = ast.group ? SUBRULE(groupClause, ast.group, undefined) : '';\n    const having = ast.having ? SUBRULE(havingClause, ast.having, undefined) : '';\n    const order = ast.order ? SUBRULE(orderClause, ast.order, undefined) : '';\n    const limit = SUBRULE(limitOffsetClauses, ast, undefined);\n\n    return [ group, having, order, limit ].filter(Boolean).join(' ');\n  },\n};\n\n/**\n * [[19]](https://www.w3.org/TR/sparql11-query/#rGroupClause)\n */\nexport const groupClause: SparqlRule<'groupClause', Grouping[]> = <const> {\n  name: 'groupClause',\n  impl: ({ AT_LEAST_ONE, SUBRULE, CONSUME }) => () => {\n    const groupings: Grouping[] = [];\n    CONSUME(l.groupBy);\n    AT_LEAST_ONE(() => {\n      groupings.push(SUBRULE(groupCondition, undefined));\n    });\n\n    return groupings;\n  },\n  gImpl: ({ SUBRULE }) => ast =>\n    `GROUP BY ${ast.map(group => SUBRULE(groupCondition, group, undefined)).join(' ')}`,\n};\n\n/**\n * [[20]](https://www.w3.org/TR/sparql11-query/#rGroupCondition)\n */\nexport const groupCondition: SparqlRule<'groupCondition', Grouping> = <const> {\n  name: 'groupCondition',\n  impl: ({ SUBRULE, CONSUME, SUBRULE1, SUBRULE2, OPTION, OR }) => () => OR<Grouping>([\n    { ALT: () => {\n      const expression = SUBRULE(builtInCall, undefined);\n      return {\n        expression,\n      };\n    } },\n    { ALT: () => {\n      const expression = SUBRULE(functionCall, undefined);\n      return {\n        expression,\n      };\n    } },\n    {\n      ALT: () => {\n        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        CONSUME(l.symbols.RParen);\n\n        return {\n          expression: expressionValue,\n          variable,\n        };\n      },\n    },\n    { ALT: () => {\n      const expression = SUBRULE2(var_, undefined);\n      return {\n        expression,\n      };\n    } },\n  ]),\n  gImpl: ({ SUBRULE }) => (ast) => {\n    if (ast.variable) {\n      return `(${SUBRULE(expression, ast.expression, undefined)} AS ${SUBRULE(var_, ast.variable, undefined)})`;\n    }\n    return SUBRULE(expression, ast.expression, undefined);\n  },\n};\n\n/**\n * [[21]](https://www.w3.org/TR/sparql11-query/#rHavingClause)\n */\nexport const havingClause: SparqlRule<'havingClause', Expression[]> = <const> {\n  name: 'havingClause',\n  impl: ({ ACTION, AT_LEAST_ONE, SUBRULE, CONSUME }) => (C) => {\n    const expressions: Expression[] = [];\n\n    CONSUME(l.having);\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 expressions;\n  },\n  gImpl: ({ SUBRULE }) => ast =>\n    `HAVING ${ast.map(having => `( ${SUBRULE(expression, having, undefined)} )`).join(' ')}`,\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', Ordering[]> = <const> {\n  name: 'orderClause',\n  impl: ({ ACTION, AT_LEAST_ONE, SUBRULE, CONSUME }) => (C) => {\n    const orderings: Ordering[] = [];\n\n    CONSUME(l.order);\n    const couldParseAgg = ACTION(() =>\n      C.parseMode.has('canParseAggregate') || !C.parseMode.add('canParseAggregate'));\n    AT_LEAST_ONE(() => {\n      orderings.push(SUBRULE(orderCondition, undefined));\n    });\n    ACTION(() => !couldParseAgg && C.parseMode.delete('canParseAggregate'));\n\n    return orderings;\n  },\n  gImpl: ({ SUBRULE }) => ast =>\n    `ORDER BY ${ast.map(order => SUBRULE(orderCondition, order, undefined)).join(' ')}`,\n};\n\n/**\n * [[24]](https://www.w3.org/TR/sparql11-query/#rOrderCondition)\n */\nexport const orderCondition: SparqlRule<'orderCondition', Ordering> = <const> {\n  name: 'orderCondition',\n  impl: ({ SUBRULE, CONSUME, OR1, OR2 }) => () => OR1([\n    {\n      ALT: () => {\n        const descending = OR2([\n          { ALT: () => {\n            CONSUME(l.orderAsc);\n            return false;\n          } },\n          { ALT: () => {\n            CONSUME(l.orderDesc);\n            return true;\n          } },\n        ]);\n        const expr = SUBRULE(brackettedExpression, undefined);\n\n        return {\n          expression: expr,\n          descending,\n        };\n      },\n    },\n    { ALT: () => {\n      const expr = SUBRULE(constraint, undefined);\n      return {\n        expression: expr,\n      };\n    } },\n    { ALT: () => {\n      const expr = SUBRULE(var_, undefined);\n      return {\n        expression: expr,\n      };\n    } },\n  ]),\n  gImpl: ({ SUBRULE }) => (ast) => {\n    const builder: string[] = [];\n    if (ast.descending) {\n      builder.push('DESC');\n    }\n    builder.push('(', SUBRULE(expression, ast.expression, undefined), ')');\n    return builder.join(' ');\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', Pick<SelectQuery, 'limit' | 'offset'>> = <const> {\n  name: 'limitOffsetClauses',\n  impl: ({ SUBRULE1, SUBRULE2, OPTION1, OPTION2, OR }) => () => OR<Pick<SelectQuery, 'limit' | 'offset'>>([\n    {\n      ALT: () => {\n        const limit = SUBRULE1(limitClause, undefined);\n        const offset = OPTION1(() => SUBRULE1(offsetClause, undefined));\n        return {\n          limit,\n          offset,\n        };\n      },\n    },\n    {\n      ALT: () => {\n        const offset = SUBRULE2(offsetClause, undefined);\n        const limit = OPTION2(() => SUBRULE2(limitClause, undefined));\n        return {\n          limit,\n          offset,\n        };\n      },\n    },\n  ]),\n  gImpl: () => (ast) => {\n    const builder: string[] = [];\n    if (ast.limit) {\n      builder.push(`LIMIT ${String(ast.limit)}`);\n    }\n    if (ast.offset) {\n      builder.push(`OFFSET ${String(ast.offset)}`);\n    }\n    return builder.join(' ');\n  },\n};\n\n/**\n * [[26]](https://www.w3.org/TR/sparql11-query/#rLimitClause)\n */\nexport const limitClause: SparqlGrammarRule<'limitClause', number> = <const> {\n  name: 'limitClause',\n  impl: ({ CONSUME }) => () => {\n    CONSUME(l.limit);\n    return Number.parseInt(CONSUME(l.terminals.integer).image, 10);\n  },\n};\n\n/**\n * [[27]](https://www.w3.org/TR/sparql11-query/#rWhereClause)\n */\nexport const offsetClause: SparqlGrammarRule<'offsetClause', number> = <const> {\n  name: <const> 'offsetClause',\n  impl: ({ CONSUME }) => () => {\n    CONSUME(l.offset);\n    return Number.parseInt(CONSUME(l.terminals.integer).image, 10);\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 {\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"]}

package/lib/grammar/tripleBlock.d.ts

@@ -1,45 +1,36 @@
-import type { BgpPattern, IGraphNode, IriTerm, ITriplesNode, PropertyPath, SparqlGrammarRule, SparqlRule, Triple, VariableTerm } from '../Sparql11types';
+import type { BasicGraphPattern, Path, PatternBgp, Term, TermVariable, TripleCollection, TripleCollectionBlankNodeProperties, TripleCollectionList, TripleNesting } from '../RoundTripTypes';
+import type { SparqlGrammarRule, SparqlRule } from '../Sparql11types';
 /**
  * [[55]](https://www.w3.org/TR/sparql11-query/#rTriplesBlock)
  */
-export declare const triplesBlock: SparqlRule<'triplesBlock', BgpPattern>;
-export declare const triplesSameSubject: SparqlGrammarRule<"triplesSameSubject", Triple[]>;
-export declare const triplesSameSubjectPath: SparqlGrammarRule<"triplesSameSubjectPath", Triple[]>;
+export declare const triplesBlock: SparqlRule<'triplesBlock', PatternBgp>;
+export declare const triplesSameSubject: SparqlGrammarRule<"triplesSameSubject", BasicGraphPattern>;
+export declare const triplesSameSubjectPath: SparqlGrammarRule<"triplesSameSubjectPath", BasicGraphPattern>;
 /**
  * [[52]](https://www.w3.org/TR/sparql11-query/#rTriplesTemplate)
  */
-export declare const triplesTemplate: SparqlGrammarRule<'triplesTemplate', Triple[]>;
-export declare const propertyList: SparqlGrammarRule<"propertyList", Triple[], Pick<Triple, "subject">>;
-export declare const propertyListPath: SparqlGrammarRule<"propertyListPath", Triple[], Pick<Triple, "subject">>;
-export declare const propertyListNotEmpty: SparqlGrammarRule<"propertyListNotEmpty", Triple[], Pick<Triple, "subject">>;
-export declare const propertyListPathNotEmpty: SparqlGrammarRule<"propertyListPathNotEmpty", Triple[], Pick<Triple, "subject">>;
+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">>;
 /**
  * [[84]](https://www.w3.org/TR/sparql11-query/#rVerbPath)
  */
-export declare const verbPath: SparqlGrammarRule<'verbPath', PropertyPath | IriTerm>;
+export declare const verbPath: SparqlGrammarRule<'verbPath', Path>;
 /**
  * [[85]](https://www.w3.org/TR/sparql11-query/#rVerbSimple)
  */
-export declare const verbSimple: SparqlGrammarRule<'verbSimple', VariableTerm>;
-export declare const objectList: SparqlGrammarRule<"objectList", Triple[], Pick<Triple, "subject" | "predicate">>;
-export declare const objectListPath: SparqlGrammarRule<"objectListPath", Triple[], Pick<Triple, "subject" | "predicate">>;
-/**
- * [[80]](https://www.w3.org/TR/sparql11-query/#rObject)
- */
-export declare const object: SparqlGrammarRule<"object", Triple[], Pick<Triple, "subject" | "predicate">>;
-/**
- * [[87]](https://www.w3.org/TR/sparql11-query/#rObjectPath)
- */
-export declare const objectPath: SparqlGrammarRule<"objectPath", Triple[], Pick<Triple, "subject" | "predicate">>;
-/**
- * [[98]](https://www.w3.org/TR/sparql11-query/#rTriplesNode)
- * [[100]](https://www.w3.org/TR/sparql11-query/#rTriplesNodePath)
- */
-export declare const triplesNode: SparqlGrammarRule<'triplesNode', ITriplesNode>;
-export declare const triplesNodePath: SparqlGrammarRule<'triplesNodePath', ITriplesNode>;
-export declare const blankNodePropertyList: SparqlGrammarRule<"blankNodePropertyList", ITriplesNode>;
-export declare const blankNodePropertyListPath: SparqlGrammarRule<"blankNodePropertyListPath", ITriplesNode>;
-export declare const collection: SparqlGrammarRule<"collection", ITriplesNode>;
-export declare const collectionPath: SparqlGrammarRule<"collectionPath", ITriplesNode>;
-export declare const graphNode: SparqlGrammarRule<"graphNode", IGraphNode>;
-export declare const graphNodePath: SparqlGrammarRule<"graphNodePath", IGraphNode>;
+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 collection: SparqlRule<"collection", TripleCollectionList>;
+export declare const collectionPath: SparqlRule<"collectionPath", TripleCollectionList>;
+export declare const triplesNode: SparqlRule<"triplesNode", TripleCollection>;
+export declare const triplesNodePath: SparqlRule<"triplesNodePath", TripleCollection>;
+export declare const blankNodePropertyList: SparqlRule<"blankNodePropertyList", TripleCollectionBlankNodeProperties>;
+export declare const blankNodePropertyListPath: SparqlRule<"blankNodePropertyListPath", TripleCollectionBlankNodeProperties>;
+export declare const graphNode: SparqlRule<"graphNode", TripleCollection | Term>;
+export declare const graphNodePath: SparqlRule<"graphNodePath", TripleCollection | Term>;

package/lib/grammar/tripleBlock.js

@@ -1,26 +1,27 @@
 import { CommonIRIs } from '../grammar-helpers/utils';
 import * as l from '../lexer';
 import { var_, varOrTerm, verb } from './general';
-import { path } from './propertyPaths';
-function triplesDotSeperated(subRule) {
-    return ({ ACTION, AT_LEAST_ONE, SUBRULE, CONSUME, OPTION }) => () => {
+import { path, pathGenerator } from './propertyPaths';
+function triplesDotSeperated(triplesSameSubjectSubrule) {
+    return ({ ACTION, AT_LEAST_ONE, SUBRULE, CONSUME, OPTION }) => (C) => {
         const triples = [];
         let parsedDot = true;
+        let dotToken;
         AT_LEAST_ONE({
             GATE: () => parsedDot,
             DEF: () => {
                 parsedDot = false;
-                const template = SUBRULE(subRule, undefined);
+                const template = SUBRULE(triplesSameSubjectSubrule, undefined);
                 ACTION(() => {
                     triples.push(...template);
                 });
                 OPTION(() => {
-                    CONSUME(l.symbols.dot);
+                    dotToken = CONSUME(l.symbols.dot);
                     parsedDot = true;
                 });
             },
         });
-        return triples;
+        return ACTION(() => C.factory.patternBgp(triples, C.factory.sourceLocation(...triples, dotToken)));
     };
 }
 /**
@@ -28,44 +29,78 @@ function triplesDotSeperated(subRule) {
  */
 export const triplesBlock = {
     name: 'triplesBlock',
-    impl: implArgs => C => ({
-        type: 'bgp',
-        triples: triplesDotSeperated(triplesSameSubjectPath)(implArgs)(C, undefined),
-    }),
-    gImpl: ({ SUBRULE }) => ast => ast.triples.map((triple) => {
-        const { subject, predicate, object } = triple;
-        return [subject, predicate, object].map((part) => {
-            if ('type' in part) {
-                return SUBRULE(path, part, undefined);
-            }
-            return SUBRULE(varOrTerm, part, undefined);
-        }).join(' ');
-    }).join(' .\n'),
+    impl: implArgs => C => triplesDotSeperated(triplesSameSubjectPath)(implArgs)(C, undefined),
+    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);
+                    // 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);
+                    // Predicate
+                    if (F.isTerm(triple.predicate) && F.isTermVariable(triple.predicate)) {
+                        SUBRULE(varOrTerm, triple.predicate, undefined);
+                    }
+                    else {
+                        SUBRULE(pathGenerator, triple.predicate, undefined);
+                    }
+                    // Object
+                    SUBRULE(graphNodePath, triple.object, undefined);
+                    // 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)) {
+                        F.printFilter(ast, () => PRINT_WORD('.'));
+                    }
+                    else if (F.isSourceLocationNoMaterialize(nextTriple.predicate.loc)) {
+                        F.printFilter(ast, () => PRINT_WORD(','));
+                    }
+                    else {
+                        F.printFilter(ast, () => PRINT_WORD(';'));
+                    }
+                }
+            });
+        }
+    },
 };
 /**
  * [[75]](https://www.w3.org/TR/sparql11-query/#rTriplesSameSubject)
  * [[81]](https://www.w3.org/TR/sparql11-query/#rTriplesSameSubjectPath)
+ * CONTRACT: triples generated from the subject come first, then comes the main triple,
+ *  and then come the triples from the object. Only the first occurrence of a term has `SourceLocationType = source`
  */
 function triplesSameSubjectImpl(name, allowPaths) {
     return {
         name,
-        impl: ({ ACTION, SUBRULE, OR }) => () => OR([
-            {
-                ALT: () => {
+        impl: ({ ACTION, SUBRULE, OR }) => C => OR([
+            { ALT: () => {
                     const subject = SUBRULE(varOrTerm, undefined);
-                    return SUBRULE(allowPaths ? propertyListPathNotEmpty : propertyListNotEmpty, { subject });
-                },
-            },
-            {
-                ALT: () => {
+                    const res = SUBRULE(allowPaths ? propertyListPathNotEmpty : propertyListNotEmpty, { subject: ACTION(() => C.factory.dematerialized(subject)) });
+                    // Only the first occurrence of a subject is actually materialized.
+                    return ACTION(() => {
+                        if (res.length > 0) {
+                            res[0].subject = subject;
+                            res[0].loc = C.factory.sourceLocation(subject, res[0]);
+                        }
+                        return res;
+                    });
+                } },
+            { ALT: () => {
                     const subjectNode = SUBRULE(allowPaths ? triplesNodePath : triplesNode, undefined);
-                    const restNode = SUBRULE(allowPaths ? propertyListPath : propertyList, { subject: subjectNode.node });
-                    return ACTION(() => [
-                        ...restNode,
-                        ...subjectNode.triples,
-                    ]);
-                },
-            },
+                    const restNode = SUBRULE(allowPaths ? propertyListPath : propertyList, { subject: ACTION(() => C.factory.graphNodeIdentifier(subjectNode)) });
+                    return ACTION(() => {
+                        if (restNode.length === 0) {
+                            return [subjectNode];
+                        }
+                        restNode[0].subject = subjectNode;
+                        restNode[0].loc = C.factory.sourceLocation(subjectNode, restNode[0]);
+                        return restNode;
+                    });
+                } },
         ]),
     };
 }
@@ -113,11 +148,13 @@ function propertyListNotEmptyImplementation(name, allowPaths) {
                         ]) :
                         SUBRULE1(verb, undefined);
                     const triples = SUBRULE1(allowPaths ? objectListPath : objectList, ACTION(() => ({ subject: arg.subject, predicate })));
-                    ACTION(() => result.push(...triples));
                     MANY2(() => {
                         CONSUME(l.symbols.semi);
                         parsedSemi = true;
                     });
+                    ACTION(() => {
+                        result.push(...triples);
+                    });
                 },
             });
             return result;
@@ -150,11 +187,13 @@ function objectListImpl(name, allowPaths) {
         impl: ({ ACTION, SUBRULE, AT_LEAST_ONE_SEP }) => (_, arg) => {
             const objects = [];
             AT_LEAST_ONE_SEP({
+                SEP: l.symbols.comma,
                 DEF: () => {
-                    const objectTriples = SUBRULE(allowPaths ? objectPath : object, arg);
-                    ACTION(() => objects.push(...objectTriples));
+                    const objectTriple = SUBRULE(allowPaths ? objectPath : object, arg);
+                    ACTION(() => {
+                        objects.push(objectTriple);
+                    });
                 },
-                SEP: l.symbols.comma,
             });
             return objects;
         },
@@ -162,65 +201,21 @@ function objectListImpl(name, allowPaths) {
 }
 export const objectList = objectListImpl('objectList', false);
 export const objectListPath = objectListImpl('objectListPath', true);
-function objectImpl(name, allowPaths) {
-    return {
-        name,
-        impl: ({ ACTION, SUBRULE }) => (_, arg) => {
-            const node = SUBRULE(allowPaths ? graphNodePath : graphNode, undefined);
-            return ACTION(() => [
-                { subject: arg.subject, predicate: arg.predicate, object: node.node },
-                ...node.triples,
-            ]);
-        },
-    };
-}
 /**
  * [[80]](https://www.w3.org/TR/sparql11-query/#rObject)
- */
-export const object = objectImpl('object', false);
-/**
  * [[87]](https://www.w3.org/TR/sparql11-query/#rObjectPath)
  */
-export const objectPath = objectImpl('objectPath', true);
-/**
- * [[98]](https://www.w3.org/TR/sparql11-query/#rTriplesNode)
- * [[100]](https://www.w3.org/TR/sparql11-query/#rTriplesNodePath)
- */
-export const triplesNode = {
-    name: 'triplesNode',
-    impl: ({ SUBRULE, OR }) => () => OR([
-        { ALT: () => SUBRULE(collection, undefined) },
-        { ALT: () => SUBRULE(blankNodePropertyList, undefined) },
-    ]),
-};
-export const triplesNodePath = {
-    name: 'triplesNodePath',
-    impl: ({ SUBRULE, OR }) => () => OR([
-        { ALT: () => SUBRULE(collectionPath, undefined) },
-        { ALT: () => SUBRULE(blankNodePropertyListPath, undefined) },
-    ]),
-};
-/**
- * [[99]](https://www.w3.org/TR/sparql11-query/#rBlankNodePropertyList)
- * [[101]](https://www.w3.org/TR/sparql11-query/#rBlankNodePropertyListPath)
- */
-function blankNodePropertyListImpl(name, allowPaths) {
+function objectImpl(name, allowPaths) {
     return {
         name,
-        impl: ({ ACTION, SUBRULE, CONSUME }) => (C) => {
-            CONSUME(l.symbols.LSquare);
-            let blankNode;
-            const propList = SUBRULE(allowPaths ? propertyListPathNotEmpty : propertyListNotEmpty, { subject: ACTION(() => blankNode = C.dataFactory.blankNode()) });
-            CONSUME(l.symbols.RSquare);
-            return ACTION(() => ({
-                node: blankNode,
-                triples: propList,
-            }));
+        impl: ({ ACTION, SUBRULE }) => (C, arg) => {
+            const node = SUBRULE(allowPaths ? graphNodePath : graphNode, undefined);
+            return ACTION(() => C.factory.triple(arg.subject, arg.predicate, node));
         },
     };
 }
-export const blankNodePropertyList = blankNodePropertyListImpl('blankNodePropertyList', false);
-export const blankNodePropertyListPath = blankNodePropertyListImpl('blankNodePropertyListPath', true);
+export const object = objectImpl('object', false);
+export const objectPath = objectImpl('objectPath', true);
 /**
  * [[102]](https://www.w3.org/TR/sparql11-query/#rCollection)
  * [[103]](https://www.w3.org/TR/sparql11-query/#rCollectionPath)
@@ -232,78 +227,129 @@ function collectionImpl(name, allowPaths) {
             // Construct a [cons list](https://en.wikipedia.org/wiki/Cons#Lists),
             // here called a [RDF collection](https://www.w3.org/TR/sparql11-query/#collections).
             const terms = [];
-            CONSUME(l.symbols.LParen);
+            const startToken = CONSUME(l.symbols.LParen);
             AT_LEAST_ONE(() => {
                 terms.push(SUBRULE(allowPaths ? graphNodePath : graphNode, undefined));
             });
-            CONSUME(l.symbols.RParen);
+            const endToken = CONSUME(l.symbols.RParen);
             return ACTION(() => {
+                const F = C.factory;
                 const triples = [];
-                const appendTriples = [];
-                const listHead = C.dataFactory.blankNode();
+                // The triples created in your recursion
+                const predFirst = F.namedNode(F.sourceLocationNoMaterialize(), CommonIRIs.FIRST, undefined);
+                const predRest = F.namedNode(F.sourceLocationNoMaterialize(), CommonIRIs.REST, undefined);
+                const predNil = F.namedNode(F.sourceLocationNoMaterialize(), CommonIRIs.NIL, undefined);
+                const listHead = F.blankNode(undefined, F.sourceLocationNoMaterialize());
                 let iterHead = listHead;
-                const predFirst = C.dataFactory.namedNode(CommonIRIs.FIRST);
-                const predRest = C.dataFactory.namedNode(CommonIRIs.REST);
                 for (const [index, term] of terms.entries()) {
-                    const headTriple = {
-                        subject: iterHead,
-                        predicate: predFirst,
-                        object: term.node,
-                    };
+                    const lastInList = index === terms.length - 1;
+                    const headTriple = F.triple(iterHead, predFirst, term);
                     triples.push(headTriple);
-                    appendTriples.push(...term.triples);
                     // If not the last, create new iterHead, otherwise, close list
-                    if (index === terms.length - 1) {
-                        const nilTriple = {
-                            subject: iterHead,
-                            predicate: predRest,
-                            object: C.dataFactory.namedNode(CommonIRIs.NIL),
-                        };
+                    if (lastInList) {
+                        const nilTriple = F.triple(iterHead, predRest, predNil);
                         triples.push(nilTriple);
                     }
                     else {
-                        const tail = C.dataFactory.blankNode();
-                        const linkTriple = {
-                            subject: iterHead,
-                            predicate: predRest,
-                            object: tail,
-                        };
+                        const tail = F.blankNode(undefined, F.sourceLocationNoMaterialize());
+                        const linkTriple = F.triple(iterHead, predRest, tail);
                         triples.push(linkTriple);
                         iterHead = tail;
                     }
                 }
-                return {
-                    node: listHead,
-                    triples: [...triples, ...appendTriples],
-                };
+                return F.tripleCollectionList(listHead, triples, F.sourceLocation(startToken, endToken));
             });
         },
+        gImpl: ({ SUBRULE, PRINT_WORD }) => (ast, { factory: F }) => {
+            F.printFilter(ast, () => PRINT_WORD('('));
+            // 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);
+                }
+            }
+            F.printFilter(ast, () => PRINT_WORD(')'));
+        },
     };
 }
 export const collection = collectionImpl('collection', false);
 export const collectionPath = collectionImpl('collectionPath', true);
+/**
+ * [[98]](https://www.w3.org/TR/sparql11-query/#rTriplesNode)
+ * [[100]](https://www.w3.org/TR/sparql11-query/#rTriplesNodePath)
+ */
+function triplesNodeImpl(name, allowPaths) {
+    return {
+        name,
+        impl: ({ SUBRULE, OR }) => () => OR([
+            { ALT: () => SUBRULE(allowPaths ? collectionPath : collection, undefined) },
+            { ALT: () => SUBRULE(allowPaths ? blankNodePropertyListPath : blankNodePropertyList, undefined) },
+        ]),
+        gImpl: ({ SUBRULE }) => ast => ast.subType === 'list' ?
+            SUBRULE(allowPaths ? collectionPath : collection, ast, undefined) :
+            SUBRULE(allowPaths ? blankNodePropertyListPath : blankNodePropertyList, ast, undefined),
+    };
+}
+export const triplesNode = triplesNodeImpl('triplesNode', false);
+export const triplesNodePath = triplesNodeImpl('triplesNodePath', true);
+/**
+ * [[99]](https://www.w3.org/TR/sparql11-query/#rBlankNodePropertyList)
+ * [[101]](https://www.w3.org/TR/sparql11-query/#rBlankNodePropertyListPath)
+ */
+function blankNodePropertyListImpl(name, allowPaths) {
+    const propertyPathNotEmptyImpl = allowPaths ? propertyListPathNotEmpty : propertyListNotEmpty;
+    return {
+        name,
+        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 endToken = CONSUME(l.symbols.RSquare);
+            return ACTION(() => C.factory.tripleCollectionBlankNodeProperties(blankNode, propList, C.factory.sourceLocation(startToken, endToken)));
+        },
+        gImpl: ({ SUBRULE, PRINT, PRINT_WORD, HANDLE_LOC }) => (ast, { factory: F }) => {
+            F.printFilter(ast, () => PRINT('['));
+            for (const triple of ast.triples) {
+                HANDLE_LOC(triple, () => {
+                    if (F.isTerm(triple.predicate) && F.isTermVariable(triple.predicate)) {
+                        SUBRULE(varOrTerm, triple.predicate, undefined);
+                    }
+                    else {
+                        SUBRULE(pathGenerator, triple.predicate, undefined);
+                    }
+                    SUBRULE(graphNodePath, triple.object, undefined);
+                    F.printFilter(ast, () => PRINT_WORD(';'));
+                });
+            }
+            F.printFilter(ast, () => PRINT(']'));
+        },
+    };
+}
+export const blankNodePropertyList = blankNodePropertyListImpl('blankNodePropertyList', false);
+export const blankNodePropertyListPath = blankNodePropertyListImpl('blankNodePropertyListPath', true);
 /**
  * [[103]](https://www.w3.org/TR/sparql11-query/#rGraphNode)
  * [[105]](https://www.w3.org/TR/sparql11-query/#rGraphNodePath)
  */
 function graphNodeImpl(name, allowPaths) {
+    const triplesNodeRule = allowPaths ? triplesNodePath : triplesNode;
     return {
         name,
         impl: ({ SUBRULE, OR }) => C => OR([
-            {
-                ALT: () => {
-                    const val = SUBRULE(varOrTerm, undefined);
-                    return {
-                        node: val,
-                        triples: [],
-                    };
-                },
-            },
+            { ALT: () => SUBRULE(varOrTerm, undefined) },
             {
                 GATE: () => C.parseMode.has('canCreateBlankNodes'),
-                ALT: () => SUBRULE(allowPaths ? triplesNodePath : triplesNode, undefined),
+                ALT: () => SUBRULE(triplesNodeRule, undefined),
             },
         ]),
+        gImpl: ({ SUBRULE }) => (ast, { factory: F }) => {
+            if (F.isTerm(ast)) {
+                SUBRULE(varOrTerm, ast, undefined);
+            }
+            else {
+                SUBRULE(triplesNodeRule, ast, undefined);
+            }
+        },
     };
 }
 export const graphNode = graphNodeImpl('graphNode', false);