@vzn/vx 0.0.651 → 0.0.652

package/src/report/framed-output.ts

@@ -268,13 +268,22 @@ const MEM_COL = 6 // "412MB", "1.1GB", "1023MB"
 const OUT_COL = 7 // `outputs`: "12MB", "900B"
 const WORKER_COL = 12 // `local`, or a plugin's name for the machine, cut at 12
 
+// A row's padding, built once: `' '.repeat` per cell was ~7 ms of an
+// 8,002-hit warm run's rows, the largest single cost of writing them.
+const SPACES = Array.from({ length: 33 }, (_, n) => ' '.repeat(n))
+
+/** `n` spaces (none below 1). */
+function pad(n: number): string {
+  return n <= 0 ? '' : (SPACES[n] ?? ' '.repeat(n))
+}
+
 /** Right-align the duration in a TIME_COL cell (pad on the left). */
 function timeCell(ms: number | null, colors: ColorSupport): string {
   let raw = ms === null ? '' : formatElapsed(ms)
   // `1000.00s` is wider than the cell; minutes fit it up to `99m 59s`.
   if (ms !== null && raw.length > TIME_COL) raw = formatElapsed(ms, true)
   // The time is the row's fact (value level); the cells around it are meta.
-  return ' '.repeat(Math.max(0, TIME_COL - raw.length)) + paint('value', raw, colors)
+  return pad(TIME_COL - raw.length) + paint('value', raw, colors)
 }
 
 /**
@@ -284,7 +293,7 @@ function timeCell(ms: number | null, colors: ColorSupport): string {
  */
 function cell(text: string, color: Style | '', width: number, colors: ColorSupport): string {
   const painted = text === '' ? '' : paint(color === '' ? 'muted' : color, text, colors)
-  return painted + ' '.repeat(Math.max(0, width - text.length))
+  return painted + pad(width - text.length)
 }
 
 /** The cache-shape glyph (task-shape for non-success). */
@@ -364,7 +373,7 @@ export function formatTaskRow(
   // `aborting` runs one into the cache cell, which is blank beside it.
   const ca = cell(cache, cacheColor, CACHE_COL - Math.max(0, status.length - STATUS_COL), colors)
   const usual = cells.usual ?? { text: '', painted: '' }
-  const us = `${' '.repeat(Math.max(0, USUAL_COL - usual.text.length))}${usual.painted}`
+  const us = `${pad(USUAL_COL - usual.text.length)}${usual.painted}`
   const cpu =
     cells.cpu === undefined ? '' : cells.cpu === null ? UNKNOWN : `${Math.round(cells.cpu * 100)}%`
   const mem =
@@ -379,8 +388,8 @@ export function formatTaskRow(
   return (
     ` ${glyph} ${timeCell(ms, colors)} ${us} ${st} ${ca} ` +
     `${right(cpu, CPU_COL, colors)} ${right(mem, MEM_COL, colors)} ${right(out, OUT_COL, colors)} ` +
-    `${' '.repeat(Math.max(0, BLOCKED_COL - blocks.length))}${paint(blocks === '0' ? 'muted' : 'value', blocks, colors)} ` +
-    `${placeCell(worker, colors)}${' '.repeat(WORKER_COL - worker.length)} ${paintedId}`
+    `${pad(BLOCKED_COL - blocks.length)}${paint(blocks === '0' ? 'muted' : 'value', blocks, colors)} ` +
+    `${placeCell(worker, colors)}${pad(WORKER_COL - worker.length)} ${paintedId}`
   )
 }
 
@@ -407,7 +416,7 @@ export interface RowCells {
 }
 
 function right(text: string, width: number, colors: ColorSupport): string {
-  return ' '.repeat(Math.max(0, width - text.length)) + paint('muted', text, colors)
+  return pad(width - text.length) + paint('muted', text, colors)
 }
 
 /** `900B`, `412MB`, `1.1GB`: one width for a size, whatever it is. */
@@ -532,7 +541,7 @@ export function formatRecordedRow(
     id: `${r.project}#${r.task}`,
     projectName: r.project,
     taskName: r.task,
-    config: r.cached === false ? {} : { cache: {} },
+    config: r.cached === false ? {} : { cache: true },
   } as unknown as TaskNode
   const o = {
     node,

package/src/report/logger.ts

@@ -373,7 +373,7 @@ export function defaultLogger(
   let slots: (WorkerSlot | null)[] = []
   const slotQueue: WorkerSlot[] = []
   let succeeded = 0
-  // Executed with no `cache` block: never a miss, counted apart.
+  // Executed without `cache: true`: never a miss, counted apart.
   let noCache = 0
   let upToDate = 0
   let restoredLocal = 0

package/src/report/plain-output.ts

@@ -57,6 +57,8 @@ export function plainOutput(sink: Logger): Logger {
       if (text !== '' || chunk === '') sink.taskStderr(node, text)
     },
     taskComplete(node, outcome) {
+      // Nearly every task ends with no escape held: its keys go unbuilt.
+      if (held.size === 0) return sink.taskComplete(node, outcome)
       flush(node, `${node.id}\0out`, (n, c) => sink.taskStdout(n, c))
       flush(node, `${node.id}\0err`, (n, c) => sink.taskStderr(n, c))
       sink.taskComplete(node, outcome)

package/src/report/summary.ts

@@ -62,11 +62,11 @@ export interface SummaryStats {
   restoredRemote: number
   /** Ran here and saved to the cache: the legend's `↑`. */
   saved?: number
-  /** Ran here with a `cache` block, succeeded, and saved nothing. */
+  /** Ran here with `cache: true`, succeeded, and saved nothing. */
   notSaved?: number
-  /** Tasks that executed (success + failed) with a `cache` block — the misses. */
+  /** Tasks that executed (success + failed) with `cache: true` — the misses. */
   miss: number
-  /** Executed with no `cache` block: never consulted the cache, not a miss. */
+  /** Executed without `cache: true`: never consulted the cache, not a miss. */
   noCache?: number
   /** Still to run (live section only; 0 in the final summary) — renders
    *  as a gray ▱ remainder so the live meters FILL toward the final. */
@@ -582,7 +582,7 @@ function tableStatusColor(o: TaskOutcome): Style {
 
 // Local byte formatter — the orchestrator can't import cli/format.ts
 // (module boundary), and the footer only needs one compact form.
-/** Ran here with a `cache` block, succeeded, and its result was not saved. */
+/** Ran here with `cache: true`, succeeded, and its result was not saved. */
 export function ranUnsaved(o: TaskOutcome): boolean {
   return o.status === 'success' && !ranNoCache(o) && o.saved !== true && o.where === undefined
 }
@@ -593,7 +593,7 @@ export function formatRunSummary(
   colors: ColorSupport = NO_COLOR,
   context?: RunContext,
 ): string[] {
-  // Counted here, not in the Tally: a task with no `cache` block never
+  // Counted here, not in the Tally: a task without `cache: true` never
   // consulted the cache, so it is not a miss.
   const noCache = outcomes.filter(
     (o) =>

package/src/settings.ts

@@ -118,7 +118,7 @@ export const SETTINGS: readonly Setting[] = [
   {
     path: 'cache.dir',
     kind: { type: 'string' },
-    default: '.vx/cache, entries in ~/.vx/<repo>/cache',
+    default: '.vx/cache, entries in ~/.vx/<id>/cache',
     doc: 'Where the cache lives, relative to the workspace root; named, it holds the whole cache.',
     flag: { verb: 'run', name: '--cache-dir' },
   },
@@ -165,25 +165,25 @@ export const SETTINGS: readonly Setting[] = [
     flag: { verb: 'run', name: '--cache-download' },
   },
   {
-    path: 'cache.inputStability.strategy',
+    path: 'inputs.stability.strategy',
     kind: { type: 'enum', values: ['immutable', 'mutable', 'unchecked'] },
     default: 'immutable',
     doc: 'What a write to an input during the command means for the save, for tasks without their own.',
-    task: 'cache.inputStability.strategy',
+    task: 'inputs.stability.strategy',
   },
   {
-    path: 'cache.inputStability.severity',
+    path: 'inputs.stability.severity',
     kind: { type: 'enum', values: ['warn', 'error'] },
     default: 'warn',
     doc: 'Whether a skipped save warns or fails the task, for tasks without their own.',
-    task: 'cache.inputStability.severity',
+    task: 'inputs.stability.severity',
   },
   {
-    path: 'cache.outputs.clean',
+    path: 'outputs.clean',
     kind: { type: 'bool' },
     default: 'true',
     doc: "Remove a task's declared outputs before it runs on a miss, for tasks without their own.",
-    task: 'cache.outputs.clean',
+    task: 'outputs.clean',
     env: false,
   },
   {
@@ -249,7 +249,7 @@ export const SETTINGS: readonly Setting[] = [
 ]
 
 /** The `.vx/workspace` groups that hold settings; `baseBranch` and `plugins` are the other keys. */
-export const SETTING_GROUPS = ['run', 'cache', 'lock', 'watch'] as const
+export const SETTING_GROUPS = ['run', 'cache', 'inputs', 'outputs', 'lock', 'watch'] as const
 
 const BY_PATH = new Map(SETTINGS.map((s) => [s.path, s]))
 

package/src/util/config-frame.ts

@@ -32,11 +32,25 @@ export function configErrorFrame(message: string, cwd: string): string | undefin
   const rest = message.slice(head[0].length)
   // The field the refusal is about, past the path that leads to it:
   // `has unknown field "comand"`, or `tasks.build: \`cache\` is not allowed`.
-  const named =
-    colon === ':' ? /^`([^`]+)`/.exec(rest) : /^has (?:unknown )?field "([^"]+)"/.exec(rest)
+  // A refused key is quoted: `tasks.b.exec.env.define: "A=B" is not …`.
+  const said =
+    colon === ':'
+      ? /^(?:`([^`]+)`|("(?:[^"\\\n]|\\.)*"))/.exec(rest)
+      : /^has (?:unknown )?field "([^"]+)"/.exec(rest)
+  const named = said === null ? null : [said[0], said[1] ?? JSON.parse(said[2]!)]
+  // `plugins[2].name`: an element of an array, framed at the element (a
+  // plugin is a call, so no key inside it is searched).
+  const element = setting === undefined ? null : /^([^[]+)\[(\d+)\]/.exec(setting)
   const fieldPath =
-    taskName === undefined ? (tasksPath ?? setting)?.split('.') : ['tasks', JSON.parse(taskName)]
-  const segments = [...(fieldPath ?? []), ...(named === null ? [] : [named[1]!])]
+    taskName !== undefined
+      ? ['tasks', JSON.parse(taskName)]
+      : element !== null
+        ? element[1]!.split('.')
+        : (tasksPath ?? setting)?.split('.')
+  const segments = [
+    ...(fieldPath ?? []),
+    ...(named === null || element !== null ? [] : [named[1]!]),
+  ]
   if (segments.length === 0) return undefined
   let source: string
   try {
@@ -44,7 +58,7 @@ export function configErrorFrame(message: string, cwd: string): string | undefin
   } catch {
     return undefined
   }
-  const at = locate(source, segments)
+  const at = locate(source, segments, element === null ? undefined : Number(element[2]))
   if (at === undefined) return undefined
   return framed(file, source, at, message.slice(file.length), cwd)
 }
@@ -54,8 +68,70 @@ export function configErrorFrame(message: string, cwd: string): string | undefin
 const POSITION =
   /^(?:Project|Workspace) config (\/[^\n]*?\/(?:vx\.config|\.vx\/workspace)\.[cm]?[jt]s):(\d+):(\d+)(: [^]*)$/
 
+// The loader's `Project config <file> threw: <message> (at <file>:<line>:<col>)`:
+// the config's own throw, placed by its stack in the config itself.
+const THREW =
+  /^(?:Project|Workspace) config (\/[^\n]*?\/(?:vx\.config|\.vx\/workspace)\.[cm]?[jt]s) threw: ([^\n]*?) \(at (\/[^\n]*?):(\d+):(\d+)\)([^]*)$/
+
+// The loader's `<kind> config <file>: cannot find '<pkg>' …`: placed at the
+// specifier. And `<kind> config at <file> did not export a default object`:
+// at the `export default` that exported something else, when there is one.
+const UNPROVIDED =
+  /^(?:Project|Workspace) config (\/[^\n]*?\/(?:vx\.config|\.vx\/workspace)\.[cm]?[jt]s): (cannot find '([^'\n]+)'[^]*)$/
+const NOT_OBJECT =
+  /^(?:Project|Workspace) config at (\/[^\n]*?\/(?:vx\.config|\.vx\/workspace)\.[cm]?[jt]s) (did not export a default object[^]*)$/
+
+/** The file, the source offset `find` places in it, and what follows `<file>:<line>:<col>`. */
+function sourceFrame(
+  file: string,
+  find: (source: string) => number,
+  rest: string,
+  cwd: string,
+): string | undefined {
+  let source: string
+  try {
+    source = readFileSync(file, 'utf8')
+  } catch {
+    return undefined
+  }
+  const at = find(source)
+  if (at < 0) return undefined
+  const before = source.slice(0, at)
+  const line = before.split('\n').length
+  return framed(file, source, { line, col: at - before.lastIndexOf('\n') }, rest, cwd)
+}
+
 function positionFrame(message: string, cwd: string): string | undefined {
-  const pos = POSITION.exec(message)
+  const unprovided = UNPROVIDED.exec(message)
+  if (unprovided !== null) {
+    const [, file, said, pkg] = unprovided as unknown as [string, string, string, string]
+    const spec = new RegExp(
+      `(?<=\\b(?:from|import|import\\(|require\\()\\s*)(['"])${escapeRe(pkg)}\\1`,
+    )
+    return sourceFrame(file, (src) => spec.exec(src)?.index ?? -1, `: ${said}`, cwd)
+  }
+  const notObject = NOT_OBJECT.exec(message)
+  if (notObject !== null) {
+    const [, file, said] = notObject as unknown as [string, string, string]
+    return sourceFrame(
+      file,
+      (src) => /^export\s+default\b/m.exec(src)?.index ?? -1,
+      `: ${said}`,
+      cwd,
+    )
+  }
+  const threw = THREW.exec(message)
+  const pos =
+    threw !== null && threw[3] === threw[1]
+      ? [
+          threw[0],
+          threw[1],
+          threw[4],
+          threw[5],
+          // A cause's own `(at …)` names the same file: relative there too.
+          `: threw: ${threw[2]}${threw[6]!.replaceAll(threw[1]!, path.relative(cwd, threw[1]!))}`,
+        ]
+      : POSITION.exec(message)
   if (pos === null) return undefined
   const [, file, line, col, rest] = pos as unknown as [string, string, string, string, string]
   let source: string
@@ -105,6 +181,8 @@ function framed(
 function locate(
   source: string,
   segments: readonly string[],
+  /** The element of the array the last segment holds; past its end, the key. */
+  index?: number,
 ): { line: number; col: number } | undefined {
   let pos = 0
   let end = source.length
@@ -137,6 +215,10 @@ function locate(
     i = next
   }
   if (found < 0) return undefined
+  if (index !== undefined && i === segments.length) {
+    const el = elementStart(source, pos, index)
+    if (el !== undefined) found = el
+  }
   const before = source.slice(0, found)
   const line = before.split('\n').length
   return { line, col: found - before.lastIndexOf('\n') }
@@ -172,6 +254,46 @@ function literalEnd(source: string, from: number): number {
   return source.length
 }
 
+/** Where element `index` of the array literal at `from` (past blanks) starts, if it has one. */
+function elementStart(source: string, from: number, index: number): number | undefined {
+  let i = from
+  while (i < source.length && /\s/.test(source[i]!)) i++
+  if (source[i] !== '[') return undefined
+  let depth = 0
+  let n = 0
+  // Each element starts at the first code past `[` or a top-level `,`.
+  let pending = true
+  for (i++; i < source.length; i++) {
+    const c = source[i]!
+    if (c === '/' && source[i + 1] === '/') {
+      i = source.indexOf('\n', i)
+      if (i < 0) return undefined
+      continue
+    }
+    if (c === '/' && source[i + 1] === '*') {
+      i = source.indexOf('*/', i + 2)
+      if (i < 0) return undefined
+      i++
+      continue
+    }
+    if (/\s/.test(c)) continue
+    if (depth === 0 && (c === ']' || c === ')' || c === '}')) return undefined
+    if (pending) {
+      if (n === index) return i
+      pending = false
+    }
+    if (c === '"' || c === "'" || c === '`') {
+      for (i++; i < source.length && source[i] !== c; i++) if (source[i] === '\\') i++
+    } else if (c === '{' || c === '[' || c === '(') depth++
+    else if (c === '}' || c === ']' || c === ')') depth--
+    else if (c === ',' && depth === 0) {
+      n++
+      pending = true
+    }
+  }
+  return undefined
+}
+
 function escapeRe(s: string): string {
   return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }

package/src/util/paths.ts

@@ -202,7 +202,7 @@ export function isLiteralPattern(glob: string): boolean {
 }
 
 /**
- * The alphabet of a TASK glob (`inputs.files`, `cache.outputs.files`,
+ * The alphabet of a TASK glob (`inputs.files`, `outputs.files`,
  * `workspaceFiles`), behind {@link isLiteralPattern}, for the callers that
  * need the POSITION of the first wildcard rather than a verdict. Every site
  * that asks "must this declaration be matched?" reads this one regex: item

package/src/util/settle.ts

@@ -51,7 +51,8 @@ export function killGraceMs(defaultMs: number): number {
 export async function settleWithin(p: Promise<unknown>, ms: number): Promise<boolean> {
   let timer: ReturnType<typeof setTimeout> | undefined
   const deadline = new Promise<false>((resolve) => {
-    timer = setTimeout(() => resolve(false), ms)
+    // A delay past a 32-bit int fires at 1 ms: the longest the timer holds instead.
+    timer = setTimeout(() => resolve(false), Math.min(ms, MAX_TIMEOUT_MS))
   })
   try {
     return (await Promise.race([p.then(() => true), deadline])) !== false

package/src/util/tail.ts

@@ -32,8 +32,11 @@ export function createTail(): Tail {
   return { chunks: [], chars: 0, dropped: 0 }
 }
 
-export function appendTail(t: Tail, chunk: string, limit = PERSISTENT_TAIL_CHARS): void {
+export function appendTail(t: Tail, chunk: string, cap = PERSISTENT_TAIL_CHARS): void {
   if (chunk.length === 0) return
+  // Every bound below is `chars > limit`, which NaN never is: a NaN cap
+  // kept everything, the unbounded heap this exists to prevent.
+  const limit = Number.isNaN(cap) ? 0 : cap
   t.chunks.push(chunk)
   t.chars += chunk.length
   // Evict WHOLE chunks from the head — no concatenation until the flush

package/src/workspace/bracket-literal.ts

@@ -65,8 +65,8 @@ export function checkBracketLiterals(root: string, projects: Iterable<ProjectEnt
       const lists: [string, readonly string[] | undefined, string][] = [
         ['inputs.files', t.inputs?.files, p.dir],
         ['inputs.workspaceFiles', t.inputs?.workspaceFiles, root],
-        ['cache.outputs.files', t.cache?.outputs?.files, p.dir],
-        ['cache.outputs.workspaceFiles', t.cache?.outputs?.workspaceFiles, root],
+        ['outputs.files', t.outputs?.files, p.dir],
+        ['outputs.workspaceFiles', t.outputs?.workspaceFiles, root],
       ]
       for (const [field, globs, base] of lists) {
         for (const glob of globs ?? []) {