bare-module 1.13.3 → 1.13.4

package/index.js

@@ -8,12 +8,12 @@ const errors = require('./lib/errors')
 const binding = require('./binding')
 
 module.exports = exports = class Module {
-  constructor (filename, main) {
+  constructor (filename) {
+    this._filename = filename
     this._state = 0
     this._type = 0
     this._defaultType = this._type
-    this._filename = filename
-    this._main = main || this
+    this._main = null
     this._exports = null
     this._imports = null
     this._info = null
@@ -164,18 +164,35 @@ module.exports = exports = class Module {
     return name in this._builtins
   }
 
-  static createRequire (filename) {
+  static createRequire (filename, opts = {}) {
+    const {
+      imports = this._imports,
+      protocol = this._protocolFor(filename, this._protocols['file:']),
+      type = constants.types.SCRIPT,
+      defaultType = constants.types.SCRIPT
+    } = opts
+
     const module = new Module(filename)
+
+    module._type = type
+    module._defaultType = defaultType
+    module._imports = imports
+    module._protocol = protocol
+
     const referrer = module
 
     const resolve = (specifier) => {
       return this.resolve(specifier, path.dirname(module._filename), {
+        protocol: this._protocolFor(specifier, protocol),
+        imports,
         referrer
       })
     }
 
     const require = (specifier) => {
       const module = this.load(resolve(specifier), {
+        protocol: this._protocolFor(specifier, protocol),
+        imports,
         referrer
       })
 
@@ -223,7 +240,7 @@ module.exports = exports = class Module {
       })
     }
 
-    const module = this._cache[specifier] = new this(specifier, main)
+    const module = this._cache[specifier] = new this(specifier)
 
     module._defaultType = defaultType
 
@@ -244,6 +261,8 @@ module.exports = exports = class Module {
     if (specifier in this._builtins) {
       module._exports = this._builtins[specifier]
     } else {
+      module._main = main || module
+
       let extension = this._extensionFor(type) || path.extname(specifier)
 
       if (extension in this._extensions === false) {

package/package.json

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