@jcoreio/toolchain-esnext 5.7.0 → 5.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-esnext",
-  "version": "5.7.0",
+  "version": "5.8.1",
   "description": "ESNext JS build toolchain",
   "repository": {
     "type": "git",
@@ -32,7 +32,8 @@
     "globals": "^16.0.0",
     "resolve": "^1.22.2",
     "resolve-bin": "^1.0.0",
-    "@jcoreio/toolchain": "5.7.0"
+    "semver": "^7.5.3",
+    "@jcoreio/toolchain": "5.8.1"
   },
   "toolchainManaged": {
     "dependencies": {

package/plugins/babelPlugins.cjs

@@ -17,16 +17,12 @@ module.exports = [
 
     return [
       require.resolve('@babel/plugin-transform-runtime'),
-      // for CJS tests, we leave off import extensions, since @babel/register resolves them.
-      // for ESM tests, we resolve to .js for babel-register-esm.
-      // for CJS build, we resolve to .js.
-      // for ESM build, we resolve to .mjs.
-      ((JCOREIO_TOOLCHAIN_CJS && !JCOREIO_TOOLCHAIN_TEST) ||
-        JCOREIO_TOOLCHAIN_ESM) && [
+      (JCOREIO_TOOLCHAIN_CJS || JCOREIO_TOOLCHAIN_ESM) && [
         require.resolve('../util/babelPluginResolveImports.cjs'),
         {
           outputExtension:
-            JCOREIO_TOOLCHAIN_ESM && !JCOREIO_TOOLCHAIN_TEST ? esmExtension
+            JCOREIO_TOOLCHAIN_TEST ? undefined
+            : JCOREIO_TOOLCHAIN_ESM ? esmExtension
             : JCOREIO_TOOLCHAIN_CJS ? cjsExtension
             : packageJson.type === 'module' ? esmExtension
             : cjsExtension,

package/plugins/compile.cjs

@@ -1,6 +1,6 @@
 const execa = require('@jcoreio/toolchain/util/execa.cjs')
 const fs = require('@jcoreio/toolchain/util/projectFs.cjs')
-const { glob } = require('@jcoreio/toolchain/util/glob.cjs')
+const { glob, globIterate } = require('@jcoreio/toolchain/util/glob.cjs')
 const buildGlobOpts = require('@jcoreio/toolchain/util/buildGlobOpts.cjs')
 const path = require('path')
 const dedent = require('dedent-js')
@@ -12,32 +12,56 @@ const {
 const getPluginsArraySync = require('@jcoreio/toolchain/util/getPluginsArraySync.cjs')
 const fixSourceMaps = require('../util/fixSourceMaps.cjs')
 
+async function hasSourceFilesForExtension(extension) {
+  const ignore = [
+    ...(toolchainConfig.buildIgnore || []),
+    ...(/\.[cm]?ts$/i.test(extension) ? [`**/*.d${extension}`] : []),
+  ]
+  for await (const file of globIterate(`src/**/*${extension}`, {
+    ignore: ignore.length ? ignore : undefined,
+  })) {
+    return true
+  }
+  return false
+}
+
 module.exports = [
   [
     async function compile(args = []) {
-      const extensions = getPluginsArraySync('babelExtensions')
-
-      await execa(
-        'babel',
-        [
-          'src',
-          ...(extensions.length ? ['--extensions', extensions.join(',')] : []),
-          ...(extensions.includes('.ts') ? ['--ignore', '**/*.d.ts'] : []),
-          ...(toolchainConfig.buildIgnore || []).flatMap((pattern) => [
-            '--ignore',
-            pattern,
-          ]),
-          '--out-dir',
-          'dist',
-          '--out-file-extension',
-          packageJson.type === 'module' ? '.cjs' : '.js',
-          ...(toolchainConfig.sourceMaps ?
-            ['--source-maps', toolchainConfig.sourceMaps]
-          : []),
-        ],
-        { env: { ...process.env, JCOREIO_TOOLCHAIN_CJS: '1' } }
+      const extensions = getPluginsArraySync('sourceExtensions').map(
+        (ext) => `.${ext}`
       )
 
+      for (const extension of extensions) {
+        if (extension.startsWith('.m')) continue
+        if (!(await hasSourceFilesForExtension(extension))) continue
+        await execa(
+          'babel',
+          [
+            'src',
+            '--extensions',
+            extension,
+            ...(/\.[cm]?ts$/i.test(extension) ?
+              ['--ignore', '**/*.d' + extension]
+            : []),
+            ...(toolchainConfig.buildIgnore || []).flatMap((pattern) => [
+              '--ignore',
+              pattern,
+            ]),
+            '--out-dir',
+            'dist',
+            '--out-file-extension',
+            /\.c[tj]sx?$/i.test(extension) || packageJson.type === 'module' ?
+              '.cjs'
+            : '.js',
+            ...(toolchainConfig.sourceMaps ?
+              ['--source-maps', toolchainConfig.sourceMaps]
+            : []),
+          ],
+          { env: { ...process.env, JCOREIO_TOOLCHAIN_CJS: '1' } }
+        )
+      }
+
       const jsFiles = await glob(path.join('dist', '**', '*.js'))
       if (toolchainConfig.outputEsm !== false) {
         if (toolchainConfig.esWrapper) {
@@ -56,27 +80,35 @@ module.exports = [
             )
           )
         } else {
-          await execa(
-            'babel',
-            [
-              'src',
-              ...(extensions.length ?
-                ['--extensions', extensions.join(',')]
-              : []),
-              ...(toolchainConfig.buildIgnore || []).flatMap((pattern) => [
-                '--ignore',
-                pattern,
-              ]),
-              '--out-dir',
-              'dist',
-              '--out-file-extension',
-              packageJson.type === 'module' ? '.js' : '.mjs',
-              ...(toolchainConfig.sourceMaps ?
-                ['--source-maps', toolchainConfig.sourceMaps]
-              : []),
-            ],
-            { env: { ...process.env, JCOREIO_TOOLCHAIN_ESM: '1' } }
-          )
+          for (const extension of extensions) {
+            if (extension.startsWith('.c')) continue
+            if (!(await hasSourceFilesForExtension(extension))) continue
+            await execa(
+              'babel',
+              [
+                'src',
+                '--extensions',
+                extension,
+                ...(/\.[cm]?ts$/i.test(extension) ?
+                  ['--ignore', '**/*.d' + extension]
+                : []),
+                ...(toolchainConfig.buildIgnore || []).flatMap((pattern) => [
+                  '--ignore',
+                  pattern,
+                ]),
+                '--out-dir',
+                'dist',
+                '--out-file-extension',
+                /\.m[tj]sx?$/.test(extension) || packageJson.type !== 'module' ?
+                  '.mjs'
+                : '.js',
+                ...(toolchainConfig.sourceMaps ?
+                  ['--source-maps', toolchainConfig.sourceMaps]
+                : []),
+              ],
+              { env: { ...process.env, JCOREIO_TOOLCHAIN_ESM: '1' } }
+            )
+          }
         }
       }
 

package/util/babelRegisterEsmWrapper.mjs

@@ -1,48 +1,51 @@
 import path from 'path'
 import { fileURLToPath, pathToFileURL } from 'url'
-import { resolve, load as wrappedLoad } from 'babel-register-esm'
-import fs from 'fs-extra'
-import { packageJson, projectDir } from '@jcoreio/toolchain/util/findUps.cjs'
-import hasTSSources from '@jcoreio/toolchain/util/hasTSSources.cjs'
+import { resolve as baseResolve, load as wrappedLoad } from 'babel-register-esm'
+import { projectDir } from '@jcoreio/toolchain/util/findUps.cjs'
+import resolveAltType from './resolveAltType.cjs'
 
 const projectDirPrefix = pathToFileURL(projectDir) + '/'
 
-export { resolve }
+export async function resolve(specifier, context, nextResolve) {
+  if (
+    specifier.startsWith('.') &&
+    context.parentURL.startsWith('file:') &&
+    !context.parentURL.includes('/node_modules/')
+  ) {
+    const basedir = path.dirname(fileURLToPath(context.parentURL))
+    const altTypeResolved = resolveAltType(specifier, basedir)
+    if (altTypeResolved) {
+      return {
+        url: new URL(altTypeResolved, context.parentURL).toString(),
+        shortCircuit: true,
+        format:
+          process.env.JCOREIO_TOOLCHAIN_CJS ? 'commonjs'
+          : process.env.JCOREIO_TOOLCHAIN_ESM ? 'module'
+          : context.format,
+      }
+    }
+  }
+  return await baseResolve(specifier, context, nextResolve)
+}
 
 export async function load(url, context, nextLoad) {
   if (!url.startsWith('file:') || url.includes('/node_modules/')) {
     return await nextLoad(url, context)
   }
-  const file = fileURLToPath(url)
-  // some versions of node support --experimental-default-type, but it was removed in Node 23.
-  // Since we allow the project to omit `type` in `package.json` and transpile the same source
-  // code to CJS and ESM, we need to set the module type based upon the mode the toolchain is
-  // running in here for Node >=23.
-  if (context.format == null && url.startsWith(projectDirPrefix)) {
-    const extension = path.extname(file)
-    if (
-      extension === '.ts' ||
-      extension === '.tsx' ||
-      (!(await hasTSSources()) && (extension === '.js' || extension === '.jsx'))
-    ) {
-      return await wrappedLoad(
-        url,
-        {
-          ...context,
-          format:
-            (
-              extension.startsWith('.js') &&
-              packageJson.type !== 'module' &&
-              (await fs.pathExists(file)) &&
-              !(await hasTSSources())
-            ) ?
-              'commonjs'
-            : process.env.JCOREIO_TOOLCHAIN_ESM ? 'module'
-            : 'commonjs',
-        },
-        nextLoad
-      )
-    }
+  const extension = path.extname(url)
+  if (
+    process.env.JCOREIO_TOOLCHAIN_ESM &&
+    url.startsWith(projectDirPrefix) &&
+    (!extension || /\.m?[jt]sx?$/i.test(extension))
+  ) {
+    context = { ...context, format: 'module' }
+  }
+  if (
+    process.env.JCOREIO_TOOLCHAIN_CJS &&
+    url.startsWith(projectDirPrefix) &&
+    (!extension || /\.c?[jt]sx?$/i.test(extension))
+  ) {
+    context = { ...context, format: 'commonjs' }
   }
   return await wrappedLoad(url, context, nextLoad)
 }

package/util/fixSourceMaps.cjs

@@ -9,13 +9,17 @@ module.exports = async function fixSourceMaps() {
   await Promise.all(
     mapFiles.map(async (file) => {
       const content = await fs.readJson(file)
-      const { sources } = content
+      const { sources, sourcesContent } = content
       let changed = false
       for (let i = 0; i < sources.length; i++) {
         if (sources[i].startsWith('../src/')) {
           changed = true
           sources[i] = sources[i].substring('../'.length)
         }
+        if (sourcesContent && sourcesContent[i] != null) {
+          changed = true
+          sourcesContent[i] = null
+        }
       }
       if (changed) await fs.writeJson(file, content)
     })

package/util/resolveAltType.cjs

@@ -0,0 +1,41 @@
+const path = require('path')
+const fs = require('fs-extra')
+const { packageJson } = require('@jcoreio/toolchain/util/findUps.cjs')
+const hasTSSourcesSync = require('@jcoreio/toolchain/util/hasTSSourcesSync.cjs')
+
+const isActive =
+  (packageJson.type === 'module' && process.env.JCOREIO_TOOLCHAIN_CJS) ||
+  (packageJson.type !== 'module' && process.env.JCOREIO_TOOLCHAIN_ESM)
+
+module.exports = function resolveAltType(specifier, basedir) {
+  if (
+    !isActive ||
+    !specifier.startsWith('.') ||
+    !/\.[tj]sx?$/i.test(specifier)
+  ) {
+    return undefined
+  }
+  // if .js/.ts, project is CJS and output mode is ESM, see if there's a .mjs/.mts file.
+  // if .js/.ts, project is ESM and output mode is CJS, see if there's a .cjs/.cts file.
+  // same for tsx/jsx
+  const otherTypeSpecifier = specifier.replace(
+    /\.([^.]+)$/,
+    packageJson.type === 'module' ? '.c$1' : '.m$1'
+  )
+  if (fs.pathExistsSync(path.resolve(basedir, otherTypeSpecifier))) {
+    return otherTypeSpecifier
+  }
+  if (hasTSSourcesSync() && /\.tsx?$/i.test(specifier)) {
+    // if .ts, project is CJS and output mode is ESM, see if there's a .mjs file.
+    // if .ts, project is ESM and output mode is CJS, see if there's a .cjs file.
+    // same for tsx/jsx
+    const otherTypeSpecifier = specifier.replace(
+      /\.t([^.]+)$/,
+      packageJson.type === 'module' ? '.cj$1' : '.mj$1'
+    )
+    if (fs.pathExistsSync(path.resolve(basedir, otherTypeSpecifier))) {
+      return otherTypeSpecifier
+    }
+  }
+  return undefined
+}

package/util/resolveImportSource.cjs

@@ -2,12 +2,18 @@ const resolve = require('resolve/sync')
 const path = require('path')
 const fs = require('fs-extra')
 const builtinModules = new Set(require('module').builtinModules)
+const resolveAltType = require('./resolveAltType.cjs')
 
 module.exports = function resolveImportSource({
   file,
   source,
   outputExtension,
 }) {
+  const basedir = path.dirname(file)
+
+  const altTypeResolved = resolveAltType(source, basedir)
+  if (altTypeResolved) return altTypeResolved
+
   if (
     /(\.d\.ts|\.[cm]?jsx?)$/i.test(source) ||
     source.startsWith('node:') ||
@@ -16,7 +22,6 @@ module.exports = function resolveImportSource({
     return source
   }
 
-  const basedir = path.dirname(file)
   if (source.startsWith('.')) {
     if (/\.[cm]?tsx?$/i.test(source) && /\.d\.[cm]?ts$/i.test(file)) {
       source = source.replace(/\.[^.]+$/, '')