@jcoreio/toolchain 5.3.0 → 5.3.2

package/lint-staged.config.cjs

@@ -3,16 +3,16 @@ const getPluginsArraySync = require('./util/getPluginsArraySync.cjs')
 const lintExtList = getPluginsArraySync('lintExtensions')
 
 const lintExts =
-  lintExtList.length === 1
-    ? `*.${lintExtList[0]}`
-    : `*.{${lintExtList.join(',')}}`
+  lintExtList.length === 1 ?
+    `*.${lintExtList[0]}`
+  : `*.{${lintExtList.join(',')}}`
 
 const formatExtList = getPluginsArraySync('formatExtensions')
 
 const formatExts =
-  formatExtList.length === 1
-    ? `*.${formatExtList[0]}`
-    : `*.{${formatExtList.join(',')}}`
+  formatExtList.length === 1 ?
+    `*.${formatExtList[0]}`
+  : `*.{${formatExtList.join(',')}}`
 
 module.exports = {
   [lintExts]: ['tc lint:fix'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "5.3.0",
+  "version": "5.3.2",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",

package/plugins/getConfigFiles.cjs

@@ -11,13 +11,13 @@ const { glob } = require('../util/glob.cjs')
 module.exports = [
   async function getConfigFiles({ fromVersion }) {
     const files = {
-      ...(isMonorepoSubpackage
-        ? {}
-        : {
-            '.npmrc': dedent`
+      ...(isMonorepoSubpackage ?
+        {}
+      : {
+          '.npmrc': dedent`
               optional=false
             `,
-          }),
+        }),
       'eslint.config.cjs': async (existing) => {
         if (existing && fromVersion) return existing
         const configs = {}
@@ -64,9 +64,8 @@ module.exports = [
       'prettier.config.cjs',
     ]) {
       files[file] = async (existing) =>
-        existing && fromVersion
-          ? existing
-          : dedent`
+        existing && fromVersion ? existing : (
+          dedent`
               /* eslint-env node, es2018 */
               const base = require('${name}/${file}')
               module.exports = {
@@ -74,39 +73,38 @@ module.exports = [
               }
         
             `
+        )
     }
-    const tasks = isMonorepoSubpackage
-      ? []
-      : await getPluginsArraySync('vscodeTasks')
-    const launch = isMonorepoSubpackage
-      ? []
-      : await getPluginsArraySync('vscodeLaunch')
+    const tasks =
+      isMonorepoSubpackage ? [] : await getPluginsArraySync('vscodeTasks')
+    const launch =
+      isMonorepoSubpackage ? [] : await getPluginsArraySync('vscodeLaunch')
 
     if (tasks.length) {
       files['.vscode/tasks.json'] = async (existing) =>
-        existing && fromVersion
-          ? existing
-          : JSON.stringify(
-              {
-                version: '2.0.0',
-                tasks,
-              },
-              null,
-              2
-            )
+        existing && fromVersion ? existing : (
+          JSON.stringify(
+            {
+              version: '2.0.0',
+              tasks,
+            },
+            null,
+            2
+          )
+        )
     }
     if (launch.length) {
       files['.vscode/launch.json'] = async (existing) =>
-        existing && fromVersion
-          ? existing
-          : JSON.stringify(
-              {
-                version: '0.2.0',
-                configurations: launch,
-              },
-              null,
-              2
-            )
+        existing && fromVersion ? existing : (
+          JSON.stringify(
+            {
+              version: '0.2.0',
+              configurations: launch,
+            },
+            null,
+            2
+          )
+        )
     }
 
     return files

package/prettier.config.cjs

@@ -4,5 +4,6 @@ module.exports = {
   semi: false,
   singleQuote: true,
   trailingComma: 'es5',
+  experimentalTernaries: true,
   overrides: getPluginsArraySync('prettierOverrides'),
 }

package/scripts/create.cjs

@@ -73,27 +73,27 @@ async function create(args = []) {
       message: 'Package keywords:',
       format: (text) => (text || '').split(/\s*,\s*|\s+/g),
     },
-    ...(monorepoPackageJson
-      ? []
-      : [
-          {
-            type: 'text',
-            name: 'organization',
-            initial: (prev, { name }) => {
-              const match = /^@(.*?)\//.exec(name)
-              if (match) return match[1]
-            },
-            message: 'GitHub organization:',
-            validate: required,
+    ...(monorepoPackageJson ?
+      []
+    : [
+        {
+          type: 'text',
+          name: 'organization',
+          initial: (prev, { name }) => {
+            const match = /^@(.*?)\//.exec(name)
+            if (match) return match[1]
           },
-          {
-            type: 'text',
-            name: 'repo',
-            message: 'GitHub repo:',
-            initial: (prev, { name }) => name.replace(/^@(.*?)\//, ''),
-            validate: required,
-          },
-        ]),
+          message: 'GitHub organization:',
+          validate: required,
+        },
+        {
+          type: 'text',
+          name: 'repo',
+          message: 'GitHub repo:',
+          initial: (prev, { name }) => name.replace(/^@(.*?)\//, ''),
+          validate: required,
+        },
+      ]),
     {
       type: 'select',
       name: 'license',
@@ -140,8 +140,9 @@ async function create(args = []) {
     copyrightHolder,
   } = answers
 
-  const { organization, repo } = monorepoPackageJson
-    ? parseRepositoryUrl(monorepoPackageJson.repository.url)
+  const { organization, repo } =
+    monorepoPackageJson ?
+      parseRepositoryUrl(monorepoPackageJson.repository.url)
     : answers
 
   const cwd = path.resolve(directory)
@@ -150,12 +151,12 @@ async function create(args = []) {
 
   const fs = ChdirFs(cwd)
 
-  const subpackagePath = monorepoProjectDir
-    ? path.relative(monorepoProjectDir, cwd)
-    : undefined
+  const subpackagePath =
+    monorepoProjectDir ? path.relative(monorepoProjectDir, cwd) : undefined
 
-  const branch = subpackagePath
-    ? (
+  const branch =
+    subpackagePath ?
+      (
         await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
           stdio: 'pipe',
           encoding: 'utf8',

package/scripts/init.cjs

@@ -73,11 +73,9 @@ async function init(args = []) {
     '--prefer-offline',
     ...(isMonorepoRoot ? ['-w'] : []),
     isTest ? '../packages/base' : `${name}@^${version}`,
-    ...(isTest
-      ? [...selectedToolchains].map((t) =>
-          t.replace(`${name}-`, '../packages/')
-        )
-      : [...selectedToolchains].map((t) => `${t}@^${version}`)),
+    ...(isTest ?
+      [...selectedToolchains].map((t) => t.replace(`${name}-`, '../packages/'))
+    : [...selectedToolchains].map((t) => `${t}@^${version}`)),
   ])
   await execa('tc', ['migrate'])
   if (isInteractive) {

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -110,53 +110,55 @@ async function migrateProjectPackageJson({ fromVersion }) {
       packageJson.exports = {
         './package.json': './package.json',
         '.': {
-          ...(packageJson.types
-            ? { types: relativize(packageJson.types) }
-            : {}),
-          ...(outputEsm !== false && packageJson.module
-            ? { import: relativize(packageJson.module) }
-            : {}),
+          ...(packageJson.types ?
+            { types: relativize(packageJson.types) }
+          : {}),
+          ...(outputEsm !== false && packageJson.module ?
+            { import: relativize(packageJson.module) }
+          : {}),
           default: relativize(packageJson.main),
         },
-        ...(dotStar
-          ? {
-              './*': {
-                types: './*.d.ts',
-                ...(outputEsm !== false ? { import: './*.mjs' } : {}),
-                default: './*.js',
-              },
-            }
-          : {}),
+        ...(dotStar ?
+          {
+            './*': {
+              types: './*.d.ts',
+              ...(outputEsm !== false ? { import: './*.mjs' } : {}),
+              default: './*.js',
+            },
+          }
+        : {}),
       }
     }
   }
 
   merge(
     packageJson,
-    fromVersion
-      ? {}
-      : {
-          version: '0.0.0-development',
-          sideEffects: false,
-          scripts: {
-            tc: 'toolchain',
-            toolchain: 'toolchain',
-            test: 'toolchain test',
-            prepublishOnly:
-              'echo This package is meant to be published by semantic-release from the dist build directory. && exit 1',
-          },
+    fromVersion ?
+      {}
+    : {
+        version: '0.0.0-development',
+        sideEffects: false,
+        scripts: {
+          tc: 'toolchain',
+          toolchain: 'toolchain',
+          test: 'toolchain test',
+          prepublishOnly:
+            'echo This package is meant to be published by semantic-release from the dist build directory. && exit 1',
         },
+      },
     pick(toolchainManaged, 'engines', 'packageManager'),
     {
       packageManager:
-        !packageJson.packageManager ||
-        !packageJson.packageManager.startsWith('pnpm@') ||
-        semver.lt(
-          packageJson.packageManager.replace(/^pnpm@/, ''),
-          toolchainManaged.packageManager.replace(/^pnpm@/, '')
-        )
-          ? toolchainManaged.packageManager
-          : packageJson.packageManager,
+        (
+          !packageJson.packageManager ||
+          !packageJson.packageManager.startsWith('pnpm@') ||
+          semver.lt(
+            packageJson.packageManager.replace(/^pnpm@/, ''),
+            toolchainManaged.packageManager.replace(/^pnpm@/, '')
+          )
+        ) ?
+          toolchainManaged.packageManager
+        : packageJson.packageManager,
     },
     pick(packageJson, 'engines')
   )

package/scripts/migrate.cjs

@@ -20,9 +20,8 @@ async function migrate(args = []) {
   const hasYarnOrNpmLockfile = require('../util/hasYarnOrNpmLockfile.cjs')
   const writeMigratedVersion = require('../util/writeMigratedVersion.cjs')
 
-  const fromVersion = packageJson[name]
-    ? packageJson[name].migratedVersion
-    : undefined
+  const fromVersion =
+    packageJson[name] ? packageJson[name].migratedVersion : undefined
   if (!fromVersion && !isMonorepoSubpackage && !findGitDir()) {
     await execa('git', ['init'])
     await installGitHooks.run()

package/scripts/runPrettier.cjs

@@ -2,11 +2,12 @@ const fs = require('../util/projectFs.cjs')
 const execa = require('../util/execa.cjs')
 
 async function prettierArgs() {
-  return (await fs.pathExists('.prettierignore'))
-    ? ['--ignore-path', '.prettierignore']
-    : (await fs.pathExists('.gitignore'))
-      ? ['--ignore-path', '.gitignore']
-      : []
+  return (
+    (await fs.pathExists('.prettierignore')) ?
+      ['--ignore-path', '.prettierignore']
+    : (await fs.pathExists('.gitignore')) ? ['--ignore-path', '.gitignore']
+    : []
+  )
 }
 
 async function runPrettier(args = []) {

package/scripts/toolchain.cjs

@@ -13,8 +13,9 @@ try {
     throw error
   }
 }
-const scripts = toolchainConfig
-  ? {
+const scripts =
+  toolchainConfig ?
+    {
       badges: require('./badges.cjs'),
       migrate: require('./migrate.cjs'),
       build: require('./build.cjs'),
@@ -43,18 +44,18 @@ const scripts = toolchainConfig
       ...Object.fromEntries(
         Object.entries(toolchainConfig.scripts || {}).map(([name, script]) => [
           name,
-          typeof script === 'string' && script.trim()
-            ? {
-                run: (args = []) =>
-                  execa([script, ...args].join(' '), { shell: true }),
-                description: script,
-              }
-            : !script || typeof script === 'string'
-              ? {
-                  run: () => {},
-                  description: '(no-op)',
-                }
-              : script,
+          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/scripts/upgrade.cjs

@@ -49,22 +49,22 @@ async function upgrade([version] = []) {
 
   await execa(
     'pnpm',
-    isTest
-      ? [
-          ...(isMonorepoRoot ? ['-r'] : []),
-          'add',
-          '-D',
-          '--prefer-offline',
-          '../packages/base',
-          ...toolchains.map((t) => t.replace(`${name}-`, '../packages/')),
-        ]
-      : [
-          ...(isMonorepoRoot ? ['-r'] : []),
-          'update',
-          '--prefer-offline',
-          `${name}@^${version}`,
-          ...toolchains.map((t) => `${t}@^${version}`),
-        ]
+    isTest ?
+      [
+        ...(isMonorepoRoot ? ['-r'] : []),
+        'add',
+        '-D',
+        '--prefer-offline',
+        '../packages/base',
+        ...toolchains.map((t) => t.replace(`${name}-`, '../packages/')),
+      ]
+    : [
+        ...(isMonorepoRoot ? ['-r'] : []),
+        'update',
+        '--prefer-offline',
+        `${name}@^${version}`,
+        ...toolchains.map((t) => `${t}@^${version}`),
+      ]
   )
   if (isMonorepoRoot) await execa('pnpm', ['run', '-r', 'tc', 'migrate'])
   else await execa('tc', ['migrate'])

package/util/ParseState.cjs

@@ -42,10 +42,12 @@ class ParseState {
     )
     pattern.lastIndex = this.index
     const match = pattern.exec(this.input)
-    return match &&
-      match.index === this.index &&
-      match.index + match[0].length <= this.end
-      ? match
+    return (
+        match &&
+          match.index === this.index &&
+          match.index + match[0].length <= this.end
+      ) ?
+        match
       : undefined
   }
 

package/util/confirm.cjs

@@ -5,8 +5,8 @@ module.exports = async function confirm({
   initial,
   ifNotInteractive = initial,
 }) {
-  return isInteractive
-    ? (
+  return isInteractive ?
+      (
         await require('./prompt.cjs')({
           type: 'confirm',
           message,

package/util/findUps.cjs

@@ -8,10 +8,9 @@ const { name } = require('../package.json')
 const configSchema = require('./configSchema.cjs')
 
 const cwd = (
-  fs.pathExistsSync(Path.join(process.cwd(), 'package.json'))
-    ? process.cwd()
-    : __filename
-).replace(/\/node_modules(\/.*|$)/, '')
+  fs.pathExistsSync(Path.join(process.cwd(), 'package.json')) ?
+    process.cwd()
+  : __filename).replace(/\/node_modules(\/.*|$)/, '')
 
 const packageJsonFile = (exports.packageJsonFile = findUp.sync('package.json', {
   cwd,
@@ -32,37 +31,38 @@ const pnpmWorkspaceFile = (exports.pnpmWorkspaceFile = findUp.sync(
     type: 'file',
   }
 ))
-const pnpmWorkspace = pnpmWorkspaceFile
-  ? require('yaml').parse(fs.readFileSync(pnpmWorkspaceFile, 'utf8'))
+const pnpmWorkspace =
+  pnpmWorkspaceFile ?
+    require('yaml').parse(fs.readFileSync(pnpmWorkspaceFile, 'utf8'))
   : undefined
 
 const isMonorepoSubpackage = (exports.isMonorepoSubpackage =
-  pnpmWorkspace && Array.isArray(pnpmWorkspace.packages)
-    ? pnpmWorkspace.packages.some((p) =>
-        new RegExp(`^${p.replace(/\*/g, '[^/]+')}$`).test(
-          Path.relative(Path.dirname(pnpmWorkspaceFile), projectDir)
-        )
+  pnpmWorkspace && Array.isArray(pnpmWorkspace.packages) ?
+    pnpmWorkspace.packages.some((p) =>
+      new RegExp(`^${p.replace(/\*/g, '[^/]+')}$`).test(
+        Path.relative(Path.dirname(pnpmWorkspaceFile), projectDir)
       )
-    : false)
+    )
+  : false)
 
 const isMonorepoRoot = (exports.isMonorepoRoot =
   pnpmWorkspaceFile != null && Path.dirname(pnpmWorkspaceFile) === projectDir)
 
 const monorepoProjectDir = (exports.monorepoProjectDir =
-  isMonorepoSubpackage || isMonorepoRoot
-    ? Path.dirname(pnpmWorkspaceFile)
-    : undefined)
+  isMonorepoSubpackage || isMonorepoRoot ?
+    Path.dirname(pnpmWorkspaceFile)
+  : undefined)
 
 const monorepoPackageJsonFile = (exports.monorepoPackageJsonFile =
-  monorepoProjectDir
-    ? Path.join(monorepoProjectDir, 'package.json')
-    : undefined)
-exports.monorepoPackageJson = monorepoPackageJsonFile
-  ? fs.readJsonSync(monorepoPackageJsonFile)
-  : undefined
-
-exports.monorepoSubpackageJsonFiles = pnpmWorkspace
-  ? [
+  monorepoProjectDir ?
+    Path.join(monorepoProjectDir, 'package.json')
+  : undefined)
+exports.monorepoPackageJson =
+  monorepoPackageJsonFile ? fs.readJsonSync(monorepoPackageJsonFile) : undefined
+
+exports.monorepoSubpackageJsonFiles =
+  pnpmWorkspace ?
+    [
       ...new Set(
         pnpmWorkspace.packages.flatMap((p) =>
           globSync(Path.join(p, 'package.json'), { cwd: monorepoProjectDir })
@@ -71,8 +71,14 @@ exports.monorepoSubpackageJsonFiles = pnpmWorkspace
     ].map((f) => Path.resolve(monorepoProjectDir, f))
   : undefined
 
-exports.monorepoSubpackageJsons = exports.monorepoSubpackageJsonFiles
-  ? exports.monorepoSubpackageJsonFiles.map((f) => fs.readJsonSync(f))
+exports.monorepoSubpackageDirs =
+  exports.monorepoSubpackageJsonFiles ?
+    exports.monorepoSubpackageJsonFiles.map((f) => Path.dirname(f))
+  : undefined
+
+exports.monorepoSubpackageJsons =
+  exports.monorepoSubpackageJsonFiles ?
+    exports.monorepoSubpackageJsonFiles.map((f) => fs.readJsonSync(f))
   : undefined
 
 const findGitDir = once(function findGitDir(cwd = process.cwd()) {
@@ -98,23 +104,23 @@ const isToolchainDev = Path.normalize(__dirname)
 const toolchainPackageJsons = (exports.toolchainPackageJsons = {})
 for (const pkg of toolchainPackages) {
   toolchainPackageJsons[pkg] =
-    pkg === packageJson.name
-      ? packageJson
-      : require(
-          isToolchainDev
-            ? Path.resolve(
-                __dirname,
-                '..',
-                '..',
-                pkg === '@jcoreio/toolchain'
-                  ? 'base'
-                  : pkg.replace('@jcoreio/toolchain-', ''),
-                'package.json'
-              )
-            : require.resolve(`${pkg}/package.json`, {
-                paths: [projectDir],
-              })
-        )
+    pkg === packageJson.name ?
+      packageJson
+    : require(
+        isToolchainDev ?
+          Path.resolve(
+            __dirname,
+            '..',
+            '..',
+            pkg === '@jcoreio/toolchain' ? 'base' : (
+              pkg.replace('@jcoreio/toolchain-', '')
+            ),
+            'package.json'
+          )
+        : require.resolve(`${pkg}/package.json`, {
+            paths: [projectDir],
+          })
+      )
 }
 
 let toolchainConfigFile
@@ -136,8 +142,9 @@ try {
     toolchainConfigFile ? require(toolchainConfigFile) : packageJson[name] || {}
   )
 } catch (error) {
-  const toolchainConfigLocation = toolchainConfigFile
-    ? Path.relative(cwd, toolchainConfigFile)
+  const toolchainConfigLocation =
+    toolchainConfigFile ?
+      Path.relative(cwd, toolchainConfigFile)
     : `packageJson[${JSON.stringify(name)}]`
 
   // eslint-disable-next-line no-console

package/util/getModules.cjs

@@ -18,15 +18,12 @@ module.exports = async function getModules(packageJsonFile) {
   const defaultType = type
   function checkFile(
     file,
-    type = file
-      ? /\.cjs$/.test(file)
-        ? 'commonjs'
-        : /\.mjs$/.test(file)
-          ? 'module'
-          : /\.js$/.test(file)
-            ? defaultType
-            : undefined
+    type = file ?
+      /\.cjs$/.test(file) ? 'commonjs'
+      : /\.mjs$/.test(file) ? 'module'
+      : /\.js$/.test(file) ? defaultType
       : undefined
+    : undefined
   ) {
     if (!file) return
     if (type === 'commonjs') cjs.add(file)
@@ -52,11 +49,9 @@ module.exports = async function getModules(packageJsonFile) {
         await checkExport(
           value,
           type ||
-            (key === 'require'
-              ? 'commonjs'
-              : key === 'import'
-                ? 'module'
-                : undefined)
+            (key === 'require' ? 'commonjs'
+            : key === 'import' ? 'module'
+            : undefined)
         )
       }
     }

package/util/migrateLegacyEslintConfigs.cjs

@@ -14,9 +14,9 @@ const objectExpression = (props) =>
   )
 
 const idOrString = (value) =>
-  /^[_a-z$][_a-z0-9$]*$/.test(value)
-    ? t.identifier(value)
-    : t.stringLiteral(value)
+  /^[_a-z$][_a-z0-9$]*$/.test(value) ?
+    t.identifier(value)
+  : t.stringLiteral(value)
 
 const member = (object, key) => {
   const prop = idOrString(key)

package/util/sortPlugins.cjs

@@ -1,7 +1,11 @@
 const toposort = require('toposort')
 
 function asArray(x) {
-  return Array.isArray(x) ? x : x ? [x] : []
+  return (
+    Array.isArray(x) ? x
+    : x ? [x]
+    : []
+  )
 }
 
 function normalizeDef(def) {

package/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: [require.resolve('./eslintConfig.cjs')],
-  env: {
-    node: true,
-  },
-}