@vzn/vx 0.0.637 → 0.0.638

package/src/util/refusal-notice.ts

@@ -0,0 +1,111 @@
+// Every refusal vx prints, as one `ui.notice`: the parts a refusal
+// carries, a config refusal's frame, or a plain message laid out a fact a
+// line. The flat message stays what `--format json` and logs carry.
+
+import { configRefusal } from './config-frame.js'
+import type { RefusalParts } from './errors.js'
+import { notice, print, type Block, type Inline, type Tone } from './ui.js'
+
+// A sentence break before a capital, a backtick or a paren: vx joins
+// its facts with these.
+const BREAK = /(?<=[.?!])\s+(?=[A-Z`(])/
+// `(see \`vx run --help\`)`: where to read more.
+const SEE = /\s*\(see `([^`]+)`\)/
+// `(did you mean --concurrency?)`, `. Did you mean build?`: the fix.
+const MEANT = /\s*(?:\(did you mean ([^?]+)\?\)|(?:^|[.;—]\s*)[Dd]id you mean ([^?]+)\?)/
+
+const bare = (s: string): string => s.trim().replace(/[.:]$/, '')
+
+/** A plain message in parts: its first sentence heads, each later one is a line. */
+export function messageParts(message: string): RefusalParts {
+  const [head = '', ...rest] = message.split('\n')
+  let first = head
+  const see = SEE.exec(first)
+  if (see !== null) first = first.replace(SEE, '')
+  const meant = MEANT.exec(first)
+  if (meant !== null) first = first.replace(MEANT, '')
+  const sentences = first
+    .split(BREAK)
+    .map(bare)
+    .filter((s) => s !== '')
+  const [headline = bare(first), ...what] = sentences
+  for (const l of rest) {
+    if (l.trim() !== '') what.push(...l.replace(/^ {2}/, '').split(BREAK).map(bare))
+  }
+  const fix = meant !== null ? (meant[1] ?? meant[2])!.trim() : undefined
+  return {
+    headline,
+    ...(what.length > 0 ? { what } : {}),
+    ...(see !== null ? { why: `see ${see[1]}` } : {}),
+    ...(fix !== undefined ? { fix } : {}),
+  }
+}
+
+/**
+ * `✗ <verb>  <headline>` with what is wrong, why, and the fix under it.
+ * `headline` set: that is the status line and the refusal's own headline
+ * joins what is wrong (`vx lock  lock not written`).
+ */
+export function refusalNotice(
+  verb: string,
+  message: string,
+  parts?: RefusalParts,
+  opts: { headline?: string; cwd?: string } = {},
+): Block {
+  const c = parts === undefined ? configRefusal(message, opts.cwd ?? process.cwd()) : undefined
+  if (c !== undefined) {
+    const what: Inline[] = [{ style: 'bold', text: c.where }, c.problem]
+    return notice({
+      tone: 'error',
+      verb,
+      headline: opts.headline ?? 'config refused',
+      what,
+      ...(c.allowed !== undefined ? { why: `allowed: ${c.allowed}` } : {}),
+      code: c.frame,
+      ...(c.fix !== undefined ? { fix: c.fix } : {}),
+    })
+  }
+  const p = parts ?? messageParts(message)
+  const what = opts.headline !== undefined ? [p.headline, ...(p.what ?? [])] : (p.what ?? [])
+  return notice({
+    tone: p.tone ?? 'error',
+    verb,
+    headline: opts.headline ?? p.headline,
+    ...(what.length > 0 ? { what } : {}),
+    ...(p.why !== undefined ? { why: p.why } : {}),
+    ...(p.fix !== undefined ? { fix: p.fix } : {}),
+  })
+}
+
+/** A message of `tone` from `verb`, a fact a line. */
+function messageNotice(tone: Tone, verb: string, message: string): Block {
+  const p = messageParts(message)
+  return notice({
+    tone,
+    verb,
+    headline: p.headline,
+    ...(p.what !== undefined ? { what: p.what } : {}),
+    ...(p.why !== undefined ? { why: p.why } : {}),
+    ...(p.fix !== undefined ? { fix: p.fix } : {}),
+  })
+}
+
+/** A line that may open with its verb (`vx why: …`), as `messageNotice` draws it. */
+export function lineNotice(tone: Tone, line: string, verb = 'vx'): Block {
+  const named = /^(vx(?: [a-z][\w-]*)?): /.exec(line)
+  return messageNotice(
+    tone,
+    named?.[1] ?? verb,
+    named === null ? line : line.slice(named[0].length),
+  )
+}
+
+/** `messageNotice` on stderr. */
+export function sayNotice(tone: Tone, verb: string, message: string): void {
+  print('err', messageNotice(tone, verb, message))
+}
+
+/** `lineNotice` on stderr. */
+export function sayLine(tone: Tone, line: string, verb = 'vx'): void {
+  print('err', lineNotice(tone, line, verb))
+}

package/src/util/report.ts

@@ -0,0 +1,31 @@
+import { paint, type ColorSupport } from './colors.js'
+
+// Brand gradient for the rule: identity violet → pink (the project /
+// task hues), faded across the dash run. Plain dashes when colors
+// are off.
+const GRADIENT_FROM = [0xa7, 0x8b, 0xfa] as const
+const GRADIENT_TO = [0xf4, 0x72, 0xb6] as const
+// Rule ends flush with the bars: 2 indent + 8 label + 2 gap + 50 cells.
+const RULE_DASHES = 57
+
+/** Total visible rule width: `─ <mark> ` + dashes. Shared by the run summary and every report. */
+export function gradientRule(colors: ColorSupport, mark = 'vx'): string {
+  const head = `─ `
+  const dashes = '─'.repeat(Math.max(8, RULE_DASHES + 2 - mark.length))
+  if (!colors.enabled) return `${head}${mark} ${dashes}`
+  const chunks = 8
+  const per = Math.ceil(RULE_DASHES / chunks)
+  let out = ''
+  for (let i = 0; i < chunks; i++) {
+    const seg = dashes.slice(i * per, (i + 1) * per)
+    if (seg.length === 0) break
+    const f = i / (chunks - 1)
+    const hex = `#${GRADIENT_FROM.map((c, j) =>
+      Math.round(c + (GRADIENT_TO[j]! - c) * f)
+        .toString(16)
+        .padStart(2, '0'),
+    ).join('')}`
+    out += paint(hex, seg, colors)
+  }
+  return `${paint(`#${GRADIENT_FROM.map((c) => c.toString(16).padStart(2, '0')).join('')}`, head, colors)}${paint('', mark, colors, { bold: true })} ${out}`
+}

package/src/util/ui.ts

@@ -0,0 +1,186 @@
+// vx's output components (org/devex/log-design.md). A verb or a plugin
+// composes these instead of writing raw lines: each component owns its
+// color, indent and spacing, so every surface shares one look. Colors
+// are decided at print time, per stream.
+
+import { detectColors, ERROR, paint, SUCCESS, WARN, type ColorSupport } from './colors.js'
+import { gradientRule } from './report.js'
+
+export type Tone = 'ok' | 'warn' | 'error' | 'info'
+
+const INFO = '#06b6d4'
+const PROJECT = '#a78bfa'
+const TASK = '#f472b6'
+const HUE: Record<Tone, string> = { ok: SUCCESS, warn: WARN, error: ERROR, info: INFO }
+const SYMBOL: Record<Tone, string> = { ok: '✓', warn: '!', error: '✗', info: '›' }
+const INDENT = '  '
+const LABEL_MIN = 8
+
+type Style = Tone | 'dim' | 'bold' | 'id'
+
+/** Styled text inside a component: a plain string, a token, or a run of them. */
+export type Inline = string | { readonly style: Style; readonly text: string } | readonly Inline[]
+
+/** A laid-out piece of output; `render` and `print` space blocks apart. */
+export interface Block {
+  readonly lines: (colors: ColorSupport) => string[]
+}
+
+/** A `project#task` id, in the run's project and task hues. */
+export const id = (text: string): Inline => ({ style: 'id', text })
+/** A path, glob or file: bold. */
+export const path = (text: string): Inline => ({ style: 'bold', text })
+/** A command to type: bold. */
+export const cmd = (text: string): Inline => ({ style: 'bold', text })
+/** A secondary fact. */
+export const dim = (text: string): Inline => ({ style: 'dim', text })
+/** Text in a tone's color. */
+export const tone = (t: Tone, text: string): Inline => ({ style: t, text })
+
+function inline(x: Inline, c: ColorSupport): string {
+  if (typeof x === 'string') return x
+  if (Array.isArray(x)) return (x as readonly Inline[]).map((p) => inline(p, c)).join('')
+  const { style, text } = x as { style: Style; text: string }
+  switch (style) {
+    case 'dim':
+      return paint('', text, c, { dim: true })
+    case 'bold':
+      return paint('', text, c, { bold: true })
+    case 'id': {
+      const hash = text.lastIndexOf('#')
+      if (hash < 0) return paint(PROJECT, text, c)
+      return paint(PROJECT, text.slice(0, hash), c) + paint(TASK, text.slice(hash), c)
+    }
+    default:
+      return paint(HUE[style], text, c)
+  }
+}
+
+const block = (lines: (c: ColorSupport) => string[]): Block => ({ lines })
+const lines = (x: Inline, c: ColorSupport): string[] => inline(x, c).split('\n')
+const visible = (s: string): number => Bun.stringWidth(s)
+
+/** `✗ vx lock  lock not written`: the tone's symbol, the bold verb, the headline. */
+export function status(t: Tone, verb: string, headline: Inline): Block {
+  return block((c) => [
+    `${paint(HUE[t], SYMBOL[t], c)} ${paint('', verb, c, { bold: true })}  ${inline(headline, c)}`,
+  ])
+}
+
+/** Indented short lines: what is wrong, or what happened. */
+export function text(...items: Inline[]): Block {
+  return block((c) => items.flatMap((i) => lines(i, c).map((l) => `${INDENT}${l}`)))
+}
+
+/** An indented dim line: why it matters. */
+export function why(line: Inline): Block {
+  return block((c) => lines(line, c).map((l) => `${INDENT}${paint('', l, c, { dim: true })}`))
+}
+
+/** A label and its values; values after the first sit under it. `null` is a blank line. */
+export type FieldRow = readonly [label: string, ...values: Inline[]] | null
+
+/** A dim label column with the values aligned beside it; `next` and `fix` are bold. */
+export function fields(rows: readonly FieldRow[]): Block {
+  return block((c) => {
+    const width = Math.max(LABEL_MIN, ...rows.map((r) => (r === null ? 0 : r[0].length)))
+    const out: string[] = []
+    for (const row of rows) {
+      if (row === null) {
+        out.push('')
+        continue
+      }
+      const [label, ...values] = row
+      const strong = label === 'next' || label === 'fix'
+      values
+        .flatMap((v) => lines(v, c))
+        .forEach((v, i) => {
+          const head =
+            i === 0 ? paint('', label.padEnd(width), c, { dim: true }) : ' '.repeat(width)
+          const value = strong ? paint('', v, c, { bold: true }) : v
+          out.push(`${INDENT}${head}  ${value}`.trimEnd())
+        })
+    }
+    return out
+  })
+}
+
+/** `fix  <action>`: what to do about it. */
+export function fix(action: Inline): Block {
+  return labelled('fix', action)
+}
+
+/** `next  <command>`: the command to type next. */
+export function next(command: Inline): Block {
+  return labelled('next', command)
+}
+
+function labelled(label: string, value: Inline): Block {
+  return block((c) => [
+    `${INDENT}${paint('', label, c, { dim: true })}  ${paint('', inline(value, c), c, { bold: true })}`,
+  ])
+}
+
+/** A report: a blank line, the brand rule naming `mark`, then its fields. */
+export function report(mark: string, rows: readonly FieldRow[]): Block {
+  return block((c) => ['', gradientRule(c, mark), ...fields(rows).lines(c)])
+}
+
+/** Aligned columns under a dim header. */
+export function table(columns: readonly string[], rows: readonly (readonly Inline[])[]): Block {
+  return block((c) => {
+    const cells = rows.map((r) => r.map((x) => inline(x, c)))
+    const widths = columns.map((h, i) =>
+      Math.max(h.length, ...cells.map((r) => visible(r[i] ?? ''))),
+    )
+    const pad = (s: string, i: number): string =>
+      i === columns.length - 1 ? s : s + ' '.repeat(widths[i]! - visible(s))
+    return [
+      `${INDENT}${paint('', columns.map((h, i) => pad(h, i)).join('  '), c, { dim: true })}`.trimEnd(),
+      ...cells.map((r) => `${INDENT}${r.map(pad).join('  ')}`.trimEnd()),
+    ]
+  })
+}
+
+/** A source frame (`> 1 | …` and its caret), indented. */
+export function code(frame: string): Block {
+  return block(() => frame.split('\n').map((l) => (l === '' ? '' : `${INDENT}${l}`)))
+}
+
+export interface NoticeParts {
+  tone: Tone
+  verb: string
+  headline: Inline
+  /** What is wrong, one fact a line. */
+  what?: readonly Inline[]
+  why?: Inline
+  /** A source frame, below the facts. */
+  code?: string
+  fix?: Inline
+}
+
+/** A refusal or a warning: status, then what and why, the frame, and the fix, a blank line apart. */
+export function notice(p: NoticeParts): Block {
+  return block((c) => {
+    const parts: Block[] = [status(p.tone, p.verb, p.headline)]
+    const body = [
+      ...(p.what !== undefined ? [text(...p.what)] : []),
+      ...(p.why !== undefined ? [why(p.why)] : []),
+    ]
+    if (body.length > 0) parts.push(block((cc) => body.flatMap((b) => b.lines(cc))))
+    if (p.code !== undefined) parts.push(code(p.code))
+    if (p.fix !== undefined) parts.push(fix(p.fix))
+    return parts.flatMap((b, i) => (i === 0 ? b.lines(c) : ['', ...b.lines(c)]))
+  })
+}
+
+/** The blocks as text, a blank line apart, ending in a newline. */
+export function render(blocks: readonly Block[], colors: ColorSupport): string {
+  return `${blocks.map((b) => b.lines(colors).join('\n')).join('\n\n')}\n`
+}
+
+/** Write the blocks to stdout (`out`) or stderr (`err`), colored for that stream. */
+export function print(stream: 'out' | 'err', ...blocks: Block[]): void {
+  const s = stream === 'out' ? process.stdout : process.stderr
+  s.write(render(blocks, detectColors(s)))
+}

package/src/workspace/affected.ts

@@ -143,6 +143,8 @@ export interface AffectedChanges {
   /** Project → its changed paths, relative to the project's directory. */
   paths: ReadonlyMap<string, readonly string[]>
   whole: ReadonlySet<string>
+  /** A whole project → the workspace-wide file that made it so (a workspace config, a claimed root file). */
+  wholeBy?: ReadonlyMap<string, string>
   /**
    * The changed paths that are nested repositories (a submodule, an
    * embedded repository), workspace-relative: each stands for every file
@@ -269,11 +271,17 @@ export async function affectedChanges(
   // itself, so an unclaimed one is a path like any other.
   //
   // Selection is not hashed, so widening it here changes no cache key.
-  const everything = (): AffectedChanges => {
+  const everything = (file: string): AffectedChanges => {
     const all = new Set(args.projects.map((p) => p.name))
-    return { projects: all, changed, paths: new Map(), whole: all }
+    const wholeBy = new Map([...all].map((n) => [n, file]))
+    return { projects: all, changed, paths: new Map(), whole: all, wholeBy }
   }
-  if (workspaceConfigChanged(changed)) return everything()
+  // The workspace config's plugins shape every project's resolved config,
+  // so its edit can re-key any task and selection cannot tell which (item
+  // 953). No key folds the file; selection is not hashed, so widening here
+  // changes no key.
+  const wsConfig = WORKSPACE_CONFIG_FILENAMES.find((n) => changed.includes(n))
+  if (wsConfig !== undefined) return everything(wsConfig)
   // Loading the workspace file costs an evaluation; only a changed ROOT
   // name can be claimed, so a diff inside the projects never loads it.
   let claims: FingerprintClaims | undefined
@@ -287,12 +295,13 @@ export async function affectedChanges(
     const lock = await bytesOrNull(path.join(args.workspaceRoot, 'bun.lock'))
     if (lock !== null) {
       const patches = new Set(bunPatchFiles(lock))
-      if (changed.some((p) => patches.has(p)) && (await loadClaims())?.files.has('bun.lock')) {
-        return everything()
+      const patch = changed.find((p) => patches.has(p))
+      if (patch !== undefined && (await loadClaims())?.files.has('bun.lock')) {
+        return everything(patch)
       }
     }
   }
-  const claimedOwned = new Set<string>()
+  const claimedOwned = new Map<string, string>()
   const rootNamesChanged = changed.filter((p) => !p.includes('/'))
   const claimed = rootNamesChanged.length > 0 ? await loadClaims() : undefined
   for (const file of rootNamesChanged) {
@@ -302,8 +311,8 @@ export async function affectedChanges(
       before: await gitBytesAt(args.workspaceRoot, base, file),
       after: await bytesOrNull(path.join(args.workspaceRoot, file)),
     })
-    if (answer === undefined) return everything()
-    for (const name of answer) claimedOwned.add(name)
+    if (answer === undefined) return everything(file)
+    for (const name of answer) if (!claimedOwned.has(name)) claimedOwned.set(name, file)
   }
 
   const realDirs = new Map(
@@ -312,7 +321,7 @@ export async function affectedChanges(
     ),
   )
   const paths = new Map<string, string[]>()
-  const whole = new Set<string>(claimedOwned)
+  const whole = new Set<string>(claimedOwned.keys())
   const owned = projectsContaining(
     args.workspaceRoot,
     changed,
@@ -330,7 +339,7 @@ export async function affectedChanges(
         }
       : undefined,
   )
-  for (const name of claimedOwned) owned.add(name)
+  for (const name of claimedOwned.keys()) owned.add(name)
 
   // A config that makes an existing directory a project took files from
   // the project above it.
@@ -367,6 +376,7 @@ export async function affectedChanges(
     changed,
     paths,
     whole,
+    ...(claimedOwned.size > 0 ? { wholeBy: claimedOwned } : {}),
     ...(nestedDirs.length > 0 ? { nested: nestedDirs } : {}),
   })
   if (changed.length === 0 || args.workspaceGlobOwners === undefined) return done()
@@ -462,19 +472,6 @@ async function gitBlobsAt(
   return blobs
 }
 
-/**
- * Whether `changed` holds the workspace config. Its plugins' `config` and
- * `project` stages shape every project's resolved config, so such an edit
- * can re-key any task, and selection cannot tell which: an edit that
- * changed every key selected nothing (item 953). No key folds the file
- * (its placement plugins must not split a cache between machines); a
- * stage it installs re-keys through the resolved configs instead.
- * Selection is not hashed, so widening here changes no key.
- */
-function workspaceConfigChanged(changed: readonly string[]): boolean {
-  return WORKSPACE_CONFIG_FILENAMES.some((n) => changed.includes(n))
-}
-
 /**
  * A root file's bytes at `ref`, or null when the ref has no such file.
  * `./` anchors the path to the cwd (the workspace root) rather than the

package/src/workspace/dependency-rules.ts

@@ -1,5 +1,5 @@
 import type { DependencyRule } from '../config.js'
-import { UserError } from '../util/index.js'
+import { refusal } from '../util/index.js'
 import { compileNameGlob } from './filter.js'
 import type { PackageGraph } from './package-graph.js'
 
@@ -40,9 +40,17 @@ export function checkDependencyRules(
     }
   }
   if (broken.length === 0) return
-  throw new UserError(
-    `${broken.length === 1 ? '1 dependency breaks' : `${broken.length} dependencies break`} run.rules.dependencies:\n${broken.map((b) => `  ${b}`).join('\n')}\nDrop the dependency, or change the project's tags or the rule.`,
-    'VX_E_DEPENDENCY_RULE',
+  const headline = `${broken.length === 1 ? '1 dependency breaks' : `${broken.length} dependencies break`} run.rules.dependencies`
+  throw refusal(
+    {
+      headline,
+      what: broken,
+      fix: "drop the dependency, or change the project's tags or the rule",
+    },
+    {
+      code: 'VX_E_DEPENDENCY_RULE',
+      message: `${headline}:\n${broken.map((b) => `  ${b}`).join('\n')}\nDrop the dependency, or change the project's tags or the rule.`,
+    },
   )
 }