fg-devkit 1.7.4 → 1.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",

package/scaffold/vue/package.json

@@ -34,7 +34,7 @@
     "@tanstack/vue-query-devtools": "6.1.24",
     "@types/node": "22.16.5",
     "@vitejs/plugin-vue": "6.0.6",
-    "fg-devkit": "1.7.4",
+    "fg-devkit": "1.7.5",
     "start-server-and-test": "2.1.3",
     "tailwindcss": "4.2.4",
     "tsx": "4.21.0",

package/scripts/fg-devkit.mjs

@@ -42,10 +42,8 @@
 
 import { spawnSync } from 'node:child_process'
 import fs from 'node:fs'
-import readline from 'node:readline/promises'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { stdin as input, stdout as output } from 'node:process'
 import { createRequire } from 'node:module'
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url))
@@ -271,30 +269,6 @@ function runMaintainerAuditAll() {
   return runNode('repo-vulns.mjs')
 }
 
-/** Prompt release type in CLI before invoking release.sh to avoid a "stuck" terminal feeling. */
-async function promptReleaseType(rl) {
-  console.log('\nSelect release type:')
-  console.log('  1) patch')
-  console.log('  2) minor')
-  console.log('  3) major')
-  console.log('  0) Cancel\n')
-  const choice = (await rl.question('Release type [1-3] (default: 1): ')).trim() || '1'
-  if (choice === '0') {
-    return null
-  }
-  if (choice === '1') {
-    return 'patch'
-  }
-  if (choice === '2') {
-    return 'minor'
-  }
-  if (choice === '3') {
-    return 'major'
-  }
-  console.error('[fg-devkit] Invalid release type selection.')
-  return null
-}
-
 /**
  * Run Commitizen from fg-devkit's bundled dependency set.
  * Always forces fg-devkit's bundled cz adapter so it stays interactive.
@@ -342,6 +316,18 @@ bootstrap(
 
 /** Run ESLint from fg-devkit's bundled dependency set. */
 function runBundledEslint(args = []) {
+  const hasExplicitConfig = args.some((arg) => arg === '--config' || arg === '-c' || arg.startsWith('--config='))
+  const hasLocalFlatConfig =
+    fs.existsSync(path.join(process.cwd(), 'eslint.config.js')) ||
+    fs.existsSync(path.join(process.cwd(), 'eslint.config.mjs')) ||
+    fs.existsSync(path.join(process.cwd(), 'eslint.config.cjs'))
+
+  if (!hasExplicitConfig && !hasLocalFlatConfig) {
+    console.error('[fg-devkit] Missing eslint.config.js|mjs|cjs in current directory.')
+    console.error('[fg-devkit] Run "fgd sync-project-configs" or "fgd sync-tooling-configs" and retry.')
+    return 1
+  }
+
   let eslintBin
   try {
     const eslintPkgPath = require.resolve('eslint/package.json')
@@ -438,6 +424,34 @@ function runBundledFallow(args = []) {
   return r.status ?? 1
 }
 
+function syncFileFromTemplate(relativeSourcePath, targetPath) {
+  const sourcePath = path.join(fgRoot, relativeSourcePath)
+  if (!fs.existsSync(sourcePath)) {
+    console.error(`[fg-devkit] Missing template: ${sourcePath}`)
+    return 1
+  }
+  try {
+    fs.copyFileSync(sourcePath, path.join(process.cwd(), targetPath))
+    console.log(`[fg-devkit] Synced ${targetPath}`)
+    return 0
+  } catch (err) {
+    console.error(`[fg-devkit] Failed to sync ${targetPath}: ${err.message}`)
+    return 1
+  }
+}
+
+function runSyncConfigTarget(target) {
+  if (target === 'vscode') return runNode('sync-vscode-settings.mjs')
+  if (target === 'eslint') return syncFileFromTemplate('configs/eslint.sync-stub.js', 'eslint.config.js')
+  if (target === 'prettier') return syncFileFromTemplate('configs/prettier.sync-stub.js', 'prettier.config.js')
+  if (target === 'tsconfig') return syncFileFromTemplate('configs/tsconfig.app.sync.json', 'tsconfig.json')
+  if (target === 'fallow') return syncFileFromTemplate('configs/fallowrc.sync-stub.json', '.fallowrc.json')
+  if (target === 'cursor') return runNode('sync-core-coding-standards.mjs')
+  if (target === 'all') return runNode('sync-project-configs.mjs')
+  console.error(`[fg-devkit] Unknown config sync target: ${target}`)
+  return 1
+}
+
 /** Map subcommand name → script file (extra argv after subcommand is forwarded). */
 const DIRECT_COMMANDS = {
   'check-deps': 'check-dependency-policy.mjs',
@@ -503,124 +517,12 @@ Commands:
   sync-scaffold-vue-deps [policy-file]
                                  Align scaffold/vue/package.json versions to the dependency policy
 
-With no command, opens an interactive menu.
+With no command, opens an interactive Inquirer menu.
 
 Options:
   -h, --help                     Show this help`)
 }
 
-/** Numbered actions shown in the interactive menu (keys must match user input). */
-const MENU = [
-  {
-    key: '1',
-    label: 'Check dependency policy',
-    run: () => runNode('check-dependency-policy.mjs'),
-  },
-  {
-    key: '2',
-    label: 'Sync dependency policy',
-    run: () => runNode('sync-dependency-policy.mjs'),
-  },
-  {
-    key: '3',
-    label: 'Sync configs (vscode, eslint, prettier, tsconfig, fallow)',
-    run: () => runNode('sync-project-configs.mjs'),
-  },
-  {
-    key: '4',
-    label: 'Create release',
-    run: () => runReleaseScript(),
-  },
-  {
-    key: '5',
-    label: 'Commit (Commitizen)',
-    run: () => runCommitizen(),
-  },
-  {
-    key: '6',
-    label: 'Commit vulnerability (Commitizen)',
-    run: () => runCommitizen([], { FG_DEVKIT_CZ_DEFAULT_TYPE: 'vuln' }),
-  },
-  {
-    key: '7',
-    label: 'Remove unnecessary deps in package.json',
-    run: () => runNode('prune-consumer-deps.mjs'),
-  },
-  {
-    key: '8',
-    label: 'Full consumer setup (7 -> scripts -> lefthook -> 3 -> 2 -> pnpm install)',
-    run: () => runFullConsumerSetup(),
-  },
-  {
-    key: '9',
-    label: 'Setup lefthook (migrate from husky/lint-staged)',
-    run: () => runSetupLefthook(),
-  },
-  {
-    key: '10',
-    label: 'PoEditor: Download translations',
-    run: () => runNode('poeditor-download.mjs'),
-  },
-  {
-    key: '11',
-    label: 'PoEditor: Upload translations',
-    run: () => runNode('poeditor-upload.mjs'),
-  },
-  {
-    key: '12',
-    label: 'Sync .cursor core coding standards',
-    run: () => runNode('sync-core-coding-standards.mjs'),
-  },
-  {
-    key: '13',
-    label: 'Fallow analysis',
-    run: () => 0,
-  },
-]
-
-const MAINTAINER_MENU = [
-  {
-    key: 'm1',
-    label: 'Maintainer: Show outdated dependency policy packages',
-    run: () => runNode('policy-outdated.mjs'),
-  },
-  {
-    key: 'm2',
-    label: 'Maintainer: Upgrade dependency policy (interactive)',
-    run: () => runNode('policy-upgrade.mjs'),
-  },
-  {
-    key: 'm3',
-    label: 'Maintainer: Refresh dependency policy from repos (and scaffold/vue package.json)',
-    run: () => runNode('refresh-dependency-policy-from-repos.mjs'),
-  },
-  {
-    key: 'm4',
-    label: 'Maintainer: Upgrade one policy package, stage, and auto-commit',
-    run: () => runMaintainerPolicyUpgradeAndCommit(),
-  },
-  {
-    key: 'm5',
-    label: 'Maintainer: Check policy vulnerabilities (audit)',
-    run: () => runNode('policy-vulns.mjs'),
-  },
-  {
-    key: 'm6',
-    label: 'Maintainer: Check fg-devkit repo vulnerabilities',
-    run: () => runMaintainerAuditAll(),
-  },
-  {
-    key: 'm7',
-    label: 'Maintainer: Check vulnerabilities across all Vue repos',
-    run: () => runNode('fleet-vulns.mjs'),
-  },
-  {
-    key: 'm8',
-    label: 'Maintainer: Bump fg-devkit in all Vue repos, run sync-deps, and pnpm install',
-    run: () => runNode('fleet-bump-fg-devkit.mjs'),
-  },
-]
-
 function isFgDevkitMaintainerContext() {
   if (path.resolve(process.cwd()) !== fgRoot) {
     return false
@@ -638,85 +540,252 @@ function isFgDevkitMaintainerContext() {
 }
 
 async function runInteractiveMenu() {
-  const rl = readline.createInterface({ input, output })
-  const isMaintainer = isFgDevkitMaintainerContext()
-  const menu = isMaintainer ? [...MENU, ...MAINTAINER_MENU] : MENU
-
-  console.log(`\nfg-devkit — choose a task (cwd: ${process.cwd()})\n`)
-
-  for (const item of menu) {
-    console.log(`  ${item.key}) ${item.label}`)
+  let selectPrompt
+  try {
+    const inquirerSelect = await import('@inquirer/select')
+    selectPrompt = inquirerSelect.default
+  } catch {
+    console.error('[fg-devkit] Interactive menu requires @inquirer/select but it is not available.')
+    console.error('[fg-devkit] Run pnpm install in your project and try again.')
+    return 1
   }
-  console.log('  0) Exit\n')
-
-  const choice = (await rl.question('Number: ')).trim()
 
-  if (choice === '0' || choice === '') {
-    rl.close()
+  const runSelectedAction = async (action) => {
+    const out = action()
+    if (typeof out === 'object' && out !== null && typeof out.then === 'function') {
+      return await out
+    }
+    if (typeof out === 'number') {
+      return out
+    }
     return 0
   }
 
-  const item = menu.find((m) => m.key === choice)
-  if (!item) {
-    console.error('[fg-devkit] Unknown option. Run again and choose a number from the list.')
-    rl.close()
-    return 1
+  const maintainerOnly = () => {
+    if (!isFgDevkitMaintainerContext()) {
+      console.error('[fg-devkit] Maintainer actions are only available in the fg-devkit repository root.')
+      return 1
+    }
+    return 0
   }
 
-  let out
-  if (item.key === '4') {
-    const bumpType = await promptReleaseType(rl)
-    if (!bumpType) {
-      rl.close()
-      return 0
+  const groups = [
+    {
+      name: '1) Create commit',
+      value: 'commit',
+    },
+    {
+      name: '2) Create release',
+      value: 'release',
+    },
+    {
+      name: '3) Lint and typecheck',
+      value: 'lint-typecheck',
+    },
+    {
+      name: '4) Poeditor',
+      value: 'poeditor',
+    },
+    {
+      name: '5) Dependecy policy',
+      value: 'dependency-policy',
+    },
+    {
+      name: '6) Sync configs',
+      value: 'sync-configs',
+    },
+    {
+      name: '7) Setup',
+      value: 'setup',
+    },
+    {
+      name: '8) Fallow analysis',
+      value: 'fallow-analysis',
+    },
+    {
+      name: '9) Maintainer',
+      value: 'maintainer',
+    },
+    {
+      name: '10) Exit',
+      value: 'exit',
+    },
+  ]
+
+  while (true) {
+    const group = await selectPrompt({
+      message: `fg-devkit — choose a task (cwd: ${process.cwd()})`,
+      choices: groups,
+      loop: false,
+    })
+    if (group === 'exit') return 0
+
+    if (group === 'commit') {
+      const choice = await selectPrompt({
+        message: 'Create commit',
+        choices: [
+          { name: 'Commit', value: 'commit' },
+          { name: 'Commit vulnerability', value: 'commit-vuln' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'commit',
+        loop: false,
+      })
+      if (choice === 'cancel') continue
+      return runSelectedAction(() => (choice === 'commit' ? runCommitizen() : runNode('vuln-commit.mjs')))
+    }
+
+    if (group === 'release') {
+      const releaseChoice = await selectPrompt({
+        message: 'Create release',
+        choices: [
+          { name: 'Patch', value: 'patch' },
+          { name: 'Minor', value: 'minor' },
+          { name: 'Major', value: 'major' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'patch',
+        loop: false,
+      })
+      if (releaseChoice === 'cancel') continue
+      return runSelectedAction(() => runReleaseScript([releaseChoice]))
+    }
+
+    if (group === 'lint-typecheck') {
+      const choice = await selectPrompt({
+        message: 'Lint and typecheck',
+        choices: [
+          { name: 'Lint and typecheck', value: 'both' },
+          { name: 'Lint', value: 'lint' },
+          { name: 'Typecheck', value: 'typecheck' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'both',
+        loop: false,
+      })
+      if (choice === 'cancel') continue
+      if (choice === 'lint') return runSelectedAction(() => runBundledEslint(['.']))
+      if (choice === 'typecheck') {
+        return runSelectedAction(() => runBundledTypeScript(['--noEmit', '-p', 'tsconfig.json']))
+      }
+      const lintCode = runBundledEslint(['.'])
+      if (lintCode !== 0) return lintCode
+      return runSelectedAction(() => runBundledTypeScript(['--noEmit', '-p', 'tsconfig.json']))
+    }
+
+    if (group === 'poeditor') {
+      const choice = await selectPrompt({
+        message: 'Poeditor',
+        choices: [
+          { name: 'Download', value: 'download' },
+          { name: 'Upload', value: 'upload' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'download',
+        loop: false,
+      })
+      if (choice === 'cancel') continue
+      return runSelectedAction(() => runNode(choice === 'download' ? 'poeditor-download.mjs' : 'poeditor-upload.mjs'))
+    }
+
+    if (group === 'dependency-policy') {
+      const choice = await selectPrompt({
+        message: 'Dependecy policy',
+        choices: [
+          { name: 'Check', value: 'check' },
+          { name: 'Sync', value: 'sync' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'check',
+        loop: false,
+      })
+      if (choice === 'cancel') continue
+      return runSelectedAction(() =>
+        runNode(choice === 'check' ? 'check-dependency-policy.mjs' : 'sync-dependency-policy.mjs'),
+      )
+    }
+
+    if (group === 'sync-configs') {
+      const choice = await selectPrompt({
+        message: 'Sync configs',
+        choices: [
+          { name: 'vscode', value: 'vscode' },
+          { name: 'eslint', value: 'eslint' },
+          { name: 'prettier', value: 'prettier' },
+          { name: 'tsconfig', value: 'tsconfig' },
+          { name: 'Fallow', value: 'fallow' },
+          { name: 'Cursor', value: 'cursor' },
+          { name: 'All', value: 'all' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'all',
+        loop: false,
+      })
+      if (choice === 'cancel') continue
+      return runSelectedAction(() => runSyncConfigTarget(choice))
     }
-    // Close menu readline before spawning interactive child processes.
-    rl.close()
-    out = runReleaseScript([bumpType])
-  } else if (item.key === '13') {
-    let subChoice = 'cancel'
-    let selectPrompt = null
-    try {
-      const inquirerSelect = await import('@inquirer/select')
-      selectPrompt = inquirerSelect.default
-    } catch {
-      // Optional dependency; fail with a clear message if not available.
+
+    if (group === 'setup') {
+      const choice = await selectPrompt({
+        message: 'Setup',
+        choices: [
+          { name: 'Lefthook', value: 'lefthook' },
+          { name: 'Full consumer setup', value: 'full-consumer-setup' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'lefthook',
+        loop: false,
+      })
+      if (choice === 'cancel') continue
+      return runSelectedAction(() => (choice === 'lefthook' ? runSetupLefthook() : runFullConsumerSetup()))
     }
 
-    if (selectPrompt) {
-      // Close menu readline before running interactive child prompt.
-      rl.close()
-      subChoice = await selectPrompt({
-        message: 'Fallow — choose analysis',
+    if (group === 'fallow-analysis') {
+      const choice = await selectPrompt({
+        message: 'Fallow analysis',
         choices: [
           { name: 'dead code', value: 'dead-code' },
           { name: 'Cancel', value: 'cancel' },
         ],
         default: 'dead-code',
+        loop: false,
       })
-    } else {
-      rl.close()
-      console.error('[fg-devkit] Option 13 requires @inquirer/select but it is not available.')
-      console.error('[fg-devkit] Run pnpm install in your project and try again.')
-      return 1
+      if (choice === 'cancel') continue
+      return runSelectedAction(() => runBundledFallow([choice]))
     }
 
-    if (subChoice === 'cancel') {
-      return 0
+    if (group === 'maintainer') {
+      const choice = await selectPrompt({
+        message: 'Maintainer',
+        choices: [
+          { name: 'Show outdated dependency policy packages', value: 'm1' },
+          { name: 'Upgrade dependency policy (interactive)', value: 'm2' },
+          { name: 'Refresh dependency policy from repos (and scaffold/vue package.json)', value: 'm3' },
+          { name: 'Upgrade one policy package, stage, and auto-commit', value: 'm4' },
+          { name: 'Check policy vulnerabilities (audit)', value: 'm5' },
+          { name: 'Check fg-devkit repo vulnerabilities', value: 'm6' },
+          { name: 'Check vulnerabilities across all Vue repos', value: 'm7' },
+          { name: 'Bump fg-devkit in all Vue repos, run sync-deps, and pnpm install', value: 'm8' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'm1',
+        loop: false,
+      })
+      if (choice === 'cancel') continue
+      const maintainerCode = maintainerOnly()
+      if (maintainerCode !== 0) return maintainerCode
+      if (choice === 'm1') return runSelectedAction(() => runNode('policy-outdated.mjs'))
+      if (choice === 'm2') return runSelectedAction(() => runNode('policy-upgrade.mjs'))
+      if (choice === 'm3') return runSelectedAction(() => runNode('refresh-dependency-policy-from-repos.mjs'))
+      if (choice === 'm4') return runSelectedAction(() => runMaintainerPolicyUpgradeAndCommit())
+      if (choice === 'm5') return runSelectedAction(() => runNode('policy-vulns.mjs'))
+      if (choice === 'm6') return runSelectedAction(() => runMaintainerAuditAll())
+      if (choice === 'm7') return runSelectedAction(() => runNode('fleet-vulns.mjs'))
+      if (choice === 'm8') return runSelectedAction(() => runNode('fleet-bump-fg-devkit.mjs'))
+      return 1
     }
-    out = runBundledFallow([subChoice])
-  } else {
-    // Close menu readline before spawning interactive child processes.
-    rl.close()
-    out = item.run()
   }
 
-  if (typeof out === 'object' && out !== null && typeof out.then === 'function') {
-    return await out
-  }
-  if (typeof out === 'number') {
-    return out
-  }
   return 0
 }