sqlmesh 0.183.1.dev2__tar.gz → 0.183.1.dev3__tar.gz

{sqlmesh-0.183.1.dev2 → sqlmesh-0.183.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.183.1.dev2
+Version: 0.183.1.dev3
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.183.1.dev2 → sqlmesh-0.183.1.dev3}/sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.183.1.dev2'
-__version_tuple__ = version_tuple = (0, 183, 1, 'dev2')
+__version__ = version = '0.183.1.dev3'
+__version_tuple__ = version_tuple = (0, 183, 1, 'dev3')

{sqlmesh-0.183.1.dev2 → sqlmesh-0.183.1.dev3}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.183.1.dev2
+Version: 0.183.1.dev3
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.183.1.dev2 → sqlmesh-0.183.1.dev3}/vscode/extension/src/commands/format.ts

@@ -1,5 +1,4 @@
 import { traceLog } from '../utilities/common/log'
-import { execSync } from 'child_process'
 import { sqlmeshExec } from '../utilities/sqlmesh/sqlmesh'
 import { err, isErr, ok, Result } from '@bus/result'
 import * as vscode from 'vscode'
@@ -10,6 +9,7 @@ import {
   handleSqlmeshLspDependenciesMissingError,
 } from '../utilities/errors'
 import { AuthenticationProviderTobikoCloud } from '../auth/auth'
+import { execAsync } from '../utilities/exec'
 
 export const format =
   (authProvider: AuthenticationProviderTobikoCloud) =>
@@ -37,22 +37,20 @@ export const format =
     vscode.window.showInformationMessage('Project formatted successfully')
   }
 
-const internalFormat = async (): Promise<Result<number, ErrorType>> => {
-  try {
-    const exec = await sqlmeshExec()
-    if (isErr(exec)) {
-      return exec
-    }
-    execSync(`${exec.value.bin} format`, {
-      encoding: 'utf-8',
-      cwd: exec.value.workspacePath,
-      env: exec.value.env,
-    })
-    return ok(0)
-  } catch (error: any) {
+const internalFormat = async (): Promise<Result<undefined, ErrorType>> => {
+  const exec = await sqlmeshExec()
+  if (isErr(exec)) {
+    return exec
+  }
+  const result = await execAsync(`${exec.value.bin}`, ['format'], {
+    cwd: exec.value.workspacePath,
+    env: exec.value.env,
+  })
+  if (result.exitCode !== 0) {
     return err({
       type: 'generic',
-      message: `Error executing sqlmesh format: ${error.message}`,
+      message: `Error executing sqlmesh format: ${result.stderr}`,
     })
   }
+  return ok(undefined)
 }

sqlmesh-0.183.1.dev3/vscode/extension/src/utilities/exec.ts

@@ -0,0 +1,69 @@
+import { exec, ExecOptions } from 'node:child_process'
+import { traceInfo } from './common/log'
+
+export interface ExecResult {
+  exitCode: number
+  stdout: string
+  stderr: string
+}
+
+export async function execAsync(
+  command: string,
+  args: string[] = [],
+  options: ExecOptions & { signal?: AbortSignal } = {},
+): Promise<ExecResult> {
+  const fullCmd = `${command} ${args.join(' ')}`
+  traceInfo(`Executing command: ${fullCmd}`)
+
+  try {
+    const result = await execAsyncCore(command, args, options)
+    traceInfo(
+      `Command ${fullCmd} exited with code ${result.exitCode}; stdout: ${result.stdout}; stderr: ${result.stderr}`,
+    )
+    return result
+  } catch (err) {
+    if ((err as any)?.name === 'AbortError') {
+      traceInfo(`Command ${fullCmd} was cancelled by AbortController`)
+    } else {
+      traceInfo(`Command ${fullCmd} failed: ${(err as Error).message}`)
+    }
+    throw err // keep original error semantics
+  }
+}
+
+function execAsyncCore(
+  command: string,
+  args: string[],
+  options: ExecOptions & { signal?: AbortSignal } = {},
+): Promise<ExecResult> {
+  return new Promise<ExecResult>((resolve, reject) => {
+    const child = exec(
+      `${command} ${args.join(' ')}`,
+      options,
+      (error, stdout, stderr) => {
+        if (error) {
+          // Forward AbortError unchanged so callers can detect cancellation
+          if ((error as NodeJS.ErrnoException).name === 'AbortError') {
+            reject(error)
+          } else {
+            resolve({
+              exitCode: typeof error.code === 'number' ? error.code : 1,
+              stdout,
+              stderr,
+            })
+          }
+          return
+        }
+
+        resolve({
+          exitCode: child.exitCode ?? 0,
+          stdout,
+          stderr,
+        })
+      },
+    )
+
+    // surface “spawn failed” errors that occur before the callback
+    child.once('error', reject)
+  })
+}

sqlmesh-0.183.1.dev2/vscode/extension/src/utilities/exec.ts

@@ -1,68 +0,0 @@
-import { exec, ExecOptions } from 'child_process'
-import { traceInfo } from './common/log'
-
-export interface ExecResult {
-  exitCode: number
-  stdout: string
-  stderr: string
-}
-
-export interface CancellableExecOptions extends ExecOptions {
-  /** When `abort()` is called on this signal the child process is killed. */
-  signal?: AbortSignal
-}
-
-export function execAsync(
-  command: string,
-  args: string[],
-  options: CancellableExecOptions = {},
-): Promise<ExecResult> {
-  return new Promise((resolve, reject) => {
-    // Pass the signal straight through to `exec`
-    traceInfo(`Executing command: ${command} ${args.join(' ')}`)
-    const child = exec(
-      `${command} ${args.join(' ')}`,
-      options,
-      (error, stdout, stderr) => {
-        if (error) {
-          resolve({
-            exitCode: typeof error.code === 'number' ? error.code : 1,
-            stdout,
-            stderr,
-          })
-          return
-        }
-
-        resolve({
-          exitCode: child.exitCode ?? 0,
-          stdout,
-          stderr,
-        })
-      },
-    )
-
-    /* ----------  Tie the Promise life‑cycle to the AbortSignal ---------- */
-
-    if (options.signal) {
-      // If the caller aborts: kill the child and reject the promise
-      const onAbort = () => {
-        // `SIGTERM` is the default; use `SIGKILL` if you need something stronger
-        child.kill()
-        reject(new Error('Process cancelled'))
-      }
-
-      if (options.signal.aborted) {
-        onAbort()
-        return
-      }
-      options.signal.addEventListener('abort', onAbort, { once: true })
-
-      // Clean‑up the event listener when the promise settles
-      const cleanup = () => {
-        options.signal!.removeEventListener('abort', onAbort)
-      }
-      child.once('exit', cleanup)
-      child.once('error', cleanup)
-    }
-  })
-}