@jcoreio/toolchain-esnext 5.8.7 → 5.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-esnext",
-  "version": "5.8.7",
+  "version": "5.8.9",
   "description": "ESNext JS build toolchain",
   "repository": {
     "type": "git",
@@ -28,12 +28,13 @@
     "babel-register-esm": "^1.2.5",
     "dedent-js": "^1.0.1",
     "eslint": "^9.17.0",
+    "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "globals": "^16.0.0",
     "resolve": "^1.22.2",
     "resolve-bin": "^1.0.0",
     "semver": "^7.5.3",
-    "@jcoreio/toolchain": "5.8.7"
+    "@jcoreio/toolchain": "5.8.9"
   },
   "toolchainManaged": {
     "dependencies": {

package/util/babelRegisterEsmWrapper.mjs

@@ -3,36 +3,72 @@ import { fileURLToPath, pathToFileURL } from 'url'
 import { resolve as baseResolve, load as wrappedLoad } from 'babel-register-esm'
 import { projectDir } from '@jcoreio/toolchain/util/findUps.cjs'
 import resolveAltType from './resolveAltType.cjs'
+import findUp from 'find-up'
+import fs from 'fs-extra'
 
 const projectDirPrefix = pathToFileURL(projectDir) + '/'
 
+const packageJsonCache = new Map()
+let packageJsonCacheTime = Date.now()
+
+async function getPackageJson(cwd) {
+  const now = Date.now()
+  if (now - packageJsonCacheTime > 10000) {
+    packageJsonCache.clear()
+    packageJsonCacheTime = now
+  }
+  if (packageJsonCache.has(cwd)) return packageJsonCache.get(cwd)
+  const packageJsonFile = await findUp('package.json', { cwd })
+  const packageJson =
+    packageJsonFile ?
+      await fs.readJson(packageJsonFile).catch(() => undefined)
+    : undefined
+  packageJsonCache.set(cwd, packageJson)
+  return packageJson
+}
+
 export async function resolve(specifier, context, nextResolve) {
-  if (
-    specifier.startsWith(projectDirPrefix) ||
-    (specifier.startsWith('.') &&
-      context.parentURL.startsWith('file:') &&
-      !context.parentURL.includes('/node_modules/'))
-  ) {
-    const basedir =
-      context.parentURL ?
-        path.dirname(fileURLToPath(context.parentURL))
-      : process.cwd()
-    if (!specifier.startsWith('.')) {
-      specifier = path.relative(basedir, fileURLToPath(specifier))
-      if (!specifier.startsWith('.')) specifier = `./${specifier}`
-    }
-    const altTypeResolved = resolveAltType(specifier, basedir)
-    if (altTypeResolved) {
-      return {
-        url: pathToFileURL(path.resolve(basedir, altTypeResolved)).toString(),
-        shortCircuit: true,
-        format:
-          process.env.JCOREIO_TOOLCHAIN_CJS ? 'commonjs'
-          : process.env.JCOREIO_TOOLCHAIN_ESM ? 'module'
-          : context.format,
+  if (specifier.startsWith('file:') || specifier.startsWith('.')) {
+    const resolved = new URL(specifier, context.parentURL).toString()
+    if (
+      resolved.startsWith(projectDirPrefix) &&
+      !resolved.includes('/node_modules/')
+    ) {
+      const basedir =
+        context.parentURL ?
+          path.dirname(fileURLToPath(context.parentURL))
+        : process.cwd()
+      const file = fileURLToPath(resolved)
+      let relativeSpec = path.relative(basedir, file)
+      if (!relativeSpec.startsWith('.')) relativeSpec = `./${relativeSpec}`
+      const altTypeResolved = resolveAltType(relativeSpec, basedir)
+      if (altTypeResolved) {
+        return {
+          url: pathToFileURL(path.resolve(basedir, altTypeResolved)).toString(),
+          shortCircuit: true,
+          format:
+            process.env.JCOREIO_TOOLCHAIN_CJS ? 'commonjs'
+            : process.env.JCOREIO_TOOLCHAIN_ESM ? 'module'
+            : context.format,
+        }
+      }
+      if (
+        /\.[jt]sx?$/.test(resolved) &&
+        !process.env.JCOREIO_TOOLCHAIN_CJS &&
+        !process.env.JCOREIO_TOOLCHAIN_ESM
+      ) {
+        const packageJson = await getPackageJson(path.dirname(file))
+        if (packageJson) {
+          return {
+            url: resolved,
+            shortCircuit: true,
+            format: packageJson.type || 'commonjs',
+          }
+        }
       }
     }
   }
+
   return await baseResolve(specifier, context, nextResolve)
 }