bare-module 4.1.1 → 4.3.0

package/README.md

@@ -210,6 +210,7 @@ Options include:
 
 ```js
 {
+  isImport = false,
   referrer = null,
   protocol,
   imports,
@@ -238,6 +239,20 @@ Options include:
 }
 ```
 
+#### `const url = Module.asset(specifier, parentURL[, options])`
+
+Options include:
+
+```js
+{
+  referrer = null,
+  protocol,
+  imports,
+  resolutions,
+  conditions
+}
+```
+
 #### `module.url`
 
 #### `module.filename`
@@ -289,9 +304,9 @@ Options include:
 
 ### Protocols
 
-#### `const protocol = new Module.Protocol(options)`
+#### `const protocol = new Module.Protocol(methods)`
 
-Options include:
+Methods include:
 
 ```js
 {

package/index.js

@@ -1,9 +1,9 @@
 /* global Bare */
 const path = require('bare-path')
 const resolve = require('bare-module-resolve')
+const { fileURLToPath, pathToFileURL } = require('bare-url')
 const Bundle = require('bare-bundle')
 const { parse } = require('cjs-module-lexer')
-const { fileURLToPath, pathToFileURL } = require('url-file-url')
 const Protocol = require('./lib/protocol')
 const constants = require('./lib/constants')
 const errors = require('./lib/errors')
@@ -324,6 +324,7 @@ const Module = module.exports = exports = class Module {
     meta.cache = module._cache
     meta.resolve = resolve
     meta.addon = addon
+    meta.asset = asset
 
     function resolve (specifier) {
       const resolved = self.resolve(specifier, referrer._url, { referrer })
@@ -341,6 +342,10 @@ const Module = module.exports = exports = class Module {
 
       return addon._exports
     }
+
+    function asset (specifier) {
+      return self.asset(specifier, referrer._url, { referrer }).href
+    }
   }
 
   static _onrun (reason, promise, err = reason) {
@@ -446,7 +451,7 @@ const Module = module.exports = exports = class Module {
 
     const [resolution] = protocol.resolve(specifier, parentURL, imports)
 
-    if (resolution) return protocol.postresolve(resolution, parentURL)
+    if (resolution) return protocol.postresolve(resolution)
 
     for (const resolution of resolve(resolved, parentURL, {
       conditions: isImport ? ['import', ...conditions] : ['require', ...conditions],
@@ -469,7 +474,7 @@ const Module = module.exports = exports = class Module {
         case 'builtin:': return resolution
         default:
           if (protocol.exists(resolution)) {
-            return protocol.postresolve(resolution, parentURL)
+            return protocol.postresolve(resolution)
           }
       }
     }
@@ -489,6 +494,46 @@ const Module = module.exports = exports = class Module {
     }
   }
 
+  static asset (specifier, parentURL, opts = {}) {
+    const self = Module
+
+    if (typeof specifier !== 'string') {
+      throw new TypeError(`Specifier must be a string. Received type ${typeof specifier} (${specifier})`)
+    }
+
+    const {
+      referrer = null,
+      protocol = referrer ? referrer._protocol : self._protocol,
+      imports = referrer ? referrer._imports : null,
+      resolutions = referrer ? referrer._resolutions : null,
+      conditions = referrer ? referrer._conditions : self._conditions
+    } = opts
+
+    const [resolution = null] = resolve(specifier, parentURL, {
+      conditions,
+      imports,
+      resolutions
+    }, readPackage)
+
+    if (resolution !== null && protocol.exists(resolution)) {
+      return protocol.asset(resolution)
+    }
+
+    let msg = `Cannot find asset '${specifier}'`
+
+    if (referrer) msg += ` imported from '${referrer._url.href}'`
+
+    throw errors.ASSET_NOT_FOUND(msg)
+
+    function readPackage (packageURL) {
+      if (protocol.exists(packageURL)) {
+        return Module.load(packageURL, { protocol })._exports
+      }
+
+      return null
+    }
+  }
+
   static _extensionFor (type) {
     switch (type) {
       case constants.types.SCRIPT:
@@ -568,6 +613,7 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
   require.cache = module._cache
   require.resolve = resolve
   require.addon = addon
+  require.asset = asset
 
   return require
 
@@ -595,6 +641,10 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
 
     return addon._exports
   }
+
+  function asset (specifier) {
+    return urlToPath(self.asset(specifier, referrer._url, { referrer }))
+  }
 }
 
 if (Bare.simulator) Module._conditions.push('simulator')
@@ -716,12 +766,22 @@ Module._extensions['.bundle'] = function (module, source, referrer) {
   module._imports = bundle.imports
   module._resolutions = bundle.resolutions
 
-  module._protocol = new Protocol({
-    exists (url) {
+  module._protocol = protocol.extend({
+    preresolve (context, specifier) {
+      return specifier
+    },
+
+    postresolve (context, url) {
+      return url
+    },
+
+    * resolve () {},
+
+    exists (context, url) {
       return bundle.exists(url.href)
     },
 
-    read (url) {
+    read (context, url) {
       return bundle.read(url.href)
     }
   })

package/lib/errors.js

@@ -16,6 +16,10 @@ module.exports = class ModuleError extends Error {
     return new ModuleError(msg, 'MODULE_NOT_FOUND', ModuleError.MODULE_NOT_FOUND)
   }
 
+  static ASSET_NOT_FOUND (msg) {
+    return new ModuleError(msg, 'ASSET_NOT_FOUND', ModuleError.ASSET_NOT_FOUND)
+  }
+
   static UNKNOWN_PROTOCOL (msg) {
     return new ModuleError(msg, 'UNKNOWN_PROTOCOL', ModuleError.UNKNOWN_PROTOCOL)
   }

package/lib/protocol.js

@@ -1,37 +1,51 @@
 module.exports = class ModuleProtocol {
-  constructor (opts = {}) {
-    const {
-      preresolve = null,
-      postresolve = null,
-      resolve = null,
-      exists = null,
-      read = null,
-      load = null
-    } = opts
-
-    if (preresolve) this.preresolve = preresolve.bind(this)
-    if (postresolve) this.postresolve = postresolve.bind(this)
-    if (resolve) this.resolve = resolve.bind(this)
-    if (exists) this.exists = exists.bind(this)
-    if (read) this.read = read.bind(this)
-    if (load) this.load = load.bind(this)
+  constructor (methods = {}, context = null) {
+    for (const name of [
+      'preresolve',
+      'postresolve',
+      'resolve',
+      'exists',
+      'read',
+      'load',
+      'asset'
+    ]) {
+      const method = methods[name]
+
+      if (typeof method === 'function') {
+        this[name] = context ? method.bind(this, context) : method.bind(this)
+      } else if (context) {
+        const method = context[name]
+
+        if (typeof method === 'function') {
+          this[name] = method
+        }
+      }
+    }
   }
 
-  preresolve (specifier, dirname) {
+  preresolve (specifier, parentURL) {
     return specifier
   }
 
-  postresolve (specifier, dirname) {
-    return specifier
+  postresolve (url) {
+    return url
   }
 
-  * resolve (specifier, dirname, imports) {}
+  * resolve (specifier, parentURL, imports) {}
 
-  exists (filename) {
+  exists (url) {
     return false
   }
 
-  read (filename) {
+  read (url) {
     return null
   }
+
+  asset (url) {
+    return url
+  }
+
+  extend (methods) {
+    return new ModuleProtocol(methods, this)
+  }
 }

package/package.json

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