Migrate to @rdfjs/types

Author: rubensworks

lib/IActiveTag.ts

@@ -1,4 +1,4 @@
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import {IRdfaPattern} from "./IRdfaPattern";
 
 /**

lib/IRdfaPattern.ts

@@ -1,4 +1,4 @@
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import {IActiveTag} from "./IActiveTag";
 
 /**

lib/RdfaParser.ts

@@ -1,7 +1,7 @@
 import {DomHandler} from "domhandler";
 import EventEmitter = NodeJS.EventEmitter;
 import {Parser as HtmlParser} from "htmlparser2";
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import {PassThrough, Transform, TransformCallback} from "stream";
 import {IActiveTag} from "./IActiveTag";
 import {IHtmlParseListener} from "./IHtmlParseListener";

lib/Util.ts

@@ -1,4 +1,4 @@
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import {resolve} from "relative-to-absolute-iri";
 import {IActiveTag} from "./IActiveTag";
 import {RDFA_CONTENTTYPES, RdfaProfile} from "./RdfaProfile";

package.json

@@ -28,9 +28,9 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/rdf-js": "*",
-    "rdf-data-factory": "^1.0.2",
+    "@rdfjs/types": "*",
     "htmlparser2": "^6.0.0",
+    "rdf-data-factory": "^1.1.0",
     "relative-to-absolute-iri": "^1.0.2"
   },
   "pre-commit": [
@@ -39,19 +39,18 @@
     "test"
   ],
   "devDependencies": {
-    "@types/rdf-js": "^4.0.0",
     "@types/jest": "^26.0.0",
     "@types/jest-each": "^24.3.0",
     "@types/node": "^13.1.0",
     "arrayify-stream": "^1.0.0",
     "coveralls": "^3.0.0",
     "jest": "^26.0.0",
     "jest-each": "^26.0.0",
-    "jest-rdf": "^1.6.0",
+    "jest-rdf": "^1.7.0",
     "manual-git-changelog": "^1.0.1",
     "pre-commit": "^1.2.2",
-    "rdf-test-suite": "^1.13.4",
     "rdf-quad": "^1.5.0",
+    "rdf-test-suite": "^1.13.4",
     "streamify-string": "^1.0.1",
     "ts-jest": "^26.0.0",
     "tslint": "^6.0.0",

test/RdfParser-test.ts

@@ -1,6 +1,6 @@
 import {DataFactory} from "rdf-data-factory";
 import "jest-rdf";
-import * as RDF from "rdf-js";
+import * as RDF from "@rdfjs/types";
 import {PassThrough} from "stream";
 import {RdfaParser} from "../lib/RdfaParser";
 import {RDFA_FEATURES} from "../lib/RdfaProfile";

yarn.lock

@@ -480,6 +480,13 @@
   dependencies:
     "@types/rdf-js" "*"
 
+"@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.8.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
@@ -1865,6 +1872,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.8"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
@@ -2408,13 +2423,14 @@ jest-pnp-resolver@^1.2.2:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-rdf@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/jest-rdf/-/jest-rdf-1.6.0.tgz#4e445230262b4c3088db445f9b097e14ed7086a4"
-  integrity sha512-eQKWVWrqs8YTZc9zTQn9j8njekePh2fs7fh3LhfPPNq7BQpAjQy/53JvKoAAMvXffBVb1egvZO07wmkFQUTtqg==
+jest-rdf@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/jest-rdf/-/jest-rdf-1.7.0.tgz#6c72c68efaba75a50db531704718db53af2799b7"
+  integrity sha512-BF8fR7Ahyco2d2YJmNio9AhzCagTtU865FKoFzq0jjRFFbN1oKyKh5TWyJU9JS0m9itWu/2VXTAoSlvx/G19xA==
   dependencies:
-    rdf-isomorphic "^1.2.0"
-    rdf-string "^1.5.0"
+    "@rdfjs/types" "*"
+    rdf-isomorphic "^1.3.0"
+    rdf-string "^1.6.0"
 
 jest-regex-util@^26.0.0:
   version "26.0.0"
@@ -3014,6 +3030,11 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+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"
@@ -3487,14 +3508,31 @@ rdf-data-factory@^1.0.0, rdf-data-factory@^1.0.1, rdf-data-factory@^1.0.2:
   dependencies:
     "@types/rdf-js" "^4.0.0"
 
-rdf-isomorphic@^1.1.0, rdf-isomorphic@^1.2.0:
+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:
+    "@rdfjs/types" "*"
+
+rdf-isomorphic@^1.1.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==
   dependencies:
     rdf-string "^1.5.0"
     rdf-terms "^1.6.2"
 
+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:
+    "@rdfjs/types" "*"
+    hash.js "^1.1.7"
+    rdf-string "^1.6.0"
+    rdf-terms "^1.7.0"
+
 rdf-literal@^1.0.0, rdf-literal@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/rdf-literal/-/rdf-literal-1.2.0.tgz#3159cce5587007144ea4a3a713cea31af4fc0c68"
@@ -3529,6 +3567,14 @@ rdf-string@^1.3.1, rdf-string@^1.5.0:
   dependencies:
     rdf-data-factory "^1.0.0"
 
+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:
+    "@rdfjs/types" "*"
+    rdf-data-factory "^1.1.0"
+
 rdf-terms@^1.4.0, rdf-terms@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/rdf-terms/-/rdf-terms-1.6.2.tgz#e31ad9023e0ee163dafa3dd847410c61556d0d57"
@@ -3537,6 +3583,15 @@ rdf-terms@^1.4.0, rdf-terms@^1.6.2:
     lodash.uniqwith "^4.5.0"
     rdf-data-factory "^1.0.1"
 
+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.1.0"
+
 rdf-test-suite@^1.13.4:
   version "1.13.4"
   resolved "https://registry.yarnpkg.com/rdf-test-suite/-/rdf-test-suite-1.13.4.tgz#ee678f15cc729afc70a7468d0cd3fde28942c037"