@netwerk-digitaal-erfgoed/network-of-terms-query 6.2.0 → 6.2.2

package/build/index.d.ts

@@ -1,5 +1,6 @@
 export * from './query.js';
 export * from './catalog.js';
+export * from './literal.js';
 export * from './lookup/lookup.js';
 export * from './terms.js';
 export * from './search/query-mode.js';

package/build/index.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,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

@@ -1,5 +1,6 @@
 export * from './query.js';
 export * from './catalog.js';
+export * from './literal.js';
 export * from './lookup/lookup.js';
 export * from './terms.js';
 export * from './search/query-mode.js';

package/build/index.js.map

@@ -1 +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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,oBAAoB,+EAMhC,CAAC;AAEF,eAAO,MAAM,sBAAsB,iFAOlC,CAAC"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,oBAAoB,+EAMhC,CAAC;AAEF,eAAO,MAAM,sBAAsB,iFAOlC,CAAC"}

package/build/instrumentation.js

@@ -1,13 +1,11 @@
 import { MeterProvider, PeriodicExportingMetricReader, } from '@opentelemetry/sdk-metrics';
-import { Resource } from '@opentelemetry/resources';
+import { defaultResource, resourceFromAttributes, } from '@opentelemetry/resources';
 import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto';
-import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
+import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 import { metrics, ValueType } from '@opentelemetry/api';
 const sourceQueriesHistogramName = 'queries.source';
 const meterProvider = new MeterProvider({
-    resource: Resource.default().merge(new Resource({
-        [SEMRESATTRS_SERVICE_NAME]: 'network-of-terms',
-    })),
+    resource: defaultResource().merge(resourceFromAttributes({ [ATTR_SERVICE_NAME]: 'network-of-terms' })),
     readers: 'test' === process.env.NODE_ENV
         ? []
         : [

package/build/instrumentation.js.map

@@ -1 +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,wBAAwB,EAAC,MAAM,qCAAqC,CAAC;AAC7E,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,wBAAwB,CAAC,EAAE,kBAAkB;KAC/C,CAAC,CACH;IACD,OAAO,EACL,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,IAAI,6BAA6B,CAAC;gBAChC,QAAQ,EAAE,IAAI,kBAAkB,EAAE;gBAClC,oBAAoB,EACjB,OAAO,CAAC,GAAG,CAAC,2BAAiD;oBAC9D,KAAK;aACR,CAAC;SACH;CACR,CAAC,CAAC;AAEH,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"}
+{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,eAAe,EACf,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,kBAAkB,EAAC,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAC,iBAAiB,EAAC,MAAM,qCAAqC,CAAC;AACtE,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,eAAe,EAAE,CAAC,KAAK,CAC/B,sBAAsB,CAAC,EAAC,CAAC,iBAAiB,CAAC,EAAE,kBAAkB,EAAC,CAAC,CAClE;IACD,OAAO,EACL,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,IAAI,6BAA6B,CAAC;gBAChC,QAAQ,EAAE,IAAI,kBAAkB,EAAE;gBAClC,oBAAoB,EACjB,OAAO,CAAC,GAAG,CAAC,2BAAiD;oBAC9D,KAAK;aACR,CAAC;SACH;CACR,CAAC,CAAC;AAEH,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/literal.d.ts

@@ -0,0 +1,10 @@
+import * as RDF from '@rdfjs/types';
+export declare function filterLiteralsByLanguage(literals: RDF.Literal[], languages: string[]): RDF.Literal[];
+/**
+ * Return value from {@link Literal} in the given languages.
+ *
+ * @param literals
+ * @param languages
+ */
+export declare function literalValues(literals: RDF.Literal[], languages?: string[]): string[];
+//# sourceMappingURL=literal.d.ts.map

package/build/literal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"literal.d.ts","sourceRoot":"","sources":["../src/literal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAGpC,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,EACvB,SAAS,EAAE,MAAM,EAAE,iBAapB;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,EACvB,SAAS,GAAE,MAAM,EAAW,YAW7B"}

package/build/literal.js

@@ -0,0 +1,26 @@
+import Literal from '@rdfjs/data-model/lib/Literal.js';
+export function filterLiteralsByLanguage(literals, languages) {
+    const preferredLanguageLiterals = literals.filter(literal => languages.includes(literal.language));
+    if (preferredLanguageLiterals.length > 0) {
+        return preferredLanguageLiterals;
+    }
+    // If literal has no language tag, we assume it is in the Network of Terms’ default language, Dutch.
+    return literals
+        .filter(literal => literal.language === '')
+        .map(literal => new Literal(literal.value, 'nl'));
+}
+/**
+ * Return value from {@link Literal} in the given languages.
+ *
+ * @param literals
+ * @param languages
+ */
+export function literalValues(literals, languages = ['nl']) {
+    const languageLiterals = filterLiteralsByLanguage(literals, languages);
+    if (languageLiterals.length > 0) {
+        return languageLiterals.map(literal => literal.value);
+    }
+    // Fall back to English for sources that provide no Dutch labels.
+    return filterLiteralsByLanguage(literals, ['en']).map(literal => literal.value);
+}
+//# sourceMappingURL=literal.js.map

package/build/literal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"literal.js","sourceRoot":"","sources":["../src/literal.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,kCAAkC,CAAC;AAEvD,MAAM,UAAU,wBAAwB,CACtC,QAAuB,EACvB,SAAmB;IAEnB,MAAM,yBAAyB,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAC1D,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CACrC,CAAC;IACF,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,OAAO,yBAAyB,CAAC;IACnC,CAAC;IAED,oGAAoG;IACpG,OAAO,QAAQ;SACZ,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,EAAE,CAAC;SAC1C,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAC3B,QAAuB,EACvB,YAAsB,CAAC,IAAI,CAAC;IAE5B,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACvE,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,iEAAiE;IACjE,OAAO,wBAAwB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CACnD,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CACzB,CAAC;AACJ,CAAC"}

package/build/server-test.d.ts.map

@@ -1 +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,YAuLpC,CAAC;AAEL,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAQf"}
+{"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,GAAI,MAAM,MAAM,YAuLpC,CAAC;AAEL,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAQf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-query",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -33,18 +33,18 @@
     "@comunica/utils-bindings-factory": "^4.0.2",
     "@hapi/hoek": "^11.0.7",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.57.2",
-    "@opentelemetry/resources": "1.30.1",
-    "@opentelemetry/sdk-metrics": "1.30.1",
-    "@opentelemetry/semantic-conventions": "1.30.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.201.1",
+    "@opentelemetry/resources": "2.0.1",
+    "@opentelemetry/sdk-metrics": "2.0.1",
+    "@opentelemetry/semantic-conventions": "1.34.0",
     "@rdfjs/data-model": "^2.1.0",
     "env-schema": "^6.0.1",
     "joi": "^17.13.3",
-    "pino": "^9.6.0",
+    "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",
     "pretty-ms": "^9.2.0",
     "rdf-data-factory": "^2.0.2",
-    "rdf-store-stream": "^2.0.1"
+    "rdf-store-stream": "^3.0.0"
   },
   "devDependencies": {
     "@comunica/query-sparql-file": "^4.1.0",