@netwerk-digitaal-erfgoed/network-of-terms-catalog 10.4.0 → 10.5.0

package/build/genre.d.ts

@@ -1,8 +1,8 @@
-import { IRI } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
+import { IRI, StringDictionary } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
 export declare class Genre {
     readonly iri: IRI;
-    readonly name: string;
-    constructor(iri: IRI, name: string);
+    readonly name: StringDictionary;
+    constructor(iri: IRI, name: StringDictionary);
 }
 export declare const dereferenceGenre: (genre: IRI) => Promise<Genre | null>;
 //# sourceMappingURL=genre.d.ts.map

package/build/genre.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"genre.d.ts","sourceRoot":"","sources":["../src/genre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,kDAAkD,CAAC;AAOrE,qBAAa,KAAK;aAEE,GAAG,EAAE,GAAG;aACR,IAAI,EAAE,MAAM;gBADZ,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM;CAE/B;AAuCD,eAAO,MAAM,gBAAgB,UArCY,GAAG,KAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAwCjE,CAAC"}
+{"version":3,"file":"genre.d.ts","sourceRoot":"","sources":["../src/genre.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,gBAAgB,EACjB,MAAM,kDAAkD,CAAC;AAQ1D,qBAAa,KAAK;aAEE,GAAG,EAAE,GAAG;aACR,IAAI,EAAE,gBAAgB;gBADtB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,gBAAgB;CAEzC;AAgCD,eAAO,MAAM,gBAAgB,UA9BY,GAAG,KAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAiCjE,CAAC"}

package/build/genre.js

@@ -11,33 +11,22 @@ export class Genre {
     }
 }
 const doDereferenceGenre = async (genre) => {
-    // We have to fetch first using a single Accept header value of application/rdf+xml, because the Poolparty server
-    // does not properly handle complex Accept headers such as those sent by Comunica.
-    const result = await fetch(genre.toString(), {
-        signal: AbortSignal.timeout(timeout),
-        headers: {
-            Accept: 'application/rdf+xml',
-        },
-    });
-    if (!result.ok) {
-        return null;
-    }
-    const xml = await result.text();
     try {
         const data = await queryEngine.queryBindings(`SELECT ?prefLabel WHERE { 
       ?s a <http://www.w3.org/2004/02/skos/core#Concept> ;
         <http://www.w3.org/2004/02/skos/core#prefLabel> ?prefLabel .
-    } LIMIT 1`, {
-            sources: [
-                {
-                    type: 'serialized',
-                    value: xml,
-                    mediaType: 'application/rdf+xml',
-                },
-            ],
+    }`, {
+            // We can't dereference at the actual URL because content negotiation is broken, so suffix .rdf.
+            sources: [`${genre.toString()}.rdf`],
+            httpTimeout: timeout,
+            httpBodyTimeout: true,
         });
-        const bindings = await data.toArray({ limit: 1 });
-        return new Genre(genre, bindings[0].get('prefLabel')?.value ?? '');
+        const bindings = await data.toArray();
+        return new Genre(genre, bindings.reduce((acc, binding) => {
+            acc[binding.get('prefLabel').language] =
+                binding.get('prefLabel').value;
+            return acc;
+        }, {}));
     }
     catch (error) {
         console.error(error);

package/build/genre.js.map

@@ -1 +1 @@
-{"version":3,"file":"genre.js","sourceRoot":"","sources":["../src/genre.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AACtC,MAAM,OAAO,GAAG,MAAM,CAAC;AAEvB,MAAM,OAAO,KAAK;IAEE;IACA;IAFlB,YACkB,GAAQ,EACR,IAAY;QADZ,QAAG,GAAH,GAAG,CAAK;QACR,SAAI,GAAJ,IAAI,CAAQ;IAC3B,CAAC;CACL;AAED,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAU,EAAyB,EAAE;IACrE,iHAAiH;IACjH,kFAAkF;IAClF,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE;QAC3C,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;QACpC,OAAO,EAAE;YACP,MAAM,EAAE,qBAAqB;SAC9B;KACF,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,aAAa,CAC1C;;;cAGQ,EACR;YACE,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,YAAY;oBAClB,KAAK,EAAE,GAAG;oBACV,SAAS,EAAE,qBAAqB;iBACjC;aACF;SACF,CACF,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC;QAChD,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,EAAE;IAC1D,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,KAAK;CACd,CAAC,CAAC"}
+{"version":3,"file":"genre.js","sourceRoot":"","sources":["../src/genre.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AACtC,MAAM,OAAO,GAAG,MAAM,CAAC;AAEvB,MAAM,OAAO,KAAK;IAEE;IACA;IAFlB,YACkB,GAAQ,EACR,IAAsB;QADtB,QAAG,GAAH,GAAG,CAAK;QACR,SAAI,GAAJ,IAAI,CAAkB;IACrC,CAAC;CACL;AAED,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAU,EAAyB,EAAE;IACrE,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,aAAa,CAC1C;;;MAGA,EACA;YACE,gGAAgG;YAChG,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC;YACpC,WAAW,EAAE,OAAO;YACpB,eAAe,EAAE,IAAI;SACtB,CACF,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAEtC,OAAO,IAAI,KAAK,CACd,KAAK,EACL,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAqB,EAAE,OAAO,EAAE,EAAE;YACjD,GAAG,CAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAc,CAAC,QAAQ,CAAC;gBAClD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,KAAK,CAAC;YAClC,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,EAAE;IAC1D,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,KAAK;CACd,CAAC,CAAC"}

package/catalog/datasets/brinkman.jsonld

@@ -29,14 +29,14 @@
   ],
   "creator": [
     {
-      "@id": "http://data.bibliotheken.nl/doc/thes/p075301482"
+      "@id": "http://data.bibliotheken.nl/id/thes/p075301482"
     }
   ],
   "url": [
     "http://data.bibliotheken.nl/id/thes/"
   ],
   "mainEntityOfPage": [
-    "https://data.bibliotheken.nl/doc/dataset/brinkman"
+    "https://data.bibliotheken.nl/KB/-/stories/Brinkman-trefwoordenthesaurus"
   ],
   "description": [
     {

package/catalog/datasets/nta.jsonld

@@ -25,14 +25,14 @@
   ],
   "creator": [
     {
-      "@id": "http://data.bibliotheken.nl/doc/thes/p075301482"
+      "@id": "http://data.bibliotheken.nl/id/thes/p075301482"
     }
   ],
   "url": [
     "http://data.bibliotheken.nl/id/thes/"
   ],
   "mainEntityOfPage": [
-    "https://data.bibliotheken.nl/doc/dataset/persons"
+    "https://data.bibliotheken.nl/KB/-/stories/NTA"
   ],
   "description": [
     {

package/catalog/datasets/stcn-drukkers.jsonld

@@ -19,14 +19,14 @@
   ],
   "creator": [
     {
-      "@id": "http://data.bibliotheken.nl/doc/thes/p075301482"
+      "@id": "http://data.bibliotheken.nl/id/thes/p075301482"
     }
   ],
   "url": [
     "http://data.bibliotheken.nl/id/thes/"
   ],
   "mainEntityOfPage": [
-    "https://data.bibliotheken.nl/doc/dataset/stcn/printers"
+    "https://data.bibliotheken.nl/KB/-/stories/STCN-persons"
   ],
   "description": [
     {

package/catalog/publishers.jsonld

@@ -62,7 +62,7 @@
       "alternateName": "NMVW"
     },
     {
-      "@id": "http://data.bibliotheken.nl/doc/thes/p075301482",
+      "@id": "http://data.bibliotheken.nl/id/thes/p075301482",
       "@type": "Organization",
       "name": [
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
-  "version": "10.4.0",
+  "version": "10.5.0",
   "type": "module",
   "description": "Catalog of Network of Terms datasets",
   "repository": {
@@ -35,7 +35,7 @@
     "jsonld-streaming-parser": "^5.0.0",
     "rdf-data-factory": "^2.0.2",
     "rdf-ext": "^2.5.2",
-    "rdf-validate-shacl": "^0.5.6"
+    "rdf-validate-shacl": "^0.5.7"
   },
   "bugs": {
     "url": "https://github.com/netwerk-digitaal-erfgoed/network-of-terms-catalog/issues"