@comunica/bus-query-operation 3.2.0 → 3.2.2

package/components/ClosableIterator.jsonld

@@ -0,0 +1,108 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-query-operation/^3.0.0/components/context.jsonld"
+  ],
+  "@id": "npmd:@comunica/bus-query-operation",
+  "components": [
+    {
+      "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator",
+      "@type": "Class",
+      "requireElement": "ClosableIterator",
+      "extends": [
+        {
+          "@type": "GenericComponentExtension",
+          "component": "urn:npm:asynciterator:AsyncIterator",
+          "genericTypeInstances": [
+            {
+              "@type": "ParameterRangeGenericTypeReference",
+              "parameterRangeGenericType": "cbqo:components/ClosableIterator.jsonld#ClosableIterator__generic_S"
+            }
+          ]
+        }
+      ],
+      "comment": "An AsyncIterator with a callback for when this iterator is closed in any way. In contrast to ClosableTransformIterator, this does not add the overhead of a TransformIterator.",
+      "genericTypeParameters": [
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator__generic_S"
+        }
+      ],
+      "parameters": [
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator_options_onClose",
+          "range": {
+            "@type": "ParameterRangeWildcard"
+          }
+        },
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator_source",
+          "range": {
+            "@type": "ParameterRangeGenericComponent",
+            "component": "urn:npm:asynciterator:AsyncIterator",
+            "genericTypeInstances": [
+              {
+                "@type": "ParameterRangeGenericTypeReference",
+                "parameterRangeGenericType": "cbqo:components/ClosableIterator.jsonld#ClosableIterator__generic_S"
+              }
+            ]
+          }
+        }
+      ],
+      "memberFields": [
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator__member__source",
+          "memberFieldName": "_source",
+          "range": {
+            "@type": "ParameterRangeIntersection",
+            "parameterRangeElements": [
+              {
+                "@type": "ParameterRangeGenericComponent",
+                "component": "urn:npm:asynciterator:AsyncIterator",
+                "genericTypeInstances": [
+                  {
+                    "@type": "ParameterRangeGenericTypeReference",
+                    "parameterRangeGenericType": "cbqo:components/ClosableIterator.jsonld#InternalSource__generic_T"
+                  }
+                ]
+              },
+              {
+                "@type": "ParameterRangeWildcard"
+              }
+            ]
+          }
+        },
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator__member_onClose",
+          "memberFieldName": "onClose"
+        },
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator__member_constructor",
+          "memberFieldName": "constructor"
+        },
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator__member_read",
+          "memberFieldName": "read"
+        },
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator__member__end",
+          "memberFieldName": "_end"
+        }
+      ],
+      "constructorArguments": [
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator_source"
+        },
+        {
+          "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator_options__constructorArgument",
+          "fields": [
+            {
+              "keyRaw": "onClose",
+              "value": {
+                "@id": "cbqo:components/ClosableIterator.jsonld#ClosableIterator_options_onClose"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

package/lib/Bindings.d.ts

@@ -17,17 +17,22 @@ import type { Algebra } from 'sparqlalgebrajs';
 export declare function materializeTerm(term: RDF.Term, bindings: Bindings): RDF.Term;
 /**
  * Materialize the given operation (recursively) with the given bindings.
- * Essentially, all variables in the given operation will be replaced
+ * Essentially, the variables in the given operation
+ * which don't appear in the projection operation will be replaced
  * by the terms bound to the variables in the given bindings.
  * @param {Algebra.Operation} operation SPARQL algebra operation.
+ * And the variables that appear in the projection operation
+ * will be added to a new values operation.
  * @param {Bindings} bindings A bindings object.
  * @param bindingsFactory The bindings factory.
  * @param options Options for materializations.
  * @param options.strictTargetVariables If target variable bindings (such as on SELECT or BIND) should not be allowed.
- * @param options.bindFilter If filter expressions should be materialized
+ * @param options.bindFilter If filter expressions should be materialized.
+ * @param options.originalBindings The bindings object as it was at the top level call of materializeOperation.
  * @return Algebra.Operation A new operation materialized with the given bindings.
  */
 export declare function materializeOperation(operation: Algebra.Operation, bindings: Bindings, bindingsFactory: BindingsFactory, options?: {
     strictTargetVariables?: boolean;
     bindFilter?: boolean;
+    originalBindings?: Bindings;
 }): Algebra.Operation;

package/lib/Bindings.js

@@ -34,20 +34,25 @@ function materializeTerm(term, bindings) {
 exports.materializeTerm = materializeTerm;
 /**
  * Materialize the given operation (recursively) with the given bindings.
- * Essentially, all variables in the given operation will be replaced
+ * Essentially, the variables in the given operation
+ * which don't appear in the projection operation will be replaced
  * by the terms bound to the variables in the given bindings.
  * @param {Algebra.Operation} operation SPARQL algebra operation.
+ * And the variables that appear in the projection operation
+ * will be added to a new values operation.
  * @param {Bindings} bindings A bindings object.
  * @param bindingsFactory The bindings factory.
  * @param options Options for materializations.
  * @param options.strictTargetVariables If target variable bindings (such as on SELECT or BIND) should not be allowed.
- * @param options.bindFilter If filter expressions should be materialized
+ * @param options.bindFilter If filter expressions should be materialized.
+ * @param options.originalBindings The bindings object as it was at the top level call of materializeOperation.
  * @return Algebra.Operation A new operation materialized with the given bindings.
  */
 function materializeOperation(operation, bindings, bindingsFactory, options = {}) {
     options = {
         strictTargetVariables: 'strictTargetVariables' in options ? options.strictTargetVariables : false,
         bindFilter: 'bindFilter' in options ? options.bindFilter : true,
+        originalBindings: 'originalBindings' in options ? options.originalBindings : bindings,
     };
     return sparqlalgebrajs_1.Util.mapOperation(operation, {
         path(op, factory) {
@@ -109,7 +114,7 @@ function materializeOperation(operation, bindings, bindingsFactory, options = {}
         project(op, factory) {
             // Materialize a project operation.
             // If strictTargetVariables is true, we throw if the project target variable is attempted to be bound.
-            // Otherwise, we just filter out the bound variables.
+            // Otherwise, we make a values clause out of the target variable and its value in InitialBindings.
             if (options.strictTargetVariables) {
                 for (const variable of op.variables) {
                     if (bindings.has(variable)) {
@@ -121,20 +126,49 @@ function materializeOperation(operation, bindings, bindingsFactory, options = {}
                     result: op,
                 };
             }
-            const variables = op.variables.filter(variable => !bindings.has(variable));
-            // Only include projected variables in the sub-bindings that will be passed down recursively.
-            // If we don't do this, we may be binding variables that may have the same label, but are not considered equal.
-            const subBindings = bindingsFactory.bindings(op.variables.map((variable) => {
-                const binding = bindings.get(variable);
-                if (binding) {
-                    return [variable, binding];
+            // Only include non-projected variables in the bindings that will be passed down recursively.
+            // This will result in non-projected variables being replaced with their InitialBindings values.
+            for (const bindingKey of bindings.keys()) {
+                for (const curVariable of op.variables) {
+                    if (curVariable.equals(bindingKey)) {
+                        bindings = bindings.delete(bindingKey);
+                        break;
+                    }
                 }
-                // eslint-disable-next-line no-useless-return,array-callback-return
-                return;
-            }).filter(Boolean));
+            }
+            // Find projected variables which are present in the originalBindings.
+            // This will result in projected variables being handled via a values clause.
+            const values = createValuesFromBindings(factory, options.originalBindings, op.variables);
+            let recursionResult = materializeOperation(op.input, bindings, bindingsFactory, options);
+            if (values.length > 0) {
+                recursionResult = factory.createJoin([...values, recursionResult]);
+            }
             return {
                 recurse: false,
-                result: factory.createProject(materializeOperation(op.input, subBindings, bindingsFactory, options), variables),
+                result: factory.createProject(recursionResult, op.variables),
+            };
+        },
+        filter(op, factory) {
+            const originalBindings = options.originalBindings;
+            if (op.expression.expressionType !== 'operator' || originalBindings.size === 0) {
+                return {
+                    recurse: false,
+                    result: op,
+                };
+            }
+            // Make a values clause using all the variables from originalBindings.
+            const values = createValuesFromBindings(factory, originalBindings);
+            // Recursively materialize the filter expression
+            const recursionResultExpression = materializeOperation(op.expression, bindings, bindingsFactory, options);
+            // Recursively materialize the filter input
+            let recursionResultInput = materializeOperation(op.input, bindings, bindingsFactory, options);
+            if (values.length > 0) {
+                recursionResultInput = factory.createJoin([...values, recursionResultInput]);
+            }
+            return {
+                // Recursion already taken care of above.
+                recurse: false,
+                result: factory.createFilter(recursionResultInput, recursionResultExpression),
             };
         },
         values(op, factory) {
@@ -227,4 +261,23 @@ function materializeOperation(operation, bindings, bindingsFactory, options = {}
     });
 }
 exports.materializeOperation = materializeOperation;
+/**
+ * Make a values operation containing the values that are present in `bindings` for variables present in `variables`.
+ * If no `variables` argument is given, this method returns a values operation
+ * containing every binding from `bindings`.
+ * @param {Factory} factory The Factory used to create the values operation.
+ * @param {Bindings} bindings A bindings object.
+ * @param {Variable[]} variables A list of variables.
+ * @returns Algebra.Values A new values operation the given bindings.
+ */
+function createValuesFromBindings(factory, bindings, variables) {
+    const values = [];
+    for (const [variable, binding] of bindings) {
+        if (!variables || variables.some(v => v.equals(variable))) {
+            const newBinding = { [(0, rdf_string_1.termToString)(variable)]: binding };
+            values.push(factory.createValues([variable], [newBinding]));
+        }
+    }
+    return values;
+}
 //# sourceMappingURL=Bindings.js.map

package/lib/Bindings.js.map

@@ -1 +1 @@
-{"version":3,"file":"Bindings.js","sourceRoot":"","sources":["Bindings.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BindingsFactory } from '@comunica/bindings-factory';\nimport type { Bindings } from '@comunica/types';\nimport type * as RDF from '@rdfjs/types';\nimport { DataFactory } from 'rdf-data-factory';\nimport { termToString } from 'rdf-string';\nimport { mapTermsNested, someTermsNested } from 'rdf-terms';\nimport type { Algebra, Factory } from 'sparqlalgebrajs';\nimport { Util } from 'sparqlalgebrajs';\n\nconst DF = new DataFactory();\n\nconst TRUE = DF.literal('true', DF.namedNode('http://www.w3.org/2001/XMLSchema#boolean'));\n\n/**\n * Materialize a term with the given binding.\n *\n * If the given term is a variable,\n * and that variable exist in the given bindings object,\n * the value of that binding is returned.\n * In all other cases, the term itself is returned.\n *\n * @param {RDF.Term} term A term.\n * @param {Bindings} bindings A bindings object.\n * @return {RDF.Term} The materialized term.\n */\nexport function materializeTerm(term: RDF.Term, bindings: Bindings): RDF.Term {\n  if (term.termType === 'Variable') {\n    const value = bindings.get(term);\n    if (value) {\n      return value;\n    }\n  }\n  if (term.termType === 'Quad' && someTermsNested(term, value => value.termType === 'Variable')) {\n    return mapTermsNested(term, subTerm => materializeTerm(subTerm, bindings));\n  }\n  return term;\n}\n\n/**\n * Materialize the given operation (recursively) with the given bindings.\n * Essentially, all variables in the given operation will be replaced\n * by the terms bound to the variables in the given bindings.\n * @param {Algebra.Operation} operation SPARQL algebra operation.\n * @param {Bindings} bindings A bindings object.\n * @param bindingsFactory The bindings factory.\n * @param options Options for materializations.\n * @param options.strictTargetVariables If target variable bindings (such as on SELECT or BIND) should not be allowed.\n * @param options.bindFilter If filter expressions should be materialized\n * @return Algebra.Operation A new operation materialized with the given bindings.\n */\nexport function materializeOperation(\n  operation: Algebra.Operation,\n  bindings: Bindings,\n  bindingsFactory: BindingsFactory,\n  options: {\n    strictTargetVariables?: boolean;\n    bindFilter?: boolean;\n  } = {},\n): Algebra.Operation {\n  options = {\n    strictTargetVariables: 'strictTargetVariables' in options ? options.strictTargetVariables : false,\n    bindFilter: 'bindFilter' in options ? options.bindFilter : true,\n  };\n\n  return Util.mapOperation(operation, {\n    path(op: Algebra.Path, factory: Factory) {\n      // Materialize variables in a path expression.\n      // The predicate expression will be recursed.\n      return {\n        recurse: false,\n        result: Object.assign(factory.createPath(\n          materializeTerm(op.subject, bindings),\n          op.predicate,\n          materializeTerm(op.object, bindings),\n          materializeTerm(op.graph, bindings),\n        ), { metadata: op.metadata }),\n      };\n    },\n    pattern(op: Algebra.Pattern, factory: Factory) {\n      // Materialize variables in the quad pattern.\n      return {\n        recurse: false,\n        result: Object.assign(factory.createPattern(\n          materializeTerm(op.subject, bindings),\n          materializeTerm(op.predicate, bindings),\n          materializeTerm(op.object, bindings),\n          materializeTerm(op.graph, bindings),\n        ), { metadata: op.metadata }),\n      };\n    },\n    extend(op: Algebra.Extend) {\n      // Materialize an extend operation.\n      // If strictTargetVariables is true, we throw if the extension target variable is attempted to be bound.\n      // Otherwise, we remove the extend operation.\n      if (bindings.has(op.variable)) {\n        if (options.strictTargetVariables) {\n          throw new Error(`Tried to bind variable ${termToString(op.variable)} in a BIND operator.`);\n        } else {\n          return {\n            recurse: true,\n            result: materializeOperation(op.input, bindings, bindingsFactory, options),\n          };\n        }\n      }\n      return {\n        recurse: true,\n        result: op,\n      };\n    },\n    group(op: Algebra.Group, factory: Factory) {\n      // Materialize a group operation.\n      // If strictTargetVariables is true, we throw if the group target variable is attempted to be bound.\n      // Otherwise, we just filter out the bound variables.\n      if (options.strictTargetVariables) {\n        for (const variable of op.variables) {\n          if (bindings.has(variable)) {\n            throw new Error(`Tried to bind variable ${termToString(variable)} in a GROUP BY operator.`);\n          }\n        }\n        return {\n          recurse: true,\n          result: op,\n        };\n      }\n      const variables = op.variables.filter(variable => !bindings.has(variable));\n      return {\n        recurse: true,\n        result: factory.createGroup(\n          op.input,\n          variables,\n          op.aggregates,\n        ),\n      };\n    },\n    project(op: Algebra.Project, factory: Factory) {\n      // Materialize a project operation.\n      // If strictTargetVariables is true, we throw if the project target variable is attempted to be bound.\n      // Otherwise, we just filter out the bound variables.\n      if (options.strictTargetVariables) {\n        for (const variable of op.variables) {\n          if (bindings.has(variable)) {\n            throw new Error(`Tried to bind variable ${termToString(variable)} in a SELECT operator.`);\n          }\n        }\n        return {\n          recurse: true,\n          result: op,\n        };\n      }\n\n      const variables = op.variables.filter(variable => !bindings.has(variable));\n\n      // Only include projected variables in the sub-bindings that will be passed down recursively.\n      // If we don't do this, we may be binding variables that may have the same label, but are not considered equal.\n      const subBindings = bindingsFactory.bindings(<[RDF.Variable, RDF.Term][]> op.variables.map((variable) => {\n        const binding = bindings.get(variable);\n        if (binding) {\n          return [ variable, binding ];\n        }\n        // eslint-disable-next-line no-useless-return,array-callback-return\n        return;\n      }).filter(Boolean));\n\n      return {\n        recurse: false,\n        result: factory.createProject(\n          materializeOperation(\n            op.input,\n            subBindings,\n            bindingsFactory,\n            options,\n          ),\n          variables,\n        ),\n      };\n    },\n    values(op: Algebra.Values, factory: Factory) {\n      // Materialize a values operation.\n      // If strictTargetVariables is true, we throw if the values target variable is attempted to be bound.\n      // Otherwise, we just filter out the bound variables and their bindings.\n      if (options.strictTargetVariables) {\n        for (const variable of op.variables) {\n          if (bindings.has(variable)) {\n            throw new Error(`Tried to bind variable ${termToString(variable)} in a VALUES operator.`);\n          }\n        }\n      } else {\n        const variables = op.variables.filter(variable => !bindings.has(variable));\n        const valueBindings: Record<string, RDF.Literal | RDF.NamedNode>[] = <any> op.bindings.map((binding) => {\n          const newBinding = { ...binding };\n          let valid = true;\n          // eslint-disable-next-line unicorn/no-array-for-each\n          bindings.forEach((value: RDF.Term, key: RDF.Variable) => {\n            const keyString = termToString(key);\n            if (keyString in newBinding) {\n              if (!value.equals(newBinding[keyString])) {\n                // If the value of the binding is not equal, remove this binding completely from the VALUES clause\n                valid = false;\n              }\n              delete newBinding[keyString];\n            }\n          });\n          return valid ? newBinding : undefined;\n        }).filter(Boolean);\n        return {\n          recurse: true,\n          result: factory.createValues(\n            variables,\n            valueBindings,\n          ),\n        };\n      }\n      return {\n        recurse: false,\n        result: op,\n      };\n    },\n    expression(op: Algebra.Expression, factory: Factory) {\n      if (!options.bindFilter) {\n        return {\n          recurse: false,\n          result: op,\n        };\n      }\n\n      if (op.expressionType === 'term') {\n        // Materialize a term expression\n        return {\n          recurse: false,\n          result: factory.createTermExpression(materializeTerm(op.term, bindings)),\n        };\n      }\n      if (op.expressionType === 'operator') {\n        if (op.operator === 'bound' && op.args.length === 1 && op.args[0].expressionType === 'term' &&\n          [ ...bindings.keys() ].some(variable => op.args[0].term.equals(variable))) {\n          return {\n            recurse: false,\n            result: factory.createTermExpression(TRUE),\n          };\n        }\n        return {\n          recurse: true,\n          result: op,\n        };\n      }\n      if (op.expressionType === 'aggregate' &&\n        'variable' in op &&\n        bindings.has(<RDF.Variable> op.variable)) {\n        // Materialize a bound aggregate operation.\n        // If strictTargetVariables is true, we throw if the expression target variable is attempted to be bound.\n        // Otherwise, we ignore this operation.\n        if (options.strictTargetVariables) {\n          throw new Error(`Tried to bind ${termToString(op.variable)} in a ${op.aggregator} aggregate.`);\n        } else {\n          return {\n            recurse: true,\n            result: op,\n          };\n        }\n      }\n      return {\n        recurse: true,\n        result: op,\n      };\n    },\n  });\n}\n"]}
+{"version":3,"file":"Bindings.js","sourceRoot":"","sources":["Bindings.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BindingsFactory } from '@comunica/bindings-factory';\nimport type { Bindings } from '@comunica/types';\nimport type * as RDF from '@rdfjs/types';\nimport type { Variable } from 'rdf-data-factory';\nimport { DataFactory } from 'rdf-data-factory';\nimport { termToString } from 'rdf-string';\nimport { mapTermsNested, someTermsNested } from 'rdf-terms';\nimport type { Algebra, Factory } from 'sparqlalgebrajs';\nimport { Util } from 'sparqlalgebrajs';\n\nconst DF = new DataFactory();\n\nconst TRUE = DF.literal('true', DF.namedNode('http://www.w3.org/2001/XMLSchema#boolean'));\n\n/**\n * Materialize a term with the given binding.\n *\n * If the given term is a variable,\n * and that variable exist in the given bindings object,\n * the value of that binding is returned.\n * In all other cases, the term itself is returned.\n *\n * @param {RDF.Term} term A term.\n * @param {Bindings} bindings A bindings object.\n * @return {RDF.Term} The materialized term.\n */\nexport function materializeTerm(term: RDF.Term, bindings: Bindings): RDF.Term {\n  if (term.termType === 'Variable') {\n    const value = bindings.get(term);\n    if (value) {\n      return value;\n    }\n  }\n  if (term.termType === 'Quad' && someTermsNested(term, value => value.termType === 'Variable')) {\n    return mapTermsNested(term, subTerm => materializeTerm(subTerm, bindings));\n  }\n  return term;\n}\n\n/**\n * Materialize the given operation (recursively) with the given bindings.\n * Essentially, the variables in the given operation\n * which don't appear in the projection operation will be replaced\n * by the terms bound to the variables in the given bindings.\n * @param {Algebra.Operation} operation SPARQL algebra operation.\n * And the variables that appear in the projection operation\n * will be added to a new values operation.\n * @param {Bindings} bindings A bindings object.\n * @param bindingsFactory The bindings factory.\n * @param options Options for materializations.\n * @param options.strictTargetVariables If target variable bindings (such as on SELECT or BIND) should not be allowed.\n * @param options.bindFilter If filter expressions should be materialized.\n * @param options.originalBindings The bindings object as it was at the top level call of materializeOperation.\n * @return Algebra.Operation A new operation materialized with the given bindings.\n */\nexport function materializeOperation(\n  operation: Algebra.Operation,\n  bindings: Bindings,\n  bindingsFactory: BindingsFactory,\n  options: {\n    strictTargetVariables?: boolean;\n    bindFilter?: boolean;\n    originalBindings?: Bindings;\n  } = {},\n): Algebra.Operation {\n  options = {\n    strictTargetVariables: 'strictTargetVariables' in options ? options.strictTargetVariables : false,\n    bindFilter: 'bindFilter' in options ? options.bindFilter : true,\n    originalBindings: 'originalBindings' in options ? options.originalBindings : bindings,\n  };\n\n  return Util.mapOperation(operation, {\n    path(op: Algebra.Path, factory: Factory) {\n      // Materialize variables in a path expression.\n      // The predicate expression will be recursed.\n      return {\n        recurse: false,\n        result: Object.assign(factory.createPath(\n          materializeTerm(op.subject, bindings),\n          op.predicate,\n          materializeTerm(op.object, bindings),\n          materializeTerm(op.graph, bindings),\n        ), { metadata: op.metadata }),\n      };\n    },\n    pattern(op: Algebra.Pattern, factory: Factory) {\n      // Materialize variables in the quad pattern.\n      return {\n        recurse: false,\n        result: Object.assign(factory.createPattern(\n          materializeTerm(op.subject, bindings),\n          materializeTerm(op.predicate, bindings),\n          materializeTerm(op.object, bindings),\n          materializeTerm(op.graph, bindings),\n        ), { metadata: op.metadata }),\n      };\n    },\n    extend(op: Algebra.Extend) {\n      // Materialize an extend operation.\n      // If strictTargetVariables is true, we throw if the extension target variable is attempted to be bound.\n      // Otherwise, we remove the extend operation.\n      if (bindings.has(op.variable)) {\n        if (options.strictTargetVariables) {\n          throw new Error(`Tried to bind variable ${termToString(op.variable)} in a BIND operator.`);\n        } else {\n          return {\n            recurse: true,\n            result: materializeOperation(op.input, bindings, bindingsFactory, options),\n          };\n        }\n      }\n      return {\n        recurse: true,\n        result: op,\n      };\n    },\n    group(op: Algebra.Group, factory: Factory) {\n      // Materialize a group operation.\n      // If strictTargetVariables is true, we throw if the group target variable is attempted to be bound.\n      // Otherwise, we just filter out the bound variables.\n      if (options.strictTargetVariables) {\n        for (const variable of op.variables) {\n          if (bindings.has(variable)) {\n            throw new Error(`Tried to bind variable ${termToString(variable)} in a GROUP BY operator.`);\n          }\n        }\n        return {\n          recurse: true,\n          result: op,\n        };\n      }\n      const variables = op.variables.filter(variable => !bindings.has(variable));\n      return {\n        recurse: true,\n        result: factory.createGroup(\n          op.input,\n          variables,\n          op.aggregates,\n        ),\n      };\n    },\n    project(op: Algebra.Project, factory: Factory) {\n      // Materialize a project operation.\n      // If strictTargetVariables is true, we throw if the project target variable is attempted to be bound.\n      // Otherwise, we make a values clause out of the target variable and its value in InitialBindings.\n      if (options.strictTargetVariables) {\n        for (const variable of op.variables) {\n          if (bindings.has(variable)) {\n            throw new Error(`Tried to bind variable ${termToString(variable)} in a SELECT operator.`);\n          }\n        }\n        return {\n          recurse: true,\n          result: op,\n        };\n      }\n\n      // Only include non-projected variables in the bindings that will be passed down recursively.\n      // This will result in non-projected variables being replaced with their InitialBindings values.\n      for (const bindingKey of bindings.keys()) {\n        for (const curVariable of op.variables) {\n          if (curVariable.equals(bindingKey)) {\n            bindings = bindings.delete(bindingKey);\n            break;\n          }\n        }\n      }\n\n      // Find projected variables which are present in the originalBindings.\n      // This will result in projected variables being handled via a values clause.\n      const values: Algebra.Operation[] =\n      createValuesFromBindings(factory, <Bindings> options.originalBindings, op.variables);\n\n      let recursionResult: Algebra.Operation = materializeOperation(\n        op.input,\n        bindings,\n        bindingsFactory,\n        options,\n      );\n\n      if (values.length > 0) {\n        recursionResult = factory.createJoin([ ...values, recursionResult ]);\n      }\n\n      return {\n        recurse: false,\n        result: factory.createProject(recursionResult, op.variables),\n      };\n    },\n    filter(op: Algebra.Filter, factory: Factory) {\n      const originalBindings: Bindings = <Bindings> options.originalBindings;\n      if (op.expression.expressionType !== 'operator' || originalBindings.size === 0) {\n        return {\n          recurse: false,\n          result: op,\n        };\n      }\n\n      // Make a values clause using all the variables from originalBindings.\n      const values: Algebra.Operation[] = createValuesFromBindings(factory, originalBindings);\n\n      // Recursively materialize the filter expression\n      const recursionResultExpression: Algebra.Expression = <Algebra.Expression> materializeOperation(\n        op.expression,\n        bindings,\n        bindingsFactory,\n        options,\n      );\n\n      // Recursively materialize the filter input\n      let recursionResultInput: Algebra.Operation = materializeOperation(\n        op.input,\n        bindings,\n        bindingsFactory,\n        options,\n      );\n\n      if (values.length > 0) {\n        recursionResultInput = factory.createJoin([ ...values, recursionResultInput ]);\n      }\n\n      return {\n        // Recursion already taken care of above.\n        recurse: false,\n        result: factory.createFilter(recursionResultInput, recursionResultExpression),\n      };\n    },\n    values(op: Algebra.Values, factory: Factory) {\n      // Materialize a values operation.\n      // If strictTargetVariables is true, we throw if the values target variable is attempted to be bound.\n      // Otherwise, we just filter out the bound variables and their bindings.\n      if (options.strictTargetVariables) {\n        for (const variable of op.variables) {\n          if (bindings.has(variable)) {\n            throw new Error(`Tried to bind variable ${termToString(variable)} in a VALUES operator.`);\n          }\n        }\n      } else {\n        const variables = op.variables.filter(variable => !bindings.has(variable));\n        const valueBindings: Record<string, RDF.Literal | RDF.NamedNode>[] = <any> op.bindings.map((binding) => {\n          const newBinding = { ...binding };\n          let valid = true;\n          // eslint-disable-next-line unicorn/no-array-for-each\n          bindings.forEach((value: RDF.Term, key: RDF.Variable) => {\n            const keyString = termToString(key);\n            if (keyString in newBinding) {\n              if (!value.equals(newBinding[keyString])) {\n                // If the value of the binding is not equal, remove this binding completely from the VALUES clause\n                valid = false;\n              }\n              delete newBinding[keyString];\n            }\n          });\n          return valid ? newBinding : undefined;\n        }).filter(Boolean);\n        return {\n          recurse: true,\n          result: factory.createValues(\n            variables,\n            valueBindings,\n          ),\n        };\n      }\n      return {\n        recurse: false,\n        result: op,\n      };\n    },\n    expression(op: Algebra.Expression, factory: Factory) {\n      if (!options.bindFilter) {\n        return {\n          recurse: false,\n          result: op,\n        };\n      }\n\n      if (op.expressionType === 'term') {\n        // Materialize a term expression\n        return {\n          recurse: false,\n          result: factory.createTermExpression(materializeTerm(op.term, bindings)),\n        };\n      }\n      if (op.expressionType === 'operator') {\n        if (op.operator === 'bound' && op.args.length === 1 && op.args[0].expressionType === 'term' &&\n          [ ...bindings.keys() ].some(variable => op.args[0].term.equals(variable))) {\n          return {\n            recurse: false,\n            result: factory.createTermExpression(TRUE),\n          };\n        }\n        return {\n          recurse: true,\n          result: op,\n        };\n      }\n      if (op.expressionType === 'aggregate' &&\n        'variable' in op &&\n        bindings.has(<RDF.Variable> op.variable)) {\n        // Materialize a bound aggregate operation.\n        // If strictTargetVariables is true, we throw if the expression target variable is attempted to be bound.\n        // Otherwise, we ignore this operation.\n        if (options.strictTargetVariables) {\n          throw new Error(`Tried to bind ${termToString(op.variable)} in a ${op.aggregator} aggregate.`);\n        } else {\n          return {\n            recurse: true,\n            result: op,\n          };\n        }\n      }\n      return {\n        recurse: true,\n        result: op,\n      };\n    },\n  });\n}\n\n/**\n * Make a values operation containing the values that are present in `bindings` for variables present in `variables`.\n * If no `variables` argument is given, this method returns a values operation\n * containing every binding from `bindings`.\n * @param {Factory} factory The Factory used to create the values operation.\n * @param {Bindings} bindings A bindings object.\n * @param {Variable[]} variables A list of variables.\n * @returns Algebra.Values A new values operation the given bindings.\n */\nfunction createValuesFromBindings(factory: Factory, bindings: Bindings, variables?: Variable[]): Algebra.Values[] {\n  const values: Algebra.Values[] = [];\n\n  for (const [ variable, binding ] of bindings) {\n    if (!variables || variables.some(v => v.equals(variable))) {\n      const newBinding = { [termToString(variable)]: <RDF.NamedNode | RDF.Literal> binding };\n\n      values.push(factory.createValues([ variable ], [ newBinding ]));\n    }\n  }\n\n  return values;\n}\n"]}

package/lib/ClosableIterator.d.ts

@@ -0,0 +1,18 @@
+import { AsyncIterator, DESTINATION } from 'asynciterator';
+type InternalSource<T> = AsyncIterator<T> & {
+    [DESTINATION]?: AsyncIterator<any>;
+};
+/**
+ * An AsyncIterator with a callback for when this iterator is closed in any way.
+ * In contrast to ClosableTransformIterator, this does not add the overhead of a TransformIterator.
+ */
+export declare class ClosableIterator<S> extends AsyncIterator<S> {
+    protected readonly _source: InternalSource<S>;
+    private readonly onClose;
+    constructor(source: AsyncIterator<S>, options: {
+        onClose: () => void;
+    });
+    read(): S | null;
+    protected _end(destroy: boolean): void;
+}
+export {};

package/lib/ClosableIterator.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClosableIterator = void 0;
+const asynciterator_1 = require("asynciterator");
+/**
+ * An AsyncIterator with a callback for when this iterator is closed in any way.
+ * In contrast to ClosableTransformIterator, this does not add the overhead of a TransformIterator.
+ */
+class ClosableIterator extends asynciterator_1.AsyncIterator {
+    constructor(source, options) {
+        super();
+        this.onClose = options.onClose;
+        this._source = source;
+        // Wire up the source for reading
+        this._source[asynciterator_1.DESTINATION] = this;
+        this._source.on('end', destinationClose);
+        this._source.on('error', destinationEmitError);
+        this._source.on('readable', destinationSetReadable);
+        this.readable = this._source.readable;
+    }
+    read() {
+        const ret = this._source.read();
+        if (!ret) {
+            // Mark as non-readable if ret was null
+            this.readable = false;
+            // Close this iterator if the source is empty
+            if (this._source.done) {
+                this.close();
+            }
+        }
+        return ret;
+    }
+    _end(destroy) {
+        this.onClose();
+        this._source.removeListener('end', destinationClose);
+        this._source.removeListener('error', destinationEmitError);
+        this._source.removeListener('readable', destinationSetReadable);
+        delete this._source[asynciterator_1.DESTINATION];
+        this._source.destroy();
+        super._end(destroy);
+    }
+}
+exports.ClosableIterator = ClosableIterator;
+// Helpers below are copied from AsyncIterator, as they are not exported from there.
+function destinationSetReadable() {
+    this[asynciterator_1.DESTINATION].readable = true;
+}
+function destinationEmitError(error) {
+    this[asynciterator_1.DESTINATION].emit('error', error);
+}
+function destinationClose() {
+    this[asynciterator_1.DESTINATION].close();
+}
+//# sourceMappingURL=ClosableIterator.js.map

package/lib/ClosableIterator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClosableIterator.js","sourceRoot":"","sources":["ClosableIterator.ts"],"names":[],"mappings":";;;AAAA,iDAA2D;AAK3D;;;GAGG;AACH,MAAa,gBAAoB,SAAQ,6BAAgB;IAIvD,YAAmB,MAAwB,EAAE,OAAgC;QAC3E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAuB,MAAM,CAAC;QAE1C,iCAAiC;QACjC,IAAI,CAAC,OAAO,CAAC,2BAAW,CAAC,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IACxC,CAAC;IAEe,IAAI;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,uCAAuC;YACvC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YAEtB,6CAA6C;YAC7C,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACtB,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEkB,IAAI,CAAC,OAAgB;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,OAAO,CAAC,2BAAW,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC;CACF;AAzCD,4CAyCC;AAED,oFAAoF;AAEpF,SAAS,sBAAsB;IAC7B,IAAI,CAAC,2BAAW,CAAE,CAAC,QAAQ,GAAG,IAAI,CAAC;AACrC,CAAC;AACD,SAAS,oBAAoB,CAA6B,KAAY;IACpE,IAAI,CAAC,2BAAW,CAAE,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAC1C,CAAC;AACD,SAAS,gBAAgB;IACvB,IAAI,CAAC,2BAAW,CAAE,CAAC,KAAK,EAAE,CAAC;AAC7B,CAAC","sourcesContent":["import { AsyncIterator, DESTINATION } from 'asynciterator';\n\ntype InternalSource<T> =\n  AsyncIterator<T> & { [DESTINATION]?: AsyncIterator<any> };\n\n/**\n * An AsyncIterator with a callback for when this iterator is closed in any way.\n * In contrast to ClosableTransformIterator, this does not add the overhead of a TransformIterator.\n */\nexport class ClosableIterator<S> extends AsyncIterator<S> {\n  protected readonly _source: InternalSource<S>;\n  private readonly onClose: () => void;\n\n  public constructor(source: AsyncIterator<S>, options: { onClose: () => void }) {\n    super();\n    this.onClose = options.onClose;\n    this._source = <InternalSource<S>> source;\n\n    // Wire up the source for reading\n    this._source[DESTINATION] = this;\n    this._source.on('end', destinationClose);\n    this._source.on('error', destinationEmitError);\n    this._source.on('readable', destinationSetReadable);\n    this.readable = this._source.readable;\n  }\n\n  public override read(): S | null {\n    const ret = this._source.read();\n    if (!ret) {\n      // Mark as non-readable if ret was null\n      this.readable = false;\n\n      // Close this iterator if the source is empty\n      if (this._source.done) {\n        this.close();\n      }\n    }\n    return ret;\n  }\n\n  protected override _end(destroy: boolean): void {\n    this.onClose();\n\n    this._source.removeListener('end', destinationClose);\n    this._source.removeListener('error', destinationEmitError);\n    this._source.removeListener('readable', destinationSetReadable);\n    delete this._source[DESTINATION];\n    this._source.destroy();\n    super._end(destroy);\n  }\n}\n\n// Helpers below are copied from AsyncIterator, as they are not exported from there.\n\nfunction destinationSetReadable<S>(this: InternalSource<S>): void {\n  this[DESTINATION]!.readable = true;\n}\nfunction destinationEmitError<S>(this: InternalSource<S>, error: Error): void {\n  this[DESTINATION]!.emit('error', error);\n}\nfunction destinationClose<S>(this: InternalSource<S>): void {\n  this[DESTINATION]!.close();\n}\n"]}

package/lib/index.d.ts

@@ -3,4 +3,5 @@ export * from './ActorQueryOperationTyped';
 export * from './ActorQueryOperationTypedMediated';
 export * from './Bindings';
 export * from './BusQueryOperation';
+export * from './ClosableIterator';
 export * from './ClosableTransformIterator';

package/lib/index.js

@@ -19,5 +19,6 @@ __exportStar(require("./ActorQueryOperationTyped"), exports);
 __exportStar(require("./ActorQueryOperationTypedMediated"), exports);
 __exportStar(require("./Bindings"), exports);
 __exportStar(require("./BusQueryOperation"), exports);
+__exportStar(require("./ClosableIterator"), exports);
 __exportStar(require("./ClosableTransformIterator"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,6DAA2C;AAC3C,qEAAmD;AACnD,6CAA2B;AAC3B,sDAAoC;AACpC,8DAA4C","sourcesContent":["export * from './ActorQueryOperation';\nexport * from './ActorQueryOperationTyped';\nexport * from './ActorQueryOperationTypedMediated';\nexport * from './Bindings';\nexport * from './BusQueryOperation';\nexport * from './ClosableTransformIterator';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,6DAA2C;AAC3C,qEAAmD;AACnD,6CAA2B;AAC3B,sDAAoC;AACpC,qDAAmC;AACnC,8DAA4C","sourcesContent":["export * from './ActorQueryOperation';\nexport * from './ActorQueryOperationTyped';\nexport * from './ActorQueryOperationTypedMediated';\nexport * from './Bindings';\nexport * from './BusQueryOperation';\nexport * from './ClosableIterator';\nexport * from './ClosableTransformIterator';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/bus-query-operation",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "A comunica bus for query-operation events.",
   "lsd:module": true,
   "license": "MIT",
@@ -36,18 +36,18 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/bindings-factory": "^3.2.0",
-    "@comunica/context-entries": "^3.2.0",
-    "@comunica/core": "^3.2.0",
+    "@comunica/bindings-factory": "^3.2.1",
+    "@comunica/context-entries": "^3.2.1",
+    "@comunica/core": "^3.2.1",
     "@comunica/data-factory": "^3.1.0",
-    "@comunica/metadata": "^3.2.0",
-    "@comunica/types": "^3.2.0",
+    "@comunica/metadata": "^3.2.1",
+    "@comunica/types": "^3.2.1",
     "@rdfjs/types": "*",
     "asynciterator": "^3.9.0",
     "rdf-data-factory": "^1.1.2",
     "rdf-string": "^1.6.1",
     "rdf-terms": "^1.11.0",
-    "sparqlalgebrajs": "^4.3.3"
+    "sparqlalgebrajs": "^4.3.7"
   },
-  "gitHead": "87baf2afed021a254859e64b92f34d9b51c6a7db"
+  "gitHead": "fbcc3a81f87738633ddf69ede5ca504236f7edd9"
 }