bare-module 4.6.0 → 4.6.1

package/README.md

@@ -199,6 +199,8 @@ Constant | Description
 `JSON` |
 `BUNDLE` |
 `ADDON` |
+`BINARY` |
+`TEXT` |
 
 #### `Module.protocol`
 

package/index.js

@@ -374,9 +374,17 @@ const Module = module.exports = exports = class Module {
       conditions = referrer ? referrer._conditions : self._conditions
     } = opts
 
-    if (cache[url.href]) return cache[url.href]._transform(isImport, isDynamicImport)
+    let module = cache[url.href] || null
 
-    const module = cache[url.href] = new Module(url)
+    if (module !== null) {
+      if (type !== 0 && type !== module._type) {
+        throw errors.TYPE_INCOMPATIBLE(`Module '${module.url.href}' is not of type '${nameOfType(type)}'`)
+      }
+
+      return module._transform(isImport, isDynamicImport)
+    }
+
+    module = cache[url.href] = new Module(url)
 
     try {
       switch (url.protocol) {
@@ -563,6 +571,27 @@ function canonicalExtensionForType (type) {
   }
 }
 
+function nameOfType (type) {
+  switch (type) {
+    case constants.types.SCRIPT:
+      return 'script'
+    case constants.types.MODULE:
+      return 'module'
+    case constants.types.JSON:
+      return 'json'
+    case constants.types.BUNDLE:
+      return 'bundle'
+    case constants.types.ADDON:
+      return 'bare'
+    case constants.types.BINARY:
+      return 'binary'
+    case constants.types.TEXT:
+      return 'text'
+    default:
+      return null
+  }
+}
+
 function typeForAttributes (attributes) {
   if (typeof attributes !== 'object' || attributes === null) return 0
 

package/lib/errors.js

@@ -31,4 +31,8 @@ module.exports = class ModuleError extends Error {
   static INVALID_URL_PATH (msg) {
     return new ModuleError(msg, 'INVALID_URL_PATH', ModuleError.INVALID_URL_PATH)
   }
+
+  static TYPE_INCOMPATIBLE (msg) {
+    return new ModuleError(msg, 'TYPE_INCOMPATIBLE', ModuleError.TYPE_INCOMPATIBLE)
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [