@traqula/rules-sparql-1-1 0.0.1-alpha.143 → 0.0.1-alpha.148

package/lib/Sparql11types.d.ts

@@ -1,6 +1,7 @@
 import type * as RdfJs from '@rdfjs/types';
-import type { BlankNode } from 'rdf-data-factory';
-import type { CommonIRIs } from '@traqula/core';
+import type * as RDF from '@rdfjs/types';
+import type { BlankNode, DataFactory } from 'rdf-data-factory';
+import type { CommonIRIs, RuleDef } from '@traqula/core';
 export type GraphTerm = IriTerm | BlankTerm | LiteralTerm;
 export type Term = GraphTerm | VariableTerm;
 export type VerbA = IriTerm<CommonIRIs.TYPE>;
@@ -14,8 +15,6 @@ export type Triple = {
     predicate: IriTerm | VariableTerm | PropertyPath;
     object: Term;
 };
-export type TripleCreatorS = (part: Pick<Triple, 'subject'>) => Triple;
-export type TripleCreatorSP = (part: Pick<Triple, 'subject' | 'predicate'>) => Triple;
 export interface IGraphNode {
     node: ITriplesNode['node'] | Term;
     triples: Triple[];
@@ -43,10 +42,6 @@ export interface GraphQuads {
     name: IriTerm | VariableTerm;
     triples: Triple[];
 }
-export interface SparqlParser {
-    parse: (query: string) => SparqlQuery;
-    _resetBlanks: () => void;
-}
 export type VariableTerm = RdfJs.Variable;
 export type IriTerm<IRI extends string = string> = RdfJs.NamedNode<IRI>;
 export type LiteralTerm = RdfJs.Literal;
@@ -244,3 +239,39 @@ export interface AggregateExpression extends BaseExpression {
     aggregation: string;
     separator?: string | undefined;
 }
+export type SparqlRuleDef<
+/**
+ * Name of grammar rule, should be a strict subtype of string like 'myGrammarRule'.
+ */
+NameType extends string = string, 
+/**
+ * Type that will be returned after a correct parse of this rule.
+ * This type will be the return type of calling SUBRULE with this grammar rule.
+ */
+ReturnType = unknown, 
+/**
+ * Function arguments that can be given to convey the state of the current parse operation.
+ */
+ParamType = undefined> = RuleDef<SparqlContext, NameType, ReturnType, ParamType>;
+export interface SparqlContext {
+    /**
+     * Data-factory to be used when constructing rdf primitives.
+     */
+    dataFactory: DataFactory<RDF.BaseQuad>;
+    /**
+     * Current scoped prefixes. Used for resolving prefixed names.
+     */
+    prefixes: Record<string, string>;
+    /**
+     * The base IRI for the query. Used for resolving relative IRIs.
+     */
+    baseIRI: string | undefined;
+    /**
+     * Can be used to disable the validation that used variables in a select clause are in scope.
+     */
+    skipValidation: boolean;
+    /**
+     * Set of queryModes. Primarily used for note 8, 14.
+     */
+    parseMode: Set<'canParseVars' | 'canCreateBlankNodes' | 'inAggregate' | 'canParseAggregate' | string>;
+}

package/lib/Sparql11types.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sparql11types.js","sourceRoot":"","sources":["Sparql11types.ts"],"names":[],"mappings":"","sourcesContent":["import type * as RdfJs from '@rdfjs/types';\nimport type { BlankNode } from 'rdf-data-factory';\nimport type { CommonIRIs } from '@traqula/core';\n\nexport type GraphTerm = IriTerm | BlankTerm | LiteralTerm;\nexport type Term = GraphTerm | VariableTerm;\nexport type VerbA = IriTerm<CommonIRIs.TYPE>;\n\nexport interface Wildcard {\n  readonly termType: 'Wildcard';\n  readonly value: '*';\n  equals: (other: RdfJs.Term | null | undefined) => boolean;\n}\n\nexport type Triple = {\n  subject: Term;\n  predicate: IriTerm | VariableTerm | PropertyPath;\n  object: Term;\n};\n\nexport type TripleCreatorS = (part: Pick<Triple, 'subject'>) => Triple;\nexport type TripleCreatorSP = (part: Pick<Triple, 'subject' | 'predicate'>) => Triple;\n\nexport interface IGraphNode {\n  node: ITriplesNode['node'] | Term;\n  triples: Triple[];\n}\n\nexport interface ITriplesNode {\n  node: IriTerm | BlankNode;\n  triples: Triple[];\n}\n\nexport type Pattern =\n  | BgpPattern\n  | BlockPattern\n  | FilterPattern\n  | BindPattern\n  | ValuesPattern\n  | Omit<SelectQuery, 'prefixes'>;\n\nexport type Expression =\n  | OperationExpression\n  | FunctionCallExpression\n  | AggregateExpression\n  // Used in `IN` operator\n  | Expression[]\n  | IriTerm\n  | VariableTerm\n  | LiteralTerm;\n\nexport interface FunctionCallExpression extends BaseExpression {\n  type: 'functionCall';\n  function: IriTerm;\n  args: Expression[];\n}\n\n/**\n * Basic Graph Pattern\n */\nexport interface BgpPattern {\n  type: 'bgp';\n  triples: Triple[];\n}\n\nexport interface GraphQuads {\n  type: 'graph';\n  name: IriTerm | VariableTerm;\n  triples: Triple[];\n}\n\n// Copied types\nexport interface SparqlParser {\n  parse: (query: string) => SparqlQuery;\n  _resetBlanks: () => void;\n}\n\nexport type VariableTerm = RdfJs.Variable;\nexport type IriTerm<IRI extends string = string> = RdfJs.NamedNode<IRI>;\nexport type LiteralTerm = RdfJs.Literal;\nexport type BlankTerm = RdfJs.BlankNode;\n\nexport type PropertyPath = NegatedPropertySet | {\n  type: 'path';\n  pathType: '|' | '/' | '^' | '+' | '*' | '?';\n  items: (IriTerm | PropertyPath)[];\n};\n\nexport type SparqlQuery = Query | Update | Pick<Update, 'base' | 'prefixes'>;\n\nexport type Query = SelectQuery | ConstructQuery | AskQuery | DescribeQuery;\n\nexport interface SelectQuery extends BaseQuery {\n  queryType: 'SELECT';\n  variables: Variable[] | [Wildcard];\n  distinct?: true | undefined;\n  reduced?: true | undefined;\n  group?: Grouping[] | undefined;\n  having?: Expression[] | undefined;\n  order?: Ordering[] | undefined;\n  limit?: number | undefined;\n  offset?: number | undefined;\n}\n\nexport interface Grouping {\n  expression: Expression;\n  variable?: VariableTerm;\n}\n\nexport interface Ordering {\n  expression: Expression;\n  descending?: true | undefined;\n}\n\nexport interface ConstructQuery extends BaseQuery {\n  queryType: 'CONSTRUCT';\n  template?: Triple[] | undefined;\n}\n\nexport interface AskQuery extends BaseQuery {\n  queryType: 'ASK';\n}\n\nexport interface DescribeQuery extends BaseQuery {\n  queryType: 'DESCRIBE';\n  variables: (VariableTerm | IriTerm)[] | [Wildcard];\n}\n\nexport interface Update {\n  type: 'update';\n  base?: string | undefined;\n  prefixes: Record<string, string>;\n  updates: UpdateOperation[];\n}\n\nexport type UpdateOperation = InsertDeleteOperation | ManagementOperation;\n\nexport type InsertDeleteOperation =\n  | {\n    updateType: 'insert';\n    graph?: GraphOrDefault;\n    insert: Quads[];\n  }\n  | {\n    updateType: 'delete';\n    graph?: GraphOrDefault;\n    delete: Quads[];\n  }\n  | {\n    updateType: 'insertdelete';\n    graph?: IriTerm;\n    insert: Quads[];\n    delete: Quads[];\n    using?: {\n      default: IriTerm[];\n      named: IriTerm[];\n    };\n    where: Pattern[];\n  }\n  | {\n    updateType: 'deletewhere';\n    graph?: GraphOrDefault;\n    delete: Quads[];\n  };\n\nexport type Quads = BgpPattern | GraphQuads;\n\nexport type ManagementOperation =\n  | CopyMoveAddOperation\n  | LoadOperation\n  | CreateOperation\n  | ClearDropOperation;\n\nexport interface CopyMoveAddOperation {\n  type: 'copy' | 'move' | 'add';\n  silent: boolean;\n  source: GraphOrDefault;\n  destination: GraphOrDefault;\n}\n\nexport interface LoadOperation {\n  type: 'load';\n  silent: boolean;\n  source: IriTerm;\n  destination?: IriTerm;\n}\n\nexport interface CreateOperation {\n  type: 'create';\n  silent: boolean;\n  graph: GraphOrDefault;\n}\n\nexport interface ClearDropOperation {\n  type: 'clear' | 'drop';\n  silent: boolean;\n  graph: GraphReference;\n}\n\nexport interface GraphOrDefault {\n  type?: 'graph';\n  name?: IriTerm | undefined;\n  default?: true | undefined;\n}\n\nexport interface GraphReference extends GraphOrDefault {\n  named?: true | undefined;\n  all?: true | undefined;\n}\n\n/**\n * Examples: '?var', '*',\n *   SELECT (?a as ?b) ... ==> { expression: '?a', variable: '?b' }\n */\nexport type Variable = VariableExpression | VariableTerm;\n\nexport interface VariableExpression {\n  expression: Expression;\n  variable: VariableTerm;\n}\n\nexport interface BaseQuery {\n  type: 'query';\n  base?: string | undefined;\n  prefixes: Record<string, string>;\n  from?:\n    | {\n      default: IriTerm[];\n      named: IriTerm[];\n    }\n    | undefined;\n  where?: Pattern[] | undefined;\n  values?: ValuePatternRow[] | undefined;\n}\n\nexport type IriTermOrElt = IriTerm | {\n  type: 'path';\n  pathType: '^';\n  items: [IriTerm];\n};\n\nexport interface NegatedPropertySet {\n  type: 'path';\n  pathType: '!';\n  items: IriTermOrElt[] | [{\n    type: 'path';\n    pathType: '|';\n    items: (IriTermOrElt)[];\n  }];\n}\n\nexport interface GroupPattern {\n  type: 'group';\n  patterns: Pattern[];\n}\n\nexport interface GraphPattern {\n  type: 'graph';\n  name: IriTerm | VariableTerm;\n  patterns: Pattern[];\n}\n\nexport interface MinusPattern {\n  type: 'minus';\n  patterns: Pattern[];\n}\n\nexport interface ServicePattern {\n  type: 'service';\n  name: IriTerm | VariableTerm;\n  silent: boolean;\n  patterns: Pattern[];\n}\n\nexport type BlockPattern =\n  | OptionalPattern\n  | UnionPattern\n  | GroupPattern\n  | GraphPattern\n  | MinusPattern\n  | ServicePattern;\n\nexport interface OptionalPattern {\n  type: 'optional';\n  patterns: Pattern[];\n}\n\nexport interface UnionPattern {\n  type: 'union';\n  patterns: Pattern[];\n}\n\nexport type ValuePatternRow = Record<string, IriTerm | BlankTerm | LiteralTerm | undefined>;\n\nexport interface FilterPattern {\n  type: 'filter';\n  expression: Expression;\n}\n\nexport interface BindPattern {\n  type: 'bind';\n  expression: Expression;\n  variable: VariableTerm;\n}\n\nexport interface ValuesPattern {\n  type: 'values';\n  values: ValuePatternRow[];\n}\n\nexport interface BaseExpression {\n  type: string;\n  distinct?: boolean | undefined;\n}\n\nexport interface OperationExpression extends BaseExpression {\n  type: 'operation';\n  operator: string;\n  args: (Expression | Pattern)[];\n}\n\nexport interface AggregateExpression extends BaseExpression {\n  type: 'aggregate';\n  expression: Expression | Wildcard;\n  aggregation: string;\n  separator?: string | undefined;\n}\n"]}
+{"version":3,"file":"Sparql11types.js","sourceRoot":"","sources":["Sparql11types.ts"],"names":[],"mappings":"","sourcesContent":["import type * as RdfJs from '@rdfjs/types';\nimport type * as RDF from '@rdfjs/types';\nimport type {BlankNode, DataFactory} from 'rdf-data-factory';\nimport type {CommonIRIs, RuleDef} from '@traqula/core';\n\nexport type GraphTerm = IriTerm | BlankTerm | LiteralTerm;\nexport type Term = GraphTerm | VariableTerm;\nexport type VerbA = IriTerm<CommonIRIs.TYPE>;\n\nexport interface Wildcard {\n  readonly termType: 'Wildcard';\n  readonly value: '*';\n  equals: (other: RdfJs.Term | null | undefined) => boolean;\n}\n\nexport type Triple = {\n  subject: Term;\n  predicate: IriTerm | VariableTerm | PropertyPath;\n  object: Term;\n};\n\nexport interface IGraphNode {\n  node: ITriplesNode['node'] | Term;\n  triples: Triple[];\n}\n\nexport interface ITriplesNode {\n  node: IriTerm | BlankNode;\n  triples: Triple[];\n}\n\nexport type Pattern =\n  | BgpPattern\n  | BlockPattern\n  | FilterPattern\n  | BindPattern\n  | ValuesPattern\n  | Omit<SelectQuery, 'prefixes'>;\n\nexport type Expression =\n  | OperationExpression\n  | FunctionCallExpression\n  | AggregateExpression\n  // Used in `IN` operator\n  | Expression[]\n  | IriTerm\n  | VariableTerm\n  | LiteralTerm;\n\nexport interface FunctionCallExpression extends BaseExpression {\n  type: 'functionCall';\n  function: IriTerm;\n  args: Expression[];\n}\n\n/**\n * Basic Graph Pattern\n */\nexport interface BgpPattern {\n  type: 'bgp';\n  triples: Triple[];\n}\n\nexport interface GraphQuads {\n  type: 'graph';\n  name: IriTerm | VariableTerm;\n  triples: Triple[];\n}\n\nexport type VariableTerm = RdfJs.Variable;\nexport type IriTerm<IRI extends string = string> = RdfJs.NamedNode<IRI>;\nexport type LiteralTerm = RdfJs.Literal;\nexport type BlankTerm = RdfJs.BlankNode;\n\nexport type PropertyPath = NegatedPropertySet | {\n  type: 'path';\n  pathType: '|' | '/' | '^' | '+' | '*' | '?';\n  items: (IriTerm | PropertyPath)[];\n};\n\nexport type SparqlQuery = Query | Update | Pick<Update, 'base' | 'prefixes'>;\n\nexport type Query = SelectQuery | ConstructQuery | AskQuery | DescribeQuery;\n\nexport interface SelectQuery extends BaseQuery {\n  queryType: 'SELECT';\n  variables: Variable[] | [Wildcard];\n  distinct?: true | undefined;\n  reduced?: true | undefined;\n  group?: Grouping[] | undefined;\n  having?: Expression[] | undefined;\n  order?: Ordering[] | undefined;\n  limit?: number | undefined;\n  offset?: number | undefined;\n}\n\nexport interface Grouping {\n  expression: Expression;\n  variable?: VariableTerm;\n}\n\nexport interface Ordering {\n  expression: Expression;\n  descending?: true | undefined;\n}\n\nexport interface ConstructQuery extends BaseQuery {\n  queryType: 'CONSTRUCT';\n  template?: Triple[] | undefined;\n}\n\nexport interface AskQuery extends BaseQuery {\n  queryType: 'ASK';\n}\n\nexport interface DescribeQuery extends BaseQuery {\n  queryType: 'DESCRIBE';\n  variables: (VariableTerm | IriTerm)[] | [Wildcard];\n}\n\nexport interface Update {\n  type: 'update';\n  base?: string | undefined;\n  prefixes: Record<string, string>;\n  updates: UpdateOperation[];\n}\n\nexport type UpdateOperation = InsertDeleteOperation | ManagementOperation;\n\nexport type InsertDeleteOperation =\n  | {\n    updateType: 'insert';\n    graph?: GraphOrDefault;\n    insert: Quads[];\n  }\n  | {\n    updateType: 'delete';\n    graph?: GraphOrDefault;\n    delete: Quads[];\n  }\n  | {\n    updateType: 'insertdelete';\n    graph?: IriTerm;\n    insert: Quads[];\n    delete: Quads[];\n    using?: {\n      default: IriTerm[];\n      named: IriTerm[];\n    };\n    where: Pattern[];\n  }\n  | {\n    updateType: 'deletewhere';\n    graph?: GraphOrDefault;\n    delete: Quads[];\n  };\n\nexport type Quads = BgpPattern | GraphQuads;\n\nexport type ManagementOperation =\n  | CopyMoveAddOperation\n  | LoadOperation\n  | CreateOperation\n  | ClearDropOperation;\n\nexport interface CopyMoveAddOperation {\n  type: 'copy' | 'move' | 'add';\n  silent: boolean;\n  source: GraphOrDefault;\n  destination: GraphOrDefault;\n}\n\nexport interface LoadOperation {\n  type: 'load';\n  silent: boolean;\n  source: IriTerm;\n  destination?: IriTerm;\n}\n\nexport interface CreateOperation {\n  type: 'create';\n  silent: boolean;\n  graph: GraphOrDefault;\n}\n\nexport interface ClearDropOperation {\n  type: 'clear' | 'drop';\n  silent: boolean;\n  graph: GraphReference;\n}\n\nexport interface GraphOrDefault {\n  type?: 'graph';\n  name?: IriTerm | undefined;\n  default?: true | undefined;\n}\n\nexport interface GraphReference extends GraphOrDefault {\n  named?: true | undefined;\n  all?: true | undefined;\n}\n\n/**\n * Examples: '?var', '*',\n *   SELECT (?a as ?b) ... ==> { expression: '?a', variable: '?b' }\n */\nexport type Variable = VariableExpression | VariableTerm;\n\nexport interface VariableExpression {\n  expression: Expression;\n  variable: VariableTerm;\n}\n\nexport interface BaseQuery {\n  type: 'query';\n  base?: string | undefined;\n  prefixes: Record<string, string>;\n  from?:\n    | {\n      default: IriTerm[];\n      named: IriTerm[];\n    }\n    | undefined;\n  where?: Pattern[] | undefined;\n  values?: ValuePatternRow[] | undefined;\n}\n\nexport type IriTermOrElt = IriTerm | {\n  type: 'path';\n  pathType: '^';\n  items: [IriTerm];\n};\n\nexport interface NegatedPropertySet {\n  type: 'path';\n  pathType: '!';\n  items: IriTermOrElt[] | [{\n    type: 'path';\n    pathType: '|';\n    items: (IriTermOrElt)[];\n  }];\n}\n\nexport interface GroupPattern {\n  type: 'group';\n  patterns: Pattern[];\n}\n\nexport interface GraphPattern {\n  type: 'graph';\n  name: IriTerm | VariableTerm;\n  patterns: Pattern[];\n}\n\nexport interface MinusPattern {\n  type: 'minus';\n  patterns: Pattern[];\n}\n\nexport interface ServicePattern {\n  type: 'service';\n  name: IriTerm | VariableTerm;\n  silent: boolean;\n  patterns: Pattern[];\n}\n\nexport type BlockPattern =\n  | OptionalPattern\n  | UnionPattern\n  | GroupPattern\n  | GraphPattern\n  | MinusPattern\n  | ServicePattern;\n\nexport interface OptionalPattern {\n  type: 'optional';\n  patterns: Pattern[];\n}\n\nexport interface UnionPattern {\n  type: 'union';\n  patterns: Pattern[];\n}\n\nexport type ValuePatternRow = Record<string, IriTerm | BlankTerm | LiteralTerm | undefined>;\n\nexport interface FilterPattern {\n  type: 'filter';\n  expression: Expression;\n}\n\nexport interface BindPattern {\n  type: 'bind';\n  expression: Expression;\n  variable: VariableTerm;\n}\n\nexport interface ValuesPattern {\n  type: 'values';\n  values: ValuePatternRow[];\n}\n\nexport interface BaseExpression {\n  type: string;\n  distinct?: boolean | undefined;\n}\n\nexport interface OperationExpression extends BaseExpression {\n  type: 'operation';\n  operator: string;\n  args: (Expression | Pattern)[];\n}\n\nexport interface AggregateExpression extends BaseExpression {\n  type: 'aggregate';\n  expression: Expression | Wildcard;\n  aggregation: string;\n  separator?: string | undefined;\n}\n\nexport type SparqlRuleDef<\n  /**\n   * Name of grammar rule, should be a strict subtype of string like 'myGrammarRule'.\n   */\n  NameType extends string = string,\n  /**\n   * Type that will be returned after a correct parse of this rule.\n   * This type will be the return type of calling SUBRULE with this grammar rule.\n   */\n  ReturnType = unknown,\n  /**\n   * Function arguments that can be given to convey the state of the current parse operation.\n   */\n  ParamType = undefined,\n> = RuleDef<SparqlContext, NameType, ReturnType, ParamType>;\n\nexport interface SparqlContext {\n  /**\n   * Data-factory to be used when constructing rdf primitives.\n   */\n  dataFactory: DataFactory<RDF.BaseQuad>;\n  /**\n   * Current scoped prefixes. Used for resolving prefixed names.\n   */\n  prefixes: Record<string, string>;\n  /**\n   * The base IRI for the query. Used for resolving relative IRIs.\n   */\n  baseIRI: string | undefined;\n  /**\n   * Can be used to disable the validation that used variables in a select clause are in scope.\n   */\n  skipValidation: boolean;\n  /**\n   * Set of queryModes. Primarily used for note 8, 14.\n   */\n  parseMode: Set<'canParseVars' | 'canCreateBlankNodes' | 'inAggregate' | 'canParseAggregate' | string>;\n}"]}

package/lib/SparqlParser.d.ts

@@ -0,0 +1,14 @@
+import { IriTerm, PropertyPath, SparqlContext } from "./Sparql11types";
+interface Parser<ParseRet> {
+    queryOrUpdate: (input: string, context: SparqlContext, arg: undefined) => ParseRet;
+    path: (input: string, context: SparqlContext, arg: undefined) => IriTerm | PropertyPath;
+}
+export declare class SparqlParser<ParseRet> {
+    private parser;
+    constructor(parser: Parser<ParseRet>);
+    parse(query: string, context?: Partial<SparqlContext>): ParseRet;
+    parsePath(query: string, context?: Partial<SparqlContext>): (PropertyPath & {
+        prefixes: object;
+    }) | IriTerm;
+}
+export {};

package/lib/SparqlParser.js

@@ -0,0 +1,29 @@
+import { DataFactory } from "rdf-data-factory";
+function completeParseContext(context) {
+    return {
+        dataFactory: context.dataFactory ?? new DataFactory({ blankNodePrefix: 'g_' }),
+        baseIRI: context.baseIRI,
+        prefixes: { ...context.prefixes },
+        parseMode: context.parseMode ? new Set(context.parseMode) : new Set(['canParseVars', 'canCreateBlankNodes']),
+        skipValidation: context.skipValidation ?? false,
+    };
+}
+export class SparqlParser {
+    constructor(parser) {
+        this.parser = parser;
+    }
+    parse(query, context = {}) {
+        return this.parser.queryOrUpdate(query, completeParseContext(context), undefined);
+    }
+    parsePath(query, context = {}) {
+        const result = this.parser.path(query, completeParseContext(context), undefined);
+        if ('type' in result) {
+            return {
+                ...result,
+                prefixes: {},
+            };
+        }
+        return result;
+    }
+}
+//# sourceMappingURL=SparqlParser.js.map

package/lib/SparqlParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SparqlParser.js","sourceRoot":"","sources":["SparqlParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAQ7C,SAAS,oBAAoB,CAAC,OAA+B;IAC3D,OAAO;QACL,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI,WAAW,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;QAC9E,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE;QACjC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAE,cAAc,EAAE,qBAAqB,CAAE,CAAC;QAC9G,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,KAAK;KAChD,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,YAAY;IACvB,YAA2B,MAAwB;QAAxB,WAAM,GAAN,MAAM,CAAkB;IAAI,CAAC;IAEjD,KAAK,CAAC,KAAa,EAAE,UAAkC,EAAE;QAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;IAEM,SAAS,CAAC,KAAa,EAAE,UAAkC,EAAE;QAClE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;QACjF,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACrB,OAAO;gBACL,GAAG,MAAM;gBACT,QAAQ,EAAE,EAAE;aACb,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF","sourcesContent":["import {DataFactory} from \"rdf-data-factory\";\nimport {IriTerm, PropertyPath, SparqlContext} from \"./Sparql11types\";\n\ninterface Parser<ParseRet> {\n  queryOrUpdate: (input: string, context: SparqlContext, arg: undefined) => ParseRet;\n  path: (input: string, context: SparqlContext, arg: undefined) => IriTerm | PropertyPath;\n}\n\nfunction completeParseContext(context: Partial<SparqlContext>): SparqlContext {\n  return {\n    dataFactory: context.dataFactory ?? new DataFactory({ blankNodePrefix: 'g_' }),\n    baseIRI: context.baseIRI,\n    prefixes: { ...context.prefixes },\n    parseMode: context.parseMode ? new Set(context.parseMode) : new Set([ 'canParseVars', 'canCreateBlankNodes' ]),\n    skipValidation: context.skipValidation ?? false,\n  };\n}\n\nexport class SparqlParser<ParseRet> {\n  public constructor(private parser: Parser<ParseRet>) { }\n\n  public parse(query: string, context: Partial<SparqlContext> = {}): ParseRet {\n    return this.parser.queryOrUpdate(query, completeParseContext(context), undefined);\n  }\n\n  public parsePath(query: string, context: Partial<SparqlContext> = {}): (PropertyPath & { prefixes: object }) | IriTerm {\n    const result = this.parser.path(query, completeParseContext(context), undefined);\n    if ('type' in result) {\n      return {\n        ...result,\n        prefixes: {},\n      };\n    }\n    return result;\n  }\n}\n"]}

package/lib/expressionHelpers.d.ts

@@ -1,13 +1,12 @@
 import type { TokenType } from 'chevrotain';
 import { Wildcard } from '@traqula/core';
-import type { RuleDef } from '@traqula/core';
-import type { Expression, Pattern, VariableTerm } from './Sparql11types';
+import type { Expression, Pattern, SparqlRuleDef, VariableTerm } from './Sparql11types';
 export interface IExpressionFunctionX<U extends (Expression | Pattern)[]> {
     type: 'operation';
     operator: string;
     args: U;
 }
-export type RuleDefExpressionFunctionX<T extends string, U extends (Expression | Pattern)[]> = RuleDef<T, IExpressionFunctionX<U>>;
+export type RuleDefExpressionFunctionX<T extends string, U extends (Expression | Pattern)[]> = SparqlRuleDef<T, IExpressionFunctionX<U>>;
 export declare function funcExpr1<T extends string>(func: TokenType & {
     name: T;
 }): RuleDefExpressionFunctionX<Uncapitalize<T>, [Expression]>;
@@ -49,7 +48,7 @@ export interface IExpressionAggregator {
     aggregation: string;
     separator?: string;
 }
-export type RuleDefExpressionAggregatorX<T extends string> = RuleDef<T, IExpressionAggregator>;
+export type RuleDefExpressionAggregatorX<T extends string> = SparqlRuleDef<T, IExpressionAggregator>;
 export declare function baseAggregateFunc<T extends string>(func: TokenType & {
     name: T;
 }): RuleDefExpressionAggregatorX<Uncapitalize<T>>;

package/lib/expressionHelpers.js

@@ -14,7 +14,7 @@ export function funcExpr1(func) {
         impl: ({ SUBRULE, CONSUME }) => () => {
             const operator = CONSUME(func);
             CONSUME(l.symbols.LParen);
-            const arg = SUBRULE(expression);
+            const arg = SUBRULE(expression, undefined);
             CONSUME(l.symbols.RParen);
             return {
                 type: 'operation',
@@ -30,9 +30,9 @@ export function funcExpr2(func) {
         impl: ({ SUBRULE1, SUBRULE2, CONSUME }) => () => {
             const operator = CONSUME(func);
             CONSUME(l.symbols.LParen);
-            const arg1 = SUBRULE1(expression);
+            const arg1 = SUBRULE1(expression, undefined);
             CONSUME(l.symbols.comma);
-            const arg2 = SUBRULE2(expression);
+            const arg2 = SUBRULE2(expression, undefined);
             CONSUME(l.symbols.RParen);
             return {
                 type: 'operation',
@@ -48,11 +48,11 @@ export function funcExpr3(func) {
         impl: ({ SUBRULE1, SUBRULE2, SUBRULE3, CONSUME, CONSUME1, CONSUME2 }) => () => {
             const operator = CONSUME(func);
             CONSUME(l.symbols.LParen);
-            const arg1 = SUBRULE1(expression);
+            const arg1 = SUBRULE1(expression, undefined);
             CONSUME1(l.symbols.comma);
-            const arg2 = SUBRULE2(expression);
+            const arg2 = SUBRULE2(expression, undefined);
             CONSUME2(l.symbols.comma);
-            const arg3 = SUBRULE3(expression);
+            const arg3 = SUBRULE3(expression, undefined);
             CONSUME(l.symbols.RParen);
             return {
                 type: 'operation',
@@ -68,7 +68,7 @@ export function funcVar1(func) {
         impl: ({ SUBRULE, CONSUME }) => () => {
             const operator = CONSUME(func);
             CONSUME(l.symbols.LParen);
-            const arg = SUBRULE(var_);
+            const arg = SUBRULE(var_, undefined);
             CONSUME(l.symbols.RParen);
             return {
                 type: 'operation',
@@ -87,7 +87,7 @@ export function funcExprOrNil1(func) {
                 {
                     ALT: () => {
                         CONSUME(l.symbols.LParen);
-                        const arg = SUBRULE(expression);
+                        const arg = SUBRULE(expression, undefined);
                         CONSUME(l.symbols.RParen);
                         return [arg];
                     },
@@ -126,7 +126,7 @@ export function funcExprList1(func) {
         name: unCapitalize(func.name),
         impl: ({ CONSUME, SUBRULE }) => () => {
             const operator = CONSUME(func);
-            const args = SUBRULE(expressionList);
+            const args = SUBRULE(expressionList, undefined);
             return {
                 type: 'operation',
                 operator: formatOperator(operator.image),
@@ -141,12 +141,12 @@ export function funcExpr2or3(func) {
         impl: ({ CONSUME, SUBRULE1, SUBRULE2, SUBRULE3, CONSUME1, OPTION, CONSUME2 }) => () => {
             const operator = CONSUME(func);
             CONSUME(l.symbols.LParen);
-            const arg1 = SUBRULE1(expression);
+            const arg1 = SUBRULE1(expression, undefined);
             CONSUME1(l.symbols.comma);
-            const arg2 = SUBRULE2(expression);
+            const arg2 = SUBRULE2(expression, undefined);
             const arg3 = OPTION(() => {
                 CONSUME2(l.symbols.comma);
-                return SUBRULE3(expression);
+                return SUBRULE3(expression, undefined);
             });
             CONSUME(l.symbols.RParen);
             return {
@@ -163,14 +163,14 @@ export function funcExpr3or4(func) {
         impl: ({ CONSUME, SUBRULE1, SUBRULE2, SUBRULE3, CONSUME1, OPTION, CONSUME2, SUBRULE4, CONSUME3 }) => () => {
             const operator = CONSUME(func);
             CONSUME(l.symbols.LParen);
-            const arg1 = SUBRULE1(expression);
+            const arg1 = SUBRULE1(expression, undefined);
             CONSUME1(l.symbols.comma);
-            const arg2 = SUBRULE2(expression);
+            const arg2 = SUBRULE2(expression, undefined);
             CONSUME2(l.symbols.comma);
-            const arg3 = SUBRULE3(expression);
+            const arg3 = SUBRULE3(expression, undefined);
             const arg4 = OPTION(() => {
                 CONSUME3(l.symbols.comma);
-                return SUBRULE4(expression);
+                return SUBRULE4(expression, undefined);
             });
             CONSUME(l.symbols.RParen);
             return {
@@ -186,7 +186,7 @@ export function funcGroupGraphPattern(func) {
         name: unCapitalize(func.name),
         impl: ({ ACTION, SUBRULE, CONSUME }) => () => {
             const operator = CONSUME(func);
-            const group = SUBRULE(groupGraphPattern);
+            const group = SUBRULE(groupGraphPattern, undefined);
             return ACTION(() => ({
                 type: 'operation',
                 operator: formatOperator(operator.image),
@@ -209,7 +209,7 @@ export function baseAggregateFunc(func) {
                         return new Wildcard();
                     },
                 },
-                { ALT: () => SUBRULE(expression) },
+                { ALT: () => SUBRULE(expression, undefined) },
             ]);
             CONSUME(l.symbols.RParen);
             return {

package/lib/expressionHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"expressionHelpers.js","sourceRoot":"","sources":["expressionHelpers.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TokenType } from 'chevrotain';\nimport * as l from './lexer';\nimport { Wildcard } from '@traqula/core';\nimport type { RuleDef } from '@traqula/core';\nimport { expression, expressionList } from './grammar/expression';\nimport { var_ } from './grammar/general';\nimport type { Expression, Pattern, VariableTerm } from './Sparql11types';\nimport { groupGraphPattern } from './grammar/whereClause';\nimport { unCapitalize } from '@traqula/core';\nimport { deGroupSingle } from './utils';\n\nexport interface IExpressionFunctionX<U extends (Expression | Pattern)[]> {\n  type: 'operation';\n  operator: string;\n  args: U;\n}\n\nexport type RuleDefExpressionFunctionX<T extends string, U extends (Expression | Pattern)[]>\n  = RuleDef<T, IExpressionFunctionX<U>>;\n\nfunction formatOperator(operator: string): string {\n  return operator.toLowerCase().replaceAll(' ', '');\n}\n\nexport function funcExpr1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ SUBRULE, CONSUME }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg = SUBRULE(expression);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ arg ],\n      };\n    },\n  };\n}\n\nexport function funcExpr2<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [Expression, Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ SUBRULE1, SUBRULE2, CONSUME }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg1 = SUBRULE1(expression);\n      CONSUME(l.symbols.comma);\n      const arg2 = SUBRULE2(expression);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ arg1, arg2 ],\n      };\n    },\n  };\n}\n\nexport function funcExpr3<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [Expression, Expression, Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ SUBRULE1, SUBRULE2, SUBRULE3, CONSUME, CONSUME1, CONSUME2 }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg1 = SUBRULE1(expression);\n      CONSUME1(l.symbols.comma);\n      const arg2 = SUBRULE2(expression);\n      CONSUME2(l.symbols.comma);\n      const arg3 = SUBRULE3(expression);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ arg1, arg2, arg3 ],\n      };\n    },\n  };\n}\n\nexport function funcVar1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [VariableTerm]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ SUBRULE, CONSUME }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg = SUBRULE(var_);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ arg ],\n      };\n    },\n  };\n}\n\nexport function funcExprOrNil1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [] | [Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, OR, SUBRULE }) => () => {\n      const operator = CONSUME(func);\n      const args = OR<[] | [Expression]>([\n        {\n          ALT: () => {\n            CONSUME(l.symbols.LParen);\n            const arg = SUBRULE(expression);\n            CONSUME(l.symbols.RParen);\n            return [ arg ];\n          },\n        },\n        {\n          ALT: () => {\n            CONSUME(l.terminals.nil);\n            return [];\n          },\n        },\n      ]);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args,\n      };\n    },\n  };\n}\n\nexport function funcNil1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, []> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.terminals.nil);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [],\n      };\n    },\n  };\n}\n\nexport function funcExprList1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, Expression[]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, SUBRULE }) => () => {\n      const operator = CONSUME(func);\n      const args = SUBRULE(expressionList);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args,\n      };\n    },\n  };\n}\n\nexport function funcExpr2or3<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [Expression, Expression] | [Expression, Expression, Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, SUBRULE1, SUBRULE2, SUBRULE3, CONSUME1, OPTION, CONSUME2 }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg1 = SUBRULE1(expression);\n      CONSUME1(l.symbols.comma);\n      const arg2 = SUBRULE2(expression);\n      const arg3 = OPTION(() => {\n        CONSUME2(l.symbols.comma);\n        return SUBRULE3(expression);\n      });\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: arg3 ? [ arg1, arg2, arg3 ] : [ arg1, arg2 ],\n      };\n    },\n  };\n}\n\nexport function funcExpr3or4<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<\n    Uncapitalize<T>,\n    [Expression, Expression, Expression] | [Expression, Expression, Expression, Expression]\n  > {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, SUBRULE1, SUBRULE2, SUBRULE3, CONSUME1, OPTION, CONSUME2, SUBRULE4, CONSUME3 }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg1 = SUBRULE1(expression);\n      CONSUME1(l.symbols.comma);\n      const arg2 = SUBRULE2(expression);\n      CONSUME2(l.symbols.comma);\n      const arg3 = SUBRULE3(expression);\n      const arg4 = OPTION(() => {\n        CONSUME3(l.symbols.comma);\n        return SUBRULE4(expression);\n      });\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: arg4 ? [ arg1, arg2, arg3, arg4 ] : [ arg1, arg2, arg3 ],\n      };\n    },\n  };\n}\n\nexport function funcGroupGraphPattern<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<\n    Uncapitalize<T>,\n    Pattern[]\n  > {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ ACTION, SUBRULE, CONSUME }) => () => {\n      const operator = CONSUME(func);\n      const group = SUBRULE(groupGraphPattern);\n      return ACTION(() => ({\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ deGroupSingle(group) ],\n      }));\n    },\n  };\n}\n\nexport interface IExpressionAggregator {\n  type: 'aggregate';\n  distinct: boolean;\n  expression: Expression | Wildcard;\n  aggregation: string;\n  separator?: string;\n}\n\nexport type RuleDefExpressionAggregatorX<T extends string> = RuleDef<T, IExpressionAggregator>;\n\nexport function baseAggregateFunc<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionAggregatorX<Uncapitalize<T>> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, SUBRULE, OPTION, OR }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const distinct = OPTION(() => CONSUME(l.distinct));\n      const expressionVal = OR<Expression | Wildcard>([\n        {\n          ALT: () => {\n            CONSUME(l.symbols.star);\n            return new Wildcard();\n          },\n        },\n        { ALT: () => SUBRULE(expression) },\n      ]);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'aggregate',\n        aggregation: operator.image.toLowerCase(),\n        expression: expressionVal,\n        distinct: Boolean(distinct),\n      };\n    },\n  };\n}\n"]}
+{"version":3,"file":"expressionHelpers.js","sourceRoot":"","sources":["expressionHelpers.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TokenType } from 'chevrotain';\nimport * as l from './lexer';\nimport { Wildcard } from '@traqula/core';\nimport { expression, expressionList } from './grammar/expression';\nimport { var_ } from './grammar/general';\nimport type {Expression, Pattern, SparqlRuleDef, VariableTerm} from './Sparql11types';\nimport { groupGraphPattern } from './grammar/whereClause';\nimport { unCapitalize } from '@traqula/core';\nimport { deGroupSingle } from './utils';\n\nexport interface IExpressionFunctionX<U extends (Expression | Pattern)[]> {\n  type: 'operation';\n  operator: string;\n  args: U;\n}\n\nexport type RuleDefExpressionFunctionX<T extends string, U extends (Expression | Pattern)[]>\n  = SparqlRuleDef<T, IExpressionFunctionX<U>>;\n\nfunction formatOperator(operator: string): string {\n  return operator.toLowerCase().replaceAll(' ', '');\n}\n\nexport function funcExpr1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ SUBRULE, CONSUME }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg = SUBRULE(expression, undefined);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ arg ],\n      };\n    },\n  };\n}\n\nexport function funcExpr2<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [Expression, Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ SUBRULE1, SUBRULE2, CONSUME }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg1 = SUBRULE1(expression, undefined);\n      CONSUME(l.symbols.comma);\n      const arg2 = SUBRULE2(expression, undefined);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ arg1, arg2 ],\n      };\n    },\n  };\n}\n\nexport function funcExpr3<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [Expression, Expression, Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ SUBRULE1, SUBRULE2, SUBRULE3, CONSUME, CONSUME1, CONSUME2 }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg1 = SUBRULE1(expression, undefined);\n      CONSUME1(l.symbols.comma);\n      const arg2 = SUBRULE2(expression, undefined);\n      CONSUME2(l.symbols.comma);\n      const arg3 = SUBRULE3(expression, undefined);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ arg1, arg2, arg3 ],\n      };\n    },\n  };\n}\n\nexport function funcVar1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [VariableTerm]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ SUBRULE, CONSUME }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg = SUBRULE(var_, undefined);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ arg ],\n      };\n    },\n  };\n}\n\nexport function funcExprOrNil1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [] | [Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, OR, SUBRULE }) => () => {\n      const operator = CONSUME(func);\n      const args = OR<[] | [Expression]>([\n        {\n          ALT: () => {\n            CONSUME(l.symbols.LParen);\n            const arg = SUBRULE(expression, undefined);\n            CONSUME(l.symbols.RParen);\n            return [ arg ];\n          },\n        },\n        {\n          ALT: () => {\n            CONSUME(l.terminals.nil);\n            return [];\n          },\n        },\n      ]);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args,\n      };\n    },\n  };\n}\n\nexport function funcNil1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, []> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.terminals.nil);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [],\n      };\n    },\n  };\n}\n\nexport function funcExprList1<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, Expression[]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, SUBRULE }) => () => {\n      const operator = CONSUME(func);\n      const args = SUBRULE(expressionList, undefined);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args,\n      };\n    },\n  };\n}\n\nexport function funcExpr2or3<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<Uncapitalize<T>, [Expression, Expression] | [Expression, Expression, Expression]> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, SUBRULE1, SUBRULE2, SUBRULE3, CONSUME1, OPTION, CONSUME2 }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg1 = SUBRULE1(expression, undefined);\n      CONSUME1(l.symbols.comma);\n      const arg2 = SUBRULE2(expression, undefined);\n      const arg3 = OPTION(() => {\n        CONSUME2(l.symbols.comma);\n        return SUBRULE3(expression, undefined);\n      });\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: arg3 ? [ arg1, arg2, arg3 ] : [ arg1, arg2 ],\n      };\n    },\n  };\n}\n\nexport function funcExpr3or4<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<\n    Uncapitalize<T>,\n    [Expression, Expression, Expression] | [Expression, Expression, Expression, Expression]\n  > {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, SUBRULE1, SUBRULE2, SUBRULE3, CONSUME1, OPTION, CONSUME2, SUBRULE4, CONSUME3 }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const arg1 = SUBRULE1(expression, undefined);\n      CONSUME1(l.symbols.comma);\n      const arg2 = SUBRULE2(expression, undefined);\n      CONSUME2(l.symbols.comma);\n      const arg3 = SUBRULE3(expression, undefined);\n      const arg4 = OPTION(() => {\n        CONSUME3(l.symbols.comma);\n        return SUBRULE4(expression, undefined);\n      });\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: arg4 ? [ arg1, arg2, arg3, arg4 ] : [ arg1, arg2, arg3 ],\n      };\n    },\n  };\n}\n\nexport function funcGroupGraphPattern<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionFunctionX<\n    Uncapitalize<T>,\n    Pattern[]\n  > {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ ACTION, SUBRULE, CONSUME }) => () => {\n      const operator = CONSUME(func);\n      const group = SUBRULE(groupGraphPattern, undefined);\n      return ACTION(() => ({\n        type: 'operation',\n        operator: formatOperator(operator.image),\n        args: [ deGroupSingle(group) ],\n      }));\n    },\n  };\n}\n\nexport interface IExpressionAggregator {\n  type: 'aggregate';\n  distinct: boolean;\n  expression: Expression | Wildcard;\n  aggregation: string;\n  separator?: string;\n}\n\nexport type RuleDefExpressionAggregatorX<T extends string> = SparqlRuleDef<T, IExpressionAggregator>;\n\nexport function baseAggregateFunc<T extends string>(func: TokenType & { name: T }):\nRuleDefExpressionAggregatorX<Uncapitalize<T>> {\n  return {\n    name: unCapitalize(func.name),\n    impl: ({ CONSUME, SUBRULE, OPTION, OR }) => () => {\n      const operator = CONSUME(func);\n      CONSUME(l.symbols.LParen);\n      const distinct = OPTION(() => CONSUME(l.distinct));\n      const expressionVal = OR<Expression | Wildcard>([\n        {\n          ALT: () => {\n            CONSUME(l.symbols.star);\n            return new Wildcard();\n          },\n        },\n        { ALT: () => SUBRULE(expression, undefined) },\n      ]);\n      CONSUME(l.symbols.RParen);\n      return {\n        type: 'aggregate',\n        aggregation: operator.image.toLowerCase(),\n        expression: expressionVal,\n        distinct: Boolean(distinct),\n      };\n    },\n  };\n}\n"]}

package/lib/grammar/builtIn.d.ts

@@ -1,7 +1,7 @@
 import type { IOrAlt } from '@chevrotain/types';
-import type { ImplArgs, RuleDef } from '@traqula/core';
+import type { ImplArgs } from '@traqula/core';
 import type { RuleDefExpressionFunctionX } from '../expressionHelpers';
-import type { AggregateExpression, Expression } from '../Sparql11types';
+import type { AggregateExpression, Expression, SparqlRuleDef } from '../Sparql11types';
 export declare const builtInStr: RuleDefExpressionFunctionX<"builtInStr", [Expression]>;
 export declare const builtInLang: RuleDefExpressionFunctionX<"builtInLang", [Expression]>;
 export declare const builtInLangmatches: RuleDefExpressionFunctionX<"builtInLangmatches", [Expression, Expression]>;
@@ -55,7 +55,7 @@ export declare function builtInCallList(SUBRULE: ImplArgs['SUBRULE']): IOrAlt<Ex
 /**
  * [[121]](https://www.w3.org/TR/sparql11-query/#rBuiltInCall)
  */
-export declare const builtInCall: RuleDef<'builtInCall', Expression>;
+export declare const builtInCall: SparqlRuleDef<'builtInCall', Expression>;
 /**
  * [[122]](https://www.w3.org/TR/sparql11-query/#rBuiltInCall)
  */
@@ -82,10 +82,8 @@ export declare const aggregateMin: import(".").RuleDefExpressionAggregatorX<"bui
 export declare const aggregateMax: import(".").RuleDefExpressionAggregatorX<"builtInMax">;
 export declare const aggregateAvg: import(".").RuleDefExpressionAggregatorX<"builtInAvg">;
 export declare const aggregateSample: import(".").RuleDefExpressionAggregatorX<"builtInSample">;
-export declare const aggregateGroup_concat: RuleDef<'builtInGroup_concat', AggregateExpression>;
-export declare const canParseAggregate: unique symbol;
-export declare const inAggregate: unique symbol;
+export declare const aggregateGroup_concat: SparqlRuleDef<'builtInGroup_concat', AggregateExpression>;
 /**
  * [[127]](https://www.w3.org/TR/sparql11-query/#rBuiltInCall)
  */
-export declare const aggregate: RuleDef<'aggregate', Expression>;
+export declare const aggregate: SparqlRuleDef<'aggregate', Expression>;

package/lib/grammar/builtIn.js

@@ -19,7 +19,7 @@ export const builtInBnodeSparqlJs = {
             {
                 ALT: () => {
                     CONSUME(l.symbols.LParen);
-                    const arg = SUBRULE(expression);
+                    const arg = SUBRULE(expression, undefined);
                     CONSUME(l.symbols.RParen);
                     return [arg];
                 },
@@ -82,61 +82,61 @@ export const builtInIsliteral = funcExpr1(l.builtIn.isliteral);
 export const builtInIsnumeric = funcExpr1(l.builtIn.isnumeric);
 export function builtInCallList(SUBRULE) {
     return [
-        { ALT: () => SUBRULE(aggregate) },
-        { ALT: () => SUBRULE(builtInStr) },
-        { ALT: () => SUBRULE(builtInLang) },
-        { ALT: () => SUBRULE(builtInLangmatches) },
-        { ALT: () => SUBRULE(builtInDatatype) },
-        { ALT: () => SUBRULE(builtInBound) },
-        { ALT: () => SUBRULE(builtInIri) },
-        { ALT: () => SUBRULE(builtInUri) },
-        { ALT: () => SUBRULE(builtInBnodeSparqlJs) },
-        { ALT: () => SUBRULE(builtInRand) },
-        { ALT: () => SUBRULE(builtInAbs) },
-        { ALT: () => SUBRULE(builtInCeil) },
-        { ALT: () => SUBRULE(builtInFloor) },
-        { ALT: () => SUBRULE(builtInRound) },
-        { ALT: () => SUBRULE(builtInConcat) },
-        { ALT: () => SUBRULE(substringExpression) },
-        { ALT: () => SUBRULE(builtInStrlen) },
-        { ALT: () => SUBRULE(strReplaceExpression) },
-        { ALT: () => SUBRULE(builtInUcase) },
-        { ALT: () => SUBRULE(builtInLcase) },
-        { ALT: () => SUBRULE(builtInEncode_for_uri) },
-        { ALT: () => SUBRULE(builtInContains) },
-        { ALT: () => SUBRULE(builtInStrstarts) },
-        { ALT: () => SUBRULE(builtInStrends) },
-        { ALT: () => SUBRULE(builtInStrbefore) },
-        { ALT: () => SUBRULE(builtInStrafter) },
-        { ALT: () => SUBRULE(builtInYear) },
-        { ALT: () => SUBRULE(builtInMonth) },
-        { ALT: () => SUBRULE(builtInDay) },
-        { ALT: () => SUBRULE(builtInHours) },
-        { ALT: () => SUBRULE(builtInMinutes) },
-        { ALT: () => SUBRULE(builtInSeconds) },
-        { ALT: () => SUBRULE(builtInTimezone) },
-        { ALT: () => SUBRULE(builtInTz) },
-        { ALT: () => SUBRULE(builtInNow) },
-        { ALT: () => SUBRULE(builtInUuid) },
-        { ALT: () => SUBRULE(builtInStruuid) },
-        { ALT: () => SUBRULE(builtInMd5) },
-        { ALT: () => SUBRULE(builtInSha1) },
-        { ALT: () => SUBRULE(builtInSha256) },
-        { ALT: () => SUBRULE(builtInSha384) },
-        { ALT: () => SUBRULE(builtInSha512) },
-        { ALT: () => SUBRULE(builtInCoalesce) },
-        { ALT: () => SUBRULE(builtInIf) },
-        { ALT: () => SUBRULE(builtInStrlang) },
-        { ALT: () => SUBRULE(builtInStrdt) },
-        { ALT: () => SUBRULE(builtInSameterm) },
-        { ALT: () => SUBRULE(builtInIsiri) },
-        { ALT: () => SUBRULE(builtInIsuri) },
-        { ALT: () => SUBRULE(builtInIsblank) },
-        { ALT: () => SUBRULE(builtInIsliteral) },
-        { ALT: () => SUBRULE(builtInIsnumeric) },
-        { ALT: () => SUBRULE(regexExpression) },
-        { ALT: () => SUBRULE(existsFunc) },
-        { ALT: () => SUBRULE(notExistsFunc) },
+        { ALT: () => SUBRULE(aggregate, undefined) },
+        { ALT: () => SUBRULE(builtInStr, undefined) },
+        { ALT: () => SUBRULE(builtInLang, undefined) },
+        { ALT: () => SUBRULE(builtInLangmatches, undefined) },
+        { ALT: () => SUBRULE(builtInDatatype, undefined) },
+        { ALT: () => SUBRULE(builtInBound, undefined) },
+        { ALT: () => SUBRULE(builtInIri, undefined) },
+        { ALT: () => SUBRULE(builtInUri, undefined) },
+        { ALT: () => SUBRULE(builtInBnodeSparqlJs, undefined) },
+        { ALT: () => SUBRULE(builtInRand, undefined) },
+        { ALT: () => SUBRULE(builtInAbs, undefined) },
+        { ALT: () => SUBRULE(builtInCeil, undefined) },
+        { ALT: () => SUBRULE(builtInFloor, undefined) },
+        { ALT: () => SUBRULE(builtInRound, undefined) },
+        { ALT: () => SUBRULE(builtInConcat, undefined) },
+        { ALT: () => SUBRULE(substringExpression, undefined) },
+        { ALT: () => SUBRULE(builtInStrlen, undefined) },
+        { ALT: () => SUBRULE(strReplaceExpression, undefined) },
+        { ALT: () => SUBRULE(builtInUcase, undefined) },
+        { ALT: () => SUBRULE(builtInLcase, undefined) },
+        { ALT: () => SUBRULE(builtInEncode_for_uri, undefined) },
+        { ALT: () => SUBRULE(builtInContains, undefined) },
+        { ALT: () => SUBRULE(builtInStrstarts, undefined) },
+        { ALT: () => SUBRULE(builtInStrends, undefined) },
+        { ALT: () => SUBRULE(builtInStrbefore, undefined) },
+        { ALT: () => SUBRULE(builtInStrafter, undefined) },
+        { ALT: () => SUBRULE(builtInYear, undefined) },
+        { ALT: () => SUBRULE(builtInMonth, undefined) },
+        { ALT: () => SUBRULE(builtInDay, undefined) },
+        { ALT: () => SUBRULE(builtInHours, undefined) },
+        { ALT: () => SUBRULE(builtInMinutes, undefined) },
+        { ALT: () => SUBRULE(builtInSeconds, undefined) },
+        { ALT: () => SUBRULE(builtInTimezone, undefined) },
+        { ALT: () => SUBRULE(builtInTz, undefined) },
+        { ALT: () => SUBRULE(builtInNow, undefined) },
+        { ALT: () => SUBRULE(builtInUuid, undefined) },
+        { ALT: () => SUBRULE(builtInStruuid, undefined) },
+        { ALT: () => SUBRULE(builtInMd5, undefined) },
+        { ALT: () => SUBRULE(builtInSha1, undefined) },
+        { ALT: () => SUBRULE(builtInSha256, undefined) },
+        { ALT: () => SUBRULE(builtInSha384, undefined) },
+        { ALT: () => SUBRULE(builtInSha512, undefined) },
+        { ALT: () => SUBRULE(builtInCoalesce, undefined) },
+        { ALT: () => SUBRULE(builtInIf, undefined) },
+        { ALT: () => SUBRULE(builtInStrlang, undefined) },
+        { ALT: () => SUBRULE(builtInStrdt, undefined) },
+        { ALT: () => SUBRULE(builtInSameterm, undefined) },
+        { ALT: () => SUBRULE(builtInIsiri, undefined) },
+        { ALT: () => SUBRULE(builtInIsuri, undefined) },
+        { ALT: () => SUBRULE(builtInIsblank, undefined) },
+        { ALT: () => SUBRULE(builtInIsliteral, undefined) },
+        { ALT: () => SUBRULE(builtInIsnumeric, undefined) },
+        { ALT: () => SUBRULE(regexExpression, undefined) },
+        { ALT: () => SUBRULE(existsFunc, undefined) },
+        { ALT: () => SUBRULE(notExistsFunc, undefined) },
     ];
 }
 /**
@@ -186,12 +186,12 @@ export const aggregateGroup_concat = {
         CONSUME(l.builtIn.groupConcat);
         CONSUME(l.symbols.LParen);
         const distinct = OPTION1(() => CONSUME(l.distinct));
-        const expr = SUBRULE(expression);
+        const expr = SUBRULE(expression, undefined);
         const separator = OPTION2(() => {
             CONSUME(l.symbols.semi);
             CONSUME(l.separator);
             CONSUME(l.symbols.equal);
-            return SUBRULE(string);
+            return SUBRULE(string, undefined);
         }) ?? ' ';
         CONSUME(l.symbols.RParen);
         return {
@@ -203,33 +203,31 @@ export const aggregateGroup_concat = {
         };
     },
 };
-export const canParseAggregate = Symbol('canParseAggregate');
-export const inAggregate = Symbol('inAggregate');
 /**
  * [[127]](https://www.w3.org/TR/sparql11-query/#rBuiltInCall)
  */
 export const aggregate = {
     name: 'aggregate',
-    impl: ({ ACTION, SUBRULE, OR, context }) => () => {
+    impl: ({ ACTION, SUBRULE, OR }) => (C) => {
         // https://www.w3.org/2013/sparql-errata#errata-query-5 - Or note 15 in SPARQL1.2 spec
         //  An aggregate function is not allowed within an aggregate function.
-        const wasInAggregate = context.parseMode.has(inAggregate);
-        ACTION(() => context.parseMode.add(inAggregate));
+        const wasInAggregate = ACTION(() => C.parseMode.has('inAggregate'));
+        ACTION(() => C.parseMode.add('inAggregate'));
         const result = OR([
-            { ALT: () => SUBRULE(aggregateCount) },
-            { ALT: () => SUBRULE(aggregateSum) },
-            { ALT: () => SUBRULE(aggregateMin) },
-            { ALT: () => SUBRULE(aggregateMax) },
-            { ALT: () => SUBRULE(aggregateAvg) },
-            { ALT: () => SUBRULE(aggregateSample) },
-            { ALT: () => SUBRULE(aggregateGroup_concat) },
+            { ALT: () => SUBRULE(aggregateCount, undefined) },
+            { ALT: () => SUBRULE(aggregateSum, undefined) },
+            { ALT: () => SUBRULE(aggregateMin, undefined) },
+            { ALT: () => SUBRULE(aggregateMax, undefined) },
+            { ALT: () => SUBRULE(aggregateAvg, undefined) },
+            { ALT: () => SUBRULE(aggregateSample, undefined) },
+            { ALT: () => SUBRULE(aggregateGroup_concat, undefined) },
         ]);
-        ACTION(() => !wasInAggregate && context.parseMode.delete(inAggregate));
+        ACTION(() => !wasInAggregate && C.parseMode.delete('inAggregate'));
         ACTION(() => {
-            if (!context.parseMode.has(canParseAggregate)) {
+            if (!C.parseMode.has('canParseAggregate')) {
                 throw new Error('Aggregates are only allowed in SELECT, HAVING, and ORDER BY clauses.');
             }
-            if (context.parseMode.has(inAggregate)) {
+            if (C.parseMode.has('inAggregate')) {
                 throw new Error('An aggregate function is not allowed within an aggregate function.');
             }
         });