@traqula/parser-sparql-1-1-adjust 0.0.9 → 0.0.12

package/lib/Parser.d.ts

@@ -211,7 +211,7 @@ export declare const adjustParserBuilder: ParserBuilder<import("@traqula/rules-s
     builtInAdjust: import("@traqula/core").ParserRule<import("@traqula/rules-sparql-1-1").SparqlContext, "builtInAdjust", g11.ExpressionFunctionX<[import("@traqula/rules-sparql-1-1").Expression, import("@traqula/rules-sparql-1-1").Expression]>, []>;
 }>;
 export type Adjust11Parser = ReturnType<typeof adjustParserBuilder.build>;
-export declare const adjustLexerBuilder: LexerBuilder<"BuiltInStr" | "BuiltInLang" | "BuiltInLangmatches" | "BuiltInDatatype" | "BuiltInBound" | "BuiltInIri" | "BuiltInUri" | "BuiltInBnode" | "BuiltInRand" | "BuiltInAbs" | "BuiltInCeil" | "BuiltInFloor" | "BuiltInRound" | "BuiltInConcat" | "BuiltInStrlen" | "BuiltInUcase" | "BuiltInLcase" | "BuiltInEncode_for_uri" | "BuiltInContains" | "BuiltInStrstarts" | "BuiltInStrends" | "BuiltInStrbefore" | "BuiltInStrafter" | "BuiltInYear" | "BuiltInMonth" | "BuiltInDay" | "BuiltInHours" | "BuiltInMinutes" | "BuiltInSeconds" | "BuiltInTimezone" | "BuiltInTz" | "BuiltInNow" | "BuiltInUuid" | "BuiltInStruuid" | "BuiltInMd5" | "BuiltInSha1" | "BuiltInSha256" | "BuiltInSha384" | "BuiltInSha512" | "BuiltInCoalesce" | "BuiltInIf" | "BuiltInStrlang" | "BuiltInStrdt" | "BuiltInSameterm" | "BuiltInIsiri" | "BuiltInIsuri" | "BuiltInIsblank" | "BuiltInIsliteral" | "BuiltInIsnumeric" | "BuiltInRegex" | "BuiltInSubstr" | "BuiltInReplace" | "BuiltInSum" | "BuiltInMin" | "BuiltInMax" | "BuiltInAvg" | "BuiltInSample" | "BuiltInExists" | "BuiltInNotexists" | "Pipe" | "Slash" | "From" | "Clear" | "Drop" | "Add" | "Copy" | "Move" | "InsertClause" | "DataClause" | "DeleteClause" | "Where" | "UsingClause" | "IriRef" | "PNameNs" | "PNameLn" | "BlankNodeLabel" | "Var1" | "Var2" | "LangTag" | "Double" | "Decimal" | "Integer" | "InterferePositive" | "DecimalPositive" | "DoublePositive" | "IntegerNegative" | "DecimalNegative" | "DoubleNegative" | "StringLiteralLong1" | "StringLiteralLong2" | "StringLiteral1" | "StringLiteral2" | "Ws" | "Comment" | "Nil" | "Anon" | "BaseDecl" | "PrefixDecl" | "Select" | "Distinct" | "Reduced" | "Construct" | "Describe" | "Ask" | "Having" | "GroupByGroup" | "By" | "Order" | "OrderAsc" | "OrderDesc" | "Limit" | "Offset" | "Values" | "Load" | "Silent" | "LoadInto" | "Create" | "To" | "ModifyWith" | "Optional" | "Service" | "Bind" | "Undef" | "Minus" | "Union" | "Filter" | "As" | "a" | "True" | "False" | "In" | "NotIn" | "Separator" | "BuiltInCount" | "BuiltInGroup_concat" | "NamedGraph" | "DefaultGraph" | "Graph" | "GraphAll" | "LogicAnd" | "LogicOr" | "NotEqual" | "LessThanEqual" | "GreaterThanEqual" | "LCurly" | "RCurly" | "Dot" | "Comma" | "Semi" | "LParen" | "RParen" | "LSquare" | "RSquare" | "Hathat" | "Hat" | "Question" | "Star" | "OpPlus" | "OpMinus" | "Exclamation" | "Equal" | "LessThan" | "GreaterThan" | "BuiltInAdjust">;
+export declare const adjustLexerBuilder: LexerBuilder<"BuiltInStr" | "BuiltInLang" | "BuiltInLangmatches" | "BuiltInDatatype" | "BuiltInBound" | "BuiltInIri" | "BuiltInUri" | "BuiltInBnode" | "BuiltInRand" | "BuiltInAbs" | "BuiltInCeil" | "BuiltInFloor" | "BuiltInRound" | "BuiltInConcat" | "BuiltInStrlen" | "BuiltInUcase" | "BuiltInLcase" | "BuiltInEncode_for_uri" | "BuiltInContains" | "BuiltInStrstarts" | "BuiltInStrends" | "BuiltInStrbefore" | "BuiltInStrafter" | "BuiltInYear" | "BuiltInMonth" | "BuiltInDay" | "BuiltInHours" | "BuiltInMinutes" | "BuiltInSeconds" | "BuiltInTimezone" | "BuiltInTz" | "BuiltInNow" | "BuiltInUuid" | "BuiltInStruuid" | "BuiltInMd5" | "BuiltInSha1" | "BuiltInSha256" | "BuiltInSha384" | "BuiltInSha512" | "BuiltInCoalesce" | "BuiltInIf" | "BuiltInStrlang" | "BuiltInStrdt" | "BuiltInSameterm" | "BuiltInIsiri" | "BuiltInIsuri" | "BuiltInIsblank" | "BuiltInIsliteral" | "BuiltInIsnumeric" | "BuiltInRegex" | "BuiltInSubstr" | "BuiltInReplace" | "BuiltInSum" | "BuiltInMin" | "BuiltInMax" | "BuiltInAvg" | "BuiltInSample" | "BuiltInExists" | "BuiltInNotexists" | "Pipe" | "Slash" | "From" | "Clear" | "Drop" | "Add" | "Copy" | "Move" | "InsertClause" | "DataClause" | "DeleteClause" | "Where" | "UsingClause" | "BuiltInAdjust" | "IriRef" | "PNameNs" | "PNameLn" | "BlankNodeLabel" | "Var1" | "Var2" | "LangTag" | "Double" | "Decimal" | "Integer" | "InterferePositive" | "DecimalPositive" | "DoublePositive" | "IntegerNegative" | "DecimalNegative" | "DoubleNegative" | "StringLiteralLong1" | "StringLiteralLong2" | "StringLiteral1" | "StringLiteral2" | "Ws" | "Comment" | "Nil" | "Anon" | "BaseDecl" | "PrefixDecl" | "Select" | "Distinct" | "Reduced" | "Construct" | "Describe" | "Ask" | "Having" | "GroupByGroup" | "By" | "Order" | "OrderAsc" | "OrderDesc" | "Limit" | "Offset" | "Values" | "Load" | "Silent" | "LoadInto" | "Create" | "To" | "ModifyWith" | "Optional" | "Service" | "Bind" | "Undef" | "Minus" | "Union" | "Filter" | "As" | "a" | "True" | "False" | "In" | "NotIn" | "Separator" | "BuiltInCount" | "BuiltInGroup_concat" | "NamedGraph" | "DefaultGraph" | "Graph" | "GraphAll" | "LogicAnd" | "LogicOr" | "NotEqual" | "LessThanEqual" | "GreaterThanEqual" | "LCurly" | "RCurly" | "Dot" | "Comma" | "Semi" | "LParen" | "RParen" | "LSquare" | "RSquare" | "Hathat" | "Hat" | "Question" | "Star" | "OpPlus" | "OpMinus" | "Exclamation" | "Equal" | "LessThan" | "GreaterThan">;
 export declare class Parser extends MinimalSparqlParser<SparqlQuery> {
     constructor();
 }

package/lib/index.cjs

@@ -9747,58 +9747,115 @@ function createToken2(config) {
   return createToken(config);
 }
 
-// ../../packages/core/lib/Transformer.ts
-var Transformer = class {
-  transformNode(curObject, searchType, patch) {
-    const copy3 = { ...curObject };
-    for (const [key, value] of Object.entries(copy3)) {
-      copy3[key] = this.safeObjectVisit(value, (obj) => this.transformNode(obj, searchType, patch));
-    }
-    if (copy3.type === searchType) {
-      return patch(copy3);
+// ../../packages/core/lib/Transformers.ts
+var TransformerType = class {
+  safeObjectVisit(value, mapper) {
+    if (value && typeof value === "object") {
+      if (Array.isArray(value)) {
+        return value.map((x) => this.safeObjectVisit(x, mapper));
+      }
+      return mapper(value);
     }
-    return copy3;
+    return value;
   }
-  transformNodeSpecific(curObject, searchType, searchSubType, patch) {
+  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.transformNodeSpecific(obj, searchType, searchSubType, patch));
+      copy3[key] = this.safeObjectVisit(value, (obj) => this.transformNode(obj, nodeCallBacks));
     }
-    if (copy3.type === searchType && copy3.subType === searchSubType) {
-      return patch(copy3);
+    if (transformation) {
+      return transformation(copy3);
     }
     return copy3;
   }
-  visitObjects(curObject, visitor) {
-    for (const value of Object.values(curObject)) {
-      this.safeObjectVisit(value, (obj) => this.visitObjects(obj, visitor));
+  visitNode(curObject, nodeCallBacks) {
+    let callback;
+    const casted = curObject;
+    if (casted.type) {
+      callback = nodeCallBacks[casted.type];
     }
-  }
-  visitNode(curObject, searchType, visitor) {
-    for (const value of Object.values(curObject)) {
-      this.safeObjectVisit(value, (obj) => this.visitNode(obj, searchType, visitor));
+    let shouldIterate = true;
+    if (callback) {
+      shouldIterate = callback(curObject);
     }
-    if (curObject.type === searchType) {
-      visitor(curObject);
+    if (shouldIterate) {
+      for (const value of Object.values(curObject)) {
+        this.safeObjectVisit(value, (obj) => this.visitNode(obj, nodeCallBacks));
+      }
     }
   }
-  visitNodeSpecific(curObject, searchType, searchSubType, visitor) {
-    for (const value of Object.values(curObject)) {
-      this.safeObjectVisit(value, (obj) => this.visitNodeSpecific(obj, searchType, searchSubType, visitor));
+};
+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));
     }
-    const cast = curObject;
-    if (cast.type === searchType && cast.subType === searchSubType) {
-      visitor(curObject);
+    if (transformation) {
+      return transformation(copy3);
     }
+    return copy3;
   }
-  safeObjectVisit(value, mapper) {
-    if (value && typeof value === "object") {
-      if (Array.isArray(value)) {
-        return value.map((x) => this.safeObjectVisit(x, mapper));
+  /**
+   * 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];
+      }
+    }
+    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));
       }
-      return mapper(value);
     }
-    return value;
   }
 };
 
@@ -11448,9 +11505,34 @@ var Factory = class extends asArg(CoreFactory).call(ContextFactoryMixin).call(Ex
   }
 };
 
+// ../../packages/rules-sparql-1-1/lib/utils.ts
+function sparqlCodepointEscape(input) {
+  const sanitizedInput = input.replaceAll(
+    /\\u([0-9a-fA-F]{4})|\\U([0-9a-fA-F]{8})/gu,
+    (_, unicode4, unicode8) => {
+      if (unicode4) {
+        const charCode2 = Number.parseInt(unicode4, 16);
+        return String.fromCodePoint(charCode2);
+      }
+      const charCode = Number.parseInt(unicode8, 16);
+      if (charCode < 65535) {
+        return String.fromCodePoint(charCode);
+      }
+      const substractedCharCode = charCode - 65536;
+      return String.fromCodePoint(55296 + (substractedCharCode >> 10), 56320 + (substractedCharCode & 1023));
+    }
+  );
+  if (/[\uD800-\uDBFF](?:[^\uDC00-\uDFFF]|$)/u.test(sanitizedInput)) {
+    throw new Error(`Invalid unicode codepoint of surrogate pair without corresponding codepoint`);
+  }
+  return sanitizedInput;
+}
+var TransformerSparql11 = class extends TransformerSubType {
+};
+
 // ../../packages/rules-sparql-1-1/lib/validation/validators.ts
 var F = new Factory();
-var transformer = new Transformer();
+var transformer = new TransformerSparql11();
 function getAggregatesOfExpression(expression2) {
   if (F.isExpressionAggregate(expression2)) {
     return [expression2];
@@ -11599,7 +11681,9 @@ function checkNote13(patterns) {
     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) => variables.push(var_2));
+      transformer.visitNodeSpecific(bgp, {}, { term: { variable: (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})`);
       }
@@ -11625,12 +11709,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: (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);
       }
@@ -11638,29 +11722,6 @@ function updateNoReuseBlankNodeLabels(updateQuery) {
   }
 }
 
-// ../../packages/rules-sparql-1-1/lib/utils.ts
-function sparqlCodepointEscape(input) {
-  const sanitizedInput = input.replaceAll(
-    /\\u([0-9a-fA-F]{4})|\\U([0-9a-fA-F]{8})/gu,
-    (_, unicode4, unicode8) => {
-      if (unicode4) {
-        const charCode2 = Number.parseInt(unicode4, 16);
-        return String.fromCodePoint(charCode2);
-      }
-      const charCode = Number.parseInt(unicode8, 16);
-      if (charCode < 65535) {
-        return String.fromCodePoint(charCode);
-      }
-      const substractedCharCode = charCode - 65536;
-      return String.fromCodePoint(55296 + (substractedCharCode >> 10), 56320 + (substractedCharCode & 1023));
-    }
-  );
-  if (/[\uD800-\uDBFF](?:[^\uDC00-\uDFFF]|$)/u.test(sanitizedInput)) {
-    throw new Error(`Invalid unicode codepoint of surrogate pair without corresponding codepoint`);
-  }
-  return sanitizedInput;
-}
-
 // ../../packages/rules-sparql-1-1/lib/grammar/literals.ts
 function stringEscapedLexical(str2) {
   const lexical = str2.replaceAll(/["\\\t\n\r\b\f]/gu, (char) => {
@@ -12488,7 +12549,7 @@ var aggregate = {
   },
   gImpl: ({ SUBRULE, PRINT_WORD }) => (ast, { factory: F2 }) => {
     F2.printFilter(ast, () => {
-      PRINT_WORD(ast.aggregation, "(");
+      PRINT_WORD(ast.aggregation.toUpperCase(), "(");
       if (ast.distinct) {
         PRINT_WORD("DISTINCT");
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@traqula/parser-sparql-1-1-adjust",
-  "version": "0.0.9",
+  "version": "0.0.12",
   "description": "SPARQL 1.1 + ADJUST parser",
   "lsd:module": true,
   "license": "MIT",
@@ -49,16 +49,16 @@
     "spec:earl": "yarn spec:earl:query && yarn spec:earl:update"
   },
   "dependencies": {
-    "@traqula/core": "^0.0.9",
-    "@traqula/parser-sparql-1-1": "^0.0.9",
-    "@traqula/rules-sparql-1-1": "^0.0.9",
-    "@traqula/rules-sparql-1-1-adjust": "^0.0.9"
+    "@traqula/core": "^0.0.12",
+    "@traqula/parser-sparql-1-1": "^0.0.12",
+    "@traqula/rules-sparql-1-1": "^0.0.12",
+    "@traqula/rules-sparql-1-1-adjust": "^0.0.12"
   },
   "devDependencies": {
     "@rdfjs/types": "^2.0.0",
-    "@traqula/test-utils": "^0.0.9",
+    "@traqula/test-utils": "^0.0.12",
     "rdf-data-factory": "^2.0.1",
     "rdf-test-suite": "^2.0.0"
   },
-  "gitHead": "c13cd255122c688daad98bf313a3397cbffdc45d"
+  "gitHead": "3517d5a5223c64dc61184b5f603f6d98c12bd166"
 }