bare-module 4.8.4 → 4.8.6

package/index.js

@@ -1,4 +1,3 @@
-/* global Bare */
 const path = require('bare-path')
 const resolve = require('bare-module-resolve')
 const lex = require('bare-module-lexer')
@@ -114,14 +113,9 @@ 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()
-      this._evaluate(true /* eagerRun */)
+      this._run()
     } else if (isImport) {
       this._synthesize()
     } else {
@@ -205,7 +199,7 @@ module.exports = exports = class Module {
     )
   }
 
-  _evaluate(eagerRun = false) {
+  _evaluate() {
     if ((this._state & constants.states.EVALUATED) !== 0) return
 
     this._state |= constants.states.EVALUATED
@@ -224,17 +218,23 @@ module.exports = exports = class Module {
         urlToPath(this._url),
         urlToDirname(this._url)
       )
-
-      if (eagerRun) this._run()
     } else if (this._type === constants.types.MODULE) {
       this._run()
 
       this._exports = binding.getNamespace(this._handle)
-    } else if (eagerRun) {
-      this._run()
     }
   }
 
+  _run() {
+    if ((this._state & constants.states.RUN) !== 0) return
+
+    this._state |= constants.states.RUN
+
+    this._synthesize()
+
+    binding.runModule(this._handle, Module._handle, Module._onrun)
+  }
+
   [Symbol.for('bare.inspect')]() {
     return {
       __proto__: { constructor: Module },
@@ -978,7 +978,9 @@ Module._protocol = new Protocol({
   postresolve(url) {
     switch (url.protocol) {
       case 'file:':
-        return pathToFileURL(binding.realpath(fileURLToPath(url)))
+        return pathToFileURL(
+          binding.realpath(path.toNamespacedPath(fileURLToPath(url)))
+        )
       default:
         return url
     }
@@ -988,7 +990,7 @@ Module._protocol = new Protocol({
     switch (url.protocol) {
       case 'file:':
         return binding.exists(
-          fileURLToPath(url),
+          path.toNamespacedPath(fileURLToPath(url)),
           type === constants.types.ASSET
             ? binding.FILE | binding.DIR
             : binding.FILE
@@ -1001,7 +1003,9 @@ Module._protocol = new Protocol({
   read(url) {
     switch (url.protocol) {
       case 'file:':
-        return Buffer.from(binding.read(fileURLToPath(url)))
+        return Buffer.from(
+          binding.read(path.toNamespacedPath(fileURLToPath(url)))
+        )
       default:
         throw errors.UNKNOWN_PROTOCOL(`Cannot load module '${url.href}'`)
     }

package/lib/constants.d.ts

@@ -2,6 +2,7 @@ declare const constants: {
   states: {
     EVALUATED: number
     SYNTHESIZED: number
+    RUN: number
     DESTROYED: number
   }
   types: {

package/lib/constants.js

@@ -2,7 +2,8 @@ module.exports = {
   states: {
     EVALUATED: 1,
     SYNTHESIZED: 2,
-    DESTROYED: 4
+    RUN: 4,
+    DESTROYED: 8
   },
 
   types: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "4.8.4",
+  "version": "4.8.6",
   "description": "Module support for JavaScript",
   "exports": {
     ".": {