bare-module-traverse 2.4.2 → 2.4.4

package/index.js

@@ -332,6 +332,8 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
 
   if (typeof imports !== 'object' || imports === null) return false
 
+  const type = moduleType(url, {}, null, opts)
+
   for (const [specifier, entry] of Object.entries(imports)) {
     const stack = [{ entry, asset: false }]
 
@@ -352,7 +354,8 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
           yield {
             children: exports.module(url, null, {}, artifacts, visited, {
               ...opts,
-              asset: true
+              asset: true,
+              referrerType: type
             }),
             deferred: true
           }
@@ -362,7 +365,10 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
           url.protocol !== deferredProtocol
         ) {
           yield {
-            children: exports.module(url, null, {}, artifacts, visited, opts),
+            children: exports.module(url, null, {}, artifacts, visited, {
+              ...opts,
+              referrerType: type
+            }),
             deferred: false
           }
         }
@@ -374,8 +380,6 @@ exports.preresolved = function* (url, source, resolutions, artifacts, visited, o
     }
   }
 
-  const type = moduleType(url, {}, null, opts)
-
   const lexer = { imports: [], exports: [] }
 
   if (type === constants.SCRIPT || type === constants.MODULE) {
@@ -684,9 +688,8 @@ exports.patternMatches = function* patternMatches(pattern, parentURL, matches, o
         if (patternNegate) removeURL(matches, url)
         else addURL(matches, url)
       } else if (patternTrailer === '' || url.href.endsWith(patternTrailer)) {
-        addURL(matches, url)
-      } else if (patternNegate) {
-        removeURL(matches, url)
+        if (patternNegate) removeURL(matches, url)
+        else addURL(matches, url)
       }
     }
   } else if (Array.isArray(pattern)) {
@@ -722,41 +725,14 @@ function* postresolve(url) {
 }
 
 function moduleType(url, attributes, info, opts = {}) {
-  const { defaultType = constants.SCRIPT, referrerType, aliases = null } = opts
-
-  if (typeof attributes.type === 'string') {
-    switch (attributes.type) {
-      case 'script':
-        return constants.SCRIPT
-      case 'module':
-        return constants.MODULE
-      case 'json':
-        return constants.JSON
-      case 'bundle':
-        return constants.BUNDLE
-      case 'addon':
-        return constants.ADDON
-      case 'binary':
-        return constants.BINARY
-      case 'text':
-        return constants.TEXT
-    }
-
-    return 0
-  }
+  const { defaultType = constants.SCRIPT, aliases = null } = opts
 
   if (url.protocol === 'data:') {
-    const { mime } = parseDataURL(url)
-
-    if (mime === null || mime.subtype === 'javascript') {
-      if (referrerType) return referrerType
-
-      return defaultType === constants.MODULE ? constants.MODULE : constants.SCRIPT
-    }
-
-    if (mime.subtype === 'json') return constants.JSON
+    return dataURLModuleType(url, attributes, opts)
+  }
 
-    return defaultType
+  if (typeof attributes.type === 'string') {
+    return typeForAttribute(attributes.type)
   }
 
   const match = url.pathname.match(/\.[a-z]+$/)
@@ -795,6 +771,67 @@ function moduleType(url, attributes, info, opts = {}) {
   return defaultType
 }
 
+function typeForAttribute(type) {
+  switch (type) {
+    case 'script':
+      return constants.SCRIPT
+    case 'module':
+      return constants.MODULE
+    case 'json':
+      return constants.JSON
+    case 'bundle':
+      return constants.BUNDLE
+    case 'addon':
+      return constants.ADDON
+    case 'binary':
+      return constants.BINARY
+    case 'text':
+      return constants.TEXT
+  }
+
+  return 0
+}
+
+function dataURLModuleType(url, attributes, opts = {}) {
+  const { defaultType = constants.SCRIPT, referrerType } = opts
+
+  const { mime } = parseDataURL(url)
+
+  const asserted = typeof attributes.type === 'string' ? typeForAttribute(attributes.type) : null
+
+  if (mime === null || mime.subtype === 'javascript') {
+    if (asserted === constants.SCRIPT || asserted === constants.MODULE) return asserted
+
+    if (asserted !== null) {
+      throw errors.TYPE_INCOMPATIBLE(`Module '${url.href}' is not of type '${attributes.type}'`)
+    }
+
+    if (referrerType) return referrerType
+
+    return defaultType === constants.MODULE ? constants.MODULE : constants.SCRIPT
+  }
+
+  let type
+
+  if (mime.subtype === 'json') {
+    type = constants.JSON
+  } else if (mime.type === 'text') {
+    type = constants.TEXT
+  } else if (mime.subtype === 'octet-stream') {
+    type = constants.BINARY
+  } else {
+    throw errors.TYPE_INCOMPATIBLE(
+      `Media type '${mime.type}/${mime.subtype}' of '${url.href}' is not supported`
+    )
+  }
+
+  if (asserted !== null && asserted !== type) {
+    throw errors.TYPE_INCOMPATIBLE(`Module '${url.href}' is not of type '${attributes.type}'`)
+  }
+
+  return type
+}
+
 function parseDataURL(url) {
   const { pathname } = url
 

package/lib/errors.js

@@ -1,11 +1,10 @@
 module.exports = class ModuleTraverseError extends Error {
   constructor(msg, fn = ModuleTraverseError, code = fn.name) {
     super(`${code}: ${msg}`)
+
     this.code = code
 
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, fn)
-    }
+    if (Error.captureStackTrace) Error.captureStackTrace(this, fn)
   }
 
   get name() {
@@ -46,6 +45,10 @@ module.exports = class ModuleTraverseError extends Error {
     return new ModuleTraverseError(msg, ModuleTraverseError.INVALID_IMPORTS_MAP)
   }
 
+  static TYPE_INCOMPATIBLE(msg) {
+    return new ModuleTraverseError(msg, ModuleTraverseError.TYPE_INCOMPATIBLE)
+  }
+
   static UNKNOWN_DATA_URL_CHARSET(msg, charset) {
     const err = new ModuleTraverseError(msg, ModuleTraverseError.UNKNOWN_DATA_URL_CHARSET)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module-traverse",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": {