@netwerk-digitaal-erfgoed/network-of-terms-catalog 10.15.3 → 10.15.5

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.
Files changed (9) hide show
  1. package/build/getCatalog.d.ts.map +1 -1
  2. package/build/getCatalog.js +2 -2
  3. package/build/getCatalog.js.map +1 -1
  4. package/catalog/queries/lookup/wikidata.rq +6 -6
  5. package/catalog/queries/search/wikidata-entities-all.rq +14 -16
  6. package/catalog/queries/search/wikidata-entities-persons.rq +13 -17
  7. package/catalog/queries/search/wikidata-entities-places.rq +14 -15
  8. package/catalog/queries/search/wikidata-entities-streets.rq +13 -16
  9. package/package.json +8 -8
package/build/getCatalog.d.ts.map CHANGED
@@ -1 +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,EAMR,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"}
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,EAMR,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,CA6DlE;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 CHANGED
@@ -96,6 +96,7 @@ export async function fromStore(store) {
96
96
  const lens = createLens(catalogSchema, {
97
97
  sources: [store],
98
98
  engine,
99
+ distinctConstruct: true,
99
100
  });
100
101
  const datasets = await lens.find(); // where Only makes it slower.
101
102
  return new Catalog(datasets.map(dataset => new Dataset(dataset.$id, dataset.name, dataset.description, dataset.genres, [dataset.url], dataset.mainEntityOfPage, dataset.inLanguage, [
@@ -104,8 +105,7 @@ export async function fromStore(store) {
104
105
  new SparqlDistribution(dataset.distribution.$id, 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
105
106
  .filter(action => action.target?.actionApplication.$id ===
106
107
  'https://reconciliation-api.github.io/specs/latest/')
107
- .map(reconciliation => new Feature(FeatureType.RECONCILIATION, new URL(reconciliation.target.urlTemplate.replace('{dataset}', dataset.$id.replace('#', '%23') // Escape # in URL.
108
- ))))),
108
+ .map(reconciliation => new Feature(FeatureType.RECONCILIATION, new URL(reconciliation.target.urlTemplate.replace('{dataset}', dataset.$id.replace('#', '%23')))))),
109
109
  ], dataset.alternateName)));
110
110
  }
111
111
  /**
package/build/getCatalog.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCatalog.js","sourceRoot":"","sources":["../src/getCatalog.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getCatalog.js","sourceRoot":"","sources":["../src/getCatalog.ts"],"names":[],"mappings":"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"}
package/catalog/queries/lookup/wikidata.rq CHANGED
@@ -5,9 +5,9 @@ PREFIX wdt: <http://www.wikidata.org/prop/direct/>
5
5
 
6
6
  CONSTRUCT {
7
7
  ?uri a skos:Concept ;
8
- skos:prefLabel ?rdfs_label ;
8
+ skos:prefLabel ?prefLabel ;
9
9
  skos:altLabel ?altLabel ;
10
- skos:scopeNote ?schema_description .
10
+ skos:scopeNote ?description .
11
11
  }
12
12
  WHERE {
13
13
  # For example:
@@ -17,16 +17,16 @@ WHERE {
17
17
  # Street: <http://www.wikidata.org/entity/Q19573969>
18
18
  VALUES ?uri { ?uris }
19
19
 
20
- ?uri rdfs:label ?rdfs_label .
21
- FILTER(LANG(?rdfs_label) = "nl" || LANG(?rdfs_label) = "en")
20
+ ?uri rdfs:label ?prefLabel .
21
+ FILTER(LANG(?prefLabel) = "nl" || LANG(?prefLabel) = "en")
22
22
 
23
23
  OPTIONAL {
24
24
  ?uri skos:altLabel ?altLabel .
25
25
  FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
26
26
  }
27
27
  OPTIONAL {
28
- ?uri schema:description ?schema_description
29
- FILTER(LANG(?schema_description) = "nl" || LANG(?schema_description) = "en")
28
+ ?uri schema:description ?description .
29
+ FILTER(LANG(?description) = "nl" || LANG(?description) = "en")
30
30
  }
31
31
  }
32
32
  LIMIT 1000
package/catalog/queries/search/wikidata-entities-all.rq CHANGED
@@ -7,33 +7,31 @@ PREFIX vrank: <http://purl.org/voc/vrank#>
7
7
  PREFIX wikibase: <http://wikiba.se/ontology#>
8
8
 
9
9
  CONSTRUCT {
10
- # Wikidata seems to have a problem with the short syntax for construct queries
11
- # so always use full syntax: "?s ?p ?o ." else you end up with an empty result list!
12
- ?item a skos:Concept .
13
- ?item skos:prefLabel ?rdfs_label .
14
- ?item skos:altLabel ?altLabel .
15
- ?item skos:scopeNote ?schema_description .
16
- ?item vrank:simpleRank ?score .
10
+ ?item a skos:Concept ;
11
+ skos:prefLabel ?prefLabel ;
12
+ skos:altLabel ?altLabel ;
13
+ skos:scopeNote ?description ;
14
+ vrank:simpleRank ?score .
17
15
  }
18
16
  WHERE {
19
17
  SERVICE wikibase:mwapi {
20
- bd:serviceParam wikibase:endpoint "www.wikidata.org" .
21
- bd:serviceParam wikibase:api "EntitySearch" .
22
- bd:serviceParam mwapi:language "nl" .
23
- bd:serviceParam mwapi:search ?query .
24
- bd:serviceParam wikibase:limit ?limit .
18
+ bd:serviceParam wikibase:endpoint "www.wikidata.org" ;
19
+ wikibase:api "EntitySearch" ;
20
+ wikibase:limit ?limit ;
21
+ mwapi:language "nl" ;
22
+ mwapi:search ?query .
25
23
  ?item wikibase:apiOutputItem mwapi:item .
26
24
  ?ordinal wikibase:apiOrdinal true.
27
25
  }
28
- ?item rdfs:label ?rdfs_label .
29
- FILTER(LANG(?rdfs_label) = "nl" || LANG(?rdfs_label) = "en")
26
+ ?item rdfs:label ?prefLabel .
27
+ FILTER(LANG(?prefLabel) = "nl" || LANG(?prefLabel) = "en")
30
28
  OPTIONAL {
31
29
  ?item skos:altLabel ?altLabel .
32
30
  FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
33
31
  }
34
32
  OPTIONAL {
35
- ?item schema:description ?schema_description
36
- FILTER(LANG(?schema_description) = "nl" || LANG(?schema_description) = "en")
33
+ ?item schema:description ?description .
34
+ FILTER(LANG(?description) = "nl" || LANG(?description) = "en")
37
35
  }
38
36
  BIND(-?ordinal AS ?score)
39
37
  }
package/catalog/queries/search/wikidata-entities-persons.rq CHANGED
@@ -5,29 +5,25 @@ PREFIX schema: <http://schema.org/>
5
5
  PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
6
6
  PREFIX vrank: <http://purl.org/voc/vrank#>
7
7
  PREFIX wikibase: <http://wikiba.se/ontology#>
8
- PREFIX wdt: <http://www.wikidata.org/prop/direct/>
9
8
  PREFIX wd: <http://www.wikidata.org/entity/>
9
+ PREFIX wdt: <http://www.wikidata.org/prop/direct/>
10
10
 
11
11
  CONSTRUCT {
12
- # Wikidata seems to have a problem with the short syntax for construct queries
13
- # so always use full syntax: "?s ?p ?o ." else you end up with an empty result list!
14
- ?item a skos:Concept .
15
- ?item skos:prefLabel ?prefLabel .
16
- ?item skos:altLabel ?altLabel .
17
- ?item skos:scopeNote ?description .
18
- ?item vrank:simpleRank ?score .
12
+ ?item a skos:Concept ;
13
+ skos:prefLabel ?prefLabel ;
14
+ skos:altLabel ?altLabel ;
15
+ skos:scopeNote ?description ;
16
+ vrank:simpleRank ?score .
19
17
  }
20
18
  WHERE {
21
19
  {
22
20
  SELECT DISTINCT ?item ?score WHERE {
23
21
  SERVICE wikibase:mwapi {
24
- bd:serviceParam wikibase:endpoint "www.wikidata.org" .
25
- # Instead of using the "EntitySearch" API we use a more generic text search option
26
- # To avoid noise we will filter the resultset on the occurence of the search string
27
- # in either prefLabel or altLabel
28
- bd:serviceParam wikibase:api "Search" .
29
- bd:serviceParam mwapi:language "nl" .
30
- bd:serviceParam mwapi:srsearch ?query .
22
+ bd:serviceParam wikibase:endpoint "www.wikidata.org" ;
23
+ wikibase:api "Search" ;
24
+ wikibase:limit "once" ; # Disabling continuation improves performance.
25
+ mwapi:language "nl" ;
26
+ mwapi:srsearch ?query .
31
27
  ?item wikibase:apiOutputItem mwapi:title .
32
28
  ?ordinal wikibase:apiOrdinal true.
33
29
  }
@@ -46,10 +42,10 @@ WHERE {
46
42
  }
47
43
  OPTIONAL {
48
44
  ?item skos:altLabel ?altLabel .
49
- FILTER(LANG(?altLabel) = "nl"|| LANG(?altLabel) = "en")
45
+ FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
50
46
  }
51
47
  OPTIONAL {
52
- ?item schema:description ?description
48
+ ?item schema:description ?description .
53
49
  FILTER(LANG(?description) = "nl" || LANG(?description) = "en")
54
50
  }
55
51
  }
package/catalog/queries/search/wikidata-entities-places.rq CHANGED
@@ -4,31 +4,30 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
4
4
  PREFIX schema: <http://schema.org/>
5
5
  PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
6
6
  PREFIX vrank: <http://purl.org/voc/vrank#>
7
- PREFIX wikibase: <http://wikiba.se/ontology#>
8
- PREFIX wdt: <http://www.wikidata.org/prop/direct/>
9
7
  PREFIX wd: <http://www.wikidata.org/entity/>
8
+ PREFIX wdt: <http://www.wikidata.org/prop/direct/>
9
+ PREFIX wikibase: <http://wikiba.se/ontology#>
10
10
 
11
11
  CONSTRUCT {
12
- # Wikidata seems to have a problem with the short syntax for construct queries
13
- # so always use full syntax: "?s ?p ?o ." else you end up with an empty result list!
14
- ?item a skos:Concept .
15
- ?item skos:prefLabel ?prefLabel .
16
- ?item skos:altLabel ?altLabel .
17
- ?item skos:scopeNote ?schema_description .
18
- ?item vrank:simpleRank ?score .
12
+ ?item a skos:Concept ;
13
+ skos:prefLabel ?prefLabel ;
14
+ skos:altLabel ?altLabel ;
15
+ skos:scopeNote ?description ;
16
+ vrank:simpleRank ?score .
19
17
  }
20
18
  WHERE {
21
19
  {
22
20
  SELECT DISTINCT ?item ?score WHERE {
23
21
  SERVICE wikibase:mwapi {
24
- bd:serviceParam wikibase:endpoint "www.wikidata.org" .
22
+ bd:serviceParam wikibase:endpoint "www.wikidata.org" ;
25
23
  # The search seems to be done with a "starts with" function,
26
24
  # where by default the English pref and alt labels are searched.
27
25
  # Setting the required language to something else than "en"
28
26
  # results in an additional search in the pref and alt labels for this language.
29
- bd:serviceParam wikibase:api "EntitySearch" .
30
- bd:serviceParam mwapi:language "nl" .
31
- bd:serviceParam mwapi:search ?query .
27
+ wikibase:api "EntitySearch" ;
28
+ wikibase:limit "once" ; # Disabling continuation improves performance.
29
+ mwapi:language "nl" ;
30
+ mwapi:search ?query .
32
31
  ?item wikibase:apiOutputItem mwapi:item .
33
32
  ?ordinal wikibase:apiOrdinal true.
34
33
  }
@@ -79,7 +78,7 @@ WHERE {
79
78
  FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
80
79
  }
81
80
  OPTIONAL {
82
- ?item schema:description ?schema_description
83
- FILTER(LANG(?schema_description) = "nl" || LANG(?schema_description) = "en")
81
+ ?item schema:description ?description .
82
+ FILTER(LANG(?description) = "nl" || LANG(?description) = "en")
84
83
  }
85
84
  }
package/catalog/queries/search/wikidata-entities-streets.rq CHANGED
@@ -1,16 +1,16 @@
1
1
  PREFIX bd: <http://www.bigdata.com/rdf#>
2
2
  PREFIX mwapi: <https://www.mediawiki.org/ontology#API/>
3
+ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
3
4
  PREFIX schema: <http://schema.org/>
4
5
  PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
5
6
  PREFIX vrank: <http://purl.org/voc/vrank#>
6
- PREFIX wikibase: <http://wikiba.se/ontology#>
7
- PREFIX wdt: <http://www.wikidata.org/prop/direct/>
8
7
  PREFIX wd: <http://www.wikidata.org/entity/>
9
- PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
8
+ PREFIX wdt: <http://www.wikidata.org/prop/direct/>
9
+ PREFIX wikibase: <http://wikiba.se/ontology#>
10
10
 
11
11
  CONSTRUCT {
12
12
  ?item a skos:Concept ;
13
- skos:prefLabel ?streetName ;
13
+ skos:prefLabel ?prefLabel ;
14
14
  skos:altLabel ?altLabel ;
15
15
  skos:scopeNote ?description ;
16
16
  vrank:simpleRank ?score .
@@ -19,14 +19,11 @@ WHERE {
19
19
  {
20
20
  SELECT DISTINCT ?item ?score WHERE {
21
21
  SERVICE wikibase:mwapi {
22
- bd:serviceParam wikibase:endpoint "www.wikidata.org" .
23
- # Instead of using the "EntitySearch" API we use a more generic text search option
24
- # To avoid noise we will filter the resultset on the occurence of the search string
25
- # in either prefLabel or altLabel
26
- bd:serviceParam wikibase:api "Search" .
27
- bd:serviceParam mwapi:language "nl" .
28
-
29
- bd:serviceParam mwapi:srsearch ?query .
22
+ bd:serviceParam wikibase:endpoint "www.wikidata.org" ;
23
+ wikibase:api "Search" ;
24
+ wikibase:limit "once" ; # Disabling continuation improves performance.
25
+ mwapi:language "nl" ;
26
+ mwapi:srsearch ?query .
30
27
  ?item wikibase:apiOutputItem mwapi:title .
31
28
  ?ordinal wikibase:apiOrdinal true.
32
29
  }
@@ -52,15 +49,15 @@ WHERE {
52
49
  #LIMIT#
53
50
  }
54
51
  OPTIONAL {
55
- ?item rdfs:label ?streetName .
56
- FILTER(LANG(?streetName) = "nl" || LANG(?streetName) = "en")
52
+ ?item rdfs:label ?prefLabel .
53
+ FILTER(LANG(?prefLabel) = "nl" || LANG(?prefLabel) = "en")
57
54
  }
58
55
  OPTIONAL {
59
- ?item skos:altLabel ?altLabel
56
+ ?item skos:altLabel ?altLabel .
60
57
  FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
61
58
  }
62
59
  OPTIONAL {
63
- ?item schema:description ?description
60
+ ?item schema:description ?description .
64
61
  FILTER(LANG(?description) = "nl" || LANG(?description) = "en")
65
62
  }
66
63
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
3
- "version": "10.15.3",
3
+ "version": "10.15.5",
4
4
  "type": "module",
5
5
  "description": "Catalog of Network of Terms datasets",
6
6
  "repository": {
@@ -28,10 +28,10 @@
28
28
  "author": "Netwerk Digitaal Erfgoed",
29
29
  "license": "EUPL-1.2",
30
30
  "devDependencies": {
31
- "@comunica/types": "^4.0.2",
31
+ "@comunica/types": "^4.2.0",
32
32
  "@types/n3": "^1.24.2",
33
33
  "@types/rdf-ext": "^2.5.2",
34
- "gts": "^5.3.1",
34
+ "gts": "^6.0.2",
35
35
  "jsonld-streaming-parser": "^5.0.0",
36
36
  "rdf-data-factory": "^2.0.2",
37
37
  "rdf-ext": "^2.5.2",
@@ -42,12 +42,12 @@
42
42
  },
43
43
  "homepage": "https://github.com/netwerk-digitaal-erfgoed/network-of-terms-catalog#readme",
44
44
  "dependencies": {
45
- "@comunica/query-sparql": "^4.1.0",
46
- "@comunica/query-sparql-rdfjs": "^4.1.0",
47
- "@comunica/utils-bindings-factory": "^4.0.2",
48
- "@netwerk-digitaal-erfgoed/network-of-terms-query": "6.2.5",
45
+ "@comunica/query-sparql": "^4.3.0",
46
+ "@comunica/query-sparql-rdfjs": "^4.3.0",
47
+ "@comunica/utils-bindings-factory": "^4.2.0",
48
+ "@netwerk-digitaal-erfgoed/network-of-terms-query": "6.2.6",
49
49
  "globby": "^14.0.2",
50
- "ldkit": "^2.1.1",
50
+ "ldkit": "^2.5.1",
51
51
  "memoize": "^10.0.0",
52
52
  "rdf-parse": "^3.0.0",
53
53
  "rdf-store-stream": "^3.0.0"