@vzn/vx 0.0.636 → 0.0.637

package/src/cli/select.ts

@@ -14,11 +14,9 @@ import {
   buildPackageGraph,
   defaultAffectedBase,
   findWorkspaceRoot,
-  type LoadReads,
   type FingerprintClaims,
-  FROZEN_WITHOUT_LOCK,
-  loadProjectConfig,
-  loadWorkspace,
+  lockKey,
+  NO_LOCK,
   parseFilter,
   type ProjectMeta,
   readLockfile,
@@ -49,15 +47,15 @@ import {
   loadCliProjects,
   loadCliWorkspace,
 } from './workspace-config.js'
+import { resolveSetting } from '../settings.js'
 
 /**
  * The projects whose tasks declare a `cache.inputs.workspaceFiles` glob
  * matching a changed path, one inside another project included (item
  * 954): `--affected` selects them, since the glob is that task's input. Through the run
  * path's staged load, so a glob a `project` plugin gave a config-less
- * package counts; evaluated live as a default run does, or read from the
- * lock as a `--frozen` run does. A load that fails drops to the config files that
- * do load, one by one — a broken out-of-scope config does not fail a
+ * package counts; read from the lock as a run does. A load that fails drops to the lock's
+ * entries, one by one — a project the lock does not hold does not fail a
  * scoped run, and must not fail its selection either.
  */
 export async function workspaceGlobOwners(
@@ -85,26 +83,23 @@ export async function workspaceGlobOwners(
   } catch {
     // Fall through to the per-file sweep.
   }
-  // A frozen run with no lock is refused here, before the tolerant sweep
-  // below could answer "nothing affected" and exit 0 without ever reaching
-  // the run's own refusal. Asked only once the staged load failed: a
-  // frozen load that succeeded read the lock, and a second read parsed it
-  // again (1,000 projects: a 1.1 MB lock, ~10 ms).
-  if (load.frozen === true && (await readLockfile(root)) === null) {
-    throw new UserError(FROZEN_WITHOUT_LOCK)
-  }
+  // No lock is refused here, before the tolerant sweep below could answer
+  // "nothing affected" and exit 0 without ever reaching the run's own
+  // refusal. The sweep reads each entry from the lock: it never evaluates.
+  const lock = await readLockfile(root)
+  if (lock === null) throw new UserError(NO_LOCK)
   const owners: string[] = []
-  await Promise.all(
-    projects.map(async (meta) => {
-      if (meta.configPath === null || meta.configPath === '') return
-      try {
-        if (declaresMatch(await loadProjectConfig(meta.configPath))) owners.push(meta.name)
-      } catch {
-        // A config that will not load cannot be shown to declare a matching
-        // glob; surfacing it here would fail a run the loader itself tolerates.
-      }
-    }),
-  )
+  for (const meta of projects) {
+    if (meta.configPath === null || meta.configPath === '') continue
+    const dir = lockKey(root, meta.dir)
+    if (!Object.hasOwn(lock.projects, dir)) continue
+    try {
+      if (declaresMatch(lock.projects[dir]!.config)) owners.push(meta.name)
+    } catch {
+      // A hand-edited entry that will not read cannot be shown to declare a
+      // matching glob; surfacing it here would fail a run the load tolerates.
+    }
+  }
   return owners
 }
 
@@ -133,9 +128,7 @@ async function workspaceFingerprintClaims(
 }
 
 async function loadWorkspaceProjects(cwd: string): Promise<ProjectMeta[]> {
-  const reads: LoadReads = new Map()
-  const root = await findWorkspaceRoot(cwd, reads)
-  return await discoverCliProjects(await loadWorkspace(root, reads))
+  return await discoverCliProjects(await findWorkspaceRoot(cwd))
 }
 
 export async function findCwdProject(cwd: string): Promise<string | null> {
@@ -150,9 +143,8 @@ export async function findCwdProject(cwd: string): Promise<string | null> {
 export async function findCwdSelection(
   cwd: string,
 ): Promise<{ name: string; discovered: { root: string; projects: ProjectMeta[] } } | null> {
-  const reads: LoadReads = new Map()
-  const root = await findWorkspaceRoot(cwd, reads)
-  const projects = await discoverCliProjects(await loadWorkspace(root, reads))
+  const root = await findWorkspaceRoot(cwd)
+  const projects = await discoverCliProjects(root)
   const abs = path.resolve(cwd)
   const within = (dirOf: (p: ProjectMeta) => string): string | null => {
     let best: string | null = null
@@ -251,14 +243,17 @@ function refusalOf(err: unknown): Refusal {
 
 /**
  * The filter `--affected[=<base>]` stands for: `...[<base>]`, the changed
- * projects and their dependents. An empty base is the workspace's
- * `affectedBase` (or a plugin's `config` stage, from nx.json's
+ * projects and their dependents. An empty base is `run.affectedBase`
+ * (its variable, then the workspace's, which a plugin's `config` stage may set from nx.json's
  * `defaultBase` or `TURBO_SCM_BASE`), then the guess.
  */
 export async function affectedFilterFor(cwd: string, affected: string): Promise<string | Refusal> {
   const root = await findWorkspaceRoot(cwd)
   let base = affected
-  if (base === '') base = (await loadCliWorkspace(root)).workspaceConfig?.affectedBase ?? ''
+  if (base === '') {
+    const ws = (await loadCliWorkspace(root)).workspaceConfig
+    base = (resolveSetting('run.affectedBase', ws).value as string | undefined) ?? ''
+  }
   if (base === '') {
     try {
       base = await defaultAffectedBase(root)
@@ -339,7 +334,6 @@ export async function resolveFilters(
         workspaceGlobOwners: (changed: readonly string[], nested: readonly string[]) =>
           workspaceGlobOwners(root, projects, changed, load, stagedOnce, nested),
         fingerprintClaims: () => workspaceFingerprintClaims(root, projects, load),
-        taskEdges: async () => edges ?? taskEdgesFrom(await stagedOnce()),
         ...(git !== undefined ? { untracked: async () => (await git.start()).untracked } : {}),
       }
       let names: Set<string>
@@ -524,7 +518,7 @@ export async function pickTask(
   }
   if (entries.length === 0) {
     process.stderr.write(
-      'vx run: no tasks declared in any project; declare one under `tasks` in a vx.config, or run `vx init` to write them from package.json scripts\n',
+      'vx run: no tasks declared in any project; declare one under `tasks` in a vx.config, or run `vx init` to write them from package.json scripts, then `vx lock`\n',
     )
     return null
   }
@@ -604,7 +598,7 @@ function didYouMeanProject(
   projects: Iterable<{ name: string }>,
 ): string {
   const names = [...projects].map((p) => p.name)
-  // A scoped name typed without its scope (`vx-mcp` for `@vzn/vx-mcp`) is
+  // A scoped name typed without its scope (`vx-otel` for `@vzn/vx-otel`) is
   // many edits from the whole name and none from the part after the `/`.
   const byBare = new Map<string, string[]>()
   for (const n of names) {
@@ -615,7 +609,7 @@ function didYouMeanProject(
     const typed = pattern.replace(/^!|\.\.\.$|^\.\.\.|\^/g, '')
     // Two edits from any two-letter name: `--filter //` hinted `ui` (X-13).
     if (typed === '//') {
-      return ". `//` is Turbo's root package, but the workspace root is no project here: give it a package.json name and a vx.config"
+      return '. `//` is the workspace root, which is no project here: add a vx.config there and run `vx lock`'
     }
     const best = nearest(typed, names)
     if (best !== undefined) return `. Did you mean ${best}?`

package/src/cli/show.ts

@@ -1,10 +1,10 @@
-// `vx show [target]` — introspect the workspace's LIVE resolved configs:
-// what a run would see here, now. Configs load through the same path a
-// run uses (`loadProjects`): the plugin `config` and `project` stages
-// apply, so a package a plugin gives tasks to shows them. No target: one
-// line per project. `<project>`: every task's resolved config. `<pkg>#
-// <task>`: one task. `<task>`: that task in every project declaring it.
-// Deliberately NOT the lock — vx-lock.json is already the frozen JSON.
+// `vx show [target]` — introspect the workspace's resolved configs: what a
+// run would see here, now. Configs load through the same path a run uses
+// (`loadProjects`): from the lock, with the plugin `config` and `project`
+// stages applied, so a package a plugin gives tasks to shows them. No lock
+// is `NO_LOCK`. No target: one line per project. `<project>`: every task's
+// resolved config. `<pkg>#<task>`: one task. `<task>`: that task in every
+// project declaring it.
 
 import path from 'node:path'
 import type { ProjectConfig, TaskConfig } from '../config.js'
@@ -23,11 +23,10 @@ import {
   type AffectedChanges,
   buildPackageGraph,
   findWorkspaceRoot,
-  type LoadReads,
-  loadWorkspace,
   type ProjectEntry,
   type ProjectMeta,
 } from '../workspace/index.js'
+import { runRules } from '../settings.js'
 
 interface ShowArgs {
   target?: string
@@ -83,9 +82,8 @@ export function parseShowArgs(args: readonly string[]): ShowArgs {
 export async function showCmd(args: readonly string[]): Promise<number> {
   const parsed = parseShowArgs(args)
   if (parsed.error) return refuse('show', args, parsed.error, 'VX_E_USAGE')
-  const reads: LoadReads = new Map()
-  const root = await findWorkspaceRoot(process.cwd(), reads)
-  const metas = await discoverCliProjects(await loadWorkspace(root, reads))
+  const root = await findWorkspaceRoot(process.cwd())
+  const metas = await discoverCliProjects(root)
   const byName = new Map(metas.map((m) => [m.name, m]))
 
   // `//#task` is Turbo's root package's task: the root project here (D-39),
@@ -149,7 +147,7 @@ export async function showCmd(args: readonly string[]): Promise<number> {
       affected = f
       raw.unshift(f)
     }
-    const r = await resolveFilters(process.cwd(), raw, { noCreate: true }, affected)
+    const r = await resolveFilters(process.cwd(), raw, {}, affected)
     if ('error' in r) throw new UserError(`vx show: ${r.error}`, r.code ?? 'VX_E_USAGE')
     if ('empty' in r) process.stderr.write(`vx show: ${r.empty}\n`)
     selected = new Set('empty' in r ? [] : r.names)
@@ -158,7 +156,7 @@ export async function showCmd(args: readonly string[]): Promise<number> {
   }
   const inSelection = (name: string): boolean => selected === undefined || selected.has(name)
 
-  const projects = await loadCliProjects(root, metas, scope, { noCreate: true, closure: true })
+  const projects = await loadCliProjects(root, metas, scope, { closure: true })
 
   if (parsed.target === undefined) {
     const shown = metas.filter((m) => inSelection(m.name))
@@ -200,7 +198,7 @@ export async function showCmd(args: readonly string[]): Promise<number> {
           plugins: ws.plugins,
           workspaceRoot: root,
           cacheDir: ws.cacheDir,
-          rules: ws.workspaceConfig?.rules,
+          rules: runRules(ws.workspaceConfig),
           warn: warnToStderr,
         }),
       )
@@ -342,7 +340,7 @@ function renderProject(
     // Round-trip so the printed object is exactly the JSON form of the
     // resolved config (drops `undefined` fields).
     const shown = shownConfig(config)
-    return `${JSON.stringify(JSON.parse(JSON.stringify({ name, dir, config: shown })), null, 2)}\n`
+    return `${JSON.stringify({ name, dir, config: shown })}\n`
   }
   const tags = config?.tags ?? []
   const tasks = Object.entries(config?.tasks ?? {})
@@ -365,7 +363,7 @@ function renderTask(
 ): string {
   if (format === 'json') {
     const obj = { name, dir, task: taskName, config: shownTask(task) }
-    return `${JSON.stringify(JSON.parse(JSON.stringify(obj)), null, 2)}\n`
+    return `${JSON.stringify(obj)}\n`
   }
   return `${name} — ${dir}\n\n${taskBlock(taskName, task)}`
 }
@@ -383,7 +381,7 @@ function renderTaskAcross(
       task: taskName,
       config: shownTask(p.config.tasks![taskName]!),
     }))
-    return `${JSON.stringify(JSON.parse(JSON.stringify(list)), null, 2)}\n`
+    return `${JSON.stringify(list)}\n`
   }
   return declaring
     .map(
@@ -406,7 +404,7 @@ function taskBlock(taskName: string, raw: TaskConfig): string {
   const exec = task.exec
   rows.push(['command', exec?.command ?? '(group)'])
   add('dependsOn', list(task.dependsOn))
-  add('timeout', exec?.timeout === undefined ? undefined : `${exec.timeout}ms`)
+  add('timeout', exec?.timeout)
   add('retries', exec?.retries)
   add('env.passThrough', list(exec?.env?.passThrough))
   add(

package/src/cli/task-verb.ts

@@ -5,7 +5,7 @@
 // name would change meaning the day a plugin declares that verb.
 
 import { isDefaultBuild, nxProjectTarget, projectNamed } from '../orchestrator/index.js'
-import { findWorkspaceRoot, loadWorkspace } from '../workspace/index.js'
+import { findWorkspaceRoot } from '../workspace/index.js'
 import { nearest } from '../util/index.js'
 import { findCwdProject } from './select.js'
 import { discoverCliProjects, loadCliProjects } from './workspace-config.js'
@@ -79,14 +79,7 @@ async function workspaceProjects(
 ): Promise<Awaited<ReturnType<typeof loadCliProjects>> | null> {
   try {
     const root = await findWorkspaceRoot(cwd)
-    return await loadCliProjects(
-      root,
-      await discoverCliProjects(await loadWorkspace(root)),
-      'all',
-      {
-        noCreate: true,
-      },
-    )
+    return await loadCliProjects(root, await discoverCliProjects(root))
   } catch {
     // No workspace, or a config that does not load: the caller's plain line stands.
     return null