@netwerk-digitaal-erfgoed/network-of-terms-query 2.2.1 → 2.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.
@@ -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 declare type Distribution = SparqlDistribution;
48
+ export type Distribution = SparqlDistribution;
49
49
  export declare class IRI extends URL {
50
50
  }
51
51
  //# sourceMappingURL=catalog.d.ts.map
@@ -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,oBAAY,YAAY,GAAG,kBAAkB,CAAC;AAE9C,qBAAa,GAAI,SAAQ,GAAG;CAAG"}
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/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
@@ -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,aAAoB,CAAC"}
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"}
@@ -1,13 +1,13 @@
1
1
  import { Catalog, Distribution, IRI } from '../catalog';
2
2
  import { QueryTermsService, ServerError, TimeoutError } from '../query';
3
3
  import { Term } from '../terms';
4
- export declare type LookupQueryResult = {
4
+ export type LookupQueryResult = {
5
5
  uri: IRI;
6
6
  distribution: SourceResult;
7
7
  result: LookupResult;
8
8
  };
9
- export declare type SourceResult = Distribution | SourceNotFoundError;
10
- export declare type LookupResult = Term | NotFoundError | TimeoutError | ServerError;
9
+ export type SourceResult = Distribution | SourceNotFoundError;
10
+ export type LookupResult = Term | NotFoundError | TimeoutError | ServerError;
11
11
  export declare class SourceNotFoundError {
12
12
  readonly iri: IRI;
13
13
  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,EAGX,YAAY,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,IAAI,EAAC,MAAM,UAAU,CAAC;AAE9B,oBAAY,iBAAiB,GAAG;IAC9B,GAAG,EAAE,GAAG,CAAC;IACT,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,oBAAY,YAAY,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAE9D,oBAAY,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;CAyEhC"}
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,EAGX,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;CACtB,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;CAyEhC"}
package/build/query.d.ts CHANGED
@@ -4,7 +4,7 @@ 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 declare type TermsResult = Terms | TimeoutError | ServerError;
7
+ export type TermsResult = Terms | TimeoutError | ServerError;
8
8
  export declare class Terms {
9
9
  readonly distribution: Distribution;
10
10
  readonly terms: Term[];
@@ -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,oBAAY,WAAW,GAAG,KAAK,GAAG,YAAY,GAAG,WAAW,CAAC;AAE7D,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;IAmBb,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,WAAW,CAAC;CA4DxB"}
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,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;IAmBb,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,WAAW,CAAC;CA8DxB"}
package/build/query.js CHANGED
@@ -58,6 +58,7 @@ export class QueryTermsService {
58
58
  const quadStream = await this.engine.queryQuads(query, {
59
59
  log: logger,
60
60
  httpAuth: url.username === '' ? '' : url.username + ':' + url.password,
61
+ httpTimeout: timeoutMs,
61
62
  sources: [
62
63
  {
63
64
  type: 'sparql',
@@ -66,11 +67,16 @@ export class QueryTermsService {
66
67
  ],
67
68
  initialBindings: bindingsFactory.fromRecord(bindings),
68
69
  });
69
- return guardTimeout(new Promise(resolve => {
70
+ return new Promise(resolve => {
70
71
  const termsTransformer = new TermsTransformer();
71
- quadStream.on('error', (error) => {
72
+ quadStream.on('error', error => {
72
73
  this.logger.error(`An error occurred when querying "${distribution.endpoint}": ${error}`);
73
- resolve(new ServerError(distribution, obfuscateHttpCredentials(error.message)));
74
+ if ('AbortError' === error.name) {
75
+ resolve(new TimeoutError(distribution, timeoutMs));
76
+ }
77
+ else {
78
+ resolve(new ServerError(distribution, obfuscateHttpCredentials(error.message)));
79
+ }
74
80
  });
75
81
  quadStream.on('data', (quad) => {
76
82
  termsTransformer.fromQuad(quad);
@@ -80,7 +86,7 @@ export class QueryTermsService {
80
86
  this.logger.info(`Found ${terms.length} terms matching "${query}" in "${distribution.endpoint}" in ${PrettyMilliseconds(timer.elapsed())}`);
81
87
  resolve(new Terms(distribution, terms));
82
88
  });
83
- }), timeoutMs, new TimeoutError(distribution, timeoutMs));
89
+ });
84
90
  }
85
91
  }
86
92
  const alphabeticallyByLabels = (a, b) => {
@@ -93,12 +99,6 @@ const alphabeticallyByLabels = (a, b) => {
93
99
  const sortLabelB = prefLabelB + altLabelB;
94
100
  return sortLabelA.localeCompare(sortLabelB);
95
101
  };
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
102
  const dataFactory = new DataFactory();
103
103
  const bindingsFactory = new BindingsFactory(dataFactory);
104
104
  const obfuscateHttpCredentials = (message) => message.replace(/(https?):\/\/.+:.+@/, '$1://***@');
@@ -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.2.1",
3
+ "version": "2.3.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.0.1",
33
- "@comunica/data-factory": "^2.0.1",
34
- "@comunica/query-sparql": "^2.4.3",
35
- "@hapi/hoek": "^10.0.1",
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.6.4",
38
- "pino": "^8.7.0",
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.0"
42
+ "rdf-store-stream": "^1.3.1"
43
43
  },
44
44
  "devDependencies": {
45
- "@comunica/core": "^2.4.0",
46
- "@comunica/query-sparql-file": "^2.4.3",
47
- "@jest/globals": "^29.2.2",
48
- "asynciterator": "^3.7.1",
49
- "jest-dev-server": "^6.1.1"
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"