bare-module 1.11.0 → 1.11.2

package/binding.c

@@ -446,6 +446,43 @@ bare_module_exists (js_env_t *env, js_callback_info_t *info) {
   return result;
 }
 
+static js_value_t *
+bare_module_realpath (js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  uv_loop_t *loop;
+  err = js_get_env_loop(env, &loop);
+  assert(err == 0);
+
+  js_value_t *argv[1];
+  size_t argc = 1;
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 1);
+
+  utf8_t path[4096];
+  err = js_get_value_string_utf8(env, argv[0], path, 4096, NULL);
+  assert(err == 0);
+
+  uv_fs_t req;
+  uv_fs_realpath(loop, &req, (char *) path, NULL);
+
+  if (req.result < 0) {
+    js_throw_error(env, uv_err_name(err), uv_strerror(err));
+    return NULL;
+  }
+
+  js_value_t *result;
+  err = js_create_string_utf8(env, (utf8_t *) req.ptr, -1, &result);
+  assert(err == 0);
+
+  uv_fs_req_cleanup(&req);
+
+  return result;
+}
+
 static js_value_t *
 bare_module_read (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -567,6 +604,11 @@ init (js_env_t *env, js_value_t *exports) {
     js_create_function(env, "exists", -1, bare_module_exists, NULL, &fn);
     js_set_named_property(env, exports, "exists", fn);
   }
+  {
+    js_value_t *fn;
+    js_create_function(env, "realpath", -1, bare_module_realpath, NULL, &fn);
+    js_set_named_property(env, exports, "realpath", fn);
+  }
   {
     js_value_t *fn;
     js_create_function(env, "read", -1, bare_module_read, NULL, &fn);

package/index.js

@@ -27,6 +27,16 @@ const Module = module.exports = class Module {
     return this._imports
   }
 
+  // For Node.js compatibility
+  get id () {
+    return this.filename
+  }
+
+  // For Node.s compatibility
+  get path () {
+    return this.dirname
+  }
+
   static _context = binding.init(this, this._onimport, this._onevaluate, this._onmeta)
 
   static _extensions = Object.create(null)
@@ -205,7 +215,7 @@ const Module = module.exports = class Module {
       throw errors.MODULE_NOT_FOUND(msg)
     }
 
-    return resolved
+    return protocol.postresolve(resolved, dirname)
   }
 
   static * _resolve (specifier, dirname, protocol, imports) {
@@ -214,7 +224,7 @@ const Module = module.exports = class Module {
 
     protocol = this._protocolFor(specifier, protocol)
 
-    specifier = protocol.map(specifier, dirname)
+    specifier = protocol.preresolve(specifier, dirname)
 
     if (protocol.resolve) {
       yield * protocol.resolve(specifier, dirname, imports)
@@ -235,15 +245,18 @@ const Module = module.exports = class Module {
   }
 
   static * _resolveFile (filename, protocol) {
-    const f = filename
-
-    if (protocol.exists(f)) yield f
-    if (protocol.exists(f + '.js')) yield f + '.js'
-    if (protocol.exists(f + '.cjs')) yield f + '.cjs'
-    if (protocol.exists(f + '.mjs')) yield f + '.mjs'
-    if (protocol.exists(f + '.json')) yield f + '.json'
-    if (protocol.exists(f + '.bare')) yield f + '.bare'
-    if (protocol.exists(f + '.node')) yield f + '.node'
+    const extensions = [
+      '.js',
+      '.cjs',
+      '.mjs',
+      '.json',
+      '.bare',
+      '.node'
+    ]
+
+    for (const candidate of [filename, ...extensions.map(ext => filename + ext)]) {
+      if (protocol.exists(candidate)) yield candidate
+    }
   }
 
   static * _resolveIndex (dirname, protocol) {
@@ -508,10 +521,14 @@ Module._extensions['.bundle'] = function (module, source, referrer, protocol, im
 }
 
 Module._protocols['file:'] = new Protocol({
-  map (specifier) {
+  preresolve (specifier) {
     return specifier.replace(/^file:/, '')
   },
 
+  postresolve (specifier) {
+    return binding.realpath(specifier)
+  },
+
   exists (filename) {
     return binding.exists(filename)
   },
@@ -522,7 +539,7 @@ Module._protocols['file:'] = new Protocol({
 })
 
 Module._protocols['node:'] = new Protocol({
-  map (specifier) {
+  preresolve (specifier) {
     return specifier.replace(/^node:/, '')
   }
 })

package/lib/protocol.js

@@ -2,7 +2,8 @@ module.exports = class Protocol {
   constructor (opts = {}) {
     const {
       imports = Object.create(null),
-      map = null,
+      preresolve = null,
+      postresolve = null,
       resolve = null,
       exists = null,
       read = null
@@ -10,14 +11,20 @@ module.exports = class Protocol {
 
     this.imports = imports
 
-    if (map) this.map = map.bind(this)
+    if (preresolve) this.preresolve = preresolve.bind(this)
+    if (postresolve) this.postresolve = postresolve.bind(this)
+
     if (resolve) this.resolve = resolve.bind(this)
     else this.resolve = null
     if (exists) this.exists = exists.bind(this)
     if (read) this.read = read.bind(this)
   }
 
-  map (specifier, dirname) {
+  preresolve (specifier, dirname) {
+    return specifier
+  }
+
+  postresolve (specifier, dirname) {
     return specifier
   }
 

package/package.json

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