@comunica/actor-query-operation-leftjoin 4.4.0 → 4.4.2-alpha.49.0

package/components/ActorQueryOperationLeftJoin.jsonld

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

package/lib/ActorQueryOperationLeftJoin.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 type { Algebra } from 'sparqlalgebrajs';
+import { Algebra } from '@comunica/utils-algebra';
 /**
  * A comunica LeftJoin Query Operation Actor.
  */

package/lib/ActorQueryOperationLeftJoin.js

@@ -4,21 +4,21 @@ exports.ActorQueryOperationLeftJoin = void 0;
 const bus_query_operation_1 = require("@comunica/bus-query-operation");
 const context_entries_1 = require("@comunica/context-entries");
 const core_1 = require("@comunica/core");
+const utils_algebra_1 = require("@comunica/utils-algebra");
 const utils_query_operation_1 = require("@comunica/utils-query-operation");
-const sparqlalgebrajs_1 = require("sparqlalgebrajs");
 /**
  * A comunica LeftJoin Query Operation Actor.
  */
 class ActorQueryOperationLeftJoin extends bus_query_operation_1.ActorQueryOperationTypedMediated {
     constructor(args) {
-        super(args, 'leftjoin');
+        super(args, utils_algebra_1.Algebra.Types.LEFT_JOIN);
     }
     async testOperation(_operation, _context) {
         return (0, core_1.passTestVoid)();
     }
     async runOperation(operationOriginal, context) {
         const dataFactory = context.getSafe(context_entries_1.KeysInitQuery.dataFactory);
-        const algebraFactory = new sparqlalgebrajs_1.Factory(dataFactory);
+        const algebraFactory = new utils_algebra_1.AlgebraFactory(dataFactory);
         // Delegate to join bus
         const entries = (await Promise.all(operationOriginal.input
             .map(async (subOperation, index) => {

package/lib/ActorQueryOperationLeftJoin.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActorQueryOperationLeftJoin.js","sourceRoot":"","sources":["ActorQueryOperationLeftJoin.ts"],"names":[],"mappings":";;;AACA,uEAAiF;AAEjF,+DAA0D;AAE1D,yCAA8C;AAE9C,2EAAkE;AAElE,qDAA0C;AAE1C;;GAEG;AACH,MAAa,2BAA4B,SAAQ,sDAAkD;IAGjG,YAAmB,IAAsC;QACvD,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,UAA4B,EAAE,QAAwB;QAC/E,OAAO,IAAA,mBAAY,GAAE,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,iBAAmC,EAAE,OAAuB;QAEpF,MAAM,WAAW,GAAwB,OAAO,CAAC,OAAO,CAAC,+BAAa,CAAC,WAAW,CAAC,CAAC;QACpF,MAAM,cAAc,GAAG,IAAI,yBAAO,CAAC,WAAW,CAAC,CAAC;QAEhD,uBAAuB;QACvB,MAAM,OAAO,GAAiB,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK;aACrE,GAAG,CAAC,KAAK,EAAC,YAAY,EAAE,KAAK,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,IAAA,uCAAe,EAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YAEhH,6CAA6C;YAC7C,wDAAwD;YACxD,2BAA2B;YAC3B,IAAI,iBAAiB,CAAC,UAAU,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChD,OAAO;oBACL,MAAM;oBACN,SAAS,EAAE,cAAc,CAAC,YAAY,CAAC,YAAY,EAAE,iBAAiB,CAAC,UAAU,CAAC;oBAClF,iBAAiB,EAAE,IAAI;iBACxB,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,MAAM;gBACN,SAAS,EAAE,YAAY;aACxB,CAAC;QACJ,CAAC,CAAC,CAAC,CAAC,CAAC;QAEP,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACjF,CAAC;CACF;AAxCD,kEAwCC","sourcesContent":["import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';\nimport { ActorQueryOperationTypedMediated } from '@comunica/bus-query-operation';\nimport type { MediatorRdfJoin } from '@comunica/bus-rdf-join';\nimport { KeysInitQuery } from '@comunica/context-entries';\nimport type { IActorTest, TestResult } from '@comunica/core';\nimport { passTestVoid } from '@comunica/core';\nimport type { ComunicaDataFactory, IActionContext, IJoinEntry, IQueryOperationResult } from '@comunica/types';\nimport { getSafeBindings } from '@comunica/utils-query-operation';\nimport type { Algebra } from 'sparqlalgebrajs';\nimport { Factory } from 'sparqlalgebrajs';\n\n/**\n * A comunica LeftJoin Query Operation Actor.\n */\nexport class ActorQueryOperationLeftJoin extends ActorQueryOperationTypedMediated<Algebra.LeftJoin> {\n  public readonly mediatorJoin: MediatorRdfJoin;\n\n  public constructor(args: IActorQueryOperationLeftJoinArgs) {\n    super(args, 'leftjoin');\n  }\n\n  public async testOperation(_operation: Algebra.LeftJoin, _context: IActionContext): Promise<TestResult<IActorTest>> {\n    return passTestVoid();\n  }\n\n  public async runOperation(operationOriginal: Algebra.LeftJoin, context: IActionContext):\n  Promise<IQueryOperationResult> {\n    const dataFactory: ComunicaDataFactory = context.getSafe(KeysInitQuery.dataFactory);\n    const algebraFactory = new Factory(dataFactory);\n\n    // Delegate to join bus\n    const entries: IJoinEntry[] = (await Promise.all(operationOriginal.input\n      .map(async(subOperation, index) => {\n        const output = getSafeBindings(await this.mediatorQueryOperation.mediate({ operation: subOperation, context }));\n\n        // If we have an expression in the left join,\n        // we attach the expression to the right-hand operation,\n        // and enforce a bind-join.\n        if (operationOriginal.expression && index === 1) {\n          return {\n            output,\n            operation: algebraFactory.createFilter(subOperation, operationOriginal.expression),\n            operationRequired: true,\n          };\n        }\n\n        return {\n          output,\n          operation: subOperation,\n        };\n      })));\n\n    return await this.mediatorJoin.mediate({ type: 'optional', entries, context });\n  }\n}\n\nexport interface IActorQueryOperationLeftJoinArgs extends IActorQueryOperationTypedMediatedArgs {\n  /**\n   * A mediator for joining Bindings streams\n   */\n  mediatorJoin: MediatorRdfJoin;\n}\n"]}
+{"version":3,"file":"ActorQueryOperationLeftJoin.js","sourceRoot":"","sources":["ActorQueryOperationLeftJoin.ts"],"names":[],"mappings":";;;AACA,uEAAiF;AAEjF,+DAA0D;AAE1D,yCAA8C;AAE9C,2DAAkE;AAClE,2EAAkE;AAElE;;GAEG;AACH,MAAa,2BAA4B,SAAQ,sDAAkD;IAGjG,YAAmB,IAAsC;QACvD,KAAK,CAAC,IAAI,EAAE,uBAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,UAA4B,EAAE,QAAwB;QAC/E,OAAO,IAAA,mBAAY,GAAE,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,iBAAmC,EAAE,OAAuB;QAEpF,MAAM,WAAW,GAAwB,OAAO,CAAC,OAAO,CAAC,+BAAa,CAAC,WAAW,CAAC,CAAC;QACpF,MAAM,cAAc,GAAG,IAAI,8BAAc,CAAC,WAAW,CAAC,CAAC;QAEvD,uBAAuB;QACvB,MAAM,OAAO,GAAiB,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK;aACrE,GAAG,CAAC,KAAK,EAAC,YAAY,EAAE,KAAK,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,IAAA,uCAAe,EAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YAEhH,6CAA6C;YAC7C,wDAAwD;YACxD,2BAA2B;YAC3B,IAAI,iBAAiB,CAAC,UAAU,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChD,OAAO;oBACL,MAAM;oBACN,SAAS,EAAE,cAAc,CAAC,YAAY,CAAC,YAAY,EAAE,iBAAiB,CAAC,UAAU,CAAC;oBAClF,iBAAiB,EAAE,IAAI;iBACxB,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,MAAM;gBACN,SAAS,EAAE,YAAY;aACxB,CAAC;QACJ,CAAC,CAAC,CAAC,CAAC,CAAC;QAEP,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACjF,CAAC;CACF;AAxCD,kEAwCC","sourcesContent":["import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';\nimport { ActorQueryOperationTypedMediated } from '@comunica/bus-query-operation';\nimport type { MediatorRdfJoin } from '@comunica/bus-rdf-join';\nimport { KeysInitQuery } from '@comunica/context-entries';\nimport type { IActorTest, TestResult } from '@comunica/core';\nimport { passTestVoid } from '@comunica/core';\nimport type { ComunicaDataFactory, IActionContext, IJoinEntry, IQueryOperationResult } from '@comunica/types';\nimport { Algebra, AlgebraFactory } from '@comunica/utils-algebra';\nimport { getSafeBindings } from '@comunica/utils-query-operation';\n\n/**\n * A comunica LeftJoin Query Operation Actor.\n */\nexport class ActorQueryOperationLeftJoin extends ActorQueryOperationTypedMediated<Algebra.LeftJoin> {\n  public readonly mediatorJoin: MediatorRdfJoin;\n\n  public constructor(args: IActorQueryOperationLeftJoinArgs) {\n    super(args, Algebra.Types.LEFT_JOIN);\n  }\n\n  public async testOperation(_operation: Algebra.LeftJoin, _context: IActionContext): Promise<TestResult<IActorTest>> {\n    return passTestVoid();\n  }\n\n  public async runOperation(operationOriginal: Algebra.LeftJoin, context: IActionContext):\n  Promise<IQueryOperationResult> {\n    const dataFactory: ComunicaDataFactory = context.getSafe(KeysInitQuery.dataFactory);\n    const algebraFactory = new AlgebraFactory(dataFactory);\n\n    // Delegate to join bus\n    const entries: IJoinEntry[] = (await Promise.all(operationOriginal.input\n      .map(async(subOperation, index) => {\n        const output = getSafeBindings(await this.mediatorQueryOperation.mediate({ operation: subOperation, context }));\n\n        // If we have an expression in the left join,\n        // we attach the expression to the right-hand operation,\n        // and enforce a bind-join.\n        if (operationOriginal.expression && index === 1) {\n          return {\n            output,\n            operation: algebraFactory.createFilter(subOperation, operationOriginal.expression),\n            operationRequired: true,\n          };\n        }\n\n        return {\n          output,\n          operation: subOperation,\n        };\n      })));\n\n    return await this.mediatorJoin.mediate({ type: 'optional', entries, context });\n  }\n}\n\nexport interface IActorQueryOperationLeftJoinArgs 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-leftjoin",
-  "version": "4.4.0",
+  "version": "4.4.2-alpha.49.0",
   "description": "A leftjoin query-operation actor",
   "lsd:module": true,
   "license": "MIT",
@@ -41,13 +41,13 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/bus-query-operation": "^4.4.0",
-    "@comunica/bus-rdf-join": "^4.4.0",
-    "@comunica/context-entries": "^4.4.0",
-    "@comunica/core": "^4.4.0",
-    "@comunica/types": "^4.4.0",
-    "@comunica/utils-query-operation": "^4.4.0",
-    "sparqlalgebrajs": "^4.3.8"
+    "@comunica/bus-query-operation": "4.4.2-alpha.49.0",
+    "@comunica/bus-rdf-join": "4.4.2-alpha.49.0",
+    "@comunica/context-entries": "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"
   },
-  "gitHead": "27acde56dfe0c1ff1162c1f46818ad752296ca88"
+  "gitHead": "ef6f96cfd8faf7c37955bb7e0fe9f6fc6a994bdf"
 }