@comunica/actor-query-operation-minus 4.4.2-alpha.49.0 → 4.5.0

package/components/ActorQueryOperationMinus.jsonld

@@ -15,17 +15,7 @@
           "@type": "GenericComponentExtension",
           "component": "cbqo:components/ActorQueryOperationTypedMediated.jsonld#ActorQueryOperationTypedMediated",
           "genericTypeInstances": [
-            {
-              "@type": "ParameterRangeIntersection",
-              "parameterRangeElements": [
-                {
-                  "@type": "ParameterRangeWildcard"
-                },
-                {
-                  "@type": "ParameterRangeWildcard"
-                }
-              ]
-            }
+            "urn:npm:sparqlalgebrajs:Minus"
           ]
         }
       ],

package/lib/ActorQueryOperationMinus.d.ts

@@ -3,7 +3,7 @@ import { ActorQueryOperationTypedMediated } from '@comunica/bus-query-operation'
 import type { MediatorRdfJoin } from '@comunica/bus-rdf-join';
 import type { IActorTest, TestResult } from '@comunica/core';
 import type { IActionContext, IQueryOperationResult } from '@comunica/types';
-import { Algebra } from '@comunica/utils-algebra';
+import type { Algebra } from 'sparqlalgebrajs';
 /**
  * A comunica Minus Query Operation Actor.
  */

package/lib/ActorQueryOperationMinus.js

@@ -3,21 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActorQueryOperationMinus = void 0;
 const bus_query_operation_1 = require("@comunica/bus-query-operation");
 const core_1 = require("@comunica/core");
-const utils_algebra_1 = require("@comunica/utils-algebra");
 const utils_query_operation_1 = require("@comunica/utils-query-operation");
 /**
  * A comunica Minus Query Operation Actor.
  */
 class ActorQueryOperationMinus extends bus_query_operation_1.ActorQueryOperationTypedMediated {
     constructor(args) {
-        super(args, utils_algebra_1.Algebra.Types.MINUS);
+        super(args, 'minus');
     }
     async testOperation(_operation, _context) {
         return (0, core_1.passTestVoid)();
     }
     async runOperation(operationOriginal, context) {
         // Propagate information about GRAPH ?g existing outside the MINUS scope to the join actor.
-        const graphVariableFromParentScope = operationOriginal.graphScopeVar;
+        const graphVariableFromParentScope = operationOriginal
+            .metadata?.graphVariableFromParentScope;
         const entries = (await Promise.all(operationOriginal.input
             .map(async (subOperation) => ({
             output: await this.mediatorQueryOperation.mediate({ operation: subOperation, context }),

package/lib/ActorQueryOperationMinus.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActorQueryOperationMinus.js","sourceRoot":"","sources":["ActorQueryOperationMinus.ts"],"names":[],"mappings":";;;AACA,uEAEuC;AAGvC,yCAA8C;AAE9C,2DAAkD;AAClD,2EAAkE;AAElE;;GAEG;AACH,MAAa,wBAAyB,SAAQ,sDAA+C;IAG3F,YAAmB,IAAmC;QACpD,KAAK,CAAC,IAAI,EAAE,uBAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,UAAyB,EAAE,QAAwB;QAC5E,OAAO,IAAA,mBAAY,GAAE,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,iBAAgC,EAChC,OAAuB;QAEvB,2FAA2F;QAC3F,MAAM,4BAA4B,GAAG,iBAAiB,CAAC,aAAa,CAAC;QAErE,MAAM,OAAO,GAAiB,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK;aACrE,GAAG,CAAC,KAAK,EAAC,YAAY,EAAC,EAAE,CAAC,CAAC;YAC1B,MAAM,EAAE,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;YACvF,SAAS,EAAE,YAAY;SACxB,CAAC,CAAC,CAAC,CAAC;aACJ,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/B,MAAM,EAAE,IAAA,uCAAe,EAAC,MAAM,CAAC;YAC/B,SAAS;SACV,CAAC,CAAC,CAAC;QAEN,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC;IACtG,CAAC;CACF;AA9BD,4DA8BC","sourcesContent":["import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';\nimport {\n  ActorQueryOperationTypedMediated,\n} from '@comunica/bus-query-operation';\nimport type { MediatorRdfJoin } from '@comunica/bus-rdf-join';\nimport type { IActorTest, TestResult } from '@comunica/core';\nimport { passTestVoid } from '@comunica/core';\nimport type { IActionContext, IQueryOperationResult, IJoinEntry } from '@comunica/types';\nimport { Algebra } from '@comunica/utils-algebra';\nimport { getSafeBindings } from '@comunica/utils-query-operation';\n\n/**\n * A comunica Minus Query Operation Actor.\n */\nexport class ActorQueryOperationMinus extends ActorQueryOperationTypedMediated<Algebra.Minus> {\n  public readonly mediatorJoin: MediatorRdfJoin;\n\n  public constructor(args: IActorQueryOperationMinusArgs) {\n    super(args, Algebra.Types.MINUS);\n  }\n\n  public async testOperation(_operation: Algebra.Minus, _context: IActionContext): Promise<TestResult<IActorTest>> {\n    return passTestVoid();\n  }\n\n  public async runOperation(\n    operationOriginal: Algebra.Minus,\n    context: IActionContext,\n  ): Promise<IQueryOperationResult> {\n    // Propagate information about GRAPH ?g existing outside the MINUS scope to the join actor.\n    const graphVariableFromParentScope = operationOriginal.graphScopeVar;\n\n    const entries: IJoinEntry[] = (await Promise.all(operationOriginal.input\n      .map(async subOperation => ({\n        output: await this.mediatorQueryOperation.mediate({ operation: subOperation, context }),\n        operation: subOperation,\n      }))))\n      .map(({ output, operation }) => ({\n        output: getSafeBindings(output),\n        operation,\n      }));\n\n    return this.mediatorJoin.mediate({ type: 'minus', entries, context, graphVariableFromParentScope });\n  }\n}\n\nexport interface IActorQueryOperationMinusArgs extends IActorQueryOperationTypedMediatedArgs {\n  /**\n   * A mediator for joining Bindings streams\n   */\n  mediatorJoin: MediatorRdfJoin;\n}\n"]}
+{"version":3,"file":"ActorQueryOperationMinus.js","sourceRoot":"","sources":["ActorQueryOperationMinus.ts"],"names":[],"mappings":";;;AACA,uEAEuC;AAGvC,yCAA8C;AAE9C,2EAAkE;AAIlE;;GAEG;AACH,MAAa,wBAAyB,SAAQ,sDAA+C;IAG3F,YAAmB,IAAmC;QACpD,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,UAAyB,EAAE,QAAwB;QAC5E,OAAO,IAAA,mBAAY,GAAE,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,iBAAgC,EAChC,OAAuB;QAEvB,2FAA2F;QAC3F,MAAM,4BAA4B,GAAmC,iBAAiB;aACnF,QAAQ,EAAE,4BAA4B,CAAC;QAE1C,MAAM,OAAO,GAAiB,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK;aACrE,GAAG,CAAC,KAAK,EAAC,YAAY,EAAC,EAAE,CAAC,CAAC;YAC1B,MAAM,EAAE,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;YACvF,SAAS,EAAE,YAAY;SACxB,CAAC,CAAC,CAAC,CAAC;aACJ,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/B,MAAM,EAAE,IAAA,uCAAe,EAAC,MAAM,CAAC;YAC/B,SAAS;SACV,CAAC,CAAC,CAAC;QAEN,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC;IACtG,CAAC;CACF;AA/BD,4DA+BC","sourcesContent":["import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';\nimport {\n  ActorQueryOperationTypedMediated,\n} from '@comunica/bus-query-operation';\nimport type { MediatorRdfJoin } from '@comunica/bus-rdf-join';\nimport type { IActorTest, TestResult } from '@comunica/core';\nimport { passTestVoid } from '@comunica/core';\nimport type { IActionContext, IQueryOperationResult, IJoinEntry } from '@comunica/types';\nimport { getSafeBindings } from '@comunica/utils-query-operation';\nimport type * as RDF from '@rdfjs/types';\nimport type { Algebra } from 'sparqlalgebrajs';\n\n/**\n * A comunica Minus Query Operation Actor.\n */\nexport class ActorQueryOperationMinus extends ActorQueryOperationTypedMediated<Algebra.Minus> {\n  public readonly mediatorJoin: MediatorRdfJoin;\n\n  public constructor(args: IActorQueryOperationMinusArgs) {\n    super(args, 'minus');\n  }\n\n  public async testOperation(_operation: Algebra.Minus, _context: IActionContext): Promise<TestResult<IActorTest>> {\n    return passTestVoid();\n  }\n\n  public async runOperation(\n    operationOriginal: Algebra.Minus,\n    context: IActionContext,\n  ): Promise<IQueryOperationResult> {\n    // Propagate information about GRAPH ?g existing outside the MINUS scope to the join actor.\n    const graphVariableFromParentScope: RDF.Variable | undefined = <any> operationOriginal\n      .metadata?.graphVariableFromParentScope;\n\n    const entries: IJoinEntry[] = (await Promise.all(operationOriginal.input\n      .map(async subOperation => ({\n        output: await this.mediatorQueryOperation.mediate({ operation: subOperation, context }),\n        operation: subOperation,\n      }))))\n      .map(({ output, operation }) => ({\n        output: getSafeBindings(output),\n        operation,\n      }));\n\n    return this.mediatorJoin.mediate({ type: 'minus', entries, context, graphVariableFromParentScope });\n  }\n}\n\nexport interface IActorQueryOperationMinusArgs extends IActorQueryOperationTypedMediatedArgs {\n  /**\n   * A mediator for joining Bindings streams\n   */\n  mediatorJoin: MediatorRdfJoin;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-query-operation-minus",
-  "version": "4.4.2-alpha.49.0",
+  "version": "4.5.0",
   "description": "A minus query-operation actor",
   "lsd:module": true,
   "license": "MIT",
@@ -41,12 +41,12 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/bus-query-operation": "4.4.2-alpha.49.0",
-    "@comunica/bus-rdf-join": "4.4.2-alpha.49.0",
-    "@comunica/core": "4.4.2-alpha.49.0",
-    "@comunica/types": "4.4.2-alpha.49.0",
-    "@comunica/utils-algebra": "4.4.2-alpha.49.0",
-    "@comunica/utils-query-operation": "4.4.2-alpha.49.0"
+    "@comunica/bus-query-operation": "^4.5.0",
+    "@comunica/bus-rdf-join": "^4.5.0",
+    "@comunica/core": "^4.5.0",
+    "@comunica/types": "^4.5.0",
+    "@comunica/utils-query-operation": "^4.5.0",
+    "sparqlalgebrajs": "^5.0.2"
   },
-  "gitHead": "ef6f96cfd8faf7c37955bb7e0fe9f6fc6a994bdf"
+  "gitHead": "2bcd98c387a021fc5c08d375793c205ca3d1bf0d"
 }