@comunica/actor-query-operation-construct 2.6.11-alpha.42.0 → 2.7.1
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.
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ActorQueryOperationConstruct = void 0;
|
|
4
4
|
const bus_query_operation_1 = require("@comunica/bus-query-operation");
|
|
5
|
-
const context_entries_1 = require("@comunica/context-entries");
|
|
6
5
|
const rdf_terms_1 = require("rdf-terms");
|
|
7
6
|
const sparqlalgebrajs_1 = require("sparqlalgebrajs");
|
|
8
7
|
const BindingsToQuadsIterator_1 = require("./BindingsToQuadsIterator");
|
|
@@ -31,16 +30,9 @@ class ActorQueryOperationConstruct extends bus_query_operation_1.ActorQueryOpera
|
|
|
31
30
|
const operation = { type: sparqlalgebrajs_1.Algebra.types.PROJECT, input: operationOriginal.input, variables };
|
|
32
31
|
// Evaluate the input query
|
|
33
32
|
const output = bus_query_operation_1.ActorQueryOperation.getSafeBindings(await this.mediatorQueryOperation.mediate({ operation, context }));
|
|
34
|
-
// Check if we apply blank node localization.
|
|
35
|
-
// The context dictate it's application.
|
|
36
|
-
// If it is not provided will apply the localization by default.
|
|
37
|
-
const localizeBlankNodesFromContext = context.get(context_entries_1.KeysQueryOperation.localizeBlankNodes);
|
|
38
|
-
const localizeBlankNodes = localizeBlankNodesFromContext !== undefined ?
|
|
39
|
-
localizeBlankNodesFromContext :
|
|
40
|
-
true;
|
|
41
33
|
// Construct triples using the result based on the pattern.
|
|
42
34
|
// If it's a DESCRIBE query don't apply the blank node localisation.
|
|
43
|
-
const quadStream = new BindingsToQuadsIterator_1.BindingsToQuadsIterator(operationOriginal.template, output.bindingsStream
|
|
35
|
+
const quadStream = new BindingsToQuadsIterator_1.BindingsToQuadsIterator(operationOriginal.template, output.bindingsStream);
|
|
44
36
|
// Let the final metadata contain the estimated number of triples
|
|
45
37
|
const metadata = () => output.metadata().then(meta => ({
|
|
46
38
|
...meta,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorQueryOperationConstruct.js","sourceRoot":"","sources":["ActorQueryOperationConstruct.ts"],"names":[],"mappings":";;;AACA,uEAGuC;
|
|
1
|
+
{"version":3,"file":"ActorQueryOperationConstruct.js","sourceRoot":"","sources":["ActorQueryOperationConstruct.ts"],"names":[],"mappings":";;;AACA,uEAGuC;AAMvC,yCAA8D;AAC9D,qDAA0C;AAC1C,uEAAoE;AAEpE;;GAEG;AACH,MAAa,4BAA6B,SAAQ,sDAAmD;IACnG,YAAmB,IAA2C;QAC5D,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,YAAY,CAAC,QAAwB;QACjD,OAAO,IAAA,qBAAS,EAAmB,EAAG,CAAC,MAAM;aAC1C,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,wBAAY,EAAC,IAAA,oBAAQ,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,SAA4B,EAAE,OAAuB;QAC9E,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,iBAAoC,EAAE,OAAuB;QAErF,yGAAyG;QACzG,MAAM,SAAS,GAAmB,4BAA4B,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACxG,MAAM,SAAS,GAAsB,EAAE,IAAI,EAAE,yBAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC;QAEhH,2BAA2B;QAC3B,MAAM,MAAM,GAAkC,yCAAmB,CAAC,eAAe,CAC/E,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAClE,CAAC;QAEF,2DAA2D;QAC3D,oEAAoE;QACpE,MAAM,UAAU,GAA4B,IAAI,iDAAuB,CACrE,iBAAiB,CAAC,QAAQ,EAC1B,MAAM,CAAC,cAAc,CACtB,CAAC;QAEF,iEAAiE;QACjE,MAAM,QAAQ,GAAmC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrF,GAAG,IAAI;YACP,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;gBAC3B,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,iBAAiB,CAAC,QAAQ,CAAC,MAAM;aAClE;YACD,gBAAgB,EAAE,KAAK;YACvB,eAAe,EAAE,SAAS;SAC3B,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,QAAQ;YACR,UAAU;YACV,IAAI,EAAE,OAAO;SACd,CAAC;IACJ,CAAC;CACF;AAvDD,oEAuDC","sourcesContent":["import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';\nimport {\n ActorQueryOperation,\n ActorQueryOperationTypedMediated,\n} from '@comunica/bus-query-operation';\nimport type { IActorTest } from '@comunica/core';\nimport type { IQueryOperationResultBindings, IActionContext, IQueryOperationResult,\n MetadataQuads } from '@comunica/types';\nimport type * as RDF from '@rdfjs/types';\nimport type { AsyncIterator } from 'asynciterator';\nimport { getTerms, getVariables, uniqTerms } from 'rdf-terms';\nimport { Algebra } from 'sparqlalgebrajs';\nimport { BindingsToQuadsIterator } from './BindingsToQuadsIterator';\n\n/**\n * A comunica Construct Query Operation Actor.\n */\nexport class ActorQueryOperationConstruct extends ActorQueryOperationTypedMediated<Algebra.Construct> {\n public constructor(args: IActorQueryOperationTypedMediatedArgs) {\n super(args, 'construct');\n }\n\n /**\n * Find all variables in a list of triple patterns.\n * @param {Algebra.Pattern[]} patterns An array of triple patterns.\n * @return {RDF.Variable[]} The variables in the triple patterns.\n */\n public static getVariables(patterns: RDF.BaseQuad[]): RDF.Variable[] {\n return uniqTerms((<RDF.Variable[]> []).concat\n .apply([], patterns.map(pattern => getVariables(getTerms(pattern)))));\n }\n\n public async testOperation(operation: Algebra.Construct, context: IActionContext): Promise<IActorTest> {\n return true;\n }\n\n public async runOperation(operationOriginal: Algebra.Construct, context: IActionContext):\n Promise<IQueryOperationResult> {\n // Apply a projection on our CONSTRUCT variables first, as the query may contain other variables as well.\n const variables: RDF.Variable[] = ActorQueryOperationConstruct.getVariables(operationOriginal.template);\n const operation: Algebra.Operation = { type: Algebra.types.PROJECT, input: operationOriginal.input, variables };\n\n // Evaluate the input query\n const output: IQueryOperationResultBindings = ActorQueryOperation.getSafeBindings(\n await this.mediatorQueryOperation.mediate({ operation, context }),\n );\n\n // Construct triples using the result based on the pattern.\n // If it's a DESCRIBE query don't apply the blank node localisation.\n const quadStream: AsyncIterator<RDF.Quad> = new BindingsToQuadsIterator(\n operationOriginal.template,\n output.bindingsStream,\n );\n\n // Let the final metadata contain the estimated number of triples\n const metadata: (() => Promise<MetadataQuads>) = () => output.metadata().then(meta => ({\n ...meta,\n order: undefined,\n cardinality: {\n type: meta.cardinality.type,\n value: meta.cardinality.value * operationOriginal.template.length,\n },\n canContainUndefs: false,\n availableOrders: undefined,\n }));\n\n return {\n metadata,\n quadStream,\n type: 'quads',\n };\n }\n}\n"]}
|
|
@@ -10,9 +10,8 @@ import { MultiTransformIterator } from 'asynciterator';
|
|
|
10
10
|
*/
|
|
11
11
|
export declare class BindingsToQuadsIterator extends MultiTransformIterator<Bindings, RDF.Quad> {
|
|
12
12
|
protected readonly template: RDF.BaseQuad[];
|
|
13
|
-
protected readonly localizeBlankNodes: boolean;
|
|
14
13
|
protected blankNodeCounter: number;
|
|
15
|
-
constructor(template: RDF.BaseQuad[], bindingsStream: BindingsStream
|
|
14
|
+
constructor(template: RDF.BaseQuad[], bindingsStream: BindingsStream);
|
|
16
15
|
/**
|
|
17
16
|
* Bind the given term.
|
|
18
17
|
* If the term is a variable and the variable is bound in the bindings object,
|
|
@@ -12,10 +12,9 @@ const DF = new rdf_data_factory_1.DataFactory();
|
|
|
12
12
|
* https://www.w3.org/TR/sparql11-query/#rConstructTriples
|
|
13
13
|
*/
|
|
14
14
|
class BindingsToQuadsIterator extends asynciterator_1.MultiTransformIterator {
|
|
15
|
-
constructor(template, bindingsStream
|
|
15
|
+
constructor(template, bindingsStream) {
|
|
16
16
|
super(bindingsStream, { autoStart: false });
|
|
17
17
|
this.template = template;
|
|
18
|
-
this.localizeBlankNodes = localizeBlankNodes;
|
|
19
18
|
this.blankNodeCounter = 0;
|
|
20
19
|
}
|
|
21
20
|
/**
|
|
@@ -89,19 +88,17 @@ class BindingsToQuadsIterator extends asynciterator_1.MultiTransformIterator {
|
|
|
89
88
|
* @return {RDF.Quad[]} A list of quads.
|
|
90
89
|
*/
|
|
91
90
|
bindTemplate(bindings, template, blankNodeCounter) {
|
|
92
|
-
|
|
91
|
+
const quads = template
|
|
92
|
+
// Make sure the multiple instantiations of the template contain different blank nodes, as required by SPARQL 1.1.
|
|
93
|
+
.map(BindingsToQuadsIterator.localizeQuad.bind(null, blankNodeCounter))
|
|
93
94
|
// Bind variables to bound terms
|
|
94
95
|
.map(x => BindingsToQuadsIterator.bindQuad.bind(null, bindings)(x))
|
|
95
96
|
// Remove quads that contained unbound terms, i.e., variables.
|
|
96
97
|
.filter(Boolean);
|
|
97
|
-
if (this.localizeBlankNodes) {
|
|
98
|
-
// Make sure the multiple instantiations of the template contain different blank nodes, as required by SPARQL 1.1.
|
|
99
|
-
quads = quads.map(BindingsToQuadsIterator.localizeQuad.bind(null, blankNodeCounter));
|
|
100
|
-
}
|
|
101
98
|
return quads;
|
|
102
99
|
}
|
|
103
100
|
_createTransformer(bindings) {
|
|
104
|
-
return new asynciterator_1.ArrayIterator(this.bindTemplate(bindings, this.template, this.blankNodeCounter++));
|
|
101
|
+
return new asynciterator_1.ArrayIterator(this.bindTemplate(bindings, this.template, this.blankNodeCounter++), { autoStart: false });
|
|
105
102
|
}
|
|
106
103
|
}
|
|
107
104
|
exports.BindingsToQuadsIterator = BindingsToQuadsIterator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BindingsToQuadsIterator.js","sourceRoot":"","sources":["BindingsToQuadsIterator.ts"],"names":[],"mappings":";;;AAGA,iDAAsE;AACtE,uDAA+C;AAC/C,yCAAqC;AAErC,MAAM,EAAE,GAAG,IAAI,8BAAW,EAAE,CAAC;AAE7B;;;;;GAKG;AACH,MAAa,uBAAwB,SAAQ,sCAA0C;
|
|
1
|
+
{"version":3,"file":"BindingsToQuadsIterator.js","sourceRoot":"","sources":["BindingsToQuadsIterator.ts"],"names":[],"mappings":";;;AAGA,iDAAsE;AACtE,uDAA+C;AAC/C,yCAAqC;AAErC,MAAM,EAAE,GAAG,IAAI,8BAAW,EAAE,CAAC;AAE7B;;;;;GAKG;AACH,MAAa,uBAAwB,SAAQ,sCAA0C;IAIrF,YAAmB,QAAwB,EAAE,cAA8B;QACzE,KAAK,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;OAYG;IACI,MAAM,CAAC,QAAQ,CAAC,QAAkB,EAAE,IAAc;QACvD,IAAI,IAAI,CAAC,QAAQ,KAAK,UAAU,EAAE;YAChC,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC3B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,QAAQ,CAAC,QAAkB,EAAE,OAAqB;QAC9D,IAAI;YACF,OAAO,IAAA,oBAAQ,EAAY,OAAO,EAAE,IAAI,CAAC,EAAE;gBACzC,MAAM,SAAS,GAAG,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACnE,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;iBACjC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC,CAAC;SACJ;QAAC,MAAM;YACN,aAAa;SACd;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,iBAAiB,CAAC,gBAAwB,EACtD,IAAc;QACd,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACjC,OAAO,EAAE,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,gBAAgB,EAAE,CAAC,CAAC;SACzD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,YAAY,CAAC,gBAAwB,EACjD,OAAqB;QACrB,OAAO,IAAA,oBAAQ,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;IACtG,CAAC;IAED;;;;;;OAMG;IACI,YAAY,CAAC,QAAkB,EAAE,QAAwB,EAAE,gBAAwB;QACxF,MAAM,KAAK,GAAoC,QAAQ;YACrD,kHAAkH;aACjH,GAAG,CAAC,uBAAuB,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YACvE,gCAAgC;aAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACnE,8DAA8D;aAC7D,MAAM,CAAC,OAAO,CAAC,CAAC;QACnB,OAAoB,KAAK,CAAC;IAC5B,CAAC;IAEM,kBAAkB,CAAC,QAAkB;QAC1C,OAAO,IAAI,6BAAa,CAAC,IAAI,CAAC,YAAY,CACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,CACjD,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3B,CAAC;CACF;AArGD,0DAqGC","sourcesContent":["import type { Bindings, BindingsStream } from '@comunica/types';\nimport type * as RDF from '@rdfjs/types';\nimport type { AsyncIterator } from 'asynciterator';\nimport { ArrayIterator, MultiTransformIterator } from 'asynciterator';\nimport { DataFactory } from 'rdf-data-factory';\nimport { mapTerms } from 'rdf-terms';\n\nconst DF = new DataFactory();\n\n/**\n * Transforms a bindings stream into a quad stream given a quad template.\n *\n * This conforms to the SPARQL 1.1 spec on constructing triples:\n * https://www.w3.org/TR/sparql11-query/#rConstructTriples\n */\nexport class BindingsToQuadsIterator extends MultiTransformIterator<Bindings, RDF.Quad> {\n protected readonly template: RDF.BaseQuad[];\n protected blankNodeCounter: number;\n\n public constructor(template: RDF.BaseQuad[], bindingsStream: BindingsStream) {\n super(bindingsStream, { autoStart: false });\n this.template = template;\n this.blankNodeCounter = 0;\n }\n\n /**\n * Bind the given term.\n * If the term is a variable and the variable is bound in the bindings object,\n * return the bindings value.\n * If the term is a variable and the variable is not bound in the bindings object,\n * a falsy value is returned..\n * Otherwise, the term itself is returned.\n * @param {Bindings} bindings A bindings object.\n * @param {RDF.Term} term An RDF term.\n * @return {RDF.Term} If the given term is not a variable, the term itself is returned.\n * If the given term is a variable, then the bound term is returned,\n * or a falsy value if it did not exist in the bindings.\n */\n public static bindTerm(bindings: Bindings, term: RDF.Term): RDF.Term | undefined {\n if (term.termType === 'Variable') {\n return bindings.get(term);\n }\n return term;\n }\n\n /**\n * Bind the given quad pattern.\n * If one of the terms was a variable AND is not bound in the bindings,\n * a falsy value will be returned.\n * @param {Bindings} bindings A bindings object.\n * @param {RDF.Quad} pattern An RDF quad.\n * @return {RDF.Quad} A bound RDF quad or undefined.\n */\n public static bindQuad(bindings: Bindings, pattern: RDF.BaseQuad): RDF.Quad | undefined {\n try {\n return mapTerms(<RDF.Quad> pattern, term => {\n const boundTerm = BindingsToQuadsIterator.bindTerm(bindings, term);\n if (!boundTerm) {\n throw new Error('Unbound term');\n }\n return boundTerm;\n });\n } catch {\n // Do nothing\n }\n }\n\n /**\n * Convert a blank node to a unique blank node in the given context.\n * If the given term is not a blank node, the term itself will be returned.\n * @param blankNodeCounter A counter value for the blank node.\n * @param {RDF.Term} term The term that should be localized.\n * @return {RDF.Term} A term.\n */\n public static localizeBlankNode(blankNodeCounter: number,\n term: RDF.Term): RDF.Term {\n if (term.termType === 'BlankNode') {\n return DF.blankNode(`${term.value}${blankNodeCounter}`);\n }\n return term;\n }\n\n /**\n * Convert the given quad to a quad that only contains unique blank nodes.\n * @param blankNodeCounter A counter value for the blank node.\n * @param {RDF.BaseQuad} pattern The pattern that should be localized.\n * @return {RDF.BaseQuad} A quad.\n */\n public static localizeQuad(blankNodeCounter: number,\n pattern: RDF.BaseQuad): RDF.BaseQuad {\n return mapTerms(pattern, term => BindingsToQuadsIterator.localizeBlankNode(blankNodeCounter, term));\n }\n\n /**\n * Convert the given template to a list of quads based on the given bindings.\n * @param {Bindings} bindings A bindings object.\n * @param {RDF.Quad[]} template A list of quad patterns.\n * @param blankNodeCounter A counter value for the blank node.\n * @return {RDF.Quad[]} A list of quads.\n */\n public bindTemplate(bindings: Bindings, template: RDF.BaseQuad[], blankNodeCounter: number): RDF.Quad[] {\n const quads: RDF.BaseQuad[] = <RDF.BaseQuad[]> template\n // Make sure the multiple instantiations of the template contain different blank nodes, as required by SPARQL 1.1.\n .map(BindingsToQuadsIterator.localizeQuad.bind(null, blankNodeCounter))\n // Bind variables to bound terms\n .map(x => BindingsToQuadsIterator.bindQuad.bind(null, bindings)(x))\n // Remove quads that contained unbound terms, i.e., variables.\n .filter(Boolean);\n return <RDF.Quad[]> quads;\n }\n\n public _createTransformer(bindings: Bindings): AsyncIterator<RDF.Quad> {\n return new ArrayIterator(this.bindTemplate(\n bindings, this.template, this.blankNodeCounter++,\n ), { autoStart: false });\n }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@comunica/actor-query-operation-construct",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.1",
|
|
4
4
|
"description": "A construct query-operation actor",
|
|
5
5
|
"lsd:module": true,
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -32,10 +32,9 @@
|
|
|
32
32
|
"lib/**/*.js.map"
|
|
33
33
|
],
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@comunica/bus-query-operation": "2.
|
|
36
|
-
"@comunica/
|
|
37
|
-
"@comunica/
|
|
38
|
-
"@comunica/types": "2.6.11-alpha.42.0",
|
|
35
|
+
"@comunica/bus-query-operation": "^2.7.1",
|
|
36
|
+
"@comunica/core": "^2.7.0",
|
|
37
|
+
"@comunica/types": "^2.7.0",
|
|
39
38
|
"@rdfjs/types": "*",
|
|
40
39
|
"asynciterator": "^3.8.0",
|
|
41
40
|
"rdf-data-factory": "^1.1.1",
|
|
@@ -47,5 +46,5 @@
|
|
|
47
46
|
"build:ts": "node \"../../node_modules/typescript/bin/tsc\"",
|
|
48
47
|
"build:components": "componentsjs-generator"
|
|
49
48
|
},
|
|
50
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "1095ec8f2d2ef1522f25f291be27cf98772fd8a0"
|
|
51
50
|
}
|