@vzn/vx-migrate 0.0.636 → 0.0.637

package/src/workspace-plugins.ts

@@ -4,17 +4,23 @@
 // and each is installed beside vx at vx-migrate's own version (plugins
 // pin their core peer to the release they shipped with).
 
-import { existsSync, readdirSync } from 'node:fs'
+import { existsSync } from 'node:fs'
 import path from 'node:path'
+import { REMOTE_CACHE, remoteCacheSignal } from './remote-cache.js'
 import { lockfilePlugin } from './workspace-notes.js'
 
+export { workspaceFileAt } from './workspace-notes.js'
+
 export interface WorkspacePlugin {
   readonly pkg: string
   readonly factory: string
 }
 
-export function workspacePlugins(root: string): WorkspacePlugin[] {
+/** `runner`: the Turbo or Nx repo's own remote cache, where the repo shows one. */
+export function workspacePlugins(root: string, runner?: 'turbo' | 'nx'): WorkspacePlugin[] {
   const out: WorkspacePlugin[] = []
+  if (runner !== undefined && remoteCacheSignal(root, runner) !== undefined)
+    out.push({ pkg: '@vzn/vx-migrate', factory: REMOTE_CACHE[runner] })
   const lock = lockfilePlugin(root)
   if (lock !== undefined) out.push({ pkg: '@vzn/vx-lockfile', factory: lock.factory })
   out.push({ pkg: '@vzn/vx-schedule-history', factory: 'scheduleHistoryPlugin' })
@@ -23,11 +29,6 @@ export function workspacePlugins(root: string): WorkspacePlugin[] {
   return out
 }
 
-/** The workspace file at `root`, in any extension the loader reads. */
-export function workspaceFileAt(root: string): string | undefined {
-  return readdirSync(root).find((n) => /^vx\.workspace\.(ts|mts|js|mjs|cts|cjs)$/.test(n))
-}
-
 /** `plugins` that `text` does not already call. */
 export function undeclared(text: string, plugins: readonly WorkspacePlugin[]): WorkspacePlugin[] {
   return plugins.filter((p) => !new RegExp(`\\b${p.factory}\\s*\\(`).test(text))
@@ -41,7 +42,19 @@ function entries(plugins: readonly WorkspacePlugin[], indent: string): string[]
   return plugins.map((p) => `${indent}${p.factory}(),`)
 }
 
-/** `vx.workspace.<format>` declaring `plugins`. */
+/** `run.concurrency` and `run.affectedBase` as one `run: { … }` line. */
+function groupLines(
+  fields: readonly { readonly field: string; readonly source: string }[],
+): string[] {
+  const groups = new Map<string, string[]>()
+  for (const f of fields) {
+    const [group, key] = f.field.split('.') as [string, string]
+    groups.set(group, [...(groups.get(group) ?? []), `${key}: ${f.source}`])
+  }
+  return [...groups].map(([group, entries]) => `  ${group}: { ${entries.join(', ')} },`)
+}
+
+/** `.vx/workspace.<format>` declaring `plugins`. */
 export function renderWorkspaceFile(
   plugins: readonly WorkspacePlugin[],
   format: 'ts' | 'mjs',
@@ -55,14 +68,14 @@ export function renderWorkspaceFile(
     '  plugins: [',
     ...entries(plugins, '    '),
     '  ],',
-    ...fields.map((f) => `  ${f.field}: ${f.source},`),
+    ...groupLines(fields),
     `}${format === 'ts' ? ' satisfies WorkspaceConfig' : ''}`,
     '',
   ].join('\n')
 }
 
 /**
- * Add `plugins` to the file `vx init` writes (`export default { plugins:
+ * Add `plugins` to a one-line workspace file (`export default { plugins:
  * [turbo()] }`); null for any other shape, which is left alone. A plugin
  * the file already calls is not added twice.
  */
@@ -83,13 +96,30 @@ export function extendWorkspaceFile(
     '',
     'export default {',
     '  plugins: [',
-    ...(kept === '' ? [] : [`    ${kept},`]),
+    ...topLevel(kept).map((k) => `    ${k},`),
     ...entries(added, '    '),
     '  ],',
     `}${tail}`,
   ].join('\n')
 }
 
+/** `a(), b({ x, y })` → `['a()', 'b({ x, y })']`: the commas outside any bracket. */
+function topLevel(list: string): string[] {
+  const out: string[] = []
+  let depth = 0
+  let from = 0
+  for (let i = 0; i < list.length; i++) {
+    const c = list[i]!
+    if ('([{'.includes(c)) depth++
+    else if (')]}'.includes(c)) depth--
+    else if (c === ',' && depth === 0) {
+      out.push(list.slice(from, i))
+      from = i + 1
+    }
+  }
+  return [...out, list.slice(from)].map((e) => e.trim()).filter((e) => e !== '')
+}
+
 /**
  * The plugins of a workspace file vx wrote (`vx init`, `--keep`, a native
  * migration): `@vzn` imports and argument-less calls, nothing else. Null