@comunica/actor-query-operation-project 1.21.1 → 2.0.1-alpha.6.0

package/LICENSE.txt

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

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

@@ -0,0 +1,152 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-project/^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-project",
+  "components": [
+    {
+      "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject",
+      "@type": "Class",
+      "requireElement": "ActorQueryOperationProject",
+      "extends": [
+        {
+          "@type": "GenericComponentExtension",
+          "component": "cbqo:components/ActorQueryOperationTypedMediated.jsonld#ActorQueryOperationTypedMediated",
+          "genericTypeInstances": [
+            "urn:npm:sparqlalgebrajs:Project"
+          ]
+        }
+      ],
+      "comment": "A comunica Project Query Operation Actor.",
+      "parameters": [
+        {
+          "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_mediatorQueryOperation",
+          "range": "cc:components/Mediator.jsonld#Mediator"
+        },
+        {
+          "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_name",
+          "range": "xsd:string",
+          "default": {
+            "@id": "rdf:subject"
+          },
+          "comment": "The name for this actor."
+        },
+        {
+          "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_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": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_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."
+        }
+      ],
+      "memberKeys": [
+        "constructor",
+        "testOperation",
+        "runOperation"
+      ],
+      "constructorArguments": [
+        {
+          "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args__constructorArgument",
+          "fields": [
+            {
+              "keyRaw": "mediatorQueryOperation",
+              "value": {
+                "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_mediatorQueryOperation"
+              }
+            },
+            {
+              "keyRaw": "name",
+              "value": {
+                "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_name"
+              }
+            },
+            {
+              "keyRaw": "bus",
+              "value": {
+                "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_bus"
+              }
+            },
+            {
+              "keyRaw": "beforeActors",
+              "value": {
+                "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_beforeActors"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

package/components/components.jsonld

@@ -1,9 +1,11 @@
 {
-  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-project/^1.0.0/components/context.jsonld",
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-operation-project/^2.0.0/components/context.jsonld"
+  ],
   "@id": "npmd:@comunica/actor-query-operation-project",
   "@type": "Module",
   "requireName": "@comunica/actor-query-operation-project",
   "import": [
-    "files-caqop:components/Actor/QueryOperation/Project.jsonld"
+    "caqop:components/ActorQueryOperationProject.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/",
-      "caqop": "npmd:@comunica/actor-query-operation-project/",
-      "files-caqop": "caqop:^1.0.0/",
-
-      "ActorQueryOperationProject": "caqop:Actor/QueryOperation/Project"
+      "caqop": "npmd:@comunica/actor-query-operation-project/^2.0.0/",
+      "ActorQueryOperationProject": {
+        "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject",
+        "@prefix": true,
+        "@context": {
+          "args_mediatorQueryOperation": {
+            "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_mediatorQueryOperation"
+          },
+          "args_name": {
+            "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_name"
+          },
+          "args_bus": {
+            "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_bus"
+          },
+          "args_beforeActors": {
+            "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_beforeActors",
+            "@container": "@list"
+          },
+          "mediatorQueryOperation": {
+            "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_mediatorQueryOperation"
+          },
+          "name": {
+            "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_name"
+          },
+          "bus": {
+            "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_bus"
+          },
+          "beforeActors": {
+            "@id": "caqop:components/ActorQueryOperationProject.jsonld#ActorQueryOperationProject_args_beforeActors",
+            "@container": "@list"
+          }
+        }
+      }
     }
   ]
-}
+}

package/lib/ActorQueryOperationProject.d.ts

@@ -1,13 +1,13 @@
 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 } from '@comunica/types';
 import type { Algebra } from 'sparqlalgebrajs';
 /**
  * A comunica Project Query Operation Actor.
  */
 export declare class ActorQueryOperationProject extends ActorQueryOperationTypedMediated<Algebra.Project> {
     constructor(args: IActorQueryOperationTypedMediatedArgs);
-    testOperation(pattern: Algebra.Project, context: ActionContext): Promise<IActorTest>;
-    runOperation(pattern: Algebra.Project, context: ActionContext): Promise<IActorQueryOperationOutputBindings>;
+    testOperation(operation: Algebra.Project, context: IActionContext): Promise<IActorTest>;
+    runOperation(operation: Algebra.Project, context: IActionContext): Promise<IQueryOperationResult>;
 }

package/lib/ActorQueryOperationProject.js

@@ -4,7 +4,6 @@ exports.ActorQueryOperationProject = void 0;
 const bus_query_operation_1 = require("@comunica/bus-query-operation");
 const data_factory_1 = require("@comunica/data-factory");
 const rdf_data_factory_1 = require("rdf-data-factory");
-const rdf_string_1 = require("rdf-string");
 const DF = new rdf_data_factory_1.DataFactory();
 /**
  * A comunica Project Query Operation Actor.
@@ -13,19 +12,22 @@ class ActorQueryOperationProject extends bus_query_operation_1.ActorQueryOperati
     constructor(args) {
         super(args, 'project');
     }
-    async testOperation(pattern, context) {
+    async testOperation(operation, context) {
         return true;
     }
-    async runOperation(pattern, context) {
+    async runOperation(operation, context) {
         // Resolve the input
-        const output = bus_query_operation_1.ActorQueryOperation.getSafeBindings(await this.mediatorQueryOperation.mediate({ operation: pattern.input, context }));
+        const output = bus_query_operation_1.ActorQueryOperation.getSafeBindings(await this.mediatorQueryOperation.mediate({ operation: operation.input, context }));
         // Find all variables that should be deleted from the input stream.
-        const variables = pattern.variables.map(x => rdf_string_1.termToString(x));
-        const deleteVariables = output.variables.filter(variable => !variables.includes(variable));
+        const outputMetadata = await output.metadata();
+        const variables = operation.variables;
+        const deleteVariables = outputMetadata.variables
+            .filter(variable => !variables.some(subVariable => variable.value === subVariable.value));
         // Error if there are variables that are not bound in the input stream.
-        const missingVariables = variables.filter(variable => !output.variables.includes(variable));
+        const missingVariables = variables
+            .filter(variable => !outputMetadata.variables.some(subVariable => variable.value === subVariable.value));
         if (missingVariables.length > 0) {
-            throw new Error(`Variables '${missingVariables}' are used in the projection result, but are not assigned.`);
+            throw new Error(`Variables '${missingVariables.map(variable => `?${variable.value}`)}' are used in the projection result, but are not assigned.`);
         }
         // Make sure the project variables are the only variables that are present in the bindings.
         let bindingsStream = deleteVariables.length === 0 ?
@@ -64,9 +66,7 @@ class ActorQueryOperationProject extends bus_query_operation_1.ActorQueryOperati
         return {
             type: 'bindings',
             bindingsStream,
-            metadata: output.metadata,
-            variables,
-            canContainUndefs: output.canContainUndefs,
+            metadata: async () => ({ ...outputMetadata, variables }),
         };
     }
 }

package/lib/index.d.ts

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

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

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

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@comunica/actor-query-operation-project",
-  "version": "1.21.1",
+  "version": "2.0.1-alpha.6.0",
   "description": "A project 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",
@@ -13,6 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
+  "sideEffects": false,
   "keywords": [
     "comunica",
     "actor",
@@ -27,45 +28,20 @@
   "files": [
     "components",
     "lib/**/*.d.ts",
-    "lib/**/*.js",
-    "index.d.ts",
-    "index.js"
+    "lib/**/*.js"
   ],
-  "peerDependencies": {
-    "@comunica/bus-query-operation": "^1.0.0",
-    "@comunica/core": "^1.0.0"
-  },
   "dependencies": {
-    "@comunica/data-factory": "^1.21.1",
-    "@comunica/types": "^1.21.1",
+    "@comunica/bus-query-operation": "2.0.1-alpha.6.0",
+    "@comunica/core": "2.0.1-alpha.6.0",
+    "@comunica/data-factory": "2.0.1-alpha.6.0",
+    "@comunica/types": "2.0.1-alpha.6.0",
     "rdf-data-factory": "^1.0.3",
-    "rdf-string": "^1.5.0",
-    "sparqlalgebrajs": "^2.5.5"
-  },
-  "devDependencies": {
-    "@comunica/bus-query-operation": "^1.21.1",
-    "@comunica/core": "^1.21.1"
-  },
-  "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": "bbf46a068e635256495a40e784a4691b22e88bd3"
 }

package/components/Actor/QueryOperation/Project.jsonld

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

package/index.d.ts

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