@traqula/rules-sparql-1-1 0.0.22 → 0.0.24

package/dist/cjs/lib/sparql11HelperTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sparql11HelperTypes.js","sourceRoot":"","sources":["../../../lib/sparql11HelperTypes.ts"],"names":[],"mappings":"","sourcesContent":["import type { GeneratorRule, ParserRule, traqulaIndentation } from '@traqula/core';\nimport type { AstFactory } from './astFactory.js';\n\nexport interface SparqlContext {\n  /**\n   * Data-factoryMixins to be used when constructing rdf primitives.\n   */\n  astFactory: AstFactory;\n  /**\n   * Current scoped prefixes. Used for resolving prefixed names.\n   */\n  prefixes: Record<string, string>;\n  /**\n   * The base IRI for the query. Used for resolving relative IRIs.\n   */\n  baseIRI: string | undefined;\n  /**\n   * Can be used to disable the validation that used variables in a select clause are in scope.\n   */\n  skipValidation: boolean;\n  /**\n   * Set of queryModes. Primarily used for note 8, 14.\n   */\n  parseMode: Set<'canParseVars' | 'canCreateBlankNodes' | 'inAggregate' | 'canParseAggregate' | string>;\n}\n\nexport interface SparqlGeneratorContext {\n  astFactory: AstFactory;\n  indentInc: number;\n  origSource?: string;\n  [traqulaIndentation]: number;\n}\n\nexport type SparqlRule<\n  /**\n   * Name of grammar rule, should be a strict subtype of string like 'myGrammarRule'.\n   */\n  NameType extends string = string,\n  /**\n   * Type that will be returned after a correct parse of this rule.\n   * This type will be the return type of calling SUBRULE with this grammar rule.\n   */\n  ReturnType = unknown,\n  GenInputType = ReturnType,\n  /**\n   * Function arguments that can be given to convey the state of the current parse operation.\n   */\n  ParamType extends any[] = [],\n> = SparqlGrammarRule<NameType, ReturnType, ParamType>\n  & SparqlGeneratorRule<NameType, GenInputType, ParamType>;\nexport type SparqlGeneratorRule<\n  /**\n   * Name of grammar rule, should be a strict subtype of string like 'myGrammarRule'.\n   */\n  NameType extends string = string,\n  /**\n   * Type that will be returned after a correct parse of this rule.\n   * This type will be the return type of calling SUBRULE with this grammar rule.\n   */\n  ReturnType = unknown,\n  /**\n   * Function arguments that can be given to convey the state of the current parse operation.\n   */\n  ParamType extends any[] = [],\n> = GeneratorRule<SparqlGeneratorContext, NameType, ReturnType, ParamType>;\nexport type SparqlGrammarRule<\n  /**\n   * Name of grammar rule, should be a strict subtype of string like 'myGrammarRule'.\n   */\n  NameType extends string = string,\n  /**\n   * Type that will be returned after a correct parse of this rule.\n   * This type will be the return type of calling SUBRULE with this grammar rule.\n   */\n  ReturnType = unknown,\n  /**\n   * Function arguments that can be given to convey the state of the current parse operation.\n   */\n  ParamType extends any[] = [],\n> = ParserRule<SparqlContext, NameType, ReturnType, ParamType>;\n"]}

package/dist/cjs/lib/utils.js

@@ -1,64 +1,46 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  AstTransformer: () => AstTransformer,
-  CommonIRIs: () => CommonIRIs,
-  sparqlCodepointEscape: () => sparqlCodepointEscape
-});
-module.exports = __toCommonJS(utils_exports);
-var import_core = require("@traqula/core");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AstTransformer = exports.CommonIRIs = void 0;
+exports.sparqlCodepointEscape = sparqlCodepointEscape;
+const core_1 = require("@traqula/core");
+/**
+ * Transform input in accordance to [19.2](https://www.w3.org/TR/sparql11-query/#codepointEscape)
+ * and validate unicode codepoints.
+ */
 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 sanitizedInput = input.replaceAll(/\\u([0-9a-fA-F]{4})|\\U([0-9a-fA-F]{8})/gu, (_, unicode4, unicode8) => {
+        if (unicode4) {
+            const charCode = Number.parseInt(unicode4, 16);
+            return String.fromCodePoint(charCode);
+        }
+        const charCode = Number.parseInt(unicode8, 16);
+        if (charCode < 0xFFFF) {
+            return String.fromCodePoint(charCode);
+        }
+        const substractedCharCode = charCode - 0x10000;
+        return String.fromCodePoint(0xD800 + (substractedCharCode >> 10), 0xDC00 + (substractedCharCode & 0x3FF));
+    });
+    // Test for invalid unicode surrogate pairs
+    if (/[\uD800-\uDBFF](?:[^\uDC00-\uDFFF]|$)/u.test(sanitizedInput)) {
+        throw new Error(`Invalid unicode codepoint of surrogate pair without corresponding codepoint`);
     }
-    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;
+    return sanitizedInput;
 }
 var CommonIRIs;
-(function(CommonIRIs2) {
-  CommonIRIs2["BOOLEAN"] = "http://www.w3.org/2001/XMLSchema#boolean";
-  CommonIRIs2["INTEGER"] = "http://www.w3.org/2001/XMLSchema#integer";
-  CommonIRIs2["DECIMAL"] = "http://www.w3.org/2001/XMLSchema#decimal";
-  CommonIRIs2["DOUBLE"] = "http://www.w3.org/2001/XMLSchema#double";
-  CommonIRIs2["STRING"] = "http://www.w3.org/2001/XMLSchema#string";
-  CommonIRIs2["FIRST"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#first";
-  CommonIRIs2["REST"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest";
-  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 = {}));
-class AstTransformer extends import_core.TransformerSubTyped {
+(function (CommonIRIs) {
+    // XSD
+    CommonIRIs["BOOLEAN"] = "http://www.w3.org/2001/XMLSchema#boolean";
+    CommonIRIs["INTEGER"] = "http://www.w3.org/2001/XMLSchema#integer";
+    CommonIRIs["DECIMAL"] = "http://www.w3.org/2001/XMLSchema#decimal";
+    CommonIRIs["DOUBLE"] = "http://www.w3.org/2001/XMLSchema#double";
+    CommonIRIs["STRING"] = "http://www.w3.org/2001/XMLSchema#string";
+    // RDF
+    CommonIRIs["FIRST"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#first";
+    CommonIRIs["REST"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest";
+    CommonIRIs["NIL"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil";
+    CommonIRIs["TYPE"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
+})(CommonIRIs || (exports.CommonIRIs = CommonIRIs = {}));
+class AstTransformer extends core_1.TransformerSubTyped {
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  AstTransformer,
-  CommonIRIs,
-  sparqlCodepointEscape
-});
+exports.AstTransformer = AstTransformer;
+//# sourceMappingURL=utils.js.map

package/dist/cjs/lib/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/utils.ts"],"names":[],"mappings":";;;AAOA,sDAqBC;AA5BD,wCAAoD;AAGpD;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,KAAa;IACjD,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,CACrC,2CAA2C,EAC3C,CAAC,CAAC,EAAE,QAAgB,EAAE,QAAgB,EAAE,EAAE;QACxC,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,QAAQ,GAAG,MAAM,EAAE,CAAC;YACtB,OAAO,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,mBAAmB,GAAG,QAAQ,GAAG,OAAO,CAAC;QAC/C,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC,CAAC;IAC5G,CAAC,CACF,CAAC;IACF,2CAA2C;IAC3C,IAAI,wCAAwC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;IACjG,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,IAAY,UAYX;AAZD,WAAY,UAAU;IACpB,MAAM;IACN,kEAAoD,CAAA;IACpD,kEAAoD,CAAA;IACpD,kEAAoD,CAAA;IACpD,gEAAkD,CAAA;IAClD,gEAAkD,CAAA;IAClD,MAAM;IACN,wEAA0D,CAAA;IAC1D,sEAAwD,CAAA;IACxD,oEAAsD,CAAA;IACtD,sEAAwD,CAAA;AAC1D,CAAC,EAZW,UAAU,0BAAV,UAAU,QAYrB;AAED,MAAa,cAAe,SAAQ,0BAAkC;CAAG;AAAzE,wCAAyE","sourcesContent":["import { TransformerSubTyped } from '@traqula/core';\nimport type { Sparql11Nodes } from './Sparql11types.js';\n\n/**\n * Transform input in accordance to [19.2](https://www.w3.org/TR/sparql11-query/#codepointEscape)\n * and validate unicode codepoints.\n */\nexport function sparqlCodepointEscape(input: string): string {\n  const sanitizedInput = input.replaceAll(\n    /\\\\u([0-9a-fA-F]{4})|\\\\U([0-9a-fA-F]{8})/gu,\n    (_, unicode4: string, unicode8: string) => {\n      if (unicode4) {\n        const charCode = Number.parseInt(unicode4, 16);\n        return String.fromCodePoint(charCode);\n      }\n      const charCode = Number.parseInt(unicode8, 16);\n      if (charCode < 0xFFFF) {\n        return String.fromCodePoint(charCode);\n      }\n      const substractedCharCode = charCode - 0x10000;\n      return String.fromCodePoint(0xD800 + (substractedCharCode >> 10), 0xDC00 + (substractedCharCode & 0x3FF));\n    },\n  );\n  // Test for invalid unicode surrogate pairs\n  if (/[\\uD800-\\uDBFF](?:[^\\uDC00-\\uDFFF]|$)/u.test(sanitizedInput)) {\n    throw new Error(`Invalid unicode codepoint of surrogate pair without corresponding codepoint`);\n  }\n  return sanitizedInput;\n}\n\nexport enum CommonIRIs {\n  // XSD\n  BOOLEAN = 'http://www.w3.org/2001/XMLSchema#boolean',\n  INTEGER = 'http://www.w3.org/2001/XMLSchema#integer',\n  DECIMAL = 'http://www.w3.org/2001/XMLSchema#decimal',\n  DOUBLE = 'http://www.w3.org/2001/XMLSchema#double',\n  STRING = 'http://www.w3.org/2001/XMLSchema#string',\n  // RDF\n  FIRST = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#first',\n  REST = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#rest',\n  NIL = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#nil',\n  TYPE = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type',\n}\n\nexport class AstTransformer extends TransformerSubTyped<Sparql11Nodes> {}\n"]}

package/dist/cjs/lib/validation/validators.js

@@ -1,214 +1,225 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var validators_exports = {};
-__export(validators_exports, {
-  checkNote13: () => checkNote13,
-  findPatternBoundedVars: () => findPatternBoundedVars,
-  queryIsGood: () => queryIsGood,
-  updateNoReuseBlankNodeLabels: () => updateNoReuseBlankNodeLabels
-});
-module.exports = __toCommonJS(validators_exports);
-var import_astFactory = require("../astFactory.js");
-var import_utils = require("../utils.js");
-const F = new import_astFactory.AstFactory();
-const transformer = new import_utils.AstTransformer();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.queryIsGood = queryIsGood;
+exports.findPatternBoundedVars = findPatternBoundedVars;
+exports.checkNote13 = checkNote13;
+exports.updateNoReuseBlankNodeLabels = updateNoReuseBlankNodeLabels;
+const astFactory_js_1 = require("../astFactory.js");
+const utils_js_1 = require("../utils.js");
+const F = new astFactory_js_1.AstFactory();
+const transformer = new utils_js_1.AstTransformer();
+/**
+ * Get all 'aggregate' rules from an expression
+ */
 function getAggregatesOfExpression(expression) {
-  if (F.isExpressionAggregate(expression)) {
-    return [expression];
-  }
-  if (F.isExpressionOperator(expression)) {
-    const aggregates = [];
-    for (const arg of expression.args) {
-      aggregates.push(...getAggregatesOfExpression(arg));
+    if (F.isExpressionAggregate(expression)) {
+        return [expression];
     }
-    return aggregates;
-  }
-  return [];
+    if (F.isExpressionOperator(expression)) {
+        const aggregates = [];
+        for (const arg of expression.args) {
+            aggregates.push(...getAggregatesOfExpression(arg));
+        }
+        return aggregates;
+    }
+    return [];
 }
+/**
+ * Return the variable value id of an expression if bounded
+ */
 function getExpressionId(expression) {
-  if (F.isTerm(expression) && F.isTermVariable(expression)) {
-    return expression.value;
-  }
-  if (F.isExpression(expression)) {
-    if (F.isExpressionAggregate(expression) && F.isTermVariable(expression.expression[0])) {
-      return expression.expression[0].value;
+    // Check if grouping
+    if (F.isTerm(expression) && F.isTermVariable(expression)) {
+        return expression.value;
     }
-    return void 0;
-  }
-  return expression.variable.value;
+    if (F.isExpression(expression)) {
+        if (F.isExpressionAggregate(expression) && F.isTermVariable(expression.expression[0])) {
+            return expression.expression[0].value;
+        }
+        return undefined;
+    }
+    return expression.variable.value;
 }
+/**
+ * Get all variables used in an expression
+ */
 function getVariablesFromExpression(expression, variables) {
-  if (F.isExpressionOperator(expression)) {
-    for (const expr of expression.args) {
-      getVariablesFromExpression(expr, variables);
+    if (F.isExpressionOperator(expression)) {
+        for (const expr of expression.args) {
+            getVariablesFromExpression(expr, variables);
+        }
+    }
+    else if (F.isTerm(expression) && F.isTermVariable(expression)) {
+        variables.add(expression.value);
     }
-  } else if (F.isTerm(expression) && F.isTermVariable(expression)) {
-    variables.add(expression.value);
-  }
 }
 function queryIsGood(query) {
-  if (query.variables.length === 1 && F.isWildcard(query.variables[0])) {
-    if (query.solutionModifiers.group !== void 0) {
-      throw new Error("GROUP BY not allowed with wildcard");
-    }
-    return;
-  }
-  const variables = query.variables;
-  const hasCountAggregate = variables.flatMap((varVal) => F.isTerm(varVal) ? [] : getAggregatesOfExpression(varVal.expression)).some((agg) => agg.aggregation === "count" && !agg.expression.some((arg) => F.isWildcard(arg)));
-  const groupBy = query.solutionModifiers.group;
-  if (hasCountAggregate || groupBy) {
-    for (const selectVar of variables) {
-      if (F.isTerm(selectVar)) {
-        if (!groupBy || !groupBy.groupings.map((groupvar) => getExpressionId(groupvar)).includes(getExpressionId(selectVar))) {
-          throw new Error("Variable not allowed in projection");
+    // NoGroupByOnWildcardSelect
+    if (query.variables.length === 1 && F.isWildcard(query.variables[0])) {
+        if (query.solutionModifiers.group !== undefined) {
+            throw new Error('GROUP BY not allowed with wildcard');
         }
-      } else if (getAggregatesOfExpression(selectVar.expression).length === 0) {
-        const usedvars = /* @__PURE__ */ new Set();
-        getVariablesFromExpression(selectVar.expression, usedvars);
-        for (const usedvar of usedvars) {
-          if (!groupBy || !groupBy.groupings.map((groupVar) => getExpressionId(groupVar)).includes(usedvar)) {
-            throw new Error(`Use of ungrouped variable in projection of operation (?${usedvar})`);
-          }
-        }
-      }
+        return;
     }
-  }
-  const subqueries = query.where.patterns.filter((pattern) => pattern.type === "query");
-  if (subqueries.length > 0) {
-    const selectBoundedVars = /* @__PURE__ */ new Set();
-    for (const variable of variables) {
-      if ("variable" in variable) {
-        selectBoundedVars.add(variable.variable.value);
-      }
+    // CannotProjectUngroupedVars - can be skipped if `SELECT *`
+    // Check for projection of ungrouped variable
+    // Check can be skipped in case of wildcard select.
+    const variables = query.variables;
+    const hasCountAggregate = variables.flatMap(varVal => F.isTerm(varVal) ? [] : getAggregatesOfExpression(varVal.expression)).some(agg => agg.aggregation === 'count' && !agg.expression.some(arg => F.isWildcard(arg)));
+    const groupBy = query.solutionModifiers.group;
+    if (hasCountAggregate || groupBy) {
+        // We have to check whether
+        //  1. Variables used in projection are usable given the group by clause
+        //  2. A selectCount will create an implicit group by clause.
+        for (const selectVar of variables) {
+            if (F.isTerm(selectVar)) {
+                if (!groupBy || !groupBy.groupings.map(groupvar => getExpressionId(groupvar))
+                    .includes((getExpressionId(selectVar)))) {
+                    throw new Error('Variable not allowed in projection');
+                }
+            }
+            else if (getAggregatesOfExpression(selectVar.expression).length === 0) {
+                // Current value binding does not use aggregates
+                const usedvars = new Set();
+                getVariablesFromExpression(selectVar.expression, usedvars);
+                for (const usedvar of usedvars) {
+                    if (!groupBy || !groupBy.groupings.map(groupVar => getExpressionId(groupVar))
+                        .includes(usedvar)) {
+                        throw new Error(`Use of ungrouped variable in projection of operation (?${usedvar})`);
+                    }
+                }
+            }
+        }
     }
-    const vars = subqueries.flatMap((sub) => sub.variables).map((v) => F.isTerm(v) ? v.value : F.isWildcard(v) ? "*" : v.variable.value);
-    const subqueryIds = new Set(vars);
-    for (const selectedVarId of selectBoundedVars) {
-      if (subqueryIds.has(selectedVarId)) {
-        throw new Error(`Target id of 'AS' (?${selectedVarId}) already used in subquery`);
-      }
+    // NOTE 12: Check if id of each AS-selected column is not yet bound by subquery
+    const subqueries = query.where.patterns.filter(pattern => pattern.type === 'query');
+    if (subqueries.length > 0) {
+        const selectBoundedVars = new Set();
+        for (const variable of variables) {
+            if ('variable' in variable) {
+                selectBoundedVars.add(variable.variable.value);
+            }
+        }
+        // Look at in scope variables
+        const vars = subqueries.flatMap(sub => sub.variables)
+            .map(v => F.isTerm(v) ? v.value : (F.isWildcard(v) ? '*' : v.variable.value));
+        const subqueryIds = new Set(vars);
+        for (const selectedVarId of selectBoundedVars) {
+            if (subqueryIds.has(selectedVarId)) {
+                throw new Error(`Target id of 'AS' (?${selectedVarId}) already used in subquery`);
+            }
+        }
     }
-  }
 }
 function notUndefined(some) {
-  return some !== void 0;
+    return some !== undefined;
 }
 function findPatternBoundedVars(iter, boundedVars) {
-  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] })
-    },
-    term: {
-      variable: (op) => {
-        boundedVars.add(op.value);
-        return {};
-      }
-    }
-  });
+    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] }),
+        },
+        term: {
+            variable: (op) => {
+                boundedVars.add(op.value);
+                return {};
+            },
+        },
+    });
 }
+/**
+ * NOTE 13 and https://www.w3.org/TR/sparql11-query/#variableScope
+ * > In BIND (expr AS v) requires that the variable v is not in-scope from the preceeding elements in the
+ *    group graph pattern in which it is used.
+ */
 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: { visitor: (var_) => {
-        variables.push(var_);
-      } } } });
-      if (variables.some((var_) => var_.value === pattern.variable.value)) {
-        throw new Error(`Variable used to bind is already bound (?${pattern.variable.value})`);
-      }
+    for (const [index, pattern] of patterns.entries()) {
+        if (F.isPatternBind(pattern) && index > 0 && F.isPatternBgp(patterns[index - 1])) {
+            const bgp = patterns[index - 1];
+            // Find variables used.
+            const variables = [];
+            // TODO: this is slow! 2.6% self execution
+            transformer.visitNodeSpecific(bgp, {}, { term: { variable: { visitor: (var_) => {
+                            variables.push(var_);
+                        } } } });
+            if (variables.some(var_ => var_.value === pattern.variable.value)) {
+                throw new Error(`Variable used to bind is already bound (?${pattern.variable.value})`);
+            }
+        }
     }
-  }
-  const boundedVars = /* @__PURE__ */ new Set();
-  for (const pattern of patterns) {
-    if (F.isPatternBind(pattern)) {
-      if (boundedVars.has(pattern.variable.value)) {
-        throw new Error(`Variable used to bind is already bound (?${pattern.variable.value})`);
-      }
-    } else {
-      findPatternBoundedVars(pattern, boundedVars);
+    const boundedVars = new Set();
+    for (const pattern of patterns) {
+        // Element can be bind, in that case, check note 13. If it is not, buildup set of bounded variables.
+        if (F.isPatternBind(pattern)) {
+            if (boundedVars.has(pattern.variable.value)) {
+                throw new Error(`Variable used to bind is already bound (?${pattern.variable.value})`);
+            }
+        }
+        else {
+            findPatternBoundedVars(pattern, boundedVars);
+        }
     }
-  }
 }
+/**
+ * https://www.w3.org/TR/sparql11-query/#grammarBNodes
+ * > two INSERT DATA operations within a single SPARQL Update request
+ */
 function updateNoReuseBlankNodeLabels(updateQuery) {
-  const blankLabelsUsedInInsertData = /* @__PURE__ */ new Set();
-  for (const update of updateQuery.updates) {
-    if (!update.operation) {
-      continue;
-    }
-    const operation = update.operation;
-    if (operation.subType === "insertdata") {
-      const blankNodesHere = /* @__PURE__ */ new Set();
-      transformer.visitNodeSpecific(operation, {}, { term: { blankNode: { visitor: (blankNode) => {
-        blankNodesHere.add(blankNode.label);
-        if (blankLabelsUsedInInsertData.has(blankNode.label)) {
-          throw new Error("Detected reuse blank node across different INSERT DATA clauses");
+    const blankLabelsUsedInInsertData = new Set();
+    for (const update of updateQuery.updates) {
+        if (!update.operation) {
+            continue;
+        }
+        const operation = update.operation;
+        if (operation.subType === 'insertdata') {
+            const blankNodesHere = new Set();
+            transformer.visitNodeSpecific(operation, {}, { term: { blankNode: { visitor: (blankNode) => {
+                            blankNodesHere.add(blankNode.label);
+                            if (blankLabelsUsedInInsertData.has(blankNode.label)) {
+                                throw new Error('Detected reuse blank node across different INSERT DATA clauses');
+                            }
+                        } } } });
+            for (const blankNode of blankNodesHere) {
+                blankLabelsUsedInInsertData.add(blankNode);
+            }
         }
-      } } } });
-      for (const blankNode of blankNodesHere) {
-        blankLabelsUsedInInsertData.add(blankNode);
-      }
     }
-  }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  checkNote13,
-  findPatternBoundedVars,
-  queryIsGood,
-  updateNoReuseBlankNodeLabels
-});
+//# sourceMappingURL=validators.js.map

package/dist/cjs/lib/validation/validators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../../lib/validation/validators.ts"],"names":[],"mappings":";;AAuEA,kCA6DC;AAMD,wDAqDC;AAOD,kCA2BC;AAMD,oEAoBC;AA1PD,oDAA8C;AAkB9C,0CAA6C;AAE7C,MAAM,CAAC,GAAG,IAAI,0BAAU,EAAE,CAAC;AAC3B,MAAM,WAAW,GAAG,IAAI,yBAAc,EAAE,CAAC;AAEzC;;GAEG;AACH,SAAS,yBAAyB,CAAC,UAAsB;IACvD,IAAI,CAAC,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,OAAO,CAAE,UAAU,CAAE,CAAC;IACxB,CAAC;IACD,IAAI,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,MAAM,UAAU,GAA0B,EAAE,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YAClC,UAAU,CAAC,IAAI,CAAC,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CAAC,UAAiE;IACxF,oBAAoB;IACpB,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QACzD,OAAO,UAAU,CAAC,KAAK,CAAC;IAC1B,CAAC;IACD,IAAI,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,IAAI,CAAC,CAAC,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtF,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACxC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,SAAS,0BAA0B,CAAC,UAAsB,EAAE,SAAsB;IAChF,IAAI,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YACnC,0BAA0B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;SAAM,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAChE,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED,SAAgB,WAAW,CAAC,KAAqE;IAC/F,4BAA4B;IAC5B,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,IAAI,KAAK,CAAC,iBAAiB,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QACD,OAAO;IACT,CAAC;IAED,4DAA4D;IAC5D,6CAA6C;IAC7C,mDAAmD;IACnD,MAAM,SAAS,GAAiD,KAAK,CAAC,SAAS,CAAC;IAChF,MAAM,iBAAiB,GAAG,SAAS,CAAC,OAAO,CACzC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC,MAAM,CAAC,UAAU,CAAC,CAC/E,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,KAAK,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7F,MAAM,OAAO,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC;IAC9C,IAAI,iBAAiB,IAAI,OAAO,EAAE,CAAC;QACjC,2BAA2B;QAC3B,wEAAwE;QACxE,6DAA6D;QAC7D,KAAK,MAAM,SAAS,IAAI,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxB,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;qBAC1E,QAAQ,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;iBAAM,IAAI,yBAAyB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxE,gDAAgD;gBAChD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;gBACnC,0BAA0B,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;yBAC1E,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,0DAA0D,OAAO,GAAG,CAAC,CAAC;oBACxF,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,+EAA+E;IAC/E,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IACpF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;gBAC3B,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAED,6BAA6B;QAC7B,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAwC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC;aACzF,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QAChF,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QAClC,KAAK,MAAM,aAAa,IAAI,iBAAiB,EAAE,CAAC;YAC9C,IAAI,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,uBAAuB,aAAa,4BAA4B,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAI,IAAO;IAC9B,OAAO,IAAI,KAAK,SAAS,CAAC;AAC5B,CAAC;AAED,SAAgB,sBAAsB,CACpC,IAAuF,EACvF,WAAwB;IAExB,WAAW,CAAC,gBAAgB,CAAC,IAAI,EAAE;QACjC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE;gBACpB,EAAE,CAAC,iBAAiB,CAAC,KAAK;aAC3B,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAE,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,MAAM,CAAE,EAAC,CAAC;QAChE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC;QAChC,gBAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAE,EAAC,CAAC;KACpE,EAAE;QACD,KAAK,EAAE;YACL,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE;oBACrB,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,EAAE,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC;oBAC1E,EAAE,CAAC,iBAAiB,CAAC,KAAK;oBAC1B,EAAE,CAAC,MAAM;iBACV,CAAC,MAAM,CAAC,YAAY,CAAC,EAAsD,CAAA;YAC5E,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE;oBACvB,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,EAAE,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC;oBAC1E,EAAE,CAAC,iBAAiB,CAAC,KAAK;oBAC1B,EAAE,CAAC,MAAM;iBACV,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;SAC1B;QACD,gBAAgB,EAAE;YAChB,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAChB,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aACjE,CAAC;YACF,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC;YACnC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;SAC7D;QACD,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE;gBACb,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;oBACnD,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC;YACjC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;YACpC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;YACpC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAE,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAE,EAAC,CAAC;YACrD,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAE,EAAE,CAAC,QAAQ,CAAE,EAAC,CAAC;YACtC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAE,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAE,EAAC,CAAC;SACpD;QACD,IAAI,EAAE;YACJ,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE;gBACf,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;gBAC1B,OAAO,EAAE,CAAC;YACZ,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,QAAmB;IAC7C,KAAK,MAAM,CAAE,KAAK,EAAE,OAAO,CAAE,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QACpD,IAAI,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAChC,uBAAuB;YACvB,MAAM,SAAS,GAAmB,EAAE,CAAC;YACrC,0CAA0C;YAC1C,WAAW,CAAC,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;4BAC7E,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACvB,CAAC,EAAE,EAAC,EAAC,CAAC,CAAC;YACP,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClE,MAAM,IAAI,KAAK,CAAC,4CAA4C,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC;YACzF,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,oGAAoG;QACpG,IAAI,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,4CAA4C,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC;YACzF,CAAC;QACH,CAAC;aAAM,CAAC;YACN,sBAAsB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,4BAA4B,CAAC,WAAmB;IAC9D,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAAU,CAAC;IACtD,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,SAAS;QACX,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QACnC,IAAI,SAAS,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;YACvC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;YACzC,WAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE;4BACzF,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;4BACpC,IAAI,2BAA2B,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gCACrD,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;4BACpF,CAAC;wBACH,CAAC,EAAE,EAAC,EAAC,CAAC,CAAC;YACP,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;gBACvC,2BAA2B,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC","sourcesContent":["import type { SelectiveTraversalContext } from '@traqula/core';\nimport { AstFactory } from '../astFactory.js';\nimport type {\n  Wildcard,\n  Expression,\n  ExpressionAggregate,\n  Pattern,\n  QuerySelect,\n  TermVariable,\n  SolutionModifierGroupBind,\n  Update,\n  PatternBind,\n  TripleCollection,\n  Path,\n  TripleNesting,\n  Term,\n  SparqlQuery,\n  Sparql11Nodes,\n} from '../Sparql11types.js';\nimport { AstTransformer } from '../utils.js';\n\nconst F = new AstFactory();\nconst transformer = new AstTransformer();\n\n/**\n * Get all 'aggregate' rules from an expression\n */\nfunction getAggregatesOfExpression(expression: Expression): ExpressionAggregate[] {\n  if (F.isExpressionAggregate(expression)) {\n    return [ expression ];\n  }\n  if (F.isExpressionOperator(expression)) {\n    const aggregates: ExpressionAggregate[] = [];\n    for (const arg of expression.args) {\n      aggregates.push(...getAggregatesOfExpression(arg));\n    }\n    return aggregates;\n  }\n  return [];\n}\n\n/**\n * Return the variable value id of an expression if bounded\n */\nfunction getExpressionId(expression: SolutionModifierGroupBind | Expression | TermVariable): string | undefined {\n  // Check if grouping\n  if (F.isTerm(expression) && F.isTermVariable(expression)) {\n    return expression.value;\n  }\n  if (F.isExpression(expression)) {\n    if (F.isExpressionAggregate(expression) && F.isTermVariable(expression.expression[0])) {\n      return expression.expression[0].value;\n    }\n    return undefined;\n  }\n  return expression.variable.value;\n}\n\n/**\n * Get all variables used in an expression\n */\nfunction getVariablesFromExpression(expression: Expression, variables: Set<string>): void {\n  if (F.isExpressionOperator(expression)) {\n    for (const expr of expression.args) {\n      getVariablesFromExpression(expr, variables);\n    }\n  } else if (F.isTerm(expression) && F.isTermVariable(expression)) {\n    variables.add(expression.value);\n  }\n}\n\nexport function queryIsGood(query: Pick<QuerySelect, 'variables' | 'solutionModifiers' | 'where'>): void {\n  // NoGroupByOnWildcardSelect\n  if (query.variables.length === 1 && F.isWildcard(query.variables[0])) {\n    if (query.solutionModifiers.group !== undefined) {\n      throw new Error('GROUP BY not allowed with wildcard');\n    }\n    return;\n  }\n\n  // CannotProjectUngroupedVars - can be skipped if `SELECT *`\n  // Check for projection of ungrouped variable\n  // Check can be skipped in case of wildcard select.\n  const variables = <Exclude<typeof query.variables, [Wildcard]>> query.variables;\n  const hasCountAggregate = variables.flatMap(\n    varVal => F.isTerm(varVal) ? [] : getAggregatesOfExpression(varVal.expression),\n  ).some(agg => agg.aggregation === 'count' && !agg.expression.some(arg => F.isWildcard(arg)));\n  const groupBy = query.solutionModifiers.group;\n  if (hasCountAggregate || groupBy) {\n    // We have to check whether\n    //  1. Variables used in projection are usable given the group by clause\n    //  2. A selectCount will create an implicit group by clause.\n    for (const selectVar of variables) {\n      if (F.isTerm(selectVar)) {\n        if (!groupBy || !groupBy.groupings.map(groupvar => getExpressionId(groupvar))\n          .includes((getExpressionId(selectVar)))) {\n          throw new Error('Variable not allowed in projection');\n        }\n      } else if (getAggregatesOfExpression(selectVar.expression).length === 0) {\n        // Current value binding does not use aggregates\n        const usedvars = new Set<string>();\n        getVariablesFromExpression(selectVar.expression, usedvars);\n        for (const usedvar of usedvars) {\n          if (!groupBy || !groupBy.groupings.map(groupVar => getExpressionId(groupVar))\n            .includes(usedvar)) {\n            throw new Error(`Use of ungrouped variable in projection of operation (?${usedvar})`);\n          }\n        }\n      }\n    }\n  }\n\n  // NOTE 12: Check if id of each AS-selected column is not yet bound by subquery\n  const subqueries = query.where.patterns.filter(pattern => pattern.type === 'query');\n  if (subqueries.length > 0) {\n    const selectBoundedVars = new Set<string>();\n    for (const variable of variables) {\n      if ('variable' in variable) {\n        selectBoundedVars.add(variable.variable.value);\n      }\n    }\n\n    // Look at in scope variables\n    const vars = subqueries.flatMap<TermVariable | PatternBind | Wildcard>(sub => sub.variables)\n      .map(v => F.isTerm(v) ? v.value : (F.isWildcard(v) ? '*' : v.variable.value));\n    const subqueryIds = new Set(vars);\n    for (const selectedVarId of selectBoundedVars) {\n      if (subqueryIds.has(selectedVarId)) {\n        throw new Error(`Target id of 'AS' (?${selectedVarId}) already used in subquery`);\n      }\n    }\n  }\n}\n\nfunction notUndefined<T>(some: T): some is Exclude<T, undefined> {\n  return some !== undefined;\n}\n\nexport function findPatternBoundedVars(\n  iter: SparqlQuery | Pattern | TripleNesting | TripleCollection | Path | Term | Wildcard,\n  boundedVars: Set<string>,\n): void {\n  transformer.traverseSubNodes(iter, {\n    query: op => ({ next: [\n      op.solutionModifiers.group,\n    ].filter(notUndefined) }),\n    triple: op => ({ next: [ op.subject, op.predicate, op.object ]}),\n    path: op => ({ next: op.items }),\n    tripleCollection: op => ({ next: [ op.identifier, ...op.triples ]}),\n  }, {\n    query: {\n      select: op => ({ next: [\n        ...(op.variables.some(x => F.isWildcard(x)) ? [ op.where ] : op.variables),\n        op.solutionModifiers.group,\n        op.values,\n      ].filter(notUndefined) } satisfies SelectiveTraversalContext<Sparql11Nodes>),\n      describe: op => ({ next: [\n        ...(op.variables.some(x => F.isWildcard(x)) ? [ op.where ] : op.variables),\n        op.solutionModifiers.group,\n        op.values,\n      ].filter(notUndefined) }),\n    },\n    solutionModifier: {\n      group: op => ({ next:\n          op.groupings.filter(g => 'variable' in g).map(x => x.variable),\n      }),\n      having: op => ({ next: op.having }),\n      order: op => ({ next: op.orderDefs.map(x => x.expression) }),\n    },\n    pattern: {\n      values: (op) => {\n        for (const v of Object.keys(op.values.at(0) ?? {})) {\n          boundedVars.add(v);\n        }\n        return {};\n      },\n      bgp: op => ({ next: op.triples }),\n      group: op => ({ next: op.patterns }),\n      union: op => ({ next: op.patterns }),\n      optional: op => ({ next: op.patterns }),\n      service: op => ({ next: [ op.name, ...op.patterns ]}),\n      bind: op => ({ next: [ op.variable ]}),\n      graph: op => ({ next: [ op.name, ...op.patterns ]}),\n    },\n    term: {\n      variable: (op) => {\n        boundedVars.add(op.value);\n        return {};\n      },\n    },\n  });\n}\n\n/**\n * NOTE 13 and https://www.w3.org/TR/sparql11-query/#variableScope\n * > In BIND (expr AS v) requires that the variable v is not in-scope from the preceeding elements in the\n *    group graph pattern in which it is used.\n */\nexport function checkNote13(patterns: Pattern[]): void {\n  for (const [ index, pattern ] of patterns.entries()) {\n    if (F.isPatternBind(pattern) && index > 0 && F.isPatternBgp(patterns[index - 1])) {\n      const bgp = patterns[index - 1];\n      // Find variables used.\n      const variables: TermVariable[] = [];\n      // TODO: this is slow! 2.6% self execution\n      transformer.visitNodeSpecific(bgp, {}, { term: { variable: { visitor: (var_) => {\n        variables.push(var_);\n      } }}});\n      if (variables.some(var_ => var_.value === pattern.variable.value)) {\n        throw new Error(`Variable used to bind is already bound (?${pattern.variable.value})`);\n      }\n    }\n  }\n\n  const boundedVars = new Set<string>();\n  for (const pattern of patterns) {\n    // Element can be bind, in that case, check note 13. If it is not, buildup set of bounded variables.\n    if (F.isPatternBind(pattern)) {\n      if (boundedVars.has(pattern.variable.value)) {\n        throw new Error(`Variable used to bind is already bound (?${pattern.variable.value})`);\n      }\n    } else {\n      findPatternBoundedVars(pattern, boundedVars);\n    }\n  }\n}\n\n/**\n * https://www.w3.org/TR/sparql11-query/#grammarBNodes\n * > two INSERT DATA operations within a single SPARQL Update request\n */\nexport function updateNoReuseBlankNodeLabels(updateQuery: Update): void {\n  const blankLabelsUsedInInsertData = new Set<string>();\n  for (const update of updateQuery.updates) {\n    if (!update.operation) {\n      continue;\n    }\n    const operation = update.operation;\n    if (operation.subType === 'insertdata') {\n      const blankNodesHere = new Set<string>();\n      transformer.visitNodeSpecific(operation, {}, { term: { blankNode: { visitor: (blankNode) => {\n        blankNodesHere.add(blankNode.label);\n        if (blankLabelsUsedInInsertData.has(blankNode.label)) {\n          throw new Error('Detected reuse blank node across different INSERT DATA clauses');\n        }\n      } }}});\n      for (const blankNode of blankNodesHere) {\n        blankLabelsUsedInInsertData.add(blankNode);\n      }\n    }\n  }\n}\n"]}

package/dist/cjs/package.json

@@ -0,0 +1 @@
+{ "type": "commonjs" }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@traqula/rules-sparql-1-1",
   "type": "module",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "TRAQULA Lexer and Grammar Rules for sparql 1.1",
   "lsd:module": true,
   "license": "MIT",
@@ -27,21 +27,22 @@
   },
   "main": "dist/esm/lib/index.js",
   "files": [
-    "dist/**/*.d.ts",
-    "dist/**/*.js",
-    "dist/**/*.js.map"
+    "dist/*/lib/**/*.d.ts",
+    "dist/*/lib/**/*.js",
+    "dist/*/lib/**/*.js.map",
+    "dist/cjs/package.json"
   ],
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
   "scripts": {
-    "build": "yarn build:ts && yarn build:transpile",
+    "build": "yarn build:ts && yarn build:cjs",
     "build:ts": "node \"../../node_modules/typescript/bin/tsc\" -b",
-    "build:transpile": "esbuild \"dist/esm/**/*.js\" --outdir=dist/cjs/lib --platform=node --format=cjs"
+    "build:cjs": "node \"../../node_modules/typescript/bin/tsc\" -b tsconfig.cjs.json"
   },
   "dependencies": {
-    "@traqula/chevrotain": "^0.0.22",
-    "@traqula/core": "^0.0.22"
+    "@traqula/chevrotain": "^0.0.24",
+    "@traqula/core": "^0.0.24"
   },
-  "gitHead": "e0cf04a50b3558229ebcc5992cf9562b14f9a077"
+  "gitHead": "9865fe1fe302819d46e19c6f3250ceef778f434f"
 }