Update for latest rdf-canon changes.

Update for latest W3C RDF Dataset Canonicalization "rdf-canon" changes:
- test suite location
- README
- links
- identifiers

Author: davidlehn

CHANGELOG.md

@@ -1,5 +1,11 @@
 # jsonld ChangeLog
 
+## 8.1.2 - 2023-03-xx
+
+### Changed
+- Update for latest [rdf-canon][] changes: test suite location, README,
+  links, and identifiers.
+
 ## 8.1.1 - 2023-02-25
 
 ### Fixed
@@ -831,5 +837,6 @@
 
 [jsonld-cli]: https://github.com/digitalbazaar/jsonld-cli
 [jsonld-request]: https://github.com/digitalbazaar/jsonld-request
+[rdf-canon]: https://w3c.github.io/rdf-canon/
 [rdf-canonize]: https://github.com/digitalbazaar/rdf-canonize
 [rdf-canonize-native]: https://github.com/digitalbazaar/rdf-canonize-native

README.md

@@ -259,11 +259,11 @@ const framed = await jsonld.frame(doc, frame);
 // output transformed into a particular tree structure per the given frame
 ```
 
-### <a name="canonize"></a>[canonize](http://json-ld.github.io/normalization/spec/) (normalize)
+### <a name="canonize"></a>[canonize](https://w3c.github.io/rdf-canon/spec/) (normalize)
 
 ```js
-// canonize (normalize) a document using the RDF Dataset Normalization Algorithm
-// (URDNA2015), see:
+// canonize (normalize) a document using the RDF Dataset Canonicalization Algorithm
+// (URDNA2015):
 const canonized = await jsonld.canonize(doc, {
   algorithm: 'URDNA2015',
   format: 'application/n-quads'
@@ -398,7 +398,7 @@ the following:
     https://github.com/w3c/json-ld-api
     https://github.com/w3c/json-ld-framing
     https://github.com/json-ld/json-ld.org
-    https://github.com/json-ld/normalization
+    https://github.com/w3c/rdf-canon
 
 They should be sibling directories of the jsonld.js directory or in a
 `test-suites` dir. To clone shallow copies into the `test-suites` dir you can

package.json

@@ -92,12 +92,12 @@
     "prepack": "npm run build",
     "build": "npm run build-webpack",
     "build-webpack": "webpack",
-    "fetch-test-suites": "npm run fetch-json-ld-wg-test-suite && npm run fetch-json-ld-org-test-suite && npm run fetch-normalization-test-suite",
+    "fetch-test-suites": "npm run fetch-json-ld-wg-test-suite && npm run fetch-json-ld-org-test-suite && npm run fetch-rdf-canon-test-suite",
     "fetch-json-ld-wg-test-suite": "npm run fetch-json-ld-api-test-suite && npm run fetch-json-ld-framing-test-suite",
     "fetch-json-ld-api-test-suite": "if [ ! -e test-suites/json-wg-api ]; then git clone --depth 1 https://github.com/w3c/json-ld-api.git test-suites/json-ld-api; fi",
     "fetch-json-ld-framing-test-suite": "if [ ! -e test-suites/json-wg-framing ]; then git clone --depth 1 https://github.com/w3c/json-ld-framing.git test-suites/json-ld-framing; fi",
     "fetch-json-ld-org-test-suite": "if [ ! -e test-suites/json-ld.org ]; then git clone --depth 1 https://github.com/json-ld/json-ld.org.git test-suites/json-ld.org; fi",
-    "fetch-normalization-test-suite": "if [ ! -e test-suites/normalization ]; then git clone --depth 1 https://github.com/json-ld/normalization.git test-suites/normalization; fi",
+    "fetch-rdf-canon-test-suite": "if [ ! -e test-suites/rdf-canon ]; then git clone --depth 1 https://github.com/w3c/rdf-canon.git test-suites/rdf-canon; fi",
     "test": "npm run test-node",
     "test-node": "cross-env NODE_ENV=test mocha --delay -t 30000 -A -R ${REPORTER:-spec} tests/test.js",
     "test-karma": "cross-env NODE_ENV=test karma start",

tests/test-common.js

@@ -246,7 +246,7 @@ const TEST_TYPES = {
     ],
     compare: compareCanonizedExpectedNQuads
   },
-  'rdfn:Urgna2012EvalTest': {
+  'rdfc:Urgna2012EvalTest': {
     fn: 'normalize',
     params: [
       readTestNQuads('action'),
@@ -258,7 +258,7 @@ const TEST_TYPES = {
     ],
     compare: compareExpectedNQuads
   },
-  'rdfn:Urdna2015EvalTest': {
+  'rdfc:Urdna2015EvalTest': {
     fn: 'normalize',
     params: [
       readTestNQuads('action'),
@@ -593,8 +593,8 @@ function addTest(manifest, test, tests) {
         if(isJsonLdType(test, 'jld:NegativeEvaluationTest')) {
           await compareExpectedError(test, err);
         } else if(isJsonLdType(test, 'jld:PositiveEvaluationTest') ||
-          isJsonLdType(test, 'rdfn:Urgna2012EvalTest') ||
-          isJsonLdType(test, 'rdfn:Urdna2015EvalTest')) {
+          isJsonLdType(test, 'rdfc:Urgna2012EvalTest') ||
+          isJsonLdType(test, 'rdfc:Urdna2015EvalTest')) {
           if(err) {
             throw err;
           }

tests/test-karma.js

@@ -88,10 +88,10 @@ if(process.env.JSONLD_TESTS) {
     _top, '../json-ld.org/test-suite/tests/frame-manifests.jsonld'));
   */
 
-  // json-ld.org normalization test suite
+  // W3C RDF Dataset Canonicalization "rdf-canon" test suite
   // FIXME: add path detection
-  entries.push(join(_top, 'test-suites/normalization/tests'));
-  entries.push(join(_top, '../normalization/tests'));
+  entries.push(join(_top, 'test-suites/rdf-canon/tests'));
+  entries.push(join(_top, '../rdf-canon/tests'));
 
   // other tests
   entries.push(join(_top, 'tests/misc.js'));

tests/test.js

@@ -89,13 +89,13 @@ if(process.env.JSONLD_TESTS) {
   }
   */
 
-  // json-ld.org normalization test suite
-  const normPath = path.resolve(_top, 'test-suites/normalization/tests');
-  if(fs.existsSync(normPath)) {
-    entries.push(normPath);
+  // W3C RDF Dataset Canonicalization "rdf-canon" test suite
+  const rdfCanonPath = path.resolve(_top, 'test-suites/rdf-canon/tests');
+  if(fs.existsSync(rdfCanonPath)) {
+    entries.push(rdfCanonPath);
   } else {
     // default up to sibling dir
-    entries.push(path.resolve(_top, '../normalization/tests'));
+    entries.push(path.resolve(_top, '../rdf-canon/tests'));
   }
 
   // other tests