@jcoreio/toolchain 5.4.4 → 5.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "5.4.4",
+  "version": "5.5.0",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -22,6 +22,7 @@
     "@eslint/js": "^9.23.0",
     "@jcoreio/eslint-plugin-implicit-dependencies": "^1.1.1",
     "chalk": "^4.0.0",
+    "debug": "^4.4.0",
     "dedent-js": "^1.0.1",
     "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",

package/scripts/migrate/migrateExportMap.cjs

@@ -0,0 +1,36 @@
+const semver = require('semver')
+
+function migrateExportMap(
+  exportMap,
+  { fromVersion = '0.0.0', outputEsm = true } = {}
+) {
+  if (
+    (semver.lt(fromVersion || '0.0.0', '5.5.0') && exportMap,
+    outputEsm !== false)
+  ) {
+    function process(obj) {
+      if (typeof obj.types === 'string') {
+        obj.types = {
+          import: obj.types.replace(/\.d\.ts$/, '.d.mts'),
+          default: obj.types,
+        }
+      }
+      for (const key in obj) {
+        if (
+          key !== 'types' &&
+          Object.hasOwnProperty.call(obj, key) &&
+          obj[key] != null &&
+          typeof obj[key] === 'object'
+        ) {
+          process(obj[key])
+        }
+      }
+    }
+    if (exportMap != null && typeof exportMap === 'object') {
+      process(exportMap)
+    }
+  }
+  return exportMap
+}
+
+module.exports = migrateExportMap

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -1,4 +1,7 @@
-const { toolchainManaged } = require('../../util/findUps.cjs')
+const {
+  toolchainConfig: { outputEsm },
+  toolchainManaged,
+} = require('../../util/findUps.cjs')
 const { name } = require('../../package.json')
 const getPluginsAsyncFunction = require('../../util/getPluginsAsyncFunction.cjs')
 const fs = require('../../util/projectFs.cjs')
@@ -11,6 +14,7 @@ const confirmOutputEsm = require('./confirmOutputEsm.cjs')
 const confirm = require('../../util/confirm.cjs')
 const unset = require('../../util/unset.cjs')
 const merge = require('../../util/merge.cjs')
+const migrateExportMap = require('./migrateExportMap.cjs')
 
 async function migrateProjectPackageJson({ fromVersion }) {
   const packageJson = await fs.readJson('package.json')
@@ -142,7 +146,10 @@ async function migrateProjectPackageJson({ fromVersion }) {
         ...(dotStar ?
           {
             './*': {
-              types: './*.d.ts',
+              types: {
+                ...(outputEsm !== false ? { import: './*.d.mts' } : {}),
+                default: './*.d.ts',
+              },
               ...(outputEsm !== false ? { import: './*.mjs' } : {}),
               default: './*.js',
             },
@@ -152,6 +159,8 @@ async function migrateProjectPackageJson({ fromVersion }) {
     }
   }
 
+  migrateExportMap(packageJson.exports, { outputEsm, fromVersion })
+
   merge(
     packageJson,
     fromVersion ?

package/util/findUps.cjs

@@ -6,26 +6,41 @@ const merge = require('./merge.cjs')
 const once = require('./once.cjs')
 const { name } = require('../package.json')
 const configSchema = require('./configSchema.cjs')
+const debug = require('debug')('@jcoreio/toolchain:findUps')
 
 // First see if the cwd is within a project dir
 let dir = process
   .cwd()
   .replace(/\/node_modules(\/.*|$)|\\node_modules(\\.*|$)/, '')
-let packageJsonFile = findUp.sync('package.json', {
+
+function matchNamedPackageJson(directory) {
+  try {
+    const json = fs.readJsonSync(Path.join(directory, 'package.json'))
+    if (json.name) return 'package.json'
+  } catch {
+    return undefined
+  }
+}
+
+let packageJsonFile = findUp.sync(matchNamedPackageJson, {
   cwd: dir,
   type: 'file',
 })
+debug({ step: 0, cwd: process.cwd(), dir, packageJsonFile })
 
 if (!packageJsonFile) {
   // When the cwd is not within a project dir, see if this file is within a project dir
   dir = __dirname.replace(/\/node_modules(\/.*|$)|\\node_modules(\\.*|$)/, '')
 
-  packageJsonFile = findUp.sync('package.json', {
+  packageJsonFile = findUp.sync(matchNamedPackageJson, {
     cwd: dir,
     type: 'file',
   })
 }
+debug({ step: 1, dir, packageJsonFile })
+
 if (!packageJsonFile) {
+  debug(`failed to find project package.json in a parent directory of ${dir}`)
   throw new Error(
     `failed to find project package.json in a parent directory of ${dir}`
   )
@@ -36,12 +51,26 @@ if (!packageJsonFile) {
 // if @jcoreio/toolchains is operating on itself.   But if we're invoking the CLI from
 // a working copy of the monorepo from a cwd outside of it, we want to error out
 let packageJson = fs.readJsonSync(packageJsonFile)
+debug({ step: 2, 'packageJson.name': packageJson.name })
+
+if (!packageJsonFile) {
+  debug(`failed to find project package.json in a parent directory of ${dir}`)
+  throw new Error(
+    `failed to find project package.json in a parent directory of ${dir}`
+  )
+}
+
 if (packageJson.name === name) {
-  packageJsonFile = findUp.sync('package.json', {
+  packageJsonFile = findUp.sync(matchNamedPackageJson, {
     cwd: Path.dirname(Path.dirname(packageJsonFile)),
     type: 'file',
   })
   packageJson = packageJsonFile ? fs.readJsonSync(packageJsonFile) : undefined
+  debug({
+    step: 3,
+    packageJsonFile,
+    'packageJson.name': packageJson.name,
+  })
   if (
     // When vscode-prettier is trying to format a file in this monorepo, the
     // cwd may be outside the monorepo, which would make our logic decide
@@ -54,6 +83,7 @@ if (packageJson.name === name) {
     !packageJson ||
     packageJson.name !== '@jcoreio/toolchains'
   ) {
+    debug(`failed to find project package.json in a parent directory of ${dir}`)
     throw new Error(
       `failed to find project package.json in a parent directory of ${dir}`
     )
@@ -227,3 +257,5 @@ for (const toolchainPkgJson of Object.values(toolchainPackageJsons)) {
     }
   }
 }
+
+debug(exports)

package/util/getModules.cjs

@@ -46,6 +46,7 @@ module.exports = async function getModules(packageJsonFile) {
       }
     } else if (exp instanceof Object) {
       for (const [key, value] of Object.entries(exp)) {
+        if (key === 'types') continue
         await checkExport(
           value,
           type ||