@traqula/generator-sparql-1-2 0.0.16 → 0.0.18

package/lib/index.cjs

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // lib/index.ts
 var index_exports = {};
 __export(index_exports, {
-  Generator: () => Generator
+  Generator: () => Generator,
+  sparql12GeneratorBuilder: () => sparql12GeneratorBuilder
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -9717,6 +9718,11 @@ var LexerBuilder = class _LexerBuilder {
 
 // ../../packages/core/lib/Transformers.js
 var TransformerType = class {
+  clone(obj) {
+    const newObj = Object.create(Object.getPrototypeOf(obj));
+    Object.defineProperties(newObj, Object.getOwnPropertyDescriptors(obj));
+    return newObj;
+  }
   safeObjectVisit(value, mapper) {
     if (value && typeof value === "object") {
       if (Array.isArray(value)) {
@@ -9726,104 +9732,213 @@ var TransformerType = class {
     }
     return value;
   }
-  transformNode(curObject, nodeCallBacks) {
-    let continueCheck;
-    let transformation;
-    const casted = curObject;
-    if (casted.type) {
-      continueCheck = nodeCallBacks[casted.type]?.continue;
-      transformation = nodeCallBacks[casted.type]?.transform;
-    }
-    let shouldContinue = true;
-    if (continueCheck) {
-      shouldContinue = continueCheck(curObject);
-    }
-    if (!shouldContinue) {
-      return curObject;
-    }
-    const copy3 = { ...curObject };
-    for (const [key, value] of Object.entries(copy3)) {
-      copy3[key] = this.safeObjectVisit(value, (obj) => this.transformNode(obj, nodeCallBacks));
-    }
-    if (transformation) {
-      return transformation(copy3);
-    }
-    return copy3;
+  /**
+   * Recursively transforms all objects that are not arrays. Mapper is called on deeper objects first.
+   * @param startObject object to start iterating from
+   * @param mapper mapper to transform the various objects - argument is a copy of the original
+   * @param preVisitor callback that is evaluated before iterating deeper.
+   *   If continues is false, we do not iterate deeper, current object is still mapped. - default: true
+   *   If shortcut is true, we do not iterate deeper, nor do we branch out, this mapper will be the last one called.
+   *    - Default false
+   */
+  transformObject(startObject, mapper, preVisitor = () => ({})) {
+    let didShortCut = false;
+    const recurse = (curObject) => {
+      const copy3 = this.clone(curObject);
+      const context = preVisitor(copy3);
+      didShortCut = context.shortcut ?? false;
+      const continues = context.continue ?? true;
+      if (continues && !didShortCut) {
+        for (const [key, value] of Object.entries(copy3)) {
+          if (didShortCut) {
+            return copy3;
+          }
+          copy3[key] = this.safeObjectVisit(value, (obj) => recurse(obj));
+        }
+      }
+      return mapper(copy3);
+    };
+    return recurse(startObject);
   }
-  visitNode(curObject, nodeCallBacks) {
-    let callback;
-    const casted = curObject;
-    if (casted.type) {
-      callback = nodeCallBacks[casted.type];
-    }
-    let shouldIterate = true;
-    if (callback) {
-      shouldIterate = callback(curObject);
-    }
-    if (shouldIterate) {
-      for (const value of Object.values(curObject)) {
-        this.safeObjectVisit(value, (obj) => this.visitNode(obj, nodeCallBacks));
+  /**
+   * Visitor that visits all objects. Visits deeper objects first.
+   */
+  visitObject(startObject, visitor, preVisitor = () => ({})) {
+    let didShortCut = false;
+    const recurse = (curObject) => {
+      const context = preVisitor(curObject);
+      didShortCut = context.shortcut ?? false;
+      const continues = context.continue ?? true;
+      if (continues && !didShortCut) {
+        for (const value of Object.values(curObject)) {
+          if (didShortCut) {
+            return;
+          }
+          this.safeObjectVisit(value, (obj) => recurse(obj));
+        }
       }
-    }
+      visitor(curObject);
+    };
+    recurse(startObject);
+  }
+  transformNode(startObject, nodeCallBacks) {
+    const transformWrapper = (curObject) => {
+      const casted = curObject;
+      if (casted.type) {
+        const ogFunc = nodeCallBacks[casted.type]?.transform;
+        if (ogFunc) {
+          return ogFunc(casted);
+        }
+      }
+      return curObject;
+    };
+    const preTransformWrapper = (curObject) => {
+      const casted = curObject;
+      if (casted.type) {
+        const ogFunc = nodeCallBacks[casted.type]?.preVisitor;
+        if (ogFunc) {
+          return ogFunc(casted);
+        }
+      }
+      return {};
+    };
+    return this.transformObject(startObject, transformWrapper, preTransformWrapper);
+  }
+  visitNode(startObject, nodeCallBacks) {
+    const visitWrapper = (curObject) => {
+      const casted = curObject;
+      if (casted.type) {
+        const ogFunc = nodeCallBacks[casted.type]?.visitor;
+        if (ogFunc) {
+          ogFunc(casted);
+        }
+      }
+    };
+    const preVisitWrapper = (curObject) => {
+      const casted = curObject;
+      if (casted.type) {
+        const ogFunc = nodeCallBacks[casted.type]?.preVisitor;
+        if (ogFunc) {
+          return ogFunc(casted);
+        }
+      }
+      return {};
+    };
+    this.visitObject(startObject, visitWrapper, preVisitWrapper);
+  }
+  traverseNodes(currentNode, traverse) {
+    let didShortCut = false;
+    const recurse = (curNode) => {
+      const traverser = traverse[curNode.type];
+      if (traverser) {
+        const { next, shortcut } = traverser(curNode);
+        didShortCut = shortcut ?? false;
+        if (!didShortCut) {
+          for (const node of next ?? []) {
+            if (didShortCut) {
+              return;
+            }
+            recurse(node);
+          }
+        }
+      }
+    };
+    recurse(currentNode);
   }
 };
 var TransformerSubType = class extends TransformerType {
-  // Public visitObjects(curObject: object, visitor: (current: object) => void): void {
-  //   for (const value of Object.values(curObject)) {
-  //     this.safeObjectVisit(value, obj => this.visitObjects(obj, visitor));
-  //   }
-  // }
-  transformNodeSpecific(curObject, nodeCallBacks, nodeSpecificCallBacks = {}) {
-    let continueCheck;
-    let transformation;
-    const casted = curObject;
-    if (casted.type && casted.subType) {
-      const specific = nodeSpecificCallBacks[casted.type];
-      if (specific) {
-        continueCheck = specific[casted.subType]?.continue;
-        transformation = specific[casted.subType]?.transform;
-      }
-    }
-    let shouldContinue = true;
-    if (continueCheck) {
-      shouldContinue = continueCheck(curObject);
-    }
-    if (!shouldContinue) {
-      return curObject;
-    }
-    const copy3 = { ...curObject };
-    for (const [key, value] of Object.entries(copy3)) {
-      copy3[key] = this.safeObjectVisit(value, (obj) => this.transformNodeSpecific(obj, nodeCallBacks, nodeSpecificCallBacks));
-    }
-    if (transformation) {
-      return transformation(copy3);
-    }
-    return copy3;
+  transformNodeSpecific(startObject, nodeCallBacks, nodeSpecificCallBacks) {
+    const transformWrapper = (curObject) => {
+      let ogTransform;
+      const casted = curObject;
+      if (casted.type && casted.subType) {
+        const specific = nodeSpecificCallBacks[casted.type];
+        if (specific) {
+          ogTransform = specific[casted.subType]?.transform;
+        }
+        if (!ogTransform) {
+          ogTransform = nodeCallBacks[casted.type]?.transform;
+        }
+      }
+      return ogTransform ? ogTransform(casted) : curObject;
+    };
+    const preVisitWrapper = (curObject) => {
+      let ogPreVisit;
+      const casted = curObject;
+      if (casted.type && casted.subType) {
+        const specific = nodeSpecificCallBacks[casted.type];
+        if (specific) {
+          ogPreVisit = specific[casted.subType]?.preVisitor;
+        }
+        if (!ogPreVisit) {
+          ogPreVisit = nodeCallBacks[casted.type]?.preVisitor;
+        }
+      }
+      return ogPreVisit ? ogPreVisit(casted) : curObject;
+    };
+    return this.transformObject(startObject, transformWrapper, preVisitWrapper);
   }
   /**
    * When both nodeCallBack and NodeSpecific callBack are matched, will only look at nodeSpecifCallback
    */
-  visitNodeSpecific(curObject, nodeCallBacks, nodeSpecificCallBacks = {}) {
-    let callback;
-    const casted = curObject;
-    if (casted.type && casted.subType) {
-      const specific = nodeSpecificCallBacks[casted.type];
-      if (specific) {
-        callback = specific[casted.subType];
+  visitNodeSpecific(startObject, nodeCallBacks, nodeSpecificCallBacks) {
+    const visitWrapper = (curObject) => {
+      let ogTransform;
+      const casted = curObject;
+      if (casted.type && casted.subType) {
+        const specific = nodeSpecificCallBacks[casted.type];
+        if (specific) {
+          ogTransform = specific[casted.subType]?.visitor;
+        }
+        if (!ogTransform) {
+          ogTransform = nodeCallBacks[casted.type]?.visitor;
+        }
       }
-    }
-    if (!callback && casted.type) {
-      callback = nodeCallBacks[curObject.type];
-    }
-    let shouldIterate = true;
-    if (callback) {
-      shouldIterate = callback(curObject) ?? true;
-    }
-    if (shouldIterate) {
-      for (const value of Object.values(curObject)) {
-        this.safeObjectVisit(value, (obj) => this.visitNodeSpecific(obj, nodeCallBacks, nodeSpecificCallBacks));
+      if (ogTransform) {
+        ogTransform(casted);
       }
-    }
+    };
+    const preVisitWrapper = (curObject) => {
+      let ogPreVisit;
+      const casted = curObject;
+      if (casted.type && casted.subType) {
+        const specific = nodeSpecificCallBacks[casted.type];
+        if (specific) {
+          ogPreVisit = specific[casted.subType]?.preVisitor;
+        }
+        if (!ogPreVisit) {
+          ogPreVisit = nodeCallBacks[casted.type]?.preVisitor;
+        }
+      }
+      return ogPreVisit ? ogPreVisit(casted) : curObject;
+    };
+    this.visitObject(startObject, visitWrapper, preVisitWrapper);
+  }
+  traverseSubNodes(currentNode, traverseNode, traverseSubNode) {
+    let didShortCut = false;
+    const recurse = (curNode) => {
+      let traverser;
+      const subObj = traverseSubNode[curNode.type];
+      if (subObj) {
+        traverser = subObj[curNode.subType];
+      }
+      if (!traverser) {
+        traverser = traverseNode[curNode.type];
+      }
+      if (traverser) {
+        const { next, shortcut } = traverser(curNode);
+        didShortCut = shortcut ?? false;
+        if (!didShortCut) {
+          for (const node of next ?? []) {
+            if (didShortCut) {
+              return;
+            }
+            recurse(node);
+          }
+        }
+      }
+    };
+    recurse(currentNode);
   }
 };
 
@@ -10065,8 +10180,9 @@ __export(lexer_exports, {
   construct: () => construct,
   copy: () => copy,
   create: () => create,
-  dataClause: () => dataClause,
   deleteClause: () => deleteClause,
+  deleteDataClause: () => deleteDataClause,
+  deleteWhereClause: () => deleteWhereClause,
   describe: () => describe,
   distinct: () => distinct,
   drop: () => drop2,
@@ -10078,6 +10194,7 @@ __export(lexer_exports, {
   having: () => having,
   in_: () => in_,
   insertClause: () => insertClause,
+  insertDataClause: () => insertDataClause,
   limit: () => limit,
   load: () => load,
   loadInto: () => loadInto,
@@ -10376,6 +10493,44 @@ var graph = createToken2({ name: "Graph", pattern: /graph/i, label: "GRAPH" });
 var graphAll = createToken2({ name: "GraphAll", pattern: /all/i, label: "ALL" });
 var allGraphTokens = LexerBuilder.create().add(named, default_, graph, graphAll);
 
+// ../../packages/rules-sparql-1-1/lib/lexer/lexerPatterns.js
+var pnCharsBasePattern = /[A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]|[\uD800-\uDB7F][\uDC00-\uDFFF]/;
+var pnCharsUPattern = new RegExp(`${pnCharsBasePattern.source}|_`);
+var varNamePattern = new RegExp(`((${pnCharsUPattern.source})|[0-9])((${pnCharsUPattern.source})|[0-9]|[\xB7\u0300-\u036F\u203F-\u2040])*`);
+var iriRefPattern = /<([^\u0000-\u0020"<>\\^`{|}])*>/;
+var pnCharsPattern = new RegExp(`(${pnCharsUPattern.source})|[\\-0-9\xB7\u0300-\u036F\u203F-\u2040]`);
+var pnPrefixPattern = new RegExp(`(${pnCharsBasePattern.source})(((${pnCharsPattern.source})|\\.)*(${pnCharsPattern.source}))?`);
+var pNameNsPattern = new RegExp(`(${pnPrefixPattern.source})?:`);
+var percentPattern = /%[\dA-Fa-f]{2}/;
+var pnLocalEscPattern = /\\[!#$%&'()*+,./;=?@\\_~-]/;
+var plxPattern = new RegExp(`(${percentPattern.source})|(${pnLocalEscPattern.source})`);
+var pnLocalPattern = new RegExp(`((${pnCharsUPattern.source})|:|[0-9]|(${plxPattern.source}))(((${pnCharsPattern.source})|\\.|:|(${plxPattern.source}))*((${pnCharsPattern.source})|:|(${plxPattern.source})))?`);
+var pNameLnPattern = new RegExp(`(${pNameNsPattern.source})(${pnLocalPattern.source})`);
+var blankNodeLabelPattern = new RegExp(`_:((${pnCharsUPattern.source})|[0-9])(((${pnCharsPattern.source})|\\.)*(${pnCharsPattern.source}))?`);
+var var1Pattern = new RegExp(`\\?(${varNamePattern.source})`);
+var var2Pattern = new RegExp(`\\$(${varNamePattern.source})`);
+var langTagPattern = /@[A-Za-z]+(-[\dA-Za-z]+)*/;
+var integerPattern = /\d+/;
+var decimalPattern2 = /\d+\.\d+/;
+var exponentPattern = /[Ee][+-]?\d+/;
+var doublePattern = new RegExp(`([0-9]+\\.[0-9]*(${exponentPattern.source}))|(\\.[0-9]+(${exponentPattern.source}))|([0-9]+(${exponentPattern.source}))`);
+var interferePositivePattern = new RegExp(`\\+${integerPattern.source}`);
+var decimalPositivePattern = new RegExp(`\\+${decimalPattern2.source}`);
+var doublePositivePattern = new RegExp(`\\+${doublePattern.source}`);
+var integerNegativePattern = new RegExp(`-${integerPattern.source}`);
+var decimalNegativePattern = new RegExp(`-${decimalPattern2.source}`);
+var doubleNegativePattern = new RegExp(`-${doublePattern.source}`);
+var echarPattern = /\\[\\"'bfnrt]/u;
+var stringLiteral1Pattern = new RegExp(`'(([^\\u0027\\u005C\\u000A\r])|(${echarPattern.source}))*'`);
+var stringLiteral2Pattern = new RegExp(`"(([^\\u0022\\u005C\\u000A\\u000D])|(${echarPattern.source}))*"`);
+var stringLiteralLong1Pattern = new RegExp(`'''(('|(''))?([^'\\\\]|(${echarPattern.source})))*'''`);
+var stringLiteralLong2Pattern = new RegExp(`"""(("|(""))?([^"\\\\]|(${echarPattern.source})))*"""`);
+var wsPattern = /[\u0009\u000A\u000D ]/;
+var nilPattern = new RegExp(`\\((${wsPattern.source})*\\)`);
+var anonPattern = new RegExp(`\\[(${wsPattern.source})*\\]`);
+var commentPattern = /#[^\n]*\n/;
+var atLeastOneBlankPattern = new RegExp(`((${wsPattern.source}+)|(${commentPattern.source}))+`);
+
 // ../../packages/rules-sparql-1-1/lib/lexer/symbols.js
 var symbols_exports = {};
 __export(symbols_exports, {
@@ -10464,40 +10619,6 @@ __export(terminals_exports, {
   var2: () => var2,
   ws: () => ws
 });
-var pnCharsBasePattern = /[A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]|[\uD800-\uDB7F][\uDC00-\uDFFF]/;
-var pnCharsUPattern = new RegExp(`${pnCharsBasePattern.source}|_`);
-var varNamePattern = new RegExp(`((${pnCharsUPattern.source})|[0-9])((${pnCharsUPattern.source})|[0-9]|[\xB7\u0300-\u036F\u203F-\u2040])*`);
-var iriRefPattern = /<([^\u0000-\u0020"<>\\^`{|}])*>/;
-var pnCharsPattern = new RegExp(`(${pnCharsUPattern.source})|[\\-0-9\xB7\u0300-\u036F\u203F-\u2040]`);
-var pnPrefixPattern = new RegExp(`(${pnCharsBasePattern.source})(((${pnCharsPattern.source})|\\.)*(${pnCharsPattern.source}))?`);
-var pNameNsPattern = new RegExp(`(${pnPrefixPattern.source})?:`);
-var percentPattern = /%[\dA-Fa-f]{2}/;
-var pnLocalEscPattern = /\\[!#$%&'()*+,./;=?@\\_~-]/;
-var plxPattern = new RegExp(`(${percentPattern.source})|(${pnLocalEscPattern.source})`);
-var pnLocalPattern = new RegExp(`((${pnCharsUPattern.source})|:|[0-9]|(${plxPattern.source}))(((${pnCharsPattern.source})|\\.|:|(${plxPattern.source}))*((${pnCharsPattern.source})|:|(${plxPattern.source})))?`);
-var pNameLnPattern = new RegExp(`(${pNameNsPattern.source})(${pnLocalPattern.source})`);
-var blankNodeLabelPattern = new RegExp(`_:((${pnCharsUPattern.source})|[0-9])(((${pnCharsPattern.source})|\\.)*(${pnCharsPattern.source}))?`);
-var var1Pattern = new RegExp(`\\?(${varNamePattern.source})`);
-var var2Pattern = new RegExp(`\\$(${varNamePattern.source})`);
-var langTagPattern = /@[A-Za-z]+(-[\dA-Za-z]+)*/;
-var integerPattern = /\d+/;
-var decimalPattern2 = /\d+\.\d+/;
-var exponentPattern = /[Ee][+-]?\d+/;
-var doublePattern = new RegExp(`([0-9]+\\.[0-9]*(${exponentPattern.source}))|(\\.[0-9]+(${exponentPattern.source}))|([0-9]+(${exponentPattern.source}))`);
-var interferePositivePattern = new RegExp(`\\+${integerPattern.source}`);
-var decimalPositivePattern = new RegExp(`\\+${decimalPattern2.source}`);
-var doublePositivePattern = new RegExp(`\\+${doublePattern.source}`);
-var integerNegativePattern = new RegExp(`-${integerPattern.source}`);
-var decimalNegativePattern = new RegExp(`-${decimalPattern2.source}`);
-var doubleNegativePattern = new RegExp(`-${doublePattern.source}`);
-var echarPattern = /\\[\\"'bfnrt]/u;
-var stringLiteral1Pattern = new RegExp(`'(([^\\u0027\\u005C\\u000A\r])|(${echarPattern.source}))*'`);
-var stringLiteral2Pattern = new RegExp(`"(([^\\u0022\\u005C\\u000A\\u000D])|(${echarPattern.source}))*"`);
-var stringLiteralLong1Pattern = new RegExp(`'''(('|(''))?([^'\\\\]|(${echarPattern.source})))*'''`);
-var stringLiteralLong2Pattern = new RegExp(`"""(("|(""))?([^"\\\\]|(${echarPattern.source})))*"""`);
-var wsPattern = /[\u0009\u000A\u000D ]/;
-var nilPattern = new RegExp(`\\((${wsPattern.source})*\\)`);
-var anonPattern = new RegExp(`\\[(${wsPattern.source})*\\]`);
 var iriRef = createToken2({ name: "IriRef", pattern: iriRefPattern });
 var pNameLn = createToken2({ name: "PNameLn", pattern: pNameLnPattern });
 var pNameNs = createToken2({ name: "PNameNs", pattern: pNameNsPattern, longer_alt: [pNameLn] });
@@ -10519,7 +10640,7 @@ var stringLiteral2 = createToken2({ name: "StringLiteral2", pattern: stringLiter
 var stringLiteralLong1 = createToken2({ name: "StringLiteralLong1", pattern: stringLiteralLong1Pattern });
 var stringLiteralLong2 = createToken2({ name: "StringLiteralLong2", pattern: stringLiteralLong2Pattern });
 var ws = createToken2({ name: "Ws", pattern: wsPattern, group: Lexer.SKIPPED });
-var comment = createToken2({ name: "Comment", pattern: /#[^\n]*/, group: Lexer.SKIPPED });
+var comment = createToken2({ name: "Comment", pattern: commentPattern, group: Lexer.SKIPPED });
 var nil = createToken2({ name: "Nil", pattern: nilPattern });
 var anon = createToken2({ name: "Anon", pattern: anonPattern });
 var allTerminals = LexerBuilder.create().add(iriRef, pNameNs, pNameLn, blankNodeLabel, var1, var2, langTag, double, decimal, integer, integerPositive, decimalPositive, doublePositive, integerNegative, decimalNegative, doubleNegative, stringLiteralLong1, stringLiteralLong2, stringLiteral1, stringLiteral2, ws, comment, nil, anon);
@@ -10556,9 +10677,23 @@ var to = createToken2({ name: "To", pattern: /to/i, label: "TO" });
 var move = createToken2({ name: "Move", pattern: /move/i, label: "MOVE" });
 var copy = createToken2({ name: "Copy", pattern: /copy/i, label: "COPY" });
 var modifyWith = createToken2({ name: "ModifyWith", pattern: /with/i, label: "WITH" });
+var deleteDataClause = createToken2({
+  name: "DeleteDataClause",
+  pattern: new RegExp(`delete(${atLeastOneBlankPattern.source})data`, "i"),
+  label: "DELETE DATA"
+});
+var deleteWhereClause = createToken2({
+  name: "DeleteWhereClause",
+  pattern: new RegExp(`delete(${atLeastOneBlankPattern.source})where`, "i"),
+  label: "DELETE WHERE"
+});
 var deleteClause = createToken2({ name: "DeleteClause", pattern: /delete/i, label: "DELETE" });
-var insertClause = createToken2({ name: "InsertClause", pattern: /insert/i, label: "INSERT" });
-var dataClause = createToken2({ name: "DataClause", pattern: /data/i, label: "DATA", longer_alt: datatype });
+var insertDataClause = createToken2({
+  name: "InsertDataClause",
+  pattern: new RegExp(`insert(${atLeastOneBlankPattern.source})data`, "i"),
+  label: "INSERT DATA"
+});
+var insertClause = createToken2({ name: "InsertClause", pattern: /insert/i, label: "insert" });
 var usingClause = createToken2({ name: "UsingClause", pattern: /using/i, label: "USING" });
 var optional = createToken2({ name: "Optional", pattern: /optional/i, label: "OPTIONAL" });
 var service = createToken2({ name: "Service", pattern: /service/i, label: "SERVICE" });
@@ -10573,8 +10708,8 @@ var false_ = createToken2({ name: "False", pattern: /false/i, label: "false" });
 var in_ = createToken2({ name: "In", pattern: /in/i, label: "IN" });
 var notIn = createToken2({ name: "NotIn", pattern: /not[\u0020\u0009\u000D\u000A]+in/i, label: "NOT IN" });
 var separator = createToken2({ name: "Separator", pattern: /separator/i, label: "SEPARATOR" });
-var allBaseTokens = LexerBuilder.create().add(baseDecl, prefixDecl, select, distinct, reduced, construct, describe, ask, from, where, having, groupByGroup, by, order, orderAsc, orderDesc, limit, offset, values2, load, silent, loadInto, clear, drop2, create, add, to, move, copy, modifyWith, deleteClause, insertClause, dataClause, usingClause, optional, service, bind, undef, minus, union, filter2, as, a, true_, false_, in_, notIn, separator);
-var sparql11LexerBuilder = LexerBuilder.create(allTerminals).merge(allBaseTokens).merge(allBuiltInCalls).merge(allGraphTokens).merge(allSymbols).moveBefore(datatype, dataClause).moveAfter(avg, a).moveBefore(a, graphAll).moveAfter(groupConcat, groupByGroup);
+var allBaseTokens = LexerBuilder.create().add(baseDecl, prefixDecl, select, distinct, reduced, construct, describe, ask, from, where, having, groupByGroup, by, order, orderAsc, orderDesc, limit, offset, values2, load, silent, loadInto, clear, drop2, create, add, to, move, copy, modifyWith, deleteWhereClause, deleteDataClause, deleteClause, insertDataClause, insertClause, usingClause, optional, service, bind, undef, minus, union, filter2, as, a, true_, false_, in_, notIn, separator);
+var sparql11LexerBuilder = LexerBuilder.create(allTerminals).merge(allBaseTokens).merge(allBuiltInCalls).merge(allGraphTokens).merge(allSymbols).moveAfter(avg, a).moveBefore(a, graphAll).moveAfter(groupConcat, groupByGroup);
 
 // ../../packages/rules-sparql-1-1/lib/factoryMixins/ContextFactory.js
 var nodeType = "contextDef";
@@ -11319,12 +11454,12 @@ var CommonIRIs;
   CommonIRIs2["NIL"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil";
   CommonIRIs2["TYPE"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
 })(CommonIRIs || (CommonIRIs = {}));
-var TransformerSparql11 = class extends TransformerSubType {
+var AstTransformer = class extends TransformerSubType {
 };
 
 // ../../packages/rules-sparql-1-1/lib/validation/validators.js
 var F = new AstFactory();
-var transformer = new TransformerSparql11();
+var transformer = new AstTransformer();
 function getAggregatesOfExpression(expression2) {
   if (F.isExpressionAggregate(expression2)) {
     return [expression2];
@@ -11403,77 +11538,69 @@ function queryIsGood(query2) {
     }
   }
 }
+function notUndefined(some2) {
+  return some2 !== void 0;
+}
 function findPatternBoundedVars(iter, boundedVars) {
-  if (F.isQuery(iter) || F.isUpdate(iter)) {
-    if (F.isQuerySelect(iter) || F.isQueryDescribe(iter)) {
-      if (iter.where && iter.variables.some((x) => F.isWildcard(x))) {
-        findPatternBoundedVars(iter.where, boundedVars);
-      } else {
-        for (const v of iter.variables) {
-          findPatternBoundedVars(v, boundedVars);
-        }
-      }
-      if (iter.solutionModifiers.group) {
-        const grouping = iter.solutionModifiers.group;
-        for (const g of grouping.groupings) {
-          if ("variable" in g) {
-            findPatternBoundedVars(g.variable, boundedVars);
-          }
-        }
-      }
-      if (iter.values?.values && iter.values.values.length > 0) {
-        const values3 = iter.values.values;
-        for (const v of Object.keys(values3[0])) {
+  transformer.traverseSubNodes(iter, {
+    query: (op) => ({ next: [
+      op.solutionModifiers.group
+    ].filter(notUndefined) }),
+    triple: (op) => ({ next: [op.subject, op.predicate, op.object] }),
+    path: (op) => ({ next: op.items }),
+    tripleCollection: (op) => ({ next: [op.identifier, ...op.triples] })
+  }, {
+    query: {
+      select: (op) => ({ next: [
+        ...op.variables.some((x) => F.isWildcard(x)) ? [op.where] : op.variables,
+        op.solutionModifiers.group,
+        op.values
+      ].filter(notUndefined) }),
+      describe: (op) => ({ next: [
+        ...op.variables.some((x) => F.isWildcard(x)) ? [op.where] : op.variables,
+        op.solutionModifiers.group,
+        op.values
+      ].filter(notUndefined) })
+    },
+    solutionModifier: {
+      group: (op) => ({
+        next: op.groupings.filter((g) => "variable" in g).map((x) => x.variable)
+      }),
+      having: (op) => ({ next: op.having }),
+      order: (op) => ({ next: op.orderDefs.map((x) => x.expression) })
+    },
+    pattern: {
+      values: (op) => {
+        for (const v of Object.keys(op.values.at(0) ?? {})) {
           boundedVars.add(v);
         }
+        return {};
+      },
+      bgp: (op) => ({ next: op.triples }),
+      group: (op) => ({ next: op.patterns }),
+      union: (op) => ({ next: op.patterns }),
+      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) })
+    },
+    term: {
+      variable: (op) => {
+        boundedVars.add(op.value);
+        return {};
       }
     }
-  } else if (F.isTerm(iter)) {
-    if (F.isTermVariable(iter)) {
-      boundedVars.add(iter.value);
-    }
-  } else if (F.isTriple(iter)) {
-    findPatternBoundedVars(iter.subject, boundedVars);
-    findPatternBoundedVars(iter.predicate, boundedVars);
-    findPatternBoundedVars(iter.object, boundedVars);
-  } else if (F.isPath(iter)) {
-    if (!F.isTerm(iter)) {
-      for (const item of iter.items) {
-        findPatternBoundedVars(item, boundedVars);
-      }
-    }
-  } else if (F.isTripleCollection(iter) || F.isPatternBgp(iter)) {
-    for (const triple of iter.triples) {
-      findPatternBoundedVars(triple, boundedVars);
-    }
-  } else if (F.isPatternGroup(iter) || F.isPatternUnion(iter) || F.isPatternOptional(iter) || F.isPatternService(iter)) {
-    for (const pattern of iter.patterns) {
-      findPatternBoundedVars(pattern, boundedVars);
-    }
-    if (F.isPatternService(iter)) {
-      findPatternBoundedVars(iter.name, boundedVars);
-    }
-  } else if (F.isPatternBind(iter)) {
-    findPatternBoundedVars(iter.variable, boundedVars);
-  } else if (F.isPatternValues(iter)) {
-    for (const variable of Object.keys(iter.values.at(0) ?? {})) {
-      boundedVars.add(variable);
-    }
-  } else if (F.isPatternGraph(iter)) {
-    findPatternBoundedVars(iter.name, boundedVars);
-    for (const pattern of iter.patterns) {
-      findPatternBoundedVars(pattern, boundedVars);
-    }
-  }
+  });
 }
 function checkNote13(patterns) {
   for (const [index, pattern] of patterns.entries()) {
     if (F.isPatternBind(pattern) && index > 0 && F.isPatternBgp(patterns[index - 1])) {
       const bgp = patterns[index - 1];
       const variables = [];
-      transformer.visitNodeSpecific(bgp, {}, { term: { variable: (var_2) => {
+      transformer.visitNodeSpecific(bgp, {}, { term: { variable: { visitor: (var_2) => {
         variables.push(var_2);
-      } } });
+      } } } });
       if (variables.some((var_2) => var_2.value === pattern.variable.value)) {
         throw new Error(`Variable used to bind is already bound (?${pattern.variable.value})`);
       }
@@ -11499,12 +11626,12 @@ function updateNoReuseBlankNodeLabels(updateQuery) {
     const operation = update2.operation;
     if (operation.subType === "insertdata") {
       const blankNodesHere = /* @__PURE__ */ new Set();
-      transformer.visitNodeSpecific(operation, {}, { term: { blankNode: (blankNode2) => {
+      transformer.visitNodeSpecific(operation, {}, { term: { blankNode: { visitor: (blankNode2) => {
         blankNodesHere.add(blankNode2.label);
         if (blankLabelsUsedInInsertData.has(blankNode2.label)) {
           throw new Error("Detected reuse blank node across different INSERT DATA clauses");
         }
-      } } });
+      } } } });
       for (const blankNode2 of blankNodesHere) {
         blankLabelsUsedInInsertData.add(blankNode2);
       }
@@ -14191,12 +14318,11 @@ var quadData = {
     return ACTION(() => C.astFactory.wrap(val.val, C.astFactory.sourceLocation(open, close)));
   }
 };
-function insertDeleteDelWhere(name, subType, cons1, cons2, dataRule) {
+function insertDeleteDelWhere(name, subType, cons1, dataRule) {
   return {
     name,
     impl: ({ ACTION, SUBRULE1, CONSUME }) => (C) => {
       const insDelToken = CONSUME(cons1);
-      CONSUME(cons2);
       let couldCreateBlankNodes = true;
       if (name !== "insertData") {
         couldCreateBlankNodes = ACTION(() => C.parseMode.delete("canCreateBlankNodes"));
@@ -14228,9 +14354,9 @@ function insertDeleteDelWhere(name, subType, cons1, cons2, dataRule) {
     }
   };
 }
-var insertData = insertDeleteDelWhere("insertData", "insertdata", insertClause, dataClause, quadData);
-var deleteData = insertDeleteDelWhere("deleteData", "deletedata", deleteClause, dataClause, quadData);
-var deleteWhere = insertDeleteDelWhere("deleteWhere", "deletewhere", deleteClause, where, quadPattern);
+var insertData = insertDeleteDelWhere("insertData", "insertdata", insertDataClause, quadData);
+var deleteData = insertDeleteDelWhere("deleteData", "deletedata", deleteDataClause, quadData);
+var deleteWhere = insertDeleteDelWhere("deleteWhere", "deletewhere", deleteWhereClause, quadPattern);
 var modify = {
   name: "modify",
   impl: ({ ACTION, CONSUME, SUBRULE1, SUBRULE2, OPTION1, OPTION2, OR }) => (C) => {

package/lib/index.d.ts

@@ -1,79 +1,79 @@
 import { GeneratorBuilder } from '@traqula/core';
 import type { Patch } from '@traqula/core';
 import type * as T12 from '@traqula/rules-sparql-1-2';
-declare const sparql12GeneratorBuilder: GeneratorBuilder<T12.SparqlGeneratorContext, "filter" | "graphRef" | "load" | "clear" | "drop" | "create" | "add" | "move" | "copy" | "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: never;
-    graphRef: never;
-    load: never;
-    clear: never;
-    drop: never;
-    create: never;
-    add: never;
-    move: never;
-    copy: never;
-    modify: never;
-    update: never;
-    query: never;
-    datasetClauses: never;
-    bind: never;
-    solutionModifier: never;
-    expression: never;
-    aggregate: never;
+export declare const sparql12GeneratorBuilder: GeneratorBuilder<T12.SparqlGeneratorContext, "path" | "queryOrUpdate" | "triplesBlock" | "blankNode" | "collectionPath" | "triplesNodePath" | "blankNodePropertyListPath" | "graphNodePath" | "expression" | "iriOrFunction" | "rdfLiteral" | "var" | "aggregate" | "iri" | "prefixedName" | "argList" | "varOrTerm" | "iriFull" | "graphTerm" | "selectClause" | "whereClause" | "solutionModifier" | "query" | "groupGraphPattern" | "graphPatternNotTriples" | "filter" | "bind" | "groupOrUnionGraphPattern" | "optionalGraphPattern" | "minusGraphPattern" | "graphGraphPattern" | "serviceGraphPattern" | "inlineData" | "groupClause" | "havingClause" | "orderClause" | "limitOffsetClauses" | "prologue" | "selectQuery" | "constructQuery" | "describeQuery" | "askQuery" | "baseDecl" | "prefixDecl" | "datasetClauses" | "update1" | "load" | "clear" | "drop" | "add" | "move" | "copy" | "create" | "insertData" | "deleteData" | "deleteWhere" | "modify" | "update" | "graphRef" | "graphRefAll" | "quads" | "quadsNotTriples" | "usingClauses" | "generatePattern" | "reifiedTriple" | "tripleTerm" | "annotationBlockPath" | "annotationPath" | "versionDecl", {
     path: never;
+    queryOrUpdate: never;
+    triplesBlock: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "triplesBlock", T12.PatternBgp, []>;
     blankNode: never;
-    selectQuery: never;
+    collectionPath: never;
+    triplesNodePath: never;
+    blankNodePropertyListPath: never;
+    graphNodePath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphNodePath", T12.GraphNode, []>;
+    expression: never;
+    iriOrFunction: never;
+    rdfLiteral: never;
+    var: never;
+    aggregate: never;
+    iri: never;
+    prefixedName: never;
+    argList: never;
+    varOrTerm: never;
+    iriFull: never;
+    graphTerm: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphTerm", T12.GraphTerm, []>;
     selectClause: never;
+    whereClause: never;
+    solutionModifier: never;
+    query: never;
+    groupGraphPattern: never;
+    graphPatternNotTriples: never;
+    filter: never;
+    bind: never;
+    groupOrUnionGraphPattern: never;
+    optionalGraphPattern: never;
+    minusGraphPattern: never;
+    graphGraphPattern: never;
+    serviceGraphPattern: never;
+    inlineData: never;
+    groupClause: never;
+    havingClause: never;
+    orderClause: never;
+    limitOffsetClauses: never;
+    prologue: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "prologue", T12.ContextDefinition[], []>;
+    selectQuery: never;
     constructQuery: never;
     describeQuery: never;
     askQuery: never;
+    baseDecl: never;
+    prefixDecl: never;
+    datasetClauses: never;
     update1: never;
+    load: never;
+    clear: never;
+    drop: never;
+    add: never;
+    move: never;
+    copy: never;
+    create: never;
     insertData: never;
     deleteData: never;
     deleteWhere: never;
+    modify: never;
+    update: never;
+    graphRef: never;
     graphRefAll: never;
     quads: never;
     quadsNotTriples: never;
     usingClauses: never;
-    argList: never;
-    iriOrFunction: never;
-    prologue: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "prologue", T12.ContextDefinition[], []>;
-    baseDecl: never;
-    prefixDecl: never;
-    varOrTerm: never;
-    var: never;
-    graphTerm: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphTerm", T12.GraphTerm, []>;
-    rdfLiteral: never;
-    iri: never;
-    iriFull: never;
-    prefixedName: never;
-    groupClause: never;
-    havingClause: never;
-    orderClause: never;
-    limitOffsetClauses: never;
-    triplesBlock: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "triplesBlock", T12.PatternBgp, []>;
-    collectionPath: never;
-    triplesNodePath: never;
-    blankNodePropertyListPath: never;
-    graphNodePath: import("@traqula/core").GeneratorRule<T12.SparqlGeneratorContext, "graphNodePath", T12.GraphNode, []>;
-    whereClause: never;
-    groupGraphPattern: never;
     generatePattern: never;
-    graphPatternNotTriples: never;
-    optionalGraphPattern: never;
-    graphGraphPattern: never;
-    serviceGraphPattern: never;
-    inlineData: never;
-    minusGraphPattern: never;
-    groupOrUnionGraphPattern: never;
-    queryOrUpdate: never;
     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 {
@@ -86,4 +86,3 @@ export declare class Generator {
         origSource: string;
     }>): string;
 }
-export {};

package/lib/index.js

@@ -1,7 +1,7 @@
 import { GeneratorBuilder } from '@traqula/core';
 import { sparql11GeneratorBuilder } from '@traqula/generator-sparql-1-1';
 import { completeParseContext, AstFactory, gram as g12 } from '@traqula/rules-sparql-1-2';
-const sparql12GeneratorBuilder = GeneratorBuilder.create(sparql11GeneratorBuilder)
+export const sparql12GeneratorBuilder = GeneratorBuilder.create(sparql11GeneratorBuilder)
     .widenContext()
     .typePatch()
     .addRule(g12.tripleTerm)

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAIzE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,IAAI,IAAI,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAG1F,MAAM,wBAAwB,GAC5B,gBAAgB,CAAC,MAAM,CAAC,wBAAwB,CAAC;KAC9C,YAAY,EAA8B;KAC1C,SAAS,EA6EN;KACH,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;KACvB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;KAC1B,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC;KAC5B,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;KAChC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;KAC3B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;KACxB,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;KACvB,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC;KACnC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAItC,MAAM,OAAO,SAAS;IACH,SAAS,GAAoB,wBAAwB,CAAC,KAAK,EAAE,CAAC;IAC9D,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;IAE/B,QAAQ,CACb,GAA2B,EAC/B,UAA+D,EAAE;QAE7D,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEM,YAAY,CAAC,GAAa,EAAE,UAA+D,EAAE;QAClG,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;CACF","sourcesContent":["import { GeneratorBuilder } from '@traqula/core';\nimport type { Wrap, Patch } from '@traqula/core';\nimport { sparql11GeneratorBuilder } from '@traqula/generator-sparql-1-1';\nimport type {\n  gram as g11,\n} from '@traqula/rules-sparql-1-1';\nimport { completeParseContext, AstFactory, gram as g12 } from '@traqula/rules-sparql-1-2';\nimport type * as T12 from '@traqula/rules-sparql-1-2';\n\nconst sparql12GeneratorBuilder =\n  GeneratorBuilder.create(sparql11GeneratorBuilder)\n    .widenContext<T12.SparqlGeneratorContext>()\n    .typePatch<{\n      [g11.queryOrUpdate.name]: [T12.SparqlQuery];\n      [g11.query.name]: [T12.Query];\n      [g11.selectQuery.name]: [Omit<T12.QuerySelect, g11.HandledByBase>];\n      [g11.constructQuery.name]: [ Omit<T12.QueryConstruct, g11.HandledByBase>];\n      [g11.describeQuery.name]: [Omit<T12.QueryDescribe, g11.HandledByBase>];\n      [g11.askQuery.name]: [Omit<T12.QueryAsk, g11.HandledByBase>];\n      [g11.selectClause.name]: [ Wrap<Pick<T12.QuerySelect, 'variables' | 'distinct' | 'reduced'>> ];\n\n      [g11.update.name]: [T12.Update];\n      [g11.update1.name]: [T12.UpdateOperation];\n      [g11.load.name]: [T12.UpdateOperationLoad];\n      [g11.clear.name]: [T12.UpdateOperationClear];\n      [g11.drop.name]: [T12.UpdateOperationDrop];\n      [g11.create.name]: [T12.UpdateOperationCreate];\n      [g11.copy.name]: [T12.UpdateOperationCopy];\n      [g11.move.name]: [T12.UpdateOperationMove];\n      [g11.add.name]: [T12.UpdateOperationAdd];\n      [g11.insertData.name]: [T12.UpdateOperationInsertData];\n      [g11.deleteData.name]: [T12.UpdateOperationDeleteData];\n      [g11.deleteWhere.name]: [T12.UpdateOperationDeleteWhere];\n      [g11.modify.name]: [T12.UpdateOperationModify];\n      [g11.graphRef.name]: [T12.TermIri];\n      [g11.graphRefAll.name]: [T12.GraphRef];\n      [g11.quads.name]: [Wrap<T12.Quads[]>];\n      [g11.quadsNotTriples.name]: [T12.GraphQuads];\n\n      [g11.aggregate.name]: [ T12.ExpressionAggregate ];\n\n      [g11.datasetClauseStar.name]: [ T12.DatasetClauses ];\n      [g11.usingClauseStar.name]: [ T12.DatasetClauses ];\n\n      // [g11.datasetClause.name]: unchanged;\n      [g11.argList.name]: [ Patch<g11.IArgList, { args: T12.Expression[] }> ];\n      [g11.expression.name]: [ T12.Expression ];\n      [g11.iriOrFunction.name]: [T12.TermIri | T12.ExpressionFunctionCall];\n\n      [g11.prologue.name]: [ T12.ContextDefinition[] ];\n      [g11.prefixDecl.name]: [ T12.ContextDefinitionPrefix ];\n      [g11.baseDecl.name]: [ T12.ContextDefinitionBase ];\n      // [g11.var_.name]: unchanged;\n      [g11.varOrTerm.name]: [ T12.Term ];\n      [g11.graphTerm.name]: [ T12.GraphTerm ];\n\n      [g11.rdfLiteral.name]: [T12.TermLiteral];\n      // [g11.string.name]: unchanged;\n      // [g11.iri.name]: unchanged;\n      // [g11.iriFull.name]: unchanged;\n      // [g11.prefixedName.name]: unchanged;\n      // [g11.blankNode.name]: unchanged;\n\n      // [g11.path.name]: unchanged;\n      //\n      [g11.solutionModifier.name]: [ T12.SolutionModifiers ];\n      [g11.groupClause.name]: [ T12.SolutionModifierGroup ];\n      [g11.havingClause.name]: [ T12.SolutionModifierHaving ];\n      [g11.orderClause.name]: [ T12.SolutionModifierOrder ];\n      [g11.limitOffsetClauses.name]: [ T12.SolutionModifierLimitOffset ];\n\n      [g11.triplesBlock.name]: [ T12.PatternBgp ];\n      [g11.collectionPath.name]: [ T12.TripleCollectionList ];\n      [g11.blankNodePropertyListPath.name]: [ T12.TripleCollectionBlankNodeProperties ];\n      [g11.triplesNodePath.name]: [ T12.TripleCollection ];\n      [g11.graphNodePath.name]: [ T12.Term | T12.TripleCollection ];\n\n      [g11.whereClause.name]: [ Wrap<T12.PatternGroup> ];\n      [g11.generatePattern.name]: [ T12.Pattern ];\n      [g11.groupGraphPattern.name]: [ T12.PatternGroup ];\n      [g11.graphPatternNotTriples.name]: [ Exclude<T12.Pattern, T12.SubSelect | T12.PatternBgp> ];\n      [g11.optionalGraphPattern.name]: [ T12.PatternOptional ];\n      [g11.graphGraphPattern.name]: [ T12.PatternGroup ];\n      [g11.serviceGraphPattern.name]: [ T12.PatternService ];\n      [g11.bind.name]: [ T12.PatternBind ];\n      [g11.inlineData.name]: [ T12.PatternValues ];\n      [g11.minusGraphPattern.name]: [ T12.PatternMinus ];\n      [g11.groupOrUnionGraphPattern.name]: [ T12.PatternGroup | T12.PatternUnion ];\n      [g11.filter.name]: [ T12.PatternFilter ];\n    }>()\n    .addRule(g12.tripleTerm)\n    .addRule(g12.reifiedTriple)\n    .patchRule(g12.graphNodePath)\n    .addRule(g12.annotationBlockPath)\n    .addRule(g12.annotationPath)\n    .addRule(g12.versionDecl)\n    .patchRule(g12.prologue)\n    .patchRule(g12.generateTriplesBlock)\n    .patchRule(g12.generateGraphTerm);\n\nexport type SparqlGenerator = ReturnType<typeof sparql12GeneratorBuilder.build>;\n\nexport class Generator {\n  private readonly generator: SparqlGenerator = sparql12GeneratorBuilder.build();\n  private readonly F = new AstFactory();\n\n  public generate(\n    ast: T12.Query | T12.Update,\ncontext: Partial<T12.SparqlContext & { origSource: string }> = {},\n  ): string {\n    return this.generator.queryOrUpdate(ast, completeParseContext(context));\n  }\n\n  public generatePath(ast: T12.Path, context: Partial<T12.SparqlContext & { origSource: string }> = {}): string {\n    return this.generator.path(ast, completeParseContext(context), undefined);\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAIzE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,IAAI,IAAI,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAG1F,MAAM,CAAC,MAAM,wBAAwB,GACnC,gBAAgB,CAAC,MAAM,CAAC,wBAAwB,CAAC;KAC9C,YAAY,EAA8B;KAC1C,SAAS,EA6EN;KACH,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;KACvB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;KAC1B,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC;KAC5B,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;KAChC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;KAC3B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;KACxB,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;KACvB,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC;KACnC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAItC,MAAM,OAAO,SAAS;IACH,SAAS,GAAoB,wBAAwB,CAAC,KAAK,EAAE,CAAC;IAC9D,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;IAE/B,QAAQ,CACb,GAA2B,EAC/B,UAA+D,EAAE;QAE7D,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEM,YAAY,CAAC,GAAa,EAAE,UAA+D,EAAE;QAClG,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;CACF","sourcesContent":["import { GeneratorBuilder } from '@traqula/core';\nimport type { Wrap, Patch } from '@traqula/core';\nimport { sparql11GeneratorBuilder } from '@traqula/generator-sparql-1-1';\nimport type {\n  gram as g11,\n} from '@traqula/rules-sparql-1-1';\nimport { completeParseContext, AstFactory, gram as g12 } from '@traqula/rules-sparql-1-2';\nimport type * as T12 from '@traqula/rules-sparql-1-2';\n\nexport const sparql12GeneratorBuilder =\n  GeneratorBuilder.create(sparql11GeneratorBuilder)\n    .widenContext<T12.SparqlGeneratorContext>()\n    .typePatch<{\n      [g11.queryOrUpdate.name]: [T12.SparqlQuery];\n      [g11.query.name]: [T12.Query];\n      [g11.selectQuery.name]: [Omit<T12.QuerySelect, g11.HandledByBase>];\n      [g11.constructQuery.name]: [ Omit<T12.QueryConstruct, g11.HandledByBase>];\n      [g11.describeQuery.name]: [Omit<T12.QueryDescribe, g11.HandledByBase>];\n      [g11.askQuery.name]: [Omit<T12.QueryAsk, g11.HandledByBase>];\n      [g11.selectClause.name]: [ Wrap<Pick<T12.QuerySelect, 'variables' | 'distinct' | 'reduced'>> ];\n\n      [g11.update.name]: [T12.Update];\n      [g11.update1.name]: [T12.UpdateOperation];\n      [g11.load.name]: [T12.UpdateOperationLoad];\n      [g11.clear.name]: [T12.UpdateOperationClear];\n      [g11.drop.name]: [T12.UpdateOperationDrop];\n      [g11.create.name]: [T12.UpdateOperationCreate];\n      [g11.copy.name]: [T12.UpdateOperationCopy];\n      [g11.move.name]: [T12.UpdateOperationMove];\n      [g11.add.name]: [T12.UpdateOperationAdd];\n      [g11.insertData.name]: [T12.UpdateOperationInsertData];\n      [g11.deleteData.name]: [T12.UpdateOperationDeleteData];\n      [g11.deleteWhere.name]: [T12.UpdateOperationDeleteWhere];\n      [g11.modify.name]: [T12.UpdateOperationModify];\n      [g11.graphRef.name]: [T12.TermIri];\n      [g11.graphRefAll.name]: [T12.GraphRef];\n      [g11.quads.name]: [Wrap<T12.Quads[]>];\n      [g11.quadsNotTriples.name]: [T12.GraphQuads];\n\n      [g11.aggregate.name]: [ T12.ExpressionAggregate ];\n\n      [g11.datasetClauseStar.name]: [ T12.DatasetClauses ];\n      [g11.usingClauseStar.name]: [ T12.DatasetClauses ];\n\n      // [g11.datasetClause.name]: unchanged;\n      [g11.argList.name]: [ Patch<g11.IArgList, { args: T12.Expression[] }> ];\n      [g11.expression.name]: [ T12.Expression ];\n      [g11.iriOrFunction.name]: [T12.TermIri | T12.ExpressionFunctionCall];\n\n      [g11.prologue.name]: [ T12.ContextDefinition[] ];\n      [g11.prefixDecl.name]: [ T12.ContextDefinitionPrefix ];\n      [g11.baseDecl.name]: [ T12.ContextDefinitionBase ];\n      // [g11.var_.name]: unchanged;\n      [g11.varOrTerm.name]: [ T12.Term ];\n      [g11.graphTerm.name]: [ T12.GraphTerm ];\n\n      [g11.rdfLiteral.name]: [T12.TermLiteral];\n      // [g11.string.name]: unchanged;\n      // [g11.iri.name]: unchanged;\n      // [g11.iriFull.name]: unchanged;\n      // [g11.prefixedName.name]: unchanged;\n      // [g11.blankNode.name]: unchanged;\n\n      // [g11.path.name]: unchanged;\n      //\n      [g11.solutionModifier.name]: [ T12.SolutionModifiers ];\n      [g11.groupClause.name]: [ T12.SolutionModifierGroup ];\n      [g11.havingClause.name]: [ T12.SolutionModifierHaving ];\n      [g11.orderClause.name]: [ T12.SolutionModifierOrder ];\n      [g11.limitOffsetClauses.name]: [ T12.SolutionModifierLimitOffset ];\n\n      [g11.triplesBlock.name]: [ T12.PatternBgp ];\n      [g11.collectionPath.name]: [ T12.TripleCollectionList ];\n      [g11.blankNodePropertyListPath.name]: [ T12.TripleCollectionBlankNodeProperties ];\n      [g11.triplesNodePath.name]: [ T12.TripleCollection ];\n      [g11.graphNodePath.name]: [ T12.Term | T12.TripleCollection ];\n\n      [g11.whereClause.name]: [ Wrap<T12.PatternGroup> ];\n      [g11.generatePattern.name]: [ T12.Pattern ];\n      [g11.groupGraphPattern.name]: [ T12.PatternGroup ];\n      [g11.graphPatternNotTriples.name]: [ Exclude<T12.Pattern, T12.SubSelect | T12.PatternBgp> ];\n      [g11.optionalGraphPattern.name]: [ T12.PatternOptional ];\n      [g11.graphGraphPattern.name]: [ T12.PatternGroup ];\n      [g11.serviceGraphPattern.name]: [ T12.PatternService ];\n      [g11.bind.name]: [ T12.PatternBind ];\n      [g11.inlineData.name]: [ T12.PatternValues ];\n      [g11.minusGraphPattern.name]: [ T12.PatternMinus ];\n      [g11.groupOrUnionGraphPattern.name]: [ T12.PatternGroup | T12.PatternUnion ];\n      [g11.filter.name]: [ T12.PatternFilter ];\n    }>()\n    .addRule(g12.tripleTerm)\n    .addRule(g12.reifiedTriple)\n    .patchRule(g12.graphNodePath)\n    .addRule(g12.annotationBlockPath)\n    .addRule(g12.annotationPath)\n    .addRule(g12.versionDecl)\n    .patchRule(g12.prologue)\n    .patchRule(g12.generateTriplesBlock)\n    .patchRule(g12.generateGraphTerm);\n\nexport type SparqlGenerator = ReturnType<typeof sparql12GeneratorBuilder.build>;\n\nexport class Generator {\n  private readonly generator: SparqlGenerator = sparql12GeneratorBuilder.build();\n  private readonly F = new AstFactory();\n\n  public generate(\n    ast: T12.Query | T12.Update,\ncontext: Partial<T12.SparqlContext & { origSource: string }> = {},\n  ): string {\n    return this.generator.queryOrUpdate(ast, completeParseContext(context));\n  }\n\n  public generatePath(ast: T12.Path, context: Partial<T12.SparqlContext & { origSource: string }> = {}): string {\n    return this.generator.path(ast, completeParseContext(context), undefined);\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@traqula/generator-sparql-1-2",
   "type": "module",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "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.16",
-    "@traqula/generator-sparql-1-1": "^0.0.16",
-    "@traqula/rules-sparql-1-1": "^0.0.16",
-    "@traqula/rules-sparql-1-2": "^0.0.16"
+    "@traqula/core": "^0.0.18",
+    "@traqula/generator-sparql-1-1": "^0.0.18",
+    "@traqula/rules-sparql-1-1": "^0.0.18",
+    "@traqula/rules-sparql-1-2": "^0.0.18"
   },
   "devDependencies": {
-    "@traqula/parser-sparql-1-2": "^0.0.16",
-    "@traqula/test-utils": "^0.0.16"
+    "@traqula/parser-sparql-1-2": "^0.0.18",
+    "@traqula/test-utils": "^0.0.18"
   },
-  "gitHead": "2de4ee608a2337bed63ecc5cf336b1a57c39e45f"
+  "gitHead": "1bb6a7d67631010ee01b325e33ff76f2f7530e02"
 }