npm - @comunica/actor-abstract-path - Versions diffs - 1.21.1 → 2.0.1-alpha.6.0 - Mend

@comunica/actor-abstract-path 1.21.1 → 2.0.1-alpha.6.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 (11) hide show

package/LICENSE.txt +22 -0
package/components/ActorAbstractPath.jsonld +177 -0
package/components/components.jsonld +5 -3
package/components/context.jsonld +46 -6
package/lib/ActorAbstractPath.d.ts +19 -17
package/lib/ActorAbstractPath.js +50 -33
package/lib/index.d.ts +1 -0
package/{index.js → lib/index.js} +1 -1
package/package.json +20 -40
package/components/Actor/AbstractPath.jsonld +0 -21
package/index.d.ts +0 -1

package/LICENSE.txt ADDED Viewed

@@ -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/components/ActorAbstractPath.jsonld ADDED Viewed

@@ -0,0 +1,177 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-abstract-path/^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-abstract-path",
+  "components": [
+    {
+      "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath",
+      "@type": "AbstractClass",
+      "requireElement": "ActorAbstractPath",
+      "extends": [
+        {
+          "@type": "GenericComponentExtension",
+          "component": "cbqo:components/ActorQueryOperationTypedMediated.jsonld#ActorQueryOperationTypedMediated",
+          "genericTypeInstances": [
+            "urn:npm:sparqlalgebrajs:Path"
+          ]
+        }
+      ],
+      "comment": "An abstract actor that handles Path operations.  Provides multiple helper functions used by the Path operation actors.",
+      "parameters": [
+        {
+          "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_predicateType",
+          "range": "xsd:string"
+        },
+        {
+          "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_mediatorQueryOperation",
+          "range": "cc:components/Mediator.jsonld#Mediator"
+        },
+        {
+          "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_name",
+          "range": "xsd:string",
+          "default": {
+            "@id": "rdf:subject"
+          },
+          "comment": "The name for this actor."
+        },
+        {
+          "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_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": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_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": [
+        "FACTORY",
+        "predicateType",
+        "constructor",
+        "testOperation",
+        "generateVariable",
+        "isPathArbitraryLengthDistinct",
+        "predicateStarGraphVariable",
+        "getObjectsPredicateStarEval",
+        "getObjectsPredicateStar",
+        "getSubjectAndObjectBindingsPredicateStar"
+      ],
+      "constructorArguments": [
+        {
+          "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args__constructorArgument",
+          "fields": [
+            {
+              "keyRaw": "mediatorQueryOperation",
+              "value": {
+                "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_mediatorQueryOperation"
+              }
+            },
+            {
+              "keyRaw": "name",
+              "value": {
+                "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_name"
+              }
+            },
+            {
+              "keyRaw": "bus",
+              "value": {
+                "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_bus"
+              }
+            },
+            {
+              "keyRaw": "beforeActors",
+              "value": {
+                "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_beforeActors"
+              }
+            }
+          ]
+        },
+        {
+          "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_predicateType"
+        }
+      ]
+    },
+    {
+      "@id": "caap:components/ActorAbstractPath.jsonld#IPathResultStream",
+      "@type": "AbstractClass",
+      "requireElement": "IPathResultStream",
+      "parameters": [],
+      "memberKeys": [
+        "bindingsStream",
+        "metadata"
+      ],
+      "constructorArguments": []
+    }
+  ]
+}

package/components/components.jsonld CHANGED Viewed

@@ -1,9 +1,11 @@
 {
-  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-abstract-path/^1.0.0/components/context.jsonld",
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-abstract-path/^2.0.0/components/context.jsonld"
+  ],
   "@id": "npmd:@comunica/actor-abstract-path",
   "@type": "Module",
   "requireName": "@comunica/actor-abstract-path",
   "import": [
-    "files-caap:components/Actor/AbstractPath.jsonld"
+    "caap:components/ActorAbstractPath.jsonld"
   ]
-}
+}

package/components/context.jsonld CHANGED Viewed

@@ -1,12 +1,52 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/core/^1.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^4.0.0/components/context.jsonld",
     {
       "npmd": "https://linkedsoftwaredependencies.org/bundles/npm/",
-      "caap": "npmd:@comunica/actor-abstract-path/",
-      "files-caap": "caap:^1.0.0/",
-      "AbstractPath": "caap:Actor/AbstractPath"
+      "caap": "npmd:@comunica/actor-abstract-path/^2.0.0/",
+      "ActorAbstractPath": {
+        "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath",
+        "@prefix": true,
+        "@context": {
+          "predicateType": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_predicateType"
+          },
+          "args_mediatorQueryOperation": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_mediatorQueryOperation"
+          },
+          "args_name": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_name"
+          },
+          "args_bus": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_bus"
+          },
+          "args_beforeActors": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_beforeActors",
+            "@container": "@list"
+          },
+          "cateType": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_predicateType"
+          },
+          "mediatorQueryOperation": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_mediatorQueryOperation"
+          },
+          "name": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_name"
+          },
+          "bus": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_bus"
+          },
+          "beforeActors": {
+            "@id": "caap:components/ActorAbstractPath.jsonld#ActorAbstractPath_args_beforeActors",
+            "@container": "@list"
+          }
+        }
+      },
+      "IPathResultStream": {
+        "@id": "caap:components/ActorAbstractPath.jsonld#IPathResultStream",
+        "@prefix": true,
+        "@context": {}
+      }
     }
   ]
-}
+}

package/lib/ActorAbstractPath.d.ts CHANGED Viewed

@@ -1,11 +1,10 @@
 import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';
-import { ActorQueryOperationTypedMediated, Bindings } from '@comunica/bus-query-operation';
+import { ActorQueryOperationTypedMediated } from '@comunica/bus-query-operation';
 import type { IActorTest } from '@comunica/core';
-import { ActionContext } from '@comunica/core';
-import type { IActorQueryOperationOutputBindings } from '@comunica/types';
+import type { IQueryOperationResultBindings, Bindings, IActionContext, MetadataBindings } from '@comunica/types';
+import type * as RDF from '@rdfjs/types';
 import type { AsyncIterator } from 'asynciterator';
 import { BufferedIterator } from 'asynciterator';
-import type { Term, Variable } from 'rdf-js';
 import type { Algebra } from 'sparqlalgebrajs';
 import { Factory } from 'sparqlalgebrajs';
 /**
@@ -16,13 +15,12 @@ import { Factory } from 'sparqlalgebrajs';
 export declare abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated<Algebra.Path> {
     protected static readonly FACTORY: Factory;
     protected readonly predicateType: string;
-    static isPathArbitraryLengthDistinctKey: string;
     protected constructor(args: IActorQueryOperationTypedMediatedArgs, predicateType: string);
-    testOperation(pattern: Algebra.Path, context: ActionContext): Promise<IActorTest>;
-    generateVariable(path?: Algebra.Path, name?: string): Variable;
-    isPathArbitraryLengthDistinct(context: ActionContext, path: Algebra.Path): Promise<{
-        context: ActionContext;
-        operation: IActorQueryOperationOutputBindings | undefined;
+    testOperation(operation: Algebra.Path, context: IActionContext): Promise<IActorTest>;
+    generateVariable(path?: Algebra.Path, name?: string): RDF.Variable;
+    isPathArbitraryLengthDistinct(context: IActionContext, path: Algebra.Path): Promise<{
+        context: IActionContext;
+        operation: IQueryOperationResultBindings | undefined;
     }>;
     private predicateStarGraphVariable;
     /**
@@ -36,23 +34,23 @@ export declare abstract class ActorAbstractPath extends ActorQueryOperationTyped
        * @param {ActionContext} context
        * @return {Promise<AsyncIterator<Bindings>} Iterator to where all bindings of query should have been pushed.
        */
-    getObjectsPredicateStarEval(subject: Term, object: Variable, predicate: Algebra.PropertyPathSymbol, graph: Term, context: ActionContext): Promise<AsyncIterator<Bindings>>;
+    getObjectsPredicateStarEval(subject: RDF.Term, object: RDF.Variable, predicate: Algebra.PropertyPathSymbol, graph: RDF.Term, context: IActionContext): Promise<IPathResultStream>;
     /**
        * Pushes all terms to iterator `it` that are a solution of object predicate* ?o.
        * @param {Term} object Term of where we start the predicate* search.
        * @param {Algebra.PropertyPathSymbol} predicate Predicate of the *-path.
        * @param {Term} graph The graph in which we search for the pattern.
        * @param {ActionContext} context
-       * @param {{[id: string]: Term}} termHashes Remembers the objects we've already searched for.
+       * @param {Record<string, Term>} termHashes Remembers the objects we've already searched for.
        * @param {BufferedIterator<Term>} it Iterator to push terms to.
        * @param {any} counter Counts how many searches are in progress to close it when needed (when counter == 0).
-       * @return {Promise<void>} All solutions of query should have been pushed to it by then.
+       * @return {Promise<IPathResultStream['metadata']>} The results metadata.
        */
-    getObjectsPredicateStar(object: Term, predicate: Algebra.PropertyPathSymbol, graph: Term, context: ActionContext, termHashes: Record<string, Term>, it: BufferedIterator<Term>, counter: any): Promise<void>;
+    getObjectsPredicateStar(object: RDF.Term, predicate: Algebra.PropertyPathSymbol, graph: RDF.Term, context: IActionContext, termHashes: Record<string, RDF.Term>, it: BufferedIterator<RDF.Term>, counter: any): Promise<IPathResultStream['metadata'] | undefined>;
     /**
        * Pushes all terms to iterator `it` that are a solution of ?s predicate* ?o.
-       * @param {string} subjectString String representation of subjectVariable
-       * @param {string} objectString String representation of objectVariable
+       * @param {string} subjectVar String representation of subjectVariable
+       * @param {string} objectVar String representation of objectVariable
        * @param {Term} subjectVal Term of where we start the predicate* search.
        * @param {Term} objectVal Found solution for an object, start for the new step.
        * @param {Algebra.PropertyPathSymbol} predicate Predicate of the *-path.
@@ -66,5 +64,9 @@ export declare abstract class ActorAbstractPath extends ActorQueryOperationTyped
        * @param {any} counter Counts how many searches are in progress to close it when needed (when counter == 0).
        * @return {Promise<void>} All solutions of query should have been pushed to it by then.
        */
-    getSubjectAndObjectBindingsPredicateStar(subjectString: string, objectString: string, subjectVal: Term, objectVal: Term, predicate: Algebra.PropertyPathSymbol, graph: Term, context: ActionContext, termHashesGlobal: Record<string, Promise<Term[]>>, termHashesCurrentSubject: Record<string, boolean>, it: BufferedIterator<Bindings>, counter: any): Promise<void>;
+    getSubjectAndObjectBindingsPredicateStar(subjectVar: RDF.Variable, objectVar: RDF.Variable, subjectVal: RDF.Term, objectVal: RDF.Term, predicate: Algebra.PropertyPathSymbol, graph: RDF.Term, context: IActionContext, termHashesGlobal: Record<string, Promise<RDF.Term[]>>, termHashesCurrentSubject: Record<string, boolean>, it: BufferedIterator<Bindings>, counter: any): Promise<void>;
+}
+export interface IPathResultStream {
+    bindingsStream: AsyncIterator<Bindings>;
+    metadata: () => Promise<MetadataBindings>;
 }

package/lib/ActorAbstractPath.js CHANGED Viewed

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActorAbstractPath = void 0;
+const bindings_factory_1 = require("@comunica/bindings-factory");
 const bus_query_operation_1 = require("@comunica/bus-query-operation");
-const core_1 = require("@comunica/core");
+const context_entries_1 = require("@comunica/context-entries");
 const asynciterator_1 = require("asynciterator");
 const rdf_data_factory_1 = require("rdf-data-factory");
 const rdf_string_1 = require("rdf-string");
 const sparqlalgebrajs_1 = require("sparqlalgebrajs");
 const DF = new rdf_data_factory_1.DataFactory();
+const BF = new bindings_factory_1.BindingsFactory();
 /**
  * An abstract actor that handles Path operations.
  *
@@ -18,8 +20,8 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
         super(args, 'path');
         this.predicateType = predicateType;
     }
-    async testOperation(pattern, context) {
-        if (pattern.predicate.type !== this.predicateType) {
+    async testOperation(operation, context) {
+        if (operation.predicate.type !== this.predicateType) {
             throw new Error(`This Actor only supports ${this.predicateType} Path operations.`);
         }
         return true;
@@ -39,40 +41,43 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
     // of ways the connection can be made) even if the repeated path itself would otherwise result in duplicates.
     // https://www.w3.org/TR/sparql11-query/#propertypaths
     async isPathArbitraryLengthDistinct(context, path) {
-        if (!context || !context.get(ActorAbstractPath.isPathArbitraryLengthDistinctKey)) {
-            context = context ?
-                context.set(ActorAbstractPath.isPathArbitraryLengthDistinctKey, true) :
-                core_1.ActionContext({ [ActorAbstractPath.isPathArbitraryLengthDistinctKey]: true });
+        if (!context.get(context_entries_1.KeysQueryOperation.isPathArbitraryLengthDistinctKey)) {
+            context = context.set(context_entries_1.KeysQueryOperation.isPathArbitraryLengthDistinctKey, true);
             return { context,
                 operation: bus_query_operation_1.ActorQueryOperation.getSafeBindings(await this.mediatorQueryOperation.mediate({
                     operation: ActorAbstractPath.FACTORY.createDistinct(path),
                     context,
                 })) };
         }
-        context = context.set(ActorAbstractPath.isPathArbitraryLengthDistinctKey, false);
+        context = context.set(context_entries_1.KeysQueryOperation.isPathArbitraryLengthDistinctKey, false);
         return { context, operation: undefined };
     }
     async predicateStarGraphVariable(subject, object, predicate, graph, context) {
         // Construct path to obtain all graphs where subject exists
         const predVar = this.generateVariable(ActorAbstractPath.FACTORY.createPath(subject, predicate, object, graph));
-        const findGraphs = ActorAbstractPath.FACTORY.createUnion(ActorAbstractPath.FACTORY.createPattern(subject, predVar, object, graph), ActorAbstractPath.FACTORY.createPattern(object, predVar, subject, graph));
+        const findGraphs = ActorAbstractPath.FACTORY.createUnion([
+            ActorAbstractPath.FACTORY.createPattern(subject, predVar, object, graph),
+            ActorAbstractPath.FACTORY.createPattern(object, predVar, subject, graph),
+        ]);
         const results = bus_query_operation_1.ActorQueryOperation.getSafeBindings(await this.mediatorQueryOperation.mediate({ context, operation: findGraphs }));
-        const objectString = rdf_string_1.termToString(object);
         const passedGraphs = new Set();
-        return new asynciterator_1.MultiTransformIterator(results.bindingsStream, {
+        const bindingsStream = new asynciterator_1.MultiTransformIterator(results.bindingsStream, {
             multiTransform: (bindings) => {
                 // Extract the graph and start a predicate* search starting from subject in each graph
-                const graphValue = bindings.get(rdf_string_1.termToString(graph));
-                if (passedGraphs.has(rdf_string_1.termToString(graphValue))) {
+                const graphValue = bindings.get(graph);
+                if (passedGraphs.has(graphValue.value)) {
                     return new asynciterator_1.EmptyIterator();
                 }
-                passedGraphs.add(rdf_string_1.termToString(graphValue));
+                passedGraphs.add(graphValue.value);
                 return new asynciterator_1.TransformIterator(async () => {
                     const it = new asynciterator_1.BufferedIterator();
                     await this.getObjectsPredicateStar(subject, predicate, graphValue, context, {}, it, { count: 0 });
                     return it.transform({
                         transform(item, next, push) {
-                            push(bus_query_operation_1.Bindings({ [objectString]: item, [rdf_string_1.termToString(graph)]: graphValue }));
+                            push(BF.bindings([
+                                [object, item],
+                                [graph, graphValue],
+                            ]));
                             next();
                         },
                     });
@@ -80,6 +85,10 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
             },
             autoStart: false,
         });
+        return {
+            bindingsStream,
+            metadata: results.metadata,
+        };
     }
     /**
        * Returns an iterator with Bindings of the query subject predicate* ?o
@@ -97,13 +106,20 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
             return this.predicateStarGraphVariable(subject, object, predicate, graph, context);
         }
         const it = new asynciterator_1.BufferedIterator();
-        await this.getObjectsPredicateStar(subject, predicate, graph, context, {}, it, { count: 0 });
-        return it.transform({
+        // We can safely ignore undefs because termHashes is empty
+        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+        const metadata = await this
+            .getObjectsPredicateStar(subject, predicate, graph, context, {}, it, { count: 0 });
+        const bindingsStream = it.transform({
             transform(item, next, push) {
-                push(bus_query_operation_1.Bindings({ [rdf_string_1.termToString(object)]: item }));
+                push(BF.bindings([[object, item]]));
                 next();
             },
         });
+        return {
+            bindingsStream,
+            metadata,
+        };
     }
     /**
        * Pushes all terms to iterator `it` that are a solution of object predicate* ?o.
@@ -111,13 +127,13 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
        * @param {Algebra.PropertyPathSymbol} predicate Predicate of the *-path.
        * @param {Term} graph The graph in which we search for the pattern.
        * @param {ActionContext} context
-       * @param {{[id: string]: Term}} termHashes Remembers the objects we've already searched for.
+       * @param {Record<string, Term>} termHashes Remembers the objects we've already searched for.
        * @param {BufferedIterator<Term>} it Iterator to push terms to.
        * @param {any} counter Counts how many searches are in progress to close it when needed (when counter == 0).
-       * @return {Promise<void>} All solutions of query should have been pushed to it by then.
+       * @return {Promise<IPathResultStream['metadata']>} The results metadata.
        */
     async getObjectsPredicateStar(object, predicate, graph, context, termHashes, it, counter) {
-        const termString = rdf_string_1.termToString(object);
+        const termString = (0, rdf_string_1.termToString)(object);
         if (termHashes[termString]) {
             return;
         }
@@ -125,11 +141,10 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
         termHashes[termString] = object;
         counter.count++;
         const thisVariable = this.generateVariable();
-        const vString = rdf_string_1.termToString(thisVariable);
         const path = ActorAbstractPath.FACTORY.createPath(object, predicate, thisVariable, graph);
         const results = bus_query_operation_1.ActorQueryOperation.getSafeBindings(await this.mediatorQueryOperation.mediate({ operation: path, context }));
         results.bindingsStream.on('data', async (bindings) => {
-            const result = bindings.get(vString);
+            const result = bindings.get(thisVariable);
             await this.getObjectsPredicateStar(result, predicate, graph, context, termHashes, it, counter);
         });
         results.bindingsStream.on('end', () => {
@@ -137,11 +152,12 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
                 it.close();
             }
         });
+        return results.metadata;
     }
     /**
        * Pushes all terms to iterator `it` that are a solution of ?s predicate* ?o.
-       * @param {string} subjectString String representation of subjectVariable
-       * @param {string} objectString String representation of objectVariable
+       * @param {string} subjectVar String representation of subjectVariable
+       * @param {string} objectVar String representation of objectVariable
        * @param {Term} subjectVal Term of where we start the predicate* search.
        * @param {Term} objectVal Found solution for an object, start for the new step.
        * @param {Algebra.PropertyPathSymbol} predicate Predicate of the *-path.
@@ -157,20 +173,23 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
        */
     // Let the iterator `it` emit all bindings of size 2, with subjectStringVariable as value subjectVal
     // and objectStringVariable as value all nodes reachable through predicate* beginning at objectVal
-    async getSubjectAndObjectBindingsPredicateStar(subjectString, objectString, subjectVal, objectVal, predicate, graph, context, termHashesGlobal, termHashesCurrentSubject, it, counter) {
-        const termString = rdf_string_1.termToString(objectVal) + rdf_string_1.termToString(graph);
+    async getSubjectAndObjectBindingsPredicateStar(subjectVar, objectVar, subjectVal, objectVal, predicate, graph, context, termHashesGlobal, termHashesCurrentSubject, it, counter) {
+        const termString = (0, rdf_string_1.termToString)(objectVal) + (0, rdf_string_1.termToString)(graph);
         // If this combination of subject and object already done, return nothing
         if (termHashesCurrentSubject[termString]) {
             return;
         }
         counter.count++;
         termHashesCurrentSubject[termString] = true;
-        it._push(bus_query_operation_1.Bindings({ [subjectString]: subjectVal, [objectString]: objectVal }));
+        it._push(BF.bindings([
+            [subjectVar, subjectVal],
+            [objectVar, objectVal],
+        ]));
         // If every reachable node from object has already been calculated, use these for current subject too
         if (termString in termHashesGlobal) {
             const objects = await termHashesGlobal[termString];
             for (const object of objects) {
-                await this.getSubjectAndObjectBindingsPredicateStar(subjectString, objectString, subjectVal, object, predicate, graph, context, termHashesGlobal, termHashesCurrentSubject, it, counter);
+                await this.getSubjectAndObjectBindingsPredicateStar(subjectVar, objectVar, subjectVal, object, predicate, graph, context, termHashesGlobal, termHashesCurrentSubject, it, counter);
             }
             if (--counter.count === 0) {
                 it.close();
@@ -182,14 +201,13 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
             const objectsArray = [];
             // Construct path that leads us one step through predicate
             const thisVariable = this.generateVariable();
-            const vString = rdf_string_1.termToString(thisVariable);
             const path = ActorAbstractPath.FACTORY.createPath(objectVal, predicate, thisVariable, graph);
             const results = bus_query_operation_1.ActorQueryOperation.getSafeBindings(await this.mediatorQueryOperation.mediate({ operation: path, context }));
             // Recursive call on all neighbours
             results.bindingsStream.on('data', async (bindings) => {
-                const result = bindings.get(vString);
+                const result = bindings.get(thisVariable);
                 objectsArray.push(result);
-                await this.getSubjectAndObjectBindingsPredicateStar(subjectString, objectString, subjectVal, result, predicate, graph, context, termHashesGlobal, termHashesCurrentSubject, it, counter);
+                await this.getSubjectAndObjectBindingsPredicateStar(subjectVar, objectVar, subjectVal, result, predicate, graph, context, termHashesGlobal, termHashesCurrentSubject, it, counter);
             });
             results.bindingsStream.on('error', reject);
             results.bindingsStream.on('end', () => {
@@ -205,5 +223,4 @@ class ActorAbstractPath extends bus_query_operation_1.ActorQueryOperationTypedMe
 }
 exports.ActorAbstractPath = ActorAbstractPath;
 ActorAbstractPath.FACTORY = new sparqlalgebrajs_1.Factory();
-ActorAbstractPath.isPathArbitraryLengthDistinctKey = 'isPathArbitraryLengthDistinct';
 //# sourceMappingURL=ActorAbstractPath.js.map

package/lib/index.d.ts ADDED Viewed

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

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

package/package.json CHANGED Viewed

@@ -1,10 +1,10 @@
 {
   "name": "@comunica/actor-abstract-path",
-  "version": "1.21.1",
+  "version": "2.0.1-alpha.6.0",
   "description": "An abstract actor for handling mediatypes",
   "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,47 +28,26 @@
   "files": [
     "components",
     "lib/**/*.d.ts",
-    "lib/**/*.js",
-    "index.d.ts",
-    "index.js"
+    "lib/**/*.js"
   ],
-  "peerDependencies": {
-    "@comunica/core": "^1.0.0"
-  },
   "dependencies": {
-    "@comunica/types": "^1.21.1",
-    "@types/rdf-js": "*",
-    "asynciterator": "^3.1.0",
+    "@comunica/bindings-factory": "2.0.1-alpha.6.0",
+    "@comunica/bus-query-operation": "2.0.1-alpha.6.0",
+    "@comunica/bus-rdf-join": "2.0.1-alpha.6.0",
+    "@comunica/context-entries": "2.0.1-alpha.6.0",
+    "@comunica/core": "2.0.1-alpha.6.0",
+    "@comunica/mediatortype-join-coefficients": "2.0.1-alpha.6.0",
+    "@comunica/types": "2.0.1-alpha.6.0",
+    "@rdfjs/types": "*",
+    "asynciterator": "^3.2.1",
     "rdf-data-factory": "^1.0.3",
     "rdf-string": "^1.5.0",
-    "sparqlalgebrajs": "^2.5.5"
-  },
-  "devDependencies": {
-    "@comunica/bus-query-operation": "^1.21.1",
-    "@comunica/bus-rdf-join": "^1.21.1",
-    "@comunica/core": "^1.21.1",
-    "@comunica/mediatortype-iterations": "^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/AbstractPath.jsonld DELETED Viewed

@@ -1,21 +0,0 @@
-{
-  "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-abstract-path/^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-abstract-path",
-  "components": [
-    {
-      "@id": "caap:Actor/AbstractPath",
-      "@type": "AbstractClass",
-      "extends": "cbqo:Actor/QueryOperationTypedMediated",
-      "requireElement": "ActorAbstractPath",
-      "comment": "An abstract comunica actor for handling Path operations.",
-      "constructorArguments": [
-        {
-          "extends": "cbqo:Actor/QueryOperationTypedMediated/constructorArgumentsObject"
-        }
-      ]
-    }
-  ]
-}

package/index.d.ts DELETED Viewed

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