bare-module 4.3.2 → 4.5.0

package/README.md

@@ -212,11 +212,14 @@ Options include:
 {
   isImport = false,
   referrer = null,
+  type,
+  extensions,
   protocol,
   imports,
   resolutions,
   builtins,
-  conditions
+  conditions,
+  attributes
 }
 ```
 
@@ -235,7 +238,8 @@ Options include:
   imports,
   resolutions,
   builtins,
-  conditions
+  conditions,
+  attributes
 }
 ```
 
@@ -315,7 +319,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')
@@ -112,6 +112,10 @@ const Module = module.exports = exports = class Module {
     Module._modules.delete(this)
   }
 
+  _run () {
+    binding.runModule(this._handle, Module._handle, Module._onrun)
+  }
+
   _transform (isImport, isDynamicImport) {
     if (isDynamicImport) {
       this._synthesize()
@@ -156,7 +160,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
@@ -179,10 +187,6 @@ const Module = module.exports = exports = class Module {
     this._handle = binding.createSyntheticModule(this._url.href, this._names, Module._handle)
   }
 
-  _run () {
-    binding.runModule(this._handle, Module._handle, Module._onrun)
-  }
-
   _evaluate (eagerRun = false) {
     if ((this._state & constants.states.EVALUATED) !== 0) return
 
@@ -204,16 +208,12 @@ const Module = module.exports = exports = class Module {
       )
 
       if (eagerRun) this._run()
-    }
-
-    if (this._type === constants.types.MODULE) {
+    } else if (this._type === constants.types.MODULE) {
       this._run()
 
       this._exports = binding.getNamespace(this._handle)
-    }
-
-    if (this._type === constants.types.ADDON) {
-      if (eagerRun) this._run()
+    } else if (eagerRun) {
+      this._run()
     }
   }
 
@@ -241,7 +241,7 @@ const Module = module.exports = exports = class Module {
 
   static _handle = binding.init(this, this._onimport, this._onevaluate, this._onmeta)
 
-  static _onimport (href, assertions, referrerHref, isDynamicImport) {
+  static _onimport (href, attributes, referrerHref, isDynamicImport) {
     const referrer = this._cache[referrerHref] || null
 
     if (referrer === null) {
@@ -252,28 +252,9 @@ const Module = module.exports = exports = class Module {
       throw errors.MODULE_NOT_FOUND(msg)
     }
 
-    const url = this.resolve(href, referrer._url, {
-      isImport: true,
-      referrer
-    })
+    const url = this.resolve(href, referrer._url, { isImport: true, referrer, attributes })
 
-    let type
-
-    switch (assertions.type) {
-      case 'module':
-        type = constants.types.MODULE
-        break
-      case 'json':
-        type = constants.types.JSON
-        break
-    }
-
-    const module = this.load(url, {
-      isImport: true,
-      isDynamicImport,
-      referrer,
-      type
-    })
+    const module = this.load(url, { isImport: true, isDynamicImport, referrer, attributes })
 
     return module._handle
   }
@@ -326,8 +307,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 +316,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
     }
   }
 
@@ -379,7 +360,8 @@ const Module = module.exports = exports = class Module {
       isDynamicImport = false,
 
       referrer = null,
-      type = 0,
+      attributes,
+      type = typeForAttributes(attributes),
       defaultType = referrer ? referrer._defaultType : 0,
       cache = referrer ? referrer._cache : self._cache,
       main = referrer ? referrer._main : null,
@@ -410,10 +392,10 @@ const Module = module.exports = exports = class Module {
           module._builtins = builtins
           module._conditions = conditions
 
-          let extension = self._extensionFor(type) || path.extname(url.pathname)
+          let extension = canonicalExtensionForType(type) || path.extname(url.pathname)
 
           if (extension in self._extensions === false) {
-            if (defaultType) extension = self._extensionFor(defaultType) || '.js'
+            if (defaultType) extension = canonicalExtensionForType(defaultType) || '.js'
             else extension = '.js'
           }
 
@@ -440,6 +422,9 @@ const Module = module.exports = exports = class Module {
       isImport = false,
 
       referrer = null,
+      attributes,
+      type = typeForAttributes(attributes),
+      extensions = extensionsForType(type),
       protocol = referrer ? referrer._protocol : self._protocol,
       imports = referrer ? referrer._imports : null,
       resolutions = referrer ? referrer._resolutions : null,
@@ -457,18 +442,11 @@ const Module = module.exports = exports = class Module {
       conditions: isImport ? ['import', ...conditions] : ['require', ...conditions],
       imports,
       resolutions,
+      extensions,
       builtins: builtins ? Object.keys(builtins) : [],
       engines: {
         ...Bare.versions
-      },
-      extensions: [
-        '.js',
-        '.cjs',
-        '.mjs',
-        '.json',
-        '.bare',
-        '.node'
-      ]
+      }
     }, readPackage)) {
       switch (resolution.protocol) {
         case 'builtin:': return resolution
@@ -481,7 +459,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 +499,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)
 
@@ -533,22 +511,70 @@ const Module = module.exports = exports = class Module {
       return null
     }
   }
+}
 
-  static _extensionFor (type) {
-    switch (type) {
-      case constants.types.SCRIPT:
-        return '.cjs'
-      case constants.types.MODULE:
-        return '.esm'
-      case constants.types.JSON:
-        return '.json'
-      case constants.types.BUNDLE:
-        return '.bundle'
-      case constants.types.ADDON:
-        return '.bare'
-      default:
-        return null
-    }
+function extensionsForType (type) {
+  switch (type) {
+    case constants.types.SCRIPT:
+      return ['.js', '.cjs']
+    case constants.types.MODULE:
+      return ['.js', '.mjs']
+    case constants.types.JSON:
+      return ['.json']
+    case constants.types.BUNDLE:
+      return ['.json']
+    case constants.types.ADDON:
+      return ['.bare', '.node']
+    case constants.types.BINARY:
+      return ['.bin']
+    case constants.types.TEXT:
+      return ['.txt']
+    default:
+      return ['.js', '.cjs', '.mjs', '.json', '.bare', '.node']
+  }
+}
+
+function canonicalExtensionForType (type) {
+  switch (type) {
+    case constants.types.SCRIPT:
+      return '.cjs'
+    case constants.types.MODULE:
+      return '.esm'
+    case constants.types.JSON:
+      return '.json'
+    case constants.types.BUNDLE:
+      return '.bundle'
+    case constants.types.ADDON:
+      return '.bare'
+    case constants.types.BINARY:
+      return '.bin'
+    case constants.types.TEXT:
+      return '.txt'
+    default:
+      return null
+  }
+}
+
+function typeForAttributes (attributes) {
+  if (typeof attributes !== 'object' || attributes === null) return 0
+
+  switch (attributes.type) {
+    case 'script':
+      return constants.types.SCRIPT
+    case 'module':
+      return constants.types.MODULE
+    case 'json':
+      return constants.types.JSON
+    case 'bundle':
+      return constants.types.BUNDLE
+    case 'addon':
+      return constants.types.ADDON
+    case 'binary':
+      return constants.types.BINARY
+    case 'text':
+      return constants.types.TEXT
+    default:
+      return 0
   }
 }
 
@@ -568,14 +594,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 +610,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
@@ -617,16 +635,18 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
 
   return require
 
-  function require (specifier) {
-    const resolved = self.resolve(specifier, referrer._url, { referrer })
+  function require (specifier, opts = {}) {
+    const attributes = opts && opts.with
 
-    const module = self.load(resolved, { referrer })
+    const resolved = self.resolve(specifier, referrer._url, { referrer, attributes })
+
+    const module = self.load(resolved, { referrer, attributes })
 
     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 +654,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 }))
   }
 }
 
@@ -785,6 +805,30 @@ Module._extensions['.bundle'] = function (module, source, referrer) {
   }
 }
 
+Module._extensions['.bin'] = function (module, source, referrer) {
+  const protocol = module._protocol
+
+  module._type = constants.types.BINARY
+
+  if (source === null) source = protocol.read(module._url)
+
+  if (typeof source === 'string') source = Buffer.from(source)
+
+  module._exports = source
+}
+
+Module._extensions['.txt'] = function (module, source, referrer) {
+  const protocol = module._protocol
+
+  module._type = constants.types.TEXT
+
+  if (source === null) source = protocol.read(module._url)
+
+  if (typeof source !== 'string') source = Buffer.coerce(source).toString()
+
+  module._exports = source
+}
+
 Module._protocol = new Protocol({
   postresolve (url) {
     switch (url.protocol) {
@@ -823,6 +867,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/lib/constants.js

@@ -10,6 +10,8 @@ module.exports = {
     MODULE: 2,
     JSON: 3,
     BUNDLE: 4,
-    ADDON: 5
+    ADDON: 5,
+    BINARY: 6,
+    TEXT: 7
   }
 }

package/package.json

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