@vzn/vx 0.0.639 → 0.0.641

package/src/workspace/migration.ts

@@ -67,7 +67,7 @@ const QUOTE_ARGS =
   `vx_r="$vx_r\${vx_s%%"$vx_q"*}'\\''"; vx_s=\${vx_s#*"$vx_q"};; *) break;; esac; done; ` +
   `vx_a="$vx_a '$vx_r$vx_s'"; done`
 
-const isCacheTodo = (todo: string): boolean => todo.startsWith('cache: add `cache: {')
+const isCacheTodo = (todo: string): boolean => todo.startsWith('cache: add `inputs: {')
 
 /** The one wording every mapper emits for a task it made persistent. */
 export const PERSISTENT_TODO =
@@ -426,7 +426,7 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   }
 
   // The lock's own words become a row; a refusal prints above the report.
-  const lock = dry || args.lock === undefined ? undefined : await args.lock(root)
+  const lock = dry || args.lock === undefined ? undefined : lockAnswer(await args.lock(root))
   if (lock !== undefined && lock.code !== 0) process.stderr.write(lock.said)
 
   const rows: ui.FieldRow[] = [['from', source]]
@@ -488,6 +488,22 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   return 0
 }
 
+/**
+ * The lock step's answer, checked: the tool calling this seam is another
+ * package and may be another version (vx-migrate 0.0.637's answered its
+ * exit code, which crashed the report).
+ */
+function lockAnswer(answer: unknown): { code: number; said: string } {
+  const a = answer as { code?: unknown; said?: unknown } | null
+  if (
+    typeof a === 'object' &&
+    a !== null &&
+    typeof a.code === 'number' &&
+    typeof a.said === 'string'
+  )
+    return { code: a.code, said: a.said }
+  return { code: 1, said: 'vx lock: the migration tool answered no result: run `vx lock`\n' }
+}
 /**
  * What to do about written files .gitignore drops. A `!file` line cures a
  * file, but git re-includes nothing inside an ignored directory: an
@@ -624,7 +640,7 @@ const EXAMPLE_BODY = `export default {
     build: {
       exec: { command: 'tsc -b' },
       dependsOn: ['^build'],
-      cache: { inputs: { files: ['src/**'] }, outputs: { files: ['dist/**'] } },
+      inputs: { files: ['src/**'] }, cache: { outputs: { files: ['dist/**'] } },
     },
   },
 }`

package/src/workspace/project-loader.ts

@@ -75,8 +75,9 @@ let serving = false
 const HELD_QUERY = /\?vx-(?:held|literal)=([0-9a-f]+)$/
 
 // Bun's resolver reads `\` as a separator, even in a file: URL, so a
-// config under `a\b` was looked for under `a/b`. Resolving it here keeps
-// the path as written; only the served load can take it.
+// config under `a\b` was looked for under `a/b`, and `?` as a query, so
+// one under `a?b` was looked for under `a`. Resolving it here keeps the
+// path as written; only the served load can take it.
 const LITERAL_QUERY = /\?vx-literal=[0-9a-f]+$/
 
 function serveHeldSources(): void {
@@ -148,14 +149,14 @@ async function loadDefaultExport(
   // URL yet, and a repeat load (the one that could replay an evaluation
   // made under earlier env values) re-evaluates in a worker instead
   // (`loadedConfigs`, item 678).
-  const literal = configPath.includes('\\')
+  const literal = /[\\?]/.test(configPath)
   const source =
     kind === 'Project' || literal
       ? servableSource(bytes, /\.[cm]?ts$/.test(configPath) ? 'ts' : 'js')
       : null
   if (literal && source === null) {
     throw new UserError(
-      `${kind} config ${configPath} sits under a path that holds a backslash, which Bun loads only as an ES module in UTF-8`,
+      `${kind} config ${configPath} sits under a path that holds ${configPath.includes('\\') ? 'a backslash' : 'a question mark'}, which Bun loads only as an ES module in UTF-8`,
     )
   }
   const hash = xxh3hex(bytes)