bare-module 6.1.2 → 6.2.0

package/README.md

@@ -131,7 +131,7 @@ The following conditions are supported, listed in order from most specific to le
 | `"node"`       | Matches for any Node.js environment.                                                                                                |
 | `"<platform>"` | Matches when equal to `Bare.platform`. See [`Bare.platform`](https://github.com/holepunchto/bare#bareplatform) for possible values. |
 | `"<arch>"`     | Matches when equal to `Bare.arch`. See [`Bare.arch`](https://github.com/holepunchto/bare#barearch) for possible values.             |
-| `"simulator"`  | Matches when Bare was compiled for a simulator, i.e. when `Bare.simulator` is `true`.                                               |
+| `"simulator"`  | Matches when Bare was compiled for a simulator.                                                                                     |
 | `"default"`    | The fallback that always matches. This condition should always be last.                                                             |
 
 Export conditions are evaluated in the order they are defined in the `"exports"` field. This means that less specific conditionals defined first will override more specific conditions define later. For example, the following will always call `./fallback.js` because `"default"` always matches and is defined first.
@@ -237,7 +237,7 @@ The following conditions are supported, listed in order from most specific to le
 | `"node"`       | Matches for any Node.js environment.                                                                                                |
 | `"<platform>"` | Matches when equal to `Bare.platform`. See [`Bare.platform`](https://github.com/holepunchto/bare#bareplatform) for possible values. |
 | `"<arch>"`     | Matches when equal to `Bare.arch`. See [`Bare.arch`](https://github.com/holepunchto/bare#barearch) for possible values.             |
-| `"simulator"`  | Matches when Bare was compiled for a simulator, ie when `Bare.simulator` is `true`.                                                 |
+| `"simulator"`  | Matches when Bare was compiled for a simulator.                                                                                     |
 | `"default"`    | The fallback that always matches. This condition should always be last.                                                             |
 
 The general rule is that conditions should be from most specific to least specific when defined.
@@ -332,6 +332,30 @@ options = {
 }
 ```
 
+#### `const url = Module.asset(specifier, parentURL[, options])`
+
+Get the asset URL by resolving `specifier` relative to `parentURL`. `specifier` is a string and `parentURL` is a WHATWG `URL`.
+
+Options include:
+
+```js
+options = {
+  // The referring module.
+  referrer: null,
+  // The ModuleProtocol to use resolve the specifier. Defaults to referrer's
+  // protocol if defined, otherwise defaults to Module.protocol
+  protocol,
+  // A default "imports" map to apply to all specifiers. Follows the same
+  // syntax and rules as the "imports" property defined in `package.json`.
+  imports,
+  // A map of preresolved imports with keys being serialized parent URLs and
+  // values being "imports" maps.
+  resolutions,
+  // The supported import conditions. "default" is always recognized.
+  conditions
+}
+```
+
 #### `const module = Module.load(url[, source][, options])`
 
 Load a module with the provided `url`. `url` is a WHATWG `URL`. If provided, the `source` will be passed to the matching `extension` for the `url`.
@@ -380,41 +404,17 @@ options = {
 }
 ```
 
-#### `const url = Module.asset(specifier, parentURL[, options])`
-
-Get the asset URL by resolving `specifier` relative to `parentURL`. `specifier` is a string and `parentURL` is a WHATWG `URL`.
-
-Options include:
-
-```js
-options = {
-  // The referring module.
-  referrer: null,
-  // The ModuleProtocol to use resolve the specifier. Defaults to referrer's
-  // protocol if defined, otherwise defaults to Module.protocol
-  protocol,
-  // A default "imports" map to apply to all specifiers. Follows the same
-  // syntax and rules as the "imports" property defined in `package.json`.
-  imports,
-  // A map of preresolved imports with keys being serialized parent URLs and
-  // values being "imports" maps.
-  resolutions,
-  // The supported import conditions. "default" is always recognized.
-  conditions
-}
-```
-
 #### `module.url`
 
-The WHATWG `URL` instance for the module.
+The WHATWG `URL` identifier of the module.
 
 #### `module.filename`
 
-The pathname of the `module.url`.
+The file portion of `module.url`.
 
 #### `module.dirname`
 
-The directory name of the module.
+The directory portion of `module.url`.
 
 #### `module.type`
 
@@ -454,7 +454,7 @@ An array of conditions used to resolve dependencies while loading the module. Se
 
 #### `module.protocol`
 
-The `ModuleProtocol` class used for resolving, reading and loading modules. See [Protocols](#protocols).
+The `ModuleProtocol` class used for resolving, reading, and loading modules. See [Protocols](#protocols).
 
 ### CommonJS modules
 
@@ -503,7 +503,7 @@ See [`bare-addon`](https://github.com/holepunchto/bare-addon) for a template of
 
 #### `require.addon.host`
 
-Returns the string representation of the platform and architecture used when resolving addons with the pattern `<platform>-<arch>[-simulator]`. Returns the same value as `Bare.Addon.host`.
+Returns the string representation of the platform and architecture used when resolving addons with the pattern `<platform>-<arch>[-<environment>]`. Returns the same value as `Bare.Addon.host`.
 
 #### `const path = require.addon.resolve([specifier][, parentURL])`
 
@@ -540,6 +540,14 @@ A boolean representing whether the current module is the entry script where the
 
 A cache of loaded modules for this module. The same value as `module.cache` for the current module.
 
+#### `import.meta.dirname`
+
+The directory name of the current module.
+
+#### `import.meta.filename`
+
+The file name of the current module.
+
 #### `const href = import.meta.resolve(specifier[, parentURL])`
 
 A module-relative resolution function which returns the URL string for the module. The `specifier` is a string which is resolved relative to the `parentURL` which is a WHATWG URL.
@@ -552,7 +560,7 @@ Returns the exported module contents.
 
 #### `import.meta.addon.host`
 
-Returns the string representation of the platform and architecture used when resolving addons with the pattern `<platform>-<arch>[-simulator]`. Returns the same value as `Bare.Addon.host`.
+Returns the string representation of the platform and architecture used when resolving addons with the pattern `<platform>-<arch>[-<environment>]`. Returns the same value as `Bare.Addon.host`.
 
 #### `const href = import.meta.addon.resolve([specifier][, parentURL])`
 

package/index.js

@@ -248,7 +248,7 @@ module.exports = exports = class Module {
   static _cache =
     module[kind] === Module[kind] ? module.cache || Object.create(null) : Object.create(null)
 
-  static _conditions = ['bare', 'node', Bare.platform, Bare.arch]
+  static _conditions = ['bare', 'node', ...Bare.Addon.host.split('-')]
 
   static _handle = binding.init(this, this._onimport, this._onevaluate, this._onmeta)
 
@@ -323,6 +323,9 @@ module.exports = exports = class Module {
     meta.main = module._main === module
     meta.cache = module._cache
 
+    meta.dirname = module.dirname // For Node.js compatibility
+    meta.filename = module.filename // For Node.js compatibility
+
     meta.resolve = function resolve(specifier, parentURL = referrer._url) {
       return self.resolve(specifier, toURL(parentURL, referrer._url), {
         referrer
@@ -797,8 +800,6 @@ exports.createRequire = function createRequire(parentURL, opts = {}) {
   return require
 }
 
-if (Bare.simulator) Module._conditions.push('simulator')
-
 Module._extensions['.js'] = function (module, source, referrer) {
   const self = Module
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "6.1.2",
+  "version": "6.2.0",
   "description": "Module support for JavaScript",
   "exports": {
     ".": {
@@ -20,7 +20,9 @@
   ],
   "addon": true,
   "scripts": {
-    "test": "prettier . --check && bare test.js"
+    "format": "prettier --write . && lunte --fix",
+    "lint": "prettier --check . && lunte",
+    "test": "brittle-bare --coverage test.js"
   },
   "repository": {
     "type": "git",
@@ -46,6 +48,7 @@
     "bare-buffer": "^3.0.2",
     "brittle": "^3.1.1",
     "cmake-bare": "^1.1.6",
+    "lunte": "^1.6.0",
     "prettier": "^3.3.3",
     "prettier-config-holepunch": "^2.0.0"
   },