npm - @comunica/actor-query-operation-union - Versions diffs - 1.22.0 → 2.0.1-alpha.5.0 - Mend

@comunica/actor-query-operation-union 1.22.0 → 2.0.1-alpha.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/LICENSE.txt +2 -2
package/README.md +4 -4
package/components/ActorQueryOperationUnion.jsonld +169 -0
package/components/components.jsonld +5 -3
package/components/context.jsonld +34 -5
package/lib/ActorQueryOperationUnion.d.ts +9 -7
package/lib/ActorQueryOperationUnion.js +33 -24
package/lib/index.d.ts +1 -0
package/{index.js → lib/index.js} +1 -1
package/package.json +14 -38
package/components/Actor/QueryOperation/Union.jsonld +0 -21
package/index.d.ts +0 -1

package/LICENSE.txt CHANGED Viewed

@@ -1,7 +1,7 @@
 The MIT License (MIT)
-Copyright © 2017–2018 Ruben Taelman, Joachim Van Herwegen
-Ghent University – imec, Belgium
+Copyright © 2017–now Ruben Taelman, Joachim Van Herwegen
+Comunica Association and Ghent University – imec, Belgium
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md CHANGED Viewed

@@ -22,14 +22,14 @@ After installing, this package can be added to your engine's configuration as fo
 {
   "@context": [
     ...
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-union/^1.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-union/^2.0.0/components/context.jsonld"
   ],
   "actors": [
     ...
     {
-      "@id": "config-sets:sparql-queryoperators.json#myUnionQueryOperator",
+      "@id": "urn:comunica:default:query-operation/actors#union",
       "@type": "ActorQueryOperationUnion",
-      "cbqo:mediatorQueryOperation": { "@id": "config-sets:sparql-queryoperators.json#mediatorQueryOperation" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
     }
   ]
 }
@@ -37,4 +37,4 @@ After installing, this package can be added to your engine's configuration as fo
 ### Config Parameters
-* `cbqo:mediatorQueryOperation`: A mediator over the [Query Operation bus](https://github.com/comunica/comunica/tree/master/packages/bus-query-operation).
+* `mediatorQueryOperation`: A mediator over the [Query Operation bus](https://github.com/comunica/comunica/tree/master/packages/bus-query-operation).

package/components/ActorQueryOperationUnion.jsonld ADDED Viewed

@@ -0,0 +1,169 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-union/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/core/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-query-operation/^2.0.0/components/context.jsonld"
+  ],
+  "@id": "npmd:@comunica/actor-query-operation-union",
+  "components": [
+    {
+      "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion",
+      "@type": "Class",
+      "requireElement": "ActorQueryOperationUnion",
+      "extends": [
+        {
+          "@type": "GenericComponentExtension",
+          "component": "cbqo:components/ActorQueryOperationTypedMediated.jsonld#ActorQueryOperationTypedMediated",
+          "genericTypeInstances": [
+            "urn:npm:sparqlalgebrajs:Union"
+          ]
+        }
+      ],
+      "comment": "A comunica Union Query Operation Actor.",
+      "parameters": [
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_mediatorQueryOperation",
+          "range": "cc:components/Mediator.jsonld#Mediator"
+        },
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_name",
+          "range": "xsd:string",
+          "default": {
+            "@id": "rdf:subject"
+          },
+          "comment": "The name for this actor."
+        },
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_bus",
+          "range": {
+            "@type": "ParameterRangeGenericComponent",
+            "component": "cc:components/Bus.jsonld#Bus",
+            "genericTypeInstances": [
+              {
+                "@type": "ParameterRangeGenericComponent",
+                "component": "cc:components/Actor.jsonld#Actor",
+                "genericTypeInstances": [
+                  {
+                    "@type": "ParameterRangeGenericTypeReference",
+                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
+                  },
+                  {
+                    "@type": "ParameterRangeGenericTypeReference",
+                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
+                  },
+                  {
+                    "@type": "ParameterRangeGenericTypeReference",
+                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
+                  }
+                ]
+              },
+              {
+                "@type": "ParameterRangeGenericTypeReference",
+                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
+              },
+              {
+                "@type": "ParameterRangeGenericTypeReference",
+                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
+              },
+              {
+                "@type": "ParameterRangeGenericTypeReference",
+                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
+              }
+            ]
+          },
+          "default": {
+            "@id": "cbqo:components/ActorQueryOperation.jsonld#ActorQueryOperation_default_bus",
+            "@type": "cc:components/Bus.jsonld#Bus"
+          },
+          "comment": "The bus this actor subscribes to."
+        },
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_beforeActors",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              {
+                "@type": "ParameterRangeArray",
+                "parameterRangeValue": {
+                  "@type": "ParameterRangeGenericComponent",
+                  "component": "cc:components/Actor.jsonld#Actor",
+                  "genericTypeInstances": [
+                    {
+                      "@type": "ParameterRangeGenericTypeReference",
+                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
+                    },
+                    {
+                      "@type": "ParameterRangeGenericTypeReference",
+                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
+                    },
+                    {
+                      "@type": "ParameterRangeGenericTypeReference",
+                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^2.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
+                    }
+                  ]
+                }
+              },
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          },
+          "comment": "Actor that must be registered in the bus before this actor."
+        }
+      ],
+      "memberFields": [
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion__member_constructor",
+          "memberFieldName": "constructor"
+        },
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion__member_unionVariables",
+          "memberFieldName": "unionVariables"
+        },
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion__member_unionMetadata",
+          "memberFieldName": "unionMetadata"
+        },
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion__member_testOperation",
+          "memberFieldName": "testOperation"
+        },
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion__member_runOperation",
+          "memberFieldName": "runOperation"
+        }
+      ],
+      "constructorArguments": [
+        {
+          "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args__constructorArgument",
+          "fields": [
+            {
+              "keyRaw": "mediatorQueryOperation",
+              "value": {
+                "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_mediatorQueryOperation"
+              }
+            },
+            {
+              "keyRaw": "name",
+              "value": {
+                "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_name"
+              }
+            },
+            {
+              "keyRaw": "bus",
+              "value": {
+                "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_bus"
+              }
+            },
+            {
+              "keyRaw": "beforeActors",
+              "value": {
+                "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_beforeActors"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

package/components/components.jsonld CHANGED Viewed

@@ -1,9 +1,11 @@
 {
-  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-union/^1.0.0/components/context.jsonld",
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-union/^2.0.0/components/context.jsonld"
+  ],
   "@id": "npmd:@comunica/actor-query-operation-union",
   "@type": "Module",
   "requireName": "@comunica/actor-query-operation-union",
   "import": [
-    "files-caqou:components/Actor/QueryOperation/Union.jsonld"
+    "caqou:components/ActorQueryOperationUnion.jsonld"
   ]
-}
+}

package/components/context.jsonld CHANGED Viewed

@@ -3,10 +3,39 @@
     "https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^4.0.0/components/context.jsonld",
     {
       "npmd": "https://linkedsoftwaredependencies.org/bundles/npm/",
-      "caqou": "npmd:@comunica/actor-query-operation-union/",
-      "files-caqou": "caqou:^1.0.0/",
-      "ActorQueryOperationUnion": "caqou:Actor/QueryOperation/Union"
+      "caqou": "npmd:@comunica/actor-query-operation-union/^2.0.0/",
+      "ActorQueryOperationUnion": {
+        "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion",
+        "@prefix": true,
+        "@context": {
+          "args_mediatorQueryOperation": {
+            "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_mediatorQueryOperation"
+          },
+          "args_name": {
+            "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_name"
+          },
+          "args_bus": {
+            "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_bus"
+          },
+          "args_beforeActors": {
+            "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_beforeActors",
+            "@container": "@list"
+          },
+          "mediatorQueryOperation": {
+            "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_mediatorQueryOperation"
+          },
+          "name": {
+            "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_name"
+          },
+          "bus": {
+            "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_bus"
+          },
+          "beforeActors": {
+            "@id": "caqou:components/ActorQueryOperationUnion.jsonld#ActorQueryOperationUnion_args_beforeActors",
+            "@container": "@list"
+          }
+        }
+      }
     }
   ]
-}
+}

package/lib/ActorQueryOperationUnion.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
 import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';
 import { ActorQueryOperationTypedMediated } from '@comunica/bus-query-operation';
-import type { ActionContext, IActorTest } from '@comunica/core';
-import type { IActorQueryOperationOutputBindings } from '@comunica/types';
+import type { IActorTest } from '@comunica/core';
+import type { IActionContext, IQueryOperationResult, MetadataBindings, MetadataQuads } from '@comunica/types';
+import type * as RDF from '@rdfjs/types';
 import type { Algebra } from 'sparqlalgebrajs';
 /**
  * A comunica Union Query Operation Actor.
@@ -14,14 +15,15 @@ export declare class ActorQueryOperationUnion extends ActorQueryOperationTypedMe
      * @param {string[][]} variables Double array of variables to take the union of.
      * @return {string[]} The union of the given variables.
      */
-    static unionVariables(variables: string[][]): string[];
+    static unionVariables(variables: RDF.Variable[][]): RDF.Variable[];
     /**
      * Takes the union of the given metadata array.
-     * It will ensure that the totalItems metadata value is properly calculated.
+     * It will ensure that the cardinality metadata value is properly calculated.
      * @param {{[p: string]: any}[]} metadatas Array of metadata.
+     * @param bindings If the union of the variables field should also be taken.
      * @return {{[p: string]: any}} Union of the metadata.
      */
-    static unionMetadata(metadatas: Record<string, any>[]): Record<string, any>;
-    testOperation(pattern: Algebra.Union, context: ActionContext): Promise<IActorTest>;
-    runOperation(pattern: Algebra.Union, context: ActionContext): Promise<IActorQueryOperationOutputBindings>;
+    static unionMetadata<Bindings extends boolean, M extends (Bindings extends true ? MetadataBindings : MetadataQuads)>(metadatas: M[], bindings: Bindings): M;
+    testOperation(operation: Algebra.Union, context: IActionContext): Promise<IActorTest>;
+    runOperation(operation: Algebra.Union, context: IActionContext): Promise<IQueryOperationResult>;
 }

package/lib/ActorQueryOperationUnion.js CHANGED Viewed

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActorQueryOperationUnion = void 0;
 const bus_query_operation_1 = require("@comunica/bus-query-operation");
 const asynciterator_1 = require("asynciterator");
+const rdf_terms_1 = require("rdf-terms");
 /**
  * A comunica Union Query Operation Actor.
  */
@@ -17,46 +18,54 @@ class ActorQueryOperationUnion extends bus_query_operation_1.ActorQueryOperation
      * @return {string[]} The union of the given variables.
      */
     static unionVariables(variables) {
-        const withDuplicates = variables.reduce((acc, it) => [...acc, ...it], []);
-        return [...new Set(withDuplicates)];
+        return (0, rdf_terms_1.uniqTerms)(variables.flat());
     }
     /**
      * Takes the union of the given metadata array.
-     * It will ensure that the totalItems metadata value is properly calculated.
+     * It will ensure that the cardinality metadata value is properly calculated.
      * @param {{[p: string]: any}[]} metadatas Array of metadata.
+     * @param bindings If the union of the variables field should also be taken.
      * @return {{[p: string]: any}} Union of the metadata.
      */
-    static unionMetadata(metadatas) {
-        let totalItems = 0;
+    static unionMetadata(metadatas, bindings) {
+        // Union cardinality
+        const cardinality = { type: 'exact', value: 0 };
         for (const metadata of metadatas) {
-            if (metadata.totalItems && Number.isFinite(metadata.totalItems)) {
-                totalItems += metadata.totalItems;
+            if ((metadata.cardinality.value && Number.isFinite(metadata.cardinality.value)) ||
+                metadata.cardinality.value === 0) {
+                if (metadata.cardinality.type === 'estimate') {
+                    cardinality.type = 'estimate';
+                }
+                cardinality.value += metadata.cardinality.value;
             }
             else {
-                totalItems = Number.POSITIVE_INFINITY;
+                cardinality.type = 'estimate';
+                cardinality.value = Number.POSITIVE_INFINITY;
                 break;
             }
         }
-        return { totalItems };
+        const metadataBase = {
+            cardinality,
+            canContainUndefs: metadatas.some(metadata => metadata.canContainUndefs),
+        };
+        // Union variables
+        if (bindings) {
+            metadataBase.variables = ActorQueryOperationUnion.unionVariables(metadatas.map(metadata => metadata.variables));
+            return metadataBase;
+        }
+        return metadataBase;
     }
-    async testOperation(pattern, context) {
+    async testOperation(operation, context) {
         return true;
     }
-    async runOperation(pattern, context) {
-        const outputs = (await Promise.all([
-            this.mediatorQueryOperation.mediate({ operation: pattern.left, context }),
-            this.mediatorQueryOperation.mediate({ operation: pattern.right, context }),
-        ])).map(bus_query_operation_1.ActorQueryOperation.getSafeBindings);
+    async runOperation(operation, context) {
+        const outputs = (await Promise.all(operation.input
+            .map(subOperation => this.mediatorQueryOperation.mediate({ operation: subOperation, context }))))
+            .map(bus_query_operation_1.ActorQueryOperation.getSafeBindings);
         const bindingsStream = new asynciterator_1.UnionIterator(outputs.map((output) => output.bindingsStream), { autoStart: false });
-        const metadata = outputs[0].metadata && outputs[1].metadata ?
-            () => Promise.all([
-                outputs[0].metadata(),
-                outputs[1].metadata(),
-            ]).then(ActorQueryOperationUnion.unionMetadata) :
-            undefined;
-        const variables = ActorQueryOperationUnion.unionVariables(outputs.map((output) => output.variables));
-        const canContainUndefs = outputs.reduce((acc, val) => acc || val.canContainUndefs, false);
-        return { type: 'bindings', bindingsStream, metadata, variables, canContainUndefs };
+        const metadata = () => Promise.all(outputs.map(output => output.metadata()))
+            .then(subMeta => ActorQueryOperationUnion.unionMetadata(subMeta, true));
+        return { type: 'bindings', bindingsStream, metadata };
     }
 }
 exports.ActorQueryOperationUnion = ActorQueryOperationUnion;

package/lib/index.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export * from './ActorQueryOperationUnion';

package/{index.js → lib/index.js} RENAMED Viewed

@@ -10,5 +10,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./lib/ActorQueryOperationUnion"), exports);
+__exportStar(require("./ActorQueryOperationUnion"), exports);
 //# sourceMappingURL=index.js.map

package/package.json CHANGED Viewed

@@ -1,10 +1,10 @@
 {
   "name": "@comunica/actor-query-operation-union",
-  "version": "1.22.0",
+  "version": "2.0.1-alpha.5.0",
   "description": "A union query-operation actor",
   "lsd:module": true,
-  "main": "index.js",
-  "typings": "index",
+  "main": "lib/index.js",
+  "typings": "lib/index",
   "repository": {
     "type": "git",
     "url": "https://github.com/comunica/comunica.git",
@@ -27,44 +27,20 @@
   "files": [
     "components",
     "lib/**/*.d.ts",
-    "lib/**/*.js",
-    "index.d.ts",
-    "index.js"
+    "lib/**/*.js"
   ],
   "dependencies": {
-    "@comunica/types": "^1.22.0",
-    "asynciterator": "^3.2.0",
-    "sparqlalgebrajs": "^3.0.0"
-  },
-  "peerDependencies": {
-    "@comunica/bus-query-operation": "^1.0.0",
-    "@comunica/core": "^1.0.0"
-  },
-  "devDependencies": {
-    "@comunica/bus-query-operation": "^1.22.0",
-    "@comunica/core": "^1.22.0"
-  },
-  "jest": {
-    "globals": {
-      "ts-jest": {
-        "tsConfig": "../../tsconfig.json"
-      }
-    },
-    "transform": {
-      "^.+\\.ts$": "ts-jest"
-    },
-    "testRegex": "(/test/.*|(\\.|/)(test|spec))\\.ts$",
-    "moduleFileExtensions": [
-      "ts",
-      "js"
-    ],
-    "collectCoverage": true
+    "@comunica/bus-query-operation": "2.0.1-alpha.5.0",
+    "@comunica/core": "2.0.1-alpha.5.0",
+    "@comunica/types": "2.0.1-alpha.5.0",
+    "asynciterator": "^3.2.1",
+    "rdf-terms": "^1.7.1",
+    "sparqlalgebrajs": "^4.0.0"
   },
   "scripts": {
-    "test": "node \"../../node_modules/jest/bin/jest.js\" ${1}",
-    "test-watch": "node \"../../node_modules/jest/bin/jest.js\" ${1} --watch",
-    "build": "node \"../../node_modules/typescript/bin/tsc\"",
-    "validate": "npm ls"
+    "build": "npm run build:ts && npm run build:components",
+    "build:ts": "node \"../../node_modules/typescript/bin/tsc\"",
+    "build:components": "componentsjs-generator"
   },
-  "gitHead": "0a249ba341022eb2f1b9922fcf549a9564671d9f"
+  "gitHead": "e2ae2e9e924bf0656df60cc99774f7e560d47695"
 }

package/components/Actor/QueryOperation/Union.jsonld DELETED Viewed

@@ -1,21 +0,0 @@
-{
-  "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-union/^1.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-query-operation/^1.0.0/components/context.jsonld"
-  ],
-  "@id": "npmd:@comunica/actor-query-operation-union",
-  "components": [
-    {
-      "@id": "caqou:Actor/QueryOperation/Union",
-      "@type": "Class",
-      "extends": "cbqo:Actor/QueryOperationTypedMediated",
-      "requireElement": "ActorQueryOperationUnion",
-      "comment": "A comunica Union Query Operation Actor.",
-      "constructorArguments": [
-        {
-          "extends": "cbqo:Actor/QueryOperationTypedMediated/constructorArgumentsObject"
-        }
-      ]
-    }
-  ]
-}

package/index.d.ts DELETED Viewed

	@@ -1 +0,0 @@
1	- export * from './lib/ActorQueryOperationUnion';