Skip to content

Commit

Permalink
Migrate to @rdfjs/types
Browse files Browse the repository at this point in the history
  • Loading branch information
@rubensworks
rubensworks committed Aug 11, 2021
1 parent cef799f commit 7b4dca3
Show file tree
Hide file tree
Showing 13 changed files with 73 additions and 45 deletions.
2 changes: 1 addition & 1 deletion lib/matchers/toBeRdfDatasetContaining.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as RDF from 'rdf-js';
import * as RDF from '@rdfjs/types';
import { quadToStringQuad } from 'rdf-string';

function quadArrayToString<Q extends RDF.BaseQuad = RDF.Quad>(quadArray: Q[]): string {
Expand Down
2 changes: 1 addition & 1 deletion lib/matchers/toBeRdfDatasetMatching.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as RDF from 'rdf-js';
import * as RDF from '@rdfjs/types';

export interface IQuadTerms<Q extends RDF.BaseQuad = RDF.Quad> {
subject?: Q['subject'];
Expand Down
2 changes: 1 addition & 1 deletion lib/matchers/toBeRdfDatasetOfSize.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as RDF from 'rdf-js';
import * as RDF from '@rdfjs/types';

export default {
toBeRdfDatasetOfSize<Q extends RDF.BaseQuad = RDF.Quad>(dataset: RDF.DatasetCore<Q>, expected: number) {
Expand Down
2 changes: 1 addition & 1 deletion lib/matchers/toBeRdfIsomorphic.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {isomorphic} from "rdf-isomorphic";
import * as RDF from "rdf-js";
import * as RDF from "@rdfjs/types";
import {quadToStringQuad} from "rdf-string";

function quadArrayToString<Q extends RDF.BaseQuad = RDF.Quad>(quadArray: Q[]): string {
Expand Down
2 changes: 1 addition & 1 deletion lib/matchers/toEqualRdfQuad.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as RDF from "rdf-js";
import * as RDF from "@rdfjs/types";
import {quadToStringQuad} from "rdf-string";
import M from "./toEqualRdfTerm";

Expand Down
2 changes: 1 addition & 1 deletion lib/matchers/toEqualRdfQuadArray.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as RDF from "rdf-js";
import * as RDF from "@rdfjs/types";
import {quadToStringQuad} from "rdf-string";
import M from "./toEqualRdfQuad";

Expand Down
2 changes: 1 addition & 1 deletion lib/matchers/toEqualRdfTerm.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as RDF from "rdf-js";
import * as RDF from "@rdfjs/types";
import {termToString} from "rdf-string";

function fail(received: RDF.Term, actual: RDF.Term) {
Expand Down
2 changes: 1 addition & 1 deletion lib/matchers/toEqualRdfTermArray.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as RDF from "rdf-js";
import * as RDF from "@rdfjs/types";
import {termToString} from "rdf-string";
import M from "./toEqualRdfTerm";

Expand Down
13 changes: 5 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,16 @@
"@types/jest": "^26.0.0",
"@types/node": "^13.1.0",
"@types/rdf-dataset-indexed": "^0.4.3",
"@types/rdf-js": "^4.0.0",
"coveralls": "^3.0.0",
"jest": "^26.0.0",
"manual-git-changelog": "^1.0.0",
"pre-commit": "^1.2.2",
"rdf-data-factory": "^1.0.1",
"rdf-data-factory": "^1.1.0",
"rdf-dataset-indexed": "^0.4.0",
"ts-jest": "^26.0.0",
"tslint": "^6.0.0",
"tslint-eslint-rules": "^5.3.1",
"typescript": "^3.0.1"
"typescript": "^4.3.5"
},
"jest": {
"setupFilesAfterEnv": [
Expand Down Expand Up @@ -75,10 +74,8 @@
"version": "manual-git-changelog onversion"
},
"dependencies": {
"rdf-isomorphic": "^1.2.0",
"rdf-string": "^1.5.0"
},
"resolutions": {
"@types/rdf-js": "^4.0.0"
"@rdfjs/types": "*",
"rdf-isomorphic": "^1.3.0",
"rdf-string": "^1.6.0"
}
}
2 changes: 1 addition & 1 deletion test/matchers/toBeRdfIsomorphic-test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DataFactory } from 'rdf-data-factory';
import datasetFactory = require('rdf-dataset-indexed');
import * as RDF from "rdf-js";
import * as RDF from "@rdfjs/types";
import "../../index";

const DF = new DataFactory();
Expand Down
2 changes: 1 addition & 1 deletion test/matchers/toEqualRdfQuad-test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DataFactory } from 'rdf-data-factory';
import * as RDF from "rdf-js";
import * as RDF from "@rdfjs/types";
import "../../index";

const DF = new DataFactory();
Expand Down
2 changes: 1 addition & 1 deletion test/matchers/toEqualRdfQuadArray-test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DataFactory } from 'rdf-data-factory';
import * as RDF from "rdf-js";
import * as RDF from "@rdfjs/types";
import "../../index";

const DF = new DataFactory();
Expand Down
83 changes: 57 additions & 26 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,13 @@
dependencies:
"@types/rdf-js" "^2.0.1"

"@rdfjs/types@*":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@rdfjs/types/-/types-1.0.1.tgz#92908a13bc88c71b349b332f3db19178282d6f4e"
integrity sha512-YxVkH0XrCNG3MWeZxfg596GFe+oorTVusmNxRP6ZHTsGczZ8AGvG3UchRNkg3Fy4MyysI7vBAA5YZbESL+VmHQ==
dependencies:
"@types/node" "*"

"@sinonjs/commons@^1.7.0":
version "1.7.2"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
Expand Down Expand Up @@ -664,13 +671,20 @@
dependencies:
"@types/rdf-js" "*"

"@types/rdf-js@*", "@types/rdf-js@^2.0.1", "@types/rdf-js@^4.0.0":
"@types/rdf-js@*":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@types/rdf-js/-/rdf-js-4.0.0.tgz#96f7314b09b77ecd16fca7f358db90db8ac86d1b"
integrity sha512-2uaR7ks0380MqzUWGOPOOk9yZIr/6MOaCcaj3ntKgd2PqNocgi8j5kSHIJTDe+5ABtTHqKMSE0v0UqrsT8ibgQ==
dependencies:
"@types/node" "*"

"@types/rdf-js@^2.0.1":
version "2.0.12"
resolved "https://registry.yarnpkg.com/@types/rdf-js/-/rdf-js-2.0.12.tgz#d305a0b6fd105e33f58d5c1b3de33ff8edcb3210"
integrity sha512-NBzHFHp2vHOJkPlSqzsOrkEsD9grKn+PdFjZieIw59pc0FlRG6WEQAjQZvHzFxJlYzC6ZDCFyTA1wBvUnnzUQw==
dependencies:
"@types/node" "*"

"@types/stack-utils@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
Expand Down Expand Up @@ -1800,6 +1814,14 @@ has-values@^1.0.0:
is-number "^3.0.0"
kind-of "^4.0.0"

hash.js@^1.1.7:
version "1.1.7"
resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
dependencies:
inherits "^2.0.3"
minimalistic-assert "^1.0.1"

hosted-git-info@^2.1.4:
version "2.8.5"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
Expand Down Expand Up @@ -2839,6 +2861,11 @@ mimic-fn@^2.1.0:
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==

minimalistic-assert@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==

minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
Expand Down Expand Up @@ -3285,12 +3312,12 @@ quick-lru@^1.0.0:
resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=

rdf-data-factory@^1.0.0, rdf-data-factory@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/rdf-data-factory/-/rdf-data-factory-1.0.1.tgz#60e84acae11135466fcb3f9176e3ff8ed6eb5a60"
integrity sha512-T8EJT4FqcQHRyLnb8erdmO7QXYhfO5YyklVbbaQkvdaGwmYB/4AcYJ0co6fBobcPDnYd2fJObSKP99+y8sGKiw==
rdf-data-factory@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/rdf-data-factory/-/rdf-data-factory-1.1.0.tgz#d0510b9f100dd79e94f29559a12d4a5a585054d6"
integrity sha512-g8feOVZ/KL1OK2Pco/jDBDFh4m29QDsOOD+rWloG9qFvIzRFchGy2CviLUX491E0ByewXxMpaq/A3zsWHQA16A==
dependencies:
"@types/rdf-js" "^4.0.0"
"@rdfjs/types" "*"

rdf-dataset-indexed@^0.4.0:
version "0.4.0"
Expand All @@ -3300,28 +3327,32 @@ rdf-dataset-indexed@^0.4.0:
"@rdfjs/data-model" "^1.1.1"
readable-stream "^3.3.0"

rdf-isomorphic@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/rdf-isomorphic/-/rdf-isomorphic-1.2.0.tgz#8175b499bbd6de0a2c5e24138ea2c6765f6a2edc"
integrity sha512-Dq+iuWrVuK7q3P4/nychbWhRJ1M5yMAekNJN8f5pjarE8SH9Duy/R0JopVF0I0Q2w0poZlsVKKIBpeG+AdOSAw==
rdf-isomorphic@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/rdf-isomorphic/-/rdf-isomorphic-1.3.0.tgz#6a1ad38b27c5ebed8a5f752b15f81988f48f8e22"
integrity sha512-3BRwUwCNHHR8//bqmVH+knTFVbVfkp7CWyQk7qPHHA8JriXBYxrab21OomjJx/2KF21w8bWz344mgNYEaQABYQ==
dependencies:
rdf-string "^1.5.0"
rdf-terms "^1.6.2"
"@rdfjs/types" "*"
hash.js "^1.1.7"
rdf-string "^1.6.0"
rdf-terms "^1.7.0"

rdf-string@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/rdf-string/-/rdf-string-1.5.0.tgz#5d0118f8788fe509f06d8cefc181fd979d712412"
integrity sha512-3TEJuDIKUADgZrfcZG+zAN4GfVA1Ei2sKA7Z7QVHkAE36wWoRGPJbGihPQMldgzvy9lG2nzZU+CXz+6oGSQNsQ==
rdf-string@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/rdf-string/-/rdf-string-1.6.0.tgz#571436284274b532af72329ff5168da876a4dc32"
integrity sha512-6vQVlEobIHralPtx8V9vtgxA+fwnzZjZv6lRz8dfymILZF6Fl3QJwyRaOAvYaUQc1JMmshGI/wlYlaxin2AldQ==
dependencies:
rdf-data-factory "^1.0.0"
"@rdfjs/types" "*"
rdf-data-factory "^1.1.0"

rdf-terms@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/rdf-terms/-/rdf-terms-1.6.2.tgz#e31ad9023e0ee163dafa3dd847410c61556d0d57"
integrity sha512-dASpdYHYLEwzN9iSymJie1WUj6VHXy1By8Am4g2rJlhTfVvNitsJpDY+A3X2QehlGhCaWjHMzXS4q/JKNPI80A==
rdf-terms@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/rdf-terms/-/rdf-terms-1.7.0.tgz#2e6cd86346c5ec1640f4661f04dad03596b48beb"
integrity sha512-K83ACD+MuWFS3mNxwCRNYQAmc/Z9iK7PgqJq9N4VP8sUVlP7ioB2pPNQHKHy0IQh4RTkEq6fg4R4q7YlweLBZQ==
dependencies:
"@rdfjs/types" "*"
lodash.uniqwith "^4.5.0"
rdf-data-factory "^1.0.1"
rdf-data-factory "^1.1.0"

react-is@^16.12.0:
version "16.12.0"
Expand Down Expand Up @@ -4148,10 +4179,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@^3.0.1:
version "3.7.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
typescript@^4.3.5:
version "4.3.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==

union-value@^1.0.0:
version "1.0.1"
Expand Down

0 comments on commit 7b4dca3

Please sign in to comment.