@vzn/vx-lockfile 0.0.594 → 0.0.596

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx-lockfile",
-  "version": "0.0.594",
+  "version": "0.0.596",
   "license": "MIT",
   "description": "Lockfile plugins for vx — pnpm(), bun(), npm(), yarn(): each keys every task on its project's own resolved dependency closure from the package manager's lockfile, so a lockfile change re-keys only the projects it reaches; --affected follows the same answer; `vx prune` cuts the workspace and the lockfile to a Docker subset.",
   "keywords": [
@@ -37,7 +37,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@vzn/vx": "^0.0.594"
+    "@vzn/vx": "^0.0.596"
   },
   "repository": {
     "type": "git",

package/src/blocks.ts

@@ -19,8 +19,7 @@ export function pruneEntries(
   keep: (keyLine: string) => boolean,
 ): string[] {
   const pad = ' '.repeat(indent)
-  const isKey = (l: string): boolean =>
-    l.startsWith(pad) && l.length > indent && l[indent] !== ' ' && l[indent] !== '#'
+  const isKey = (l: string): boolean => l.startsWith(pad) && /^[^\s#]/.test(l.slice(indent))
   const head: string[] = []
   let i = from
   while (i < to && !isKey(lines[i]!)) head.push(lines[i++]!)

package/src/bun.ts

@@ -11,6 +11,7 @@
 // Bun.JSONC is the parser: no dependency, and the file is Bun's own.
 
 import { reachDigests } from '@vzn/vx'
+import { depsOf, record, type Json } from './json.js'
 import type { PruneScope } from './scope.js'
 
 export interface Lockfile {
@@ -35,7 +36,6 @@ export interface Entry {
   readonly resolution: string
 }
 
-type Json = Record<string, unknown>
 /** The top-level fields the digest reads per workspace. */
 // Read per workspace: the workspaces and packages themselves, and the fields
 // whose whole effect is the `packages` entry a workspace reaches — how a
@@ -51,13 +51,6 @@ const PER_WORKSPACE = new Set([
   'patchedDependencies',
 ])
 
-const DEP_FIELDS = [
-  'dependencies',
-  'devDependencies',
-  'optionalDependencies',
-  'peerDependencies',
-] as const
-
 export function parseLockfile(text: string): Lockfile {
   let doc: unknown
   try {
@@ -110,20 +103,6 @@ export function parseLockfile(text: string): Lockfile {
   }
 }
 
-function depsOf(m: Json): ReadonlyMap<string, string> {
-  const out = new Map<string, string>()
-  for (const field of DEP_FIELDS) {
-    const deps = record(m[field])
-    if (deps === undefined) continue
-    for (const [name, spec] of Object.entries(deps)) out.set(name, String(spec))
-  }
-  return out
-}
-
-function record(v: unknown): Json | undefined {
-  return v !== null && typeof v === 'object' && !Array.isArray(v) ? (v as Json) : undefined
-}
-
 /**
  * Where dependency `name` of the package at node_modules path `from`
  * lives: the deepest `…/name` key up the path, then the root. A workspace

package/src/json.ts

@@ -0,0 +1,25 @@
+export type Json = Record<string, unknown>
+
+const DEP_FIELDS = [
+  'dependencies',
+  'devDependencies',
+  'optionalDependencies',
+  'peerDependencies',
+] as const
+
+export function depsOf(
+  e: Json,
+  fields: readonly string[] = DEP_FIELDS,
+): ReadonlyMap<string, string> {
+  const out = new Map<string, string>()
+  for (const field of fields) {
+    const deps = record(e[field])
+    if (deps === undefined) continue
+    for (const [name, spec] of Object.entries(deps)) out.set(name, String(spec))
+  }
+  return out
+}
+
+export function record(v: unknown): Json | undefined {
+  return v !== null && typeof v === 'object' && !Array.isArray(v) ? (v as Json) : undefined
+}

package/src/npm.ts

@@ -8,6 +8,7 @@
 // ancestor directory's, else `node_modules/d` — Node's own walk.
 
 import { reachDigests } from '@vzn/vx'
+import { depsOf, record, type Json } from './json.js'
 import type { PruneScope } from './scope.js'
 
 export interface Lockfile {
@@ -27,14 +28,6 @@ export interface Entry {
   readonly isWorkspace: boolean
 }
 
-type Json = Record<string, unknown>
-const DEP_FIELDS = [
-  'dependencies',
-  'devDependencies',
-  'optionalDependencies',
-  'peerDependencies',
-] as const
-
 export function parseLockfile(text: string): Lockfile {
   let doc: unknown
   try {
@@ -74,20 +67,6 @@ export function parseLockfile(text: string): Lockfile {
   return { version, packages, global }
 }
 
-function depsOf(e: Json): ReadonlyMap<string, string> {
-  const out = new Map<string, string>()
-  for (const field of DEP_FIELDS) {
-    const deps = record(e[field])
-    if (deps === undefined) continue
-    for (const [name, spec] of Object.entries(deps)) out.set(name, String(spec))
-  }
-  return out
-}
-
-function record(v: unknown): Json | undefined {
-  return v !== null && typeof v === 'object' && !Array.isArray(v) ? (v as Json) : undefined
-}
-
 /**
  * Node's walk: `p/node_modules/name`, then the same under each ancestor
  * directory that is not itself a `node_modules`, then `node_modules/name`.

package/src/pnpm.ts

@@ -13,6 +13,7 @@
 
 import { reachDigests } from '@vzn/vx'
 import { pruneSections } from './blocks.js'
+import { record } from './json.js'
 import type { PruneScope } from './scope.js'
 
 export interface Lockfile {
@@ -59,11 +60,9 @@ export function parseLockfile(text: string): Lockfile {
   // with "regenerate it", which regenerates the same two documents.
   const parsed: unknown = Bun.YAML.parse(text)
   const docs = (Array.isArray(parsed) ? parsed : [parsed]).filter((d) => d !== null)
-  const doc = docs.at(-1) as Yaml | undefined
+  const doc = record(docs.at(-1))
   const leading = docs.slice(0, -1)
-  if (doc === undefined || typeof doc !== 'object' || Array.isArray(doc)) {
-    throw new Error('pnpm-lock.yaml: not a YAML document')
-  }
+  if (doc === undefined) throw new Error('pnpm-lock.yaml: not a YAML document')
   const version = scalar(doc['lockfileVersion'])
   const major = Number.parseInt(version, 10)
   if (!Number.isFinite(major) || major < 5) {
@@ -148,10 +147,6 @@ function scalar(v: unknown): string {
       : ''
 }
 
-function record(v: unknown): Yaml | undefined {
-  return v !== null && typeof v === 'object' && !Array.isArray(v) ? (v as Yaml) : undefined
-}
-
 /** JSON with sorted keys, so YAML key order cannot move a digest. */
 export function stable(v: unknown): string {
   return JSON.stringify(v, (_k, val: unknown) =>

package/src/prune.ts

@@ -25,6 +25,7 @@ import {
   type ProjectMeta,
 } from '@vzn/vx'
 import * as bunLock from './bun.js'
+import { record } from './json.js'
 import * as npmLock from './npm.js'
 import * as pnpmLock from './pnpm.js'
 import * as yarnLock from './yarn.js'
@@ -317,9 +318,7 @@ async function namedFiles(root: string, manifest: Record<string, unknown>): Prom
     const p = path.join(root, file)
     if (!(await exists(p))) return {}
     const doc: unknown = Bun.YAML.parse(await Bun.file(p).text())
-    return doc !== null && typeof doc === 'object' && !Array.isArray(doc)
-      ? (doc as Record<string, unknown>)
-      : {}
+    return record(doc) ?? {}
   }
   named.push(...values((await yaml('pnpm-workspace.yaml'))['patchedDependencies']))
   const yarnrc = await yaml('.yarnrc.yml')

package/src/yarn.ts

@@ -15,6 +15,7 @@ import path from 'node:path'
 import { reachDigests } from '@vzn/vx'
 import { stable } from './pnpm.js'
 import { pruneEntries, yamlKey } from './blocks.js'
+import { depsOf, record } from './json.js'
 import type { PruneScope } from './scope.js'
 
 export interface Lockfile {
@@ -45,8 +46,6 @@ export interface Entry {
   readonly resolution: string
 }
 
-type Json = Record<string, unknown>
-
 export function parseLockfile(text: string): Lockfile {
   const head = text.slice(0, 400)
   if (/^# yarn lockfile v1/m.test(head)) return parseClassic(text)
@@ -196,20 +195,6 @@ function unquote(s: string): string {
   return s.length >= 2 && s.startsWith('"') && s.endsWith('"') ? s.slice(1, -1) : s
 }
 
-function depsOf(e: Json, fields: readonly string[]): ReadonlyMap<string, string> {
-  const out = new Map<string, string>()
-  for (const field of fields) {
-    const deps = record(e[field])
-    if (deps === undefined) continue
-    for (const [name, spec] of Object.entries(deps)) out.set(name, String(spec))
-  }
-  return out
-}
-
-function record(v: unknown): Json | undefined {
-  return v !== null && typeof v === 'object' && !Array.isArray(v) ? (v as Json) : undefined
-}
-
 /**
  * `bar` + `npm:^2` → the entry keyed `bar@npm:^2`; classic: `bar@^2`. A
  * bare range gets berry's `npm:` prefix. A `workspace:` range resolves to