@netwerk-digitaal-erfgoed/network-of-terms-query 2.4.0 → 2.6.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.
@@ -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,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"}
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;CA8E1B"}
package/build/query.js CHANGED
@@ -77,7 +77,7 @@ export class QueryTermsService {
77
77
  const termsTransformer = new TermsTransformer();
78
78
  quadStream.on('error', error => {
79
79
  const elapsed = Math.round(timer.elapsed());
80
- this.logger.error(`An error occurred when querying "${distribution.endpoint}": ${error}`);
80
+ this.logger.error(`An error occurred when querying "${distribution.endpoint}": ${error} with %o`, error);
81
81
  if ('AbortError' === error.name) {
82
82
  resolve(new TermsResponse(new TimeoutError(distribution, timeoutMs), elapsed));
83
83
  }
@@ -89,13 +89,26 @@ export class QueryTermsService {
89
89
  termsTransformer.fromQuad(quad);
90
90
  });
91
91
  quadStream.on('end', () => {
92
- const terms = termsTransformer.asArray().sort(alphabeticallyByLabels);
92
+ const terms = termsTransformer
93
+ .asArray()
94
+ .sort(byScoreThenAlphabetically);
93
95
  this.logger.info(`Found ${terms.length} terms matching "${query}" in "${distribution.endpoint}" in ${PrettyMilliseconds(timer.elapsed())}`);
94
96
  resolve(new TermsResponse(new Terms(distribution, terms), Math.round(timer.elapsed())));
95
97
  });
96
98
  });
97
99
  }
98
100
  }
101
+ const byScoreThenAlphabetically = (a, b) => {
102
+ var _a, _b;
103
+ const scoreA = ((_a = a.score) === null || _a === void 0 ? void 0 : _a.value) || 0;
104
+ const scoreB = ((_b = b.score) === null || _b === void 0 ? void 0 : _b.value) || 0;
105
+ if (scoreA === scoreB) {
106
+ return alphabeticallyByLabels(a, b);
107
+ }
108
+ else {
109
+ return scoreA < scoreB ? 1 : -1;
110
+ }
111
+ };
99
112
  const alphabeticallyByLabels = (a, b) => {
100
113
  var _a, _b, _c, _d, _e, _f, _g, _h;
101
114
  const prefLabelA = (_b = (_a = a.prefLabels[0]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : '';
@@ -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,uBAAuB,CAAC;AACjD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,kBAAkB,MAAM,WAAW,CAAC;AAG3C,OAAO,EAAO,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAY,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAI7C,MAAM,OAAO,aAAa;IACxB,YAAqB,MAAmB,EAAW,cAAsB;QAApD,WAAM,GAAN,MAAM,CAAa;QAAW,mBAAc,GAAd,cAAc,CAAQ;IAAG,CAAC;CAC9E;AAED,MAAM,OAAO,KAAK;IAChB,YAAqB,YAA0B,EAAW,KAAa;QAAlD,iBAAY,GAAZ,YAAY,CAAc;QAAW,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;CAC5E;AAED,MAAM,OAAO,KAAK;IAChB,YAAqB,YAA0B,EAAW,OAAe;QAApD,iBAAY,GAAZ,YAAY,CAAc;QAAW,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;CAC9E;AAED,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC,YAAqB,YAA0B,EAAE,SAAiB;QAChE,KAAK,CAAC,YAAY,EAAE,0BAA0B,SAAS,IAAI,CAAC,CAAC;QAD1C,iBAAY,GAAZ,YAAY,CAAc;IAE/C,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,KAAK;CAAG;AAEzC,MAAM,OAAO,iBAAiB;IAI5B,YAAY,UAA0D,EAAE;QACtE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,WAAW,EAAE,CAAC;QACpD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,MAAM,CACV,WAAmB,EACnB,SAAoB,EACpB,OAAgB,EAChB,YAA0B,EAC1B,SAAiB;QAEjB,MAAM,QAAQ,GAAG,CAAC,GAAG,aAAa,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAChE,CAAC,MAAgC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC3C,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACnC,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,EAAE,CACH,CAAC;QACF,QAAQ,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEvE,OAAO,IAAI,CAAC,GAAG,CACb,YAAY,CAAC,WAAW,EACxB,YAAY,EACZ,SAAS,EACT,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAW,EAAE,YAA0B,EAAE,SAAiB;QACrE,OAAO,IAAI,CAAC,GAAG,CACb,YAAY,CAAC,WAAW,CAAC,OAAO,CAC9B,OAAO,EACP,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACtC,EACD,YAAY,EACZ,SAAS,CACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CACP,KAAa,EACb,YAA0B,EAC1B,SAAiB,EACjB,WAAqC,EAAE;QAEvC,GAAG,CAAC,OAAO,CACT,SAAS,EACT,GAAG,CAAC,MAAM,EAAE;aACT,OAAO,EAAE;aACT,GAAG,CAAC,CAAC,CAAC;aACN,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAA2B,CAAC,IAAI,KAAK,CAAC;aAC/D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAA+B,CAAC,IAAI,IAAI,CAAC,CAC1E,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;QACrD,iEAAiE;QACjE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,GAAG,WAAW,KAAK,MAAM,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE;YACrD,GAAG,EAAE,MAAM;YACX,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,GAAG,GAAG,CAAC,QAAQ;YACtE,WAAW,EAAE,SAAS;YACtB,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,QAAQ;iBACjC;aACF;YACD,eAAe,EAAE,eAAe,CAAC,UAAU,CACzC,QAAQ,CACc;SACzB,CAAC,CAAC;QAEH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC;YAChD,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;gBAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,oCAAoC,YAAY,CAAC,QAAQ,MAAM,KAAK,EAAE,CACvE,CAAC;gBAEF,IAAI,YAAY,KAAK,KAAK,CAAC,IAAI,EAAE;oBAC/B,OAAO,CACL,IAAI,aAAa,CACf,IAAI,YAAY,CAAC,YAAY,EAAE,SAAS,CAAC,EACzC,OAAO,CACR,CACF,CAAC;iBACH;qBAAM;oBACL,OAAO,CACL,IAAI,aAAa,CACf,IAAI,WAAW,CACb,YAAY,EACZ,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,CACxC,EACD,OAAO,CACR,CACF,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAc,EAAE,EAAE;gBACvC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACxB,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;gBACtE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,SAAS,KAAK,CAAC,MAAM,oBAAoB,KAAK,SAC5C,YAAY,CAAC,QACf,QAAQ,kBAAkB,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAC9C,CAAC;gBACF,OAAO,CACL,IAAI,aAAa,CACf,IAAI,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAC9B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAC5B,CACF,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,sBAAsB,GAAG,CAAC,CAAO,EAAE,CAAO,EAAE,EAAE;;IAClD,MAAM,UAAU,GAAG,MAAA,MAAA,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,0CAAE,KAAK,mCAAI,EAAE,CAAC;IAChD,MAAM,SAAS,GAAG,MAAA,MAAA,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,0CAAE,KAAK,mCAAI,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAA,MAAA,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,0CAAE,KAAK,mCAAI,EAAE,CAAC;IAChD,MAAM,SAAS,GAAG,MAAA,MAAA,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,0CAAE,KAAK,mCAAI,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;IAC1C,OAAO,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AACtC,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC;AAEzD,MAAM,wBAAwB,GAAG,CAAC,OAAe,EAAE,EAAE,CACnD,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { Catalog } from './index';
2
+ export declare const teardown: () => Promise<void>;
2
3
  export declare const testCatalog: (port: number) => Catalog;
3
4
  export declare function startDistributionSparqlEndpoint(port: number): Promise<void>;
4
5
  //# sourceMappingURL=server-test.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"server-test.d.ts","sourceRoot":"","sources":["../src/server-test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAOR,MAAM,SAAS,CAAC;AAKjB,eAAO,MAAM,WAAW,SAAU,MAAM,YA2IpC,CAAC;AAEL,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAQf"}
1
+ {"version":3,"file":"server-test.d.ts","sourceRoot":"","sources":["../src/server-test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAOR,MAAM,SAAS,CAAC;AAMjB,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"}
@@ -1,7 +1,11 @@
1
1
  import { Catalog, Dataset, Feature, FeatureType, IRI, Organization, SparqlDistribution, } from './index';
2
- import { setup } from 'jest-dev-server';
2
+ import { setup, teardown as teardownServer } from 'jest-dev-server';
3
3
  import { dirname } from 'path';
4
4
  import { fileURLToPath } from 'url';
5
+ export const teardown = async () => {
6
+ await teardownServer(servers);
7
+ };
8
+ let servers;
5
9
  export const testCatalog = (port) => new Catalog([
6
10
  new Dataset(new IRI('https://data.rkd.nl/rkdartists'), 'RKDartists', 'Biografische gegevens van Nederlandse en buitenlandse kunstenaars van de middeleeuwen tot heden', [new IRI('https://example.com/resources/')], [
7
11
  new Organization(new IRI('https://rkd.nl'), 'RKD – Nederlands Instituut voor Kunstgeschiedenis', 'RKD'),
@@ -66,7 +70,7 @@ export const testCatalog = (port) => new Catalog([
66
70
  ]),
67
71
  ]);
68
72
  export async function startDistributionSparqlEndpoint(port) {
69
- await setup({
73
+ servers = await setup({
70
74
  command: `npx comunica-sparql-file-http ${dirname(fileURLToPath(import.meta.url))}/../test/fixtures/terms.ttl -p ${port}`,
71
75
  port,
72
76
  launchTimeout: 10000,
@@ -1 +1 @@
1
- {"version":3,"file":"server-test.js","sourceRoot":"","sources":["../src/server-test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server-test.js","sourceRoot":"","sources":["../src/server-test.ts"],"names":[],"mappings":"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"}
package/build/terms.d.ts CHANGED
@@ -11,7 +11,8 @@ export declare class Term {
11
11
  readonly narrowerTerms: RelatedTerm[];
12
12
  readonly relatedTerms: RelatedTerm[];
13
13
  readonly datasetIri: RDF.Term | undefined;
14
- constructor(id: RDF.Term, type: RDF.Term | undefined, prefLabels: RDF.Literal[], altLabels: RDF.Literal[], hiddenLabels: RDF.Literal[], scopeNotes: RDF.Literal[], seeAlso: RDF.NamedNode[], broaderTerms: RelatedTerm[], narrowerTerms: RelatedTerm[], relatedTerms: RelatedTerm[], datasetIri: RDF.Term | undefined);
14
+ readonly score: RDF.Literal | undefined;
15
+ constructor(id: RDF.Term, type: RDF.Term | undefined, prefLabels: RDF.Literal[], altLabels: RDF.Literal[], hiddenLabels: RDF.Literal[], scopeNotes: RDF.Literal[], seeAlso: RDF.NamedNode[], broaderTerms: RelatedTerm[], narrowerTerms: RelatedTerm[], relatedTerms: RelatedTerm[], datasetIri: RDF.Term | undefined, score: RDF.Literal | undefined);
15
16
  }
16
17
  export declare class RelatedTerm {
17
18
  readonly id: RDF.Term;
@@ -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;gBAVhC,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;CAE5C;AAED,qBAAa,WAAW;IACV,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI;IAAE,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;gBAAhD,EAAE,EAAE,GAAG,CAAC,IAAI,EAAW,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;CACtE;AAgBD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,QAAQ,CAA4C;IAC5D,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAkBpC;IAEH,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,IAAI;IA6B9B,OAAO,IAAI,IAAI,EAAE;IAsBjB;;;;;OAKG;IACH,OAAO,CAAC,eAAe,CAOd;CACV"}
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;IACV,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI;IAAE,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;gBAAhD,EAAE,EAAE,GAAG,CAAC,IAAI,EAAW,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE;CACtE;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,5 +1,5 @@
1
1
  export class Term {
2
- constructor(id, type, prefLabels, altLabels, hiddenLabels, scopeNotes, seeAlso, broaderTerms, narrowerTerms, relatedTerms, datasetIri) {
2
+ constructor(id, type, prefLabels, altLabels, hiddenLabels, scopeNotes, seeAlso, broaderTerms, narrowerTerms, relatedTerms, datasetIri, score) {
3
3
  this.id = id;
4
4
  this.type = type;
5
5
  this.prefLabels = prefLabels;
@@ -11,6 +11,7 @@ export class Term {
11
11
  this.narrowerTerms = narrowerTerms;
12
12
  this.relatedTerms = relatedTerms;
13
13
  this.datasetIri = datasetIri;
14
+ this.score = score;
14
15
  }
15
16
  }
16
17
  export class RelatedTerm {
@@ -32,6 +33,7 @@ class SparqlResultTerm {
32
33
  this.narrowerTerms = [];
33
34
  this.relatedTerms = [];
34
35
  this.inScheme = undefined;
36
+ this.score = undefined;
35
37
  }
36
38
  }
37
39
  export class TermsTransformer {
@@ -56,6 +58,7 @@ export class TermsTransformer {
56
58
  ['http://www.w3.org/2004/02/skos/core#related', 'relatedTerms'],
57
59
  ['http://www.w3.org/2008/05/skos#related', 'relatedTerms'],
58
60
  ['http://www.w3.org/2004/02/skos/core#inScheme', 'inScheme'],
61
+ ['http://purl.org/voc/vrank#simpleRank', 'score'],
59
62
  ]);
60
63
  /**
61
64
  * Map related IRIs to their related terms, making sure to only accept complete related terms.
@@ -99,7 +102,7 @@ export class TermsTransformer {
99
102
  asArray() {
100
103
  return [...this.termsIris].map(iri => {
101
104
  const term = this.termsMap.get(iri);
102
- 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);
105
+ 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);
103
106
  });
104
107
  }
105
108
  }
@@ -1 +1 @@
1
- {"version":3,"file":"terms.js","sourceRoot":"","sources":["../src/terms.ts"],"names":[],"mappings":"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"}
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": "2.4.0",
3
+ "version": "2.6.0",
4
4
  "type": "module",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -29,24 +29,25 @@
29
29
  "keywords": [],
30
30
  "description": "Engine for querying sources in the Network of Terms",
31
31
  "dependencies": {
32
- "@comunica/bindings-factory": "^2.5.1",
33
- "@comunica/data-factory": "^2.5.1",
34
- "@comunica/query-sparql": "^2.5.0",
32
+ "@comunica/bindings-factory": "^2.7.0",
33
+ "@comunica/data-factory": "^2.7.0",
34
+ "@comunica/query-sparql": "^2.7.1",
35
35
  "@hapi/hoek": "^11.0.2",
36
36
  "@rdfjs/data-model": "^2.0.1",
37
- "joi": "^17.7.0",
38
- "pino": "^8.8.0",
39
- "pino-pretty": "^9.1.1",
37
+ "joi": "^17.9.2",
38
+ "pino": "^8.14.1",
39
+ "pino-pretty": "^10.0.0",
40
40
  "pretty-ms": "^8.0.0",
41
41
  "rdf-data-factory": "^1.1.1",
42
42
  "rdf-store-stream": "^1.3.1"
43
43
  },
44
44
  "devDependencies": {
45
- "@comunica/core": "^2.5.1",
46
- "@comunica/query-sparql-file": "^2.5.0",
47
- "@jest/globals": "^29.3.1",
45
+ "@comunica/core": "^2.7.0",
46
+ "@comunica/query-sparql-file": "^2.7.1",
47
+ "@jest/globals": "^29.4.3",
48
48
  "asynciterator": "^3.8.0",
49
- "jest-dev-server": "^6.2.0"
49
+ "jest-dev-server": "9.0.0",
50
+ "spawnd": "^9.0.0"
50
51
  },
51
52
  "engines": {
52
53
  "node": ">=16.15.0"