@vzn/vx 0.0.591 → 0.0.594

package/src/workspace/project-loader.ts

@@ -269,6 +269,9 @@ interface BuildPosition {
   column?: number
 }
 
+/** A stack frame naming a file path, as a config's own throw has. */
+const NAMED_FRAME = /\n\s+at .*[\\/]/
+
 /**
  * Turn the two errors Bun's own loader throws into user errors naming the
  * file the user wrote; every other throw is the config's own and already
@@ -301,6 +304,13 @@ export function configLoadError(err: unknown, configPath: string, kind: string):
     return configLoadError(errors[0], configPath, kind)
   }
   if (typeof message !== 'string') return null
+  // Bun's JSON loader throws a `SyntaxError` whose stack, when it has one,
+  // holds no file frame: a malformed `import data from './data.json'`
+  // printed `vx: JSON Parse error: Expected '}'` and named nothing. A
+  // config's own `JSON.parse` has its line in the stack and passes through.
+  if (name === 'SyntaxError' && !NAMED_FRAME.test(String((err as { stack?: unknown }).stack))) {
+    return new UserError(`${kind} config ${configPath}: an import does not parse: ${message}`)
+  }
   if (name === 'ResolveMessage') {
     const spec = /Cannot find (?:package|module) ['"]([^'"]+)['"]/.exec(message)?.[1]
     const what = spec === undefined ? message.replace(BUST_QUERY, '') : `cannot find '${spec}'`
@@ -665,14 +675,19 @@ export async function loadProjectConfigs(
  */
 // `Bun` and `Bun.hash` are what vx itself runs on: `Bun.hash.xxHash3 = ()
 // => 7n` gave every task the key 00000000, and a changed command replayed
-// the old output (D-75).
+// the old output (D-75). `Bun` is read by its identifier, not through
+// globalThis: the docs playground bundles this file with the identifier
+// rewritten to its shim, and a browser has no global `Bun`.
 const WATCHED_BUILTINS: ReadonlyArray<readonly [string, object]> = WATCHED_BUILTIN_NAMES.map(
   (name) =>
     [
       name,
       name
         .split('.')
-        .reduce<unknown>((o, k) => (o as Record<string, unknown>)[k], globalThis) as object,
+        .reduce<unknown>(
+          (o, k) => (o === globalThis && k === 'Bun' ? Bun : (o as Record<string, unknown>)[k]),
+          globalThis,
+        ) as object,
     ] as const,
 )
 

package/src/workspace/workspace.ts

@@ -115,8 +115,12 @@ export async function findWorkspaceRoot(
         // them: `packages/**` holding `packages/inner` (with `workspaces:
         // ['sub']`) and `packages/inner/sub` resolved `sub` to `inner` and
         // `inner` to the outer root, two roots and two keys for one tree.
-        if (claimsMember(dir, [claimed], globs) && claimsMember(dir, members, globs)) claimed = dir
-      } else if (claimsMember(dir, inner === null ? below : [inner], globs)) {
+        if (
+          (await claimsMember(dir, [claimed], globs)) &&
+          (await claimsMember(dir, members, globs))
+        )
+          claimed = dir
+      } else if (await claimsMember(dir, inner === null ? below : [inner], globs)) {
         claimed = dir
         members = inner === null ? [...below] : [inner]
       }
@@ -152,7 +156,11 @@ export async function findWorkspaceRoot(
 }
 
 /** True when one of `below` (dirs under `root`, toward `start`) is a member. */
-function claimsMember(root: string, below: readonly string[], globs: readonly string[]): boolean {
+async function claimsMember(
+  root: string,
+  below: readonly string[],
+  globs: readonly string[],
+): Promise<boolean> {
   if (below.length === 0 || globs.length === 0) return false
   const { positive, negative } = splitPackageGlobs(globs)
   const rels = below.map((d) => relPosix(root, d)).filter((rel) => !excludedBy(rel, negative))
@@ -161,11 +169,21 @@ function claimsMember(root: string, below: readonly string[], globs: readonly st
     // `.` means the root itself is the project — never a directory below it.
     if (normalized === '' || normalized === '.') continue
     const glob = new Bun.Glob(normalized)
-    if (rels.some((rel) => glob.match(rel))) return true
+    for (const rel of rels) {
+      if (!glob.match(rel)) continue
+      // `match` has no `dot: false`: `packages/*` matched `packages/.tpl`,
+      // which discovery skips, and a run from inside it found a workspace
+      // that does not list it. Such a path asks discovery's own walk.
+      if (!SKIPPED_SEGMENT.test(rel)) return true
+      const dirs = await memberDirs(root, pattern)
+      if (dirs.includes(path.join(root, rel))) return true
+    }
   }
   return false
 }
 
+const SKIPPED_SEGMENT = /(^|\/)(\.|node_modules(\/|$))/
+
 /**
  * pnpm, npm, yarn and Bun all take `!packages/fixtures` in the package
  * list. Handed to `Bun.Glob` raw, a leading `!` negates the WHOLE pattern,
@@ -374,6 +392,11 @@ function extglobRefusal(pattern: string, file: string, field: string): UserError
  */
 export function resolveCacheDir(root: string, config: WorkspaceConfig | null): string {
   const rel = config?.cacheDir ?? (process.env['VX_CACHE_DIR'] || path.join('.vx', 'cache'))
+  // No shell expands `~` in a config string or a quoted variable, and
+  // `'~/.cache/vx'` made a directory named `~` in the workspace.
+  if (rel.startsWith('~/')) {
+    return path.join(process.env['HOME'] || homedir(), rel.slice(1))
+  }
   return path.resolve(root, rel)
 }
 
@@ -809,6 +832,19 @@ export async function namedProject(
   if (typeof named?.name !== 'string' || named.name === '' || typeof named.dir !== 'string') {
     throw new UserError(`${where} ${JSON.stringify(named)}: expected { dir: string, name: string }`)
   }
+  // The rules `parsePackageJson` holds a manifest's name to: a plugin's name
+  // for a directory with no `name` of its own skipped them, and `a#b` planned
+  // under `--all` while no run spec or dependsOn could reach it.
+  if (named.name.trim() !== named.name) {
+    throw new UserError(
+      `${where} ${JSON.stringify(named.name)}: the name has surrounding whitespace`,
+    )
+  }
+  if (named.name.includes('#')) {
+    throw new UserError(
+      `${where} "${named.name}": the name holds "#" — vx addresses a task as <name>#<task>`,
+    )
+  }
   const dir = path.resolve(workspace.root, named.dir)
   const rel = relPosix(workspace.root, dir)
   if (rel === '..' || rel.startsWith('../') || path.isAbsolute(rel)) {