Merge branch 'master' into issue-380

Author: gkellogg

.travis.yml

@@ -35,7 +35,7 @@ jobs:
         - 'gem update bundler --conservative'
       script:
         - docker pull stupchiy/checklink
-        - docker run -it stupchiy/checklink -b -X '(http|https|mailto):' "https://labs.w3.org/spec-generator/?type=respec&url=https://rawgit.com/w3c/json-ld-api/${TRAVIS_BRANCH}/index.html?specStatus=WD&shortName=json-ld11-api"
+        - docker run -it stupchiy/checklink -b -X '(http|https|mailto):' "https://labs.w3.org/spec-generator/?type=respec&url=https://raw.githack.com/w3c/json-ld-api/${TRAVIS_BRANCH}/index.html?specStatus=WD&shortName=json-ld11-api"
         - bundle exec rake check_html
     - stage: echidna
       name: "Echidna Publication"

README.md

@@ -5,6 +5,10 @@
 
 This is the repository of the W3C’s specification on JSON-LD 1.1 Processing Algorithms and API, developed by the [JSON-LD Working Group](https://www.w3.org/2018/json-ld-wg/). The editors’ draft of the specification can also be [read directly](https://w3c.github.io/json-ld-api/).
 
+## Submitting Implementation Reports
+
+We are actively seeking JSON-LD 1.1 API implementations! Please [read the instructions](https://w3c.github.io/json-ld-api/reports/#instructions-for-submitting-implementation-reports) and submit your report by either emailing it to `[email protected]` or by [sending a Pull Request to this repository](https://github.com/w3c/json-ld-api/pulls).
+
 ## Feature Frozen
 
 We are no longer accepting new feature requests for JSON-LD 1.1 drafts. Please limit

Rakefile

@@ -22,3 +22,32 @@ task :check_html do
     exit(1)
   end
 end
+
+desc "Create concatenated test manifests for reporting"
+file "reports/manifests.nt" do
+  require 'rdf'
+  require 'json/ld'
+  require 'rdf/ntriples'
+  graph = RDF::Graph.new do |g|
+    %w( https://w3c.github.io/json-ld-api/tests/compact-manifest.jsonld
+        https://w3c.github.io/json-ld-api/tests/expand-manifest.jsonld
+        https://w3c.github.io/json-ld-api/tests/flatten-manifest.jsonld
+        https://w3c.github.io/json-ld-api/tests/fromRdf-manifest.jsonld
+        https://w3c.github.io/json-ld-api/tests/html-manifest.jsonld
+        https://w3c.github.io/json-ld-api/tests/remote-doc-manifest.jsonld
+        https://w3c.github.io/json-ld-api/tests/toRdf-manifest.jsonld
+        https://w3c.github.io/json-ld-framing/tests/frame-manifest.jsonld
+    ).each do |man|
+      puts "load #{man}"
+      local_man = if man.include?('json-ld-api')
+        basename = File.basename(man)
+        File.expand_path("../tests/#{basename}", __FILE__)
+      else
+        man
+      end
+      g.load(local_man, base_uri: man, unique_bnodes: true)
+    end
+  end
+  puts "write"
+  RDF::NTriples::Writer.open("reports/manifests.nt", unique_bnodes: true, validate: false) {|w| w << graph}
+end

common/algorithm-terms.html

@@ -9,28 +9,36 @@
     which is used for finding coercion mappings in the <a>active contexta>.dd>
   <dt><dfn data-cite="JSON-LD11-API#dfn-active-subject">active subjectdfn>dt><dd>
     The currently active subject that the processor should use when processing.dd>
-  <dt class="changed"><dfn data-cite="JSON-LD11-API#add-value">add valuedfn>dt>
+  <dt class="changed"><dfn data-cite="JSON-LD11-API#dfn-add-value">add valuedfn>dt>
   <dd class="algorithm changed">
     Used as a macro within various algorithms as a way to add a <var>valuevar>
     to an <a>entrya> in a <a>mapa> (<var>objectvar>) using a specified <var>keyvar>.
     The invocation may include an <var>as arrayvar> flag defaulting to <code>falsecode>.
     <ol>
-      <li>If <var>as arrayvar> is <code>truecode>,
-        and <var>valuevar> is not an <a>arraya>,
-        set it to an <a>arraya> containing <var>valuevar>.li>
-      <li>If <var>keyvar> is not an entry in <var>objectvar>,
-        add <var>valuevar> as the value of <var>keyvar> in <var>objectvar>.li>
-      <li>Otherwise
+      <li>If <var>as arrayvar> is <code>truecode>
+        and the value of <var>keyvar> in <var>objectvar> does not exist
+        or is not an <a>arraya>, set it to a new <a>arraya>
+        containing any original value.li>
+      <li>If <var>valuevar> is an <a>arraya>,
+        then for each element <var>vvar> in <var>valuevar>,
+        use <a>add valuea> recursively to add <var>vvar> to <var>keyvar> in <var>entryvar>.li>
+      <li>Otherwise:
         <ol>
-          <li>If the value of <var>keyvar> <a>entrya> in <var>objectvar> is not an <a>arraya>,
-            set it to a new <a>arraya> containing the original value.li>
-          <li>If <var>valuevar> is an <a>arraya>, concatenate <var>valuevar>
-            to that <a>entrya>.li>
-          <li>Otherwise, append <var>valuevar> to that <a>entrya>.li>
+          <li>If <var>keyvar> is not an entry in <var>objectvar>,
+            add <var>valuevar> as the value of <var>keyvar> in <var>objectvar>.li>
+          <li>Otherwise
+            <ol>
+              <li>If the value of the <var>keyvar> <a>entrya> in <var>objectvar> is not an <a>arraya>,
+                set it to a new <a>arraya> containing the original value.li>
+              <li>Append <var>valuevar>
+                to the value of the <var>keyvar> <a>entrya> in <var>objectvar>.li>
+            ol>
+          li>
         ol>
+      li>
     ol>
   dd>
-  <dt><dfn data-cite="JSON-LD11-FRAMING#dfn-expicit-inclusion-flag">explicit inclusion flagdfn>dt><dd>
+  <dt><dfn data-cite="JSON-LD11-FRAMING#dfn-explicit-inclusion-flag">explicit inclusion flagdfn>dt><dd>
     A flag specifying that for <a>propertiesa> to be included in the output,
     they must be explicitly declared in the matching <a>framea>.dd>
   <dt><dfn data-cite="JSON-LD11-FRAMING#dfn-framing-state">framing statedfn>dt><dd>
@@ -70,7 +78,7 @@
     the <var>document relativevar> flag defaults to `false`,
     and the <var>vocabvar> flag defaults to `true`.
     <ol>
-      <li>Return the result of using the <a href="#iri-expansion">IRI Expansion algorithma>,
+      <li>Return the result of using the <a data-cite="JSON-LD11-API#iri-expansion">IRI Expansion algorithma>,
         passing <var>active contextvar>,
         <var>valuevar>,
         <var>local contextvar> (if supplied),
@@ -81,7 +89,7 @@
   dd>
   <dt><dfn data-cite="JSON-LD11-FRAMING#dfn-input-frame">input framedfn>dt><dd>
     The initial <a>Framea> provided to the framing algorithm.dd>
-  <dt><dfn data-cite="JSON-LD11-API#dfn-json-ld-input">JSON-LD inputdfn>dt><dd>
+  <dt><dfn data-cite="JSON-LD11-API#dfn-json-ld-input" class="preserve">JSON-LD inputdfn>dt><dd>
     The JSON-LD data structure that is provided as input to the algorithm.dd>
   <dt><dfn data-cite="JSON-LD11-API#dfn-json-ld-output">JSON-LD outputdfn>dt><dd>
     The JSON-LD data structure that is produced as output by the algorithm.dd>

common/common.js

@@ -1,149 +1,32 @@
-/* globals omitTerms, respecConfig, $, require */
+/* globals require */
 /* JSON-LD Working Group common spec JavaScript */
-// We should be able to remove terms that are not actually
-// referenced from the common definitions
-//
-// Add class "preserve" to a definition to ensure it is not removed.
-//
-// the termlist is in a block of class "termlist".
-const termNames = [] ;
-const termsReferencedByTerms = [] ;
-
-function restrictReferences(utils, content) {
-  const base = document.createElement("div");
-  base.innerHTML = content;
-
-  // New new logic:
-  //
-  // 1. build a list of all term-internal references
-  // 2. When ready to process, for each reference INTO the terms,
-  // remove any terms they reference from the termNames array too.
-  const noPreserve = base.querySelectorAll("dfn:not(.preserve)");
-  for (const item of noPreserve) {
-    const $t = $(item);
-    const titles = $t.getDfnTitles();
-    const n = $t.makeID("dfn", titles[0]);
-    if (n) {
-      termNames[n] = $t.parent();
-    }
-  }
-
-  const $container = $(".termlist", base) ;
-  const containerID = $container.makeID("", "terms") ;
-  return (base.innerHTML);
-}
 
+/*
+* Implement tabbed examples.
+*/
 require(["core/pubsubhub"], (respecEvents) => {
   "use strict";
 
-  respecEvents.sub('end', (message) => {
+  respecEvents.sub('end-all', (documentElement) => {
     // remove data-cite on where the citation is to ourselves.
-    const selfDfns = document.querySelectorAll("dfn[data-cite^='" + respecConfig.shortName.toUpperCase() + "#']");
+    const selfDfns = document.querySelectorAll("dfn[data-cite^='__SPEC__#']");
     for (const dfn of selfDfns) {
+      const anchor = dfn.querySelector('a');
+      if (anchor) {
+        const anchorContent = anchor.textContent;
+        dfn.removeChild(anchor);
+        dfn.textContent = anchorContent;
+      }
       delete dfn.dataset.cite;
     }
 
     // Update data-cite references to ourselves.
-    const selfRefs = document.querySelectorAll("a[data-cite^='" + respecConfig.shortName.toUpperCase() + "#']");
+    const selfRefs = document.querySelectorAll("a[data-cite^='__SPEC__#']");
     for (const anchor of selfRefs) {
       anchor.href= anchor.dataset.cite.replace(/^.*#/,"#");
       delete anchor.dataset.cite;
     }
-  });
 
-  // add a handler to come in after all the definitions are resolved
-  //
-  // New logic: If the reference is within a 'dl' element of
-  // class 'termlist', and if the target of that reference is
-  // also within a 'dl' element of class 'termlist', then
-  // consider it an internal reference and ignore it.
-  respecEvents.sub('end', (message) => {
-    if (message === 'core/link-to-dfn') {
-      // all definitions are linked; find any internal references
-      const internalTerms = document.querySelectorAll(".termlist a.internalDFN");
-      for (const item of internalTerms) {
-        const idref = item.getAttribute('href').replace(/^#/,"") ;
-        if (termNames[idref]) {
-          // this is a reference to another term
-          // what is the idref of THIS term?
-          const def = item.closest('dd');
-          if (def) {
-            const tid = def.previousElementSibling
-              .querySelector('dfn')
-              .getAttribute('id');
-            if (tid) {
-              if (termsReferencedByTerms[tid] === undefined) termsReferencedByTerms[tid] = [];
-              termsReferencedByTerms[tid].push(idref);
-            }
-          }
-        }
-      }
-
-      // clearRefs is recursive.  Walk down the tree of
-      // references to ensure that all references are resolved.
-      const clearRefs = (theTerm) => {
-        if (termsReferencedByTerms[theTerm] ) {
-          for (const item of termsReferencedByTerms[theTerm]) {
-            if (termNames[item]) {
-                delete termNames[item];
-                clearRefs(item);
-            }
-          }
-        };
-        // make sure this term doesn't get removed
-        if (termNames[theTerm]) {
-          delete termNames[theTerm];
-        }
-      };
-
-      // now termsReferencedByTerms has ALL terms that
-      // reference other terms, and a list of the
-      // terms that they reference
-      const internalRefs = document.querySelectorAll("a[data-link-type='dfn']");
-      for (const item of internalRefs) {
-        const idref = item.getAttribute('href').replace(/^.*#/,"") ;
-        // if the item is outside the term list
-        if (!item.closest('dl.termlist')) {
-          clearRefs(idref);
-        }
-      }
-
-      // delete any terms that were not referenced.
-      for (const term in termNames) {
-        const $p = $("#"+term);
-        // Remove term definitions inside a dt, where data-cite does not start with shortname
-        if ($p === undefined) { continue; }
-        if (!$p.parent().is("dt")) { continue; }
-        if (($p.data("cite") || "").toLowerCase().startsWith(respecConfig.shortName)) { continue; }
-
-        const $dt = $p.parent();
-        const $dd = $dt.next();
-
-        // If the associated dd contains a dfn which is _not_ in termNames, warn
-        if ($dd.children("dfn").length > 0) {
-          console.log(term + " definition contains definitions " + $dd.children("dfn").attr("id"))
-        }
-        console.log("drop term " + term);
-        const tList = $p.getDfnTitles();
-        $dd.remove(); // remove dd
-        $dt.remove(); // remove dt
-        // FIXME: this depended on an undocumented internal structure
-        //for (const item of tList) {
-        //  if (respecConfig.definitionMap[item]) {
-        //    delete respecConfig.definitionMap[item];
-        //  }
-        //}
-      }
-    }
-  });
-});
-
-/*
-* Implement tabbed examples.
-*/
-require(["core/pubsubhub"], (respecEvents) => {
-  "use strict";
-  respecEvents.sub('end-all', (documentElement) => {
     // Add playground links
     for (const link of document.querySelectorAll("a.playground")) {
       let pre;

common/jsonld.js

@@ -59,13 +59,13 @@ const jsonld = {
       status: 'unofficial',
       date: '29 May 2015'
     },
-    "JCS": {
+    "RFC8785": {
       title: "JSON Canonicalization Scheme (JCS)",
-      href: 'https://tools.ietf.org/html/draft-rundgren-json-canonicalization-scheme-17',
+      href: 'https://www.rfc-editor.org/rfc/rfc8785',
       authors: ['A. Rundgren', 'B. Jordan', 'S. Erdtman'],
       publisher: 'Network Working Group',
-      status: 'Internet-Draft',
-      date: '20 January 2020'
+      status: 'Informational',
+      date: 'June 2020'
     },
     // These necessary as specref uses the wrong URLs
     "RFC7231": {

common/terms.html

@@ -188,7 +188,7 @@
     An embedded <a>contexta> is a context which appears
     as the <code>@contextcode> <a>entrya> of one of the following:
     a <a>node objecta>, a <a>value objecta>, a <a>graph objecta>, a <a>list objecta>,
-    a <a>set objecta>, the value of a <a>nested propertiesa>,
+    a <a>set objecta>, the value of a <a>nested propertya>,
     or the value of an <a>expanded term definitiona>.
     Its value may be a <a>mapa> for a <a data-cite="JSON-LD11#dfn-context-definition">context definitiona>,
     as an <a>IRIa>, or as an <a>arraya> combining either of the above.
@@ -230,7 +230,7 @@
     Note that <a>node objectsa> may have a <code>@graphcode> <a>entrya>,
     but are not considered <a>graph objectsa> if they include any other <a>entriesa>.
     A top-level object consisting of <code>@graphcode> is also not a <a>graph objecta>.
-    Note that a <a>node objecta> may also represent a <a>named grapha> it it includes other properties.
+    Note that a <a>node objecta> may also represent a <a>named grapha> if it includes other properties.
     See the <a data-cite="JSON-LD11#graph-objects">Graph Objectsa> section of JSON-LD 1.1 for a normative description.
   dd>
   <dt class="changed"><dfn data-cite="JSON-LD11#dfn-id-map">id mapdfn>dt><dd class="changed">
@@ -302,7 +302,7 @@
     and normatively specified in the <a data-cite="JSON-LD11#keywords">Keywordsa> section of JSON-LD 1.1,
   dd>
   <dt><dfn data-cite="JSON-LD11#dfn-language-map">language mapdfn>dt><dd>
-    An <a>language mapa> is a <a>mapa> value of a <a>terma>
+    A <a>language mapa> is a <a>mapa> value of a <a>terma>
     defined with <code>@containercode> set to <code>@languagecode>,
     whose keys must be <a>stringsa> representing [[BCP47]] language codes
     and the values must be any of the following types:
@@ -391,11 +391,11 @@
     and a type,
     which is an <a>IRIa>.dd>
   <dt><dfn data-cite="JSON-LD11#dfn-value-object">value objectdfn>dt><dd>
-    A <a>value objecta> is a <a>mapa> that has an <code>@valuecode> <a>entrya>.dd>
+    A <a>value objecta> is a <a>mapa> that has an <code>@valuecode> <a>entrya>.
+    See the <a data-cite="JSON-LD11#value-objects">Value Objectsa> section of JSON-LD 1.1 for a normative description.dd>
   <dt><dfn data-cite="JSON-LD11#dfn-vocabulary-mapping" class="preserve">vocabulary mappingdfn>dt><dd>
     The vocabulary mapping is set in the <a>contexta> using the <code>@vocabcode> key
     whose value must be an <a>IRIa>, a <a>compact IRIa>, a <a>terma>, or <code>nullcode>.
-    See the <a data-cite="JSON-LD11#value-objects">Value Objectsa> section of JSON-LD 1.1 for a normative description.
-  dd>
+    See the <a data-cite="JSON-LD11#context-definitions">Context Definitionsa> section of JSON-LD 1.1 for a normative description.dd>
 dl>
 section>

common/typographical-conventions.html

@@ -15,7 +15,7 @@
     A reference to a definition <em>in this documentem>
     is underlined and is also an active link to the definition itself. dd>
   <dt><a data-lt="definition"><code>markup definition referencecode>a>dt><dd>
-    A references to a definition <em>in this documentem>,
+    References to a definition <em>in this documentem>,
     when the reference itself is also a markup, is underlined,
     red-orange monospace font, and is also an active link to the definition itself.dd>
   <dt><a class="externalDFN">external definition referencea>dt><dd>