@comunica/actor-query-source-identify-rdfjs 3.2.4-alpha.47.0 → 3.3.0

package/components/ActorQuerySourceIdentifyRdfJs.jsonld

@@ -49,10 +49,6 @@
                   {
                     "@type": "ParameterRangeGenericTypeReference",
                     "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
-                  },
-                  {
-                    "@type": "ParameterRangeGenericTypeReference",
-                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
                   }
                 ]
               },
@@ -67,10 +63,6 @@
               {
                 "@type": "ParameterRangeGenericTypeReference",
                 "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
-              },
-              {
-                "@type": "ParameterRangeGenericTypeReference",
-                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
               }
             ]
           },
@@ -80,20 +72,6 @@
           },
           "comment": "The bus this actor subscribes to."
         },
-        {
-          "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_busFailMessage",
-          "range": {
-            "@type": "ParameterRangeUnion",
-            "parameterRangeElements": [
-              "xsd:string",
-              {
-                "@type": "ParameterRangeUndefined"
-              }
-            ]
-          },
-          "default": "Query source identification failed: none of the configured actors were able to identify ${action.querySourceUnidentified.value}",
-          "comment": "The message that will be configured in the bus for reporting failures.  This message may be a template string that contains references to the executed `action`. For example, the following templated string is allowed: \"RDF dereferencing failed: no actors could handle ${action.handle.mediaType}\""
-        },
         {
           "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_beforeActors",
           "range": {
@@ -116,10 +94,6 @@
                     {
                       "@type": "ParameterRangeGenericTypeReference",
                       "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
-                    },
-                    {
-                      "@type": "ParameterRangeGenericTypeReference",
-                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
                     }
                   ]
                 }
@@ -173,12 +147,6 @@
                 "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_bus"
               }
             },
-            {
-              "keyRaw": "busFailMessage",
-              "value": {
-                "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_busFailMessage"
-              }
-            },
             {
               "keyRaw": "beforeActors",
               "value": {

package/components/QuerySourceRdfJs.jsonld

@@ -15,25 +15,13 @@
         },
         {
           "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs_bindingsFactory",
-          "range": "urn:npm:@comunica/utils-bindings-factory:BindingsFactory"
-        },
-        {
-          "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs_dataFactory",
-          "range": {
-            "@type": "ParameterRangeIntersection",
-            "parameterRangeElements": [
-              "urn:npm:@rdfjs/types:DataFactory",
-              {
-                "@type": "ParameterRangeWildcard"
-              }
-            ]
-          }
+          "range": "urn:npm:@comunica/bindings-factory:BindingsFactory"
         }
       ],
       "memberFields": [
         {
-          "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs__member_selectorShape",
-          "memberFieldName": "selectorShape",
+          "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs__member_SELECTOR_SHAPE",
+          "memberFieldName": "SELECTOR_SHAPE",
           "range": {
             "@type": "ParameterRangeWildcard"
           }
@@ -54,10 +42,6 @@
           "memberFieldName": "source",
           "range": "caqsir:components/IRdfJsSourceExtended.jsonld#IRdfJsSourceExtended"
         },
-        {
-          "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs__member_dataFactory",
-          "memberFieldName": "dataFactory"
-        },
         {
           "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs__member_bindingsFactory",
           "memberFieldName": "bindingsFactory"
@@ -107,9 +91,6 @@
         {
           "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs_source"
         },
-        {
-          "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs_dataFactory"
-        },
         {
           "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs_bindingsFactory"
         }

package/components/context.jsonld

@@ -17,9 +17,6 @@
           "args_bus": {
             "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_bus"
           },
-          "args_busFailMessage": {
-            "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_busFailMessage"
-          },
           "args_beforeActors": {
             "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_beforeActors",
             "@container": "@list"
@@ -33,9 +30,6 @@
           "bus": {
             "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_bus"
           },
-          "busFailMessage": {
-            "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_busFailMessage"
-          },
           "beforeActors": {
             "@id": "caqsir:components/ActorQuerySourceIdentifyRdfJs.jsonld#ActorQuerySourceIdentifyRdfJs_args_beforeActors",
             "@container": "@list"
@@ -61,12 +55,6 @@
           },
           "bindingsFactory": {
             "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs_bindingsFactory"
-          },
-          "dataFactory": {
-            "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs_dataFactory"
-          },
-          "ory": {
-            "@id": "caqsir:components/QuerySourceRdfJs.jsonld#QuerySourceRdfJs_bindingsFactory"
           }
         }
       }

package/lib/ActorQuerySourceIdentifyRdfJs.d.ts

@@ -1,14 +1,14 @@
 import type { MediatorMergeBindingsContext } from '@comunica/bus-merge-bindings-context';
 import type { IActionQuerySourceIdentify, IActorQuerySourceIdentifyOutput, IActorQuerySourceIdentifyArgs } from '@comunica/bus-query-source-identify';
 import { ActorQuerySourceIdentify } from '@comunica/bus-query-source-identify';
-import type { IActorTest, TestResult } from '@comunica/core';
+import type { IActorTest } from '@comunica/core';
 /**
  * A comunica RDFJS Query Source Identify Actor.
  */
 export declare class ActorQuerySourceIdentifyRdfJs extends ActorQuerySourceIdentify {
     readonly mediatorMergeBindingsContext: MediatorMergeBindingsContext;
     constructor(args: IActorQuerySourceIdentifyRdfJsArgs);
-    test(action: IActionQuerySourceIdentify): Promise<TestResult<IActorTest>>;
+    test(action: IActionQuerySourceIdentify): Promise<IActorTest>;
     run(action: IActionQuerySourceIdentify): Promise<IActorQuerySourceIdentifyOutput>;
 }
 export interface IActorQuerySourceIdentifyRdfJsArgs extends IActorQuerySourceIdentifyArgs {

package/lib/ActorQuerySourceIdentifyRdfJs.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActorQuerySourceIdentifyRdfJs = void 0;
+const bindings_factory_1 = require("@comunica/bindings-factory");
 const bus_query_source_identify_1 = require("@comunica/bus-query-source-identify");
-const context_entries_1 = require("@comunica/context-entries");
 const core_1 = require("@comunica/core");
-const utils_bindings_factory_1 = require("@comunica/utils-bindings-factory");
 const QuerySourceRdfJs_1 = require("./QuerySourceRdfJs");
 /**
  * A comunica RDFJS Query Source Identify Actor.
@@ -16,18 +15,17 @@ class ActorQuerySourceIdentifyRdfJs extends bus_query_source_identify_1.ActorQue
     async test(action) {
         const source = action.querySourceUnidentified;
         if (source.type !== undefined && source.type !== 'rdfjs') {
-            return (0, core_1.failTest)(`${this.name} requires a single query source with rdfjs type to be present in the context.`);
+            throw new Error(`${this.name} requires a single query source with rdfjs type to be present in the context.`);
         }
         if (typeof source.value === 'string' || !('match' in source.value)) {
-            return (0, core_1.failTest)(`${this.name} received an invalid rdfjs query source.`);
+            throw new Error(`${this.name} received an invalid rdfjs query source.`);
         }
-        return (0, core_1.passTestVoid)();
+        return true;
     }
     async run(action) {
-        const dataFactory = action.context.getSafe(context_entries_1.KeysInitQuery.dataFactory);
         return {
             querySource: {
-                source: new QuerySourceRdfJs_1.QuerySourceRdfJs(action.querySourceUnidentified.value, dataFactory, await utils_bindings_factory_1.BindingsFactory.create(this.mediatorMergeBindingsContext, action.context, dataFactory)),
+                source: new QuerySourceRdfJs_1.QuerySourceRdfJs(action.querySourceUnidentified.value, await bindings_factory_1.BindingsFactory.create(this.mediatorMergeBindingsContext, action.context)),
                 context: action.querySourceUnidentified.context ?? new core_1.ActionContext(),
             },
         };

package/lib/ActorQuerySourceIdentifyRdfJs.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActorQuerySourceIdentifyRdfJs.js","sourceRoot":"","sources":["ActorQuerySourceIdentifyRdfJs.ts"],"names":[],"mappings":";;;AAMA,mFAA+E;AAC/E,+DAA0D;AAE1D,yCAAuE;AAEvE,6EAAmE;AAEnE,yDAAsD;AAEtD;;GAEG;AACH,MAAa,6BAA8B,SAAQ,oDAAwB;IAGzE,YAAmB,IAAwC;QACzD,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAkC;QAClD,MAAM,MAAM,GAAG,MAAM,CAAC,uBAAuB,CAAC;QAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACzD,OAAO,IAAA,eAAQ,EAAC,GAAG,IAAI,CAAC,IAAI,+EAA+E,CAAC,CAAC;QAC/G,CAAC;QACD,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACnE,OAAO,IAAA,eAAQ,EAAC,GAAG,IAAI,CAAC,IAAI,0CAA0C,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,IAAA,mBAAY,GAAE,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,MAAkC;QACjD,MAAM,WAAW,GAAwB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,+BAAa,CAAC,WAAW,CAAC,CAAC;QAC3F,OAAO;YACL,WAAW,EAAE;gBACX,MAAM,EAAE,IAAI,mCAAgB,CACb,MAAM,CAAC,uBAAuB,CAAC,KAAK,EACjD,WAAW,EACX,MAAM,wCAAe,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAC7F;gBACD,OAAO,EAAE,MAAM,CAAC,uBAAuB,CAAC,OAAO,IAAI,IAAI,oBAAa,EAAE;aACvE;SACF,CAAC;IACJ,CAAC;CACF;AA/BD,sEA+BC","sourcesContent":["import type { MediatorMergeBindingsContext } from '@comunica/bus-merge-bindings-context';\nimport type {\n  IActionQuerySourceIdentify,\n  IActorQuerySourceIdentifyOutput,\n  IActorQuerySourceIdentifyArgs,\n} from '@comunica/bus-query-source-identify';\nimport { ActorQuerySourceIdentify } from '@comunica/bus-query-source-identify';\nimport { KeysInitQuery } from '@comunica/context-entries';\nimport type { IActorTest, TestResult } from '@comunica/core';\nimport { failTest, passTestVoid, ActionContext } from '@comunica/core';\nimport type { ComunicaDataFactory } from '@comunica/types';\nimport { BindingsFactory } from '@comunica/utils-bindings-factory';\nimport type * as RDF from '@rdfjs/types';\nimport { QuerySourceRdfJs } from './QuerySourceRdfJs';\n\n/**\n * A comunica RDFJS Query Source Identify Actor.\n */\nexport class ActorQuerySourceIdentifyRdfJs extends ActorQuerySourceIdentify {\n  public readonly mediatorMergeBindingsContext: MediatorMergeBindingsContext;\n\n  public constructor(args: IActorQuerySourceIdentifyRdfJsArgs) {\n    super(args);\n  }\n\n  public async test(action: IActionQuerySourceIdentify): Promise<TestResult<IActorTest>> {\n    const source = action.querySourceUnidentified;\n    if (source.type !== undefined && source.type !== 'rdfjs') {\n      return failTest(`${this.name} requires a single query source with rdfjs type to be present in the context.`);\n    }\n    if (typeof source.value === 'string' || !('match' in source.value)) {\n      return failTest(`${this.name} received an invalid rdfjs query source.`);\n    }\n    return passTestVoid();\n  }\n\n  public async run(action: IActionQuerySourceIdentify): Promise<IActorQuerySourceIdentifyOutput> {\n    const dataFactory: ComunicaDataFactory = action.context.getSafe(KeysInitQuery.dataFactory);\n    return {\n      querySource: {\n        source: new QuerySourceRdfJs(\n          <RDF.Source> action.querySourceUnidentified.value,\n          dataFactory,\n          await BindingsFactory.create(this.mediatorMergeBindingsContext, action.context, dataFactory),\n        ),\n        context: action.querySourceUnidentified.context ?? new ActionContext(),\n      },\n    };\n  }\n}\n\nexport interface IActorQuerySourceIdentifyRdfJsArgs extends IActorQuerySourceIdentifyArgs {\n  /**\n   * A mediator for creating binding context merge handlers\n   */\n  mediatorMergeBindingsContext: MediatorMergeBindingsContext;\n}\n"]}
+{"version":3,"file":"ActorQuerySourceIdentifyRdfJs.js","sourceRoot":"","sources":["ActorQuerySourceIdentifyRdfJs.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAO7D,mFAA+E;AAE/E,yCAA+C;AAE/C,yDAAsD;AAEtD;;GAEG;AACH,MAAa,6BAA8B,SAAQ,oDAAwB;IAGzE,YAAmB,IAAwC;QACzD,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAkC;QAClD,MAAM,MAAM,GAAG,MAAM,CAAC,uBAAuB,CAAC;QAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,+EAA+E,CAAC,CAAC;QAC/G,CAAC;QACD,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACnE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,0CAA0C,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,MAAkC;QACjD,OAAO;YACL,WAAW,EAAE;gBACX,MAAM,EAAE,IAAI,mCAAgB,CACb,MAAM,CAAC,uBAAuB,CAAC,KAAK,EACjD,MAAM,kCAAe,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,MAAM,CAAC,OAAO,CAAC,CAChF;gBACD,OAAO,EAAE,MAAM,CAAC,uBAAuB,CAAC,OAAO,IAAI,IAAI,oBAAa,EAAE;aACvE;SACF,CAAC;IACJ,CAAC;CACF;AA7BD,sEA6BC","sourcesContent":["import { BindingsFactory } from '@comunica/bindings-factory';\nimport type { MediatorMergeBindingsContext } from '@comunica/bus-merge-bindings-context';\nimport type {\n  IActionQuerySourceIdentify,\n  IActorQuerySourceIdentifyOutput,\n  IActorQuerySourceIdentifyArgs,\n} from '@comunica/bus-query-source-identify';\nimport { ActorQuerySourceIdentify } from '@comunica/bus-query-source-identify';\nimport type { IActorTest } from '@comunica/core';\nimport { ActionContext } from '@comunica/core';\nimport type * as RDF from '@rdfjs/types';\nimport { QuerySourceRdfJs } from './QuerySourceRdfJs';\n\n/**\n * A comunica RDFJS Query Source Identify Actor.\n */\nexport class ActorQuerySourceIdentifyRdfJs extends ActorQuerySourceIdentify {\n  public readonly mediatorMergeBindingsContext: MediatorMergeBindingsContext;\n\n  public constructor(args: IActorQuerySourceIdentifyRdfJsArgs) {\n    super(args);\n  }\n\n  public async test(action: IActionQuerySourceIdentify): Promise<IActorTest> {\n    const source = action.querySourceUnidentified;\n    if (source.type !== undefined && source.type !== 'rdfjs') {\n      throw new Error(`${this.name} requires a single query source with rdfjs type to be present in the context.`);\n    }\n    if (typeof source.value === 'string' || !('match' in source.value)) {\n      throw new Error(`${this.name} received an invalid rdfjs query source.`);\n    }\n    return true;\n  }\n\n  public async run(action: IActionQuerySourceIdentify): Promise<IActorQuerySourceIdentifyOutput> {\n    return {\n      querySource: {\n        source: new QuerySourceRdfJs(\n          <RDF.Source> action.querySourceUnidentified.value,\n          await BindingsFactory.create(this.mediatorMergeBindingsContext, action.context),\n        ),\n        context: action.querySourceUnidentified.context ?? new ActionContext(),\n      },\n    };\n  }\n}\n\nexport interface IActorQuerySourceIdentifyRdfJsArgs extends IActorQuerySourceIdentifyArgs {\n  /**\n   * A mediator for creating binding context merge handlers\n   */\n  mediatorMergeBindingsContext: MediatorMergeBindingsContext;\n}\n"]}

package/lib/QuerySourceRdfJs.d.ts

@@ -1,16 +1,15 @@
-import type { IQuerySource, BindingsStream, IActionContext, FragmentSelectorShape, ComunicaDataFactory } from '@comunica/types';
-import type { BindingsFactory } from '@comunica/utils-bindings-factory';
+import type { BindingsFactory } from '@comunica/bindings-factory';
+import type { IQuerySource, BindingsStream, IActionContext, FragmentSelectorShape } from '@comunica/types';
 import type * as RDF from '@rdfjs/types';
 import { AsyncIterator } from 'asynciterator';
 import type { Algebra } from 'sparqlalgebrajs';
 import type { IRdfJsSourceExtended } from './IRdfJsSourceExtended';
 export declare class QuerySourceRdfJs implements IQuerySource {
-    protected readonly selectorShape: FragmentSelectorShape;
+    protected static readonly SELECTOR_SHAPE: FragmentSelectorShape;
     referenceValue: string | RDF.Source;
     protected readonly source: IRdfJsSourceExtended;
-    private readonly dataFactory;
     private readonly bindingsFactory;
-    constructor(source: RDF.Source, dataFactory: ComunicaDataFactory, bindingsFactory: BindingsFactory);
+    constructor(source: RDF.Source, bindingsFactory: BindingsFactory);
     static nullifyVariables(term: RDF.Term | undefined, quotedTripleFiltering: boolean): RDF.Term | undefined;
     static hasDuplicateVariables(pattern: RDF.BaseQuad): boolean;
     getSelectorShape(): Promise<FragmentSelectorShape>;

package/lib/QuerySourceRdfJs.js

@@ -3,29 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuerySourceRdfJs = void 0;
 const bus_query_source_identify_1 = require("@comunica/bus-query-source-identify");
 const context_entries_1 = require("@comunica/context-entries");
-const utils_metadata_1 = require("@comunica/utils-metadata");
+const metadata_1 = require("@comunica/metadata");
 const asynciterator_1 = require("asynciterator");
+const rdf_data_factory_1 = require("rdf-data-factory");
 const rdf_terms_1 = require("rdf-terms");
 const sparqlalgebrajs_1 = require("sparqlalgebrajs");
+const AF = new sparqlalgebrajs_1.Factory();
+const DF = new rdf_data_factory_1.DataFactory();
 class QuerySourceRdfJs {
-    constructor(source, dataFactory, bindingsFactory) {
+    constructor(source, bindingsFactory) {
         this.source = source;
         this.referenceValue = source;
-        this.dataFactory = dataFactory;
         this.bindingsFactory = bindingsFactory;
-        const AF = new sparqlalgebrajs_1.Factory(this.dataFactory);
-        this.selectorShape = {
-            type: 'operation',
-            operation: {
-                operationType: 'pattern',
-                pattern: AF.createPattern(this.dataFactory.variable('s'), this.dataFactory.variable('p'), this.dataFactory.variable('o')),
-            },
-            variablesOptional: [
-                this.dataFactory.variable('s'),
-                this.dataFactory.variable('p'),
-                this.dataFactory.variable('o'),
-            ],
-        };
     }
     static nullifyVariables(term, quotedTripleFiltering) {
         return !term || term.termType === 'Variable' || (!quotedTripleFiltering &&
@@ -38,7 +27,7 @@ class QuerySourceRdfJs {
         return variables.length > 1 && (0, rdf_terms_1.uniqTerms)(variables).length < variables.length;
     }
     async getSelectorShape() {
-        return this.selectorShape;
+        return QuerySourceRdfJs.SELECTOR_SHAPE;
     }
     queryBindings(operation, context) {
         if (operation.type !== 'pattern') {
@@ -60,7 +49,7 @@ class QuerySourceRdfJs {
             this.setMetadata(it, operation)
                 .catch(error => it.destroy(error));
         }
-        return (0, bus_query_source_identify_1.quadsToBindings)(it, operation, this.dataFactory, this.bindingsFactory, Boolean(context.get(context_entries_1.KeysQueryOperation.unionDefaultGraph)));
+        return (0, bus_query_source_identify_1.quadsToBindings)(it, operation, this.bindingsFactory, Boolean(context.get(context_entries_1.KeysQueryOperation.unionDefaultGraph)));
     }
     async setMetadata(it, operation) {
         // Check if the source supports quoted triple filtering
@@ -87,8 +76,9 @@ class QuerySourceRdfJs {
             (0, rdf_terms_1.someTerms)(operation, term => term.termType === 'Quad')) ||
             QuerySourceRdfJs.hasDuplicateVariables(operation);
         it.setProperty('metadata', {
-            state: new utils_metadata_1.MetadataValidationState(),
+            state: new metadata_1.MetadataValidationState(),
             cardinality: { type: wouldRequirePostFiltering ? 'estimate' : 'exact', value: cardinality },
+            canContainUndefs: false,
         });
     }
     queryQuads(_operation, _context) {
@@ -105,4 +95,16 @@ class QuerySourceRdfJs {
     }
 }
 exports.QuerySourceRdfJs = QuerySourceRdfJs;
+QuerySourceRdfJs.SELECTOR_SHAPE = {
+    type: 'operation',
+    operation: {
+        operationType: 'pattern',
+        pattern: AF.createPattern(DF.variable('s'), DF.variable('p'), DF.variable('o')),
+    },
+    variablesOptional: [
+        DF.variable('s'),
+        DF.variable('p'),
+        DF.variable('o'),
+    ],
+};
 //# sourceMappingURL=QuerySourceRdfJs.js.map

package/lib/QuerySourceRdfJs.js.map

@@ -1 +1 @@
-{"version":3,"file":"QuerySourceRdfJs.js","sourceRoot":"","sources":["QuerySourceRdfJs.ts"],"names":[],"mappings":"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","sourcesContent":["import { filterMatchingQuotedQuads, quadsToBindings } from '@comunica/bus-query-source-identify';\nimport { KeysQueryOperation } from '@comunica/context-entries';\nimport type {\n  IQuerySource,\n  BindingsStream,\n  IActionContext,\n  FragmentSelectorShape,\n  ComunicaDataFactory,\n} from '@comunica/types';\nimport type { BindingsFactory } from '@comunica/utils-bindings-factory';\nimport { MetadataValidationState } from '@comunica/utils-metadata';\nimport type * as RDF from '@rdfjs/types';\nimport { AsyncIterator, wrap as wrapAsyncIterator } from 'asynciterator';\nimport { someTermsNested, filterTermsNested, someTerms, uniqTerms } from 'rdf-terms';\nimport type { Algebra } from 'sparqlalgebrajs';\nimport { Factory } from 'sparqlalgebrajs';\nimport type { IRdfJsSourceExtended } from './IRdfJsSourceExtended';\n\nexport class QuerySourceRdfJs implements IQuerySource {\n  protected readonly selectorShape: FragmentSelectorShape;\n  public referenceValue: string | RDF.Source;\n  protected readonly source: IRdfJsSourceExtended;\n  private readonly dataFactory: ComunicaDataFactory;\n  private readonly bindingsFactory: BindingsFactory;\n\n  public constructor(source: RDF.Source, dataFactory: ComunicaDataFactory, bindingsFactory: BindingsFactory) {\n    this.source = source;\n    this.referenceValue = source;\n    this.dataFactory = dataFactory;\n    this.bindingsFactory = bindingsFactory;\n    const AF = new Factory(<RDF.DataFactory> this.dataFactory);\n    this.selectorShape = {\n      type: 'operation',\n      operation: {\n        operationType: 'pattern',\n        pattern: AF.createPattern(\n          this.dataFactory.variable('s'),\n          this.dataFactory.variable('p'),\n          this.dataFactory.variable('o'),\n        ),\n      },\n      variablesOptional: [\n        this.dataFactory.variable('s'),\n        this.dataFactory.variable('p'),\n        this.dataFactory.variable('o'),\n      ],\n    };\n  }\n\n  public static nullifyVariables(term: RDF.Term | undefined, quotedTripleFiltering: boolean): RDF.Term | undefined {\n    return !term || term.termType === 'Variable' || (!quotedTripleFiltering &&\n      term.termType === 'Quad' && someTermsNested(term, value => value.termType === 'Variable')) ?\n      undefined :\n      term;\n  }\n\n  public static hasDuplicateVariables(pattern: RDF.BaseQuad): boolean {\n    const variables = filterTermsNested(pattern, term => term.termType === 'Variable');\n    return variables.length > 1 && uniqTerms(variables).length < variables.length;\n  }\n\n  public async getSelectorShape(): Promise<FragmentSelectorShape> {\n    return this.selectorShape;\n  }\n\n  public queryBindings(operation: Algebra.Operation, context: IActionContext): BindingsStream {\n    if (operation.type !== 'pattern') {\n      throw new Error(`Attempted to pass non-pattern operation '${operation.type}' to QuerySourceRdfJs`);\n    }\n\n    // Check if the source supports quoted triple filtering\n    const quotedTripleFiltering = Boolean(this.source.features?.quotedTripleFiltering);\n\n    // Create an async iterator from the matched quad stream\n    const rawStream = this.source.match(\n      QuerySourceRdfJs.nullifyVariables(operation.subject, quotedTripleFiltering),\n      QuerySourceRdfJs.nullifyVariables(operation.predicate, quotedTripleFiltering),\n      QuerySourceRdfJs.nullifyVariables(operation.object, quotedTripleFiltering),\n      QuerySourceRdfJs.nullifyVariables(operation.graph, quotedTripleFiltering),\n    );\n    let it: AsyncIterator<RDF.Quad> = rawStream instanceof AsyncIterator ?\n      rawStream :\n      wrapAsyncIterator<RDF.Quad>(rawStream, { autoStart: false });\n\n    // Perform post-match-filtering if the source does not support quoted triple filtering.\n    if (!quotedTripleFiltering) {\n      it = filterMatchingQuotedQuads(operation, it);\n    }\n\n    // Determine metadata\n    if (!it.getProperty('metadata')) {\n      this.setMetadata(it, operation)\n        .catch(error => it.destroy(error));\n    }\n\n    return quadsToBindings(\n      it,\n      operation,\n      this.dataFactory,\n      this.bindingsFactory,\n      Boolean(context.get(KeysQueryOperation.unionDefaultGraph)),\n    );\n  }\n\n  protected async setMetadata(\n    it: AsyncIterator<RDF.Quad>,\n    operation: Algebra.Pattern,\n  ): Promise<void> {\n    // Check if the source supports quoted triple filtering\n    const quotedTripleFiltering = Boolean(this.source.features?.quotedTripleFiltering);\n\n    let cardinality: number;\n    if (this.source.countQuads) {\n      // If the source provides a dedicated method for determining cardinality, use that.\n      cardinality = await this.source.countQuads(\n        QuerySourceRdfJs.nullifyVariables(operation.subject, quotedTripleFiltering),\n        QuerySourceRdfJs.nullifyVariables(operation.predicate, quotedTripleFiltering),\n        QuerySourceRdfJs.nullifyVariables(operation.object, quotedTripleFiltering),\n        QuerySourceRdfJs.nullifyVariables(operation.graph, quotedTripleFiltering),\n      );\n    } else {\n      // Otherwise, fallback to a sub-optimal alternative where we just call match again to count the quads.\n      // WARNING: we can NOT reuse the original data stream here,\n      // because we may lose data elements due to things happening async.\n      let i = 0;\n      cardinality = await new Promise((resolve, reject) => {\n        const matches = this.source.match(\n          QuerySourceRdfJs.nullifyVariables(operation.subject, quotedTripleFiltering),\n          QuerySourceRdfJs.nullifyVariables(operation.predicate, quotedTripleFiltering),\n          QuerySourceRdfJs.nullifyVariables(operation.object, quotedTripleFiltering),\n          QuerySourceRdfJs.nullifyVariables(operation.graph, quotedTripleFiltering),\n        );\n        matches.on('error', reject);\n        matches.on('end', () => resolve(i));\n        matches.on('data', () => i++);\n      });\n    }\n\n    // If `match` would require filtering afterwards, our count will be an over-estimate.\n    const wouldRequirePostFiltering = (!quotedTripleFiltering &&\n        someTerms(operation, term => term.termType === 'Quad')) ||\n      QuerySourceRdfJs.hasDuplicateVariables(operation);\n\n    it.setProperty('metadata', {\n      state: new MetadataValidationState(),\n      cardinality: { type: wouldRequirePostFiltering ? 'estimate' : 'exact', value: cardinality },\n    });\n  }\n\n  public queryQuads(\n    _operation: Algebra.Operation,\n    _context: IActionContext,\n  ): AsyncIterator<RDF.Quad> {\n    throw new Error('queryQuads is not implemented in QuerySourceRdfJs');\n  }\n\n  public queryBoolean(\n    _operation: Algebra.Ask,\n    _context: IActionContext,\n  ): Promise<boolean> {\n    throw new Error('queryBoolean is not implemented in QuerySourceRdfJs');\n  }\n\n  public queryVoid(\n    _operation: Algebra.Update,\n    _context: IActionContext,\n  ): Promise<void> {\n    throw new Error('queryVoid is not implemented in QuerySourceRdfJs');\n  }\n\n  public toString(): string {\n    return `QuerySourceRdfJs(${this.source.constructor.name})`;\n  }\n}\n"]}
+{"version":3,"file":"QuerySourceRdfJs.js","sourceRoot":"","sources":["QuerySourceRdfJs.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BindingsFactory } from '@comunica/bindings-factory';\nimport { filterMatchingQuotedQuads, quadsToBindings } from '@comunica/bus-query-source-identify';\nimport { KeysQueryOperation } from '@comunica/context-entries';\nimport { MetadataValidationState } from '@comunica/metadata';\nimport type { IQuerySource, BindingsStream, IActionContext, FragmentSelectorShape } from '@comunica/types';\nimport type * as RDF from '@rdfjs/types';\nimport { AsyncIterator, wrap as wrapAsyncIterator } from 'asynciterator';\nimport { DataFactory } from 'rdf-data-factory';\nimport { someTermsNested, filterTermsNested, someTerms, uniqTerms } from 'rdf-terms';\nimport type { Algebra } from 'sparqlalgebrajs';\nimport { Factory } from 'sparqlalgebrajs';\nimport type { IRdfJsSourceExtended } from './IRdfJsSourceExtended';\n\nconst AF = new Factory();\nconst DF = new DataFactory<RDF.BaseQuad>();\n\nexport class QuerySourceRdfJs implements IQuerySource {\n  protected static readonly SELECTOR_SHAPE: FragmentSelectorShape = {\n    type: 'operation',\n    operation: {\n      operationType: 'pattern',\n      pattern: AF.createPattern(DF.variable('s'), DF.variable('p'), DF.variable('o')),\n    },\n    variablesOptional: [\n      DF.variable('s'),\n      DF.variable('p'),\n      DF.variable('o'),\n    ],\n  };\n\n  public referenceValue: string | RDF.Source;\n  protected readonly source: IRdfJsSourceExtended;\n  private readonly bindingsFactory: BindingsFactory;\n\n  public constructor(source: RDF.Source, bindingsFactory: BindingsFactory) {\n    this.source = source;\n    this.referenceValue = source;\n    this.bindingsFactory = bindingsFactory;\n  }\n\n  public static nullifyVariables(term: RDF.Term | undefined, quotedTripleFiltering: boolean): RDF.Term | undefined {\n    return !term || term.termType === 'Variable' || (!quotedTripleFiltering &&\n      term.termType === 'Quad' && someTermsNested(term, value => value.termType === 'Variable')) ?\n      undefined :\n      term;\n  }\n\n  public static hasDuplicateVariables(pattern: RDF.BaseQuad): boolean {\n    const variables = filterTermsNested(pattern, term => term.termType === 'Variable');\n    return variables.length > 1 && uniqTerms(variables).length < variables.length;\n  }\n\n  public async getSelectorShape(): Promise<FragmentSelectorShape> {\n    return QuerySourceRdfJs.SELECTOR_SHAPE;\n  }\n\n  public queryBindings(operation: Algebra.Operation, context: IActionContext): BindingsStream {\n    if (operation.type !== 'pattern') {\n      throw new Error(`Attempted to pass non-pattern operation '${operation.type}' to QuerySourceRdfJs`);\n    }\n\n    // Check if the source supports quoted triple filtering\n    const quotedTripleFiltering = Boolean(this.source.features?.quotedTripleFiltering);\n\n    // Create an async iterator from the matched quad stream\n    const rawStream = this.source.match(\n      QuerySourceRdfJs.nullifyVariables(operation.subject, quotedTripleFiltering),\n      QuerySourceRdfJs.nullifyVariables(operation.predicate, quotedTripleFiltering),\n      QuerySourceRdfJs.nullifyVariables(operation.object, quotedTripleFiltering),\n      QuerySourceRdfJs.nullifyVariables(operation.graph, quotedTripleFiltering),\n    );\n    let it: AsyncIterator<RDF.Quad> = rawStream instanceof AsyncIterator ?\n      rawStream :\n      wrapAsyncIterator<RDF.Quad>(rawStream, { autoStart: false });\n\n    // Perform post-match-filtering if the source does not support quoted triple filtering.\n    if (!quotedTripleFiltering) {\n      it = filterMatchingQuotedQuads(operation, it);\n    }\n\n    // Determine metadata\n    if (!it.getProperty('metadata')) {\n      this.setMetadata(it, operation)\n        .catch(error => it.destroy(error));\n    }\n\n    return quadsToBindings(\n      it,\n      operation,\n      this.bindingsFactory,\n      Boolean(context.get(KeysQueryOperation.unionDefaultGraph)),\n    );\n  }\n\n  protected async setMetadata(\n    it: AsyncIterator<RDF.Quad>,\n    operation: Algebra.Pattern,\n  ): Promise<void> {\n    // Check if the source supports quoted triple filtering\n    const quotedTripleFiltering = Boolean(this.source.features?.quotedTripleFiltering);\n\n    let cardinality: number;\n    if (this.source.countQuads) {\n      // If the source provides a dedicated method for determining cardinality, use that.\n      cardinality = await this.source.countQuads(\n        QuerySourceRdfJs.nullifyVariables(operation.subject, quotedTripleFiltering),\n        QuerySourceRdfJs.nullifyVariables(operation.predicate, quotedTripleFiltering),\n        QuerySourceRdfJs.nullifyVariables(operation.object, quotedTripleFiltering),\n        QuerySourceRdfJs.nullifyVariables(operation.graph, quotedTripleFiltering),\n      );\n    } else {\n      // Otherwise, fallback to a sub-optimal alternative where we just call match again to count the quads.\n      // WARNING: we can NOT reuse the original data stream here,\n      // because we may lose data elements due to things happening async.\n      let i = 0;\n      cardinality = await new Promise((resolve, reject) => {\n        const matches = this.source.match(\n          QuerySourceRdfJs.nullifyVariables(operation.subject, quotedTripleFiltering),\n          QuerySourceRdfJs.nullifyVariables(operation.predicate, quotedTripleFiltering),\n          QuerySourceRdfJs.nullifyVariables(operation.object, quotedTripleFiltering),\n          QuerySourceRdfJs.nullifyVariables(operation.graph, quotedTripleFiltering),\n        );\n        matches.on('error', reject);\n        matches.on('end', () => resolve(i));\n        matches.on('data', () => i++);\n      });\n    }\n\n    // If `match` would require filtering afterwards, our count will be an over-estimate.\n    const wouldRequirePostFiltering = (!quotedTripleFiltering &&\n        someTerms(operation, term => term.termType === 'Quad')) ||\n      QuerySourceRdfJs.hasDuplicateVariables(operation);\n\n    it.setProperty('metadata', {\n      state: new MetadataValidationState(),\n      cardinality: { type: wouldRequirePostFiltering ? 'estimate' : 'exact', value: cardinality },\n      canContainUndefs: false,\n    });\n  }\n\n  public queryQuads(\n    _operation: Algebra.Operation,\n    _context: IActionContext,\n  ): AsyncIterator<RDF.Quad> {\n    throw new Error('queryQuads is not implemented in QuerySourceRdfJs');\n  }\n\n  public queryBoolean(\n    _operation: Algebra.Ask,\n    _context: IActionContext,\n  ): Promise<boolean> {\n    throw new Error('queryBoolean is not implemented in QuerySourceRdfJs');\n  }\n\n  public queryVoid(\n    _operation: Algebra.Update,\n    _context: IActionContext,\n  ): Promise<void> {\n    throw new Error('queryVoid is not implemented in QuerySourceRdfJs');\n  }\n\n  public toString(): string {\n    return `QuerySourceRdfJs(${this.source.constructor.name})`;\n  }\n}\n"]}

package/package.json

@@ -1,13 +1,9 @@
 {
   "name": "@comunica/actor-query-source-identify-rdfjs",
-  "version": "3.2.4-alpha.47.0",
+  "version": "3.3.0",
   "description": "A rdfjs query-source-identify actor",
   "lsd:module": true,
   "license": "MIT",
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/comunica-association"
-  },
   "homepage": "https://comunica.dev/",
   "repository": {
     "type": "git",
@@ -41,17 +37,18 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/bus-merge-bindings-context": "3.2.4-alpha.47.0",
-    "@comunica/bus-query-source-identify": "3.2.4-alpha.47.0",
-    "@comunica/context-entries": "3.2.4-alpha.47.0",
-    "@comunica/core": "3.2.4-alpha.47.0",
-    "@comunica/types": "3.2.4-alpha.47.0",
-    "@comunica/utils-bindings-factory": "3.2.4-alpha.47.0",
-    "@comunica/utils-metadata": "3.2.4-alpha.47.0",
+    "@comunica/bindings-factory": "^3.3.0",
+    "@comunica/bus-merge-bindings-context": "^3.3.0",
+    "@comunica/bus-query-source-identify": "^3.3.0",
+    "@comunica/context-entries": "^3.3.0",
+    "@comunica/core": "^3.3.0",
+    "@comunica/metadata": "^3.3.0",
+    "@comunica/types": "^3.3.0",
     "@rdfjs/types": "*",
     "asynciterator": "^3.9.0",
+    "rdf-data-factory": "^1.1.1",
     "rdf-terms": "^1.11.0",
-    "sparqlalgebrajs": "^4.3.8"
+    "sparqlalgebrajs": "^4.3.7"
   },
-  "gitHead": "85bd4c5cf07dfc293ebbc3a1416b70e2db8bfc48"
+  "gitHead": "02bde397d206f1f5a523643a6a604c89e792e2f9"
 }