@smoothbricks/cli 0.10.0 → 0.10.2

package/src/release/__tests__/helpers/fixture-repo.ts

@@ -82,9 +82,14 @@ export async function writeBuildablePackage(
   );
 }
 
-export async function git(root: string, args: string[], env?: Record<string, string>): Promise<void> {
-  const result = await gitResult(root, args, env);
-  if (result.exitCode !== 0) {
+export async function git(
+  root: string,
+  args: string[],
+  env?: Record<string, string>,
+  timeoutMs = GIT_TIMEOUT_MS,
+): Promise<void> {
+  const result = await gitResult(root, args, env, timeoutMs);
+  if (result.timedOut || result.exitCode !== 0) {
     throw new Error(gitErrorMessage(root, args, result));
   }
 }
@@ -101,9 +106,15 @@ export async function gitSucceeds(root: string, args: string[]): Promise<boolean
   return (await gitResult(root, args)).exitCode === 0;
 }
 
-async function gitResult(root: string, args: string[], env?: Record<string, string>): Promise<GitResult> {
+async function gitResult(
+  root: string,
+  args: string[],
+  env?: Record<string, string>,
+  timeoutMs = GIT_TIMEOUT_MS,
+): Promise<GitResult> {
   const proc = Bun.spawn(['git', ...args], {
     cwd: root,
+    detached: true,
     env: { ...process.env, ...GIT_FIXTURE_ENV, ...env },
     stdout: 'pipe',
     stderr: 'pipe',
@@ -111,15 +122,23 @@ async function gitResult(root: string, args: string[], env?: Record<string, stri
   let timedOut = false;
   const timeout = setTimeout(() => {
     timedOut = true;
-    proc.kill();
-  }, GIT_TIMEOUT_MS);
+    try {
+      // `git` may exit after spawning a transport or hook which still owns its
+      // pipes. Killing the detached process group closes every inherited pipe.
+      process.kill(-proc.pid, 'SIGKILL');
+    } catch (error) {
+      if (!(error instanceof Error && 'code' in error && error.code === 'ESRCH')) {
+        proc.kill('SIGKILL');
+      }
+    }
+  }, timeoutMs);
   try {
     const [exitCode, stdout, stderr] = await Promise.all([
       proc.exited,
       streamBytes(proc.stdout),
       streamBytes(proc.stderr),
     ]);
-    return { exitCode, stdout, stderr, timedOut };
+    return { exitCode, stdout, stderr, timedOut, timeoutMs };
   } finally {
     clearTimeout(timeout);
   }
@@ -151,12 +170,13 @@ interface GitResult {
   stdout: Uint8Array;
   stderr: Uint8Array;
   timedOut: boolean;
+  timeoutMs: number;
 }
 
 function gitErrorMessage(root: string, args: string[], result: GitResult): string {
   const stderr = new TextDecoder().decode(result.stderr).trim();
   const timeoutText = result.timedOut
-    ? ` timed out after ${GIT_TIMEOUT_MS}ms`
+    ? ` timed out after ${result.timeoutMs}ms`
     : ` failed with exit code ${result.exitCode}`;
   return [`git ${args.join(' ')}${timeoutText}`, `cwd: ${root}`, stderr].filter(Boolean).join('\n');
 }

package/src/wrangler/prepare-env.ts

@@ -60,7 +60,13 @@ function kvIn(toml: string, table: AST.TOMLTable, key: string): AST.TOMLKeyValue
 }
 
 /** The `<field>` KV of the `[[env.<env>.<arrayKey>]]` table whose `binding` matches, or null. */
-function arrayTableKv(toml: string, env: string, arrayKey: string, binding: string, field: string): AST.TOMLKeyValue | null {
+function arrayTableKv(
+  toml: string,
+  env: string,
+  arrayKey: string,
+  binding: string,
+  field: string,
+): AST.TOMLKeyValue | null {
   const block = envRecord(toml, env);
   const rows = isRecord(block) && Array.isArray(block[arrayKey]) ? block[arrayKey] : [];
   const index = rows.findIndex((r) => isRecord(r) && r.binding === binding);
@@ -173,7 +179,8 @@ export function getD1Name(toml: string, env: string, binding: string): string |
   const block = envRecord(toml, env);
   const rows = isRecord(block) && Array.isArray(block.d1_databases) ? block.d1_databases : [];
   for (const row of rows) {
-    if (isRecord(row) && row.binding === binding && typeof row.database_name === 'string') return row.database_name || null;
+    if (isRecord(row) && row.binding === binding && typeof row.database_name === 'string')
+      return row.database_name || null;
   }
   return null;
 }
@@ -193,7 +200,10 @@ export function blankD1Ids(toml: string, env: string): string {
 /** Blank one field across every `[[env.<env>.<arrayKey>]]` table (value..EOL -> `""`). */
 function blankArrayField(toml: string, env: string, arrayKey: string, field: string): string {
   const edits = tables(toml)
-    .filter((t) => t.kind === 'array' && t.resolvedKey[0] === 'env' && t.resolvedKey[1] === env && t.resolvedKey[2] === arrayKey)
+    .filter(
+      (t) =>
+        t.kind === 'array' && t.resolvedKey[0] === 'env' && t.resolvedKey[1] === env && t.resolvedKey[2] === arrayKey,
+    )
     .map((t) => kvIn(toml, t, field))
     .flatMap((kv) => (kv ? [{ start: kv.value.range[0], end: endOfLine(toml, kv.value.range[1]) }] : []));
   return applyBlanks(toml, edits);
@@ -332,7 +342,7 @@ export async function ensureNamespace(logical: string, existing: KvNamespace[],
   try {
     await $`bunx wrangler kv namespace create ${logical}`.cwd(cwd).quiet();
   } catch (err) {
-    return errText(err).includes('already') ? (await reList(logical, cwd)) : null;
+    return errText(err).includes('already') ? await reList(logical, cwd) : null;
   }
   return reList(logical, cwd);
 }

package/src/wrangler/scaffold.ts

@@ -16,7 +16,10 @@ export interface ScaffoldOptions {
 }
 
 /** Locate a workspace package by nx name, package name, or relative path; must have a wrangler.toml. */
-function resolveProject(root: string, project: string): { dir: string; label: string; packageJsonPath: string; json: Record<string, unknown> } {
+function resolveProject(
+  root: string,
+  project: string,
+): { dir: string; label: string; packageJsonPath: string; json: Record<string, unknown> } {
   const manifests = getWorkspacePackageManifests(root);
   const match = manifests.find((m) => {
     const nx = recordProperty(m.json, 'nx');
@@ -83,7 +86,7 @@ async function checkMode(env: string): Promise<void> {
   for (const binding of kvBindings) {
     const inToml = pe.getKvId(toml, env, binding);
     const liveId = live.find((n) => n.title === kvTitle(binding, env))?.id ?? null;
-    p.log.message(\`  KV \${binding}: \${!liveId ? '✗ not created' : inToml === liveId ? \`✓ \${liveId}\` : \`⚠ drift (live \${liveId}, toml \${inToml ?? 'unset'})\`}\`);
+    p.log.message(\`  KV \${binding}: \${!liveId ? '✗ not created' : inToml === liveId ? \`✓ \${liveId}\` : \`! drift (live \${liveId}, toml \${inToml ?? 'unset'})\`}\`);
   }
   for (const name of vars) {
     p.log.message(\`  var \${name}: \${pe.getVar(toml, env, name) ? '✓ set' : '✗ empty'}\`);
@@ -234,6 +237,8 @@ export function scaffold(root: string, project: string, options: ScaffoldOptions
     console.log(`updated       ${label}/package.json prepare-env target`);
   }
 
-  console.log(`\nnext: fill secret NAMES in ${label}/.dev.vars.example, then\n  bunx nx run ${project}:prepare-env -- <env>`);
+  console.log(
+    `\nnext: fill secret NAMES in ${label}/.dev.vars.example, then\n  bunx nx run ${project}:prepare-env -- <env>`,
+  );
   return scriptPath;
 }