bare-module-traverse 2.0.0 → 2.0.2

package/index.js

@@ -198,12 +198,13 @@ exports.module = function* (url, source, attributes, artifacts, visited, opts =
       const [extension] = match
 
       switch (extension) {
-        case '.js':
+        case '.js': {
           const isESM =
             defaultType === constants.MODULE || (info !== null && info.type === 'module')
 
           type = isESM ? constants.MODULE : constants.SCRIPT
           break
+        }
         case '.cjs':
           type = constants.SCRIPT
           break

package/lib/resolve/bare.js

@@ -13,11 +13,11 @@ module.exports = function (entry, parentURL, opts = {}) {
     conditions = conditions.map((conditions) => ['addon', ...conditions])
 
     return resolve.addon(entry.specifier || '.', parentURL, {
+      ...opts,
       extensions,
       conditions,
       hosts,
-      linked,
-      ...opts
+      linked
     })
   }
 
@@ -34,8 +34,8 @@ module.exports = function (entry, parentURL, opts = {}) {
   }
 
   return resolve.module(entry.specifier, parentURL, {
+    ...opts,
     extensions,
-    conditions,
-    ...opts
+    conditions
   })
 }

package/lib/resolve/node.js

@@ -6,34 +6,32 @@ module.exports = function (entry, parentURL, opts = {}) {
   const { host = runtime.host, hosts = [host] } = opts
 
   let extensions
-  let conditions
+  let conditions = hosts.map((host) => ['node', ...host.split('-')])
 
   if (entry.type & lex.constants.ADDON) {
     extensions = ['.node']
-    conditions = hosts.map((host) => ['node', 'addon', ...host.split('-')])
+    conditions = conditions.map((conditions) => ['addon', ...conditions])
 
     return resolve.addon(entry.specifier || '.', parentURL, {
+      ...opts,
       extensions,
       conditions,
-      hosts,
-      ...opts
+      hosts
     })
   }
 
   if (entry.type & lex.constants.ASSET) {
-    conditions = ['node', 'asset']
+    conditions = conditions.map((conditions) => ['asset', ...conditions])
   } else if (entry.type & lex.constants.REQUIRE) {
     extensions = ['.js', '.json', '.node']
-    conditions = ['node', 'require']
+    conditions = conditions.map((conditions) => ['require', ...conditions])
   } else if (entry.type & lex.constants.IMPORT) {
-    conditions = ['node', 'import']
-  } else {
-    conditions = ['node']
+    conditions = conditions.map((conditions) => ['import', ...conditions])
   }
 
   return resolve.module(entry.specifier, parentURL, {
+    ...opts,
     extensions,
-    conditions,
-    ...opts
+    conditions
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module-traverse",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Low-level module graph traversal for Bare",
   "exports": {
     ".": {
@@ -37,10 +37,11 @@
     "lib"
   ],
   "scripts": {
-    "test": "npm run lint && npm run test:bare && npm run test:node",
-    "test:bare": "bare test.js",
-    "test:node": "node test.js",
-    "lint": "prettier . --check"
+    "format": "prettier --write . && lunte --fix",
+    "lint": "prettier --check . && lunte",
+    "test": "npm run test:bare && npm run test:node",
+    "test:bare": "brittle-bare --coverage test.js",
+    "test:node": "brittle-node --coverage test.js"
   },
   "repository": {
     "type": "git",
@@ -61,6 +62,7 @@
     "bare-buffer": "^3.0.2",
     "bare-url": "^2.1.3",
     "brittle": "^3.2.1",
+    "lunte": "^1.8.0",
     "prettier": "^3.4.2",
     "prettier-config-holepunch": "^2.0.0"
   },