@jcoreio/toolchain 5.2.0 → 5.3.1

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,9 @@ exports.monorepoSubpackageJsonFiles = pnpmWorkspace
     ].map((f) => Path.resolve(monorepoProjectDir, f))
   : undefined
 
-exports.monorepoSubpackageJsons = exports.monorepoSubpackageJsonFiles
-  ? exports.monorepoSubpackageJsonFiles.map((f) => fs.readJsonSync(f))
+exports.monorepoSubpackageJsons =
+  exports.monorepoSubpackageJsonFiles ?
+    exports.monorepoSubpackageJsonFiles.map((f) => fs.readJsonSync(f))
   : undefined
 
 const findGitDir = once(function findGitDir(cwd = process.cwd()) {
@@ -98,23 +99,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 +137,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

@@ -0,0 +1,218 @@
+const { name } = require('../package.json')
+const { format } = require('prettier')
+const prettierConfig = require('../prettier.config.cjs')
+const { statement, expression, default: template } = require('@babel/template')
+const { generate } = require('@babel/generator')
+const path = require('path')
+const t = require('@babel/types')
+
+const objectExpression = (props) =>
+  t.objectExpression(
+    Object.entries(props).flatMap(([key, value]) =>
+      value ? [t.objectProperty(t.identifier(key), value)] : []
+    )
+  )
+
+const idOrString = (value) =>
+  /^[_a-z$][_a-z0-9$]*$/.test(value) ?
+    t.identifier(value)
+  : t.stringLiteral(value)
+
+const member = (object, key) => {
+  const prop = idOrString(key)
+  return t.memberExpression(object, prop, prop.type !== 'Identifier')
+}
+
+function isSimpleObjectExpression(obj) {
+  return (
+    obj &&
+    obj.type === 'ObjectExpression' &&
+    obj.properties.every(
+      (p) =>
+        p.type === 'ObjectProperty' &&
+        !p.computed &&
+        (p.key.type === 'Identifier' || p.key.type === 'StringLiteral')
+    )
+  )
+}
+
+function decodeSimpleObjectExpression(obj) {
+  if (!isSimpleObjectExpression(obj)) {
+    throw new Error(
+      'obj is not an ObjectExpression containing only non-computed identifier- or string-keyed properties'
+    )
+  }
+  return Object.fromEntries(
+    obj.properties.map((p) => [
+      p.key.type === 'Identifier' ? p.key.name : p.key.value,
+      p.value,
+    ])
+  )
+}
+
+async function migrateLegacyEslintConfigs(configs) {
+  const body = [
+    statement.ast`const { defineConfig } = require('eslint/config')`,
+  ]
+  const warnings = {}
+  let importedGlobals = false
+
+  function importGlobals() {
+    if (importedGlobals) return
+    body.push(statement.ast`const globals = require('globals')`)
+    importedGlobals = true
+  }
+
+  const CONFIG = expression.ast(`[...require('${name}/eslintConfig.cjs')]`)
+  for (const [file, content] of Object.entries(configs)) {
+    function warn(warning) {
+      ;(warnings[file] || (warnings[file] = [])).push(warning)
+    }
+    if (/\.[cm]?js$/.test(file)) {
+      const { parse } = require('@babel/parser')
+      let parsed
+      try {
+        parsed = parse(content, { sourceType: 'unambiguous' })
+      } catch (error) {
+        warn(`parse error: ${error.message}`)
+        continue
+      }
+
+      const exportStatement = parsed.program.body.find(
+        (s) =>
+          s.type === 'ExpressionStatement' &&
+          s.expression.type === 'AssignmentExpression' &&
+          generate(s.expression.left).code === 'module.exports' &&
+          s.expression.right.type === 'ObjectExpression'
+      )
+      if (!exportStatement) {
+        warn('module.exports = statement not found')
+        continue
+      }
+      const config = exportStatement.expression.right
+
+      if (!isSimpleObjectExpression(config)) {
+        warn(
+          'config is not an ObjectExpression or has spread or computed properties'
+        )
+        continue
+      }
+      const {
+        extends: _extends,
+        env: _env,
+        rules,
+        ...rest
+      } = decodeSimpleObjectExpression(config)
+
+      for (const key of Object.keys(rest)) {
+        warn(
+          `migrating ${generate(member(t.identifier('config'), key)).code} is not currently supported`
+        )
+      }
+
+      if (_extends) {
+        const ext = generate(_extends).code
+        if (
+          ext !== `[require.resolve('@jcoreio/toolchain/eslintConfig.cjs')]` &&
+          ext !== `[require.resolve('@jcoreio/toolchain/eslint.config.cjs')]`
+        ) {
+          warn(
+            `config.extends has entries other than base @jcoreio/toolchain eslint config`
+          )
+        }
+      }
+      let env
+      if (_env) {
+        if (isSimpleObjectExpression(_env)) {
+          env = decodeSimpleObjectExpression(_env)
+          for (const key in env) {
+            if (env[key].type !== 'BooleanLiteral') {
+              warn(
+                `config.${generate(member(t.identifier('env'), key)).code} is not a boolean`
+              )
+              delete env[key]
+            }
+          }
+          if (!Object.keys(env).length) env = undefined
+        } else {
+          warn(
+            `config.env is not an ObjectExpression or has spread or computed properties`
+          )
+        }
+      }
+
+      if (!env && !rules) continue
+
+      if (env) importGlobals()
+
+      CONFIG.elements.push(
+        objectExpression({
+          files:
+            path.dirname(file) !== '.' &&
+            t.arrayExpression([t.stringLiteral(path.dirname(file) + '/**')]),
+          languageOptions:
+            env &&
+            objectExpression({
+              globals: t.objectExpression(
+                Object.keys(env).map((key) =>
+                  t.spreadElement(member(t.identifier('globals'), key))
+                )
+              ),
+            }),
+          rules,
+        })
+      )
+    } else {
+      const JSON5 = require('json5')
+
+      const props = JSON5.parse(content)
+      const { env, rules, ...rest } = props
+
+      for (const key of Object.keys(rest)) {
+        warn(
+          `migrating ${generate(member(t.identifier('config'), key)).code} is not currently supported`
+        )
+      }
+
+      if (!env && !rules) continue
+
+      if (env) importGlobals()
+
+      CONFIG.elements.push(
+        objectExpression({
+          files:
+            path.dirname(file) !== '.' &&
+            t.arrayExpression([t.stringLiteral(path.dirname(file) + '/**')]),
+          rules: rules && expression.ast(JSON.stringify(rules)),
+          languageOptions:
+            env &&
+            objectExpression({
+              globals: t.objectExpression(
+                Object.keys(env).map((key) =>
+                  t.spreadElement(member(t.identifier('globals'), key))
+                )
+              ),
+            }),
+        })
+      )
+    }
+  }
+
+  body.push(template`module.exports = defineConfig(CONFIG)`({ CONFIG }))
+
+  return {
+    migrated: await format(
+      generate(t.program(body)).code.replace(
+        /^module\.exports/m,
+        '\nmodule.exports'
+      ),
+      {
+        ...prettierConfig,
+        parser: 'babel',
+      }
+    ),
+    warnings,
+  }
+}
+
+module.exports = migrateLegacyEslintConfigs

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,
-  },
-}

package/bin/eslint

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-exec $(node "$basedir/resolveBin.cjs" eslint) "$@"

package/bin/lint-fix.cjs

@@ -1,8 +0,0 @@
-#!/usr/bin/env node
-
-require('../scripts/runEslint.cjs')
-  .eslintFix()
-  .then(
-    () => process.exit(0),
-    (error) => process.exit(error.code != null ? error.code : 1)
-  )

package/bin/lint-staged

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-exec $(node "$basedir/resolveBin.cjs" lint-staged) "$@"

package/bin/prettier

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-exec $(node "$basedir/resolveBin.cjs" prettier) "$@"

package/bin/resolveBin.cjs

@@ -1,8 +0,0 @@
-#!/usr/bin/env node
-
-process.stdout.write(
-  require('resolve-bin').sync(
-    process.argv[2],
-    process.argv[3] ? { executable: process.argv[3] } : {}
-  )
-)

package/bin/semantic-release

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-exec $(node "$basedir/resolveBin.cjs" semantic-release) "$@"

package/eslint.extends.cjs

@@ -1,79 +0,0 @@
-module.exports = {
-  extends: ['eslint:recommended'],
-  plugins: ['@jcoreio/eslint-plugin-implicit-dependencies'],
-  rules: {
-    '@jcoreio/implicit-dependencies/no-implicit': [
-      'error',
-      {
-        dev: true,
-        peer: true,
-        optional: true,
-      },
-    ],
-    'arrow-spacing': 'error',
-    'comma-spacing': 'error',
-    'computed-property-spacing': ['error', 'never'],
-    'eol-last': 'error',
-    'jsx-quotes': 'error',
-    'keyword-spacing': 'error',
-    'key-spacing': [
-      'error',
-      {
-        mode: 'strict',
-      },
-    ],
-    'linebreak-style': 'error',
-    'no-console': 'error',
-    'no-unused-vars': [
-      'error',
-      {
-        args: 'none',
-        varsIgnorePattern: 'React',
-      },
-    ],
-    'no-extra-semi': 'error',
-    'no-multi-spaces': 'error',
-    'no-multiple-empty-lines': 'error',
-    'no-trailing-spaces': 'error',
-    'no-unexpected-multiline': 'error',
-    'no-unreachable': 'error',
-    'no-whitespace-before-property': 'error',
-    'object-shorthand': ['error', 'always'],
-    'padded-blocks': ['error', 'never'],
-    semi: ['error', 'never'],
-    'space-before-blocks': ['error', 'always'],
-    'space-before-function-paren': [
-      'error',
-      {
-        anonymous: 'always',
-        named: 'never',
-      },
-    ],
-    'space-in-parens': ['error', 'never'],
-    'space-infix-ops': ['error', { int32Hint: false }],
-    'space-unary-ops': [
-      'error',
-      {
-        words: true,
-        nonwords: false,
-      },
-    ],
-    'rest-spread-spacing': ['error', 'never'],
-  },
-  overrides: [
-    {
-      files: ['src/**'],
-      excludedFiles: ['**/__tests__/**'],
-      rules: {
-        '@jcoreio/implicit-dependencies/no-implicit': [
-          'error',
-          {
-            dev: false,
-            peer: true,
-            optional: true,
-          },
-        ],
-      },
-    },
-  ],
-}

package/plugins/getEslintExtends.cjs

@@ -1 +0,0 @@
-module.exports = [() => [require.resolve('../eslint.extends.cjs')]]