reffy 14.2.1 → 14.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffy",
-  "version": "14.2.1",
+  "version": "14.2.3",
   "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",

package/src/lib/util.js

@@ -61,23 +61,16 @@ function requireFromWorkingDirectory(filename) {
 
 
 /**
- * Determine the path to the "node_modules" folder to resolve relative links
- * in the ES6 browser lib modules. The path depends on whether Reffy is run
- * directly, or installed as a library.
+ * Path to the "webidl2" folder to resolve relative links in the ES6 browser
+ * lib modules. The path depends on whether Reffy is run directly, or installed
+ * as a library.
  *
- * @function
- * @return {String} Path to the node_modules folder.
+ * Code relies on the "require.resolve" function, but note that, when given a
+ * simple module name, that function returns the path to the file targeted by
+ * the "main" property in "package.json" which, in the case of the webidl2
+ * module, is "dist/webidl2.js".
  */
-function getModulesFolder() {
-    const rootFolder = path.resolve(__dirname, '../..');
-    let folder = path.resolve(rootFolder, 'node_modules');
-    if (existsSync(folder)) {
-        return folder;
-    }
-    folder = path.resolve(rootFolder, '..');
-    return folder;
-}
-const modulesFolder = getModulesFolder();
+const webidl2Folder = path.resolve(path.dirname(require.resolve('webidl2')), '..');
 
 
 /**
@@ -381,7 +374,7 @@ async function processSpecification(spec, processFunction, args, options) {
                         body = Buffer.from(browserlib);
                     }
                     else if (request.url.includes(webidl2Path)) {
-                        const file = path.resolve(modulesFolder, 'webidl2',
+                        const file = path.resolve(webidl2Folder,
                             request.url.substring(request.url.indexOf(webidl2Path) + webidl2Path.length));
                         body = await fs.readFile(file);
                     }

package/src/postprocessing/patch-dfns.js

@@ -33,13 +33,15 @@ module.exports = {
           dfn.linkingText[0] !== 'MessageEventSource');
       }
 
-      // The /TR version of the WebCrypto API does not follow the usual dfn data
-      // model. Definitions get extracted as "exported" as a result. This
-      // creates collisions. The nightly version of the API respects the dfn
-      // data model, so let's force /TR dfns to be "non-exported" (most don't
-      // have the right "type" in any case). Also see discussion in:
+      // The /TR versions of WebCrypto API, Publication Manifest and Audiobooks
+      // do not follow the usual dfn data model. Definitions get extracted as
+      // "exported" as a result. This creates collisions. The nightly versions
+      // of the specs respect the dfn data model and these specs don't export
+      // terms in practice. Also see discussion in:
       // https://github.com/w3c/reffy/issues/1250
-      else if (spec.crawled.includes('/TR/WebCryptoAPI/')) {
+      else if (spec.crawled.includes('/TR/WebCryptoAPI/') ||
+          spec.crawled.includes('/TR/pub-manifest/') ||
+          spec.crawled.includes('/TR/audiobooks/')) {
         spec.dfns.forEach(dfn => dfn.access = 'private');
       }
     }