refactor(w3c/headers): pass additional* as option arguments (#2014)

* refactor: pass additionalContent as options

* childNodes

Author: saschanaz

src/w3c/headers.js

@@ -630,13 +630,6 @@ export function run(conf) {
     );
   }
 
-  if (conf.isTagFinding && !conf.additionalContent) {
-    pub(
-      "warn",
-      "ReSpec does not support automated SotD generation for TAG findings, " +
-        "please add the prerequisite content in the 'sotd' section"
-    );
-  }
   // Requested by https://github.com/w3c/respec/issues/504
   // Makes a record of a few auto-generated things.
   pub("amend-user-config", {
@@ -645,25 +638,36 @@ export function run(conf) {
   });
 }
 
+/**
+ * @param {*} conf
+ * @param {HTMLElement} sotd
+ */
 function populateSoTD(conf, sotd) {
   const sotdClone = sotd.cloneNode(true);
-  const additionalNodes = document.createDocumentFragment();
-  const additionalContent = document.createElement("temp");
+  const additionalContent = document.createDocumentFragment();
   // we collect everything until we hit a section,
   // that becomes the custom content.
   while (sotdClone.hasChildNodes()) {
     if (
       sotdClone.firstChild.nodeType !== Node.ELEMENT_NODE ||
       sotdClone.firstChild.localName !== "section"
     ) {
-      additionalNodes.appendChild(sotdClone.firstChild);
+      additionalContent.appendChild(sotdClone.firstChild);
       continue;
     }
     break;
   }
-  additionalContent.appendChild(additionalNodes);
-  conf.additionalContent = additionalContent.innerHTML;
-  // Whatever sections are left, we throw at the end.
-  conf.additionalSections = sotdClone.innerHTML;
-  return (conf.isCGBG ? cgbgSotdTmpl : sotdTmpl)(conf);
+  if (conf.isTagFinding && !additionalContent.hasChildNodes()) {
+    pub(
+      "warn",
+      "ReSpec does not support automated SotD generation for TAG findings, " +
+        "please add the prerequisite content in the 'sotd' section"
+    );
+  }
+  const template = conf.isCGBG ? cgbgSotdTmpl : sotdTmpl;
+  return template(conf, {
+    additionalContent,
+    // Whatever sections are left, we throw at the end.
+    additionalSections: sotdClone.childNodes,
+  });
 }

src/w3c/templates/cgbg-sotd.js

@@ -1,6 +1,6 @@
 import hyperHTML from "hyperhtml";
 
-export default conf => {
+export default (conf, opts) => {
   const html = hyperHTML;
   return html`
     <h2>${conf.l10n.sotd}</h2>
@@ -62,7 +62,7 @@ export default conf => {
         >W3C Community and Business Groups</a
       >.
     </p>
-    ${!conf.sotdAfterWGinfo ? [conf.additionalContent] : ""}
+    ${!conf.sotdAfterWGinfo ? opts.additionalContent : ""}
     ${
       conf.wgPublicList
         ? html`
@@ -102,7 +102,7 @@ export default conf => {
           `
         : ""
     }
-    ${conf.sotdAfterWGinfo ? [conf.additionalContent] : ""}
-    ${[conf.additionalSections]}
+    ${conf.sotdAfterWGinfo ? opts.additionalContent : ""}
+    ${opts.additionalSections}
   `;
 };

src/w3c/templates/sotd.js

@@ -1,6 +1,6 @@
 import hyperHTML from "hyperhtml";
 
-export default conf => {
+export default (conf, opts) => {
   const html = hyperHTML;
   return html`
     <h2>${conf.l10n.sotd}</h2>
@@ -44,12 +44,12 @@ export default conf => {
               official standing of any kind and does not represent the support
               or consensus of any standards organization.
             </p>
-            ${[conf.additionalContent]}
+            ${opts.additionalContent}
           `
         : html`
             ${
               conf.isTagFinding
-                ? [conf.additionalContent]
+                ? opts.additionalContent
                 : html`
                     ${
                       conf.isNoTrack
@@ -61,14 +61,14 @@ export default conf => {
                               and does not represent consensus of the W3C
                               Membership.
                             </p>
-                            ${[conf.additionalContent]}
+                            ${opts.additionalContent}
                           `
                         : html`
                             <p><em>${[conf.l10n.status_at_publication]}</em></p>
                             ${
                               conf.isSubmission
                                 ? html`
-                                    ${[conf.additionalContent]}
+                                    ${opts.additionalContent}
                                     ${
                                       conf.isMemberSubmission
                                         ? html`
@@ -199,7 +199,7 @@ export default conf => {
                                 : html`
                                     ${
                                       !conf.sotdAfterWGinfo
-                                        ? [conf.additionalContent]
+                                        ? opts.additionalContent
                                         : ""
                                     }
                                     ${
@@ -434,7 +434,7 @@ export default conf => {
                                     }
                                     ${
                                       conf.sotdAfterWGinfo
-                                        ? [conf.additionalContent]
+                                        ? opts.additionalContent
                                         : ""
                                     }
                                     ${
@@ -589,6 +589,6 @@ export default conf => {
             }
           `
     }
-    ${[conf.additionalSections]}
+    ${opts.additionalSections}
   `;
 };