@netwerk-digitaal-erfgoed/network-of-terms-query 2.2.1 → 2.4.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.
- package/build/catalog.d.ts +1 -1
- package/build/catalog.d.ts.map +1 -1
- package/build/distributions.d.ts +3 -3
- package/build/distributions.d.ts.map +1 -1
- package/build/distributions.js.map +1 -1
- package/build/index.d.ts +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/lookup/lookup.d.ts +4 -3
- package/build/lookup/lookup.d.ts.map +1 -1
- package/build/lookup/lookup.js +14 -11
- package/build/lookup/lookup.js.map +1 -1
- package/build/query.d.ts +9 -4
- package/build/query.d.ts.map +1 -1
- package/build/query.js +18 -11
- package/build/query.js.map +1 -1
- package/package.json +13 -13
package/build/catalog.d.ts
CHANGED
|
@@ -45,7 +45,7 @@ export declare enum FeatureType {
|
|
|
45
45
|
/**
|
|
46
46
|
* A union type to be extended in the future with other distribution types.
|
|
47
47
|
*/
|
|
48
|
-
export
|
|
48
|
+
export type Distribution = SparqlDistribution;
|
|
49
49
|
export declare class IRI extends URL {
|
|
50
50
|
}
|
|
51
51
|
//# sourceMappingURL=catalog.d.ts.map
|
package/build/catalog.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,KAAK,CAAC;AAExB,qBAAa,OAAO;IACN,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC;gBAAhC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC;IAE9C,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,GAAG,SAAS;IAM9C,2BAA2B,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,GAAG,SAAS;IAM1D,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,GAAG,SAAS;IAQlD,gCAAgC,CACrC,WAAW,EAAE,WAAW,GACvB,YAAY,EAAE;CAUlB;AAED,qBAAa,OAAO;IAEhB,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,CAAC,YAAY,CAAC;IACtC,QAAQ,CAAC,aAAa,CAAC;gBANd,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,GAAG,EAAE,EACpB,QAAQ,EAAE,CAAC,YAAY,CAAC,EACxB,aAAa,EAAE,CAAC,YAAY,CAAC,EAC7B,aAAa,CAAC,oBAAQ;IAG1B,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,GAAG,SAAS;CAKhE;AAED,qBAAa,YAAY;IAErB,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,MAAM;gBAFrB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM;CAEjC;AAED,qBAAa,kBAAkB;IAE3B,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,QAAQ,EAAE,GAAG;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE;gBAJnB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,GAAE,OAAO,EAAO;IAG5B,UAAU,CAAC,OAAO,EAAE,WAAW;CAGvC;AAED,qBAAa,OAAO;IACN,QAAQ,CAAC,IAAI,EAAE,WAAW;IAAE,QAAQ,CAAC,GAAG,EAAE,GAAG;gBAApC,IAAI,EAAE,WAAW,EAAW,GAAG,EAAE,GAAG;CAC1D;AAED,oBAAY,WAAW;IACrB,cAAc,uDAAuD;CACtE;AAED;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,KAAK,CAAC;AAExB,qBAAa,OAAO;IACN,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC;gBAAhC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC;IAE9C,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,GAAG,SAAS;IAM9C,2BAA2B,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,GAAG,SAAS;IAM1D,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,GAAG,SAAS;IAQlD,gCAAgC,CACrC,WAAW,EAAE,WAAW,GACvB,YAAY,EAAE;CAUlB;AAED,qBAAa,OAAO;IAEhB,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,CAAC,YAAY,CAAC;IACtC,QAAQ,CAAC,aAAa,CAAC;gBANd,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,GAAG,EAAE,EACpB,QAAQ,EAAE,CAAC,YAAY,CAAC,EACxB,aAAa,EAAE,CAAC,YAAY,CAAC,EAC7B,aAAa,CAAC,oBAAQ;IAG1B,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,GAAG,SAAS;CAKhE;AAED,qBAAa,YAAY;IAErB,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,MAAM;gBAFrB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM;CAEjC;AAED,qBAAa,kBAAkB;IAE3B,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,QAAQ,EAAE,GAAG;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE;gBAJnB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,GAAE,OAAO,EAAO;IAG5B,UAAU,CAAC,OAAO,EAAE,WAAW;CAGvC;AAED,qBAAa,OAAO;IACN,QAAQ,CAAC,IAAI,EAAE,WAAW;IAAE,QAAQ,CAAC,GAAG,EAAE,GAAG;gBAApC,IAAI,EAAE,WAAW,EAAW,GAAG,EAAE,GAAG;CAC1D;AAED,oBAAY,WAAW;IACrB,cAAc,uDAAuD;CACtE;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAE9C,qBAAa,GAAI,SAAQ,GAAG;CAAG"}
|
package/build/distributions.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { QueryEngine } from '@comunica/query-sparql';
|
|
2
2
|
import Pino from 'pino';
|
|
3
|
-
import {
|
|
3
|
+
import { TermsResponse } from './query';
|
|
4
4
|
import { QueryMode } from './search/query-mode';
|
|
5
5
|
import { Catalog, IRI } from './catalog';
|
|
6
6
|
export interface QueryOptions {
|
|
@@ -24,7 +24,7 @@ export declare class DistributionsService {
|
|
|
24
24
|
catalog: Catalog;
|
|
25
25
|
comunica?: QueryEngine;
|
|
26
26
|
});
|
|
27
|
-
query(options: QueryOptions): Promise<
|
|
28
|
-
queryAll(options: QueryAllOptions): Promise<
|
|
27
|
+
query(options: QueryOptions): Promise<TermsResponse>;
|
|
28
|
+
queryAll(options: QueryAllOptions): Promise<TermsResponse[]>;
|
|
29
29
|
}
|
|
30
30
|
//# sourceMappingURL=distributions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"distributions.d.ts","sourceRoot":"","sources":["../src/distributions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAoB,
|
|
1
|
+
{"version":3,"file":"distributions.d.ts","sourceRoot":"","sources":["../src/distributions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAoB,aAAa,EAAC,MAAM,SAAS,CAAC;AACzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAE,GAAG,EAAC,MAAM,WAAW,CAAC;AAGvC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,GAAG,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AASD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AASD,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,QAAQ,CAAc;gBAElB,OAAO,EAAE;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,WAAW,CAAC;KACxB;IAMK,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAqBpD,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAYnE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"distributions.js","sourceRoot":"","sources":["../src/distributions.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"distributions.js","sourceRoot":"","sources":["../src/distributions.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,iBAAiB,EAAgB,MAAM,SAAS,CAAC;AAGzD,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AASjC,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;IAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;CAClC,CAAC,CAAC;AASH,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC;IAChC,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;CAClC,CAAC,CAAC;AAEH,MAAM,OAAO,oBAAoB;IAK/B,YAAY,OAIX;QACC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAqB;QAC/B,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,IAAI,CAAC,MAAM,MAAM,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5E,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,MAAM,KAAK,CAAC,oBAAoB,IAAI,CAAC,MAAM,aAAa,CAAC,CAAC;SAC3D;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC;QAChE,MAAM,YAAY,GAAG,IAAI,iBAAiB,CAAC;YACzC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC,CAAC;QACH,OAAO,YAAY,CAAC,MAAM,CACxB,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,SAAS,EACd,OAAO,EACP,YAAY,EACZ,IAAI,CAAC,SAAS,CACf,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAwB;QACrC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAChD,IAAI,CAAC,KAAK,CAAC;YACT,MAAM;YACN,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CACH,CAAC;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;CACF"}
|
package/build/index.d.ts
CHANGED
|
@@ -6,5 +6,5 @@ export * from './search/query-mode';
|
|
|
6
6
|
export * from './distributions';
|
|
7
7
|
export * from './helpers/logger';
|
|
8
8
|
import { QueryEngine } from '@comunica/query-sparql';
|
|
9
|
-
export declare const comunica: QueryEngine
|
|
9
|
+
export declare const comunica: QueryEngine<import("@comunica/types").IQueryContextCommon>;
|
|
10
10
|
//# sourceMappingURL=index.d.ts.map
|
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC;AACxB,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAEjC,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,eAAO,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC;AACxB,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAEjC,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,eAAO,MAAM,QAAQ,4DAAoB,CAAC"}
|
package/build/lookup/lookup.d.ts
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { Catalog, Distribution, IRI } from '../catalog';
|
|
2
2
|
import { QueryTermsService, ServerError, TimeoutError } from '../query';
|
|
3
3
|
import { Term } from '../terms';
|
|
4
|
-
export
|
|
4
|
+
export type LookupQueryResult = {
|
|
5
5
|
uri: IRI;
|
|
6
6
|
distribution: SourceResult;
|
|
7
7
|
result: LookupResult;
|
|
8
|
+
responseTimeMs: number;
|
|
8
9
|
};
|
|
9
|
-
export
|
|
10
|
-
export
|
|
10
|
+
export type SourceResult = Distribution | SourceNotFoundError;
|
|
11
|
+
export type LookupResult = Term | NotFoundError | TimeoutError | ServerError;
|
|
11
12
|
export declare class SourceNotFoundError {
|
|
12
13
|
readonly iri: IRI;
|
|
13
14
|
readonly message: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookup.d.ts","sourceRoot":"","sources":["../../src/lookup/lookup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAW,YAAY,EAAE,GAAG,EAAC,MAAM,YAAY,CAAC;AAC/D,OAAO,EAEL,iBAAiB,EACjB,WAAW,
|
|
1
|
+
{"version":3,"file":"lookup.d.ts","sourceRoot":"","sources":["../../src/lookup/lookup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAW,YAAY,EAAE,GAAG,EAAC,MAAM,YAAY,CAAC;AAC/D,OAAO,EAEL,iBAAiB,EACjB,WAAW,EAIX,YAAY,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,IAAI,EAAC,MAAM,UAAU,CAAC;AAE9B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,GAAG,CAAC;IACT,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,YAAY,CAAC;IAErB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAE9D,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,aAAa,GAAG,YAAY,GAAG,WAAW,CAAC;AAE7E,qBAAa,mBAAmB;IAGlB,QAAQ,CAAC,GAAG,EAAE,GAAG;IAF7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEJ,GAAG,EAAE,GAAG;CAG9B;AAED,qBAAa,aAAa;IAGZ,QAAQ,CAAC,GAAG,EAAE,GAAG;IAF7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEJ,GAAG,EAAE,GAAG;CAG9B;AAED,qBAAa,aAAa;IAEtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,YAAY;gBADZ,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,iBAAiB;IAG5B,MAAM,CACjB,IAAI,EAAE,GAAG,EAAE,EACX,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,iBAAiB,EAAE,CAAC;CAmFhC"}
|
package/build/lookup/lookup.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IRI } from '../catalog';
|
|
2
|
-
import { Error, Terms, } from '../query';
|
|
2
|
+
import { Error, Terms, TermsResponse, } from '../query';
|
|
3
3
|
export class SourceNotFoundError {
|
|
4
4
|
constructor(iri) {
|
|
5
5
|
this.iri = iri;
|
|
@@ -35,12 +35,12 @@ export class LookupService {
|
|
|
35
35
|
}, new Map());
|
|
36
36
|
const lookups = [...datasetToIris].map(([dataset]) => this.queryService.lookup(iris, dataset.distributions[0], timeoutMs));
|
|
37
37
|
const termsPerSource = await Promise.all(lookups);
|
|
38
|
-
const datasetToTerms = termsPerSource.reduce((acc,
|
|
39
|
-
var _a;
|
|
40
|
-
let dataset = this.catalog.getDatasetByDistributionIri(result.distribution.iri);
|
|
41
|
-
if (result instanceof Terms) {
|
|
42
|
-
const termsResult = (_a = acc.get(dataset)) !== null &&
|
|
43
|
-
for (const term of result.terms) {
|
|
38
|
+
const datasetToTerms = termsPerSource.reduce((acc, response) => {
|
|
39
|
+
var _a, _b;
|
|
40
|
+
let dataset = this.catalog.getDatasetByDistributionIri(response.result.distribution.iri);
|
|
41
|
+
if (response.result instanceof Terms) {
|
|
42
|
+
const termsResult = (_b = (_a = acc.get(dataset)) === null || _a === void 0 ? void 0 : _a.result) !== null && _b !== void 0 ? _b : new Terms(response.result.distribution, []);
|
|
43
|
+
for (const term of response.result.terms) {
|
|
44
44
|
if (term.datasetIri !== undefined) {
|
|
45
45
|
const termsDataset = this.catalog.getDatasetByIri(new IRI(term.datasetIri.value));
|
|
46
46
|
if (termsDataset !== undefined) {
|
|
@@ -50,11 +50,11 @@ export class LookupService {
|
|
|
50
50
|
}
|
|
51
51
|
termsResult.terms.push(term);
|
|
52
52
|
}
|
|
53
|
-
acc.set(dataset, termsResult);
|
|
53
|
+
acc.set(dataset, new TermsResponse(termsResult, response.responseTimeMs));
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
const dataset = this.catalog.getDatasetByDistributionIri(result.distribution.iri);
|
|
57
|
-
acc.set(dataset,
|
|
56
|
+
const dataset = this.catalog.getDatasetByDistributionIri(response.result.distribution.iri);
|
|
57
|
+
acc.set(dataset, response);
|
|
58
58
|
}
|
|
59
59
|
return acc;
|
|
60
60
|
}, new Map());
|
|
@@ -65,12 +65,15 @@ export class LookupService {
|
|
|
65
65
|
uri: iri,
|
|
66
66
|
distribution: new SourceNotFoundError(iri),
|
|
67
67
|
result: new NotFoundError(iri),
|
|
68
|
+
responseTimeMs: 0,
|
|
68
69
|
};
|
|
69
70
|
}
|
|
71
|
+
const response = datasetToTerms.get(dataset);
|
|
70
72
|
return {
|
|
71
73
|
uri: iri,
|
|
72
74
|
distribution: dataset.distributions[0],
|
|
73
|
-
result: result(
|
|
75
|
+
result: result(response.result, iri),
|
|
76
|
+
responseTimeMs: response.responseTimeMs,
|
|
74
77
|
};
|
|
75
78
|
});
|
|
76
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookup.js","sourceRoot":"","sources":["../../src/lookup/lookup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,GAAG,EAAC,MAAM,YAAY,CAAC;AAC/D,OAAO,EACL,KAAK,EAGL,KAAK,
|
|
1
|
+
{"version":3,"file":"lookup.js","sourceRoot":"","sources":["../../src/lookup/lookup.ts"],"names":[],"mappings":"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"}
|
package/build/query.d.ts
CHANGED
|
@@ -4,7 +4,12 @@ import { Term } from './terms';
|
|
|
4
4
|
import { QueryMode } from './search/query-mode';
|
|
5
5
|
import { Dataset, Distribution, IRI } from './catalog';
|
|
6
6
|
import { QueryEngine } from '@comunica/query-sparql';
|
|
7
|
-
export
|
|
7
|
+
export type TermsResult = Terms | TimeoutError | ServerError;
|
|
8
|
+
export declare class TermsResponse {
|
|
9
|
+
readonly result: TermsResult;
|
|
10
|
+
readonly responseTimeMs: number;
|
|
11
|
+
constructor(result: TermsResult, responseTimeMs: number);
|
|
12
|
+
}
|
|
8
13
|
export declare class Terms {
|
|
9
14
|
readonly distribution: Distribution;
|
|
10
15
|
readonly terms: Term[];
|
|
@@ -28,8 +33,8 @@ export declare class QueryTermsService {
|
|
|
28
33
|
comunica?: QueryEngine;
|
|
29
34
|
logger?: Pino.Logger;
|
|
30
35
|
});
|
|
31
|
-
search(searchQuery: string, queryMode: QueryMode, dataset: Dataset, distribution: Distribution, timeoutMs: number): Promise<
|
|
32
|
-
lookup(iris: IRI[], distribution: Distribution, timeoutMs: number): Promise<
|
|
33
|
-
run(query: string, distribution: Distribution, timeoutMs: number, bindings?: Record<string, RDF.Term>): Promise<
|
|
36
|
+
search(searchQuery: string, queryMode: QueryMode, dataset: Dataset, distribution: Distribution, timeoutMs: number): Promise<TermsResponse>;
|
|
37
|
+
lookup(iris: IRI[], distribution: Distribution, timeoutMs: number): Promise<TermsResponse>;
|
|
38
|
+
run(query: string, distribution: Distribution, timeoutMs: number, bindings?: Record<string, RDF.Term>): Promise<TermsResponse>;
|
|
34
39
|
}
|
|
35
40
|
//# sourceMappingURL=query.d.ts.map
|
package/build/query.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAC,IAAI,EAAmB,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAgB,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAInD,
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAC,IAAI,EAAmB,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAgB,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAInD,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,YAAY,GAAG,WAAW,CAAC;AAE7D,qBAAa,aAAa;IACZ,QAAQ,CAAC,MAAM,EAAE,WAAW;IAAE,QAAQ,CAAC,cAAc,EAAE,MAAM;gBAApD,MAAM,EAAE,WAAW,EAAW,cAAc,EAAE,MAAM;CAC1E;AAED,qBAAa,KAAK;IACJ,QAAQ,CAAC,YAAY,EAAE,YAAY;IAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE;gBAAlD,YAAY,EAAE,YAAY,EAAW,KAAK,EAAE,IAAI,EAAE;CACxE;AAED,qBAAa,KAAK;IACJ,QAAQ,CAAC,YAAY,EAAE,YAAY;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM;gBAApD,YAAY,EAAE,YAAY,EAAW,OAAO,EAAE,MAAM;CAC1E;AAED,qBAAa,YAAa,SAAQ,KAAK;IACzB,QAAQ,CAAC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM;CAGnE;AAED,qBAAa,WAAY,SAAQ,KAAK;CAAG;AAEzC,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;gBAEzB,OAAO,GAAE;QAAC,QAAQ,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;KAAM;IAKlE,MAAM,CACV,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC;IAkBnB,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM;IAWjE,GAAG,CACP,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,QAAQ,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAM,GACtC,OAAO,CAAC,aAAa,CAAC;CA4E1B"}
|
package/build/query.js
CHANGED
|
@@ -8,6 +8,12 @@ import { queryVariants } from './search/query-mode';
|
|
|
8
8
|
import { QueryEngine } from '@comunica/query-sparql';
|
|
9
9
|
import { BindingsFactory } from '@comunica/bindings-factory';
|
|
10
10
|
import { DataFactory } from 'rdf-data-factory';
|
|
11
|
+
export class TermsResponse {
|
|
12
|
+
constructor(result, responseTimeMs) {
|
|
13
|
+
this.result = result;
|
|
14
|
+
this.responseTimeMs = responseTimeMs;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
11
17
|
export class Terms {
|
|
12
18
|
constructor(distribution, terms) {
|
|
13
19
|
this.distribution = distribution;
|
|
@@ -58,6 +64,7 @@ export class QueryTermsService {
|
|
|
58
64
|
const quadStream = await this.engine.queryQuads(query, {
|
|
59
65
|
log: logger,
|
|
60
66
|
httpAuth: url.username === '' ? '' : url.username + ':' + url.password,
|
|
67
|
+
httpTimeout: timeoutMs,
|
|
61
68
|
sources: [
|
|
62
69
|
{
|
|
63
70
|
type: 'sparql',
|
|
@@ -66,11 +73,17 @@ export class QueryTermsService {
|
|
|
66
73
|
],
|
|
67
74
|
initialBindings: bindingsFactory.fromRecord(bindings),
|
|
68
75
|
});
|
|
69
|
-
return
|
|
76
|
+
return new Promise(resolve => {
|
|
70
77
|
const termsTransformer = new TermsTransformer();
|
|
71
|
-
quadStream.on('error',
|
|
78
|
+
quadStream.on('error', error => {
|
|
79
|
+
const elapsed = Math.round(timer.elapsed());
|
|
72
80
|
this.logger.error(`An error occurred when querying "${distribution.endpoint}": ${error}`);
|
|
73
|
-
|
|
81
|
+
if ('AbortError' === error.name) {
|
|
82
|
+
resolve(new TermsResponse(new TimeoutError(distribution, timeoutMs), elapsed));
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
resolve(new TermsResponse(new ServerError(distribution, obfuscateHttpCredentials(error.message)), elapsed));
|
|
86
|
+
}
|
|
74
87
|
});
|
|
75
88
|
quadStream.on('data', (quad) => {
|
|
76
89
|
termsTransformer.fromQuad(quad);
|
|
@@ -78,9 +91,9 @@ export class QueryTermsService {
|
|
|
78
91
|
quadStream.on('end', () => {
|
|
79
92
|
const terms = termsTransformer.asArray().sort(alphabeticallyByLabels);
|
|
80
93
|
this.logger.info(`Found ${terms.length} terms matching "${query}" in "${distribution.endpoint}" in ${PrettyMilliseconds(timer.elapsed())}`);
|
|
81
|
-
resolve(new Terms(distribution, terms));
|
|
94
|
+
resolve(new TermsResponse(new Terms(distribution, terms), Math.round(timer.elapsed())));
|
|
82
95
|
});
|
|
83
|
-
})
|
|
96
|
+
});
|
|
84
97
|
}
|
|
85
98
|
}
|
|
86
99
|
const alphabeticallyByLabels = (a, b) => {
|
|
@@ -93,12 +106,6 @@ const alphabeticallyByLabels = (a, b) => {
|
|
|
93
106
|
const sortLabelB = prefLabelB + altLabelB;
|
|
94
107
|
return sortLabelA.localeCompare(sortLabelB);
|
|
95
108
|
};
|
|
96
|
-
function guardTimeout(promise, timeoutMs, timeoutError) {
|
|
97
|
-
return Promise.race([
|
|
98
|
-
promise,
|
|
99
|
-
new Promise(resolve => setTimeout(resolve.bind(null, timeoutError), timeoutMs)),
|
|
100
|
-
]);
|
|
101
|
-
}
|
|
102
109
|
const dataFactory = new DataFactory();
|
|
103
110
|
const bindingsFactory = new BindingsFactory(dataFactory);
|
|
104
111
|
const obfuscateHttpCredentials = (message) => message.replace(/(https?):\/\/.+:.+@/, '$1://***@');
|
package/build/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@netwerk-digitaal-erfgoed/network-of-terms-query",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -29,24 +29,24 @@
|
|
|
29
29
|
"keywords": [],
|
|
30
30
|
"description": "Engine for querying sources in the Network of Terms",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@comunica/bindings-factory": "^2.
|
|
33
|
-
"@comunica/data-factory": "^2.
|
|
34
|
-
"@comunica/query-sparql": "^2.
|
|
35
|
-
"@hapi/hoek": "^
|
|
32
|
+
"@comunica/bindings-factory": "^2.5.1",
|
|
33
|
+
"@comunica/data-factory": "^2.5.1",
|
|
34
|
+
"@comunica/query-sparql": "^2.5.0",
|
|
35
|
+
"@hapi/hoek": "^11.0.2",
|
|
36
36
|
"@rdfjs/data-model": "^2.0.1",
|
|
37
|
-
"joi": "^17.
|
|
38
|
-
"pino": "^8.
|
|
37
|
+
"joi": "^17.7.0",
|
|
38
|
+
"pino": "^8.8.0",
|
|
39
39
|
"pino-pretty": "^9.1.1",
|
|
40
40
|
"pretty-ms": "^8.0.0",
|
|
41
41
|
"rdf-data-factory": "^1.1.1",
|
|
42
|
-
"rdf-store-stream": "^1.3.
|
|
42
|
+
"rdf-store-stream": "^1.3.1"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@comunica/core": "^2.
|
|
46
|
-
"@comunica/query-sparql-file": "^2.
|
|
47
|
-
"@jest/globals": "^29.
|
|
48
|
-
"asynciterator": "^3.
|
|
49
|
-
"jest-dev-server": "^6.
|
|
45
|
+
"@comunica/core": "^2.5.1",
|
|
46
|
+
"@comunica/query-sparql-file": "^2.5.0",
|
|
47
|
+
"@jest/globals": "^29.3.1",
|
|
48
|
+
"asynciterator": "^3.8.0",
|
|
49
|
+
"jest-dev-server": "^6.2.0"
|
|
50
50
|
},
|
|
51
51
|
"engines": {
|
|
52
52
|
"node": ">=16.15.0"
|