@vzn/vx-migrate 0.0.554 → 0.0.556

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx-migrate",
-  "version": "0.0.554",
+  "version": "0.0.556",
   "license": "MIT",
   "description": "Adopt @vzn/vx from Turborepo or Nx: run the repo unchanged, migrate it to vx.config.ts, and keep your Turbo or Nx remote cache",
   "keywords": [
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@vzn/vx": "^0.0.554"
+    "@vzn/vx": "^0.0.556"
   },
   "repository": {
     "type": "git",

package/src/glob-grammar.ts

@@ -61,3 +61,25 @@ function classMembers(body: string): string[] | null {
   }
   return [...out]
 }
+
+/**
+ * `list` without a literal that one of its `!` entries takes back. Turbo,
+ * Nx and vx all subtract an exclusion wherever it sits, so such a file was
+ * never an input there either; vx refuses it at load, which would stop an
+ * unchanged repo's run, so the adapters drop it.
+ */
+export function withoutTakenBack<T>(list: readonly T[]): T[] {
+  const wild = /[*?{}]/
+  const negative = list.flatMap((e) =>
+    typeof e === 'string' && e.startsWith('!') ? [e.slice(1)] : [],
+  )
+  if (negative.length === 0) return [...list]
+  const globs = negative
+    .flatMap((n) => (wild.test(n) ? [n] : [n, `${n.replace(/\/+$/, '')}/**`]))
+    .map((g) => new Bun.Glob(g.replace(/^\.\//, '')))
+  return list.filter((e) => {
+    if (typeof e !== 'string' || e.startsWith('!') || wild.test(e)) return true
+    const lit = e.replace(/^\.\//, '').replace(/\/+$/, '')
+    return !globs.some((g) => g.match(lit))
+  })
+}

package/src/nx/nx-map.ts

@@ -23,6 +23,7 @@ import {
   type ProjectMeta,
   UserError,
 } from '@vzn/vx'
+import { withoutTakenBack } from '../glob-grammar.js'
 import { mapRunCommands, shellQuote } from '../nx-command.js'
 import { scriptCommand, yarnPnp } from '../script-command.js'
 import {
@@ -937,8 +938,8 @@ function buildTask(
   const task: Record<string, unknown> = { exec }
   if (deps.length > 0) task.dependsOn = deps
   if (cacheEnabled) {
-    const cacheInputs: Record<string, unknown> = { files: inputs.files }
-    if (inputs.wsFiles.length > 0) cacheInputs.workspaceFiles = inputs.wsFiles
+    const cacheInputs: Record<string, unknown> = { files: withoutTakenBack(inputs.files) }
+    if (inputs.wsFiles.length > 0) cacheInputs.workspaceFiles = withoutTakenBack(inputs.wsFiles)
     if (inputs.envNames.length > 0) cacheInputs.env = inputs.envNames
     // The `.env` files the task loads are inputs, and gitignored ones
     // (`.env.local`) are invisible to a glob: their bytes, read per run.

package/src/turbo/turbo-map.ts

@@ -13,7 +13,7 @@
 import { existsSync, readFileSync } from 'node:fs'
 import path from 'node:path'
 import { pruneOrphanPersistentNotes, type ProjectMeta, UserError } from '@vzn/vx'
-import { minimatchToVx } from '../glob-grammar.js'
+import { minimatchToVx, withoutTakenBack } from '../glob-grammar.js'
 import { shellQuote } from '../nx-command.js'
 import { scriptCommand, yarnPnp } from '../script-command.js'
 import {
@@ -1956,8 +1956,9 @@ function buildTask(
       wsFiles.unshift(...files.splice(0))
       wsOutFiles.unshift(...outFiles.splice(0))
     }
-    const inputs: Record<string, unknown> = { files }
-    if (wsFiles.length > 0) inputs.workspaceFiles = uniq(wsFiles, hidden('inputs'))
+    const inputs: Record<string, unknown> = { files: withoutTakenBack(files) }
+    if (wsFiles.length > 0)
+      inputs.workspaceFiles = withoutTakenBack(uniq(wsFiles, hidden('inputs')))
     if (cacheEnv.length > 0) inputs.env = cacheEnv
     if (pkgDotenv) inputs.runtime = [pkgDotenvDeep ? DOTENV_PROBE : DOTENV_PROBE_TOP]
     if (wsDotenv.length > 0) inputs.workspaceRuntime = [dotenvGlobsProbe(wsDotenv) ?? DOTENV_PROBE]