@vzn/vx 0.0.531 → 0.0.533

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx",
-  "version": "0.0.531",
+  "version": "0.0.533",
   "description": "The fastest task runner and build cache for JavaScript monorepos.",
   "type": "module",
   "exports": {
@@ -21,10 +21,10 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@vzn/vx-linux-x64": "0.0.531",
-    "@vzn/vx-linux-arm64": "0.0.531",
-    "@vzn/vx-darwin-x64": "0.0.531",
-    "@vzn/vx-darwin-arm64": "0.0.531"
+    "@vzn/vx-linux-x64": "0.0.533",
+    "@vzn/vx-linux-arm64": "0.0.533",
+    "@vzn/vx-darwin-x64": "0.0.533",
+    "@vzn/vx-darwin-arm64": "0.0.533"
   },
   "dependencies": {
     "@anthropic-ai/sandbox-runtime": "^0.0.76"

package/src/cache/cache.ts

@@ -1473,9 +1473,17 @@ export class Cache implements CacheLayer {
       // leaves it or loops (item 748).
       const code = (err as NodeJS.ErrnoException).code
       if (code === 'EISDIR' || code === 'ENOTDIR' || code === 'EEXIST' || code === 'ENOTEMPTY') {
+        // Bun's message already opens with the code: `EEXIST: EEXIST: …` read
+        // as a stutter. EEXIST and ENOTDIR are a FILE in a directory's
+        // place; the told-backwards sentence named only the reverse (X-7).
+        const msg = (err as Error).message
+        const what =
+          code === 'EISDIR' || code === 'ENOTEMPTY'
+            ? 'a directory stands where the entry holds a file'
+            : 'a file stands where the entry needs a directory'
         throw new UserError(
-          `restore of ${hash} into ${projectDir} was blocked by what is on disk (${code}: ${(err as Error).message}). ` +
-            `The clean before a restore removes the files the output globs select, not a directory standing where the entry holds a file, nor a path the globs do not cover — remove it and re-run.`,
+          `restore of ${hash} into ${projectDir} was blocked by what is on disk (${msg.startsWith(code) ? msg : `${code}: ${msg}`}): ${what}. ` +
+            `The clean before a restore removes the files the output globs select and the directories that empties, not this — remove it and re-run.`,
         )
       }
       // A legal name under a destination deep enough that the two together

package/src/cli/select.ts

@@ -21,11 +21,11 @@ import {
   parseFilter,
   type ProjectMeta,
   readLockfile,
-  workspaceGlobsMatch,
 } from '../workspace/index.js'
 import type { ProjectConfig } from '../config.js'
 import type { ProjectEntry } from '../workspace/index.js'
 import { parseDependencySpec } from '../graph/index.js'
+import { declaresInput } from '../cache/index.js'
 import { listed, maskedLine, nearest, UserError } from '../util/index.js'
 import {
   claimedAffected,
@@ -61,9 +61,9 @@ export async function workspaceGlobOwners(
 ): Promise<string[]> {
   const declaresMatch = (config: ProjectConfig): boolean => {
     for (const task of Object.values(config.tasks ?? {})) {
-      const globs = task.cache?.inputs?.workspaceFiles
-      if (globs === undefined) continue
-      if (changed.some((rel) => workspaceGlobsMatch(globs, rel))) return true
+      const cache = task.cache
+      if (cache === undefined) continue
+      if (changed.some((rel) => declaresInput(cache, null, rel))) return true
     }
     return false
   }

package/src/workspace/affected.ts

@@ -10,14 +10,12 @@ import { realpathSync, statSync } from 'node:fs'
 import { realpath } from 'node:fs/promises'
 import path from 'node:path'
 import {
-  asTrees,
   executablePath,
   UserError,
   gitSpawnRefusal,
   isExecutableMissing,
   isInstalledPath,
   relPosix,
-  taskGlob,
 } from '../util/index.js'
 import { LOCKFILE_NAME } from './lockfile.js'
 import { configImportOwners } from './config-imports.js'
@@ -576,36 +574,6 @@ async function workspaceConfigChanged(
   return false
 }
 
-/**
- * Does any `cache.inputs.workspaceFiles` entry in `globs` match `rel`?
- *
- * Mirrors `resolveWorkspaceFiles`' partition: a leading `!` is an EXCLUDE, and
- * with no positive glob nothing matches. Paths are workspace-root-relative and
- * POSIX-separated, which is the form both git enumeration and the glob
- * resolver already speak.
- *
- * `asTrees` on BOTH sides, because the resolver runs it on both and this
- * has to answer the same question the KEY answers. It did not, and the
- * gap decided whether a changed file rebuilt anything: with
- * `workspaceFiles: ['./generated/**']` or the literal `['generated']` —
- * five spellings in all — the resolver folds `generated/x.txt` into the
- * project's key while a raw `Bun.Glob` matched none of them, so
- * `--affected` left the project out of a run its own key says is stale
- * (item 445). A mirror that normalizes differently from what it mirrors
- * is not a mirror.
- */
-export function workspaceGlobsMatch(globs: readonly string[], rel: string): boolean {
-  const positive: string[] = []
-  const negative: string[] = []
-  for (const entry of globs) {
-    if (entry.startsWith('!')) negative.push(entry.slice(1))
-    else positive.push(entry)
-  }
-  if (positive.length === 0) return false
-  if (!asTrees(positive).some((g) => taskGlob(g).match(rel))) return false
-  return !asTrees(negative).some((g) => taskGlob(g).match(rel))
-}
-
 /**
  * The fingerprint files as workspace-root-relative paths. Read from the same
  * constant the fingerprint itself walks, so a new lockfile format cannot be

package/src/workspace/index.ts

@@ -8,7 +8,6 @@ export {
   defaultAffectedBase,
   type FingerprintClaims,
   refIsHead,
-  workspaceGlobsMatch,
 } from './affected.js'
 export { applyFilters, parseFilter } from './filter.js'
 export {