bare-module 4.5.2 → 4.6.1

package/README.md

@@ -199,6 +199,8 @@ Constant | Description
 `JSON` |
 `BUNDLE` |
 `ADDON` |
+`BINARY` |
+`TEXT` |
 
 #### `Module.protocol`
 
@@ -320,6 +322,7 @@ Methods include:
   exists,
   read,
   load,
+  addon,
   asset
 }
 ```

package/index.js

@@ -1,9 +1,9 @@
 /* global Bare */
 const path = require('bare-path')
 const resolve = require('bare-module-resolve')
+const lex = require('bare-module-lexer')
 const { isURL, fileURLToPath, pathToFileURL } = require('bare-url')
 const Bundle = require('bare-bundle')
-const { parse } = require('cjs-module-lexer')
 const Protocol = require('./lib/protocol')
 const constants = require('./lib/constants')
 const errors = require('./lib/errors')
@@ -149,21 +149,23 @@ const Module = module.exports = exports = class Module {
 
       switch (module._type) {
         case constants.types.SCRIPT: {
-          const result = parse(module._function.toString())
+          const result = lex(module._function.toString())
 
-          for (const name of result.exports) names.add(name)
+          for (const { name } of result.exports) names.add(name)
 
           const referrer = module
 
-          for (const specifier of result.reexports) {
-            const resolved = Module.resolve(specifier, referrer._url, { isImport: true, referrer })
+          for (const { specifier, type } of result.imports) {
+            if (type & lex.constants.REEXPORT) {
+              const resolved = Module.resolve(specifier, referrer._url, { isImport: true, referrer })
 
-            const module = Module.load(resolved, { isImport: true, referrer })
+              const module = Module.load(resolved, { isImport: true, referrer })
 
-            if (module._names) {
-              for (const name of module._names) names.add(name)
-            } else {
-              queue.push(module)
+              if (module._names) {
+                for (const name of module._names) names.add(name)
+              } else {
+                queue.push(module)
+              }
             }
           }
 
@@ -372,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) {
@@ -434,7 +444,7 @@ const Module = module.exports = exports = class Module {
 
     const resolved = protocol.preresolve(specifier, parentURL)
 
-    const [resolution] = protocol.resolve(specifier, parentURL, imports)
+    const [resolution] = protocol.resolve(resolved, parentURL, imports)
 
     if (resolution) return protocol.postresolve(resolution)
 
@@ -487,14 +497,20 @@ const Module = module.exports = exports = class Module {
       conditions = referrer ? referrer._conditions : self._conditions
     } = opts
 
-    const [resolution = null] = resolve(specifier, parentURL, {
+    const resolved = protocol.preresolve(specifier, parentURL)
+
+    const [resolution] = protocol.resolve(resolved, parentURL, imports)
+
+    if (resolution) return protocol.postresolve(resolution)
+
+    for (const resolution of resolve(resolved, parentURL, {
       conditions: ['asset', ...conditions],
       imports,
       resolutions
-    }, readPackage)
-
-    if (resolution !== null && protocol.exists(resolution)) {
-      return protocol.asset(resolution)
+    }, readPackage)) {
+      if (protocol.exists(resolution)) {
+        return protocol.postresolve(protocol.asset ? protocol.asset(resolution) : resolution)
+      }
     }
 
     let msg = `Cannot find asset '${specifier}'`
@@ -555,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/lib/protocol.js

@@ -7,6 +7,7 @@ module.exports = class ModuleProtocol {
       'exists',
       'read',
       'load',
+      'addon',
       'asset'
     ]) {
       const method = methods[name]
@@ -41,6 +42,10 @@ module.exports = class ModuleProtocol {
     return null
   }
 
+  addon (url) {
+    return url
+  }
+
   asset (url) {
     return url
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "4.5.2",
+  "version": "4.6.1",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [
@@ -27,10 +27,10 @@
   "homepage": "https://github.com/holepunchto/bare-module#readme",
   "dependencies": {
     "bare-bundle": "^1.3.0",
-    "bare-module-resolve": "^1.6.0",
+    "bare-module-lexer": "^1.0.0",
+    "bare-module-resolve": "^1.8.0",
     "bare-path": "^3.0.0",
-    "bare-url": "^2.0.1",
-    "cjs-module-lexer": "^1.2.3"
+    "bare-url": "^2.0.1"
   },
   "devDependencies": {
     "brittle": "^3.1.1",