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

package/lib/factoryMixins/ExpressionFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpressionFactory.js","sourceRoot":"","sources":["ExpressionFactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  Expression,\n  ExpressionAggregate,\n  ExpressionAggregateDefault,\n  ExpressionAggregateOnWildcard,\n  ExpressionAggregateSeparator,\n  ExpressionFunctionCall,\n  ExpressionOperation,\n  ExpressionPatternOperation,\n  PatternGroup,\n  TermIri,\n  Wildcard,\n} from '../RoundTripTypes';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'expression';\nconst nodeType: NodeType = 'expression';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function ExpressionFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class ExpressionFactory extends Base {\n    public isExpressionPure(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public formatOperator(operator: string): string {\n      return operator.toLowerCase().replaceAll(' ', '');\n    }\n\n    public expressionOperation<Args extends Expression[]>(\n      operator: string,\n      args: Args,\n      loc: SourceLocation,\n    ): ExpressionOperation & { args: Args } {\n      return {\n        type: nodeType,\n        subType: 'operation',\n        operator: this.formatOperator(operator),\n        args,\n        loc,\n      };\n    }\n\n    public isExpressionOperator(obj: object): obj is SubTyped<NodeType, 'operation'> {\n      return this.isOfSubType(obj, nodeType, 'operation');\n    }\n\n    public expressionFunctionCall<Args extends Expression[]>(\n      functionOp: TermIri,\n      args: Args,\n      distinct: boolean,\n      loc: SourceLocation,\n    ): ExpressionFunctionCall & { args: Args } {\n      return {\n        type: 'expression',\n        subType: 'functionCall',\n        function: functionOp,\n        args,\n        distinct,\n        loc,\n      };\n    }\n\n    public isExpressionFunctionCall(obj: object): obj is SubTyped<NodeType, 'functionCall'> {\n      return this.isOfSubType(obj, nodeType, 'functionCall');\n    }\n\n    public expressionPatternOperation(\n      operator: string,\n      args: PatternGroup,\n      loc: SourceLocation,\n    ): ExpressionPatternOperation {\n      return {\n        type: nodeType,\n        subType: 'patternOperation',\n        operator: this.formatOperator(operator),\n        args,\n        loc,\n      };\n    }\n\n    public isExpressionPatternOperation(obj: object): obj is SubTyped<NodeType, 'patternOperation'> {\n      return this.isOfSubType(obj, nodeType, 'patternOperation');\n    }\n\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Expression,\n      separator: undefined,\n      loc: SourceLocation\n    ): ExpressionAggregateDefault;\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Wildcard,\n      separator: undefined,\n      loc: SourceLocation\n    ): ExpressionAggregateOnWildcard;\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Expression,\n      separator: string,\n      loc: SourceLocation\n    ): ExpressionAggregateSeparator;\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Expression | Wildcard,\n      separator: string | undefined,\n      loc: SourceLocation,\n    ): ExpressionAggregate;\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Expression | Wildcard,\n      separator: string | undefined,\n      loc: SourceLocation,\n    ): ExpressionAggregate {\n      const base = <const> {\n        type: 'expression',\n        subType: 'aggregate',\n        aggregation: this.formatOperator(aggregation),\n        distinct,\n        loc,\n      };\n      if (this.isOfType(arg, 'wildcard')) {\n        return { ...base, expression: [ arg ]} satisfies ExpressionAggregateOnWildcard;\n      }\n      if (separator === undefined) {\n        return { ...base, expression: [ arg ]} satisfies ExpressionAggregateDefault;\n      }\n      return { ...base, expression: [ arg ], separator } satisfies ExpressionAggregateSeparator;\n    }\n\n    public isExpressionAggregate(obj: object): obj is SubTyped<NodeType, 'aggregate'> {\n      return this.isOfSubType(obj, nodeType, 'aggregate');\n    }\n\n    public isExpressionAggregateSeparator(obj: object): obj is SubTyped<NodeType, 'aggregate'> & { separator: string } {\n      return this.isOfSubType(obj, nodeType, 'aggregate') &&\n        typeof (<{ separator?: unknown }> obj).separator === 'string';\n    }\n\n    public isExpressionAggregateOnWildcard(obj: object):\n      obj is SubTyped<NodeType, 'aggregate'> & { expression: [Typed<'wildcard'>]} {\n      const casted = <{ expression?: unknown }> obj;\n      return this.isOfSubType(obj, nodeType, 'aggregate') && Array.isArray(casted.expression) &&\n        casted.expression.length === 1 && this.isOfType(casted.expression[0], 'wildcard');\n    }\n\n    public isExpressionAggregateDefault(obj: object):\n      obj is SubTyped<NodeType, 'aggregate'> & { expression: [Expression]} {\n      const casted = <{ expression?: unknown }> obj;\n\n      return this.isOfSubType(obj, nodeType, 'operation') && Array.isArray(casted.expression) &&\n        casted.expression.length === 1 && !this.isOfType(casted.expression[0], 'wildcard');\n    }\n  };\n}\n"]}
+{"version":3,"file":"ExpressionFactory.js","sourceRoot":"","sources":["ExpressionFactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  Expression,\n  ExpressionAggregate,\n  ExpressionAggregateDefault,\n  ExpressionAggregateOnWildcard,\n  ExpressionAggregateSeparator,\n  ExpressionFunctionCall,\n  ExpressionOperation,\n  ExpressionPatternOperation,\n  PatternGroup,\n  TermIri,\n  Wildcard,\n} from '../Sparql11types';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'expression';\nconst nodeType: NodeType = 'expression';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function ExpressionFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class ExpressionFactory extends Base {\n    public isExpressionPure(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public formatOperator(operator: string): string {\n      return operator.toLowerCase().replaceAll(' ', '');\n    }\n\n    public expressionOperation<Args extends Expression[]>(\n      operator: string,\n      args: Args,\n      loc: SourceLocation,\n    ): ExpressionOperation & { args: Args } {\n      return {\n        type: nodeType,\n        subType: 'operation',\n        operator: this.formatOperator(operator),\n        args,\n        loc,\n      };\n    }\n\n    public isExpressionOperator(obj: object): obj is SubTyped<NodeType, 'operation'> {\n      return this.isOfSubType(obj, nodeType, 'operation');\n    }\n\n    public expressionFunctionCall<Args extends Expression[]>(\n      functionOp: TermIri,\n      args: Args,\n      distinct: boolean,\n      loc: SourceLocation,\n    ): ExpressionFunctionCall & { args: Args } {\n      return {\n        type: 'expression',\n        subType: 'functionCall',\n        function: functionOp,\n        args,\n        distinct,\n        loc,\n      };\n    }\n\n    public isExpressionFunctionCall(obj: object): obj is SubTyped<NodeType, 'functionCall'> {\n      return this.isOfSubType(obj, nodeType, 'functionCall');\n    }\n\n    public expressionPatternOperation(\n      operator: string,\n      args: PatternGroup,\n      loc: SourceLocation,\n    ): ExpressionPatternOperation {\n      return {\n        type: nodeType,\n        subType: 'patternOperation',\n        operator: this.formatOperator(operator),\n        args,\n        loc,\n      };\n    }\n\n    public isExpressionPatternOperation(obj: object): obj is SubTyped<NodeType, 'patternOperation'> {\n      return this.isOfSubType(obj, nodeType, 'patternOperation');\n    }\n\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Expression,\n      separator: undefined,\n      loc: SourceLocation\n    ): ExpressionAggregateDefault;\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Wildcard,\n      separator: undefined,\n      loc: SourceLocation\n    ): ExpressionAggregateOnWildcard;\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Expression,\n      separator: string,\n      loc: SourceLocation\n    ): ExpressionAggregateSeparator;\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Expression | Wildcard,\n      separator: string | undefined,\n      loc: SourceLocation,\n    ): ExpressionAggregate;\n    public aggregate(\n      aggregation: string,\n      distinct: boolean,\n      arg: Expression | Wildcard,\n      separator: string | undefined,\n      loc: SourceLocation,\n    ): ExpressionAggregate {\n      const base = <const> {\n        type: 'expression',\n        subType: 'aggregate',\n        aggregation: this.formatOperator(aggregation),\n        distinct,\n        loc,\n      };\n      if (this.isOfType(arg, 'wildcard')) {\n        return { ...base, expression: [ arg ]} satisfies ExpressionAggregateOnWildcard;\n      }\n      if (separator === undefined) {\n        return { ...base, expression: [ arg ]} satisfies ExpressionAggregateDefault;\n      }\n      return { ...base, expression: [ arg ], separator } satisfies ExpressionAggregateSeparator;\n    }\n\n    public isExpressionAggregate(obj: object): obj is SubTyped<NodeType, 'aggregate'> {\n      return this.isOfSubType(obj, nodeType, 'aggregate');\n    }\n\n    public isExpressionAggregateSeparator(obj: object): obj is SubTyped<NodeType, 'aggregate'> & { separator: string } {\n      return this.isOfSubType(obj, nodeType, 'aggregate') &&\n        typeof (<{ separator?: unknown }> obj).separator === 'string';\n    }\n\n    public isExpressionAggregateOnWildcard(obj: object):\n      obj is SubTyped<NodeType, 'aggregate'> & { expression: [Typed<'wildcard'>]} {\n      const casted = <{ expression?: unknown }> obj;\n      return this.isOfSubType(obj, nodeType, 'aggregate') && Array.isArray(casted.expression) &&\n        casted.expression.length === 1 && this.isOfType(casted.expression[0], 'wildcard');\n    }\n\n    public isExpressionAggregateDefault(obj: object):\n      obj is SubTyped<NodeType, 'aggregate'> & { expression: [Expression]} {\n      const casted = <{ expression?: unknown }> obj;\n\n      return this.isOfSubType(obj, nodeType, 'operation') && Array.isArray(casted.expression) &&\n        casted.expression.length === 1 && !this.isOfType(casted.expression[0], 'wildcard');\n    }\n  };\n}\n"]}

package/lib/factoryMixins/GraphRefFactory.d.ts

@@ -1,5 +1,5 @@
 import type { CoreFactory, SubTyped, SourceLocation, Typed } from '@traqula/core';
-import type { GraphRefAll, GraphRefDefault, GraphRefNamed, GraphRefSpecific, TermIri } from '../RoundTripTypes';
+import type { GraphRefAll, GraphRefDefault, GraphRefNamed, GraphRefSpecific, TermIri } from '../Sparql11types';
 import type { Constructor } from './mixins';
 type NodeType = 'graphRef';
 export declare function GraphRefFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase): {

package/lib/factoryMixins/GraphRefFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"GraphRefFactory.js","sourceRoot":"","sources":["GraphRefFactory.ts"],"names":[],"mappings":"AAWA,MAAM,QAAQ,GAAa,UAAU,CAAC;AAEtC,4DAA4D;AAC5D,MAAM,UAAU,oBAAoB,CAAyC,IAAW;IACtF,OAAO,MAAM,eAAgB,SAAQ,IAAI;QAChC,UAAU,CAAC,GAAW;YAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QAEM,eAAe,CAAC,GAAmB;YACxC,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,SAAS;gBAClB,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,iBAAiB,CAAC,QAAgB;YACvC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACzD,CAAC;QAEM,aAAa,CAAC,GAAmB;YACtC,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,OAAO;gBAChB,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,eAAe,CAAC,QAAgB;YACrC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;QAEM,WAAW,CAAC,GAAmB;YACpC,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,KAAK;gBACd,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,aAAa,CAAC,QAAgB;YACnC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACrD,CAAC;QAEM,gBAAgB,CAAC,KAAc,EAAE,GAAmB;YACzD,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,UAAU;gBACnB,KAAK;gBACL,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,kBAAkB,CAAC,QAAgB;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC1D,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { CoreFactory, SubTyped, SourceLocation, Typed } from '@traqula/core';\nimport type {\n  GraphRefAll,\n  GraphRefDefault,\n  GraphRefNamed,\n  GraphRefSpecific,\n  TermIri,\n} from '../RoundTripTypes';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'graphRef';\nconst nodeType: NodeType = 'graphRef';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function GraphRefFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class GraphRefFactory extends Base {\n    public isGraphRef(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public graphRefDefault(loc: SourceLocation): GraphRefDefault {\n      return {\n        type: nodeType,\n        subType: 'default',\n        loc,\n      };\n    }\n\n    public isGraphRefDefault(graphRef: object): graphRef is SubTyped<NodeType, 'default'> {\n      return this.isOfSubType(graphRef, nodeType, 'default');\n    }\n\n    public graphRefNamed(loc: SourceLocation): GraphRefNamed {\n      return {\n        type: nodeType,\n        subType: 'named',\n        loc,\n      };\n    }\n\n    public isGraphRefNamed(graphRef: object): graphRef is SubTyped<NodeType, 'named'> {\n      return this.isOfSubType(graphRef, nodeType, 'named');\n    }\n\n    public graphRefAll(loc: SourceLocation): GraphRefAll {\n      return {\n        type: nodeType,\n        subType: 'all',\n        loc,\n      };\n    }\n\n    public isGraphRefAll(graphRef: object): graphRef is SubTyped<NodeType, 'all'> {\n      return this.isOfSubType(graphRef, nodeType, 'all');\n    }\n\n    public graphRefSpecific(graph: TermIri, loc: SourceLocation): GraphRefSpecific {\n      return {\n        type: nodeType,\n        subType: 'specific',\n        graph,\n        loc,\n      };\n    }\n\n    public isGraphRefSpecific(graphRef: object): graphRef is SubTyped<NodeType, 'specific'> {\n      return this.isOfSubType(graphRef, nodeType, 'specific');\n    }\n  };\n}\n"]}
+{"version":3,"file":"GraphRefFactory.js","sourceRoot":"","sources":["GraphRefFactory.ts"],"names":[],"mappings":"AAWA,MAAM,QAAQ,GAAa,UAAU,CAAC;AAEtC,4DAA4D;AAC5D,MAAM,UAAU,oBAAoB,CAAyC,IAAW;IACtF,OAAO,MAAM,eAAgB,SAAQ,IAAI;QAChC,UAAU,CAAC,GAAW;YAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QAEM,eAAe,CAAC,GAAmB;YACxC,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,SAAS;gBAClB,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,iBAAiB,CAAC,QAAgB;YACvC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACzD,CAAC;QAEM,aAAa,CAAC,GAAmB;YACtC,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,OAAO;gBAChB,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,eAAe,CAAC,QAAgB;YACrC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;QAEM,WAAW,CAAC,GAAmB;YACpC,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,KAAK;gBACd,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,aAAa,CAAC,QAAgB;YACnC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACrD,CAAC;QAEM,gBAAgB,CAAC,KAAc,EAAE,GAAmB;YACzD,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,UAAU;gBACnB,KAAK;gBACL,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,kBAAkB,CAAC,QAAgB;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC1D,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { CoreFactory, SubTyped, SourceLocation, Typed } from '@traqula/core';\nimport type {\n  GraphRefAll,\n  GraphRefDefault,\n  GraphRefNamed,\n  GraphRefSpecific,\n  TermIri,\n} from '../Sparql11types';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'graphRef';\nconst nodeType: NodeType = 'graphRef';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function GraphRefFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class GraphRefFactory extends Base {\n    public isGraphRef(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public graphRefDefault(loc: SourceLocation): GraphRefDefault {\n      return {\n        type: nodeType,\n        subType: 'default',\n        loc,\n      };\n    }\n\n    public isGraphRefDefault(graphRef: object): graphRef is SubTyped<NodeType, 'default'> {\n      return this.isOfSubType(graphRef, nodeType, 'default');\n    }\n\n    public graphRefNamed(loc: SourceLocation): GraphRefNamed {\n      return {\n        type: nodeType,\n        subType: 'named',\n        loc,\n      };\n    }\n\n    public isGraphRefNamed(graphRef: object): graphRef is SubTyped<NodeType, 'named'> {\n      return this.isOfSubType(graphRef, nodeType, 'named');\n    }\n\n    public graphRefAll(loc: SourceLocation): GraphRefAll {\n      return {\n        type: nodeType,\n        subType: 'all',\n        loc,\n      };\n    }\n\n    public isGraphRefAll(graphRef: object): graphRef is SubTyped<NodeType, 'all'> {\n      return this.isOfSubType(graphRef, nodeType, 'all');\n    }\n\n    public graphRefSpecific(graph: TermIri, loc: SourceLocation): GraphRefSpecific {\n      return {\n        type: nodeType,\n        subType: 'specific',\n        graph,\n        loc,\n      };\n    }\n\n    public isGraphRefSpecific(graphRef: object): graphRef is SubTyped<NodeType, 'specific'> {\n      return this.isOfSubType(graphRef, nodeType, 'specific');\n    }\n  };\n}\n"]}

package/lib/factoryMixins/PathFactory.d.ts

@@ -1,5 +1,5 @@
 import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';
-import type { Path, PathAlternativeLimited, PathModified, PathNegated, PathNegatedElt, PropertyPathChain, TermIri } from '../RoundTripTypes';
+import type { Path, PathAlternativeLimited, PathModified, PathNegated, PathNegatedElt, PropertyPathChain, TermIri } from '../Sparql11types';
 import type { Constructor } from './mixins';
 type NodeType = 'path';
 type RawNegatedElt = SubTyped<NodeType, '^'> & {

package/lib/factoryMixins/PathFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"PathFactory.js","sourceRoot":"","sources":["PathFactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  Path,\n  PathAlternativeLimited,\n  PathModified,\n  PathNegated,\n  PathNegatedElt,\n  PropertyPathChain,\n  TermIri,\n} from '../RoundTripTypes';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'path';\nconst nodeType: NodeType = 'path';\n\ntype RawNegatedElt = SubTyped<NodeType, '^'> & { items: [SubTyped<'term', 'namedNode'>]};\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function PathFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class PathFactory extends Base {\n    public isPathPure(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public path(\n      subType: '|',\n      items: (TermIri | PathNegatedElt)[],\n      loc: SourceLocation\n    ): PathAlternativeLimited;\n    public path(\n      subType: '!',\n      items: [TermIri | PathNegatedElt | PathAlternativeLimited],\n      loc: SourceLocation\n    ): PathNegated;\n    public path(subType: '^', items: [TermIri], loc: SourceLocation): PathNegatedElt;\n    public path(subType: PathModified['subType'], item: [Path], loc: SourceLocation): PathModified;\n    public path(subType: '|' | '/', items: Path[], loc: SourceLocation):\n    PropertyPathChain;\n    public path(\n      subType: (PropertyPathChain | PathModified | PathNegated)['subType'],\n      items: Path[],\n      loc: SourceLocation,\n    ): Path {\n      const base = <const>{\n        type: nodeType,\n        loc,\n        items,\n      };\n      if (subType === '|' || subType === '/') {\n        return {\n          ...base,\n          subType,\n        } satisfies PropertyPathChain;\n      }\n      if ((subType === '?' || subType === '*' || subType === '+' || subType === '^') && items.length === 1) {\n        return {\n          ...base,\n          subType,\n          items: <[Path]>items,\n        } satisfies PathModified;\n      }\n      if (subType === '^' && items.length === 1 && !this.isPathPure(items[0])) {\n        return {\n          ...base,\n          subType,\n          items: <[TermIri]>items,\n        } satisfies PathNegatedElt;\n      }\n      if (subType === '!' && items.length === 1 && (\n        this.isPathAlternativeLimited(items[0]) || !this.isPathPure(items[0]) || this.isPathNegatedElt(items[0]))) {\n        return {\n          ...base,\n          subType,\n          items: <[TermIri | PathNegatedElt | PathAlternativeLimited]>items,\n        } satisfies PathNegated;\n      }\n      throw new Error('Invalid path type');\n    }\n\n    public isPathOfType<T extends U[], U extends string>(obj: object, subTypes: T): obj is SubTyped<NodeType, U> {\n      return this.isOfType(obj, nodeType) && subTypes.includes(<any>(<{ subType?: unknown }>obj).subType);\n    }\n\n    public isPathChain(obj: object): obj is SubTyped<NodeType, '|' | '/'> {\n      return this.isOfSubType(obj, nodeType, '/') || this.isOfSubType(obj, nodeType, '|');\n    }\n\n    public isPathModified(obj: object): obj is SubTyped<NodeType, '?' | '*' | '+' | '^'> {\n      return this.isOfSubType(obj, nodeType, '?') || this.isOfSubType(obj, nodeType, '*') ||\n        this.isOfSubType(obj, nodeType, '+') || this.isOfSubType(obj, nodeType, '^');\n    }\n\n    public isPathNegatedElt(obj: object): obj is RawNegatedElt {\n      const casted: { items?: unknown } = obj;\n      return this.isOfSubType(obj, nodeType, '^') && Array.isArray(casted.items) && casted.items.length === 1 &&\n        typeof casted.items[0] === 'object' && (casted.items[0] ?? false) && !this.isPathPure(casted.items[0]);\n    }\n\n    public isPathNegated(obj: object): obj is SubTyped<NodeType, '!'> {\n      return this.isOfSubType(obj, nodeType, '!');\n    }\n\n    public isPathAlternativeLimited(obj: object):\n      obj is SubTyped<NodeType, '|'> & { items: (SubTyped<'term', 'namedNode'> | RawNegatedElt)[] } {\n      const casted: { items?: unknown } = obj;\n      return this.isOfSubType(obj, nodeType, '|') && Array.isArray(casted.items) &&\n        casted.items.every(item => !this.isPathPure(item) || this.isPathNegatedElt(item));\n    }\n  };\n}\n"]}
+{"version":3,"file":"PathFactory.js","sourceRoot":"","sources":["PathFactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  Path,\n  PathAlternativeLimited,\n  PathModified,\n  PathNegated,\n  PathNegatedElt,\n  PropertyPathChain,\n  TermIri,\n} from '../Sparql11types';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'path';\nconst nodeType: NodeType = 'path';\n\ntype RawNegatedElt = SubTyped<NodeType, '^'> & { items: [SubTyped<'term', 'namedNode'>]};\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function PathFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class PathFactory extends Base {\n    public isPathPure(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public path(\n      subType: '|',\n      items: (TermIri | PathNegatedElt)[],\n      loc: SourceLocation\n    ): PathAlternativeLimited;\n    public path(\n      subType: '!',\n      items: [TermIri | PathNegatedElt | PathAlternativeLimited],\n      loc: SourceLocation\n    ): PathNegated;\n    public path(subType: '^', items: [TermIri], loc: SourceLocation): PathNegatedElt;\n    public path(subType: PathModified['subType'], item: [Path], loc: SourceLocation): PathModified;\n    public path(subType: '|' | '/', items: Path[], loc: SourceLocation):\n    PropertyPathChain;\n    public path(\n      subType: (PropertyPathChain | PathModified | PathNegated)['subType'],\n      items: Path[],\n      loc: SourceLocation,\n    ): Path {\n      const base = <const>{\n        type: nodeType,\n        loc,\n        items,\n      };\n      if (subType === '|' || subType === '/') {\n        return {\n          ...base,\n          subType,\n        } satisfies PropertyPathChain;\n      }\n      if ((subType === '?' || subType === '*' || subType === '+' || subType === '^') && items.length === 1) {\n        return {\n          ...base,\n          subType,\n          items: <[Path]>items,\n        } satisfies PathModified;\n      }\n      if (subType === '^' && items.length === 1 && !this.isPathPure(items[0])) {\n        return {\n          ...base,\n          subType,\n          items: <[TermIri]>items,\n        } satisfies PathNegatedElt;\n      }\n      if (subType === '!' && items.length === 1 && (\n        this.isPathAlternativeLimited(items[0]) || !this.isPathPure(items[0]) || this.isPathNegatedElt(items[0]))) {\n        return {\n          ...base,\n          subType,\n          items: <[TermIri | PathNegatedElt | PathAlternativeLimited]>items,\n        } satisfies PathNegated;\n      }\n      throw new Error('Invalid path type');\n    }\n\n    public isPathOfType<T extends U[], U extends string>(obj: object, subTypes: T): obj is SubTyped<NodeType, U> {\n      return this.isOfType(obj, nodeType) && subTypes.includes(<any>(<{ subType?: unknown }>obj).subType);\n    }\n\n    public isPathChain(obj: object): obj is SubTyped<NodeType, '|' | '/'> {\n      return this.isOfSubType(obj, nodeType, '/') || this.isOfSubType(obj, nodeType, '|');\n    }\n\n    public isPathModified(obj: object): obj is SubTyped<NodeType, '?' | '*' | '+' | '^'> {\n      return this.isOfSubType(obj, nodeType, '?') || this.isOfSubType(obj, nodeType, '*') ||\n        this.isOfSubType(obj, nodeType, '+') || this.isOfSubType(obj, nodeType, '^');\n    }\n\n    public isPathNegatedElt(obj: object): obj is RawNegatedElt {\n      const casted: { items?: unknown } = obj;\n      return this.isOfSubType(obj, nodeType, '^') && Array.isArray(casted.items) && casted.items.length === 1 &&\n        typeof casted.items[0] === 'object' && (casted.items[0] ?? false) && !this.isPathPure(casted.items[0]);\n    }\n\n    public isPathNegated(obj: object): obj is SubTyped<NodeType, '!'> {\n      return this.isOfSubType(obj, nodeType, '!');\n    }\n\n    public isPathAlternativeLimited(obj: object):\n      obj is SubTyped<NodeType, '|'> & { items: (SubTyped<'term', 'namedNode'> | RawNegatedElt)[] } {\n      const casted: { items?: unknown } = obj;\n      return this.isOfSubType(obj, nodeType, '|') && Array.isArray(casted.items) &&\n        casted.items.every(item => !this.isPathPure(item) || this.isPathNegatedElt(item));\n    }\n  };\n}\n"]}

package/lib/factoryMixins/Patternfactory.d.ts

@@ -1,5 +1,5 @@
 import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';
-import type { BasicGraphPattern, Expression, Pattern, PatternBgp, PatternBind, PatternFilter, PatternGraph, PatternGroup, PatternMinus, PatternOptional, PatternService, PatternUnion, PatternValues, TermIri, TermVariable, ValuePatternRow } from '../RoundTripTypes';
+import type { BasicGraphPattern, Expression, Pattern, PatternBgp, PatternBind, PatternFilter, PatternGraph, PatternGroup, PatternMinus, PatternOptional, PatternService, PatternUnion, PatternValues, TermIri, TermVariable, ValuePatternRow } from '../Sparql11types';
 import type { Constructor } from './mixins';
 type NodeType = 'pattern';
 export declare function PatternFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase): {

package/lib/factoryMixins/Patternfactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"Patternfactory.js","sourceRoot":"","sources":["Patternfactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  BasicGraphPattern,\n  Expression,\n  Pattern,\n  PatternBgp,\n  PatternBind,\n  PatternFilter,\n  PatternGraph,\n  PatternGroup,\n  PatternMinus,\n  PatternOptional,\n  PatternService,\n  PatternUnion,\n  PatternValues,\n  TermIri,\n  TermVariable,\n  ValuePatternRow,\n} from '../RoundTripTypes';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'pattern';\nconst nodeType: NodeType = 'pattern';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function PatternFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class PatternFactory extends Base {\n    public isPattern(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public patternBgp(triples: BasicGraphPattern, loc: SourceLocation): PatternBgp {\n      return { type: nodeType, subType: 'bgp', triples, loc };\n    }\n\n    public isPatternBgp(obj: object): obj is SubTyped<NodeType, 'bgp'> {\n      return this.isOfSubType(obj, nodeType, 'bgp');\n    }\n\n    public patternGroup(patterns: Pattern[], loc: SourceLocation): PatternGroup {\n      return { type: nodeType, subType: 'group', patterns, loc };\n    }\n\n    public isPatternGroup(obj: object): obj is SubTyped<NodeType, 'group'> {\n      return this.isOfSubType(obj, nodeType, 'group');\n    }\n\n    public patternGraph(name: TermIri | TermVariable, patterns: Pattern[], loc: SourceLocation): PatternGraph {\n      return { type: nodeType, subType: 'graph', name, patterns, loc };\n    }\n\n    public isPatternGraph(obj: object): obj is SubTyped<NodeType, 'graph'> {\n      return this.isOfSubType(obj, nodeType, 'graph');\n    }\n\n    public patternOptional(patterns: Pattern[], loc: SourceLocation): PatternOptional {\n      return { type: nodeType, subType: 'optional', patterns, loc };\n    }\n\n    public isPatternOptional(obj: object): obj is SubTyped<NodeType, 'optional'> {\n      return this.isOfSubType(obj, nodeType, 'optional');\n    }\n\n    public patternValues(values: ValuePatternRow[], loc: SourceLocation): PatternValues {\n      return { type: nodeType, subType: 'values', values, loc };\n    }\n\n    public isPatternValues(obj: object): obj is SubTyped<NodeType, 'values'> {\n      return this.isOfSubType(obj, nodeType, 'values');\n    }\n\n    public patternFilter(expression: Expression, loc: SourceLocation): PatternFilter {\n      return {\n        type: nodeType,\n        subType: 'filter',\n        expression,\n        loc,\n      };\n    }\n\n    public isPatternFilter(obj: object): obj is SubTyped<NodeType, 'filter'> {\n      return this.isOfSubType(obj, nodeType, 'filter');\n    }\n\n    public patternBind(\n      expression: Expression,\n      variable: TermVariable,\n      loc: SourceLocation,\n    ): PatternBind {\n      return {\n        type: nodeType,\n        subType: 'bind',\n        expression,\n        variable,\n        loc,\n      };\n    }\n\n    public isPatternBind(obj: object): obj is SubTyped<NodeType, 'bind'> {\n      return this.isOfSubType(obj, nodeType, 'bind');\n    }\n\n    public patternUnion(patterns: PatternGroup[], loc: SourceLocation): PatternUnion {\n      return {\n        type: nodeType,\n        subType: 'union',\n        patterns,\n        loc,\n      };\n    }\n\n    public isPatternUnion(obj: object): obj is SubTyped<NodeType, 'union'> {\n      return this.isOfSubType(obj, nodeType, 'union');\n    }\n\n    public patternMinus(patterns: Pattern[], loc: SourceLocation): PatternMinus {\n      return {\n        type: nodeType,\n        subType: 'minus',\n        patterns,\n        loc,\n      };\n    }\n\n    public isPatternMinus(obj: object): obj is SubTyped<NodeType, 'minus'> {\n      return this.isOfSubType(obj, nodeType, 'minus');\n    }\n\n    public patternService(\n      name: TermIri | TermVariable,\n      patterns: Pattern[],\n      silent: boolean,\n      loc: SourceLocation,\n    ): PatternService {\n      return {\n        type: nodeType,\n        subType: 'service',\n        silent,\n        name,\n        patterns,\n        loc,\n      };\n    }\n\n    public isPatternService(obj: object): obj is SubTyped<NodeType, 'service'> {\n      return this.isOfSubType(obj, nodeType, 'service');\n    }\n  };\n}\n"]}
+{"version":3,"file":"Patternfactory.js","sourceRoot":"","sources":["Patternfactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  BasicGraphPattern,\n  Expression,\n  Pattern,\n  PatternBgp,\n  PatternBind,\n  PatternFilter,\n  PatternGraph,\n  PatternGroup,\n  PatternMinus,\n  PatternOptional,\n  PatternService,\n  PatternUnion,\n  PatternValues,\n  TermIri,\n  TermVariable,\n  ValuePatternRow,\n} from '../Sparql11types';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'pattern';\nconst nodeType: NodeType = 'pattern';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function PatternFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class PatternFactory extends Base {\n    public isPattern(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public patternBgp(triples: BasicGraphPattern, loc: SourceLocation): PatternBgp {\n      return { type: nodeType, subType: 'bgp', triples, loc };\n    }\n\n    public isPatternBgp(obj: object): obj is SubTyped<NodeType, 'bgp'> {\n      return this.isOfSubType(obj, nodeType, 'bgp');\n    }\n\n    public patternGroup(patterns: Pattern[], loc: SourceLocation): PatternGroup {\n      return { type: nodeType, subType: 'group', patterns, loc };\n    }\n\n    public isPatternGroup(obj: object): obj is SubTyped<NodeType, 'group'> {\n      return this.isOfSubType(obj, nodeType, 'group');\n    }\n\n    public patternGraph(name: TermIri | TermVariable, patterns: Pattern[], loc: SourceLocation): PatternGraph {\n      return { type: nodeType, subType: 'graph', name, patterns, loc };\n    }\n\n    public isPatternGraph(obj: object): obj is SubTyped<NodeType, 'graph'> {\n      return this.isOfSubType(obj, nodeType, 'graph');\n    }\n\n    public patternOptional(patterns: Pattern[], loc: SourceLocation): PatternOptional {\n      return { type: nodeType, subType: 'optional', patterns, loc };\n    }\n\n    public isPatternOptional(obj: object): obj is SubTyped<NodeType, 'optional'> {\n      return this.isOfSubType(obj, nodeType, 'optional');\n    }\n\n    public patternValues(values: ValuePatternRow[], loc: SourceLocation): PatternValues {\n      return { type: nodeType, subType: 'values', values, loc };\n    }\n\n    public isPatternValues(obj: object): obj is SubTyped<NodeType, 'values'> {\n      return this.isOfSubType(obj, nodeType, 'values');\n    }\n\n    public patternFilter(expression: Expression, loc: SourceLocation): PatternFilter {\n      return {\n        type: nodeType,\n        subType: 'filter',\n        expression,\n        loc,\n      };\n    }\n\n    public isPatternFilter(obj: object): obj is SubTyped<NodeType, 'filter'> {\n      return this.isOfSubType(obj, nodeType, 'filter');\n    }\n\n    public patternBind(\n      expression: Expression,\n      variable: TermVariable,\n      loc: SourceLocation,\n    ): PatternBind {\n      return {\n        type: nodeType,\n        subType: 'bind',\n        expression,\n        variable,\n        loc,\n      };\n    }\n\n    public isPatternBind(obj: object): obj is SubTyped<NodeType, 'bind'> {\n      return this.isOfSubType(obj, nodeType, 'bind');\n    }\n\n    public patternUnion(patterns: PatternGroup[], loc: SourceLocation): PatternUnion {\n      return {\n        type: nodeType,\n        subType: 'union',\n        patterns,\n        loc,\n      };\n    }\n\n    public isPatternUnion(obj: object): obj is SubTyped<NodeType, 'union'> {\n      return this.isOfSubType(obj, nodeType, 'union');\n    }\n\n    public patternMinus(patterns: Pattern[], loc: SourceLocation): PatternMinus {\n      return {\n        type: nodeType,\n        subType: 'minus',\n        patterns,\n        loc,\n      };\n    }\n\n    public isPatternMinus(obj: object): obj is SubTyped<NodeType, 'minus'> {\n      return this.isOfSubType(obj, nodeType, 'minus');\n    }\n\n    public patternService(\n      name: TermIri | TermVariable,\n      patterns: Pattern[],\n      silent: boolean,\n      loc: SourceLocation,\n    ): PatternService {\n      return {\n        type: nodeType,\n        subType: 'service',\n        silent,\n        name,\n        patterns,\n        loc,\n      };\n    }\n\n    public isPatternService(obj: object): obj is SubTyped<NodeType, 'service'> {\n      return this.isOfSubType(obj, nodeType, 'service');\n    }\n  };\n}\n"]}

package/lib/factoryMixins/QueryFactory.d.ts

@@ -1,5 +1,5 @@
 import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';
-import type { ContextDefinition, DatasetClauses, PatternBgp, PatternGroup, PatternValues, QueryConstruct, QuerySelect, SolutionModifiers } from '../RoundTripTypes';
+import type { ContextDefinition, DatasetClauses, PatternBgp, PatternGroup, PatternValues, QueryConstruct, QuerySelect, SolutionModifiers } from '../Sparql11types';
 import type { Constructor } from './mixins';
 type NodeType = 'query';
 export declare function QueryFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase): {

package/lib/factoryMixins/QueryFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryFactory.js","sourceRoot":"","sources":["QueryFactory.ts"],"names":[],"mappings":"AAcA,MAAM,QAAQ,GAAa,OAAO,CAAC;AAEnC,4DAA4D;AAC5D,MAAM,UAAU,iBAAiB,CAAyC,IAAW;IACnF,OAAO,MAAM,YAAa,SAAQ,IAAI;QAC7B,OAAO,CAAC,GAAW;YACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QAEM,aAAa,CAAC,GAAW;YAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnD,CAAC;QAEM,cAAc,CACnB,GAAmB,EACnB,OAA4B,EAC5B,QAAoB,EACpB,KAAmB,EACnB,iBAAoC,EACpC,QAAwB,EACxB,MAAsB;YAEtB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,WAAW;gBACpB,OAAO;gBACP,QAAQ;gBACR,KAAK;gBACL,iBAAiB;gBACjB,QAAQ;gBACR,MAAM;gBACN,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,gBAAgB,CAAC,GAAW;YACjC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QACtD,CAAC;QAEM,eAAe,CAAC,GAAW;YAChC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QACrD,CAAC;QAEM,UAAU,CAAC,GAAW;YAC3B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QAEM,WAAW,CAAC,GAAkD,EAAE,GAAmB;YACxF,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,QAAQ;gBACjB,GAAG,GAAG;gBACN,GAAG;aACJ,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  ContextDefinition,\n  DatasetClauses,\n  PatternBgp,\n  PatternGroup,\n  PatternValues,\n  QueryConstruct,\n  QuerySelect,\n  SolutionModifiers,\n} from '../RoundTripTypes';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'query';\nconst nodeType: NodeType = 'query';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function QueryFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class QueryFactory extends Base {\n    public isQuery(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public isQuerySelect(obj: object): obj is SubTyped<NodeType, 'select'> {\n      return this.isOfSubType(obj, nodeType, 'select');\n    }\n\n    public queryConstruct(\n      loc: SourceLocation,\n      context: ContextDefinition[],\n      template: PatternBgp,\n      where: PatternGroup,\n      solutionModifiers: SolutionModifiers,\n      datasets: DatasetClauses,\n      values?: PatternValues,\n    ): QueryConstruct {\n      return {\n        type: 'query',\n        subType: 'construct',\n        context,\n        template,\n        where,\n        solutionModifiers,\n        datasets,\n        values,\n        loc,\n      };\n    }\n\n    public isQueryConstruct(obj: object): obj is SubTyped<NodeType, 'construct'> {\n      return this.isOfSubType(obj, nodeType, 'construct');\n    }\n\n    public isQueryDescribe(obj: object): obj is SubTyped<NodeType, 'describe'> {\n      return this.isOfSubType(obj, nodeType, 'describe');\n    }\n\n    public isQueryAsk(obj: object): obj is SubTyped<NodeType, 'ask'> {\n      return this.isOfSubType(obj, nodeType, 'ask');\n    }\n\n    public querySelect(arg: Omit<QuerySelect, 'type' | 'subType' | 'loc'>, loc: SourceLocation): QuerySelect {\n      return {\n        type: nodeType,\n        subType: 'select',\n        ...arg,\n        loc,\n      };\n    }\n  };\n}\n"]}
+{"version":3,"file":"QueryFactory.js","sourceRoot":"","sources":["QueryFactory.ts"],"names":[],"mappings":"AAcA,MAAM,QAAQ,GAAa,OAAO,CAAC;AAEnC,4DAA4D;AAC5D,MAAM,UAAU,iBAAiB,CAAyC,IAAW;IACnF,OAAO,MAAM,YAAa,SAAQ,IAAI;QAC7B,OAAO,CAAC,GAAW;YACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QAEM,aAAa,CAAC,GAAW;YAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnD,CAAC;QAEM,cAAc,CACnB,GAAmB,EACnB,OAA4B,EAC5B,QAAoB,EACpB,KAAmB,EACnB,iBAAoC,EACpC,QAAwB,EACxB,MAAsB;YAEtB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,WAAW;gBACpB,OAAO;gBACP,QAAQ;gBACR,KAAK;gBACL,iBAAiB;gBACjB,QAAQ;gBACR,MAAM;gBACN,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,gBAAgB,CAAC,GAAW;YACjC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QACtD,CAAC;QAEM,eAAe,CAAC,GAAW;YAChC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QACrD,CAAC;QAEM,UAAU,CAAC,GAAW;YAC3B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QAEM,WAAW,CAAC,GAAkD,EAAE,GAAmB;YACxF,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,QAAQ;gBACjB,GAAG,GAAG;gBACN,GAAG;aACJ,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  ContextDefinition,\n  DatasetClauses,\n  PatternBgp,\n  PatternGroup,\n  PatternValues,\n  QueryConstruct,\n  QuerySelect,\n  SolutionModifiers,\n} from '../Sparql11types';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'query';\nconst nodeType: NodeType = 'query';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function QueryFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class QueryFactory extends Base {\n    public isQuery(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public isQuerySelect(obj: object): obj is SubTyped<NodeType, 'select'> {\n      return this.isOfSubType(obj, nodeType, 'select');\n    }\n\n    public queryConstruct(\n      loc: SourceLocation,\n      context: ContextDefinition[],\n      template: PatternBgp,\n      where: PatternGroup,\n      solutionModifiers: SolutionModifiers,\n      datasets: DatasetClauses,\n      values?: PatternValues,\n    ): QueryConstruct {\n      return {\n        type: 'query',\n        subType: 'construct',\n        context,\n        template,\n        where,\n        solutionModifiers,\n        datasets,\n        values,\n        loc,\n      };\n    }\n\n    public isQueryConstruct(obj: object): obj is SubTyped<NodeType, 'construct'> {\n      return this.isOfSubType(obj, nodeType, 'construct');\n    }\n\n    public isQueryDescribe(obj: object): obj is SubTyped<NodeType, 'describe'> {\n      return this.isOfSubType(obj, nodeType, 'describe');\n    }\n\n    public isQueryAsk(obj: object): obj is SubTyped<NodeType, 'ask'> {\n      return this.isOfSubType(obj, nodeType, 'ask');\n    }\n\n    public querySelect(arg: Omit<QuerySelect, 'type' | 'subType' | 'loc'>, loc: SourceLocation): QuerySelect {\n      return {\n        type: nodeType,\n        subType: 'select',\n        ...arg,\n        loc,\n      };\n    }\n  };\n}\n"]}

package/lib/factoryMixins/SolutionModifiersFactory.d.ts

@@ -1,5 +1,5 @@
 import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';
-import type { Expression, Ordering, SolutionModifierGroup, SolutionModifierGroupBind, SolutionModifierHaving, SolutionModifierLimitOffset, SolutionModifierOrder } from '../RoundTripTypes';
+import type { Expression, Ordering, SolutionModifierGroup, SolutionModifierGroupBind, SolutionModifierHaving, SolutionModifierLimitOffset, SolutionModifierOrder } from '../Sparql11types';
 import type { Constructor } from './mixins';
 type NodeType = 'solutionModifier';
 export declare function SolutionModifiersFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase): {

package/lib/factoryMixins/SolutionModifiersFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"SolutionModifiersFactory.js","sourceRoot":"","sources":["SolutionModifiersFactory.ts"],"names":[],"mappings":"AAaA,MAAM,QAAQ,GAAa,kBAAkB,CAAC;AAE9C,4DAA4D;AAC5D,MAAM,UAAU,6BAA6B,CAAyC,IAAW;IAC/F,OAAO,MAAM,wBAAyB,SAAQ,IAAI;QACzC,kBAAkB,CAAC,GAAW;YACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QAEM,sBAAsB,CAAC,MAAoB,EAAE,GAAmB;YACrE,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,QAAQ;gBACjB,MAAM;gBACN,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,wBAAwB,CAAC,GAAW;YACzC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnD,CAAC;QAEM,qBAAqB,CAAC,SAAqB,EAAE,GAAmB;YACrE,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,OAAO;gBAChB,SAAS;gBACT,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,uBAAuB,CAAC,GAAW;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QAEM,2BAA2B,CAChC,KAAyB,EACzB,MAA0B,EAC1B,GAAmB;YAEnB,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,aAAa;gBACtB,KAAK;gBACL,MAAM;gBACN,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,6BAA6B,CAAC,GAAW;YAC9C,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QACxD,CAAC;QAEM,qBAAqB,CAAC,SAAqD,EAAE,GAAmB;YAErG,OAAO;gBACL,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,OAAO;gBAChB,SAAS;gBACT,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,uBAAuB,CAAC,GAAW;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  Expression,\n  Ordering,\n  SolutionModifierGroup,\n  SolutionModifierGroupBind,\n  SolutionModifierHaving,\n  SolutionModifierLimitOffset,\n  SolutionModifierOrder,\n} from '../RoundTripTypes';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'solutionModifier';\nconst nodeType: NodeType = 'solutionModifier';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function SolutionModifiersFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class SolutionModifiersFactory extends Base {\n    public isSolutionModifier(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public solutionModifierHaving(having: Expression[], loc: SourceLocation): SolutionModifierHaving {\n      return {\n        type: nodeType,\n        subType: 'having',\n        having,\n        loc,\n      };\n    }\n\n    public isSolutionModifierHaving(obj: object): obj is SubTyped<NodeType, 'having'> {\n      return this.isOfSubType(obj, nodeType, 'having');\n    }\n\n    public solutionModifierOrder(orderDefs: Ordering[], loc: SourceLocation): SolutionModifierOrder {\n      return {\n        type: nodeType,\n        subType: 'order',\n        orderDefs,\n        loc,\n      };\n    }\n\n    public isSolutionModifierOrder(obj: object): obj is SubTyped<NodeType, 'order'> {\n      return this.isOfSubType(obj, nodeType, 'order');\n    }\n\n    public solutionModifierLimitOffset(\n      limit: number | undefined,\n      offset: number | undefined,\n      loc: SourceLocation,\n    ): SolutionModifierLimitOffset {\n      return {\n        type: nodeType,\n        subType: 'limitOffset',\n        limit,\n        offset,\n        loc,\n      };\n    }\n\n    public isSolutionModifierLimitOffset(obj: object): obj is SubTyped<NodeType, 'limitOffset'> {\n      return this.isOfSubType(obj, nodeType, 'limitOffset');\n    }\n\n    public solutionModifierGroup(groupings: (Expression | SolutionModifierGroupBind)[], loc: SourceLocation):\n    SolutionModifierGroup {\n      return {\n        type: 'solutionModifier',\n        subType: 'group',\n        groupings,\n        loc,\n      };\n    }\n\n    public isSolutionModifierGroup(obj: object): obj is SubTyped<NodeType, 'group'> {\n      return this.isOfSubType(obj, nodeType, 'group');\n    }\n  };\n}\n"]}
+{"version":3,"file":"SolutionModifiersFactory.js","sourceRoot":"","sources":["SolutionModifiersFactory.ts"],"names":[],"mappings":"AAaA,MAAM,QAAQ,GAAa,kBAAkB,CAAC;AAE9C,4DAA4D;AAC5D,MAAM,UAAU,6BAA6B,CAAyC,IAAW;IAC/F,OAAO,MAAM,wBAAyB,SAAQ,IAAI;QACzC,kBAAkB,CAAC,GAAW;YACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QAEM,sBAAsB,CAAC,MAAoB,EAAE,GAAmB;YACrE,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,QAAQ;gBACjB,MAAM;gBACN,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,wBAAwB,CAAC,GAAW;YACzC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnD,CAAC;QAEM,qBAAqB,CAAC,SAAqB,EAAE,GAAmB;YACrE,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,OAAO;gBAChB,SAAS;gBACT,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,uBAAuB,CAAC,GAAW;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QAEM,2BAA2B,CAChC,KAAyB,EACzB,MAA0B,EAC1B,GAAmB;YAEnB,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,aAAa;gBACtB,KAAK;gBACL,MAAM;gBACN,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,6BAA6B,CAAC,GAAW;YAC9C,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QACxD,CAAC;QAEM,qBAAqB,CAAC,SAAqD,EAAE,GAAmB;YAErG,OAAO;gBACL,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,OAAO;gBAChB,SAAS;gBACT,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,uBAAuB,CAAC,GAAW;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  Expression,\n  Ordering,\n  SolutionModifierGroup,\n  SolutionModifierGroupBind,\n  SolutionModifierHaving,\n  SolutionModifierLimitOffset,\n  SolutionModifierOrder,\n} from '../Sparql11types';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'solutionModifier';\nconst nodeType: NodeType = 'solutionModifier';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function SolutionModifiersFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class SolutionModifiersFactory extends Base {\n    public isSolutionModifier(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public solutionModifierHaving(having: Expression[], loc: SourceLocation): SolutionModifierHaving {\n      return {\n        type: nodeType,\n        subType: 'having',\n        having,\n        loc,\n      };\n    }\n\n    public isSolutionModifierHaving(obj: object): obj is SubTyped<NodeType, 'having'> {\n      return this.isOfSubType(obj, nodeType, 'having');\n    }\n\n    public solutionModifierOrder(orderDefs: Ordering[], loc: SourceLocation): SolutionModifierOrder {\n      return {\n        type: nodeType,\n        subType: 'order',\n        orderDefs,\n        loc,\n      };\n    }\n\n    public isSolutionModifierOrder(obj: object): obj is SubTyped<NodeType, 'order'> {\n      return this.isOfSubType(obj, nodeType, 'order');\n    }\n\n    public solutionModifierLimitOffset(\n      limit: number | undefined,\n      offset: number | undefined,\n      loc: SourceLocation,\n    ): SolutionModifierLimitOffset {\n      return {\n        type: nodeType,\n        subType: 'limitOffset',\n        limit,\n        offset,\n        loc,\n      };\n    }\n\n    public isSolutionModifierLimitOffset(obj: object): obj is SubTyped<NodeType, 'limitOffset'> {\n      return this.isOfSubType(obj, nodeType, 'limitOffset');\n    }\n\n    public solutionModifierGroup(groupings: (Expression | SolutionModifierGroupBind)[], loc: SourceLocation):\n    SolutionModifierGroup {\n      return {\n        type: 'solutionModifier',\n        subType: 'group',\n        groupings,\n        loc,\n      };\n    }\n\n    public isSolutionModifierGroup(obj: object): obj is SubTyped<NodeType, 'group'> {\n      return this.isOfSubType(obj, nodeType, 'group');\n    }\n  };\n}\n"]}

package/lib/factoryMixins/TermFactory.d.ts

@@ -1,5 +1,5 @@
 import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';
-import type { TermBlank, TermIri, TermIriFull, TermIriPrefixed, TermLiteral, TermLiteralLangStr, TermLiteralStr, TermLiteralTyped, TermVariable } from '../RoundTripTypes';
+import type { TermBlank, TermIri, TermIriFull, TermIriPrefixed, TermLiteral, TermLiteralLangStr, TermLiteralStr, TermLiteralTyped, TermVariable } from '../Sparql11types';
 import type { Constructor } from './mixins';
 type NodeType = 'term';
 export declare function TermFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase): {

package/lib/factoryMixins/TermFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"TermFactory.js","sourceRoot":"","sources":["TermFactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  TermBlank,\n  TermIri,\n  TermIriFull,\n  TermIriPrefixed,\n  TermLiteral,\n  TermLiteralLangStr,\n  TermLiteralStr,\n  TermLiteralTyped,\n  TermVariable,\n} from '../RoundTripTypes';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'term';\nconst nodeType: NodeType = 'term';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function TermFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class TermFactory extends Base {\n    public __blankNodeCounter = 0;\n\n    public resetBlankNodeCounter(): void {\n      this.__blankNodeCounter = 0;\n    }\n\n    public isTerm(x: object): x is Typed<'term'> {\n      return this.isOfType(x, 'term');\n    }\n\n    public blankNode(label: undefined | string, loc: SourceLocation): TermBlank {\n      const base = <const>{\n        type: 'term',\n        subType: 'blankNode',\n        loc,\n      };\n      if (label === undefined) {\n        return { ...base, label: `g_${this.__blankNodeCounter++}` };\n      }\n      return { ...base, label: `e_${label}` };\n    }\n\n    public isTermBlank(obj: object): obj is SubTyped<NodeType, 'blankNode'> {\n      return this.isOfSubType(obj, nodeType, 'blankNode');\n    }\n\n    /**\n     * String, no lang, no type\n     */\n    public literalTerm(loc: SourceLocation, value: string, lang?: undefined): TermLiteralStr;\n    /**\n     * String with a language tag\n     */\n    public literalTerm(loc: SourceLocation, value: string, lang: string): TermLiteralLangStr;\n    /**\n     * Lexical form with a type\n     */\n    public literalTerm(loc: SourceLocation, value: string, iri: TermIri): TermLiteralTyped;\n    public literalTerm(loc: SourceLocation, value: string, langOrIri?: string | TermIri): TermLiteral;\n    public literalTerm(loc: SourceLocation, value: string, langOrIri?: string | TermIri): TermLiteral {\n      return {\n        type: nodeType,\n        subType: 'literal',\n        value,\n        langOrIri,\n        loc,\n      };\n    }\n\n    public isTermLiteral(obj: object): obj is SubTyped<NodeType, 'literal'> {\n      return this.isOfSubType(obj, nodeType, 'literal');\n    }\n\n    public isTermLiteralLangStr(obj: object): obj is SubTyped<NodeType, 'literal'> & { langOrIri: string } {\n      return this.isTermLiteral(obj) && typeof (<{ langOrIri?: unknown }>obj).langOrIri === 'string';\n    }\n\n    public isTermLiteralStr(obj: object): obj is SubTyped<NodeType, 'literal'> & { langOrIri: undefined } {\n      return this.isTermLiteral(obj) && typeof (<{ langOrIri?: unknown }>obj).langOrIri === 'undefined';\n    }\n\n    public isTermLiteralTyped(obj: object):\n      obj is SubTyped<NodeType, 'literal'> & { langOrIri: SubTyped<NodeType, 'namedNode'> } {\n      const casted = <{ langOrIri?: unknown }>obj;\n      return this.isTermLiteral(obj) && typeof casted.langOrIri === 'object' &&\n        casted.langOrIri !== null && this.isTermNamed(casted.langOrIri);\n    }\n\n    public variable(value: string, loc: SourceLocation): TermVariable {\n      return {\n        type: nodeType,\n        subType: 'variable',\n        value,\n        loc,\n      };\n    }\n\n    public isTermVariable(obj: object): obj is SubTyped<NodeType, 'variable'> {\n      return this.isOfSubType(obj, nodeType, 'variable');\n    }\n\n    /**\n     * A namednode with fully defined with a uri.\n     */\n    public namedNode(loc: SourceLocation, value: string, prefix?: undefined): TermIriFull;\n    /**\n     * A namednode defined using a prefix\n     */\n    public namedNode(loc: SourceLocation, value: string, prefix: string): TermIriPrefixed;\n    public namedNode(loc: SourceLocation, value: string, prefix?: string): TermIriFull | TermIriPrefixed {\n      const base = <const>{\n        type: nodeType,\n        subType: 'namedNode',\n        value,\n        loc,\n      };\n      if (prefix === undefined) {\n        return base;\n      }\n      return { ...base, prefix };\n    }\n\n    public isTermNamed(obj: object): obj is SubTyped<NodeType, 'namedNode'> {\n      return this.isOfSubType(obj, nodeType, 'namedNode');\n    }\n\n    public isTermNamedPrefixed(obj: object): obj is SubTyped<NodeType, 'namedNode'> & { prefix: string } {\n      const casted = <{ prefix?: unknown }>obj;\n      return this.isTermNamed(obj) && typeof casted.prefix === 'string';\n    }\n  };\n}\n"]}
+{"version":3,"file":"TermFactory.js","sourceRoot":"","sources":["TermFactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, Typed, SubTyped } from '@traqula/core';\nimport type {\n  TermBlank,\n  TermIri,\n  TermIriFull,\n  TermIriPrefixed,\n  TermLiteral,\n  TermLiteralLangStr,\n  TermLiteralStr,\n  TermLiteralTyped,\n  TermVariable,\n} from '../Sparql11types';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'term';\nconst nodeType: NodeType = 'term';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function TermFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class TermFactory extends Base {\n    public __blankNodeCounter = 0;\n\n    public resetBlankNodeCounter(): void {\n      this.__blankNodeCounter = 0;\n    }\n\n    public isTerm(x: object): x is Typed<'term'> {\n      return this.isOfType(x, 'term');\n    }\n\n    public blankNode(label: undefined | string, loc: SourceLocation): TermBlank {\n      const base = <const>{\n        type: 'term',\n        subType: 'blankNode',\n        loc,\n      };\n      if (label === undefined) {\n        return { ...base, label: `g_${this.__blankNodeCounter++}` };\n      }\n      return { ...base, label: `e_${label}` };\n    }\n\n    public isTermBlank(obj: object): obj is SubTyped<NodeType, 'blankNode'> {\n      return this.isOfSubType(obj, nodeType, 'blankNode');\n    }\n\n    /**\n     * String, no lang, no type\n     */\n    public literalTerm(loc: SourceLocation, value: string, lang?: undefined): TermLiteralStr;\n    /**\n     * String with a language tag\n     */\n    public literalTerm(loc: SourceLocation, value: string, lang: string): TermLiteralLangStr;\n    /**\n     * Lexical form with a type\n     */\n    public literalTerm(loc: SourceLocation, value: string, iri: TermIri): TermLiteralTyped;\n    public literalTerm(loc: SourceLocation, value: string, langOrIri?: string | TermIri): TermLiteral;\n    public literalTerm(loc: SourceLocation, value: string, langOrIri?: string | TermIri): TermLiteral {\n      return {\n        type: nodeType,\n        subType: 'literal',\n        value,\n        langOrIri,\n        loc,\n      };\n    }\n\n    public isTermLiteral(obj: object): obj is SubTyped<NodeType, 'literal'> {\n      return this.isOfSubType(obj, nodeType, 'literal');\n    }\n\n    public isTermLiteralLangStr(obj: object): obj is SubTyped<NodeType, 'literal'> & { langOrIri: string } {\n      return this.isTermLiteral(obj) && typeof (<{ langOrIri?: unknown }>obj).langOrIri === 'string';\n    }\n\n    public isTermLiteralStr(obj: object): obj is SubTyped<NodeType, 'literal'> & { langOrIri: undefined } {\n      return this.isTermLiteral(obj) && typeof (<{ langOrIri?: unknown }>obj).langOrIri === 'undefined';\n    }\n\n    public isTermLiteralTyped(obj: object):\n      obj is SubTyped<NodeType, 'literal'> & { langOrIri: SubTyped<NodeType, 'namedNode'> } {\n      const casted = <{ langOrIri?: unknown }>obj;\n      return this.isTermLiteral(obj) && typeof casted.langOrIri === 'object' &&\n        casted.langOrIri !== null && this.isTermNamed(casted.langOrIri);\n    }\n\n    public variable(value: string, loc: SourceLocation): TermVariable {\n      return {\n        type: nodeType,\n        subType: 'variable',\n        value,\n        loc,\n      };\n    }\n\n    public isTermVariable(obj: object): obj is SubTyped<NodeType, 'variable'> {\n      return this.isOfSubType(obj, nodeType, 'variable');\n    }\n\n    /**\n     * A namednode with fully defined with a uri.\n     */\n    public namedNode(loc: SourceLocation, value: string, prefix?: undefined): TermIriFull;\n    /**\n     * A namednode defined using a prefix\n     */\n    public namedNode(loc: SourceLocation, value: string, prefix: string): TermIriPrefixed;\n    public namedNode(loc: SourceLocation, value: string, prefix?: string): TermIriFull | TermIriPrefixed {\n      const base = <const>{\n        type: nodeType,\n        subType: 'namedNode',\n        value,\n        loc,\n      };\n      if (prefix === undefined) {\n        return base;\n      }\n      return { ...base, prefix };\n    }\n\n    public isTermNamed(obj: object): obj is SubTyped<NodeType, 'namedNode'> {\n      return this.isOfSubType(obj, nodeType, 'namedNode');\n    }\n\n    public isTermNamedPrefixed(obj: object): obj is SubTyped<NodeType, 'namedNode'> & { prefix: string } {\n      const casted = <{ prefix?: unknown }>obj;\n      return this.isTermNamed(obj) && typeof casted.prefix === 'string';\n    }\n  };\n}\n"]}

package/lib/factoryMixins/UpdateOperationFactory.d.ts

@@ -1,5 +1,5 @@
 import type { CoreFactory, SourceLocation, SubTyped, Typed } from '@traqula/core';
-import type { DatasetClauses, GraphRef, GraphRefDefault, GraphRefSpecific, PatternGroup, Quads, TermIri, UpdateOperationAdd, UpdateOperationClear, UpdateOperationCopy, UpdateOperationCreate, UpdateOperationDeleteData, UpdateOperationDeleteWhere, UpdateOperationDrop, UpdateOperationInsertData, UpdateOperationLoad, UpdateOperationModify, UpdateOperationMove } from '../RoundTripTypes';
+import type { DatasetClauses, GraphRef, GraphRefDefault, GraphRefSpecific, PatternGroup, Quads, TermIri, UpdateOperationAdd, UpdateOperationClear, UpdateOperationCopy, UpdateOperationCreate, UpdateOperationDeleteData, UpdateOperationDeleteWhere, UpdateOperationDrop, UpdateOperationInsertData, UpdateOperationLoad, UpdateOperationModify, UpdateOperationMove } from '../Sparql11types';
 import type { Constructor } from './mixins';
 type NodeType = 'updateOperation';
 export declare function UpdateOperationFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase): {

package/lib/factoryMixins/UpdateOperationFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateOperationFactory.js","sourceRoot":"","sources":["UpdateOperationFactory.ts"],"names":[],"mappings":"AAwBA,MAAM,QAAQ,GAAa,iBAAiB,CAAC;AAE7C,4DAA4D;AAC5D,MAAM,UAAU,2BAA2B,CAAyC,IAAW;IAC7F,OAAO,MAAM,sBAAuB,SAAQ,IAAI;QACvC,iBAAiB,CAAC,GAAW;YAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QAEM,mBAAmB,CACxB,GAAmB,EACnB,MAAe,EACf,MAAe,EACf,WAA0C;YAE1C,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM;gBACN,MAAM;gBACN,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;gBACnC,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,qBAAqB,CAAC,GAAW;YACtC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC;QAYM,wBAAwB,CAC7B,OAAyB,EACzB,MAAe,EACf,WAAqB,EACrB,GAAmB;YAEnB,OAAO;gBACL,IAAI,EAAE,iBAAiB;gBACvB,OAAO;gBACP,MAAM;gBACN,WAAW;gBACX,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,oBAAoB,CACzB,WAAqB,EACrB,MAAe,EACf,GAAmB;YAEnB,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;QAC1E,CAAC;QAAA,CAAC;QAEK,sBAAsB,CAAC,GAAW;YACvC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QAEM,mBAAmB,CACxB,WAAqB,EACrB,MAAe,EACf,GAAmB;YAEnB,OAAO,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;QACzE,CAAC;QAEM,qBAAqB,CAAC,GAAW;YACtC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC;QAEM,qBAAqB,CAC1B,WAA6B,EAC7B,MAAe,EACf,GAAmB;YAEnB,OAAO;gBACL,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,QAAQ;gBACjB,MAAM;gBACN,WAAW;gBACX,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,uBAAuB,CAAC,GAAW;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnD,CAAC;QA8BM,0BAA0B,CAC/B,OAAgC,EAChC,MAA0C,EAC1C,WAA+C,EAC/C,MAAe,EACf,GAAmB;YAEnB,OAAO;gBACL,IAAI,EAAE,iBAAiB;gBACvB,OAAO;gBACP,MAAM;gBACN,MAAM;gBACN,WAAW;gBACX,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,kBAAkB,CACvB,MAA0C,EAC1C,WAA+C,EAC/C,MAAe,EACf,GAAmB;YAEnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClF,CAAC;QAEM,oBAAoB,CAAC,GAAW;YACrC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QAEM,mBAAmB,CACxB,MAA0C,EAC1C,WAA+C,EAC/C,MAAe,EACf,GAAmB;YAEnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACnF,CAAC;QAEM,qBAAqB,CAAC,GAAW;YACtC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC;QAEM,mBAAmB,CACxB,MAA0C,EAC1C,WAA+C,EAC/C,MAAe,EACf,GAAmB;YAEnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACnF,CAAC;QAEM,qBAAqB,CAAC,GAAW;YACtC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC;QAaM,8BAA8B,CACnC,OAAoD,EACpD,IAAa,EACb,GAAmB;YAEnB,OAAO;gBACL,IAAI,EAAE,iBAAiB;gBACvB,OAAO;gBACP,IAAI;gBACJ,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,yBAAyB,CAAC,IAAa,EAAE,GAAmB;YACjE,OAAO,IAAI,CAAC,8BAA8B,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QACtE,CAAC;QAEM,2BAA2B,CAAC,GAAW;YAC5C,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QACvD,CAAC;QAEM,yBAAyB,CAAC,IAAa,EAAE,GAAmB;YACjE,OAAO,IAAI,CAAC,8BAA8B,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QACtE,CAAC;QAEM,2BAA2B,CAAC,GAAW;YAC5C,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QACvD,CAAC;QAEM,0BAA0B,CAAC,IAAa,EAAE,GAAmB;YAClE,OAAO,IAAI,CAAC,8BAA8B,CAAC,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QACvE,CAAC;QAEM,4BAA4B,CAAC,GAAW;YAC7C,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QACxD,CAAC;QAEM,qBAAqB,CAC1B,GAAmB,EACnB,MAA2B,EAC3B,GAAwB,EACxB,KAAmB,EACnB,IAAoB,EACpB,KAA2B;YAE3B,OAAO;gBACL,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,MAAM,IAAI,EAAE;gBACpB,MAAM,EAAE,GAAG,IAAI,EAAE;gBACjB,KAAK;gBACL,KAAK;gBACL,IAAI;gBACJ,GAAG;aACJ,CAAC;QACJ,CAAC;QAEM,uBAAuB,CAAC,GAAW;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnD,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { CoreFactory, SourceLocation, SubTyped, Typed } from '@traqula/core';\nimport type {\n  DatasetClauses,\n  GraphRef,\n  GraphRefDefault,\n  GraphRefSpecific,\n  PatternGroup,\n  Quads,\n  TermIri,\n  UpdateOperationAdd,\n  UpdateOperationClear,\n  UpdateOperationCopy,\n  UpdateOperationCreate,\n  UpdateOperationDeleteData,\n  UpdateOperationDeleteWhere,\n  UpdateOperationDrop,\n  UpdateOperationInsertData,\n  UpdateOperationLoad,\n  UpdateOperationModify,\n  UpdateOperationMove,\n} from '../RoundTripTypes';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'updateOperation';\nconst nodeType: NodeType = 'updateOperation';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function UpdateOperationFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class UpdateOperationFactory extends Base {\n    public isUpdateOperation(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public updateOperationLoad(\n      loc: SourceLocation,\n      source: TermIri,\n      silent: boolean,\n      destination?: GraphRefSpecific | undefined,\n    ): UpdateOperationLoad {\n      return {\n        type: nodeType,\n        subType: 'load',\n        silent,\n        source,\n        ...(destination && { destination }),\n        loc,\n      };\n    }\n\n    public isUpdateOperationLoad(obj: object): obj is SubTyped<NodeType, 'load'> {\n      return this.isOfSubType(obj, nodeType, 'load');\n    }\n\n    public updateOperationClearDrop(subType: 'clear', silent: boolean, destination: GraphRef, loc: SourceLocation):\n    UpdateOperationClear;\n    public updateOperationClearDrop(subType: 'drop', silent: boolean, destination: GraphRef, loc: SourceLocation):\n    UpdateOperationDrop;\n    public updateOperationClearDrop(\n      subType: 'clear' | 'drop',\n      silent: boolean,\n      destination: GraphRef,\n      loc: SourceLocation\n    ): UpdateOperationClear | UpdateOperationDrop;\n    public updateOperationClearDrop(\n      subType: 'clear' | 'drop',\n      silent: boolean,\n      destination: GraphRef,\n      loc: SourceLocation,\n    ): UpdateOperationClear | UpdateOperationDrop {\n      return {\n        type: 'updateOperation',\n        subType,\n        silent,\n        destination,\n        loc,\n      };\n    }\n\n    public updateOperationClear(\n      destination: GraphRef,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationClear {\n      return this.updateOperationClearDrop('clear', silent, destination, loc);\n    };\n\n    public isUpdateOperationClear(obj: object): obj is SubTyped<NodeType, 'clear'> {\n      return this.isOfSubType(obj, nodeType, 'clear');\n    }\n\n    public updateOperationDrop(\n      destination: GraphRef,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationDrop {\n      return this.updateOperationClearDrop('drop', silent, destination, loc);\n    }\n\n    public isUpdateOperationDrop(obj: object): obj is SubTyped<NodeType, 'drop'> {\n      return this.isOfSubType(obj, nodeType, 'drop');\n    }\n\n    public updateOperationCreate(\n      destination: GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationCreate {\n      return {\n        type: 'updateOperation',\n        subType: 'create',\n        silent,\n        destination,\n        loc,\n      };\n    }\n\n    public isUpdateOperationCreate(obj: object): obj is SubTyped<NodeType, 'create'> {\n      return this.isOfSubType(obj, nodeType, 'create');\n    }\n\n    public updateOperationAddMoveCopy(\n      subType: 'add',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationAdd;\n    public updateOperationAddMoveCopy(\n      subType: 'move',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationMove ;\n    public updateOperationAddMoveCopy(\n      subType: 'copy',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationCopy;\n    public updateOperationAddMoveCopy(\n      subType: 'add' | 'move' | 'copy',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationAdd | UpdateOperationMove | UpdateOperationCopy;\n    public updateOperationAddMoveCopy(\n      subType: 'add' | 'move' | 'copy',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationAdd | UpdateOperationMove | UpdateOperationCopy {\n      return {\n        type: 'updateOperation',\n        subType,\n        silent,\n        source,\n        destination,\n        loc,\n      };\n    }\n\n    public updateOperationAdd(\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationAdd {\n      return this.updateOperationAddMoveCopy('add', source, destination, silent, loc);\n    }\n\n    public isUpdateOperationAdd(obj: object): obj is SubTyped<NodeType, 'add'> {\n      return this.isOfSubType(obj, nodeType, 'add');\n    }\n\n    public updateOperationMove(\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationMove {\n      return this.updateOperationAddMoveCopy('move', source, destination, silent, loc);\n    }\n\n    public isUpdateOperationMove(obj: object): obj is SubTyped<NodeType, 'move'> {\n      return this.isOfSubType(obj, nodeType, 'move');\n    }\n\n    public updateOperationCopy(\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationCopy {\n      return this.updateOperationAddMoveCopy('copy', source, destination, silent, loc);\n    }\n\n    public isUpdateOperationCopy(obj: object): obj is SubTyped<NodeType, 'copy'> {\n      return this.isOfSubType(obj, nodeType, 'copy');\n    }\n\n    public updateOperationInsDelDataWhere(subType: 'insertdata', data: Quads[], loc: SourceLocation):\n    UpdateOperationInsertData;\n    public updateOperationInsDelDataWhere(subType: 'deletedata', data: Quads[], loc: SourceLocation):\n    UpdateOperationDeleteData;\n    public updateOperationInsDelDataWhere(subType: 'deletewhere', data: Quads[], loc: SourceLocation):\n    UpdateOperationDeleteWhere;\n    public updateOperationInsDelDataWhere(\n      subType: 'insertdata' | 'deletedata' | 'deletewhere',\n      data: Quads[],\n      loc: SourceLocation,\n    ): UpdateOperationInsertData | UpdateOperationDeleteData | UpdateOperationDeleteWhere;\n    public updateOperationInsDelDataWhere(\n      subType: 'insertdata' | 'deletedata' | 'deletewhere',\n      data: Quads[],\n      loc: SourceLocation,\n    ): UpdateOperationInsertData | UpdateOperationDeleteData | UpdateOperationDeleteWhere {\n      return {\n        type: 'updateOperation',\n        subType,\n        data,\n        loc,\n      };\n    }\n\n    public updateOperationInsertData(data: Quads[], loc: SourceLocation): UpdateOperationInsertData {\n      return this.updateOperationInsDelDataWhere('insertdata', data, loc);\n    }\n\n    public isUpdateOperationInsertData(obj: object): obj is SubTyped<NodeType, 'insertdata'> {\n      return this.isOfSubType(obj, nodeType, 'insertdata');\n    }\n\n    public updateOperationDeleteData(data: Quads[], loc: SourceLocation): UpdateOperationDeleteData {\n      return this.updateOperationInsDelDataWhere('deletedata', data, loc);\n    }\n\n    public isUpdateOperationDeleteData(obj: object): obj is SubTyped<NodeType, 'deletedata'> {\n      return this.isOfSubType(obj, nodeType, 'deletedata');\n    }\n\n    public updateOperationDeleteWhere(data: Quads[], loc: SourceLocation): UpdateOperationDeleteWhere {\n      return this.updateOperationInsDelDataWhere('deletewhere', data, loc);\n    }\n\n    public isUpdateOperationDeleteWhere(obj: object): obj is SubTyped<NodeType, 'deletewhere'> {\n      return this.isOfSubType(obj, nodeType, 'deletewhere');\n    }\n\n    public updateOperationModify(\n      loc: SourceLocation,\n      insert: Quads[] | undefined,\n      del: Quads[] | undefined,\n      where: PatternGroup,\n      from: DatasetClauses,\n      graph?: TermIri | undefined,\n    ): UpdateOperationModify {\n      return {\n        type: 'updateOperation',\n        subType: 'modify',\n        insert: insert ?? [],\n        delete: del ?? [],\n        graph,\n        where,\n        from,\n        loc,\n      };\n    }\n\n    public isUpdateOperationModify(obj: object): obj is SubTyped<NodeType, 'modify'> {\n      return this.isOfSubType(obj, nodeType, 'modify');\n    }\n  };\n}\n"]}
+{"version":3,"file":"UpdateOperationFactory.js","sourceRoot":"","sources":["UpdateOperationFactory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CoreFactory, SourceLocation, SubTyped, Typed } from '@traqula/core';\nimport type {\n  DatasetClauses,\n  GraphRef,\n  GraphRefDefault,\n  GraphRefSpecific,\n  PatternGroup,\n  Quads,\n  TermIri,\n  UpdateOperationAdd,\n  UpdateOperationClear,\n  UpdateOperationCopy,\n  UpdateOperationCreate,\n  UpdateOperationDeleteData,\n  UpdateOperationDeleteWhere,\n  UpdateOperationDrop,\n  UpdateOperationInsertData,\n  UpdateOperationLoad,\n  UpdateOperationModify,\n  UpdateOperationMove,\n} from '../Sparql11types';\nimport type { Constructor } from './mixins';\n\ntype NodeType = 'updateOperation';\nconst nodeType: NodeType = 'updateOperation';\n\n// eslint-disable-next-line ts/explicit-function-return-type\nexport function UpdateOperationFactoryMixin<TBase extends Constructor<CoreFactory>>(Base: TBase) {\n  return class UpdateOperationFactory extends Base {\n    public isUpdateOperation(obj: object): obj is Typed<NodeType> {\n      return this.isOfType(obj, nodeType);\n    }\n\n    public updateOperationLoad(\n      loc: SourceLocation,\n      source: TermIri,\n      silent: boolean,\n      destination?: GraphRefSpecific | undefined,\n    ): UpdateOperationLoad {\n      return {\n        type: nodeType,\n        subType: 'load',\n        silent,\n        source,\n        ...(destination && { destination }),\n        loc,\n      };\n    }\n\n    public isUpdateOperationLoad(obj: object): obj is SubTyped<NodeType, 'load'> {\n      return this.isOfSubType(obj, nodeType, 'load');\n    }\n\n    public updateOperationClearDrop(subType: 'clear', silent: boolean, destination: GraphRef, loc: SourceLocation):\n    UpdateOperationClear;\n    public updateOperationClearDrop(subType: 'drop', silent: boolean, destination: GraphRef, loc: SourceLocation):\n    UpdateOperationDrop;\n    public updateOperationClearDrop(\n      subType: 'clear' | 'drop',\n      silent: boolean,\n      destination: GraphRef,\n      loc: SourceLocation\n    ): UpdateOperationClear | UpdateOperationDrop;\n    public updateOperationClearDrop(\n      subType: 'clear' | 'drop',\n      silent: boolean,\n      destination: GraphRef,\n      loc: SourceLocation,\n    ): UpdateOperationClear | UpdateOperationDrop {\n      return {\n        type: 'updateOperation',\n        subType,\n        silent,\n        destination,\n        loc,\n      };\n    }\n\n    public updateOperationClear(\n      destination: GraphRef,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationClear {\n      return this.updateOperationClearDrop('clear', silent, destination, loc);\n    };\n\n    public isUpdateOperationClear(obj: object): obj is SubTyped<NodeType, 'clear'> {\n      return this.isOfSubType(obj, nodeType, 'clear');\n    }\n\n    public updateOperationDrop(\n      destination: GraphRef,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationDrop {\n      return this.updateOperationClearDrop('drop', silent, destination, loc);\n    }\n\n    public isUpdateOperationDrop(obj: object): obj is SubTyped<NodeType, 'drop'> {\n      return this.isOfSubType(obj, nodeType, 'drop');\n    }\n\n    public updateOperationCreate(\n      destination: GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationCreate {\n      return {\n        type: 'updateOperation',\n        subType: 'create',\n        silent,\n        destination,\n        loc,\n      };\n    }\n\n    public isUpdateOperationCreate(obj: object): obj is SubTyped<NodeType, 'create'> {\n      return this.isOfSubType(obj, nodeType, 'create');\n    }\n\n    public updateOperationAddMoveCopy(\n      subType: 'add',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationAdd;\n    public updateOperationAddMoveCopy(\n      subType: 'move',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationMove ;\n    public updateOperationAddMoveCopy(\n      subType: 'copy',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationCopy;\n    public updateOperationAddMoveCopy(\n      subType: 'add' | 'move' | 'copy',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationAdd | UpdateOperationMove | UpdateOperationCopy;\n    public updateOperationAddMoveCopy(\n      subType: 'add' | 'move' | 'copy',\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationAdd | UpdateOperationMove | UpdateOperationCopy {\n      return {\n        type: 'updateOperation',\n        subType,\n        silent,\n        source,\n        destination,\n        loc,\n      };\n    }\n\n    public updateOperationAdd(\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationAdd {\n      return this.updateOperationAddMoveCopy('add', source, destination, silent, loc);\n    }\n\n    public isUpdateOperationAdd(obj: object): obj is SubTyped<NodeType, 'add'> {\n      return this.isOfSubType(obj, nodeType, 'add');\n    }\n\n    public updateOperationMove(\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationMove {\n      return this.updateOperationAddMoveCopy('move', source, destination, silent, loc);\n    }\n\n    public isUpdateOperationMove(obj: object): obj is SubTyped<NodeType, 'move'> {\n      return this.isOfSubType(obj, nodeType, 'move');\n    }\n\n    public updateOperationCopy(\n      source: GraphRefDefault | GraphRefSpecific,\n      destination: GraphRefDefault | GraphRefSpecific,\n      silent: boolean,\n      loc: SourceLocation,\n    ): UpdateOperationCopy {\n      return this.updateOperationAddMoveCopy('copy', source, destination, silent, loc);\n    }\n\n    public isUpdateOperationCopy(obj: object): obj is SubTyped<NodeType, 'copy'> {\n      return this.isOfSubType(obj, nodeType, 'copy');\n    }\n\n    public updateOperationInsDelDataWhere(subType: 'insertdata', data: Quads[], loc: SourceLocation):\n    UpdateOperationInsertData;\n    public updateOperationInsDelDataWhere(subType: 'deletedata', data: Quads[], loc: SourceLocation):\n    UpdateOperationDeleteData;\n    public updateOperationInsDelDataWhere(subType: 'deletewhere', data: Quads[], loc: SourceLocation):\n    UpdateOperationDeleteWhere;\n    public updateOperationInsDelDataWhere(\n      subType: 'insertdata' | 'deletedata' | 'deletewhere',\n      data: Quads[],\n      loc: SourceLocation,\n    ): UpdateOperationInsertData | UpdateOperationDeleteData | UpdateOperationDeleteWhere;\n    public updateOperationInsDelDataWhere(\n      subType: 'insertdata' | 'deletedata' | 'deletewhere',\n      data: Quads[],\n      loc: SourceLocation,\n    ): UpdateOperationInsertData | UpdateOperationDeleteData | UpdateOperationDeleteWhere {\n      return {\n        type: 'updateOperation',\n        subType,\n        data,\n        loc,\n      };\n    }\n\n    public updateOperationInsertData(data: Quads[], loc: SourceLocation): UpdateOperationInsertData {\n      return this.updateOperationInsDelDataWhere('insertdata', data, loc);\n    }\n\n    public isUpdateOperationInsertData(obj: object): obj is SubTyped<NodeType, 'insertdata'> {\n      return this.isOfSubType(obj, nodeType, 'insertdata');\n    }\n\n    public updateOperationDeleteData(data: Quads[], loc: SourceLocation): UpdateOperationDeleteData {\n      return this.updateOperationInsDelDataWhere('deletedata', data, loc);\n    }\n\n    public isUpdateOperationDeleteData(obj: object): obj is SubTyped<NodeType, 'deletedata'> {\n      return this.isOfSubType(obj, nodeType, 'deletedata');\n    }\n\n    public updateOperationDeleteWhere(data: Quads[], loc: SourceLocation): UpdateOperationDeleteWhere {\n      return this.updateOperationInsDelDataWhere('deletewhere', data, loc);\n    }\n\n    public isUpdateOperationDeleteWhere(obj: object): obj is SubTyped<NodeType, 'deletewhere'> {\n      return this.isOfSubType(obj, nodeType, 'deletewhere');\n    }\n\n    public updateOperationModify(\n      loc: SourceLocation,\n      insert: Quads[] | undefined,\n      del: Quads[] | undefined,\n      where: PatternGroup,\n      from: DatasetClauses,\n      graph?: TermIri | undefined,\n    ): UpdateOperationModify {\n      return {\n        type: 'updateOperation',\n        subType: 'modify',\n        insert: insert ?? [],\n        delete: del ?? [],\n        graph,\n        where,\n        from,\n        loc,\n      };\n    }\n\n    public isUpdateOperationModify(obj: object): obj is SubTyped<NodeType, 'modify'> {\n      return this.isOfSubType(obj, nodeType, 'modify');\n    }\n  };\n}\n"]}

package/lib/grammar/builtIn.d.ts

@@ -1,7 +1,7 @@
 import type { IOrAlt } from '@chevrotain/types';
 import type { ImplArgs } from '@traqula/core';
-import type { Expression, ExpressionAggregate, ExpressionAggregateDefault, ExpressionAggregateOnWildcard, ExpressionAggregateSeparator } from '../RoundTripTypes';
-import type { SparqlGrammarRule, SparqlRule } from '../Sparql11types';
+import type { SparqlGrammarRule, SparqlRule } from '../sparql11HelperTypes';
+import type { Expression, ExpressionAggregate, ExpressionAggregateDefault, ExpressionAggregateOnWildcard, ExpressionAggregateSeparator } from '../Sparql11types';
 export declare const builtInStr: import(".").RuleDefExpressionFunctionX<"builtInStr", [Expression]>;
 export declare const builtInLang: import(".").RuleDefExpressionFunctionX<"builtInLang", [Expression]>;
 export declare const builtInLangmatches: import(".").RuleDefExpressionFunctionX<"builtInLangmatches", [Expression, Expression]>;

package/lib/grammar/builtIn.js

@@ -54,61 +54,61 @@ export const builtInIsliteral = funcExpr1(l.builtIn.isliteral);
 export const builtInIsnumeric = funcExpr1(l.builtIn.isnumeric);
 export function builtInCallList(SUBRULE) {
     return [
-        { 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) },
+        { 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) },
     ];
 }
 /**
@@ -157,7 +157,7 @@ export const aggregateCount = {
                     const starToken = CONSUME(l.symbols.star);
                     return ACTION(() => C.factory.wildcard(C.factory.sourceLocation(starToken)));
                 } },
-            { ALT: () => SUBRULE(expression, undefined) },
+            { ALT: () => SUBRULE(expression) },
         ]);
         const closeToken = CONSUME(l.symbols.RParen);
         return ACTION(() => {
@@ -180,12 +180,12 @@ export const aggregateGroup_concat = {
         const operatorToken = CONSUME(l.builtIn.groupConcat);
         CONSUME(l.symbols.LParen);
         const distinctToken = OPTION1(() => CONSUME(l.distinct));
-        const expr = SUBRULE(expression, undefined);
+        const expr = SUBRULE(expression);
         const sep = OPTION2(() => {
             CONSUME(l.symbols.semi);
             CONSUME(l.separator);
             CONSUME(l.symbols.equal);
-            return SUBRULE(string, undefined);
+            return SUBRULE(string);
         });
         const closeToken = CONSUME(l.symbols.RParen);
         return ACTION(() => {
@@ -205,13 +205,13 @@ export const aggregate = {
         const wasInAggregate = ACTION(() => C.parseMode.has('inAggregate'));
         ACTION(() => C.parseMode.add('inAggregate'));
         const result = OR([
-            { 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) },
+            { ALT: () => SUBRULE(aggregateCount) },
+            { ALT: () => SUBRULE(aggregateSum) },
+            { ALT: () => SUBRULE(aggregateMin) },
+            { ALT: () => SUBRULE(aggregateMax) },
+            { ALT: () => SUBRULE(aggregateAvg) },
+            { ALT: () => SUBRULE(aggregateSample) },
+            { ALT: () => SUBRULE(aggregateGroup_concat) },
         ]);
         ACTION(() => !wasInAggregate && C.parseMode.delete('inAggregate'));
         ACTION(() => {
@@ -236,7 +236,7 @@ export const aggregate = {
             F.printFilter(ast, () => PRINT_WORD('*'));
         }
         else {
-            SUBRULE(expression, arg, undefined);
+            SUBRULE(expression, arg);
         }
         if (F.isExpressionAggregateSeparator(ast)) {
             F.printFilter(ast, () => PRINT_WORD(';', 'SEPARATOR', '=', stringEscapedLexical(ast.separator)));