refactor(core/utils): a few simplifications

src/core/utils.js

@@ -12,13 +12,19 @@ marked.setOptions({
   gfm: true,
 });
 
+const spaceOrTab = /^[\ |\t]*/;
+const endsWithSpace = /\s+$/gm;
+const dashes = /\-/g;
+const gtEntity = />/gm;
+const ampEntity = /&/gm;
+
 export function markdownToHtml(text) {
   const normalizedLeftPad = normalizePadding(text);
   // As markdown is pulled from HTML, > and & are already escaped and
   // so blockquotes aren't picked up by the parser. This fixes it.
   const potentialMarkdown = normalizedLeftPad
-    .replace(/>/gm, ">")
-    .replace(/&/gm, "&");
+    .replace(gtEntity, ">")
+    .replace(ampEntity, "&");
   const result = marked(potentialMarkdown);
   return result;
 }
@@ -108,8 +114,7 @@ export function makeOwnerSwapper(node) {
   if (!node) {
     throw new TypeError("Expected instance of Node.");
   }
-  return function(insertionPoint) {
-    node.remove();
+  return insertionPoint => {
     insertionPoint.ownerDocument.adoptNode(node);
     if (insertionPoint.firstElementChild) {
       return insertionPoint.insertBefore(
@@ -125,19 +130,16 @@ export function calculateLeftPad(text) {
   if (typeof text !== "string") {
     throw new TypeError("Invalid input");
   }
-  var spaceOrTab = /^[\ |\t]*/;
   // Find smallest padding value
   var leftPad = text
     .split("\n")
-    .filter(function(item) {
-      return item;
-    })
-    .reduce(function(smallest, item) {
+    .filter(item => item)
+    .reduce((smallest, item) => {
       // can't go smaller than 0
       if (smallest === 0) {
         return smallest;
       }
-      var match = item.match(spaceOrTab)[0] || "";
+      const match = item.match(spaceOrTab)[0] || "";
       return Math.min(match.length, smallest);
     }, +Infinity);
   return leftPad === +Infinity ? 0 : leftPad;
@@ -160,9 +162,9 @@ export function createResourceHint(opts) {
   if (!resourceHints.has(opts.hint)) {
     throw new TypeError("Invalid resources hint");
   }
-  var url = new URL(opts.href, document.location);
-  var linkElem = document.createElement("link");
-  var href = url.href;
+  const url = new URL(opts.href, document.location);
+  const linkElem = document.createElement("link");
+  let href = url.href;
   linkElem.rel = opts.hint;
   switch (linkElem.rel) {
     case "dns-prefetch":
@@ -175,24 +177,21 @@ export function createResourceHint(opts) {
     case "preload":
       if ("as" in opts && typeof opts.as === "string") {
         if (!fetchDestinations.has(opts.as)) {
-          console.warn("Unknown request destination: " + opts.as);
+          console.warn(`Unknown request destination: ${opts.as}`);
         }
         linkElem.setAttribute("as", opts.as);
       }
       break;
-    case "prerender":
-      href = url.href;
-      break;
   }
   linkElem.href = href;
   if (!opts.dontRemove) {
     linkElem.classList.add("removeOnSave");
   }
   return linkElem;
 }
-const endsWithSpace = /\s+$/gm;
-export function normalizePadding(text) {
-  if (!text) {
+
+export function normalizePadding(text = "") {
+  if(!text){
     return "";
   }
   if (typeof text !== "string") {
@@ -289,9 +288,7 @@ export function normalizePadding(text) {
 
 // RESPEC STUFF
 export function removeReSpec(doc) {
-  Array.from(
-    doc.querySelectorAll(".remove, script[data-requiremodule]")
-  ).forEach(function(elem) {
+  doc.querySelectorAll(".remove, script[data-requiremodule]").forEach(elem => {
     elem.remove();
   });
 }
@@ -300,24 +297,20 @@ export function removeReSpec(doc) {
 // Takes an array and returns a string that separates each of its items with the proper commas and
 // "and". The second argument is a mapping function that can convert the items before they are
 // joined
-export function joinAnd(arr, mapper) {
-  if (!arr || !arr.length) return "";
-  mapper =
-    mapper ||
-    function(ret) {
-      return ret;
-    };
-  var ret = "";
-  if (arr.length === 1) return mapper(arr[0], 0);
-  for (var i = 0, n = arr.length; i < n; i++) {
-    if (i > 0) {
-      if (n === 2) ret += " ";
-      else ret += ", ";
-      if (i === n - 1) ret += "and ";
-    }
-    ret += mapper(arr[i], i);
+export function joinAnd(array = [], mapper = item => item) {
+  const items = array.map(mapper);
+  switch (items.length) {
+    case 0:
+    case 1: // "x"
+      return items.toString();
+    case 2: // x and y
+      return items.join(" and ");
+    default:
+      // x, y, and z
+      const str = items.join(", ");
+      const lastComma = str.lastIndexOf(",");
+      return `${str.substr(0, lastComma + 1)} and ${str.slice(lastComma + 2)}`;
   }
-  return ret;
 }
 
 // Takes a string, applies some XML escapes, and returns the escaped string.
@@ -333,14 +326,14 @@ export function xmlEscape(s) {
 
 // Trims string at both ends and replaces all other white space with a single space
 export function norm(str) {
-  return str.replace(/^\s+/, "").replace(/\s+$/, "").split(/\s+/).join(" ");
+  return str.trim().replace(/\s+/g, " ");
 }
 
 // --- DATE HELPERS -------------------------------------------------------------------------------
 // Takes a Date object and an optional separator and returns the year,month,day representation with
 // the custom separator (defaulting to none) and proper 0-padding
 export function concatDate(date, sep = "") {
-  return ISODate.format(date).replace(new RegExp("-", "g"), sep);
+  return ISODate.format(date).replace(dashes, sep);
 }
 
 // formats a date to "yyyy-mm-dd"
@@ -350,8 +343,7 @@ export function toShortIsoDate(date) {
 
 // takes a string, prepends a "0" if it is of length 1, does nothing otherwise
 export function lead0(str) {
-  str = "" + str;
-  return str.length === 1 ? "0" + str : str;
+  return String(str).length === 1 ? "0" + str : str;
 }
 
 // takes a YYYY-MM-DD date and returns a Date object for it
@@ -372,43 +364,44 @@ export function humanDate(
   lang = document.documentElement.lang || "en"
 ) {
   if (!(date instanceof Date)) date = new Date(date);
-  const day = date.toLocaleString([lang, "en"], { day: "2-digit", timeZone: "UTC"});
-  const month = date.toLocaleString([lang, "en"], { month: "long", timeZone: "UTC"});
-  const year = date.toLocaleString([lang, "en"], { year: "numeric", timeZone: "UTC"});
+  const langs = [lang, "en"];
+  const day = date.toLocaleString(langs, {
+    day: "2-digit",
+    timeZone: "UTC",
+  });
+  const month = date.toLocaleString(langs, {
+    month: "long",
+    timeZone: "UTC",
+  });
+  const year = date.toLocaleString(langs, {
+    year: "numeric",
+    timeZone: "UTC",
+  });
   //date month year
   return `${day} ${month} ${year}`;
 }
-// given either a Date object or a date in YYYY-MM-DD format, return an ISO formatted
-// date suitable for use in a xsd:datetime item
+// given either a Date object or a date in YYYY-MM-DD format,
+// return an ISO formatted date suitable for use in a xsd:datetime item
 export function isoDate(date) {
-  if (!(date instanceof Date)) date = new Date(date);
-  return date.toISOString();
+  return (date instanceof Date ? date : new Date(date)).toISOString();
 }
 
 // Given an object, it converts it to a key value pair separated by
 // ("=", configurable) and a delimiter (" ," configurable).
 // for example, {"foo": "bar", "baz": 1} becomes "foo=bar, baz=1"
-export function toKeyValuePairs(obj, delimiter, separator) {
-  if (!separator) {
-    separator = "=";
-  }
-  if (!delimiter) {
-    delimiter = ", ";
-  }
-  return Object.getOwnPropertyNames(obj)
-    .map(function(key) {
-      return key + separator + JSON.stringify(obj[key]);
-    })
+export function toKeyValuePairs(obj, delimiter = ", ", separator = "=") {
+  return Array.from(Object.entries(obj))
+    .map(([key, value]) => `${key}${separator}${JSON.stringify(value)}`)
     .join(delimiter);
 }
 
 // STYLE HELPERS
-// take a document and either a link or an array of links to CSS and appends a <link/> element
-// to the head pointing to each
+// take a document and either a link or an array of links to CSS and appends
+// a <link/> element to the head pointing to each
 export function linkCSS(doc, styles) {
-  var stylesArray = Array.isArray(styles) ? [].concat(styles) : [styles];
-  var frag = stylesArray
-    .map(function(url) {
+  const stylesArray = [].concat(styles);
+  const frag = stylesArray
+    .map(url => {
       var link = doc.createElement("link");
       link.rel = "stylesheet";
       link.href = url;
@@ -423,7 +416,8 @@ export function linkCSS(doc, styles) {
 
 // TRANSFORMATIONS
 // Run list of transforms over content and return result.
-// Please note that this is a legacy method that is only kept in order to maintain compatibility
+// Please note that this is a legacy method that is only kept in order
+// to maintain compatibility
 // with RSv1. It is therefore not tested and not actively supported.
 export function runTransforms(content, flist) {
   var args = [this, content];

src/w3c/headers.js

@@ -539,7 +539,7 @@ export function run(conf, doc, cb) {
   });
   conf.multipleAlternates =
     conf.alternateFormats && conf.alternateFormats.length > 1;
-  conf.alternatesHTML = joinAnd(conf.alternateFormats, function(alt) {
+  conf.alternatesHTML = conf.alternateFormats && joinAnd(conf.alternateFormats, function(alt) {
     var optional = alt.hasOwnProperty("lang") && alt.lang
       ? " hreflang='" + alt.lang + "'"
       : "";

tests/spec/SpecHelper.js

@@ -145,12 +145,12 @@ function makeBasicConfig() {
       },
     ],
     specStatus: "ED",
-    edDraftURI: "http://foo.com",
+    edDraftURI: "https://foo.com",
     shortName: "Foo",
     previousMaturity: "CR",
     previousPublishDate: "1999-01-01",
     errata: "https://github.com/tabatkins/bikeshed",
-    implementationReportURI: "http://example.com/implementationReportURI",
+    implementationReportURI: "https://example.com/implementationReportURI",
     perEnd: "1999-01-01",
     lint: false,
   };

tests/spec/core/override-configuration-spec.js

@@ -1,27 +1,35 @@
 "use strict";
-describe("Core — Override Configuration", function() {
-  afterAll(function(done) {
+describe("Core — Override Configuration", () => {
+  afterAll(done => {
     flushIframes();
     done();
   });
-  it("should override a simple string setting", function(done) {
-    var url =
-      "spec/core/simple.html?specStatus=RSCND&previousMaturity=REC&previousPublishDate=1994-12-12";
-    var test = function(doc) {
-      expect($(".head h2", doc).text()).toMatch(/W3C Rescinded Recommendation/);
-      expect(
-        doc.defaultView.respecConfig.previousPublishDate.getFullYear()
-      ).toEqual(1994);
-      expect(doc.defaultView.respecConfig.previousMaturity).toEqual("REC");
+  const simpleURL = new URL("./spec/core/simple.html", document.location);
+  it("overrides a simple string setting", done => {
+    const url = new URL(simpleURL.href);
+    url.searchParams.set("specStatus", "RSCND");
+    url.searchParams.set("previousMaturity", "REC");
+    url.searchParams.set("previousPublishDate", "1994-03-01");
+    const test = doc => {
+      const { respecConfig: conf } = doc.defaultView;
+      const { textContent } = doc.querySelector(".head h2");
+      expect(textContent).toMatch(/W3C Rescinded Recommendation/);
+      const month = conf.previousPublishDate.getUTCMonth();
+      expect(month).toEqual(2);
+      const { previousMaturity } = conf;
+      expect(previousMaturity).toEqual("REC");
       done();
     };
     makeRSDoc(makeStandardOps(), test, url);
   });
-  it("decodes URL key/values strings correctly", function(done) {
-    var url =
-      "spec/core/simple.html?additionalCopyrightHolders=Internet%20Engineering%20Task%20Force";
-    var test = function(doc) {
-      var copyrightText = doc.querySelector(".copyright").textContent;
+  it("decodes URL key/values strings correctly", done => {
+    const url = new URL(simpleURL.href);
+    url.searchParams.set(
+      "additionalCopyrightHolders",
+      "Internet Engineering Task Force"
+    );
+    const test = doc => {
+      const copyrightText = doc.querySelector(".copyright").textContent;
       expect(copyrightText).toMatch(/Internet Engineering Task Force/);
       done();
     };

tests/spec/core/utils-spec.js

@@ -416,7 +416,7 @@ describe("Core - Utils", () => {
     var expected =
       'editors;[{"name":"Person Name"}], specStatus;"ED", ' +
       'edDraftURI;"http://foo.com", shortName;"Foo"';
-    expect(utils.toKeyValuePairs(obj, null, ";")).toEqual(expected);
+    expect(utils.toKeyValuePairs(obj, undefined, ";")).toEqual(expected);
 
     expected =
       'editors^[{"name":"Person Name"}] % specStatus^"ED" % ' +