@comunica/actor-rdf-join-optional-optplus 3.2.4-alpha.47.0 → 3.3.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.
@@ -53,10 +53,6 @@
53
53
  {
54
54
  "@type": "ParameterRangeGenericTypeReference",
55
55
  "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
56
- },
57
- {
58
- "@type": "ParameterRangeGenericTypeReference",
59
- "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
60
56
  }
61
57
  ]
62
58
  },
@@ -71,10 +67,6 @@
71
67
  {
72
68
  "@type": "ParameterRangeGenericTypeReference",
73
69
  "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
74
- },
75
- {
76
- "@type": "ParameterRangeGenericTypeReference",
77
- "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
78
70
  }
79
71
  ]
80
72
  },
@@ -84,20 +76,6 @@
84
76
  },
85
77
  "comment": "The bus this actor subscribes to."
86
78
  },
87
- {
88
- "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_busFailMessage",
89
- "range": {
90
- "@type": "ParameterRangeUnion",
91
- "parameterRangeElements": [
92
- "xsd:string",
93
- {
94
- "@type": "ParameterRangeUndefined"
95
- }
96
- ]
97
- },
98
- "default": "RDF joining failed: none of the configured actors were able to handle the join type ${action.type}",
99
- "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}\""
100
- },
101
79
  {
102
80
  "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_beforeActors",
103
81
  "range": {
@@ -120,10 +98,6 @@
120
98
  {
121
99
  "@type": "ParameterRangeGenericTypeReference",
122
100
  "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
123
- },
124
- {
125
- "@type": "ParameterRangeGenericTypeReference",
126
- "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^3.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
127
101
  }
128
102
  ]
129
103
  }
@@ -183,12 +157,6 @@
183
157
  "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_bus"
184
158
  }
185
159
  },
186
- {
187
- "keyRaw": "busFailMessage",
188
- "value": {
189
- "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_busFailMessage"
190
- }
191
- },
192
160
  {
193
161
  "keyRaw": "beforeActors",
194
162
  "value": {
@@ -20,9 +20,6 @@
20
20
  "args_bus": {
21
21
  "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_bus"
22
22
  },
23
- "args_busFailMessage": {
24
- "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_busFailMessage"
25
- },
26
23
  "args_beforeActors": {
27
24
  "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_beforeActors",
28
25
  "@container": "@list"
@@ -39,9 +36,6 @@
39
36
  "bus": {
40
37
  "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_bus"
41
38
  },
42
- "busFailMessage": {
43
- "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_busFailMessage"
44
- },
45
39
  "beforeActors": {
46
40
  "@id": "carjoo:components/ActorRdfJoinOptionalOptPlus.jsonld#ActorRdfJoinOptionalOptPlus_args_beforeActors",
47
41
  "@container": "@list"
@@ -1,7 +1,7 @@
1
- import type { IActionRdfJoin, IActorRdfJoinOutputInner, IActorRdfJoinArgs, MediatorRdfJoin, IActorRdfJoinTestSideData } from '@comunica/bus-rdf-join';
1
+ import type { IActionRdfJoin, IActorRdfJoinOutputInner, IActorRdfJoinArgs, MediatorRdfJoin } from '@comunica/bus-rdf-join';
2
2
  import { ActorRdfJoin } from '@comunica/bus-rdf-join';
3
- import type { TestResult } from '@comunica/core';
4
3
  import type { IMediatorTypeJoinCoefficients } from '@comunica/mediatortype-join-coefficients';
4
+ import type { MetadataBindings } from '@comunica/types';
5
5
  /**
6
6
  * A comunica Optional Opt+ RDF Join Actor.
7
7
  */
@@ -9,7 +9,7 @@ export declare class ActorRdfJoinOptionalOptPlus extends ActorRdfJoin {
9
9
  readonly mediatorJoin: MediatorRdfJoin;
10
10
  constructor(args: IActorRdfJoinOptionalOptPlusJoinArgs);
11
11
  getOutput({ entries, context }: IActionRdfJoin): Promise<IActorRdfJoinOutputInner>;
12
- protected getJoinCoefficients(action: IActionRdfJoin, sideData: IActorRdfJoinTestSideData): Promise<TestResult<IMediatorTypeJoinCoefficients, IActorRdfJoinTestSideData>>;
12
+ protected getJoinCoefficients(action: IActionRdfJoin, metadatas: MetadataBindings[]): Promise<IMediatorTypeJoinCoefficients>;
13
13
  }
14
14
  export interface IActorRdfJoinOptionalOptPlusJoinArgs extends IActorRdfJoinArgs {
15
15
  /**
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ActorRdfJoinOptionalOptPlus = void 0;
4
4
  const bus_rdf_join_1 = require("@comunica/bus-rdf-join");
5
- const core_1 = require("@comunica/core");
6
5
  const asynciterator_1 = require("asynciterator");
7
6
  /**
8
7
  * A comunica Optional Opt+ RDF Join Actor.
@@ -23,16 +22,27 @@ class ActorRdfJoinOptionalOptPlus extends bus_rdf_join_1.ActorRdfJoin {
23
22
  return { result: {
24
23
  type: 'bindings',
25
24
  bindingsStream: new asynciterator_1.UnionIterator([clonedStream, joined.bindingsStream], { autoStart: false }),
26
- metadata: async () => await this.constructResultMetadata(entries, await bus_rdf_join_1.ActorRdfJoin.getMetadatas(entries), context, {}, true),
25
+ metadata: async () => {
26
+ const [leftMeta, joinedMeta] = await Promise.all([entries[0].output.metadata(), joined.metadata()]);
27
+ return {
28
+ variables: joinedMeta.variables,
29
+ canContainUndefs: true,
30
+ cardinality: {
31
+ type: joinedMeta.cardinality.type,
32
+ value: leftMeta.cardinality.value + joinedMeta.cardinality.value,
33
+ },
34
+ state: this.constructState([leftMeta, joinedMeta]),
35
+ };
36
+ },
27
37
  } };
28
38
  }
29
- async getJoinCoefficients(action, sideData) {
30
- return (0, core_1.passTestWithSideData)({
31
- iterations: sideData.metadatas[0].cardinality.value + sideData.metadatas[1].cardinality.value,
39
+ async getJoinCoefficients(action, metadatas) {
40
+ return {
41
+ iterations: metadatas[0].cardinality.value + metadatas[1].cardinality.value,
32
42
  persistedItems: 0,
33
43
  blockingItems: 0,
34
44
  requestTime: 0,
35
- }, sideData);
45
+ };
36
46
  }
37
47
  }
38
48
  exports.ActorRdfJoinOptionalOptPlus = ActorRdfJoinOptionalOptPlus;
@@ -1 +1 @@
1
- {"version":3,"file":"ActorRdfJoinOptionalOptPlus.js","sourceRoot":"","sources":["ActorRdfJoinOptionalOptPlus.ts"],"names":[],"mappings":";;;AAOA,yDAEgC;AAEhC,yCAAsD;AAEtD,iDAA8C;AAE9C;;GAEG;AACH,MAAa,2BAA4B,SAAQ,2BAAY;IAG3D,YAAmB,IAA0C;QAC3D,KAAK,CAAC,IAAI,EAAE;YACV,WAAW,EAAE,UAAU;YACvB,YAAY,EAAE,aAAa;YAC3B,YAAY,EAAE,CAAC;YACf,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAkB;QACzD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC9D,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACpF,OAAO,EAAE,MAAM,EAAE;gBACf,IAAI,EAAE,UAAU;gBAChB,cAAc,EAAE,IAAI,6BAAa,CAAC,CAAE,YAAY,EAAE,MAAM,CAAC,cAAc,CAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;gBAChG,QAAQ,EAAE,KAAK,IAAG,EAAE,CAAC,MAAM,IAAI,CAAC,uBAAuB,CACrD,OAAO,EACP,MAAM,2BAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EACxC,OAAO,EACP,EAAE,EACF,IAAI,CACL;aACF,EAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,MAAsB,EACtB,QAAmC;QAEnC,OAAO,IAAA,2BAAoB,EAAC;YAC1B,UAAU,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK;YAC7F,cAAc,EAAE,CAAC;YACjB,aAAa,EAAE,CAAC;YAChB,WAAW,EAAE,CAAC;SACf,EAAE,QAAQ,CAAC,CAAC;IACf,CAAC;CACF;AAxCD,kEAwCC","sourcesContent":["import type {\n IActionRdfJoin,\n IActorRdfJoinOutputInner,\n IActorRdfJoinArgs,\n MediatorRdfJoin,\n IActorRdfJoinTestSideData,\n} from '@comunica/bus-rdf-join';\nimport {\n ActorRdfJoin,\n} from '@comunica/bus-rdf-join';\nimport type { TestResult } from '@comunica/core';\nimport { passTestWithSideData } from '@comunica/core';\nimport type { IMediatorTypeJoinCoefficients } from '@comunica/mediatortype-join-coefficients';\nimport { UnionIterator } from 'asynciterator';\n\n/**\n * A comunica Optional Opt+ RDF Join Actor.\n */\nexport class ActorRdfJoinOptionalOptPlus extends ActorRdfJoin {\n public readonly mediatorJoin: MediatorRdfJoin;\n\n public constructor(args: IActorRdfJoinOptionalOptPlusJoinArgs) {\n super(args, {\n logicalType: 'optional',\n physicalName: 'nested-loop',\n limitEntries: 2,\n canHandleUndefs: true,\n });\n }\n\n public async getOutput({ entries, context }: IActionRdfJoin): Promise<IActorRdfJoinOutputInner> {\n const clonedStream = entries[0].output.bindingsStream.clone();\n entries[0].output.bindingsStream = entries[0].output.bindingsStream.clone();\n const joined = await this.mediatorJoin.mediate({ type: 'inner', entries, context });\n return { result: {\n type: 'bindings',\n bindingsStream: new UnionIterator([ clonedStream, joined.bindingsStream ], { autoStart: false }),\n metadata: async() => await this.constructResultMetadata(\n entries,\n await ActorRdfJoin.getMetadatas(entries),\n context,\n {},\n true,\n ),\n }};\n }\n\n protected async getJoinCoefficients(\n action: IActionRdfJoin,\n sideData: IActorRdfJoinTestSideData,\n ): Promise<TestResult<IMediatorTypeJoinCoefficients, IActorRdfJoinTestSideData>> {\n return passTestWithSideData({\n iterations: sideData.metadatas[0].cardinality.value + sideData.metadatas[1].cardinality.value,\n persistedItems: 0,\n blockingItems: 0,\n requestTime: 0,\n }, sideData);\n }\n}\n\nexport interface IActorRdfJoinOptionalOptPlusJoinArgs extends IActorRdfJoinArgs {\n /**\n * A mediator for joining Bindings streams\n */\n mediatorJoin: MediatorRdfJoin;\n}\n"]}
1
+ {"version":3,"file":"ActorRdfJoinOptionalOptPlus.js","sourceRoot":"","sources":["ActorRdfJoinOptionalOptPlus.ts"],"names":[],"mappings":";;;AAMA,yDAEgC;AAGhC,iDAA8C;AAE9C;;GAEG;AACH,MAAa,2BAA4B,SAAQ,2BAAY;IAG3D,YAAmB,IAA0C;QAC3D,KAAK,CAAC,IAAI,EAAE;YACV,WAAW,EAAE,UAAU;YACvB,YAAY,EAAE,aAAa;YAC3B,YAAY,EAAE,CAAC;YACf,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAkB;QACzD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC9D,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACpF,OAAO,EAAE,MAAM,EAAE;gBACf,IAAI,EAAE,UAAU;gBAChB,cAAc,EAAE,IAAI,6BAAa,CAAC,CAAE,YAAY,EAAE,MAAM,CAAC,cAAc,CAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;gBAChG,QAAQ,EAAE,KAAK,IAA8B,EAAE;oBAC7C,MAAM,CAAE,QAAQ,EAAE,UAAU,CAAE,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAE,CAAC,CAAC;oBACxG,OAAO;wBACL,SAAS,EAAE,UAAU,CAAC,SAAS;wBAC/B,gBAAgB,EAAE,IAAI;wBACtB,WAAW,EAAE;4BACX,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,IAAI;4BACjC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,KAAK;yBACjE;wBACD,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAE,QAAQ,EAAE,UAAU,CAAE,CAAC;qBACrD,CAAC;gBACJ,CAAC;aACF,EAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,MAAsB,EACtB,SAA6B;QAE7B,OAAO;YACL,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK;YAC3E,cAAc,EAAE,CAAC;YACjB,aAAa,EAAE,CAAC;YAChB,WAAW,EAAE,CAAC;SACf,CAAC;IACJ,CAAC;CACF;AA7CD,kEA6CC","sourcesContent":["import type {\n IActionRdfJoin,\n IActorRdfJoinOutputInner,\n IActorRdfJoinArgs,\n MediatorRdfJoin,\n} from '@comunica/bus-rdf-join';\nimport {\n ActorRdfJoin,\n} from '@comunica/bus-rdf-join';\nimport type { IMediatorTypeJoinCoefficients } from '@comunica/mediatortype-join-coefficients';\nimport type { MetadataBindings } from '@comunica/types';\nimport { UnionIterator } from 'asynciterator';\n\n/**\n * A comunica Optional Opt+ RDF Join Actor.\n */\nexport class ActorRdfJoinOptionalOptPlus extends ActorRdfJoin {\n public readonly mediatorJoin: MediatorRdfJoin;\n\n public constructor(args: IActorRdfJoinOptionalOptPlusJoinArgs) {\n super(args, {\n logicalType: 'optional',\n physicalName: 'nested-loop',\n limitEntries: 2,\n canHandleUndefs: true,\n });\n }\n\n public async getOutput({ entries, context }: IActionRdfJoin): Promise<IActorRdfJoinOutputInner> {\n const clonedStream = entries[0].output.bindingsStream.clone();\n entries[0].output.bindingsStream = entries[0].output.bindingsStream.clone();\n const joined = await this.mediatorJoin.mediate({ type: 'inner', entries, context });\n return { result: {\n type: 'bindings',\n bindingsStream: new UnionIterator([ clonedStream, joined.bindingsStream ], { autoStart: false }),\n metadata: async(): Promise<MetadataBindings> => {\n const [ leftMeta, joinedMeta ] = await Promise.all([ entries[0].output.metadata(), joined.metadata() ]);\n return {\n variables: joinedMeta.variables,\n canContainUndefs: true,\n cardinality: {\n type: joinedMeta.cardinality.type,\n value: leftMeta.cardinality.value + joinedMeta.cardinality.value,\n },\n state: this.constructState([ leftMeta, joinedMeta ]),\n };\n },\n }};\n }\n\n protected async getJoinCoefficients(\n action: IActionRdfJoin,\n metadatas: MetadataBindings[],\n ): Promise<IMediatorTypeJoinCoefficients> {\n return {\n iterations: metadatas[0].cardinality.value + metadatas[1].cardinality.value,\n persistedItems: 0,\n blockingItems: 0,\n requestTime: 0,\n };\n }\n}\n\nexport interface IActorRdfJoinOptionalOptPlusJoinArgs extends IActorRdfJoinArgs {\n /**\n * A mediator for joining Bindings streams\n */\n mediatorJoin: MediatorRdfJoin;\n}\n"]}
package/package.json CHANGED
@@ -1,13 +1,9 @@
1
1
  {
2
2
  "name": "@comunica/actor-rdf-join-optional-optplus",
3
- "version": "3.2.4-alpha.47.0",
3
+ "version": "3.3.0",
4
4
  "description": "A optional-optplus rdf-join actor",
5
5
  "lsd:module": true,
6
6
  "license": "MIT",
7
- "funding": {
8
- "type": "opencollective",
9
- "url": "https://opencollective.com/comunica-association"
10
- },
11
7
  "homepage": "https://comunica.dev/",
12
8
  "repository": {
13
9
  "type": "git",
@@ -41,10 +37,10 @@
41
37
  "build:components": "componentsjs-generator"
42
38
  },
43
39
  "dependencies": {
44
- "@comunica/bus-rdf-join": "3.2.4-alpha.47.0",
45
- "@comunica/core": "3.2.4-alpha.47.0",
46
- "@comunica/mediatortype-join-coefficients": "3.2.4-alpha.47.0",
40
+ "@comunica/bus-rdf-join": "^3.3.0",
41
+ "@comunica/mediatortype-join-coefficients": "^3.3.0",
42
+ "@comunica/types": "^3.3.0",
47
43
  "asynciterator": "^3.9.0"
48
44
  },
49
- "gitHead": "85bd4c5cf07dfc293ebbc3a1416b70e2db8bfc48"
45
+ "gitHead": "02bde397d206f1f5a523643a6a604c89e792e2f9"
50
46
  }