@netwerk-digitaal-erfgoed/network-of-terms-catalog 9.19.3 → 10.0.0

package/build/getCatalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getCatalog.d.ts","sourceRoot":"","sources":["../src/getCatalog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAKpC,OAAO,EACL,OAAO,EAOR,MAAM,kDAAkD,CAAC;AAM1D,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAMhE;AAED,wBAAsB,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAsGlE;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CASrE;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAQ/D"}
+{"version":3,"file":"getCatalog.d.ts","sourceRoot":"","sources":["../src/getCatalog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAKpC,OAAO,EACL,OAAO,EAOR,MAAM,kDAAkD,CAAC;AAK1D,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAMhE;AAmFD,wBAAsB,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CA4DlE;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CASrE;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAQ/D"}

package/build/getCatalog.js

@@ -6,83 +6,107 @@ import { globby } from 'globby';
 import { storeStream } from 'rdf-store-stream';
 import { Catalog, Dataset, Feature, FeatureType, IRI, Organization, SparqlDistribution, } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
 import { fileURLToPath } from 'url';
-import { DataFactory } from 'rdf-data-factory';
-import { BindingsFactory } from '@comunica/utils-bindings-factory';
+import { ldkit, rdf, schema } from 'ldkit/namespaces';
+import { createLens } from 'ldkit';
 export async function getCatalog(path) {
     const directory = (path ?? fileURLToPath(new URL('../catalog', import.meta.url))).replace(/\\/g, '/'); // Windows compatibility.
     const store = await fromFiles(directory);
     return fromStore(store);
 }
+const catalogSchema = {
+    '@type': schema.Dataset,
+    name: {
+        '@id': schema.name,
+        '@multilang': true,
+    },
+    alternateName: {
+        '@id': schema.alternateName,
+        '@multilang': true,
+        '@optional': true,
+    },
+    description: {
+        '@id': schema.description,
+        '@multilang': true,
+    },
+    inLanguage: {
+        '@id': schema.inLanguage,
+        '@array': true,
+    },
+    genres: {
+        '@id': schema.genre,
+        '@array': true,
+    },
+    creator: {
+        '@id': schema.creator,
+        '@schema': {
+            '@type': schema.Organization,
+            name: {
+                '@id': schema.name,
+                '@multilang': true,
+            },
+            alternateName: {
+                '@id': schema.alternateName,
+                '@multilang': true,
+            },
+        },
+    },
+    distribution: {
+        '@id': schema.distribution,
+        '@schema': {
+            encodingFormat: schema.encodingFormat,
+            contentUrl: schema.contentUrl,
+            potentialAction: {
+                '@array': true,
+                '@id': schema.potentialAction,
+                '@schema': {
+                    // '@type': schema.Action,
+                    types: {
+                        '@id': rdf.type,
+                        '@type': ldkit.IRI,
+                        '@array': true,
+                    },
+                    query: {
+                        '@id': schema.query,
+                        '@optional': true,
+                    },
+                    target: {
+                        '@id': schema.target,
+                        '@optional': true,
+                        '@schema': {
+                            actionApplication: {
+                                '@id': schema.actionApplication,
+                                '@schema': {
+                                    '@type': schema.SoftwareApplication,
+                                },
+                            },
+                            urlTemplate: {
+                                '@id': schema.urlTemplate,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    },
+    mainEntityOfPage: schema.mainEntityOfPage,
+    url: schema.url,
+};
+const engine = new QueryEngine();
 export async function fromStore(store) {
-    // Collect all properties for SELECT and GROUP BY so we can flatten the schema:url values into a single value.
-    const properties = '?dataset ?name ?description ?creator ?creatorName ?creatorAlternateName ?distribution ?endpointUrl ?searchQuery ?lookupQuery ?reconciliationUrlTemplate ?alternateName ?mainEntityOfPage';
-    const query = `
-      PREFIX schema: <http://schema.org/>
-        SELECT ${properties} 
-            (GROUP_CONCAT(?genre) as ?genre)
-            (GROUP_CONCAT(DISTINCT ?url) as ?url)
-            (GROUP_CONCAT(DISTINCT ?inLanguage) as ?inLanguage) 
-        WHERE {
-          ?dataset a schema:Dataset ;
-            schema:name ?name ;
-            schema:description ?description ;
-            schema:genre ?genre ;
-            schema:inLanguage ?inLanguage ;
-            schema:creator ?creator ;
-            schema:distribution ?distribution ;
-            schema:url ?url ;
-            schema:mainEntityOfPage ?mainEntityOfPage .
-          ?creator schema:name ?creatorName ;
-            schema:alternateName ?creatorAlternateName .
-          ?distribution schema:encodingFormat "application/sparql-query" ;
-            schema:contentUrl ?endpointUrl ;
-            schema:potentialAction
-                [a schema:SearchAction ; schema:query ?searchQuery ] ,
-                [a schema:FindAction ; schema:query ?lookupQuery ] .
-            OPTIONAL { 
-                ?distribution schema:potentialAction/schema:target ?entryPoint .
-                ?entryPoint schema:actionApplication ?reconciliationIri ;
-                    schema:urlTemplate ?reconciliationUrlTemplate .
-            }
-          OPTIONAL { ?dataset schema:alternateName ?alternateName . }
-        }
-        GROUP BY ${properties}
-        ORDER BY LCASE(?name)`;
-    const bindingsStream = await new QueryEngine().queryBindings(query, {
+    const lens = createLens(catalogSchema, {
         sources: [store],
-        initialBindings: bindingsFactory.fromRecord({
-            reconciliationIri: dataFactory.namedNode(FeatureType.RECONCILIATION),
-        }),
-    });
-    const promise = new Promise((resolve, reject) => {
-        const datasets = [];
-        bindingsStream.on('data', (bindings) => {
-            datasets.push(new Dataset(new IRI(bindings.get('dataset').value), bindings.get('name').value, bindings.get('description').value, bindings
-                .get('genre')
-                .value.split(' ') // The single value is space-delineated.
-                .map((genre) => new IRI(genre)), bindings
-                .get('url')
-                .value.split(' ') // The single value is space-delineated.
-                .map((url) => new IRI(url)), bindings.get('mainEntityOfPage').value, bindings.get('inLanguage').value.split(' '), // The single value is space-delineated.
-            [
-                new Organization(new IRI(bindings.get('creator').value), bindings.get('creatorName').value, bindings.get('creatorAlternateName').value),
-            ], [
-                new SparqlDistribution(new IRI(bindings.get('distribution').value), new IRI(bindings.get('endpointUrl').value), bindings.get('searchQuery').value, bindings.get('lookupQuery').value, [
-                    ...(bindings.has('reconciliationUrlTemplate')
-                        ? [
-                            new Feature(FeatureType.RECONCILIATION, new URL(bindings
-                                .get('reconciliationUrlTemplate')
-                                .value.replace('{dataset}', bindings.get('dataset').value.replace('#', '%23') // Escape # in URL.
-                            ))),
-                        ]
-                        : []),
-                ]),
-            ], bindings.get('alternateName')?.value));
-        });
-        bindingsStream.on('end', () => resolve(datasets));
-        bindingsStream.on('error', () => reject);
+        engine,
     });
-    return new Catalog(await promise);
+    const datasets = await lens.find(); // where Only makes it slower.
+    return new Catalog(datasets.map(dataset => new Dataset(new IRI(dataset.$id), dataset.name, dataset.description, dataset.genres.map(genre => new IRI(genre)), [new IRI(dataset.url)], dataset.mainEntityOfPage, dataset.inLanguage, [
+        new Organization(new IRI(dataset.creator.$id), dataset.creator.name, dataset.creator.alternateName),
+    ], [
+        new SparqlDistribution(new IRI(dataset.distribution.$id), new IRI(dataset.distribution.contentUrl), dataset.distribution.potentialAction.filter(action => action.types.includes(schema.SearchAction))[0].query, dataset.distribution.potentialAction.filter(action => action.types.includes(schema.FindAction))[0].query, dataset.distribution.potentialAction
+            .filter(action => action.target?.actionApplication.$id ===
+            'https://reconciliation-api.github.io/specs/latest/')
+            .map(reconciliation => new Feature(FeatureType.RECONCILIATION, new URL(reconciliation.target.urlTemplate.replace('{dataset}', dataset.$id.replace('#', '%23') // Escape # in URL.
+        ))))),
+    ], dataset.alternateName)));
 }
 /**
  * Return a separate RDF.Store for each catalog file because merging them into a single store
@@ -138,6 +162,4 @@ class SubstituteCredentialsFromEnvironmentVariables extends Transform {
         callback();
     }
 }
-const dataFactory = new DataFactory();
-const bindingsFactory = new BindingsFactory(dataFactory);
 //# sourceMappingURL=getCatalog.js.map

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/catalog/datasets/aat-materials.jsonld

@@ -1,14 +1,22 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "http://vocab.getty.edu/aat#materials",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Art & Architecture Thesaurus - materials"
+    },
     {
       "@language": "nl",
       "@value": "Art & Architecture Thesaurus - materialen"
     }
   ],
   "alternateName": [
+    {
+      "@language": "en",
+      "@value": "AAT - materials"
+    },
     {
       "@language": "nl",
       "@value": "AAT - materialen"
@@ -31,6 +39,10 @@
     "https://www.getty.edu/research/tools/vocabularies/aat/about.html"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Selection of AAT terms for describing materials in architectural, art and cultural-historical collections"
+    },
     {
       "@language": "nl",
       "@value": "Selectie van AAT termen voor het beschrijven van materialen in architectuur-, kunst- en cultuurhistorische collecties"
@@ -41,15 +53,17 @@
     {
       "@id": "http://vocab.getty.edu/aat/sparql/materials",
       "@type": "DataDownload",
-      "contentUrl": "http://vocab.getty.edu/sparql",
+      "contentUrl": "https://vocab.getty.edu/sparql",
       "encodingFormat": "application/sparql-query",
       "potentialAction": [
         {
           "@type": "SearchAction",
+          "name": "search",
           "query": "file://catalog/queries/search/aat-materials.rq"
         },
         {
           "@type": "FindAction",
+          "name": "lookup",
           "query": "file://catalog/queries/lookup/aat.rq"
         },
         {

package/catalog/datasets/aat-processes-and-techniques.jsonld

@@ -1,14 +1,22 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "http://vocab.getty.edu/aat#processes-and-techniques",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Art & Architecture Thesaurus - processes and techniques"
+    },
     {
       "@language": "nl",
       "@value": "Art & Architecture Thesaurus - processen en technieken"
     }
   ],
   "alternateName": [
+    {
+      "@language": "en",
+      "@value": "AAT - processes and techniques"
+    },
     {
       "@language": "nl",
       "@value": "AAT - processen en technieken"
@@ -31,6 +39,10 @@
     "https://www.getty.edu/research/tools/vocabularies/aat/about.html"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Selection of AAT terms for describing processes and techniques in architectural, art and cultural-historical collections"
+    },
     {
       "@language": "nl",
       "@value": "Selectie van AAT termen voor het beschrijven van processen en technieken in architectuur-, kunst- en cultuurhistorische collecties"

package/catalog/datasets/aat-styles-and-periods.jsonld

@@ -1,14 +1,22 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "http://vocab.getty.edu/aat#styles-and-periods",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Art & Architecture Thesaurus - styles and periods"
+    },
     {
       "@language": "nl",
       "@value": "Art & Architecture Thesaurus - stijlen en periodes"
     }
   ],
   "alternateName": [
+    {
+      "@language": "en",
+      "@value": "AAT - styles and periods"
+    },
     {
       "@language": "nl",
       "@value": "AAT - stijlen en periodes"
@@ -34,6 +42,10 @@
     "https://www.getty.edu/research/tools/vocabularies/aat/about.html"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Selection of AAT terms for describing styles in architectural, art and cultural-historical collections"
+    },
     {
       "@language": "nl",
       "@value": "Selectie van AAT termen voor het beschrijven van stijlen en periodes in architectuur-, kunst- en cultuurhistorische collecties"

package/catalog/datasets/aat.jsonld

@@ -1,17 +1,25 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "http://vocab.getty.edu/aat",
   "@type": "Dataset",
   "name": [
     {
       "@language": "en",
       "@value": "Art & Architecture Thesaurus"
+    },
+    {
+      "@language": "nl",
+      "@value": "Art & Architecture Thesaurus"
     }
   ],
   "alternateName": [
     {
       "@language": "en",
       "@value": "AAT"
+    },
+    {
+      "@language": "nl",
+      "@value": "AAT"
     }
   ],
   "genre": [
@@ -52,6 +60,10 @@
     "https://www.getty.edu/research/tools/vocabularies/aat/about.html"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Subjects for describing architectural, art and cultural-historical collections"
+    },
     {
       "@language": "nl",
       "@value": "Onderwerpen voor het beschrijven van architectuur-, kunst- en cultuurhistorische collecties"

package/catalog/datasets/abr.jsonld

@@ -1,14 +1,22 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "https://data.cultureelerfgoed.nl/term/id/abr",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Archaeological Basic Register"
+    },
     {
       "@language": "nl",
       "@value": "Archeologisch Basisregister"
     }
   ],
   "alternateName": [
+    {
+      "@language": "en",
+      "@value": "ABR"
+    },
     {
       "@language": "nl",
       "@value": "ABR"

package/catalog/datasets/adamlink-adressen.jsonld

@@ -1,8 +1,12 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "https://adamlink.nl/geo/addresses/start/",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Adamlink: historical addresses in Amsterdam"
+    },
     {
       "@language": "nl",
       "@value": "Adamlink: historische adressen in Amsterdam"
@@ -25,6 +29,10 @@
     "https://adamlink.nl"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Historical addresses in Amsterdam"
+    },
     {
       "@language": "nl",
       "@value": "Historische adressen in Amsterdam"

package/catalog/datasets/adamlink-straten.jsonld

@@ -1,8 +1,12 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "https://adamlink.nl/geo/streets/list",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Adamlink: streets in Amsterdam"
+    },
     {
       "@language": "nl",
       "@value": "Adamlink: straten in Amsterdam"
@@ -25,6 +29,10 @@
     "https://adamlink.nl"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Streets in Amsterdam"
+    },
     {
       "@language": "nl",
       "@value": "Straten in Amsterdam"

package/catalog/datasets/brabantse-gebouwen.jsonld

@@ -1,8 +1,12 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "https://data.brabantcloud.nl/gebouwen",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Brabants buildings"
+    },
     {
       "@language": "nl",
       "@value": "Brabantse gebouwen"
@@ -25,6 +29,10 @@
     "https://www.brabantcloud.nl/page/787/brabantse-kloosters-als-termenlijst"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Buildings in the province of Gebouwen in de provincie of North Brabant, as yet with a religious function such as monasteries"
+    },
     {
       "@language": "nl",
       "@value": "Gebouwen in de provincie Noord-Brabant, vooralsnog met een religieuze functie, zoals kloosters"

package/catalog/datasets/brinkman.jsonld

@@ -1,14 +1,22 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "http://data.bibliotheken.nl/id/dataset/brinkman",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Brinkman subjects"
+    },
     {
       "@language": "nl",
       "@value": "Brinkman trefwoordenthesaurus"
     }
   ],
   "alternateName": [
+    {
+      "@language": "en",
+      "@value": "Brinkman"
+    },
     {
       "@language": "nl",
       "@value": "Brinkman"
@@ -31,6 +39,10 @@
     "https://data.bibliotheken.nl/doc/dataset/brinkman"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Subjects that the National Library of the Netherlands assigns to publications"
+    },
     {
       "@language": "nl",
       "@value": "Onderwerpen die de Koninklijke Bibliotheek aan publicaties toekent"

package/catalog/datasets/cht-materials.jsonld

@@ -1,14 +1,22 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "https://data.cultureelerfgoed.nl/term/id/cht#materials",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Cultural-historical Thesaurus - Materials"
+    },
     {
       "@language": "nl",
       "@value": "Cultuurhistorische Thesaurus - Materialen"
     }
   ],
   "alternateName": [
+    {
+      "@language": "en",
+      "@value": "CHT - materials"
+    },
     {
       "@language": "nl",
       "@value": "CHT - materialen"
@@ -31,9 +39,13 @@
     "https://kennis.cultureelerfgoed.nl/index.php/Thesauri_bij_de_RCE_-_Cultuurhistorische_Thesaurus"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Subjects for describing material features of cultural heritage"
+    },
     {
       "@language": "nl",
-      "@value": "Onderwerpen voor het beschrijven van materiaal kenmerken van cultureel erfgoed objecten."
+      "@value": "Onderwerpen voor het beschrijven van materiaalkenmerken van cultureel erfgoed"
     }
   ],
   "inLanguage": "nl",

package/catalog/datasets/cht-styles-and-periods.jsonld

@@ -1,14 +1,22 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "https://data.cultureelerfgoed.nl/term/id/cht#styles-and-periodes",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Cultural-historical Thesaurus - Styles and periods"
+    },
     {
       "@language": "nl",
       "@value": "Cultuurhistorische Thesaurus - Stijlen en periodes"
     }
   ],
   "alternateName": [
+    {
+      "@language": "en",
+      "@value": "CHT - styles and periods"
+    },
     {
       "@language": "nl",
       "@value": "CHT - stijlen en periodes"
@@ -34,9 +42,13 @@
     "https://kennis.cultureelerfgoed.nl/index.php/Thesauri_bij_de_RCE_-_Cultuurhistorische_Thesaurus"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Subjects for describing stylistic and periodical features of cultural heritage"
+    },
     {
       "@language": "nl",
-      "@value": "Onderwerpen voor het beschrijven van stijl en periode kenmerken van cultureel erfgoed objecten."
+      "@value": "Onderwerpen voor het beschrijven van stijl- en periodekenmerken van cultureel erfgoed objecten."
     }
   ],
   "inLanguage": "nl",

package/catalog/datasets/cht.jsonld

@@ -1,14 +1,22 @@
 {
-  "@context": "https://schema.org/docs/jsonldcontext.jsonld",
+  "@context": "https://schema.org",
   "@id": "https://data.cultureelerfgoed.nl/term/id/cht",
   "@type": "Dataset",
   "name": [
+    {
+      "@language": "en",
+      "@value": "Cultural-historical Thesaurus"
+    },
     {
       "@language": "nl",
       "@value": "Cultuurhistorische Thesaurus"
     }
   ],
   "alternateName": [
+    {
+      "@language": "en",
+      "@value": "CHT"
+    },
     {
       "@language": "nl",
       "@value": "CHT"
@@ -55,6 +63,10 @@
     "https://kennis.cultureelerfgoed.nl/index.php/Thesauri_bij_de_RCE_-_Cultuurhistorische_Thesaurus"
   ],
   "description": [
+    {
+      "@language": "en",
+      "@value": "Subjects for describing cultural heritage"
+    },
     {
       "@language": "nl",
       "@value": "Onderwerpen voor het beschrijven van cultureel erfgoed"