@netwerk-digitaal-erfgoed/network-of-terms-query 2.9.3 → 3.0.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.
- package/build/catalog.d.ts.map +1 -1
- package/build/catalog.js +18 -0
- package/build/catalog.js.map +1 -1
- package/build/distributions.d.ts +3 -3
- package/build/distributions.d.ts.map +1 -1
- package/build/distributions.js +6 -3
- package/build/distributions.js.map +1 -1
- package/build/helpers/logger-pino.js +1 -0
- package/build/helpers/logger-pino.js.map +1 -1
- package/build/index.d.ts +7 -7
- package/build/index.d.ts.map +1 -1
- package/build/index.js +7 -7
- package/build/index.js.map +1 -1
- package/build/instrumentation.js +1 -2
- package/build/instrumentation.js.map +1 -1
- package/build/lookup/lookup.d.ts +3 -3
- package/build/lookup/lookup.d.ts.map +1 -1
- package/build/lookup/lookup.js +14 -9
- package/build/lookup/lookup.js.map +1 -1
- package/build/query.d.ts +3 -3
- package/build/query.d.ts.map +1 -1
- package/build/query.js +19 -12
- package/build/query.js.map +1 -1
- package/build/search/query-mode.d.ts +1 -2
- package/build/search/query-mode.d.ts.map +1 -1
- package/build/search/query-mode.js +0 -3
- package/build/search/query-mode.js.map +1 -1
- package/build/server-test.d.ts +1 -1
- package/build/server-test.d.ts.map +1 -1
- package/build/server-test.js +1 -1
- package/build/server-test.js.map +1 -1
- package/build/terms.d.ts.map +1 -1
- package/build/terms.js +64 -53
- package/build/terms.js.map +1 -1
- package/package.json +8 -8
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;
|
|
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;IAEhB,QAAQ,CAAC,IAAI,EAAE,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,GAAG;gBADR,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,GAAG;CAEpB;AAED,oBAAY,WAAW;IACrB,cAAc,uDAAuD;CACtE;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAE9C,qBAAa,GAAI,SAAQ,GAAG;CAAG"}
|
package/build/catalog.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { URL } from 'url';
|
|
2
2
|
export class Catalog {
|
|
3
|
+
datasets;
|
|
3
4
|
constructor(datasets) {
|
|
4
5
|
this.datasets = datasets;
|
|
5
6
|
}
|
|
@@ -22,6 +23,13 @@ export class Catalog {
|
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
25
|
export class Dataset {
|
|
26
|
+
iri;
|
|
27
|
+
name;
|
|
28
|
+
description;
|
|
29
|
+
termsPrefixes;
|
|
30
|
+
creators;
|
|
31
|
+
distributions;
|
|
32
|
+
alternateName;
|
|
25
33
|
constructor(iri, name, description, termsPrefixes, creators, distributions, alternateName) {
|
|
26
34
|
this.iri = iri;
|
|
27
35
|
this.name = name;
|
|
@@ -36,6 +44,9 @@ export class Dataset {
|
|
|
36
44
|
}
|
|
37
45
|
}
|
|
38
46
|
export class Organization {
|
|
47
|
+
iri;
|
|
48
|
+
name;
|
|
49
|
+
alternateName;
|
|
39
50
|
constructor(iri, name, alternateName) {
|
|
40
51
|
this.iri = iri;
|
|
41
52
|
this.name = name;
|
|
@@ -43,6 +54,11 @@ export class Organization {
|
|
|
43
54
|
}
|
|
44
55
|
}
|
|
45
56
|
export class SparqlDistribution {
|
|
57
|
+
iri;
|
|
58
|
+
endpoint;
|
|
59
|
+
searchQuery;
|
|
60
|
+
lookupQuery;
|
|
61
|
+
features;
|
|
46
62
|
constructor(iri, endpoint, searchQuery, lookupQuery, features = []) {
|
|
47
63
|
this.iri = iri;
|
|
48
64
|
this.endpoint = endpoint;
|
|
@@ -55,6 +71,8 @@ export class SparqlDistribution {
|
|
|
55
71
|
}
|
|
56
72
|
}
|
|
57
73
|
export class Feature {
|
|
74
|
+
type;
|
|
75
|
+
url;
|
|
58
76
|
constructor(type, url) {
|
|
59
77
|
this.type = type;
|
|
60
78
|
this.url = url;
|
package/build/catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,KAAK,CAAC;AAExB,MAAM,OAAO,OAAO;
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}
|
package/build/distributions.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { QueryEngine } from '@comunica/query-sparql';
|
|
2
2
|
import Pino from 'pino';
|
|
3
|
-
import { TermsResponse } from './query';
|
|
4
|
-
import { QueryMode } from './search/query-mode';
|
|
5
|
-
import { Catalog, IRI } from './catalog';
|
|
3
|
+
import { TermsResponse } from './query.js';
|
|
4
|
+
import { QueryMode } from './search/query-mode.js';
|
|
5
|
+
import { Catalog, IRI } from './catalog.js';
|
|
6
6
|
export interface QueryOptions {
|
|
7
7
|
source: IRI;
|
|
8
8
|
query: string;
|
|
@@ -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,aAAa,EAAC,MAAM,
|
|
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,YAAY,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAC,OAAO,EAAE,GAAG,EAAC,MAAM,cAAc,CAAC;AAI1C,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;CAgBnE"}
|
package/build/distributions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Joi from 'joi';
|
|
2
|
-
import { QueryTermsService } from './query';
|
|
3
|
-
import { comunica } from './index';
|
|
4
|
-
import { clientQueriesCounter } from './instrumentation';
|
|
2
|
+
import { QueryTermsService } from './query.js';
|
|
3
|
+
import { comunica } from './index.js';
|
|
4
|
+
import { clientQueriesCounter } from './instrumentation.js';
|
|
5
5
|
const schemaQuery = Joi.object({
|
|
6
6
|
source: Joi.object().required(),
|
|
7
7
|
query: Joi.string().required(),
|
|
@@ -15,6 +15,9 @@ const schemaQueryAll = Joi.object({
|
|
|
15
15
|
timeoutMs: Joi.number().integer(),
|
|
16
16
|
});
|
|
17
17
|
export class DistributionsService {
|
|
18
|
+
logger;
|
|
19
|
+
catalog;
|
|
20
|
+
comunica;
|
|
18
21
|
constructor(options) {
|
|
19
22
|
this.logger = options.logger;
|
|
20
23
|
this.catalog = options.catalog;
|
|
@@ -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,EAAgB,MAAM,
|
|
1
|
+
{"version":3,"file":"distributions.js","sourceRoot":"","sources":["../src/distributions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-pino.js","sourceRoot":"","sources":["../../src/helpers/logger-pino.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAOtC,MAAM,OAAO,UAAW,SAAQ,MAAM;
|
|
1
|
+
{"version":3,"file":"logger-pino.js","sourceRoot":"","sources":["../../src/helpers/logger-pino.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAOtC,MAAM,OAAO,UAAW,SAAQ,MAAM;IAC1B,MAAM,CAAc;IAE9B,YAAY,OAA2B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,8DAA8D;IAC9D,KAAK,CAAC,OAAe,EAAE,IAAU;QAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,8DAA8D;IAC9D,KAAK,CAAC,OAAe,EAAE,IAAU;QAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,8DAA8D;IAC9D,KAAK,CAAC,OAAe,EAAE,IAAU;QAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,8DAA8D;IAC9D,IAAI,CAAC,OAAe,EAAE,IAAU;QAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,8DAA8D;IAC9D,KAAK,CAAC,OAAe,EAAE,IAAU;QAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,8DAA8D;IAC9D,IAAI,CAAC,OAAe,EAAE,IAAU;QAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;CACF"}
|
package/build/index.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export * from './query';
|
|
2
|
-
export * from './catalog';
|
|
3
|
-
export * from './lookup/lookup';
|
|
4
|
-
export * from './terms';
|
|
5
|
-
export * from './search/query-mode';
|
|
6
|
-
export * from './distributions';
|
|
7
|
-
export * from './helpers/logger';
|
|
1
|
+
export * from './query.js';
|
|
2
|
+
export * from './catalog.js';
|
|
3
|
+
export * from './lookup/lookup.js';
|
|
4
|
+
export * from './terms.js';
|
|
5
|
+
export * from './search/query-mode.js';
|
|
6
|
+
export * from './distributions.js';
|
|
7
|
+
export * from './helpers/logger.js';
|
|
8
8
|
import { QueryEngine } from '@comunica/query-sparql';
|
|
9
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,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,eAAO,MAAM,QAAQ,4DAAoB,CAAC"}
|
package/build/index.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export * from './query';
|
|
2
|
-
export * from './catalog';
|
|
3
|
-
export * from './lookup/lookup';
|
|
4
|
-
export * from './terms';
|
|
5
|
-
export * from './search/query-mode';
|
|
6
|
-
export * from './distributions';
|
|
7
|
-
export * from './helpers/logger';
|
|
1
|
+
export * from './query.js';
|
|
2
|
+
export * from './catalog.js';
|
|
3
|
+
export * from './lookup/lookup.js';
|
|
4
|
+
export * from './terms.js';
|
|
5
|
+
export * from './search/query-mode.js';
|
|
6
|
+
export * from './distributions.js';
|
|
7
|
+
export * from './helpers/logger.js';
|
|
8
8
|
import { QueryEngine } from '@comunica/query-sparql';
|
|
9
9
|
export const comunica = new QueryEngine();
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC"}
|
package/build/instrumentation.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
var _a;
|
|
2
1
|
import { MeterProvider, PeriodicExportingMetricReader, } from '@opentelemetry/sdk-metrics';
|
|
3
2
|
import { Resource } from '@opentelemetry/resources';
|
|
4
3
|
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto';
|
|
@@ -13,7 +12,7 @@ const meterProvider = new MeterProvider({
|
|
|
13
12
|
if ('test' !== process.env.NODE_ENV) {
|
|
14
13
|
meterProvider.addMetricReader(new PeriodicExportingMetricReader({
|
|
15
14
|
exporter: new OTLPMetricExporter(),
|
|
16
|
-
exportIntervalMillis:
|
|
15
|
+
exportIntervalMillis: process.env.OTEL_METRIC_EXPORT_INTERVAL ?? 60000,
|
|
17
16
|
}));
|
|
18
17
|
}
|
|
19
18
|
metrics.setGlobalMeterProvider(meterProvider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAC,kBAAkB,EAAC,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAC,0BAA0B,EAAC,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAEtD,MAAM,0BAA0B,GAAG,gBAAgB,CAAC;AAEpD,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;IACtC,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,CAChC,IAAI,QAAQ,CAAC;QACX,CAAC,0BAA0B,CAAC,YAAY,CAAC,EAAE,kBAAkB;KAC9D,CAAC,CACH;CACF,CAAC,CAAC;AAEH,IAAI,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;IACnC,aAAa,CAAC,eAAe,CAC3B,IAAI,6BAA6B,CAAC;QAChC,QAAQ,EAAE,IAAI,kBAAkB,EAAE;QAClC,oBAAoB,EACjB,OAAO,CAAC,GAAG,CAAC,2BAAiD,IAAI,KAAK;KAC1E,CAAC,CACH,CAAC;CACH;AACD,OAAO,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;AAE9C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAE1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,aAAa,CACrD,wBAAwB,EACxB;IACE,WAAW,EAAE,wBAAwB;IACrC,SAAS,EAAE,SAAS,CAAC,GAAG;CACzB,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC,eAAe,CACzD,0BAA0B,EAC1B;IACE,WAAW,EAAE,yDAAyD;IACtE,SAAS,EAAE,SAAS,CAAC,GAAG;IACxB,IAAI,EAAE,IAAI;CACX,CACF,CAAC"}
|
package/build/lookup/lookup.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Catalog, Distribution, IRI } from '../catalog';
|
|
2
|
-
import { QueryTermsService, ServerError, TimeoutError } from '../query';
|
|
3
|
-
import { Term } from '../terms';
|
|
1
|
+
import { Catalog, Distribution, IRI } from '../catalog.js';
|
|
2
|
+
import { QueryTermsService, ServerError, TimeoutError } from '../query.js';
|
|
3
|
+
import { Term } from '../terms.js';
|
|
4
4
|
export type LookupQueryResult = {
|
|
5
5
|
uri: IRI;
|
|
6
6
|
distribution: SourceResult;
|
|
@@ -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,
|
|
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,eAAe,CAAC;AAClE,OAAO,EAEL,iBAAiB,EACjB,WAAW,EAIX,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AAGjC,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;CAqFhC"}
|
package/build/lookup/lookup.js
CHANGED
|
@@ -1,19 +1,25 @@
|
|
|
1
|
-
import { IRI } from '../catalog';
|
|
2
|
-
import { Error, Terms, TermsResponse, } from '../query';
|
|
3
|
-
import { clientQueriesCounter } from '../instrumentation';
|
|
1
|
+
import { IRI } from '../catalog.js';
|
|
2
|
+
import { Error, Terms, TermsResponse, } from '../query.js';
|
|
3
|
+
import { clientQueriesCounter } from '../instrumentation.js';
|
|
4
4
|
export class SourceNotFoundError {
|
|
5
|
+
iri;
|
|
6
|
+
message;
|
|
5
7
|
constructor(iri) {
|
|
6
8
|
this.iri = iri;
|
|
7
9
|
this.message = `No source found that can provide term with URI ${iri}`;
|
|
8
10
|
}
|
|
9
11
|
}
|
|
10
12
|
export class NotFoundError {
|
|
13
|
+
iri;
|
|
14
|
+
message;
|
|
11
15
|
constructor(iri) {
|
|
12
16
|
this.iri = iri;
|
|
13
17
|
this.message = `No term found with URI ${iri}`;
|
|
14
18
|
}
|
|
15
19
|
}
|
|
16
20
|
export class LookupService {
|
|
21
|
+
catalog;
|
|
22
|
+
queryService;
|
|
17
23
|
constructor(catalog, queryService) {
|
|
18
24
|
this.catalog = catalog;
|
|
19
25
|
this.queryService = queryService;
|
|
@@ -27,9 +33,8 @@ export class LookupService {
|
|
|
27
33
|
return acc;
|
|
28
34
|
}, new Map());
|
|
29
35
|
const datasetToIris = [...irisToDataset].reduce((datasetMap, [iri, dataset]) => {
|
|
30
|
-
var _a;
|
|
31
36
|
datasetMap.set(dataset, [
|
|
32
|
-
...(
|
|
37
|
+
...(datasetMap.get(dataset) ?? []),
|
|
33
38
|
new IRI(iri),
|
|
34
39
|
]);
|
|
35
40
|
return datasetMap;
|
|
@@ -37,10 +42,10 @@ export class LookupService {
|
|
|
37
42
|
const lookups = [...datasetToIris].map(([dataset]) => this.queryService.lookup(iris, dataset.distributions[0], timeoutMs));
|
|
38
43
|
const termsPerSource = await Promise.all(lookups);
|
|
39
44
|
const datasetToTerms = termsPerSource.reduce((acc, response) => {
|
|
40
|
-
var _a, _b;
|
|
41
45
|
let dataset = this.catalog.getDatasetByDistributionIri(response.result.distribution.iri);
|
|
42
46
|
if (response.result instanceof Terms) {
|
|
43
|
-
const termsResult =
|
|
47
|
+
const termsResult = acc.get(dataset)?.result ??
|
|
48
|
+
new Terms(response.result.distribution, []);
|
|
44
49
|
for (const term of response.result.terms) {
|
|
45
50
|
if (term.datasetIri !== undefined) {
|
|
46
51
|
const termsDataset = this.catalog.getDatasetByIri(new IRI(term.datasetIri.value));
|
|
@@ -82,10 +87,10 @@ export class LookupService {
|
|
|
82
87
|
}
|
|
83
88
|
}
|
|
84
89
|
function result(result, iri) {
|
|
85
|
-
var _a;
|
|
86
90
|
if (result instanceof Error) {
|
|
87
91
|
return result;
|
|
88
92
|
}
|
|
89
|
-
return (
|
|
93
|
+
return (result.terms.find(term => term.id.value === iri.toString()) ??
|
|
94
|
+
new NotFoundError(iri));
|
|
90
95
|
}
|
|
91
96
|
//# sourceMappingURL=lookup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookup.js","sourceRoot":"","sources":["../../src/lookup/lookup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,GAAG,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"lookup.js","sourceRoot":"","sources":["../../src/lookup/lookup.ts"],"names":[],"mappings":"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"}
|
package/build/query.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import Pino from 'pino';
|
|
2
2
|
import * as RDF from '@rdfjs/types';
|
|
3
|
-
import { Term } from './terms';
|
|
4
|
-
import { QueryMode } from './search/query-mode';
|
|
5
|
-
import { Dataset, Distribution, IRI } from './catalog';
|
|
3
|
+
import { Term } from './terms.js';
|
|
4
|
+
import { QueryMode } from './search/query-mode.js';
|
|
5
|
+
import { Dataset, Distribution, IRI } from './catalog.js';
|
|
6
6
|
import { QueryEngine } from '@comunica/query-sparql';
|
|
7
7
|
export type TermsResult = Terms | TimeoutError | ServerError;
|
|
8
8
|
export declare class TermsResponse {
|
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,
|
|
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,YAAY,CAAC;AAClD,OAAO,EAAC,SAAS,EAAgB,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAC,MAAM,cAAc,CAAC;AACxD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAKnD,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,YAAY,GAAG,WAAW,CAAC;AAE7D,qBAAa,aAAa;IAEtB,QAAQ,CAAC,MAAM,EAAE,WAAW;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM;gBADtB,MAAM,EAAE,WAAW,EACnB,cAAc,EAAE,MAAM;CAElC;AAED,qBAAa,KAAK;IAEd,QAAQ,CAAC,YAAY,EAAE,YAAY;IACnC,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE;gBADb,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,IAAI,EAAE;CAEzB;AAED,qBAAa,KAAK;IAEd,QAAQ,CAAC,YAAY,EAAE,YAAY;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM;gBADf,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM;CAE3B;AAED,qBAAa,YAAa,SAAQ,KAAK;IAEnC,QAAQ,CAAC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY,EACnC,SAAS,EAAE,MAAM;CAIpB;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;CA0F1B"}
|
package/build/query.js
CHANGED
|
@@ -1,33 +1,40 @@
|
|
|
1
1
|
import * as Hoek from '@hapi/hoek';
|
|
2
2
|
import Joi from 'joi';
|
|
3
|
-
import { LoggerPino } from './helpers/logger-pino';
|
|
3
|
+
import { LoggerPino } from './helpers/logger-pino.js';
|
|
4
4
|
import Pino from 'pino';
|
|
5
5
|
import PrettyMilliseconds from 'pretty-ms';
|
|
6
|
-
import { TermsTransformer } from './terms';
|
|
7
|
-
import { queryVariants } from './search/query-mode';
|
|
6
|
+
import { TermsTransformer } from './terms.js';
|
|
7
|
+
import { queryVariants } from './search/query-mode.js';
|
|
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
|
-
import { sourceQueriesHistogram } from './instrumentation';
|
|
11
|
+
import { sourceQueriesHistogram } from './instrumentation.js';
|
|
12
12
|
export class TermsResponse {
|
|
13
|
+
result;
|
|
14
|
+
responseTimeMs;
|
|
13
15
|
constructor(result, responseTimeMs) {
|
|
14
16
|
this.result = result;
|
|
15
17
|
this.responseTimeMs = responseTimeMs;
|
|
16
18
|
}
|
|
17
19
|
}
|
|
18
20
|
export class Terms {
|
|
21
|
+
distribution;
|
|
22
|
+
terms;
|
|
19
23
|
constructor(distribution, terms) {
|
|
20
24
|
this.distribution = distribution;
|
|
21
25
|
this.terms = terms;
|
|
22
26
|
}
|
|
23
27
|
}
|
|
24
28
|
export class Error {
|
|
29
|
+
distribution;
|
|
30
|
+
message;
|
|
25
31
|
constructor(distribution, message) {
|
|
26
32
|
this.distribution = distribution;
|
|
27
33
|
this.message = message;
|
|
28
34
|
}
|
|
29
35
|
}
|
|
30
36
|
export class TimeoutError extends Error {
|
|
37
|
+
distribution;
|
|
31
38
|
constructor(distribution, timeoutMs) {
|
|
32
39
|
super(distribution, `Source timed out after ${timeoutMs}ms`);
|
|
33
40
|
this.distribution = distribution;
|
|
@@ -36,6 +43,8 @@ export class TimeoutError extends Error {
|
|
|
36
43
|
export class ServerError extends Error {
|
|
37
44
|
}
|
|
38
45
|
export class QueryTermsService {
|
|
46
|
+
logger;
|
|
47
|
+
engine;
|
|
39
48
|
constructor(options = {}) {
|
|
40
49
|
this.engine = options.comunica || new QueryEngine();
|
|
41
50
|
this.logger = options.logger || Pino();
|
|
@@ -111,9 +120,8 @@ export class QueryTermsService {
|
|
|
111
120
|
}
|
|
112
121
|
}
|
|
113
122
|
const byScoreThenAlphabetically = (a, b) => {
|
|
114
|
-
|
|
115
|
-
const
|
|
116
|
-
const scoreB = parseFloat((_d = (_c = b.score) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '0');
|
|
123
|
+
const scoreA = parseFloat(a.score?.value ?? '0');
|
|
124
|
+
const scoreB = parseFloat(b.score?.value ?? '0');
|
|
117
125
|
if (scoreA === scoreB) {
|
|
118
126
|
return alphabeticallyByLabels(a, b);
|
|
119
127
|
}
|
|
@@ -122,12 +130,11 @@ const byScoreThenAlphabetically = (a, b) => {
|
|
|
122
130
|
}
|
|
123
131
|
};
|
|
124
132
|
const alphabeticallyByLabels = (a, b) => {
|
|
125
|
-
|
|
126
|
-
const
|
|
127
|
-
const altLabelA = (_d = (_c = a.altLabels[0]) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '';
|
|
133
|
+
const prefLabelA = a.prefLabels[0]?.value ?? '';
|
|
134
|
+
const altLabelA = a.altLabels[0]?.value ?? '';
|
|
128
135
|
const sortLabelA = prefLabelA + altLabelA;
|
|
129
|
-
const prefLabelB =
|
|
130
|
-
const altLabelB =
|
|
136
|
+
const prefLabelB = b.prefLabels[0]?.value ?? '';
|
|
137
|
+
const altLabelB = b.altLabels[0]?.value ?? '';
|
|
131
138
|
const sortLabelB = prefLabelB + altLabelB;
|
|
132
139
|
return sortLabelA.localeCompare(sortLabelB);
|
|
133
140
|
};
|
package/build/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AACnC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAC,UAAU,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
export declare enum QueryMode {
|
|
2
2
|
RAW = "raw",
|
|
3
|
-
OPTIMIZED = "optimized"
|
|
4
|
-
DEPRECATED = "deprecated"
|
|
3
|
+
OPTIMIZED = "optimized"
|
|
5
4
|
}
|
|
6
5
|
export declare function queryVariants(query: string, type: QueryMode): Map<string, string>;
|
|
7
6
|
//# sourceMappingURL=query-mode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-mode.d.ts","sourceRoot":"","sources":["../../src/search/query-mode.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IACnB,GAAG,QAAQ;IACX,SAAS,cAAc;
|
|
1
|
+
{"version":3,"file":"query-mode.d.ts","sourceRoot":"","sources":["../../src/search/query-mode.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IACnB,GAAG,QAAQ;IACX,SAAS,cAAc;CACxB;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,uBAa3D"}
|
|
@@ -2,7 +2,6 @@ export var QueryMode;
|
|
|
2
2
|
(function (QueryMode) {
|
|
3
3
|
QueryMode["RAW"] = "raw";
|
|
4
4
|
QueryMode["OPTIMIZED"] = "optimized";
|
|
5
|
-
QueryMode["DEPRECATED"] = "deprecated";
|
|
6
5
|
})(QueryMode || (QueryMode = {}));
|
|
7
6
|
export function queryVariants(query, type) {
|
|
8
7
|
switch (type) {
|
|
@@ -16,8 +15,6 @@ export function queryVariants(query, type) {
|
|
|
16
15
|
['query', stringQuery(query)],
|
|
17
16
|
['virtuosoQuery', virtuosoQuery(stringQuery(query))],
|
|
18
17
|
]);
|
|
19
|
-
case QueryMode.DEPRECATED:
|
|
20
|
-
return new Map([['query', query]]);
|
|
21
18
|
}
|
|
22
19
|
}
|
|
23
20
|
const stringQuery = (query) => query.toLowerCase().replace(/\s+/g, ' ').trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-mode.js","sourceRoot":"","sources":["../../src/search/query-mode.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"query-mode.js","sourceRoot":"","sources":["../../src/search/query-mode.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,oCAAuB,CAAA;AACzB,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAED,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,IAAe;IAC1D,QAAQ,IAAI,EAAE;QACZ,KAAK,SAAS,CAAC,GAAG;YAChB,OAAO,IAAI,GAAG,CAAC;gBACb,CAAC,OAAO,EAAE,KAAK,CAAC;gBAChB,CAAC,eAAe,EAAE,KAAK,CAAC;aACzB,CAAC,CAAC;QACL,KAAK,SAAS,CAAC,SAAS;YACtB,OAAO,IAAI,GAAG,CAAC;gBACb,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC,eAAe,EAAE,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;aACrD,CAAC,CAAC;KACN;AACH,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE,CACpC,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAElD,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CACtC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAErD,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAEpD;;GAEG;AACH,MAAM,KAAK,GAAG,CAAC,UAAoB,EAAE,EAAE,CACrC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC;AAEzE,MAAM,eAAe,GAAG,CAAC,UAAoB,EAAE,EAAE,CAC/C,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;AAE1C;;GAEG;AACH,MAAM,IAAI,GAAG,CAAC,UAAoB,EAAE,EAAE,CACpC,UAAU,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;IACrE,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,EAAE;QACpE,OAAO,GAAG,aAAa,QAAQ,YAAY,EAAE,CAAC;KAC/C;IAED,OAAO,GAAG,aAAa,IAAI,YAAY,EAAE,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEL,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAAE,EAAE,CAC9C,SAAS,CAAC,WAAW,EAAE,KAAK,KAAK,IAAI,SAAS,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC"}
|
package/build/server-test.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Catalog } from './index';
|
|
1
|
+
import { Catalog } from './index.js';
|
|
2
2
|
export declare const teardown: () => Promise<void>;
|
|
3
3
|
export declare const testCatalog: (port: number) => Catalog;
|
|
4
4
|
export declare function startDistributionSparqlEndpoint(port: number): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-test.d.ts","sourceRoot":"","sources":["../src/server-test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAOR,MAAM,
|
|
1
|
+
{"version":3,"file":"server-test.d.ts","sourceRoot":"","sources":["../src/server-test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAOR,MAAM,YAAY,CAAC;AAMpB,eAAO,MAAM,QAAQ,qBAEpB,CAAC;AAGF,eAAO,MAAM,WAAW,SAAU,MAAM,YA2IpC,CAAC;AAEL,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAQf"}
|
package/build/server-test.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Catalog, Dataset, Feature, FeatureType, IRI, Organization, SparqlDistribution, } from './index';
|
|
1
|
+
import { Catalog, Dataset, Feature, FeatureType, IRI, Organization, SparqlDistribution, } from './index.js';
|
|
2
2
|
import { setup, teardown as teardownServer } from 'jest-dev-server';
|
|
3
3
|
import { dirname } from 'path';
|
|
4
4
|
import { fileURLToPath } from 'url';
|
package/build/server-test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-test.js","sourceRoot":"","sources":["../src/server-test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,OAAO,EACP,OAAO,EACP,WAAW,EACX,GAAG,EACH,YAAY,EACZ,kBAAkB,GACnB,MAAM,
|
|
1
|
+
{"version":3,"file":"server-test.js","sourceRoot":"","sources":["../src/server-test.ts"],"names":[],"mappings":"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"}
|
package/build/terms.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terms.d.ts","sourceRoot":"","sources":["../src/terms.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAEpC,qBAAa,IAAI;IAEb,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI;IACrB,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS;IACnC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;IAClC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE;IACjC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE;IACpC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;IAClC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE;IACjC,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE;IACpC,QAAQ,CAAC,aAAa,EAAE,WAAW,EAAE;IACrC,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE;IACpC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS;IACzC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,SAAS;gBAX9B,EAAE,EAAE,GAAG,CAAC,IAAI,EACZ,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS,EAC1B,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,EACzB,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,EACxB,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,EAC3B,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,EACzB,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,EACxB,YAAY,EAAE,WAAW,EAAE,EAC3B,aAAa,EAAE,WAAW,EAAE,EAC5B,YAAY,EAAE,WAAW,EAAE,EAC3B,UAAU,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS,EAChC,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,SAAS;CAE1C;AAED,qBAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"terms.d.ts","sourceRoot":"","sources":["../src/terms.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAEpC,qBAAa,IAAI;IAEb,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI;IACrB,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS;IACnC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;IAClC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE;IACjC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE;IACpC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;IAClC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE;IACjC,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE;IACpC,QAAQ,CAAC,aAAa,EAAE,WAAW,EAAE;IACrC,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE;IACpC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS;IACzC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,SAAS;gBAX9B,EAAE,EAAE,GAAG,CAAC,IAAI,EACZ,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS,EAC1B,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,EACzB,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,EACxB,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,EAC3B,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,EACzB,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,EACxB,YAAY,EAAE,WAAW,EAAE,EAC3B,aAAa,EAAE,WAAW,EAAE,EAC5B,YAAY,EAAE,WAAW,EAAE,EAC3B,UAAU,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS,EAChC,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,SAAS;CAE1C;AAED,qBAAa,WAAW;IAEpB,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI;IACrB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;gBADzB,EAAE,EAAE,GAAG,CAAC,IAAI,EACZ,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;CAErC;AAiBD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,QAAQ,CAA4C;IAC5D,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAmBpC;IAEH,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,IAAI;IA6B9B,OAAO,IAAI,IAAI,EAAE;IAuBjB;;;;;OAKG;IACH,OAAO,CAAC,eAAe,CAOd;CACV"}
|
package/build/terms.js
CHANGED
|
@@ -1,4 +1,16 @@
|
|
|
1
1
|
export class Term {
|
|
2
|
+
id;
|
|
3
|
+
type;
|
|
4
|
+
prefLabels;
|
|
5
|
+
altLabels;
|
|
6
|
+
hiddenLabels;
|
|
7
|
+
scopeNotes;
|
|
8
|
+
seeAlso;
|
|
9
|
+
broaderTerms;
|
|
10
|
+
narrowerTerms;
|
|
11
|
+
relatedTerms;
|
|
12
|
+
datasetIri;
|
|
13
|
+
score;
|
|
2
14
|
constructor(id, type, prefLabels, altLabels, hiddenLabels, scopeNotes, seeAlso, broaderTerms, narrowerTerms, relatedTerms, datasetIri, score) {
|
|
3
15
|
this.id = id;
|
|
4
16
|
this.type = type;
|
|
@@ -15,70 +27,57 @@ export class Term {
|
|
|
15
27
|
}
|
|
16
28
|
}
|
|
17
29
|
export class RelatedTerm {
|
|
30
|
+
id;
|
|
31
|
+
prefLabels;
|
|
18
32
|
constructor(id, prefLabels) {
|
|
19
33
|
this.id = id;
|
|
20
34
|
this.prefLabels = prefLabels;
|
|
21
35
|
}
|
|
22
36
|
}
|
|
23
37
|
class SparqlResultTerm {
|
|
38
|
+
id;
|
|
24
39
|
constructor(id) {
|
|
25
40
|
this.id = id;
|
|
26
|
-
this.type = undefined;
|
|
27
|
-
this.prefLabels = [];
|
|
28
|
-
this.altLabels = [];
|
|
29
|
-
this.hiddenLabels = [];
|
|
30
|
-
this.scopeNotes = [];
|
|
31
|
-
this.seeAlso = [];
|
|
32
|
-
this.broaderTerms = [];
|
|
33
|
-
this.narrowerTerms = [];
|
|
34
|
-
this.relatedTerms = [];
|
|
35
|
-
this.inScheme = undefined;
|
|
36
|
-
this.score = undefined;
|
|
37
41
|
}
|
|
42
|
+
type = undefined;
|
|
43
|
+
prefLabels = [];
|
|
44
|
+
altLabels = [];
|
|
45
|
+
hiddenLabels = [];
|
|
46
|
+
scopeNotes = [];
|
|
47
|
+
seeAlso = [];
|
|
48
|
+
broaderTerms = [];
|
|
49
|
+
narrowerTerms = [];
|
|
50
|
+
relatedTerms = [];
|
|
51
|
+
inScheme = undefined;
|
|
52
|
+
score = undefined;
|
|
38
53
|
}
|
|
39
54
|
export class TermsTransformer {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
]);
|
|
63
|
-
/**
|
|
64
|
-
* Map related IRIs to their related terms, making sure to only accept complete related terms.
|
|
65
|
-
*
|
|
66
|
-
* Related terms can be incomplete because of the SPARQL query limit (see
|
|
67
|
-
* https://github.com/netwerk-digitaal-erfgoed/network-of-terms/issues/36).
|
|
68
|
-
*/
|
|
69
|
-
this.mapRelatedTerms = (terms) => terms.reduce((acc, iri) => {
|
|
70
|
-
const term = this.termsMap.get(iri.value);
|
|
71
|
-
if (term) {
|
|
72
|
-
acc.push(new RelatedTerm(term.id, term.prefLabels));
|
|
73
|
-
}
|
|
74
|
-
return acc;
|
|
75
|
-
}, []);
|
|
76
|
-
}
|
|
55
|
+
termsIris = new Set();
|
|
56
|
+
termsMap = new Map();
|
|
57
|
+
predicateToPropertyMap = new Map([
|
|
58
|
+
['http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'type'],
|
|
59
|
+
['http://www.w3.org/2000/01/rdf-schema#seeAlso', 'seeAlso'],
|
|
60
|
+
['http://www.w3.org/2004/02/skos/core#prefLabel', 'prefLabels'],
|
|
61
|
+
['http://www.w3.org/2008/05/skos#prefLabel', 'prefLabels'],
|
|
62
|
+
['http://www.w3.org/2004/02/skos/core#altLabel', 'altLabels'],
|
|
63
|
+
['http://www.w3.org/2008/05/skos#altLabel', 'altLabels'],
|
|
64
|
+
['http://www.w3.org/2004/02/skos/core#hiddenLabel', 'hiddenLabels'],
|
|
65
|
+
['http://www.w3.org/2008/05/skos#hiddenLabel', 'hiddenLabels'],
|
|
66
|
+
['http://www.w3.org/2004/02/skos/core#scopeNote', 'scopeNotes'],
|
|
67
|
+
['http://www.w3.org/2008/05/skos#scopeNote', 'scopeNotes'],
|
|
68
|
+
['http://www.w3.org/2004/02/skos/core#broader', 'broaderTerms'],
|
|
69
|
+
['http://www.w3.org/2008/05/skos#broader', 'broaderTerms'],
|
|
70
|
+
['http://www.w3.org/2004/02/skos/core#narrower', 'narrowerTerms'],
|
|
71
|
+
['http://www.w3.org/2008/05/skos#narrower', 'narrowerTerms'],
|
|
72
|
+
['http://www.w3.org/2004/02/skos/core#related', 'relatedTerms'],
|
|
73
|
+
['http://www.w3.org/2008/05/skos#related', 'relatedTerms'],
|
|
74
|
+
['http://www.w3.org/2004/02/skos/core#inScheme', 'inScheme'],
|
|
75
|
+
['http://purl.org/voc/vrank#simpleRank', 'score'],
|
|
76
|
+
]);
|
|
77
77
|
fromQuad(quad) {
|
|
78
|
-
var _a;
|
|
79
78
|
const subject = quad.subject;
|
|
80
79
|
const propertyName = this.predicateToPropertyMap.get(quad.predicate.value);
|
|
81
|
-
const currentTerm =
|
|
80
|
+
const currentTerm = this.termsMap.get(subject.value) ?? new SparqlResultTerm(subject);
|
|
82
81
|
this.termsMap.set(subject.value, currentTerm);
|
|
83
82
|
// skos:Concepts are the top-level search results, which we track in termsIris.
|
|
84
83
|
if (propertyName === 'type' &&
|
|
@@ -105,11 +104,23 @@ export class TermsTransformer {
|
|
|
105
104
|
return new Term(term.id, term.type, term.prefLabels, term.altLabels, term.hiddenLabels, term.scopeNotes, term.seeAlso, this.mapRelatedTerms(term.broaderTerms).sort(alphabeticallyByPrefLabel), this.mapRelatedTerms(term.narrowerTerms).sort(alphabeticallyByPrefLabel), this.mapRelatedTerms(term.relatedTerms).sort(alphabeticallyByPrefLabel), term.inScheme, term.score);
|
|
106
105
|
});
|
|
107
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* Map related IRIs to their related terms, making sure to only accept complete related terms.
|
|
109
|
+
*
|
|
110
|
+
* Related terms can be incomplete because of the SPARQL query limit (see
|
|
111
|
+
* https://github.com/netwerk-digitaal-erfgoed/network-of-terms/issues/36).
|
|
112
|
+
*/
|
|
113
|
+
mapRelatedTerms = (terms) => terms.reduce((acc, iri) => {
|
|
114
|
+
const term = this.termsMap.get(iri.value);
|
|
115
|
+
if (term) {
|
|
116
|
+
acc.push(new RelatedTerm(term.id, term.prefLabels));
|
|
117
|
+
}
|
|
118
|
+
return acc;
|
|
119
|
+
}, []);
|
|
108
120
|
}
|
|
109
121
|
const alphabeticallyByPrefLabel = (a, b) => {
|
|
110
|
-
|
|
111
|
-
const
|
|
112
|
-
const prefLabelB = (_d = (_c = b.prefLabels[0]) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '';
|
|
122
|
+
const prefLabelA = a.prefLabels[0]?.value ?? '';
|
|
123
|
+
const prefLabelB = b.prefLabels[0]?.value ?? '';
|
|
113
124
|
return prefLabelA.localeCompare(prefLabelB);
|
|
114
125
|
};
|
|
115
126
|
//# sourceMappingURL=terms.js.map
|
package/build/terms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terms.js","sourceRoot":"","sources":["../src/terms.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,IAAI;
|
|
1
|
+
{"version":3,"file":"terms.js","sourceRoot":"","sources":["../src/terms.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": "
|
|
3
|
+
"version": "3.0.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -31,15 +31,15 @@
|
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@comunica/bindings-factory": "^2.7.0",
|
|
33
33
|
"@comunica/data-factory": "^2.7.0",
|
|
34
|
-
"@comunica/query-sparql": "^2.8.
|
|
34
|
+
"@comunica/query-sparql": "^2.8.3",
|
|
35
35
|
"@hapi/hoek": "^11.0.2",
|
|
36
36
|
"@opentelemetry/api": "^1.4.1",
|
|
37
|
-
"@opentelemetry/exporter-metrics-otlp-proto": "0.41.
|
|
38
|
-
"@opentelemetry/resources": "1.15.
|
|
39
|
-
"@opentelemetry/sdk-metrics": "1.15.
|
|
40
|
-
"@opentelemetry/semantic-conventions": "1.15.
|
|
37
|
+
"@opentelemetry/exporter-metrics-otlp-proto": "0.41.2",
|
|
38
|
+
"@opentelemetry/resources": "1.15.2",
|
|
39
|
+
"@opentelemetry/sdk-metrics": "1.15.2",
|
|
40
|
+
"@opentelemetry/semantic-conventions": "1.15.2",
|
|
41
41
|
"@rdfjs/data-model": "^2.0.1",
|
|
42
|
-
"joi": "^17.
|
|
42
|
+
"joi": "^17.10.1",
|
|
43
43
|
"pino": "^8.15.0",
|
|
44
44
|
"pino-pretty": "^10.2.0",
|
|
45
45
|
"pretty-ms": "^8.0.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@comunica/core": "^2.7.0",
|
|
51
|
-
"@comunica/query-sparql-file": "^2.8.
|
|
51
|
+
"@comunica/query-sparql-file": "^2.8.3",
|
|
52
52
|
"@jest/globals": "^29.6.2",
|
|
53
53
|
"asynciterator": "^3.8.1",
|
|
54
54
|
"jest-dev-server": "9.0.0",
|