From b369577d7ec752f3dbe76201df32a316fd6b297f Mon Sep 17 00:00:00 2001 From: tpluscode Date: Mon, 15 Jan 2024 22:43:38 +0100 Subject: [PATCH 1/2] build(deps): update to RDF/JS Env v1 --- .changeset/long-emus-cry.md | 5 +++ lib/environment.js | 4 +- package-lock.json | 72 +++++++++++++++++++++++++--------- package.json | 6 ++- test/Clownface/addIn.test.js | 2 +- test/Clownface/addList.test.js | 2 +- test/Clownface/addOut.test.js | 2 +- test/Factory.test.js | 6 +-- 8 files changed, 70 insertions(+), 29 deletions(-) create mode 100644 .changeset/long-emus-cry.md diff --git a/.changeset/long-emus-cry.md b/.changeset/long-emus-cry.md new file mode 100644 index 0000000..b05d994 --- /dev/null +++ b/.changeset/long-emus-cry.md @@ -0,0 +1,5 @@ +--- +"clownface": minor +--- + +Adjust to `@rdfjs/environment@v1` (still compatible with v0) diff --git a/lib/environment.js b/lib/environment.js index 5664463..3fd5749 100644 --- a/lib/environment.js +++ b/lib/environment.js @@ -1,6 +1,6 @@ import Environment from '@rdfjs/environment' -import NamespaceFactory from '@rdfjs/environment/NamespaceFactory.js' -import DataFactory from '@rdfjs/environment/DataFactory.js' +import NamespaceFactory from '@rdfjs/namespace/Factory.js' +import DataFactory from '@rdfjs/data-model/Factory.js' export default new Environment([ NamespaceFactory, diff --git a/package-lock.json b/package-lock.json index d957799..84582f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,20 @@ { "name": "clownface", - "version": "2.0.0", + "version": "2.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "clownface", - "version": "2.0.0", + "version": "2.0.1", "license": "MIT", "dependencies": { - "@rdfjs/environment": "^0.1.2" + "@rdfjs/data-model": "^2.0.1", + "@rdfjs/environment": "0 - 1", + "@rdfjs/namespace": "^2.0.0" }, "devDependencies": { "@changesets/cli": "^2.26.1", - "@rdfjs/namespace": "^2.0.0", "@rdfjs/parser-n3": "^2.0.0", "@tpluscode/eslint-config": "^0.4.4", "c8": "^7.14.0", @@ -881,28 +882,21 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-2.0.1.tgz", "integrity": "sha512-hDIaXpUmU/ZdofX/BMFDAchkhN/AjmP5dMCOuVL2VCqWuFjeQxd2KV84E4+7S2Biw8tjEFhPBeQZP7KW+ARV7Q==", + "dev": true, "bin": { "rdfjs-dataset-test": "bin/test.js" } }, "node_modules/@rdfjs/environment": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@rdfjs/environment/-/environment-0.1.2.tgz", - "integrity": "sha512-R4N73kaoaOt3XvgLy2Cb98bJUgMJv/wRsUPGDxeogbtalkENPmo3X5to/rKQEwOjnj+jw+ILzN2webUHb8pvEw==", - "dependencies": { - "@rdfjs/data-model": "^2.0.1", - "@rdfjs/dataset": "^2.0.1", - "@rdfjs/fetch-lite": "^3.2.1", - "@rdfjs/namespace": "^2.0.0", - "@rdfjs/sink-map": "^2.0.0", - "@rdfjs/term-map": "^2.0.0", - "@rdfjs/term-set": "^2.0.1" - } + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@rdfjs/environment/-/environment-1.0.0.tgz", + "integrity": "sha512-+S5YjSvfoQR5r7YQCRCCVHvIEyrWia7FJv2gqM3s5EDfotoAQmFeBagApa9c/eQFi5EiNhmBECE5nB8LIxTaHg==" }, "node_modules/@rdfjs/fetch-lite": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/@rdfjs/fetch-lite/-/fetch-lite-3.2.1.tgz", "integrity": "sha512-cnCuSkEpMGsSbkd3+bIKheCKTDE4iBSGG6l/Inp0qg4y5WMLtcffKtSUzWhq09cAajm0dWs+5W3EGPNBqF5A4w==", + "dev": true, "dependencies": { "is-stream": "^3.0.0", "nodeify-fetch": "^3.1.0", @@ -913,6 +907,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.0.tgz", "integrity": "sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg==", + "dev": true, "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", @@ -1016,12 +1011,14 @@ "node_modules/@rdfjs/sink-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@rdfjs/sink-map/-/sink-map-2.0.0.tgz", - "integrity": "sha512-5Ahs1Ky6fglsqewpo89K7CFxD4EvFvAHdI/E5HJTu0L4tCUlvnZsmyKem4iYPDWdwsKplmUdORonUz75qPgd1g==" + "integrity": "sha512-5Ahs1Ky6fglsqewpo89K7CFxD4EvFvAHdI/E5HJTu0L4tCUlvnZsmyKem4iYPDWdwsKplmUdORonUz75qPgd1g==", + "dev": true }, "node_modules/@rdfjs/term-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@rdfjs/term-map/-/term-map-2.0.0.tgz", "integrity": "sha512-z0K8AgLsJGTrh+dGkXNl/oT9vBdMei4xq1MIeGN360oimA81Q+ruQUKFCbYNRRZS03tVHPBzqXUal/DezFGPEA==", + "dev": true, "dependencies": { "@rdfjs/to-ntriples": "^2.0.0" } @@ -1030,6 +1027,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/@rdfjs/term-set/-/term-set-2.0.1.tgz", "integrity": "sha512-ZD8IwSY7tPpevs2iaQEsesAu8c7TO4GKHQHObbehUE4odKa9BuhuimdNuYwBoyVprTtHARaW6VW+0Jsu7ehD+Q==", + "dev": true, "dependencies": { "@rdfjs/to-ntriples": "^2.0.0" } @@ -1037,7 +1035,8 @@ "node_modules/@rdfjs/to-ntriples": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@rdfjs/to-ntriples/-/to-ntriples-2.0.0.tgz", - "integrity": "sha512-nDhpfhx6W6HKsy4HjyLp3H1nbrX1CiUCWhWQwKcYZX1s9GOjcoQTwY7GUUbVec0hzdJDQBR6gnjxtENBDt482Q==" + "integrity": "sha512-nDhpfhx6W6HKsy4HjyLp3H1nbrX1CiUCWhWQwKcYZX1s9GOjcoQTwY7GUUbVec0hzdJDQBR6gnjxtENBDt482Q==", + "dev": true }, "node_modules/@rdfjs/traverser": { "version": "0.1.2", @@ -1539,6 +1538,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, "dependencies": { "event-target-shim": "^5.0.0" }, @@ -1892,6 +1892,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -2087,6 +2088,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, "funding": [ { "type": "github", @@ -2835,6 +2837,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", + "dev": true, "engines": { "node": ">= 12" } @@ -4367,6 +4370,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true, "engines": { "node": ">=6" } @@ -4375,6 +4379,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true, "engines": { "node": ">=0.8.x" } @@ -4487,6 +4492,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", + "dev": true, "funding": [ { "type": "github", @@ -4787,6 +4793,7 @@ "version": "4.0.10", "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", + "dev": true, "dependencies": { "fetch-blob": "^3.1.2" }, @@ -5452,6 +5459,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -5930,6 +5938,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -6556,7 +6565,8 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true }, "node_modules/lodash.camelcase": { "version": "4.3.0", @@ -7338,6 +7348,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "dev": true, "funding": [ { "type": "github", @@ -7376,6 +7387,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/nodeify-fetch/-/nodeify-fetch-3.1.0.tgz", "integrity": "sha512-ZV81vM//sEgTgXwVZlOONzcOCdTGQ53mV65FVSNXgPQHa8oCwRLtLbnGxL/1S/Yw90bcXUDKMz00jEnaeazo+A==", + "dev": true, "dependencies": { "lodash": "^4.17.21", "node-fetch": "^3.2.10", @@ -7387,6 +7399,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", + "dev": true, "dependencies": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", @@ -7404,6 +7417,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.0.tgz", "integrity": "sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg==", + "dev": true, "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", @@ -8154,6 +8168,7 @@ "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true, "engines": { "node": ">= 0.6.0" } @@ -8314,6 +8329,21 @@ "readable-stream": "^4.3.0" } }, + "node_modules/rdf-ext/node_modules/@rdfjs/environment": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@rdfjs/environment/-/environment-0.1.2.tgz", + "integrity": "sha512-R4N73kaoaOt3XvgLy2Cb98bJUgMJv/wRsUPGDxeogbtalkENPmo3X5to/rKQEwOjnj+jw+ILzN2webUHb8pvEw==", + "dev": true, + "dependencies": { + "@rdfjs/data-model": "^2.0.1", + "@rdfjs/dataset": "^2.0.1", + "@rdfjs/fetch-lite": "^3.2.1", + "@rdfjs/namespace": "^2.0.0", + "@rdfjs/sink-map": "^2.0.0", + "@rdfjs/term-map": "^2.0.0", + "@rdfjs/term-set": "^2.0.1" + } + }, "node_modules/rdf-ext/node_modules/readable-stream": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.0.tgz", @@ -9002,6 +9032,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, "funding": [ { "type": "github", @@ -10150,6 +10181,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/stream-chunks/-/stream-chunks-1.0.0.tgz", "integrity": "sha512-/G+kinLx3pKXChtuko82taA4gZo56zFG2b2BbhmugmS0TUPBL40c5b2vjonS+gAHYK/cSKM9m0WTvAJYgDUeNw==", + "dev": true, "dependencies": { "buffer": "^6.0.3", "string_decoder": "^1.3.0" @@ -10201,6 +10233,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, "dependencies": { "safe-buffer": "~5.2.0" } @@ -11174,6 +11207,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", + "dev": true, "engines": { "node": ">= 8" } diff --git a/package.json b/package.json index 8630bba..f2780b1 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,13 @@ }, "homepage": "https://github.com/rdf-ext/clownface", "dependencies": { - "@rdfjs/environment": "^0.1.2" + "@rdfjs/data-model": "^2.0.1", + "@rdfjs/environment": "0 - 1", + "@rdfjs/namespace": "^2.0.0" }, "devDependencies": { "@changesets/cli": "^2.26.1", - "@rdfjs/namespace": "^2.0.0", + "@rdfjs/dataset": "^2.0.1", "@rdfjs/parser-n3": "^2.0.0", "@tpluscode/eslint-config": "^0.4.4", "c8": "^7.14.0", diff --git a/test/Clownface/addIn.test.js b/test/Clownface/addIn.test.js index 98c589f..f21d661 100644 --- a/test/Clownface/addIn.test.js +++ b/test/Clownface/addIn.test.js @@ -3,7 +3,7 @@ import { describe, it } from 'mocha' import sinon from 'sinon' import { addAll } from 'rdf-dataset-ext' import Environment from '@rdfjs/environment' -import NamespaceFactory from '@rdfjs/environment/NamespaceFactory.js' +import NamespaceFactory from '@rdfjs/namespace/Factory.js' import clownface from '../../index.js' import rdf from '../support/factory.js' import CustomDataFactory from '../support/CustomDataFactory.js' diff --git a/test/Clownface/addList.test.js b/test/Clownface/addList.test.js index c335a1c..9be7db1 100644 --- a/test/Clownface/addList.test.js +++ b/test/Clownface/addList.test.js @@ -1,7 +1,7 @@ import assert from 'assert' import { describe, it } from 'mocha' import Environment from '@rdfjs/environment' -import NamespaceFactory from '@rdfjs/environment/NamespaceFactory.js' +import NamespaceFactory from '@rdfjs/namespace/Factory.js' import clownface from '../../index.js' import rdf from '../support/factory.js' import * as ns from '../support/namespace.js' diff --git a/test/Clownface/addOut.test.js b/test/Clownface/addOut.test.js index d30ef52..7a1a235 100644 --- a/test/Clownface/addOut.test.js +++ b/test/Clownface/addOut.test.js @@ -3,7 +3,7 @@ import { describe, it } from 'mocha' import sinon from 'sinon' import { addAll } from 'rdf-dataset-ext' import Environment from '@rdfjs/environment' -import NamespaceFactory from '@rdfjs/environment/NamespaceFactory.js' +import NamespaceFactory from '@rdfjs/namespace/Factory.js' import clownface from '../../index.js' import loadExample from '../support/example.js' import rdf from '../support/factory.js' diff --git a/test/Factory.test.js b/test/Factory.test.js index 813cb56..eaa7230 100644 --- a/test/Factory.test.js +++ b/test/Factory.test.js @@ -1,9 +1,9 @@ import { expect } from 'chai' import Environment from '@rdfjs/environment' -import DatasetFactory from '@rdfjs/environment/DatasetFactory.js' +import DatasetFactory from '@rdfjs/dataset/Factory.js' import $rdf from 'rdf-ext' -import NamespaceFactory from '@rdfjs/environment/NamespaceFactory.js' -import DataFactory from '@rdfjs/environment/DataFactory.js' +import NamespaceFactory from '@rdfjs/namespace/Factory.js' +import DataFactory from '@rdfjs/data-model/Factory.js' import ClownfaceFactory from '../Factory.js' describe('Factory', () => { From 0c36d357659ffe3f9565d36153e2b23c1e0ab456 Mon Sep 17 00:00:00 2001 From: Tomasz Pluskiewicz Date: Mon, 15 Jan 2024 22:48:28 +0100 Subject: [PATCH 2/2] Update long-emus-cry.md --- .changeset/long-emus-cry.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/long-emus-cry.md b/.changeset/long-emus-cry.md index b05d994..2eff64a 100644 --- a/.changeset/long-emus-cry.md +++ b/.changeset/long-emus-cry.md @@ -1,5 +1,5 @@ --- -"clownface": minor +"clownface": patch --- Adjust to `@rdfjs/environment@v1` (still compatible with v0)