@netwerk-digitaal-erfgoed/network-of-terms-catalog 5.10.2 → 6.0.2
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.
- package/build/catalog.d.ts +1 -1
- package/build/catalog.d.ts.map +1 -1
- package/build/catalog.js +24 -8
- package/build/catalog.js.map +1 -1
- package/catalog/datasets/abr.jsonld +2 -1
- package/catalog/datasets/adamlink-straten.jsonld +2 -1
- package/catalog/datasets/brinkman.jsonld +2 -1
- package/catalog/datasets/cht.jsonld +2 -1
- package/catalog/datasets/eurovoc.jsonld +2 -1
- package/catalog/datasets/gtaa-classificatie.jsonld +2 -1
- package/catalog/datasets/gtaa-genres.jsonld +2 -1
- package/catalog/datasets/gtaa-geografische-namen.jsonld +2 -1
- package/catalog/datasets/gtaa-namen.jsonld +2 -1
- package/catalog/datasets/gtaa-onderwerpen-beng.jsonld +2 -1
- package/catalog/datasets/gtaa-onderwerpen.jsonld +2 -1
- package/catalog/datasets/gtaa-persoonsnamen.jsonld +2 -1
- package/catalog/datasets/muziekschatten-onderwerpen.jsonld +2 -1
- package/catalog/datasets/muziekschatten-personen.jsonld +2 -1
- package/catalog/datasets/mw-genresstijlen.jsonld +2 -1
- package/catalog/datasets/mw-personengroepen.jsonld +2 -1
- package/catalog/datasets/nmvw.jsonld +2 -1
- package/catalog/datasets/nta.jsonld +2 -1
- package/catalog/datasets/rkdartists.jsonld +2 -1
- package/catalog/datasets/stcn-drukkers.jsonld +2 -1
- package/catalog/datasets/wo2thesaurus.jsonld +2 -1
- package/catalog/queries/search/wikidata-entities-places.rq +6 -2
- package/package.json +3 -3
package/build/catalog.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as RDF from '
|
|
1
|
+
import * as RDF from '@rdfjs/types';
|
|
2
2
|
import { Catalog } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
|
|
3
3
|
export declare function defaultCatalog(): Promise<Catalog>;
|
|
4
4
|
export declare function fromStore(store: RDF.Store[]): Promise<Catalog>;
|
package/build/catalog.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAMpC,OAAO,EACL,OAAO,EAOR,MAAM,kDAAkD,CAAC;AAM1D,wBAAsB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAQvD;AAED,wBAAsB,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAuFpE;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAIvE;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAU/D"}
|
package/build/catalog.js
CHANGED
|
@@ -5,8 +5,10 @@ import { Transform } from 'stream';
|
|
|
5
5
|
import { dirname, resolve } from 'path';
|
|
6
6
|
import { globby } from 'globby';
|
|
7
7
|
import { storeStream } from 'rdf-store-stream';
|
|
8
|
-
import { Catalog, Dataset, Feature, IRI, Organization, SparqlDistribution, } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
|
|
8
|
+
import { Catalog, Dataset, Feature, FeatureType, IRI, Organization, SparqlDistribution, } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
|
|
9
9
|
import { fileURLToPath } from 'url';
|
|
10
|
+
import { DataFactory } from 'rdf-data-factory';
|
|
11
|
+
import { BindingsFactory } from '@comunica/bindings-factory';
|
|
10
12
|
export async function defaultCatalog() {
|
|
11
13
|
const directory = resolve(dirname(fileURLToPath(import.meta.url)), '../', 'catalog/');
|
|
12
14
|
const store = await fromFiles(directory);
|
|
@@ -14,10 +16,10 @@ export async function defaultCatalog() {
|
|
|
14
16
|
}
|
|
15
17
|
export async function fromStore(store) {
|
|
16
18
|
// Collect all properties for SELECT and GROUP BY so we can flatten the schema:url values into a single value.
|
|
17
|
-
const properties = '?dataset ?name ?creator ?creatorName ?creatorAlternateName ?distribution ?endpointUrl ?searchQuery ?lookupQuery ?alternateName';
|
|
19
|
+
const properties = '?dataset ?name ?creator ?creatorName ?creatorAlternateName ?distribution ?endpointUrl ?searchQuery ?lookupQuery ?reconciliationUrlTemplate ?alternateName';
|
|
18
20
|
const query = `
|
|
19
21
|
PREFIX schema: <http://schema.org/>
|
|
20
|
-
SELECT ${properties} (GROUP_CONCAT(?url) as ?url)
|
|
22
|
+
SELECT ${properties} (GROUP_CONCAT(?url) as ?url) WHERE {
|
|
21
23
|
?dataset a schema:Dataset ;
|
|
22
24
|
schema:name ?name ;
|
|
23
25
|
schema:creator ?creator ;
|
|
@@ -31,12 +33,19 @@ export async function fromStore(store) {
|
|
|
31
33
|
schema:potentialAction
|
|
32
34
|
[a schema:SearchAction ; schema:query ?searchQuery ] ,
|
|
33
35
|
[a schema:FindAction ; schema:query ?lookupQuery ] .
|
|
34
|
-
OPTIONAL {
|
|
36
|
+
OPTIONAL {
|
|
37
|
+
?distribution schema:potentialAction/schema:target ?entryPoint .
|
|
38
|
+
?entryPoint schema:actionApplication ?reconciliationIri ;
|
|
39
|
+
schema:urlTemplate ?reconciliationUrlTemplate .
|
|
40
|
+
}
|
|
35
41
|
}
|
|
36
42
|
GROUP BY ${properties}
|
|
37
43
|
ORDER BY LCASE(?name)`;
|
|
38
44
|
const bindingsStream = await new QueryEngine().queryBindings(query, {
|
|
39
45
|
sources: store,
|
|
46
|
+
initialBindings: bindingsFactory.fromRecord({
|
|
47
|
+
reconciliationIri: dataFactory.namedNode(FeatureType.RECONCILIATION),
|
|
48
|
+
}),
|
|
40
49
|
});
|
|
41
50
|
const promise = new Promise((resolve, reject) => {
|
|
42
51
|
const datasets = [];
|
|
@@ -48,10 +57,15 @@ export async function fromStore(store) {
|
|
|
48
57
|
.map((url) => new IRI(url)), [
|
|
49
58
|
new Organization(new IRI(bindings.get('creator').value), bindings.get('creatorName').value, bindings.get('creatorAlternateName').value),
|
|
50
59
|
], [
|
|
51
|
-
new SparqlDistribution(new IRI(bindings.get('distribution').value), new IRI(bindings.get('endpointUrl').value), bindings.get('searchQuery').value, bindings.get('lookupQuery').value,
|
|
52
|
-
.
|
|
53
|
-
|
|
54
|
-
|
|
60
|
+
new SparqlDistribution(new IRI(bindings.get('distribution').value), new IRI(bindings.get('endpointUrl').value), bindings.get('searchQuery').value, bindings.get('lookupQuery').value, [
|
|
61
|
+
...(bindings.has('reconciliationUrlTemplate')
|
|
62
|
+
? [
|
|
63
|
+
new Feature(FeatureType.RECONCILIATION, new URL(bindings
|
|
64
|
+
.get('reconciliationUrlTemplate')
|
|
65
|
+
.value.replace('{distribution}', bindings.get('distribution').value))),
|
|
66
|
+
]
|
|
67
|
+
: []),
|
|
68
|
+
]),
|
|
55
69
|
], (_a = bindings.get('alternateName')) === null || _a === void 0 ? void 0 : _a.value));
|
|
56
70
|
});
|
|
57
71
|
bindingsStream.on('end', () => resolve(datasets));
|
|
@@ -113,4 +127,6 @@ class SubstituteCredentialsFromEnvironmentVariables extends Transform {
|
|
|
113
127
|
callback();
|
|
114
128
|
}
|
|
115
129
|
}
|
|
130
|
+
const dataFactory = new DataFactory();
|
|
131
|
+
const bindingsFactory = new BindingsFactory(dataFactory);
|
|
116
132
|
//# sourceMappingURL=catalog.js.map
|
package/build/catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAC,SAAS,EAAoB,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,MAAM,CAAC;AACtC,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,14 +35,18 @@ WHERE {
|
|
|
35
35
|
?item wdt:P17 wd:Q55 .
|
|
36
36
|
|
|
37
37
|
# Filter out Dutch municipalities
|
|
38
|
-
|
|
38
|
+
# deactivated because some places are former municipalities
|
|
39
|
+
# and would be excluded by this filter
|
|
40
|
+
#FILTER NOT EXISTS { ?item wdt:P31 wd:Q2039348 }
|
|
39
41
|
}
|
|
40
42
|
UNION {
|
|
41
43
|
# Select places in Belgium
|
|
42
44
|
?item wdt:P17 wd:Q31 .
|
|
43
45
|
|
|
44
46
|
# Filter out Belgian municipalities
|
|
45
|
-
|
|
47
|
+
# deactivated because some places are former municipalities
|
|
48
|
+
# and would be excluded by this filter
|
|
49
|
+
#FILTER NOT EXISTS { ?item wdt:P31 wd:Q493522}
|
|
46
50
|
}
|
|
47
51
|
|
|
48
52
|
# Filter out agglomerations
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Catalog of Network of Terms datasets",
|
|
6
6
|
"repository": {
|
|
@@ -43,10 +43,10 @@
|
|
|
43
43
|
},
|
|
44
44
|
"homepage": "https://github.com/netwerk-digitaal-erfgoed/network-of-terms-catalog#readme",
|
|
45
45
|
"dependencies": {
|
|
46
|
+
"@comunica/bindings-factory": "^2.2.0",
|
|
46
47
|
"@comunica/query-sparql-rdfjs": "^2.0.6",
|
|
47
|
-
"@netwerk-digitaal-erfgoed/network-of-terms-query": "1.
|
|
48
|
+
"@netwerk-digitaal-erfgoed/network-of-terms-query": "2.1.0",
|
|
48
49
|
"globby": "^13.1.1",
|
|
49
|
-
"rdf-js": "^4.0.2",
|
|
50
50
|
"rdf-parse": "^2.0.0",
|
|
51
51
|
"rdf-store-stream": "^1.1.0"
|
|
52
52
|
}
|