reffy 6.0.0 → 6.1.0

package/index.js

@@ -3,5 +3,9 @@ module.exports = {
   crawlSpecs: require("./src/lib/specs-crawler").crawlList,
   expandCrawlResult: require("./src/lib/util").expandCrawlResult,
   mergeCrawlResults: require("./src/lib/util").mergeCrawlResults,
-  isLatestLevelThatPasses: require("./src/lib/util").isLatestLevelThatPasses
+  isLatestLevelThatPasses: require("./src/lib/util").isLatestLevelThatPasses,
+  generateIdlNames: require("./src/cli/generate-idlnames").generateIdlNames,
+  saveIdlNames: require("./src/cli/generate-idlnames").saveIdlNames,
+  generateIdlParsed: require("./src/cli/generate-idlparsed").generateIdlParsed,
+  saveIdlParsed: require("./src/cli/generate-idlparsed").saveIdlParsed
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "W3C/WHATWG spec dependencies exploration companion. Features a short set of tools to study spec references as well as WebIDL term definitions and references found in W3C specifications.",
   "repository": {
     "type": "git",
@@ -35,17 +35,17 @@
     "browser-specs": "2.21.0",
     "commander": "8.3.0",
     "fetch-filecache-for-crawling": "4.0.2",
-    "puppeteer": "13.0.1",
+    "puppeteer": "13.1.1",
     "semver": "^7.3.5",
     "webidl2": "24.2.0"
   },
   "devDependencies": {
     "chai": "4.3.4",
-    "mocha": "9.1.3",
-    "nock": "13.2.1",
-    "respec": "28.1.0",
+    "mocha": "9.1.4",
+    "nock": "13.2.2",
+    "respec": "28.2.2",
     "respec-hljs": "2.1.1",
-    "rollup": "2.63.0"
+    "rollup": "2.65.0"
   },
   "scripts": {
     "test": "mocha --recursive tests/"

package/src/browserlib/extract-webidl.mjs

@@ -11,19 +11,28 @@ import informativeSelector from './informative-selector.mjs';
  */
 export default function () {
     const generator = getGenerator();
+    let idl = '';
     if (generator === 'bikeshed') {
-        return extractBikeshedIdl();
+        idl = extractBikeshedIdl();
     }
     else if (document.title.startsWith('Web IDL')) {
         // IDL content in the Web IDL spec are... examples,
         // not real definitions
-        return '';
     }
     else {
         // Most non-ReSpec specs still follow the ReSpec conventions
         // for IDL definitions
-        return extractRespecIdl();
+        idl = extractRespecIdl();
+    }
+
+    if (idl) {
+        // Remove trailing spaces and use spaces throughout
+        idl = idl
+            .replace(/\s+$/gm, '\n')
+            .replace(/\t/g, '  ')
+            .trim();
     }
+    return idl;
 }
 
 

package/src/lib/specs-crawler.js

@@ -226,11 +226,7 @@ async function saveSpecResults(spec, settings) {
             // (https://github.com/w3c/webref)
             // Source: ${spec.title} (${spec.crawled})`;
         idlHeader = idlHeader.replace(/^\s+/gm, '').trim() + '\n\n';
-        let idl = spec.idl
-            .replace(/\s+$/gm, '\n')
-            .replace(/\t/g, '  ')
-            .trim();
-        idl = idlHeader + idl + '\n';
+        const idl = idlHeader + spec.idl + '\n';
         await fs.promises.writeFile(
             path.join(folders.idl, spec.shortname + '.idl'), idl);
         return `idl/${spec.shortname}.idl`;

package/src/lib/util.js

@@ -740,6 +740,13 @@ async function expandCrawlResult(crawl, baseFolder, properties) {
                 const filename = path.join(baseFolder, spec[property]);
                 contents = await fs.readFile(filename, 'utf8');
             }
+
+            // Force UNIX-style line endings
+            // (Git may auto-convert LF to CRLF on Windows machines and we
+            // want to store multiline IDL fragments as values of properties
+            // in parsed IDL trees)
+            contents = contents.replace(/\r\n/g, '\n');
+
             if (spec[property].endsWith('.json')) {
                 contents = JSON.parse(contents);
             }