@jcoreio/toolchain 4.8.0 → 4.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "4.8.0",
+  "version": "4.9.1",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -22,9 +22,10 @@
     "execa": "^5.0.0",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
-    "glob": "^7.2.0",
+    "glob": "^11.0.0",
     "json5": "^2.2.1",
     "lint-staged": "^15.2.2",
+    "minimatch": "^10.0.1",
     "open": "^8.4.0",
     "prettier": "^2.5.1",
     "prompts": "^2.4.2",

package/plugins/compile.cjs

@@ -1,6 +1,7 @@
 const Path = require('path')
 const { projectDir } = require('../util/findUps.cjs')
 const fs = require('../util/projectFs.cjs')
+const isBuildIgnored = require('../util/isBuildIgnored.cjs')
 
 module.exports = [
   async function compile(args = []) {
@@ -8,6 +9,7 @@ module.exports = [
       if (err.code !== 'ENOENT') throw err
     }
     const filter = (src, dest) => {
+      if (isBuildIgnored(src)) return false
       // eslint-disable-next-line no-console
       console.error(
         Path.relative(projectDir, src),

package/plugins/getConfigFiles.cjs

@@ -4,6 +4,7 @@ const fs = require('../util/projectFs.cjs')
 const JSON5 = require('json5')
 const { isMonorepoSubpackage } = require('../util/findUps.cjs')
 const getPluginsArraySync = require('../util/getPluginsArraySync.cjs')
+const initBuildIgnore = require('../util/initBuildIgnore.cjs')
 
 async function getRootEslintConfig() {
   if (await fs.pathExists('.eslintrc.json')) {
@@ -53,6 +54,7 @@ module.exports = [
         return dedent`
           /* eslint-env node, es2018 */
           module.exports = {
+            buildIgnore: ${JSON.stringify(await initBuildIgnore(), null, 2)},
             // scripts: {
             //   pretest: 'docker compose up -d',
             //   jsExample: {
@@ -73,13 +75,13 @@ module.exports = [
         existing && fromVersion
           ? existing
           : dedent`
-        /* eslint-env node, es2018 */
-        const base = require('${name}/${file}')
-        module.exports = {
-          ...base,
-        }
-  
-      `
+              /* eslint-env node, es2018 */
+              const base = require('${name}/${file}')
+              module.exports = {
+                ...base,
+              }
+        
+            `
     }
     const tasks = isMonorepoSubpackage
       ? []

package/plugins/smokeTestBuild.cjs

@@ -0,0 +1,26 @@
+const getModules = require('../util/getModules.cjs')
+const execa = require('../util/execa.cjs')
+const path = require('path')
+
+module.exports = [
+  async function smokeTestBuild() {
+    const { cjs, esm } = await getModules('dist/package.json')
+
+    function relpath(file) {
+      const result = path.relative(process.cwd(), file)
+      return result.startsWith('.') ? result : `./${result}`
+    }
+
+    for (const file of cjs) {
+      await execa('node', ['-e', `require(${JSON.stringify(relpath(file))})`])
+    }
+    for (const file of esm) {
+      await execa('node', [
+        '--input-type',
+        'module',
+        '-e',
+        `import ${JSON.stringify(relpath(file))}`,
+      ])
+    }
+  },
+]

package/scripts/build.cjs

@@ -3,7 +3,7 @@ const Path = require('path')
 const { projectDir } = require('../util/findUps.cjs')
 const fs = require('../util/projectFs.cjs')
 const execa = require('../util/execa.cjs')
-const glob = require('../util/glob.cjs')
+const { glob } = require('../util/glob.cjs')
 
 exports.run = async function build(args = []) {
   await execa('tc', ['clean'])

package/scripts/migrate/migrateEslintConfigs.cjs

@@ -1,4 +1,4 @@
-const glob = require('../../util/glob.cjs')
+const { glob } = require('../../util/glob.cjs')
 const Path = require('path')
 const JSON5 = require('json5')
 const fs = require('../../util/projectFs.cjs')

package/scripts/migrate/migrateMoveTypeDefs.cjs

@@ -1,4 +1,4 @@
-const glob = require('../../util/glob.cjs')
+const { glob } = require('../../util/glob.cjs')
 const fs = require('../../util/projectFs.cjs')
 const path = require('path')
 

package/scripts/smokeTestBuild.cjs

@@ -1,26 +1,7 @@
-const getModules = require('../util/getModules.cjs')
-const execa = require('../util/execa.cjs')
-const path = require('path')
+const getPluginsAsyncFunction = require('../util/getPluginsAsyncFunction.cjs')
 
-exports.run = async function smokeTestBuild() {
-  const { cjs, esm } = await getModules('dist/package.json')
-
-  function relpath(file) {
-    const result = path.relative(process.cwd(), file)
-    return result.startsWith('.') ? result : `./${result}`
-  }
-
-  for (const file of cjs) {
-    await execa('node', ['-e', `require(${JSON.stringify(relpath(file))})`])
-  }
-  for (const file of esm) {
-    await execa('node', [
-      '--input-type',
-      'module',
-      '-e',
-      `import ${JSON.stringify(relpath(file))}`,
-    ])
-  }
+exports.run = async function smokeTestBuild(args) {
+  await getPluginsAsyncFunction('smokeTestBuild')(args)
 }
 
 exports.description = 'smoke test that build output can be required/imported'

package/scripts/toolchain.cjs

@@ -42,12 +42,17 @@ const scripts = toolchainConfig
       ...Object.fromEntries(
         Object.entries(toolchainConfig.scripts || {}).map(([name, script]) => [
           name,
-          typeof script === 'string'
+          typeof script === 'string' && script.trim()
             ? {
                 run: (args = []) =>
                   execa([script, ...args].join(' '), { shell: true }),
                 description: script,
               }
+            : !script || typeof script === 'string'
+            ? {
+                run: () => {},
+                description: '(no-op)',
+              }
             : script,
         ])
       ),

package/util/buildGlobOpts.cjs

@@ -0,0 +1,8 @@
+const isBuildIgnored = require('./isBuildIgnored.cjs')
+
+module.exports = {
+  ignore: {
+    ignored: (p) => isBuildIgnored(p.fullpath()),
+    childrenIgnored: (p) => isBuildIgnored(p.fullpath()),
+  },
+}

package/util/configSchema.cjs

@@ -5,6 +5,8 @@ module.exports = z.object({
   esmBabelEnv: z.record(z.unknown()).optional(),
   esWrapper: z.boolean().optional(),
   outputEsm: z.boolean().optional(),
+  hasTypeScriptSources: z.boolean().optional(),
+  buildIgnore: z.array(z.string()).optional(),
   sourceMaps: z
     .union([
       /**

package/util/findUps.cjs

@@ -1,7 +1,7 @@
 const findUp = require('find-up')
 const Path = require('path')
 const fs = require('fs-extra')
-const glob = require('glob')
+const { globSync } = require('glob')
 const merge = require('./merge.cjs')
 const once = require('./once.cjs')
 const { name } = require('../package.json')
@@ -64,7 +64,7 @@ exports.monorepoSubpackageJsonFiles = pnpmWorkspace
   ? [
       ...new Set(
         pnpmWorkspace.packages.flatMap((p) =>
-          glob.sync(Path.join(p, 'package.json'), { cwd: monorepoProjectDir })
+          globSync(Path.join(p, 'package.json'), { cwd: monorepoProjectDir })
         )
       ),
     ].map((f) => Path.resolve(monorepoProjectDir, f))

package/util/getModules.cjs

@@ -1,5 +1,5 @@
 const fs = require('./projectFs.cjs')
-const glob = require('./glob.cjs')
+const { glob } = require('./glob.cjs')
 const path = require('path')
 
 module.exports = async function getModules(packageJsonFile) {

package/util/glob.cjs

@@ -1,6 +1,23 @@
-const _glob = require('util').promisify(require('glob'))
+const { glob, globSync, globIterate, globIterateSync } = require('glob')
 const { projectDir } = require('./findUps.cjs')
 
-const glob = (what, options) => _glob(what, { cwd: projectDir, ...options })
-
-module.exports = glob
+module.exports = {
+  glob: (what, options) => glob(what, { cwd: projectDir, ...options }),
+  globSync: (what, options) => globSync(what, { cwd: projectDir, ...options }),
+  globIterate: (what, options) =>
+    globIterate(what, { cwd: projectDir, ...options }),
+  globIterateSync: (what, options) =>
+    globIterateSync(what, { cwd: projectDir, ...options }),
+  globExists: async (what, options) => {
+    for await (const _ of module.exports.globIterate(what, options)) {
+      return true
+    }
+    return false
+  },
+  globExistsSync: (what, options) => {
+    for (const _ of module.exports.globIterateSync(what, options)) {
+      return true
+    }
+    return false
+  },
+}

package/util/hasTSFiles.cjs

@@ -1,7 +1,7 @@
-const fs = require('./projectFs.cjs')
 const once = require('./once.cjs')
+const { glob } = require('./glob.cjs')
 
 module.exports = once(async function hasTSFiles() {
-  const files = await fs.readdir('src')
-  return files.some((f) => /\.[cm]?tsx?$/.test(f))
+  const files = await glob('**/*.{ts,tsx}')
+  return files.length > 0
 })

package/util/hasTSSources.cjs

@@ -0,0 +1,15 @@
+const once = require('./once.cjs')
+const { globExists } = require('./glob.cjs')
+const { toolchainConfig } = require('./findUps.cjs')
+
+module.exports = once(async function hasTSSources() {
+  if (
+    toolchainConfig &&
+    typeof toolchainConfig.hasTypeScriptSources === 'boolean'
+  ) {
+    return toolchainConfig.hasTypeScriptSources
+  }
+  return await globExists('src/**/*.{ts,cts,mts,tsx,ctsx,mtsx}', {
+    ignore: '**/*.d.{ts,cts,mts}',
+  })
+})

package/util/hasTSSourcesSync.cjs

@@ -1,7 +1,15 @@
-const fs = require('./projectFs.cjs')
 const once = require('./once.cjs')
+const { globExistsSync } = require('./glob.cjs')
+const { toolchainConfig } = require('./findUps.cjs')
 
 module.exports = once(function hasTSSourcesSync() {
-  const files = fs.readdirSync('src')
-  return files.some((f) => /\.[cm]?tsx?$/.test(f) && !/\.d\.[cm]?tsx?$/.test(f))
+  if (
+    toolchainConfig &&
+    typeof toolchainConfig.hasTypeScriptSources === 'boolean'
+  ) {
+    return toolchainConfig.hasTypeScriptSources
+  }
+  return globExistsSync('src/**/*.{ts,cts,mts,tsx,ctsx,mtsx}', {
+    ignore: '**/*.d.{ts,cts,mts}',
+  })
 })

package/util/initBuildIgnore.cjs

@@ -0,0 +1,18 @@
+const { globExists } = require('@jcoreio/toolchain/util/glob.cjs')
+const getPluginsArraySync = require('@jcoreio/toolchain/util/getPluginsArraySync.cjs')
+
+module.exports = async function initBuildIgnore() {
+  const buildIgnore = []
+  if (await globExists('src/**/__tests__')) {
+    buildIgnore.push('src/**/__tests__')
+  }
+  for (const extension of getPluginsArraySync('sourceExtensions')) {
+    for (const suffix of ['test', 'spec']) {
+      const pattern = `src/**/*.${suffix}.${extension}`
+      if (await globExists(pattern, { ignore: 'src/**/__tests__/**' })) {
+        buildIgnore.push(pattern)
+      }
+    }
+  }
+  return buildIgnore
+}

package/util/isBuildIgnored.cjs

@@ -0,0 +1,12 @@
+const path = require('path')
+const { toolchainConfig, projectDir } = require('./findUps.cjs')
+const { Minimatch } = require('minimatch')
+
+const matchers = ((toolchainConfig && toolchainConfig.buildIgnore) || []).map(
+  (pattern) => new Minimatch(pattern)
+)
+
+module.exports = function isBuildIgnored(file) {
+  if (path.isAbsolute(file)) file = path.relative(projectDir, file)
+  return matchers.some((m) => m.match(file))
+}