@traqula/generator-sparql-1-2 0.0.20 → 0.0.21

package/lib/index.cjs

@@ -9750,7 +9750,7 @@ var LexerBuilder = class _LexerBuilder {
 };
 
 // ../../packages/core/lib/TransformerObject.js
-var TransformerObject = class {
+var TransformerObject = class _TransformerObject {
   defaultContext;
   maxStackSize = 1e6;
   /**
@@ -9760,12 +9760,15 @@ var TransformerObject = class {
   constructor(defaultContext = {}) {
     this.defaultContext = defaultContext;
   }
+  clone(newDefaultContext = {}) {
+    return new _TransformerObject({ ...this.defaultContext, ...newDefaultContext });
+  }
   /**
    * Function to shallow clone any type.
    * @param obj
    * @protected
    */
-  clone(obj) {
+  cloneObj(obj) {
     if (obj === null || typeof obj !== "object") {
       return obj;
     }
@@ -9840,7 +9843,7 @@ var TransformerObject = class {
         const ignoreKeys = context.ignoreKeys ?? defaultIgnoreKeys;
         const shallowKeys = context.shallowKeys ?? defaultShallowKeys;
         didShortCut = context.shortcut ?? defaultDidShortCut;
-        const copy3 = copyFlag ? this.clone(curObject) : curObject;
+        const copy3 = copyFlag ? this.cloneObj(curObject) : curObject;
         handleMapperOnLen.push(stack.length);
         mapperCopyStack.push(copy3);
         mapperOrigStack.push(curObject);
@@ -9854,7 +9857,7 @@ var TransformerObject = class {
             const val = copy3[key];
             const onlyShallow = shallowKeys && shallowKeys?.has(key);
             if (onlyShallow) {
-              copy3[key] = this.clone(val);
+              copy3[key] = this.cloneObj(val);
             }
             if (ignoreKeys && ignoreKeys.has(key)) {
               continue;
@@ -9935,12 +9938,15 @@ var TransformerObject = class {
 };
 
 // ../../packages/core/lib/TransformerTyped.js
-var TransformerTyped = class extends TransformerObject {
+var TransformerTyped = class _TransformerTyped extends TransformerObject {
   defaultNodePreVisitor;
   constructor(defaultContext = {}, defaultNodePreVisitor = {}) {
     super(defaultContext);
     this.defaultNodePreVisitor = defaultNodePreVisitor;
   }
+  clone(newDefaultContext = {}, newDefaultNodePreVisitor = {}) {
+    return new _TransformerTyped({ ...this.defaultContext, ...newDefaultContext }, { ...this.defaultNodePreVisitor, ...newDefaultNodePreVisitor });
+  }
   /**
    * Transform a single node.
    * The transformation calls the preVisitor from starting from the startObject.
@@ -10029,10 +10035,13 @@ var TransformerTyped = class extends TransformerObject {
 };
 
 // ../../packages/core/lib/TransformerSubTyped.js
-var TransformerSubTyped = class extends TransformerTyped {
+var TransformerSubTyped = class _TransformerSubTyped extends TransformerTyped {
   constructor(defaultContext = {}, defaultNodePreVisitor = {}) {
     super(defaultContext, defaultNodePreVisitor);
   }
+  clone(newDefaultContext = {}, newDefaultNodePreVisitor = {}) {
+    return new _TransformerSubTyped({ ...this.defaultContext, ...newDefaultContext }, { ...this.defaultNodePreVisitor, ...newDefaultNodePreVisitor });
+  }
   /**
    * Shares the functionality and first two arguments with {@link this.transformNode}.
    * The third argument allows you to also transform based on the subType of objects.
@@ -11783,8 +11792,7 @@ function findPatternBoundedVars(iter, boundedVars) {
       optional: (op) => ({ next: op.patterns }),
       service: (op) => ({ next: [op.name, ...op.patterns] }),
       bind: (op) => ({ next: [op.variable] }),
-      graph: (op) => ({ next: [op.name, ...op.patterns] }),
-      minus: (op) => ({ next: op.patterns.slice(0, 1) })
+      graph: (op) => ({ next: [op.name, ...op.patterns] })
     },
     term: {
       variable: (op) => {

package/lib/index.d.ts

@@ -2,53 +2,42 @@ import { GeneratorBuilder } from '@traqula/core';
 import type { Wrap, Patch } from '@traqula/core';
 import type { gram as g11 } from '@traqula/rules-sparql-1-1';
 import type * as T12 from '@traqula/rules-sparql-1-2';
-export declare const sparql12GeneratorBuilder: GeneratorBuilder<T12.SparqlGeneratorContext, "filter" | "copy" | "graphRef" | "load" | "clear" | "drop" | "create" | "add" | "move" | "modify" | "update" | "query" | "datasetClauses" | "bind" | "solutionModifier" | "expression" | "aggregate" | "path" | "blankNode" | "selectQuery" | "selectClause" | "constructQuery" | "describeQuery" | "askQuery" | "update1" | "insertData" | "deleteData" | "deleteWhere" | "graphRefAll" | "quads" | "quadsNotTriples" | "usingClauses" | "argList" | "iriOrFunction" | "prologue" | "baseDecl" | "prefixDecl" | "varOrTerm" | "var" | "graphTerm" | "rdfLiteral" | "iri" | "iriFull" | "prefixedName" | "groupClause" | "havingClause" | "orderClause" | "limitOffsetClauses" | "triplesBlock" | "collectionPath" | "triplesNodePath" | "blankNodePropertyListPath" | "graphNodePath" | "whereClause" | "groupGraphPattern" | "generatePattern" | "graphPatternNotTriples" | "optionalGraphPattern" | "graphGraphPattern" | "serviceGraphPattern" | "inlineData" | "minusGraphPattern" | "groupOrUnionGraphPattern" | "queryOrUpdate" | "reifiedTriple" | "versionDecl" | "annotationPath" | "annotationBlockPath" | "tripleTerm", {
-    filter: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "filter", T12.PatternFilter, []>;
-    copy: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "copy", T12.UpdateOperationCopy, []>;
-    graphRef: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphRef", import("@traqula/rules-sparql-1-1").TermIri, []>;
-    load: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "load", T12.UpdateOperationLoad, []>;
-    clear: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "clear", T12.UpdateOperationClear, []>;
-    drop: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "drop", T12.UpdateOperationDrop, []>;
-    create: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "create", T12.UpdateOperationCreate, []>;
-    add: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "add", T12.UpdateOperationAdd, []>;
-    move: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "move", T12.UpdateOperationMove, []>;
-    modify: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "modify", T12.UpdateOperationModify, []>;
-    update: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "update", T12.Update, []>;
+export declare const sparql12GeneratorBuilder: GeneratorBuilder<T12.SparqlGeneratorContext, "queryOrUpdate" | "query" | "selectQuery" | "constructQuery" | "describeQuery" | "askQuery" | "selectClause" | "update" | "update1" | "load" | "clear" | "drop" | "create" | "copy" | "move" | "add" | "insertData" | "deleteData" | "deleteWhere" | "modify" | "graphRef" | "graphRefAll" | "quads" | "quadsNotTriples" | "aggregate" | "datasetClauses" | "usingClauses" | "argList" | "expression" | "iriOrFunction" | "prologue" | "prefixDecl" | "baseDecl" | "varOrTerm" | "var" | "graphTerm" | "blankNode" | "rdfLiteral" | "iri" | "iriFull" | "prefixedName" | "path" | "solutionModifier" | "groupClause" | "havingClause" | "orderClause" | "limitOffsetClauses" | "triplesBlock" | "collectionPath" | "blankNodePropertyListPath" | "triplesNodePath" | "graphNodePath" | "whereClause" | "generatePattern" | "groupGraphPattern" | "graphPatternNotTriples" | "filter" | "bind" | "optionalGraphPattern" | "graphGraphPattern" | "serviceGraphPattern" | "inlineData" | "minusGraphPattern" | "groupOrUnionGraphPattern" | "reifiedTriple" | "tripleTerm" | "annotationBlockPath" | "annotationPath" | "versionDecl", {
+    queryOrUpdate: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "queryOrUpdate", T12.SparqlQuery, []>;
     query: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "query", T12.Query, []>;
-    datasetClauses: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "datasetClauses", T12.DatasetClauses, []>;
-    bind: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "bind", T12.PatternBind, []>;
-    solutionModifier: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "solutionModifier", T12.SolutionModifiers, []>;
-    expression: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "expression", T12.Expression, []>;
-    aggregate: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "aggregate", T12.ExpressionAggregate, []>;
-    path: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "path", import("@traqula/rules-sparql-1-1").Path, [boolean | undefined]>;
-    blankNode: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "blankNode", import("@traqula/core").Node & {
-        type: "term";
-        subType: string;
-    } & {
-        subType: "blankNode";
-    } & {
-        label: string;
-    }, []>;
     selectQuery: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "selectQuery", Omit<T12.QuerySelect, g11.HandledByBase>, []>;
-    selectClause: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "selectClause", Wrap<Pick<T12.QuerySelect, "variables" | "distinct" | "reduced">>, []>;
     constructQuery: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "constructQuery", Omit<T12.QueryConstruct, g11.HandledByBase>, []>;
     describeQuery: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "describeQuery", Omit<T12.QueryDescribe, g11.HandledByBase>, []>;
     askQuery: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "askQuery", Omit<T12.QueryAsk, g11.HandledByBase>, []>;
+    selectClause: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "selectClause", Wrap<Pick<T12.QuerySelect, "variables" | "distinct" | "reduced">>, []>;
+    update: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "update", T12.Update, []>;
     update1: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "update1", T12.UpdateOperation, []>;
+    load: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "load", T12.UpdateOperationLoad, []>;
+    clear: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "clear", T12.UpdateOperationClear, []>;
+    drop: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "drop", T12.UpdateOperationDrop, []>;
+    create: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "create", T12.UpdateOperationCreate, []>;
+    copy: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "copy", T12.UpdateOperationCopy, []>;
+    move: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "move", T12.UpdateOperationMove, []>;
+    add: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "add", T12.UpdateOperationAdd, []>;
     insertData: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "insertData", T12.UpdateOperationInsertData, []>;
     deleteData: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "deleteData", T12.UpdateOperationDeleteData, []>;
     deleteWhere: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "deleteWhere", T12.UpdateOperationDeleteWhere, []>;
+    modify: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "modify", T12.UpdateOperationModify, []>;
+    graphRef: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphRef", import("@traqula/rules-sparql-1-1").TermIri, []>;
     graphRefAll: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphRefAll", import("@traqula/rules-sparql-1-1").GraphRef, []>;
     quads: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "quads", Wrap<T12.Quads[]>, []>;
     quadsNotTriples: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "quadsNotTriples", T12.GraphQuads, []>;
+    aggregate: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "aggregate", T12.ExpressionAggregate, []>;
+    datasetClauses: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "datasetClauses", T12.DatasetClauses, []>;
     usingClauses: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "usingClauses", T12.DatasetClauses, []>;
     argList: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "argList", Patch<g11.IArgList, {
         args: T12.Expression[];
     }>, []>;
+    expression: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "expression", T12.Expression, []>;
     iriOrFunction: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "iriOrFunction", import("@traqula/rules-sparql-1-1").TermIri | T12.ExpressionFunctionCall, []>;
     prologue: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "prologue", T12.ContextDefinition[], []>;
-    baseDecl: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "baseDecl", import("@traqula/rules-sparql-1-1").ContextDefinitionBase, []>;
     prefixDecl: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "prefixDecl", import("@traqula/rules-sparql-1-1").ContextDefinitionPrefix, []>;
+    baseDecl: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "baseDecl", import("@traqula/rules-sparql-1-1").ContextDefinitionBase, []>;
     varOrTerm: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "varOrTerm", T12.Term, []>;
     var: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "var", import("@traqula/core").Node & {
         type: "term";
@@ -58,6 +47,14 @@ export declare const sparql12GeneratorBuilder: GeneratorBuilder<T12.SparqlGenera
         value: string;
     }, []>;
     graphTerm: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphTerm", T12.GraphTerm, []>;
+    blankNode: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "blankNode", import("@traqula/core").Node & {
+        type: "term";
+        subType: string;
+    } & {
+        subType: "blankNode";
+    } & {
+        label: string;
+    }, []>;
     rdfLiteral: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "rdfLiteral", import("@traqula/rules-sparql-1-1").TermLiteral, []>;
     iri: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "iri", import("@traqula/rules-sparql-1-1").TermIri, []>;
     iriFull: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "iriFull", import("@traqula/core").Node & {
@@ -77,37 +74,40 @@ export declare const sparql12GeneratorBuilder: GeneratorBuilder<T12.SparqlGenera
         value: string;
         prefix: string;
     }, []>;
+    path: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "path", import("@traqula/rules-sparql-1-1").Path, [boolean | undefined]>;
+    solutionModifier: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "solutionModifier", T12.SolutionModifiers, []>;
     groupClause: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "groupClause", T12.SolutionModifierGroup, []>;
     havingClause: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "havingClause", T12.SolutionModifierHaving, []>;
     orderClause: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "orderClause", T12.SolutionModifierOrder, []>;
     limitOffsetClauses: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "limitOffsetClauses", import("@traqula/rules-sparql-1-1").SolutionModifierLimitOffset, []>;
     triplesBlock: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "triplesBlock", T12.PatternBgp, []>;
     collectionPath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "collectionPath", T12.TripleCollectionList, []>;
-    triplesNodePath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "triplesNodePath", T12.TripleCollection, []>;
     blankNodePropertyListPath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "blankNodePropertyListPath", Patch<import("@traqula/rules-sparql-1-1").TripleCollectionBlankNodeProperties, {
         triples: T12.TripleNesting[];
         identifier: T12.TermBlank | T12.TermVariable | T12.TermIri;
     }>, []>;
+    triplesNodePath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "triplesNodePath", T12.TripleCollection, []>;
     graphNodePath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphNodePath", T12.GraphNode, []>;
     whereClause: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "whereClause", Wrap<T12.PatternGroup>, []>;
-    groupGraphPattern: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "groupGraphPattern", T12.PatternGroup, []>;
     generatePattern: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "generatePattern", T12.Pattern, []>;
+    groupGraphPattern: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "groupGraphPattern", T12.PatternGroup, []>;
     graphPatternNotTriples: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphPatternNotTriples", T12.PatternGroup | T12.PatternUnion | T12.PatternOptional | T12.PatternMinus | T12.PatternGraph | T12.PatternService | T12.PatternFilter | T12.PatternBind | T12.PatternValues, []>;
+    filter: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "filter", T12.PatternFilter, []>;
+    bind: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "bind", T12.PatternBind, []>;
     optionalGraphPattern: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "optionalGraphPattern", T12.PatternOptional, []>;
     graphGraphPattern: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphGraphPattern", T12.PatternGroup, []>;
     serviceGraphPattern: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "serviceGraphPattern", T12.PatternService, []>;
     inlineData: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "inlineData", T12.PatternValues, []>;
     minusGraphPattern: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "minusGraphPattern", T12.PatternMinus, []>;
     groupOrUnionGraphPattern: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "groupOrUnionGraphPattern", T12.PatternGroup | T12.PatternUnion, []>;
-    queryOrUpdate: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "queryOrUpdate", T12.SparqlQuery, []>;
     reifiedTriple: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "reifiedTriple", T12.TripleCollectionReifiedTriple, []>;
-    versionDecl: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "versionDecl", T12.ContextDefinitionVersion, []>;
-    annotationPath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "annotationPath", T12.Annotation[], []>;
+    tripleTerm: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "tripleTerm", T12.TermTriple, []>;
     annotationBlockPath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "annotationBlockPath", Patch<import("@traqula/rules-sparql-1-1").TripleCollectionBlankNodeProperties, {
         triples: T12.TripleNesting[];
         identifier: T12.TermBlank | T12.TermVariable | T12.TermIri;
     }>, []>;
-    tripleTerm: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "tripleTerm", T12.TermTriple, []>;
+    annotationPath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "annotationPath", T12.Annotation[], []>;
+    versionDecl: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "versionDecl", T12.ContextDefinitionVersion, []>;
 }>;
 export type SparqlGenerator = ReturnType<typeof sparql12GeneratorBuilder.build>;
 export declare class Generator {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@traqula/generator-sparql-1-2",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "SPARQL 1.2 generator",
   "lsd:module": true,
   "license": "MIT",
@@ -42,14 +42,14 @@
     "build:transpile": " node \"../../node_modules/esbuild/bin/esbuild\" --format=cjs --bundle --log-level=error --outfile=lib/index.cjs lib/index.ts"
   },
   "dependencies": {
-    "@traqula/core": "^0.0.20",
-    "@traqula/generator-sparql-1-1": "^0.0.20",
-    "@traqula/rules-sparql-1-1": "^0.0.20",
-    "@traqula/rules-sparql-1-2": "^0.0.20"
+    "@traqula/core": "^0.0.21",
+    "@traqula/generator-sparql-1-1": "^0.0.21",
+    "@traqula/rules-sparql-1-1": "^0.0.21",
+    "@traqula/rules-sparql-1-2": "^0.0.21"
   },
   "devDependencies": {
-    "@traqula/parser-sparql-1-2": "^0.0.20",
-    "@traqula/test-utils": "^0.0.20"
+    "@traqula/parser-sparql-1-2": "^0.0.21",
+    "@traqula/test-utils": "^0.0.21"
   },
-  "gitHead": "caf35c28d4ddbfec5947566b697d34f38c1e6e31"
+  "gitHead": "6e27b4bab942e473c11576196320bd52894ea5a4"
 }