bare-module 4.3.1 → 4.4.0

package/README.md

@@ -315,7 +315,8 @@ Methods include:
   resolve,
   exists,
   read,
-  load
+  load,
+  asset
 }
 ```
 

package/index.js

@@ -1,7 +1,7 @@
 /* global Bare */
 const path = require('bare-path')
 const resolve = require('bare-module-resolve')
-const { fileURLToPath, pathToFileURL } = require('bare-url')
+const { isURL, fileURLToPath, pathToFileURL } = require('bare-url')
 const Bundle = require('bare-bundle')
 const { parse } = require('cjs-module-lexer')
 const Protocol = require('./lib/protocol')
@@ -156,7 +156,11 @@ const Module = module.exports = exports = class Module {
 
             const module = Module.load(resolved, { isImport: true, referrer })
 
-            queue.push(module)
+            if (module._names) {
+              for (const name of module._names) names.add(name)
+            } else {
+              queue.push(module)
+            }
           }
 
           break
@@ -326,8 +330,8 @@ const Module = module.exports = exports = class Module {
     meta.addon = addon
     meta.asset = asset
 
-    function resolve (specifier) {
-      const resolved = self.resolve(specifier, referrer._url, { referrer })
+    function resolve (specifier, parentURL = referrer._url) {
+      const resolved = self.resolve(specifier, toURL(parentURL), { referrer })
 
       switch (resolved.protocol) {
         case 'builtin:': return resolved.pathname
@@ -335,16 +339,16 @@ const Module = module.exports = exports = class Module {
       }
     }
 
-    function addon (specifier = '.') {
-      const resolved = Bare.Addon.resolve(specifier, referrer._url, { referrer })
+    function addon (specifier = '.', parentURL = referrer._url) {
+      const resolved = Bare.Addon.resolve(specifier, toURL(parentURL), { referrer })
 
       const addon = Bare.Addon.load(resolved, { referrer })
 
       return addon._exports
     }
 
-    function asset (specifier) {
-      return self.asset(specifier, referrer._url, { referrer }).href
+    function asset (specifier, parentURL = referrer._url) {
+      return self.asset(specifier, toURL(parentURL), { referrer }).href
     }
   }
 
@@ -481,7 +485,7 @@ const Module = module.exports = exports = class Module {
 
     let msg = `Cannot find module '${specifier}'`
 
-    if (referrer) msg += ` imported from '${referrer._url.href}'`
+    if (referrer) msg += ` imported from '${parentURL.href}'`
 
     throw errors.MODULE_NOT_FOUND(msg)
 
@@ -521,7 +525,7 @@ const Module = module.exports = exports = class Module {
 
     let msg = `Cannot find asset '${specifier}'`
 
-    if (referrer) msg += ` imported from '${referrer._url.href}'`
+    if (referrer) msg += ` imported from '${parentURL.href}'`
 
     throw errors.ASSET_NOT_FOUND(msg)
 
@@ -568,14 +572,6 @@ exports.isBuiltin = function isBuiltin () {
 const createRequire = exports.createRequire = function createRequire (parentURL, opts = {}) {
   const self = Module
 
-  if (typeof parentURL === 'string') {
-    if (startsWithWindowsDriveLetter(parentURL)) {
-      parentURL = '/' + parentURL
-    }
-
-    parentURL = new URL(parentURL, 'file:')
-  }
-
   let {
     module = null,
 
@@ -592,7 +588,7 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
   } = opts
 
   if (module === null) {
-    module = new Module(parentURL)
+    module = new Module(toURL(parentURL))
 
     module._type = type
     module._defaultType = defaultType
@@ -625,8 +621,8 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
     return module._exports
   }
 
-  function resolve (specifier) {
-    const resolved = self.resolve(specifier, referrer._url, { referrer })
+  function resolve (specifier, parentURL = referrer._url) {
+    const resolved = self.resolve(specifier, toURL(parentURL), { referrer })
 
     switch (resolved.protocol) {
       case 'builtin:': return resolved.pathname
@@ -634,16 +630,16 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
     }
   }
 
-  function addon (specifier = '.') {
-    const resolved = Bare.Addon.resolve(specifier, referrer._url, { referrer })
+  function addon (specifier = '.', parentURL = referrer._url) {
+    const resolved = Bare.Addon.resolve(specifier, toURL(parentURL), { referrer })
 
     const addon = Bare.Addon.load(resolved, { referrer })
 
     return addon._exports
   }
 
-  function asset (specifier) {
-    return urlToPath(self.asset(specifier, referrer._url, { referrer }))
+  function asset (specifier, parentURL = referrer._url) {
+    return urlToPath(self.asset(specifier, toURL(parentURL), { referrer }))
   }
 }
 
@@ -767,22 +763,16 @@ Module._extensions['.bundle'] = function (module, source, referrer) {
   module._resolutions = bundle.resolutions
 
   module._protocol = protocol.extend({
-    preresolve (context, specifier) {
-      return specifier
-    },
-
     postresolve (context, url) {
-      return url
+      return bundle.exists(url.href) ? url : context.postresolve(url)
     },
 
-    * resolve () {},
-
     exists (context, url) {
-      return bundle.exists(url.href)
+      return bundle.exists(url.href) || context.exists(url)
     },
 
     read (context, url) {
-      return bundle.read(url.href)
+      return bundle.read(url.href) || context.read(url)
     }
   })
 
@@ -829,6 +819,16 @@ Bare
     binding.destroy(Module._handle)
   })
 
+function toURL (value) {
+  if (isURL(value)) return value
+
+  if (startsWithWindowsDriveLetter(value)) {
+    return pathToFileURL(value)
+  }
+
+  return URL.parse(value) || pathToFileURL(value)
+}
+
 function urlToPath (url) {
   if (url.protocol === 'file:') return fileURLToPath(url)
 

package/package.json

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