@netwerk-digitaal-erfgoed/network-of-terms-catalog 6.27.1 → 7.0.1

package/build/getCatalog.js

@@ -10,7 +10,7 @@ import { fileURLToPath } from 'url';
 import { DataFactory } from 'rdf-data-factory';
 import { BindingsFactory } from '@comunica/bindings-factory';
 export async function getCatalog(path) {
-    const directory = path !== null && path !== void 0 ? path : resolve(dirname(fileURLToPath(import.meta.url)), '../', 'catalog/');
+    const directory = path ?? resolve(dirname(fileURLToPath(import.meta.url)), '../', 'catalog/');
     const store = await fromFiles(directory);
     return fromStore(store);
 }
@@ -51,7 +51,6 @@ export async function fromStore(store) {
     const promise = new Promise((resolve, reject) => {
         const datasets = [];
         bindingsStream.on('data', (bindings) => {
-            var _a;
             datasets.push(new Dataset(new IRI(bindings.get('dataset').value), bindings.get('name').value, bindings.get('description').value, bindings
                 .get('url')
                 .value.split(' ') // The single value is space-delineated.
@@ -70,7 +69,7 @@ export async function fromStore(store) {
                         ]
                         : []),
                 ]),
-            ], (_a = bindings.get('alternateName')) === null || _a === void 0 ? void 0 : _a.value));
+            ], bindings.get('alternateName')?.value));
         });
         bindingsStream.on('end', () => resolve(datasets));
         bindingsStream.on('error', () => reject);
@@ -87,10 +86,9 @@ export async function fromFiles(directory) {
     return Promise.all(files.map(fromFile));
 }
 export async function fromFile(file) {
-    var _a;
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    const quadStream = ((_a = rdfParser.default) !== null && _a !== void 0 ? _a : RdfParser)
+    const quadStream = (rdfParser.default ?? RdfParser)
         .parse(fs.createReadStream(file), {
         path: file,
     })
@@ -119,13 +117,13 @@ class InlineFiles extends Transform {
  * value with the same name.
  */
 class SubstituteCredentialsFromEnvironmentVariables extends Transform {
+    regex = new RegExp('\\$(.+)(?=@)');
     constructor() {
         super({ objectMode: true });
-        this.regex = new RegExp('\\$(.+)(?=@)');
     }
     async _transform(quad, encoding, callback) {
         if (quad.predicate.value === 'http://schema.org/contentUrl') {
-            quad.object.value = quad.object.value.replace(this.regex, (match, envVar) => { var _a; return (_a = process.env[envVar]) !== null && _a !== void 0 ? _a : ''; });
+            quad.object.value = quad.object.value.replace(this.regex, (match, envVar) => process.env[envVar] ?? '');
         }
         this.push(quad, encoding);
         callback();

package/build/getCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCatalog.js","sourceRoot":"","sources":["../src/getCatalog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getCatalog.js","sourceRoot":"","sources":["../src/getCatalog.ts"],"names":[],"mappings":"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"}

package/build/index.d.ts

@@ -1,2 +1,2 @@
-export * from './getCatalog';
+export * from './getCatalog.js';
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}

package/build/index.js

@@ -1,2 +1,2 @@
-export * from './getCatalog';
+export * from './getCatalog.js';
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}

package/catalog/queries/search/adamlink-straten.rq

@@ -13,19 +13,7 @@ WHERE {
     ?uri a hg:Street .
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        BIND(?virtuosoQuery as ?b)
-        FILTER(!BOUND(?b))
-        ?uri ?predicate ?label .
-        # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.
-        FILTER (<bif:contains> (?label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")) )
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri skos:prefLabel ?prefLabel }
     OPTIONAL { ?uri skos:altLabel ?altLabel }

package/catalog/queries/search/brinkman.rq

@@ -21,19 +21,7 @@ WHERE {
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
     FILTER(LANG(?label) = "nl")
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        BIND(?virtuosoQuery as ?b)
-        FILTER(!BOUND(?b))
-        ?uri ?predicate ?label .
-        # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.
-        FILTER (<bif:contains> (?label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")))
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .

package/catalog/queries/search/muziekschatten-onderwerpen.rq

@@ -10,22 +10,11 @@ CONSTRUCT {
     ?broader_uri skos:prefLabel ?broader_schema_name .
 }
 WHERE {
-    ?uri a skos:Concept .
+    ?uri a skos:Concept ;
+        ?predicate ?label .
 
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        VALUES ?predicate { schema:name schema:keywords }
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        # This Virtuoso endpoint needs STRLEN() rather than !BOUND() because the latter still matches, throwing an error
-        # for queries with diacritics or multiple words.
-        FILTER(STRLEN(?virtuosoQuery) = 0)
-        ?uri ?predicate ?label .
-        VALUES ?predicate { schema:name schema:keywords }
-        ?label <bif:contains> ?query .
-    }
+    VALUES ?predicate { schema:name schema:keywords }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL {
         ?uri schema:name ?schema_name .

package/catalog/queries/search/muziekschatten-personen.rq

@@ -29,22 +29,10 @@ CONSTRUCT {
 WHERE {
     ?uri a schema:Person .
     # Require the presence of this property for quality purposes
-    ?uri som:NDEREC ?nderec .
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        VALUES ?predicate { schema:name schema:alternateName }
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        # This Virtuoso endpoint needs STRLEN() rather than !BOUND() because the latter still matches, throwing an error
-        # for queries with diacritics or multiple words.
-        FILTER(STRLEN(?virtuosoQuery) = 0)
-        ?uri ?predicate ?label .
-        VALUES ?predicate { schema:name schema:alternateName }
-        ?label <bif:contains> ?query .
-    }
+    ?uri som:NDEREC ?nderec ;
+        ?predicate ?label .
+    VALUES ?predicate { schema:name schema:alternateName }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri schema:name ?schema_name }
     OPTIONAL { ?uri schema:alternateName ?schema_alternateName }

package/catalog/queries/search/mw-genresstijlen.rq

@@ -12,20 +12,9 @@ CONSTRUCT {
     ?narrower_uri skos:prefLabel ?narrower_prefLabel .
 }
 WHERE {
-    ?uri a muziekweb:Genre .
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri rdfs:label ?rdfs_label .
-        ?rdfs_label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        BIND(?virtuosoQuery as ?b)
-        FILTER(!BOUND(?b))
-        ?uri rdfs:label ?rdfs_label .
-        # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.
-        FILTER (<bif:contains> (?rdfs_label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")) )
-    }
+    ?uri a muziekweb:Genre ;
+        rdfs:label ?rdfs_label .
+    ?rdfs_label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL {
         ?uri skos:broader ?broader_uri .

package/catalog/queries/search/mw-personengroepen.rq

@@ -10,22 +10,10 @@ CONSTRUCT {
         skos:scopeNote ?schema_description .
 }
 WHERE {
-    ?uri a schema:MusicGroup .
-    ?uri ?predicate ?label .
+    ?uri a schema:MusicGroup ;
+        ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        BIND(?virtuosoQuery as ?b)
-        FILTER(!BOUND(?b))
-        ?uri ?predicate ?label .
-        # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.
-        FILTER (<bif:contains> (?label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")) )
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri skos:prefLabel ?prefLabel }
     OPTIONAL { ?uri skos:altLabel ?altLabel }

package/catalog/queries/search/nmvw.rq

@@ -14,19 +14,7 @@ CONSTRUCT {
 WHERE {
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        BIND(?virtuosoQuery as ?b)
-        FILTER(!BOUND(?b))
-        ?uri ?predicate ?label .
-        # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.
-        FILTER (<bif:contains> (?label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")) )
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .

package/catalog/queries/search/nta.rq

@@ -8,29 +8,10 @@ CONSTRUCT {
         skos:scopeNote ?schema_description .
 }
 WHERE {
-    ?uri schema:mainEntityOfPage/schema:isPartOf <http://data.bibliotheken.nl/id/dataset/persons> .
-    ?uri ?predicate ?label .
+    ?uri schema:mainEntityOfPage/schema:isPartOf <http://data.bibliotheken.nl/id/dataset/persons> ;
+        ?predicate ?label .
     VALUES ?predicate { rdfs:label schema:name schema:alternateName }
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        BIND(?virtuosoQuery as ?b)
-        FILTER(!BOUND(?b))
-        ?uri ?predicate ?label .
-        # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.
-        FILTER (<bif:contains> (?label,
-            REPLACE(
-                REPLACE(?query, "[.,]", " "),
-                "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)(?!$)(?![[:space:]])",
-                " AND ",
-                "i"
-            )
-        ))
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri rdfs:label ?rdfs_label }
     OPTIONAL { ?uri schema:name ?schema_name }

package/catalog/queries/search/rkdartists.rq

@@ -15,27 +15,8 @@ WHERE {
     ?uri ?name ?label .
     VALUES ?name { schema:name schema:alternateName }
 
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        # The RKD Virtuoso endpoint needs isLiteral() rather than !BOUND() because the latter still matches, throwing an
-        # error for queries with diacritics.
-        FILTER(!isLiteral(?virtuosoQuery))
-
-        ?uri ?predicate ?label .
-        # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.
-        FILTER (<bif:contains> (?label,
-            REPLACE(
-                REPLACE(?query, "[.,]", " "),
-                "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)(?!$)(?![[:space:]])",
-                " AND ",
-                "i"
-            )
-        ))
-    }
+    ?uri ?predicate ?label .
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri schema:name ?schema_name . }
     OPTIONAL { ?uri schema:alternateName ?schema_alternateName . }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
-  "version": "6.27.1",
+  "version": "7.0.1",
   "type": "module",
   "description": "Catalog of Network of Terms datasets",
   "repository": {
@@ -29,10 +29,10 @@
   "license": "EUPL-1.2",
   "devDependencies": {
     "@comunica/core": "^2.7.0",
-    "@comunica/types": "^2.7.0",
+    "@comunica/types": "^2.8.2",
     "@types/n3": "^1.4.3",
     "@types/rdf-ext": "^2.2.2",
-    "gts": "^3.1.1",
+    "gts": "^5.0.1",
     "jsonld-streaming-parser": "^3.2.0",
     "rdf-data-factory": "^1.1.2",
     "rdf-ext": "^2.2.0",
@@ -44,8 +44,8 @@
   "homepage": "https://github.com/netwerk-digitaal-erfgoed/network-of-terms-catalog#readme",
   "dependencies": {
     "@comunica/bindings-factory": "^2.7.0",
-    "@comunica/query-sparql-rdfjs": "^2.8.0",
-    "@netwerk-digitaal-erfgoed/network-of-terms-query": "2.9.3",
+    "@comunica/query-sparql-rdfjs": "^2.8.3",
+    "@netwerk-digitaal-erfgoed/network-of-terms-query": "3.0.1",
     "globby": "^13.2.2",
     "rdf-parse": "^2.3.2",
     "rdf-store-stream": "^2.0.0"