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

package/LICENSE.txt

@@ -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

@@ -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-construct/^1.0.0/components/context.jsonld"  
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-construct/^2.0.0/components/context.jsonld"  
   ],
   "actors": [
     ...
     {
-      "@id": "config-sets:sparql-queryoperators.json#myConstructQueryOperator",
+      "@id": "urn:comunica:default:query-operation/actors#construct",
       "@type": "ActorQueryOperationConstruct",
-      "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/ActorQueryOperationConstruct.jsonld

@@ -0,0 +1,165 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-construct/^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-construct",
+  "components": [
+    {
+      "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct",
+      "@type": "Class",
+      "requireElement": "ActorQueryOperationConstruct",
+      "extends": [
+        {
+          "@type": "GenericComponentExtension",
+          "component": "cbqo:components/ActorQueryOperationTypedMediated.jsonld#ActorQueryOperationTypedMediated",
+          "genericTypeInstances": [
+            "urn:npm:sparqlalgebrajs:Construct"
+          ]
+        }
+      ],
+      "comment": "A comunica Construct Query Operation Actor.",
+      "parameters": [
+        {
+          "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_mediatorQueryOperation",
+          "range": "cc:components/Mediator.jsonld#Mediator"
+        },
+        {
+          "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_name",
+          "range": "xsd:string",
+          "default": {
+            "@id": "rdf:subject"
+          },
+          "comment": "The name for this actor."
+        },
+        {
+          "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_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": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_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": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct__member_constructor",
+          "memberFieldName": "constructor"
+        },
+        {
+          "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct__member_getVariables",
+          "memberFieldName": "getVariables"
+        },
+        {
+          "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct__member_testOperation",
+          "memberFieldName": "testOperation"
+        },
+        {
+          "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct__member_runOperation",
+          "memberFieldName": "runOperation"
+        }
+      ],
+      "constructorArguments": [
+        {
+          "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args__constructorArgument",
+          "fields": [
+            {
+              "keyRaw": "mediatorQueryOperation",
+              "value": {
+                "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_mediatorQueryOperation"
+              }
+            },
+            {
+              "keyRaw": "name",
+              "value": {
+                "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_name"
+              }
+            },
+            {
+              "keyRaw": "bus",
+              "value": {
+                "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_bus"
+              }
+            },
+            {
+              "keyRaw": "beforeActors",
+              "value": {
+                "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_beforeActors"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

package/components/components.jsonld

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

package/components/context.jsonld

@@ -3,10 +3,39 @@
     "https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^4.0.0/components/context.jsonld",
     {
       "npmd": "https://linkedsoftwaredependencies.org/bundles/npm/",
-      "caqoc": "npmd:@comunica/actor-query-operation-construct/",
-      "files-caqoc": "caqoc:^1.0.0/",
-
-      "ActorQueryOperationConstruct": "caqoc:Actor/QueryOperation/Construct"
+      "caqoc": "npmd:@comunica/actor-query-operation-construct/^2.0.0/",
+      "ActorQueryOperationConstruct": {
+        "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct",
+        "@prefix": true,
+        "@context": {
+          "args_mediatorQueryOperation": {
+            "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_mediatorQueryOperation"
+          },
+          "args_name": {
+            "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_name"
+          },
+          "args_bus": {
+            "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_bus"
+          },
+          "args_beforeActors": {
+            "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_beforeActors",
+            "@container": "@list"
+          },
+          "mediatorQueryOperation": {
+            "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_mediatorQueryOperation"
+          },
+          "name": {
+            "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_name"
+          },
+          "bus": {
+            "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_bus"
+          },
+          "beforeActors": {
+            "@id": "caqoc:components/ActorQueryOperationConstruct.jsonld#ActorQueryOperationConstruct_args_beforeActors",
+            "@container": "@list"
+          }
+        }
+      }
     }
   ]
-}
+}

package/lib/ActorQueryOperationConstruct.d.ts

@@ -1,9 +1,9 @@
 import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';
 import { ActorQueryOperationTypedMediated } from '@comunica/bus-query-operation';
-import type { ActionContext, IActorTest } from '@comunica/core';
-import type { IActorQueryOperationOutputQuads } from '@comunica/types';
+import type { IActorTest } from '@comunica/core';
+import type { IActionContext, IQueryOperationResult } from '@comunica/types';
 import type * as RDF from '@rdfjs/types';
-import type { Algebra } from 'sparqlalgebrajs';
+import { Algebra } from 'sparqlalgebrajs';
 /**
  * A comunica Construct Query Operation Actor.
  */
@@ -15,6 +15,6 @@ export declare class ActorQueryOperationConstruct extends ActorQueryOperationTyp
      * @return {RDF.Variable[]} The variables in the triple patterns.
      */
     static getVariables(patterns: RDF.BaseQuad[]): RDF.Variable[];
-    testOperation(pattern: Algebra.Construct, context: ActionContext): Promise<IActorTest>;
-    runOperation(pattern: Algebra.Construct, context: ActionContext): Promise<IActorQueryOperationOutputQuads>;
+    testOperation(operation: Algebra.Construct, context: IActionContext): Promise<IActorTest>;
+    runOperation(operationOriginal: Algebra.Construct, context: IActionContext): Promise<IQueryOperationResult>;
 }

package/lib/ActorQueryOperationConstruct.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActorQueryOperationConstruct = void 0;
 const bus_query_operation_1 = require("@comunica/bus-query-operation");
 const rdf_terms_1 = require("rdf-terms");
+const sparqlalgebrajs_1 = require("sparqlalgebrajs");
 const BindingsToQuadsIterator_1 = require("./BindingsToQuadsIterator");
 /**
  * A comunica Construct Query Operation Actor.
@@ -17,30 +18,31 @@ class ActorQueryOperationConstruct extends bus_query_operation_1.ActorQueryOpera
      * @return {RDF.Variable[]} The variables in the triple patterns.
      */
     static getVariables(patterns) {
-        return rdf_terms_1.uniqTerms([].concat
-            .apply([], patterns.map(pattern => rdf_terms_1.getVariables(rdf_terms_1.getTerms(pattern)))));
+        return (0, rdf_terms_1.uniqTerms)([].concat
+            .apply([], patterns.map(pattern => (0, rdf_terms_1.getVariables)((0, rdf_terms_1.getTerms)(pattern)))));
     }
-    async testOperation(pattern, context) {
+    async testOperation(operation, context) {
         return true;
     }
-    async runOperation(pattern, context) {
+    async runOperation(operationOriginal, context) {
         // Apply a projection on our CONSTRUCT variables first, as the query may contain other variables as well.
-        const variables = ActorQueryOperationConstruct.getVariables(pattern.template);
-        const operation = { type: 'project', input: pattern.input, variables };
+        const variables = ActorQueryOperationConstruct.getVariables(operationOriginal.template);
+        const operation = { type: sparqlalgebrajs_1.Algebra.types.PROJECT, input: operationOriginal.input, variables };
         // Evaluate the input query
         const output = bus_query_operation_1.ActorQueryOperation.getSafeBindings(await this.mediatorQueryOperation.mediate({ operation, context }));
         // Construct triples using the result based on the pattern.
-        const quadStream = new BindingsToQuadsIterator_1.BindingsToQuadsIterator(pattern.template, output.bindingsStream);
+        const quadStream = new BindingsToQuadsIterator_1.BindingsToQuadsIterator(operationOriginal.template, output.bindingsStream);
         // Let the final metadata contain the estimated number of triples
-        let metadata;
-        if (output.metadata) {
-            metadata = () => output.metadata().then(meta => {
-                if (meta.totalItems) {
-                    return Object.assign(Object.assign({}, meta), { totalItems: meta.totalItems * pattern.template.length });
-                }
-                return meta;
-            });
-        }
+        const metadata = () => output.metadata().then(meta => ({
+            ...meta,
+            order: undefined,
+            cardinality: {
+                type: meta.cardinality.type,
+                value: meta.cardinality.value * operationOriginal.template.length,
+            },
+            canContainUndefs: false,
+            availableOrders: undefined,
+        }));
         return {
             metadata,
             quadStream,

package/lib/BindingsToQuadsIterator.d.ts

@@ -26,7 +26,7 @@ export declare class BindingsToQuadsIterator extends MultiTransformIterator<Bind
      *                             If the given term is a variable, then the bound term is returned,
      *                             or a falsy value if it did not exist in the bindings.
      */
-    static bindTerm(bindings: Bindings, term: RDF.Term): RDF.Term;
+    static bindTerm(bindings: Bindings, term: RDF.Term): RDF.Term | undefined;
     /**
      * Bind the given quad pattern.
      * If one of the terms was a variable AND is not bound in the bindings,

package/lib/BindingsToQuadsIterator.js

@@ -33,7 +33,7 @@ class BindingsToQuadsIterator extends asynciterator_1.MultiTransformIterator {
      */
     static bindTerm(bindings, term) {
         if (term.termType === 'Variable') {
-            return bindings.get(`?${term.value}`);
+            return bindings.get(term);
         }
         return term;
     }
@@ -47,7 +47,7 @@ class BindingsToQuadsIterator extends asynciterator_1.MultiTransformIterator {
      */
     static bindQuad(bindings, pattern) {
         try {
-            return rdf_terms_1.mapTerms(pattern, term => {
+            return (0, rdf_terms_1.mapTerms)(pattern, term => {
                 const boundTerm = BindingsToQuadsIterator.bindTerm(bindings, term);
                 if (!boundTerm) {
                     throw new Error('Unbound term');
@@ -55,7 +55,7 @@ class BindingsToQuadsIterator extends asynciterator_1.MultiTransformIterator {
                 return boundTerm;
             });
         }
-        catch (_a) {
+        catch {
             // Do nothing
         }
     }
@@ -79,7 +79,7 @@ class BindingsToQuadsIterator extends asynciterator_1.MultiTransformIterator {
      * @return {RDF.BaseQuad}                 A quad.
      */
     static localizeQuad(blankNodeCounter, pattern) {
-        return rdf_terms_1.mapTerms(pattern, term => BindingsToQuadsIterator.localizeBlankNode(blankNodeCounter, term));
+        return (0, rdf_terms_1.mapTerms)(pattern, term => BindingsToQuadsIterator.localizeBlankNode(blankNodeCounter, term));
     }
     /**
      * Convert the given template to a list of quads based on the given bindings.

package/lib/index.d.ts

@@ -0,0 +1,2 @@
+export * from './ActorQueryOperationConstruct';
+export * from './BindingsToQuadsIterator';

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

@@ -10,6 +10,6 @@ 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/ActorQueryOperationConstruct"), exports);
-__exportStar(require("./lib/BindingsToQuadsIterator"), exports);
+__exportStar(require("./ActorQueryOperationConstruct"), exports);
+__exportStar(require("./BindingsToQuadsIterator"), exports);
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@comunica/actor-query-operation-construct",
-  "version": "1.22.0",
+  "version": "2.0.1-alpha.5.0",
   "description": "A construct 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,48 +27,23 @@
   "files": [
     "components",
     "lib/**/*.d.ts",
-    "lib/**/*.js",
-    "index.d.ts",
-    "index.js"
+    "lib/**/*.js"
   ],
   "dependencies": {
-    "@comunica/data-factory": "^1.22.0",
-    "@comunica/types": "^1.22.0",
+    "@comunica/bus-query-operation": "2.0.1-alpha.5.0",
+    "@comunica/core": "2.0.1-alpha.5.0",
+    "@comunica/data-factory": "2.0.1-alpha.5.0",
+    "@comunica/types": "2.0.1-alpha.5.0",
     "@rdfjs/types": "*",
-    "asynciterator": "^3.2.0",
+    "asynciterator": "^3.2.1",
     "rdf-data-factory": "^1.0.3",
     "rdf-terms": "^1.6.2",
-    "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
+    "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/Construct.jsonld

@@ -1,21 +0,0 @@
-{
-  "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-construct/^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-construct",
-  "components": [
-    {
-      "@id": "caqoc:Actor/QueryOperation/Construct",
-      "@type": "Class",
-      "extends": "cbqo:Actor/QueryOperationTypedMediated",
-      "requireElement": "ActorQueryOperationConstruct",
-      "comment": "A comunica Construct Query Operation Actor.",
-      "constructorArguments": [
-        {
-          "extends": "cbqo:Actor/QueryOperationTypedMediated/constructorArgumentsObject"
-        }
-      ]
-    }
-  ]
-}

package/index.d.ts

@@ -1,2 +0,0 @@
-export * from './lib/ActorQueryOperationConstruct';
-export * from './lib/BindingsToQuadsIterator';