From b5e23e25ef3fc904b4ae855f699e8d9d3e29ce3d Mon Sep 17 00:00:00 2001 From: Tomasz Pluskiewicz Date: Mon, 31 Jul 2023 15:24:38 +0200 Subject: [PATCH] build(deps): use `@zazuko/env` --- .changeset/chilled-tools-cheer.md | 10 + package-lock.json | 196 ++++++++++-------- packages/cli/lib/cli.js | 5 +- packages/cli/package.json | 6 +- packages/cli/test/barnard59.test.js | 2 +- packages/core/lib/cloneTerm.js | 2 +- packages/core/lib/factory/variables.js | 2 +- packages/core/lib/loader/variable.js | 2 +- packages/core/package.json | 2 +- packages/core/test/cloneTerm.test.js | 2 +- packages/core/test/loader/pipeline.test.js | 2 +- packages/core/test/loader/variable.test.js | 2 +- .../test/support/createPipelineDefinition.js | 2 +- packages/rdf/lib/PatternMatcher.js | 2 +- packages/rdf/lib/cbdCopy.js | 2 +- packages/rdf/lib/cube/buildCubeShape/Cube.js | 7 +- .../rdf/lib/cube/buildCubeShape/Dimension.js | 2 +- packages/rdf/lib/cube/buildCubeShape/index.js | 5 +- packages/rdf/lib/cube/toObservation.js | 8 +- packages/rdf/lib/membership.js | 2 +- packages/rdf/lib/metadata/applyOptions.js | 2 +- packages/rdf/lib/metadata/datasetClasses.js | 2 +- .../rdf/lib/metadata/namedDateLiterals.js | 2 +- packages/rdf/lib/namespaces.js | 2 +- packages/rdf/lib/voidStats.js | 2 +- packages/rdf/mapMatch.js | 2 +- packages/rdf/package.json | 8 +- packages/rdf/setGraph.js | 2 +- packages/rdf/test/PatternMatcher.test.js | 2 +- packages/rdf/test/append.test.js | 23 +- packages/rdf/test/cube/toObservation.test.js | 2 +- .../rdf/test/localFetch/localFetch.test.js | 13 +- packages/rdf/test/mapMatch.test.js | 4 +- packages/rdf/test/membership.test.js | 16 +- .../rdf/test/metadata/applyOptions.test.js | 2 +- packages/rdf/test/setGraph.test.js | 2 +- .../test/support/createObservationsStream.js | 2 +- .../test/support/datasetStreamToClownface.js | 5 +- packages/rdf/test/support/namespaces.js | 2 +- packages/rdf/test/voidStats.test.js | 8 +- packages/sparql/package.json | 5 +- packages/sparql/test/construct.test.js | 15 +- packages/sparql/test/support/namespaces.js | 2 +- test/e2e/asyncLoaders.js | 5 +- test/e2e/package.json | 3 +- test/support/loadPipelineDefinition.js | 8 +- test/support/package.json | 4 +- 47 files changed, 227 insertions(+), 181 deletions(-) create mode 100644 .changeset/chilled-tools-cheer.md diff --git a/.changeset/chilled-tools-cheer.md b/.changeset/chilled-tools-cheer.md new file mode 100644 index 00000000..d7eede2c --- /dev/null +++ b/.changeset/chilled-tools-cheer.md @@ -0,0 +1,10 @@ +--- +"barnard59-sparql": patch +"barnard59-core": patch +"barnard59": patch +"barnard59-rdf": patch +"barnard59-test-support": patch +"barnard59-test-e2e": patch +--- + +Update clownface to `v2`, use `@zazuko/env` instead of `rdf-ext` diff --git a/package-lock.json b/package-lock.json index 9f478e02..d260d201 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1979,7 +1979,9 @@ }, "node_modules/@rdfjs/normalize": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@rdfjs/normalize/-/normalize-2.0.0.tgz", + "integrity": "sha512-jOSdIKz9r/oPI9nuWXMTYzFaCbrFQj9qEOPdqs1/7oAR1JTvqpS69HVZPkVqbH+WhL52PJbBXyA5QadoyNLgpQ==", + "dev": true, "dependencies": { "rdf-canonize": "^3.0.0" }, @@ -2045,19 +2047,24 @@ }, "node_modules/@rdfjs/prefix-map": { "version": "0.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@rdfjs/prefix-map/-/prefix-map-0.1.1.tgz", + "integrity": "sha512-w9VrJ/YfMyvdcpuKG0XEzgbH6AXtUSugvgL1U1IvbTYdL2rfIifaYkSyp86lEhD2hHeYUYAGZTKkpDErtXCMxQ==", + "dev": true, "dependencies": { "readable-stream": "^4.3.0" } }, "node_modules/@rdfjs/prefix-map/node_modules/readable-stream": { - "version": "4.4.0", - "license": "MIT", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", "events": "^3.3.0", - "process": "^0.11.10" + "process": "^0.11.10", + "string_decoder": "^1.3.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2065,7 +2072,9 @@ }, "node_modules/@rdfjs/score": { "version": "0.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@rdfjs/score/-/score-0.1.1.tgz", + "integrity": "sha512-+t9Sf5nFUJTvH8X2Xy7H+egLKIyVCwlDzCGrWThSrSCmIENcC9n3+GkMMImnsmYDeSXaWi3awcI1f1TmA84FIQ==", + "dev": true, "dependencies": { "@rdfjs/data-model": "^2.0.1", "@rdfjs/term-map": "^2.0.0", @@ -2193,7 +2202,9 @@ }, "node_modules/@rdfjs/traverser": { "version": "0.1.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@rdfjs/traverser/-/traverser-0.1.2.tgz", + "integrity": "sha512-EBB/p9LrTMzupZ6VlxtBXyL0bdXFY7e5lAp2tHNwxOoe3kcR6hOJFVWdPT7pdWaSotyXbTIEQxG4PkXMw/OY7w==", + "dev": true, "dependencies": { "@rdfjs/to-ntriples": "^2.0.0" } @@ -2291,6 +2302,19 @@ "@zazuko/prefixes": "^2.0.0" } }, + "node_modules/@tpluscode/rdf-string": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tpluscode/rdf-string/-/rdf-string-1.0.3.tgz", + "integrity": "sha512-h0PWqCGXvmT44T4Yqeje8hlCPzdMtcb3UD1SCPYgRtXOeo3IgKu/XczJ7oDAlkcO2DCxTFfzU7DnxYAVCKEYEg==", + "dev": true, + "dependencies": { + "@rdfjs/data-model": "^2", + "@rdfjs/namespace": "^2.0.0", + "@rdfjs/term-map": "^2", + "@rdfjs/types": "*", + "@zazuko/prefixes": ">=1" + } + }, "node_modules/@types/babel__traverse": { "version": "7.20.1", "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", @@ -2655,23 +2679,15 @@ "license": "ISC" }, "node_modules/@zazuko/env": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@zazuko/env/-/env-1.0.1.tgz", - "integrity": "sha512-A/Oqmf08rm5FhA4f9KTr1K6HT90NdMPo+/7QprwYXNvxaxXyNJJJHwLf3Rx3VP/jU1V3yUyj8rZfnRZudO/gVQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@zazuko/env/-/env-1.1.0.tgz", + "integrity": "sha512-JF6CnBb6GWwnE56LxQ5T+M/yfmPYOZvXgrEVVYpr/G3bMh53axBSmvJwWcvQt1J0sZwxFen26coG9OPCoTJjXw==", "dependencies": { "@rdfjs/environment": "^0.1.2", "@tpluscode/rdf-ns-builders": "^4.1.0", "clownface": "^2.0.0" } }, - "node_modules/@zazuko/env/node_modules/clownface": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/clownface/-/clownface-2.0.0.tgz", - "integrity": "sha512-wnSOFWAvqrz9qZ+urzgEmQfvdnWsMt1+jZH/5LBJt+pLdjDwjlR80AMzzPBL+4ZF+yCK4cCLPGTg+d/uq3OIbg==", - "dependencies": { - "@rdfjs/environment": "^0.1.2" - } - }, "node_modules/@zazuko/node-fetch": { "version": "2.6.6", "license": "MIT", @@ -3661,31 +3677,11 @@ } }, "node_modules/clownface": { - "version": "1.5.1", - "license": "MIT", - "dependencies": { - "@rdfjs/data-model": "^1.1.0", - "@rdfjs/namespace": "^1.0.0" - } - }, - "node_modules/clownface/node_modules/@rdfjs/data-model": { - "version": "1.3.4", - "license": "MIT", - "dependencies": { - "@rdfjs/types": ">=1.0.1" - }, - "bin": { - "rdfjs-data-model-test": "bin/test.js" - } - }, - "node_modules/clownface/node_modules/@rdfjs/namespace": { - "version": "1.1.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/clownface/-/clownface-2.0.0.tgz", + "integrity": "sha512-wnSOFWAvqrz9qZ+urzgEmQfvdnWsMt1+jZH/5LBJt+pLdjDwjlR80AMzzPBL+4ZF+yCK4cCLPGTg+d/uq3OIbg==", "dependencies": { - "@rdfjs/data-model": "^1.1.0" - }, - "engines": { - "node": ">=6" + "@rdfjs/environment": "^0.1.2" } }, "node_modules/codepage": { @@ -9547,7 +9543,8 @@ }, "node_modules/rdf-canonize": { "version": "3.4.0", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/rdf-canonize/-/rdf-canonize-3.4.0.tgz", + "integrity": "sha512-fUeWjrkOO0t1rg7B2fdyDTvngj+9RlUyL92vOdiB7c0FPguWVsniIMjEtHH+meLBO9rzkUlUzBVXgWrjI8P9LA==", "dependencies": { "setimmediate": "^1.0.5" }, @@ -9562,9 +9559,20 @@ "@rdfjs/types": "*" } }, + "node_modules/rdf-dataset-ext": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/rdf-dataset-ext/-/rdf-dataset-ext-1.0.1.tgz", + "integrity": "sha512-I08/j+w0zqNRmFXbFhqxexmKsdS9nGDno/cG/OaF5sLxkDNrhyP82OxWx35ZPrjd4FG8T+TsGaxZFZkVIS85eA==", + "dependencies": { + "rdf-canonize": "^3.0.0", + "readable-stream": "^3.4.0" + } + }, "node_modules/rdf-ext": { "version": "2.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/rdf-ext/-/rdf-ext-2.2.0.tgz", + "integrity": "sha512-/6Z1VK+OdL4SQnxhzdN1CJJY7pmtTzh0BHLRgKQG9MPIN2SnYr/eymHxqcygcZ/YHqXAV7kl2aOFbn6u9P4Wgw==", + "dev": true, "dependencies": { "@rdfjs/data-model": "^2.0.1", "@rdfjs/dataset": "^2.0.1", @@ -9582,14 +9590,51 @@ "readable-stream": "^4.3.0" } }, + "node_modules/rdf-ext/node_modules/clownface": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/clownface/-/clownface-1.5.1.tgz", + "integrity": "sha512-Ko8N/UFsnhEGmPlyE1bUFhbRhVgDbxqlIjcqxtLysc4dWaY0A7iCdg3savhAxs7Lheb7FCygIyRh7ADYZWVIng==", + "dev": true, + "dependencies": { + "@rdfjs/data-model": "^1.1.0", + "@rdfjs/namespace": "^1.0.0" + } + }, + "node_modules/rdf-ext/node_modules/clownface/node_modules/@rdfjs/data-model": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-1.3.4.tgz", + "integrity": "sha512-iKzNcKvJotgbFDdti7GTQDCYmL7GsGldkYStiP0K8EYtN7deJu5t7U11rKTz+nR7RtesUggT+lriZ7BakFv8QQ==", + "dev": true, + "dependencies": { + "@rdfjs/types": ">=1.0.1" + }, + "bin": { + "rdfjs-data-model-test": "bin/test.js" + } + }, + "node_modules/rdf-ext/node_modules/clownface/node_modules/@rdfjs/namespace": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rdfjs/namespace/-/namespace-1.1.0.tgz", + "integrity": "sha512-utO5rtaOKxk8B90qzaQ0N+J5WrCI28DtfAY/zExCmXE7cOfC5uRI/oMKbLaVEPj2P7uArekt/T4IPATtj7Tjug==", + "dev": true, + "dependencies": { + "@rdfjs/data-model": "^1.1.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/rdf-ext/node_modules/readable-stream": { - "version": "4.4.0", - "license": "MIT", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", "events": "^3.3.0", - "process": "^0.11.10" + "process": "^0.11.10", + "string_decoder": "^1.3.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -9613,30 +9658,11 @@ }, "node_modules/rdf-loader-code": { "version": "0.3.3", + "resolved": "git+ssh://git@github.com/zazuko/rdf-loader-code.git#d13e63762059baa8990389bfd6693ce7a7ae2c60", "license": "MIT", "dependencies": { - "@rdfjs/namespace": "^1.1.0", - "clownface": "^1.3.0" - } - }, - "node_modules/rdf-loader-code/node_modules/@rdfjs/data-model": { - "version": "1.3.4", - "license": "MIT", - "dependencies": { - "@rdfjs/types": ">=1.0.1" - }, - "bin": { - "rdfjs-data-model-test": "bin/test.js" - } - }, - "node_modules/rdf-loader-code/node_modules/@rdfjs/namespace": { - "version": "1.1.0", - "license": "MIT", - "dependencies": { - "@rdfjs/data-model": "^1.1.0" - }, - "engines": { - "node": ">=6" + "@rdfjs/namespace": "^2.0.0", + "clownface": "^2.0.0" } }, "node_modules/rdf-loaders-registry": { @@ -10258,7 +10284,8 @@ }, "node_modules/setimmediate": { "version": "1.0.5", - "license": "MIT" + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" }, "node_modules/setprototypeof": { "version": "1.2.0", @@ -12465,11 +12492,12 @@ "@opentelemetry/semantic-conventions": "^0.24.0", "@opentelemetry/tracing": "^0.24.0", "@rdfjs/namespace": "^2.0.0", + "@zazuko/env": "^1.0.1", "barnard59-core": "1 - 2", - "clownface": "^1.5.1", + "clownface": "^2.0.0", "commander": "^7.1.0", "lodash": "^4.17.21", - "rdf-ext": "^2.2.0", + "rdf-dataset-ext": "^1.0.1", "rdf-utils-fs": "^2.2.0", "readable-stream": "^3.6.0" }, @@ -12483,6 +12511,7 @@ "barnard59-shell": "^0.1.0", "barnard59-test-support": "^0.0.0", "chai": "^4.3.7", + "rdf-ext": "^2", "shelljs": "^0.8.4", "strip-ansi": "^7.0.0" } @@ -12520,7 +12549,7 @@ "@opentelemetry/api": "^1.0.1", "@rdfjs/namespace": "^2.0.0", "@zazuko/env": "^1.0.1", - "clownface": "^1.4.0", + "clownface": "^2.0.0", "duplex-to": "^1.0.1", "duplexify": "^4.1.1", "is-graph-pointer": "^2.0.0", @@ -12540,7 +12569,6 @@ "husky": "^8.0.3", "lint-staged": "^13.2.2", "mocha": "^10.2.0", - "mocha-chai-jest-snapshot": "^1.1.4", "nock": "^13.1.0", "rdf-utils-fs": "^2.1.0", "sinon": "^15.0.4", @@ -12585,13 +12613,13 @@ "dependencies": { "@rdfjs/fetch": "^3.0.0", "@rdfjs/formats-common": "^2.2.0", - "clownface": "^1.3.0", + "@zazuko/env": "^1.1.0", + "clownface": "^2", "file-fetch": "^1.7.0", "is-stream": "^3.0.0", "lodash": "^4.17.21", "mime-types": "^2.1.35", "proto-fetch": "^1.0.0", - "rdf-ext": "^2.2.0", "rdf-literal": "^1.3.0", "rdf-transform-triple-to-quad": "^1.0.2", "rdf-utils-fs": "^2.3.0", @@ -12603,7 +12631,9 @@ "chai": "^4.3.7", "get-stream": "^6.0.1", "mocha-chai-jest-snapshot": "^1.1.4", - "nock": "^13.2.4" + "nock": "^13.2.4", + "rdf-dataset-ext": "^1.0.1", + "rdf-ext": "^2.2.0" }, "engines": { "node": ">= 14.0.0" @@ -12619,11 +12649,12 @@ "sparql-http-client": "^2.4.0" }, "devDependencies": { + "@tpluscode/rdf-string": "^1.0.3", + "@zazuko/env": "^1.0.1", "get-stream": "^6.0.0", "isstream": "^0.1.2", "mocha": "^9.0.2", - "nock": "^13.1.1", - "rdf-ext": "^2.2.0" + "nock": "^13.1.1" }, "engines": { "node": ">= 14.0.0" @@ -12864,13 +12895,12 @@ "name": "barnard59-test-e2e", "version": "0.0.0", "dependencies": { + "@zazuko/env": "^1.0.1", "barnard59-core": "^2.0.2", "barnard59-http": "^1.1.0", "barnard59-test-support": "^0.0.0", - "clownface": "^1.5.1", "get-stream": "^6.0.0", "nock": "^13.3.1", - "rdf-ext": "^2.2.0", "rdf-loader-code": "^0.3.3", "readable-stream": "^3" } @@ -12880,8 +12910,8 @@ "version": "0.0.0", "dependencies": { "@rdfjs/namespace": "^2.0.0", - "clownface": "^1.5.1", - "rdf-ext": "^2.2.0", + "@zazuko/env": "^1.0.1", + "rdf-dataset-ext": "^1.0.1", "rdf-utils-fs": "^2.3.0" } } diff --git a/packages/cli/lib/cli.js b/packages/cli/lib/cli.js index 2cd5d379..2e0bf27c 100644 --- a/packages/cli/lib/cli.js +++ b/packages/cli/lib/cli.js @@ -3,16 +3,17 @@ import { dirname, resolve } from 'path' import { promisify } from 'util' import { SpanStatusCode } from '@opentelemetry/api' import program from 'commander' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import fromFile from 'rdf-utils-fs/fromFile.js' import { finished, PassThrough } from 'readable-stream' +import fromStream from 'rdf-dataset-ext/fromStream.js' import findPipeline from '../findPipeline.js' import runner from '../runner.js' import bufferDebug from './bufferDebug.js' import tracer from './tracer.js' async function fileToDataset(filename) { - return rdf.dataset().import(fromFile(filename)) + return fromStream(rdf.dataset(), fromFile(filename)) } function createOutputStream(output) { diff --git a/packages/cli/package.json b/packages/cli/package.json index 3c0e8822..ad1b86ac 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -32,11 +32,12 @@ "@opentelemetry/semantic-conventions": "^0.24.0", "@opentelemetry/tracing": "^0.24.0", "@rdfjs/namespace": "^2.0.0", + "@zazuko/env": "^1.0.1", "barnard59-core": "1 - 2", - "clownface": "^1.5.1", + "clownface": "^2.0.0", "commander": "^7.1.0", "lodash": "^4.17.21", - "rdf-ext": "^2.2.0", + "rdf-dataset-ext": "^1.0.1", "rdf-utils-fs": "^2.2.0", "readable-stream": "^3.6.0" }, @@ -47,6 +48,7 @@ "barnard59-shell": "^0.1.0", "barnard59-test-support": "^0.0.0", "chai": "^4.3.7", + "rdf-ext": "^2", "shelljs": "^0.8.4", "strip-ansi": "^7.0.0" } diff --git a/packages/cli/test/barnard59.test.js b/packages/cli/test/barnard59.test.js index d511adda..e43b5d02 100644 --- a/packages/cli/test/barnard59.test.js +++ b/packages/cli/test/barnard59.test.js @@ -113,7 +113,7 @@ describe('barnard59', () => { it('should run the parse-csvw.ttl example without error', () => { const pipelineFile = (new URL('../examples/parse-csvw.ttl', import.meta.url)).pathname - const command = `${barnard59} run --pipeline=http://example.org/pipeline/parseCsvw ${pipelineFile}` + const command = `${barnard59} run -vv --pipeline=http://example.org/pipeline/parseCsvw ${pipelineFile}` const result = shell.exec(command, { silent: true, cwd }) diff --git a/packages/core/lib/cloneTerm.js b/packages/core/lib/cloneTerm.js index 4f411e9c..a34bb71b 100644 --- a/packages/core/lib/cloneTerm.js +++ b/packages/core/lib/cloneTerm.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' function cloneTerm(term) { if (!term) { diff --git a/packages/core/lib/factory/variables.js b/packages/core/lib/factory/variables.js index fb4acd85..23575d98 100644 --- a/packages/core/lib/factory/variables.js +++ b/packages/core/lib/factory/variables.js @@ -1,4 +1,4 @@ -import $rdf from 'rdf-ext' +import $rdf from '@zazuko/env' import ns from '../namespaces.js' import { VariableMap } from '../VariableMap.js' diff --git a/packages/core/lib/loader/variable.js b/packages/core/lib/loader/variable.js index 8b9baa8e..8a2cbb78 100644 --- a/packages/core/lib/loader/variable.js +++ b/packages/core/lib/loader/variable.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import cloneTerm from '../cloneTerm.js' import ns from '../namespaces.js' import { VariableMap } from '../VariableMap.js' diff --git a/packages/core/package.json b/packages/core/package.json index 5d69a093..a6c69966 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -23,7 +23,7 @@ "@opentelemetry/api": "^1.0.1", "@rdfjs/namespace": "^2.0.0", "@zazuko/env": "^1.0.1", - "clownface": "^1.4.0", + "clownface": "^2.0.0", "duplex-to": "^1.0.1", "duplexify": "^4.1.1", "is-graph-pointer": "^2.0.0", diff --git a/packages/core/test/cloneTerm.test.js b/packages/core/test/cloneTerm.test.js index 6aff066f..1c4f959b 100644 --- a/packages/core/test/cloneTerm.test.js +++ b/packages/core/test/cloneTerm.test.js @@ -1,5 +1,5 @@ import { notStrictEqual, strictEqual, throws } from 'assert' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import cloneTerm from '../lib/cloneTerm.js' import ns from './support/namespaces.js' diff --git a/packages/core/test/loader/pipeline.test.js b/packages/core/test/loader/pipeline.test.js index 25bfd1be..7ac9fc05 100644 --- a/packages/core/test/loader/pipeline.test.js +++ b/packages/core/test/loader/pipeline.test.js @@ -1,7 +1,7 @@ import { strictEqual, rejects } from 'assert' import { resolve } from 'path' import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { pipelineDefinitionLoader } from 'barnard59-test-support/loadPipelineDefinition.js' import { run } from '../../index.js' import loader from '../../lib/loader/pipeline.js' diff --git a/packages/core/test/loader/variable.test.js b/packages/core/test/loader/variable.test.js index 48f4617d..7563ed69 100644 --- a/packages/core/test/loader/variable.test.js +++ b/packages/core/test/loader/variable.test.js @@ -1,6 +1,6 @@ import { strictEqual } from 'assert' import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import loader from '../../lib/loader/variable.js' import ns from '../support/namespaces.js' diff --git a/packages/core/test/support/createPipelineDefinition.js b/packages/core/test/support/createPipelineDefinition.js index 11aa736f..be3e9498 100644 --- a/packages/core/test/support/createPipelineDefinition.js +++ b/packages/core/test/support/createPipelineDefinition.js @@ -1,5 +1,5 @@ import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import ns from './namespaces.js' function createPipelineDefinition({ diff --git a/packages/rdf/lib/PatternMatcher.js b/packages/rdf/lib/PatternMatcher.js index bb855d98..d1efe1a0 100644 --- a/packages/rdf/lib/PatternMatcher.js +++ b/packages/rdf/lib/PatternMatcher.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' class PatternMatcher { constructor({ subject, predicate, object, graph } = {}) { diff --git a/packages/rdf/lib/cbdCopy.js b/packages/rdf/lib/cbdCopy.js index 562e8016..007fd155 100644 --- a/packages/rdf/lib/cbdCopy.js +++ b/packages/rdf/lib/cbdCopy.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' function cbdCopy(source, target, { ignore = rdf.termSet() } = {}) { for (const quad of source.dataset.match(source.term)) { diff --git a/packages/rdf/lib/cube/buildCubeShape/Cube.js b/packages/rdf/lib/cube/buildCubeShape/Cube.js index 4540b3f0..2adf332e 100644 --- a/packages/rdf/lib/cube/buildCubeShape/Cube.js +++ b/packages/rdf/lib/cube/buildCubeShape/Cube.js @@ -1,5 +1,6 @@ import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' +import addAll from 'rdf-dataset-ext/addAll.js' import cbdCopy from '../../cbdCopy.js' import * as ns from '../../namespaces.js' import Dimension from './Dimension.js' @@ -54,11 +55,11 @@ class Cube { .addOut(ns.sh.closed, true) for (const dimension of this.dimensions.values()) { - shapeDataset.addAll(dimension.toDataset({ shape: this.shape })) + addAll(shapeDataset, dimension.toDataset({ shape: this.shape })) } const setGraph = quad => rdf.quad(quad.subject, quad.predicate, quad.object, shapeGraph) - return dataset.addAll([...(shapeDataset.map(setGraph))]) + return addAll(dataset, [...shapeDataset].map(setGraph)) } } diff --git a/packages/rdf/lib/cube/buildCubeShape/Dimension.js b/packages/rdf/lib/cube/buildCubeShape/Dimension.js index faab05fa..ba6c5ac2 100644 --- a/packages/rdf/lib/cube/buildCubeShape/Dimension.js +++ b/packages/rdf/lib/cube/buildCubeShape/Dimension.js @@ -1,5 +1,5 @@ import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { fromRdf } from 'rdf-literal' import cbdCopy from '../../cbdCopy.js' import * as ns from '../../namespaces.js' diff --git a/packages/rdf/lib/cube/buildCubeShape/index.js b/packages/rdf/lib/cube/buildCubeShape/index.js index be953f5a..fd44f42a 100644 --- a/packages/rdf/lib/cube/buildCubeShape/index.js +++ b/packages/rdf/lib/cube/buildCubeShape/index.js @@ -1,7 +1,8 @@ import clownface from 'clownface' import once from 'lodash/once.js' -import $rdf from 'rdf-ext' +import $rdf from '@zazuko/env' import { Transform } from 'readable-stream' +import fromStream from 'rdf-dataset-ext/fromStream.js' import * as ns from '../../namespaces.js' import urlJoin from '../../urlJoin.js' import Cube from './Cube.js' @@ -44,7 +45,7 @@ class CubeShapeBuilder extends Transform { async _init() { if (this.options.metadataStream) { - this.options.metadata = await $rdf.dataset().import(this.options.metadataStream) + this.options.metadata = await fromStream($rdf.dataset(), this.options.metadataStream) } else { this.options.metadata = $rdf.dataset() } diff --git a/packages/rdf/lib/cube/toObservation.js b/packages/rdf/lib/cube/toObservation.js index 4be91d58..3f9032b4 100644 --- a/packages/rdf/lib/cube/toObservation.js +++ b/packages/rdf/lib/cube/toObservation.js @@ -1,6 +1,6 @@ import { URL } from 'url' import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Transform } from 'readable-stream' import dateToId from '../dateToId.js' import urlJoin from '../urlJoin.js' @@ -12,7 +12,7 @@ const ns = { } function findRoot({ dataset }) { - const subjects = [...dataset.filter(quad => quad.subject.termType === 'NamedNode')].reduce((subjects, quad) => { + const subjects = [...dataset].filter(quad => quad.subject.termType === 'NamedNode').reduce((subjects, quad) => { const count = subjects.get(quad.subject) || 0 subjects.set(quad.subject, count + 1) @@ -181,7 +181,7 @@ class ToObservation extends Transform { context.observations = this.options.observations(context) context.observation = this.options.observation(context) - const dataset = context.dataset + const dataset = rdf.dataset([...context.dataset] .filter(quad => !quad.predicate.equals(ns.rdf.type)) .filter(quad => !this.options.blacklist.has(quad.predicate)) .map(quad => { @@ -190,7 +190,7 @@ class ToObservation extends Transform { quad.predicate, quad.object, ) - }) + })) dataset.add(rdf.quad(context.observation, ns.rdf.type, ns.cube.Observation)) diff --git a/packages/rdf/lib/membership.js b/packages/rdf/lib/membership.js index 62a2ce99..98a3a7c1 100644 --- a/packages/rdf/lib/membership.js +++ b/packages/rdf/lib/membership.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Transform } from 'readable-stream' import * as ns from './namespaces.js' diff --git a/packages/rdf/lib/metadata/applyOptions.js b/packages/rdf/lib/metadata/applyOptions.js index ba0f1981..cad236b7 100644 --- a/packages/rdf/lib/metadata/applyOptions.js +++ b/packages/rdf/lib/metadata/applyOptions.js @@ -6,7 +6,7 @@ import { namedDateLiterals } from './namedDateLiterals.js' function subjectsWithDatasetType(dataset, classes) { const result = rdf.termSet() - dataset + ;[...dataset] .filter(quad => (quad.predicate.equals(ns.rdf.type) && classes.has(quad.object))) .forEach(quad => { result.add(quad.subject) diff --git a/packages/rdf/lib/metadata/datasetClasses.js b/packages/rdf/lib/metadata/datasetClasses.js index 13865363..2b2eadd5 100644 --- a/packages/rdf/lib/metadata/datasetClasses.js +++ b/packages/rdf/lib/metadata/datasetClasses.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import * as ns from '../namespaces.js' const wellKnownDatasetClasses = rdf.termSet([ diff --git a/packages/rdf/lib/metadata/namedDateLiterals.js b/packages/rdf/lib/metadata/namedDateLiterals.js index b203e011..9bc67e84 100644 --- a/packages/rdf/lib/metadata/namedDateLiterals.js +++ b/packages/rdf/lib/metadata/namedDateLiterals.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { xsd } from '../namespaces.js' const namedDateLiterals = new Map() diff --git a/packages/rdf/lib/namespaces.js b/packages/rdf/lib/namespaces.js index 8cb3845e..d3f94b8c 100644 --- a/packages/rdf/lib/namespaces.js +++ b/packages/rdf/lib/namespaces.js @@ -1,4 +1,4 @@ -import $rdf from 'rdf-ext' +import $rdf from '@zazuko/env' const cube = $rdf.namespace('https://cube.link/') const rdf = $rdf.namespace('http://www.w3.org/1999/02/22-rdf-syntax-ns#') diff --git a/packages/rdf/lib/voidStats.js b/packages/rdf/lib/voidStats.js index f18dc750..24d7bf54 100644 --- a/packages/rdf/lib/voidStats.js +++ b/packages/rdf/lib/voidStats.js @@ -1,5 +1,5 @@ import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Transform } from 'readable-stream' import * as ns from './namespaces.js' diff --git a/packages/rdf/mapMatch.js b/packages/rdf/mapMatch.js index 4239914b..e461bc69 100644 --- a/packages/rdf/mapMatch.js +++ b/packages/rdf/mapMatch.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Transform } from 'readable-stream' import PatternMatcher from './lib/PatternMatcher.js' diff --git a/packages/rdf/package.json b/packages/rdf/package.json index ec6483e3..ec3b81be 100644 --- a/packages/rdf/package.json +++ b/packages/rdf/package.json @@ -25,13 +25,13 @@ "dependencies": { "@rdfjs/fetch": "^3.0.0", "@rdfjs/formats-common": "^2.2.0", - "clownface": "^1.3.0", + "@zazuko/env": "^1.1.0", + "clownface": "^2", "file-fetch": "^1.7.0", "is-stream": "^3.0.0", "lodash": "^4.17.21", "mime-types": "^2.1.35", "proto-fetch": "^1.0.0", - "rdf-ext": "^2.2.0", "rdf-literal": "^1.3.0", "rdf-transform-triple-to-quad": "^1.0.2", "rdf-utils-fs": "^2.3.0", @@ -43,7 +43,9 @@ "chai": "^4.3.7", "get-stream": "^6.0.1", "mocha-chai-jest-snapshot": "^1.1.4", - "nock": "^13.2.4" + "nock": "^13.2.4", + "rdf-dataset-ext": "^1.0.1", + "rdf-ext": "^2.2.0" }, "engines": { "node": ">= 14.0.0" diff --git a/packages/rdf/setGraph.js b/packages/rdf/setGraph.js index 9b1cbda5..7bf8fb5b 100644 --- a/packages/rdf/setGraph.js +++ b/packages/rdf/setGraph.js @@ -1,4 +1,4 @@ -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import TripleToQuadTransform from 'rdf-transform-triple-to-quad' function setGraph(graph) { diff --git a/packages/rdf/test/PatternMatcher.test.js b/packages/rdf/test/PatternMatcher.test.js index 56d9b883..c9176016 100644 --- a/packages/rdf/test/PatternMatcher.test.js +++ b/packages/rdf/test/PatternMatcher.test.js @@ -1,5 +1,5 @@ import { strictEqual } from 'assert' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import PatternMatcher from '../lib/PatternMatcher.js' import { ex } from './support/namespaces.js' diff --git a/packages/rdf/test/append.test.js b/packages/rdf/test/append.test.js index ce805435..cb6109fd 100644 --- a/packages/rdf/test/append.test.js +++ b/packages/rdf/test/append.test.js @@ -7,8 +7,11 @@ import assertThrows from 'assert-throws-async' import getStream from 'get-stream' import { isDuplexStream as isDuplex } from 'is-stream' import nock from 'nock' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Readable } from 'readable-stream' +import fromStream from 'rdf-dataset-ext/fromStream.js' +import addAll from 'rdf-dataset-ext/addAll.js' +import toCanonical from 'rdf-dataset-ext/toCanonical.js' import append from '../lib/append.js' import { schema, xsd, dcterms } from '../lib/namespaces.js' @@ -23,7 +26,7 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url)) const ex = rdf.namespace('http://example.org/') async function getRDFDataset(filePath) { - return rdf.dataset().import(getRDFStream(filePath)) + return fromStream(rdf.dataset(), getRDFStream(filePath)) } function getRDFStream(filePath) { @@ -79,8 +82,8 @@ describe('metadata.append', () => { it('should append data and metadata with default values', async () => { const all = rdf.dataset() - all.addAll(await getRDFDataset(dataPath)) - all.addAll(await getRDFDataset(metadataPath)) + addAll(all, await getRDFDataset(dataPath)) + addAll(all, await getRDFDataset(metadataPath)) const step = await append({ input: getRDFStream(metadataPath), @@ -88,15 +91,15 @@ describe('metadata.append', () => { const { final } = await applyStep(step) equal( - final.toCanonical(), - all.toCanonical(), 'appended quads not as expected', + toCanonical(final), + toCanonical(all), 'appended quads not as expected', ) }) it('should append data and metadata with default values, and path as string', async () => { const all = rdf.dataset() - all.addAll(await getRDFDataset(dataPath)) - all.addAll(await getRDFDataset(metadataPath)) + addAll(all, await getRDFDataset(dataPath)) + addAll(all, await getRDFDataset(metadataPath)) const step = await append({ input: metadataPath, @@ -105,8 +108,8 @@ describe('metadata.append', () => { const { final } = await applyStep(step) equal( - final.toCanonical(), - all.toCanonical(), 'appended quads not as expected', + toCanonical(final), + toCanonical(all), 'appended quads not as expected', ) }) diff --git a/packages/rdf/test/cube/toObservation.test.js b/packages/rdf/test/cube/toObservation.test.js index 42ab3d33..b3aee3b2 100644 --- a/packages/rdf/test/cube/toObservation.test.js +++ b/packages/rdf/test/cube/toObservation.test.js @@ -3,7 +3,7 @@ import toNT from '@rdfjs/to-ntriples' import clownface from 'clownface' import getStream from 'get-stream' import { isDuplexStream as isDuplex } from 'is-stream' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Readable } from 'readable-stream' import toObservation from '../../lib/cube/toObservation.js' import dateToId from '../../lib/dateToId.js' diff --git a/packages/rdf/test/localFetch/localFetch.test.js b/packages/rdf/test/localFetch/localFetch.test.js index 7457113b..6f164045 100644 --- a/packages/rdf/test/localFetch/localFetch.test.js +++ b/packages/rdf/test/localFetch/localFetch.test.js @@ -5,13 +5,14 @@ import defaultFormats from '@rdfjs/formats-common' import assertThrows from 'assert-throws-async' import nock from 'nock' import rdf from 'rdf-ext' +import fromStream from 'rdf-dataset-ext/fromStream.js' import { localFetch } from '../../lib/localFetch/localFetch.js' const datasetPath = '../support/dataset.ttl' const datasetAbsolutePath = new URL(datasetPath, import.meta.url).toString() async function getRDFDataset(filePath) { - return rdf.dataset().import(getRDFStream(filePath)) + return fromStream(rdf.dataset(), getRDFStream(filePath)) } function getRDFStream(filePath) { @@ -40,14 +41,14 @@ describe('metadata.lfetch', () => { it('with defaults, should get the same dataset', async () => { const expected = await getRDFDataset(datasetPath) const { quadStream } = await localFetch(getRDFStream(datasetPath)) - const actual = await rdf.dataset().import(quadStream) + const actual = await fromStream(rdf.dataset(), quadStream) equal(expected.equals(actual), true) }) it('with filename and base, should get the same dataset', async () => { const expected = await getRDFDataset(datasetPath) const { quadStream } = await localFetch(datasetPath, resolve('./test/ldfetch')) - const actual = await rdf.dataset().import(quadStream) + const actual = await fromStream(rdf.dataset(), quadStream) equal(expected.equals(actual), true) }) @@ -55,7 +56,7 @@ describe('metadata.lfetch', () => { it('with absolute filename, should get the same dataset', async () => { const expected = await getRDFDataset(datasetPath) const { quadStream } = await localFetch(datasetAbsolutePath) - const actual = await rdf.dataset().import(quadStream) + const actual = await fromStream(rdf.dataset(), quadStream) equal(expected.equals(actual), true) }) @@ -63,7 +64,7 @@ describe('metadata.lfetch', () => { it('with absolute filename, should ignore basePath and get the same dataset', async () => { const expected = await getRDFDataset(datasetPath) const { quadStream } = await localFetch(datasetAbsolutePath, '/unknown/') - const actual = await rdf.dataset().import(quadStream) + const actual = await fromStream(rdf.dataset(), quadStream) equal(expected.equals(actual), true) }) @@ -89,7 +90,7 @@ describe('metadata.lfetch', () => { const expected = await getRDFDataset(datasetPath) const { quadStream } = await localFetch('https://example.com/metadata.ttl') - const actual = await rdf.dataset().import(quadStream) + const actual = await fromStream(rdf.dataset(), quadStream) equal(expected.equals(actual), true) }) diff --git a/packages/rdf/test/mapMatch.test.js b/packages/rdf/test/mapMatch.test.js index 1760a85f..c185a756 100644 --- a/packages/rdf/test/mapMatch.test.js +++ b/packages/rdf/test/mapMatch.test.js @@ -1,7 +1,7 @@ import { strictEqual } from 'assert' import getStream from 'get-stream' import { isDuplexStream } from 'is-stream' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Readable } from 'readable-stream' import mapMatch from '../mapMatch.js' import * as ns from './support/namespaces.js' @@ -129,7 +129,7 @@ describe('mapMatch', () => { strictEqual(quads[1].equals(seen[1]), true) }) - it('should assign rdf-ext as rdf to the this context', async () => { + it('should assign @zazuko/env as rdf to the this context', async () => { let context = null const quads = [ rdf.quad(ns.ex.subject1, ns.ex.predicate1, ns.ex.object1, ns.ex.graph1), diff --git a/packages/rdf/test/membership.test.js b/packages/rdf/test/membership.test.js index 8ea236ce..95744291 100644 --- a/packages/rdf/test/membership.test.js +++ b/packages/rdf/test/membership.test.js @@ -1,19 +1,15 @@ import { equal, strictEqual, throws } from 'assert' import getStream from 'get-stream' import { isDuplexStream as isDuplex } from 'is-stream' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Readable } from 'readable-stream' +import toCanonical from 'rdf-dataset-ext/toCanonical.js' import append from '../lib/append.js' import { toTarget, fromSource } from '../lib/membership.js' import * as ns from '../lib/namespaces.js' const ex = rdf.namespace('http://example.org/') -function toCanonical(quads) { - const dataset = rdf.dataset().addAll(quads) - return dataset.toCanonical() -} - describe('membership.toTarget', () => { it('should be a factory', () => { strictEqual(typeof append, 'function') @@ -70,7 +66,7 @@ describe('membership.toTarget', () => { equal( toCanonical(result), - toCanonical([...data, ...expectedMetadata]), + toCanonical(rdf.dataset([...data, ...expectedMetadata])), ) }) @@ -100,7 +96,7 @@ describe('membership.toTarget', () => { equal( toCanonical(result), - toCanonical([...data, ...expectedMetadata]), + toCanonical(rdf.dataset([...data, ...expectedMetadata])), ) }) }) @@ -161,7 +157,7 @@ describe('membership.fromSource', () => { equal( toCanonical(result), - toCanonical([...data, ...expectedMetadata]), + toCanonical(rdf.dataset([...data, ...expectedMetadata])), ) }) @@ -191,7 +187,7 @@ describe('membership.fromSource', () => { equal( toCanonical(result), - toCanonical([...data, ...expectedMetadata]), + toCanonical(rdf.dataset([...data, ...expectedMetadata])), ) }) }) diff --git a/packages/rdf/test/metadata/applyOptions.test.js b/packages/rdf/test/metadata/applyOptions.test.js index 6250508f..5ee08c67 100644 --- a/packages/rdf/test/metadata/applyOptions.test.js +++ b/packages/rdf/test/metadata/applyOptions.test.js @@ -1,5 +1,5 @@ import { strictEqual } from 'assert' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Readable } from 'readable-stream' import { applyOptions } from '../../lib/metadata/applyOptions.js' import * as ns from '../../lib/namespaces.js' diff --git a/packages/rdf/test/setGraph.test.js b/packages/rdf/test/setGraph.test.js index 34912f86..11511889 100644 --- a/packages/rdf/test/setGraph.test.js +++ b/packages/rdf/test/setGraph.test.js @@ -1,7 +1,7 @@ import { strictEqual } from 'assert' import getStream from 'get-stream' import { isDuplexStream as isDuplex } from 'is-stream' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Readable } from 'readable-stream' import setGraph from '../setGraph.js' import * as ns from './support/namespaces.js' diff --git a/packages/rdf/test/support/createObservationsStream.js b/packages/rdf/test/support/createObservationsStream.js index f58f7812..83aaef04 100644 --- a/packages/rdf/test/support/createObservationsStream.js +++ b/packages/rdf/test/support/createObservationsStream.js @@ -1,5 +1,5 @@ import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Readable } from 'readable-stream' import * as ns from './namespaces.js' diff --git a/packages/rdf/test/support/datasetStreamToClownface.js b/packages/rdf/test/support/datasetStreamToClownface.js index 655caf8a..072e7057 100644 --- a/packages/rdf/test/support/datasetStreamToClownface.js +++ b/packages/rdf/test/support/datasetStreamToClownface.js @@ -1,11 +1,12 @@ import clownface from 'clownface' import getStream from 'get-stream' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' +import addAll from 'rdf-dataset-ext/addAll.js' async function datasetStreamToClownface(stream) { const datasets = await getStream.array(stream) - return clownface({ dataset: datasets.reduce((all, current) => all.addAll(current), rdf.dataset()) }) + return clownface({ dataset: datasets.reduce((all, current) => addAll(all, current), rdf.dataset()) }) } export default datasetStreamToClownface diff --git a/packages/rdf/test/support/namespaces.js b/packages/rdf/test/support/namespaces.js index b9db1dbb..910fb5ad 100644 --- a/packages/rdf/test/support/namespaces.js +++ b/packages/rdf/test/support/namespaces.js @@ -1,4 +1,4 @@ -import $rdf from 'rdf-ext' +import $rdf from '@zazuko/env' const cube = $rdf.namespace('https://cube.link/') const ex = $rdf.namespace('http://example.org/') diff --git a/packages/rdf/test/voidStats.test.js b/packages/rdf/test/voidStats.test.js index 29ee15c7..09675df2 100644 --- a/packages/rdf/test/voidStats.test.js +++ b/packages/rdf/test/voidStats.test.js @@ -2,8 +2,9 @@ import { equal, strictEqual } from 'assert' import assertThrows from 'assert-throws-async' import getStream from 'get-stream' import { isDuplexStream as isDuplex } from 'is-stream' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import { Readable } from 'readable-stream' +import toCanonical from 'rdf-dataset-ext/toCanonical.js' import * as ns from '../lib/namespaces.js' import voidStats from '../lib/voidStats.js' @@ -30,11 +31,6 @@ describe('metadata.voidStats', () => { strictEqual(isDuplex(step), true) }) - function toCanonical(quads) { - const dataset = rdf.dataset().addAll(quads) - return dataset.toCanonical() - } - it('includes counts at the end of the stream', async () => { const data = [ rdf.quad(ex.bob, ns.rdf.type, ex.Person), diff --git a/packages/sparql/package.json b/packages/sparql/package.json index 50477b76..c9711af9 100644 --- a/packages/sparql/package.json +++ b/packages/sparql/package.json @@ -23,11 +23,12 @@ "sparql-http-client": "^2.4.0" }, "devDependencies": { + "@tpluscode/rdf-string": "^1.0.3", + "@zazuko/env": "^1.0.1", "get-stream": "^6.0.0", "isstream": "^0.1.2", "mocha": "^9.0.2", - "nock": "^13.1.1", - "rdf-ext": "^2.2.0" + "nock": "^13.1.1" }, "engines": { "node": ">= 14.0.0" diff --git a/packages/sparql/test/construct.test.js b/packages/sparql/test/construct.test.js index fe35d148..164c721b 100644 --- a/packages/sparql/test/construct.test.js +++ b/packages/sparql/test/construct.test.js @@ -2,7 +2,8 @@ import { strictEqual } from 'assert' import getStream from 'get-stream' import { isReadable, isWritable } from 'isstream' import nock from 'nock' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' +import { turtle } from '@tpluscode/rdf-string' import construct from '../construct.js' import * as ns from './support/namespaces.js' @@ -62,11 +63,13 @@ describe('construct', () => { }) it('should parse the response', async () => { - const quad0 = rdf.quad(ns.ex(''), ns.ex.p, rdf.literal('0')) - const quad1 = rdf.quad(ns.ex(''), ns.ex.p, rdf.literal('0')) + const quads = [ + rdf.quad(ns.ex(''), ns.ex.p, rdf.literal('0')), + rdf.quad(ns.ex(''), ns.ex.p, rdf.literal('0')), + ] const endpoint = new URL('http://example.org/parse-response') const query = 'CONSTRUCT { ?s ?p ?o } WHERE { ?s ?p ?o }' - const content = [quad0.toString(), quad1.toString()].join('\n') + const content = turtle`${quads}`.toString() nock(endpoint.origin) .get(`${endpoint.pathname}?query=${encodeURIComponent(query)}`) @@ -75,8 +78,8 @@ describe('construct', () => { const result = await getStream.array(await construct({ endpoint, query })) strictEqual(result.length, 2) - strictEqual(quad0.equals(result[0]), true) - strictEqual(quad0.equals(result[1]), true) + strictEqual(quads[0].equals(result[0]), true) + strictEqual(quads[0].equals(result[1]), true) }) it('should support authentication headers', async () => { diff --git a/packages/sparql/test/support/namespaces.js b/packages/sparql/test/support/namespaces.js index 245a3402..4e3a3cc9 100644 --- a/packages/sparql/test/support/namespaces.js +++ b/packages/sparql/test/support/namespaces.js @@ -1,5 +1,5 @@ import namespace from '@rdfjs/namespace' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' const ex = namespace('http://example.org/', { factory: rdf }) diff --git a/test/e2e/asyncLoaders.js b/test/e2e/asyncLoaders.js index 68685614..7a6a7c15 100644 --- a/test/e2e/asyncLoaders.js +++ b/test/e2e/asyncLoaders.js @@ -1,5 +1,4 @@ -import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' // eslint-disable-next-line import/default import ecmaScriptModuleLoader from 'rdf-loader-code/ecmaScriptModule.js' @@ -12,7 +11,7 @@ promisedEcmaScriptLoader.register = registry => { } async function promisedUrlLoader({ term, dataset }) { - return clownface({ dataset, term }) + return rdf.clownface({ dataset, term }) .out(rdf.namedNode('http://example.org/url')) .value } diff --git a/test/e2e/package.json b/test/e2e/package.json index 268acf1d..e4b636a5 100644 --- a/test/e2e/package.json +++ b/test/e2e/package.json @@ -7,14 +7,13 @@ "test": "mocha *.test.js" }, "dependencies": { + "@zazuko/env": "^1.0.1", "barnard59-core": "^2.0.2", "barnard59-http": "^1.1.0", - "clownface": "^1.5.1", "get-stream": "^6.0.0", "nock": "^13.3.1", "barnard59-test-support": "^0.0.0", "readable-stream": "^3", - "rdf-ext": "^2.2.0", "rdf-loader-code": "^0.3.3" } } diff --git a/test/support/loadPipelineDefinition.js b/test/support/loadPipelineDefinition.js index 634cd44c..33fc9ed7 100644 --- a/test/support/loadPipelineDefinition.js +++ b/test/support/loadPipelineDefinition.js @@ -1,9 +1,9 @@ import { resolve } from 'path' import * as url from 'url' -import clownface from 'clownface' -import rdf from 'rdf-ext' +import rdf from '@zazuko/env' import fromFile from 'rdf-utils-fs/fromFile.js' import namespace from '@rdfjs/namespace' +import fromStream from 'rdf-dataset-ext/fromStream.js' const ex = namespace('http://example.org/pipeline/') @@ -13,8 +13,8 @@ export function pipelineDefinitionLoader(baseUrl, path = 'support/definitions') return async (name, { term = ex('') } = {}) => { const filename = resolve(basePath, `${path}/${name}.ttl`) const stream = fromFile(filename) - const dataset = await rdf.dataset().import(stream) + const dataset = await fromStream(rdf.dataset(), stream) - return clownface({ dataset, term }) + return rdf.clownface({ dataset, term }) } } diff --git a/test/support/package.json b/test/support/package.json index 227d851b..214be071 100644 --- a/test/support/package.json +++ b/test/support/package.json @@ -5,8 +5,8 @@ "type": "module", "dependencies": { "@rdfjs/namespace": "^2.0.0", - "clownface": "^1.5.1", - "rdf-ext": "^2.2.0", + "@zazuko/env": "^1.0.1", + "rdf-dataset-ext": "^1.0.1", "rdf-utils-fs": "^2.3.0" } }