fix: no DatasetExt

hypermedia-app · Sep 14, 2023 · c613635 · c613635
1 parent 3808bc9
commit c613635
Show file tree

Hide file tree

Showing 4 changed files with 147 additions and 19 deletions.
diff --git a/.changeset/grumpy-spies-matter.md b/.changeset/grumpy-spies-matter.md
@@ -0,0 +1,5 @@
+---
+"@hydrofoil/resource-store": patch
+---
+
+DatasetExt API was used
diff --git a/packages/store/index.ts b/packages/store/index.ts
@@ -9,6 +9,7 @@ import { StreamClient } from 'sparql-http-client/StreamClient'
 import { ASK, CONSTRUCT, INSERT } from '@tpluscode/sparql-builder'
 import $rdf from '@zazuko/env'
 import { sparql } from '@tpluscode/rdf-string'
+import fromStream from 'rdf-dataset-ext/fromStream.js'
 
 /**
  * Provides functions to work with individual resources.
@@ -49,7 +50,7 @@ export class ResourcePerGraphStore implements ResourceStore {
   async load(term: Term): Promise<GraphPointer<NamedNode>> {
     assertNamedNode(term)
 
-    const dataset = await $rdf.dataset().import(await CONSTRUCT`?s ?p ?o`
+    const dataset = await fromStream($rdf.dataset(), await CONSTRUCT`?s ?p ?o`
       .FROM(term)
       .WHERE`?s ?p ?o`
       .execute(this.client.query))

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -15,6 +15,10 @@
     "@tpluscode/rdf-string": "^1.0.3",
     "@tpluscode/sparql-builder": "^1.1.0",
     "@zazuko/env": "^1.3.1",
-    "sparql-http-client": "^2.4.2"
+    "rdf-dataset-ext": "^1.0.0",
+    "sparql-http-client": "^2.4.2",
+    "@types/clownface": "^2.0.0",
+    "@types/rdfjs__environment": "^0.1.7",
+    "@types/rdfjs__formats-common": "^3.1.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1749,13 +1749,20 @@
   resolved "https://registry.yarnpkg.com/@rdfjs/to-ntriples/-/to-ntriples-2.0.0.tgz#ad70822e2ddf068fd1291b505e5c678c17af7a30"
   integrity sha512-nDhpfhx6W6HKsy4HjyLp3H1nbrX1CiUCWhWQwKcYZX1s9GOjcoQTwY7GUUbVec0hzdJDQBR6gnjxtENBDt482Q==
 
-"@rdfjs/types@*", "@rdfjs/types@>=1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@rdfjs/types/-/types-1.0.1.tgz#92908a13bc88c71b349b332f3db19178282d6f4e"
-  integrity sha512-YxVkH0XrCNG3MWeZxfg596GFe+oorTVusmNxRP6ZHTsGczZ8AGvG3UchRNkg3Fy4MyysI7vBAA5YZbESL+VmHQ==
+"@rdfjs/types@*", "@rdfjs/types@>=1.0.1", "@rdfjs/types@^1.0.1":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rdfjs/types/-/types-1.1.0.tgz#098f180b7cccb03bb416c7b4d03baaa9d480e36b"
+  integrity sha512-5zm8bN2/CC634dTcn/0AhTRLaQRjXDZs3QfcAsQKNturHT7XVWcKy/8p3P5gXl+YkZTAmy7T5M/LyiT/jbkENw==
   dependencies:
     "@types/node" "*"
 
+"@rubensworks/saxes@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@rubensworks/saxes/-/saxes-6.0.1.tgz#2f394548493a415c522d2bfd4f12fad67c9a6317"
+  integrity sha512-UW4OTIsOtJ5KSXo2Tchi4lhZqu+tlHrOAs4nNti7CrtB53kAZl3/hyrTi6HkMihxdbDM6m2Zc3swc/ZewEe1xw==
+  dependencies:
+    xmlchars "^2.2.0"
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -1953,7 +1960,14 @@
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4"
   integrity sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==
 
-"@types/clownface@*", "@types/clownface@^1.2.6", "@types/clownface@^1.5.0", "@types/clownface@^1.5.1":
+"@types/clownface@*", "@types/clownface@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/clownface/-/clownface-2.0.1.tgz#125433636a6382fdc7a638bf9b108b665415227c"
+  integrity sha512-zn794UX/fXle6nZLlwrTAcXyq0JOS4dy/nmQFUgMD8gMSS1Fnm/PWRdWl+jOeWZRq+FM94fi0Wvdgub/LFAgcg==
+  dependencies:
+    rdf-js "^4.0.2"
+
+"@types/clownface@^1.2.6", "@types/clownface@^1.5.0", "@types/clownface@^1.5.1":
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/@types/clownface/-/clownface-1.5.1.tgz#54304a6284a652c698716176ebf0344256a27511"
   integrity sha512-jYRGdXZu5BD6gp+Rfml9eAYovhj0Sf2ovufleMS9PEg8Un9Mc+ZbdbHt6nlutsuSk3QEqluTSzkYr1lno2FnHw==
@@ -2082,6 +2096,11 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
+"@types/jsonld@*":
+  version "1.5.9"
+  resolved "https://registry.yarnpkg.com/@types/jsonld/-/jsonld-1.5.9.tgz#aca18d90b91488d15f8b4e941f660da4093be783"
+  integrity sha512-K76ImkErPYL2wGPZpNFSKp6wE+h/APecZLJrU7UfDaGqt/f+D9Rrg1aR7VdRrQ6k5DUNRZ2vn9yACwmpOr9QcA==
+
 "@types/jsonwebtoken@^8.5.8", "@types/jsonwebtoken@^8.5.9":
   version "8.5.9"
   resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz#2c064ecb0b3128d837d2764aa0b117b0ff6e4586"
@@ -2213,13 +2232,40 @@
     "@types/clownface" "*"
     rdf-js "^4.0.2"
 
+"@types/rdfjs__data-model@*":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__data-model/-/rdfjs__data-model-2.0.4.tgz#e2250ac3baea6c467279f6b8d69825a2cc10c4fc"
+  integrity sha512-3FidQ/YmHqp4Yl4ePQNC9B3YE3bWIIXT+YRTl2HfO1u/HD4GyUjk4sWlJscqKg4g6Cvzd3KMYpRL8TRv2CRdNw==
+  dependencies:
+    "@rdfjs/types" "^1.0.1"
+
+"@types/rdfjs__dataset@*":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__dataset/-/rdfjs__dataset-2.0.3.tgz#90f7296a9e52462db44688136a72a277d4ae32b7"
+  integrity sha512-VjdsE3qkeZBXij24lsN/Revdf6lQsyTBK1SYgNbixrt/8RHMrNGtLfH8WAXAnxtC7lCJJ7+CUmpuhwEVDwIvLA==
+  dependencies:
+    "@rdfjs/types" "*"
+
 "@types/rdfjs__dataset@^1":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/rdfjs__dataset/-/rdfjs__dataset-1.0.5.tgz#2338ed702e5b2a7fd04690d6a76affa80f049cf6"
   integrity sha512-8OBC9Kr/ZSgNoUTe5mHTDPHaPt8Xen4XbYfqcbYv56d+4WdKliHXaFmFc0L4I5vsynE5JGu21Hvg2zWgX1Az6Q==
   dependencies:
     rdf-js "^4.0.2"
 
+"@types/rdfjs__environment@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__environment/-/rdfjs__environment-0.1.7.tgz#4b3248b04679b27116b94d10413d73bc25f95b42"
+  integrity sha512-rvcIFCVx5Hwhov5sgEGs57eDtnBoS0wU8nfrtXYkzFv/41iYpAuTeoW5XQj13IBzbRgJNdIc1aluKkZRmFu9gw==
+  dependencies:
+    "@rdfjs/types" "*"
+    "@types/rdfjs__data-model" "*"
+    "@types/rdfjs__dataset" "*"
+    "@types/rdfjs__namespace" "*"
+    "@types/rdfjs__sink-map" "*"
+    "@types/rdfjs__term-map" "*"
+    "@types/rdfjs__term-set" "*"
+
 "@types/rdfjs__express-handler@*", "@types/rdfjs__express-handler@^1.1.6":
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/@types/rdfjs__express-handler/-/rdfjs__express-handler-1.1.6.tgz#3e7faa1f762f21d9cfd69eab2ece1313442ec90f"
@@ -2229,13 +2275,18 @@
     "@types/rdfjs__formats-common" "*"
     rdf-js "^4.0.2"
 
-"@types/rdfjs__formats-common@*":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/rdfjs__formats-common/-/rdfjs__formats-common-2.0.1.tgz#7d3226a6c2a3440f9f040e4bee502d7525b9a0b4"
-  integrity sha512-Gnh6t8dmdbchz1Ka7PiRIpTm61LU+RJfk5Ketog4K8cUFj5HE+Wmu6PuOvArp00QpQuLsD1PWth/+Ht9tGu2Zw==
+"@types/rdfjs__formats-common@*", "@types/rdfjs__formats-common@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__formats-common/-/rdfjs__formats-common-3.1.0.tgz#088cd1c0465e024192e783516e532ac4cfbd1f4a"
+  integrity sha512-9Hk275paHAu8oB6WSOO8zxQtap+RjIA3ZAQFlW+Cz+d5Z96/rmMz3sg80zUHHrdaHFvKe/VHuu69GeKPx8LLgw==
   dependencies:
-    "@types/rdf-js" "*"
+    "@types/rdfjs__parser-jsonld" "*"
+    "@types/rdfjs__parser-n3" "*"
+    "@types/rdfjs__serializer-jsonld" "*"
+    "@types/rdfjs__serializer-ntriples" "*"
     "@types/rdfjs__sink-map" "*"
+    rdf-js "^4.0.2"
+    rdfxml-streaming-parser ">=2"
 
 "@types/rdfjs__namespace@*", "@types/rdfjs__namespace@^2.0.2":
   version "2.0.5"
@@ -2251,34 +2302,77 @@
   dependencies:
     rdf-js "^4.0.2"
 
+"@types/rdfjs__parser-jsonld@*":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__parser-jsonld/-/rdfjs__parser-jsonld-2.1.1.tgz#c839dde5caee095cf34b9b8ad310f387371e3c51"
+  integrity sha512-9oGUJG3f9MBviuvc3KVrRt8/4TD4CsVp0NRryKrSngj34P6ccoaRPeDyB035MNlA1Zv+yo7ANZ1JtoxMDYa1jA==
+  dependencies:
+    "@types/jsonld" "*"
+    rdf-js "^4.0.2"
+
+"@types/rdfjs__parser-n3@*":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__parser-n3/-/rdfjs__parser-n3-2.0.1.tgz#5a8d6169d8000980ddffa779e3916fea84c2c2a3"
+  integrity sha512-IPA04Q5LutRlFy9Kz1x48uqj6UaPd5rWandyBww1wj7xzwrCl1Yp3xTVkx7DnWP6o/kYd527/KHKsVkNi4tA9g==
+  dependencies:
+    rdf-js "^4.0.2"
+
+"@types/rdfjs__serializer-jsonld@*":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__serializer-jsonld/-/rdfjs__serializer-jsonld-2.0.0.tgz#15295132d62c7683d8c70074d42107d0a3776c9a"
+  integrity sha512-UQW8CRWygXdhTUnsFMgVkzSOqoLvY0jbhKaNtv//2s8+6yurRtln73kEkM34WrUHepwFmNbZ26prKimbgdDSVQ==
+  dependencies:
+    rdf-js "^4.0.2"
+
+"@types/rdfjs__serializer-ntriples@*":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__serializer-ntriples/-/rdfjs__serializer-ntriples-2.0.1.tgz#c36891133077c6aecb77da44fb254c1112783bf0"
+  integrity sha512-KkMJ1IlKL919G/b4L7DNA+dTUk4OMGtTfDwY9lVVLMd9+fuHRTfwtFuFRuUSzoSaD9Km8DMJj3Q6bDP3Rx5Aww==
+  dependencies:
+    rdf-js "^4.0.2"
+
 "@types/rdfjs__sink-map@*":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/rdfjs__sink-map/-/rdfjs__sink-map-1.0.0.tgz#347351314933ab40b0089e3c64e42eea24ec054b"
   integrity sha512-yci4F5SciD8W8d7elmWYaMv2igiz7cGzga/3LWRKTjA5xW8C22CGUWL7/4nwq9YYpSV9DyNA+21rOxBuGDQQcA==
   dependencies:
     "@types/rdf-js" "*"
 
+"@types/rdfjs__term-map@*":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__term-map/-/rdfjs__term-map-2.0.5.tgz#6295e444fd7b495a9d70c0a34cdd0ddaf0b26664"
+  integrity sha512-15IRpyv0woniH5ALBjCrJX4VJqtxzs2ic02ET/ydbjSV+RRIctKxCDeQn2boXUFw6WNQycAmR+z54qIvb5Xo5g==
+  dependencies:
+    "@rdfjs/types" "*"
+
 "@types/rdfjs__term-map@^1":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/rdfjs__term-map/-/rdfjs__term-map-1.0.2.tgz#c135bf857888e0516c7ec1b3dc2b82e0f5ad1a3a"
   integrity sha512-Ae674zmrAHh9zl4uLL9cGdYt77ugUOMIvn0z+uA6RHOwBQZn1LrXcjGK37cBwbxvw7bZ0NYPtcDbn5Vs8f/+ZQ==
   dependencies:
     rdf-js "^4.0.2"
 
+"@types/rdfjs__term-set@*":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rdfjs__term-set/-/rdfjs__term-set-2.0.4.tgz#7e9c6e9782c9d2dfabc2de898bb2b6a6772f798f"
+  integrity sha512-AJQ7QOUtI5O0x6DRe+kujcCKlUfrliViBdm+hg4UKiGVk5K9QxZQIlYz85pSG9811pggeaaBr9SR/lrL8TDrfw==
+  dependencies:
+    "@rdfjs/types" "*"
+
 "@types/rdfjs__term-set@^1.0.1":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@types/rdfjs__term-set/-/rdfjs__term-set-1.0.3.tgz#d44c222d9f12642274e68a7b42673209cab70366"
   integrity sha512-+BNhhBuDeYwR7yNDetqkaTbHIZ1Tt++vSfuzOdFGORxSLs1bxSl6Ae31jA2E+ePgZGbKRSGjLlWyUv1k7krjww==
   dependencies:
     rdf-js "^4.0.2"
 
-"@types/readable-stream@*":
-  version "2.3.14"
-  resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.14.tgz#1282cdc03a1fc9ed52982aa8f0553d7c251070b9"
-  integrity sha512-8jQ5Mp7bsDJEnW/69i6nAaQMoLwAVJVc7ZRAVTrdh/o6XueQsX38TEvKuYyoQj76/mg7WdlRfMrtl9pDLCJWsg==
+"@types/readable-stream@*", "@types/readable-stream@^2.3.13":
+  version "2.3.15"
+  resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.15.tgz#3d79c9ceb1b6a57d5f6e6976f489b9b5384321ae"
+  integrity sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==
   dependencies:
     "@types/node" "*"
-    safe-buffer "*"
+    safe-buffer "~5.1.1"
 
 "@types/semver@^6.0.0":
   version "6.2.3"
@@ -6806,6 +6900,20 @@ rdf-web-access-control@^1.3.2:
     "@tpluscode/rdf-ns-builders" "^2.0.0"
     "@tpluscode/sparql-builder" "^0.3.22"
 
+rdfxml-streaming-parser@>=2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/rdfxml-streaming-parser/-/rdfxml-streaming-parser-2.2.3.tgz#ca362b5557068b37334e44790912e7ca5b089a1a"
+  integrity sha512-HoH8urnga+YQ5sDY9ufRb0wg6FvwR284sSXpZ+fJE5X5Oej6dfzkFer81uBNZzyNmzJR1TpMYMznyXEjPMLhCA==
+  dependencies:
+    "@rdfjs/types" "*"
+    "@rubensworks/saxes" "^6.0.1"
+    "@types/readable-stream" "^2.3.13"
+    buffer "^6.0.3"
+    rdf-data-factory "^1.1.0"
+    readable-stream "^4.0.0"
+    relative-to-absolute-iri "^1.0.0"
+    validate-iri "^1.0.0"
+
 rdfxml-streaming-parser@^1.3.6, rdfxml-streaming-parser@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/rdfxml-streaming-parser/-/rdfxml-streaming-parser-1.5.0.tgz#485af3a01abc2dc49149b8758da9a12351d34348"
@@ -6888,7 +6996,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.2.2, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^4.2.0:
+readable-stream@^4.0.0, readable-stream@^4.2.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.4.2.tgz#e6aced27ad3b9d726d8308515b9a1b98dc1b9d13"
   integrity sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==
@@ -7099,7 +7207,7 @@ rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@*, safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -8076,6 +8184,11 @@ valid-url@^1.0.9:
   resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"
   integrity sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA=
 
+validate-iri@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/validate-iri/-/validate-iri-1.0.1.tgz#4f7289a479e2ed96d3b8b613e12674c725fbb29b"
+  integrity sha512-gLXi7351CoyVVQw8XE5sgpYawRKatxE7kj/xmCxXOZS1kMdtcqC0ILIqLuVEVnAUQSL/evOGG3eQ+8VgbdnstA==
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -8222,6 +8335,11 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
 xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"