diff --git a/engines/config-query-sparql/config/merge-bindings-context/actors.json b/engines/config-query-sparql/config/merge-bindings-context/actors.json index b19889feb39..3e6de260230 100644 --- a/engines/config-query-sparql/config/merge-bindings-context/actors.json +++ b/engines/config-query-sparql/config/merge-bindings-context/actors.json @@ -3,5 +3,6 @@ "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/config-query-sparql/^3.0.0/components/context.jsonld" ], "import": [ + "ccqs:config/merge-bindings-context/source-binding-union.json" ] } diff --git a/engines/config-query-sparql/config/query-process/actors.json b/engines/config-query-sparql/config/query-process/actors.json index 09fc73d0d3a..edb5a7a0e8a 100644 --- a/engines/config-query-sparql/config/query-process/actors.json +++ b/engines/config-query-sparql/config/query-process/actors.json @@ -7,6 +7,7 @@ "ccqs:config/query-process/actors/sequential.json", "ccqs:config/query-process/actors/explain-parsed.json", "ccqs:config/query-process/actors/explain-logical.json", - "ccqs:config/query-process/actors/explain-physical.json" + "ccqs:config/query-process/actors/explain-physical.json", + "ccqs:config/query-process/actors/annotate-source-binding.json" ] } diff --git a/engines/config-query-sparql/config/query-source-identify-hypermedia/actors.json b/engines/config-query-sparql/config/query-source-identify-hypermedia/actors.json index ce80480fd4e..7296581538c 100644 --- a/engines/config-query-sparql/config/query-source-identify-hypermedia/actors.json +++ b/engines/config-query-sparql/config/query-source-identify-hypermedia/actors.json @@ -1,10 +1,10 @@ { "@context": [ "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^3.0.0/components/context.jsonld", - "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-source-identify-hypermedia-none/^3.0.0/components/context.jsonld", "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-source-identify-hypermedia-qpf/^3.0.0/components/context.jsonld", - "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-source-identify-hypermedia-sparql/^3.0.0/components/context.jsonld" + "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-source-identify-hypermedia-sparql/^3.0.0/components/context.jsonld", + "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-query-source-identify-hypermedia-annotate-source/^3.0.0/components/context.jsonld" ], "@id": "urn:comunica:default:Runner", "@type": "Runner", @@ -27,6 +27,17 @@ "@id": "urn:comunica:default:query-source-identify-hypermedia/actors#none", "@type": "ActorQuerySourceIdentifyHypermediaNone", "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" } + }, + { + "@id": "urn:comunica:default:query-source-identify-hypermedia/actors#annotate-source", + "@type": "ActorQuerySourceIdentifyHypermediaAnnotateSource", + "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }, + "mediatorQuerySourceIdentifyHypermedia": { "@id": "urn:comunica:default:query-source-identify-hypermedia/mediators#main" }, + "beforeActors": [ + { "@id": "urn:comunica:default:query-source-identify-hypermedia/actors#none" }, + { "@id": "urn:comunica:default:rdf-resolve-quad-pattern/actors#sparql" }, + { "@id": "urn:comunica:default:query-source-identify-hypermedia/actors#qpf" } + ] } ] } diff --git a/packages/actor-merge-bindings-context-union/lib/ActorMergeBindingsContextUnion.ts b/packages/actor-merge-bindings-context-union/lib/ActorMergeBindingsContextUnion.ts index 94d3a084bb4..e0b99e5fe87 100644 --- a/packages/actor-merge-bindings-context-union/lib/ActorMergeBindingsContextUnion.ts +++ b/packages/actor-merge-bindings-context-union/lib/ActorMergeBindingsContextUnion.ts @@ -23,6 +23,7 @@ export class ActorMergeBindingsContextUnion extends ActorMergeBindingsContext { } public async run(_action: IActionMergeBindingsContext): Promise { + console.log('ActorMergeBindingsContextUnion'); // Merge function: Union with set semantics const mergeHandlers: Record> = {}; mergeHandlers[this.contextKey] = new SetUnionBindingsContextMergeHandler(); diff --git a/packages/actor-query-process-annotate-source-binding/lib/ActorQueryProcessAnnotateSourceBinding.ts b/packages/actor-query-process-annotate-source-binding/lib/ActorQueryProcessAnnotateSourceBinding.ts index 846971f2473..d5d8e501930 100644 --- a/packages/actor-query-process-annotate-source-binding/lib/ActorQueryProcessAnnotateSourceBinding.ts +++ b/packages/actor-query-process-annotate-source-binding/lib/ActorQueryProcessAnnotateSourceBinding.ts @@ -33,6 +33,7 @@ export class ActorQueryProcessAnnotateSourceBinding extends ActorQueryProcess { } public async run(action: IActionQueryProcess): Promise { + console.log('ActorQueryProcessAnnotateSourceBinding'); const context = action.context.set(KEY_CONTEXT_WRAPPED, true); action.context = context; diff --git a/packages/actor-query-source-identify-hypermedia-annotate-source/lib/ActorQuerySourceIdentifyHypermediaAnnotateSource.ts b/packages/actor-query-source-identify-hypermedia-annotate-source/lib/ActorQuerySourceIdentifyHypermediaAnnotateSource.ts index 9d07b711a07..87f17e16104 100644 --- a/packages/actor-query-source-identify-hypermedia-annotate-source/lib/ActorQuerySourceIdentifyHypermediaAnnotateSource.ts +++ b/packages/actor-query-source-identify-hypermedia-annotate-source/lib/ActorQuerySourceIdentifyHypermediaAnnotateSource.ts @@ -24,6 +24,7 @@ export class ActorQuerySourceIdentifyHypermediaAnnotateSource extends ActorQuery public async testMetadata( action: IActionQuerySourceIdentifyHypermedia, ): Promise { + console.log('ActorQuerySourceIdentifyHypermediaAnnotateSource - TEST'); if (action.context.get(KEY_CONTEXT_WRAPPED)) { throw new Error('Unable to wrap query source multiple times'); } @@ -31,6 +32,7 @@ export class ActorQuerySourceIdentifyHypermediaAnnotateSource extends ActorQuery } public async run(action: IActionQuerySourceIdentifyHypermedia): Promise { + console.log('ActorQuerySourceIdentifyHypermediaAnnotateSource'); const context = action.context.set(KEY_CONTEXT_WRAPPED, true); action.context = context;