bare-module 3.1.10 → 3.1.12

package/index.js

@@ -132,7 +132,7 @@ const Module = module.exports = exports = class Module {
 
     if (this._type === constants.types.MODULE) return
 
-    const names = ['default']
+    const names = new Set(['default'])
     const queue = [this]
     const seen = new Set()
 
@@ -147,7 +147,7 @@ const Module = module.exports = exports = class Module {
         case constants.types.SCRIPT: {
           const result = parse(module._function.toString())
 
-          names.push(...result.exports)
+          for (const name of result.exports) names.add(name)
 
           const referrer = module
 
@@ -165,20 +165,16 @@ const Module = module.exports = exports = class Module {
         case constants.types.MODULE:
           module._evaluate()
 
-          for (const name of Object.keys(module._exports)) {
-            names.push(name)
-          }
+          for (const name of Object.keys(module._exports)) names.add(name)
 
           break
 
         case constants.types.JSON:
-          for (const name of Object.keys(module._exports)) {
-            names.push(name)
-          }
+          for (const name of Object.keys(module._exports)) names.add(name)
       }
     }
 
-    this._names = names
+    this._names = Array.from(names)
 
     this._handle = binding.createSyntheticModule(this._url.href, this._names, Module._handle)
   }
@@ -296,7 +292,21 @@ const Module = module.exports = exports = class Module {
     module._evaluate()
 
     for (const name of module._names) {
-      binding.setExport(module._handle, name, name === 'default' ? module._exports : module._exports[name])
+      let value
+
+      if (
+        name === 'default' && (
+          typeof module._exports !== 'object' ||
+          module._exports === null ||
+          name in module._exports === false
+        )
+      ) {
+        value = module._exports
+      } else {
+        value = module._exports[name]
+      }
+
+      binding.setExport(module._handle, name, value)
     }
   }
 
@@ -373,33 +383,33 @@ const Module = module.exports = exports = class Module {
 
     const module = cache[url.href] = new Module(url)
 
-    switch (url.protocol) {
-      case 'builtin:':
-        module._exports = builtins[url.pathname]
-        break
+    try {
+      switch (url.protocol) {
+        case 'builtin:':
+          module._exports = builtins[url.pathname]
+          break
 
-      default: {
-        module._defaultType = defaultType
-        module._cache = cache
-        module._main = main || module
-        module._protocol = protocol
-        module._imports = imports
-        module._resolutions = resolutions
-        module._builtins = builtins
-        module._conditions = conditions
-
-        let extension = self._extensionFor(type) || path.extname(url.pathname)
-
-        if (extension in self._extensions === false) {
-          if (defaultType) extension = self._extensionFor(defaultType) || '.js'
-          else extension = '.js'
-        }
+        default: {
+          module._defaultType = defaultType
+          module._cache = cache
+          module._main = main || module
+          module._protocol = protocol
+          module._imports = imports
+          module._resolutions = resolutions
+          module._builtins = builtins
+          module._conditions = conditions
+
+          let extension = self._extensionFor(type) || path.extname(url.pathname)
+
+          if (extension in self._extensions === false) {
+            if (defaultType) extension = self._extensionFor(defaultType) || '.js'
+            else extension = '.js'
+          }
 
-        self._extensions[extension](module, source, referrer)
+          self._extensions[extension](module, source, referrer)
+        }
       }
-    }
 
-    try {
       return module._transform(isImport, isDynamicImport)
     } catch (err) {
       delete cache[url.href]

package/package.json

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