diff --git a/ft_build/compiler/index.ts b/ft_build/compiler/index.ts index fdaea8e3..72dddb1b 100644 --- a/ft_build/compiler/index.ts +++ b/ft_build/compiler/index.ts @@ -34,10 +34,17 @@ export default async function generateConfig( await addPackages(requiredDependencies.map((p: any) => ({ name: p }))); } - await asyncExecute( + const isFunctionConfigValid = await asyncExecute( "cd build/functions/src; tsc functionConfig.ts", - commandErrorHandler({ user }) + commandErrorHandler({ + user, + functionConfigTs: configFile, + description: `Invalid compiled functionConfig.ts`, + }) ); + if (!isFunctionConfigValid) { + return false; + } const { sparksConfig } = require("../functions/src/functionConfig.js"); const requiredSparks = sparksConfig.map((s: any) => s.type); diff --git a/ft_build/compiler/terminal.ts b/ft_build/compiler/terminal.ts index 545af158..475bcbe1 100644 --- a/ft_build/compiler/terminal.ts +++ b/ft_build/compiler/terminal.ts @@ -13,7 +13,7 @@ export const asyncExecute = async (command: string, callback: any) => child.exec(command, async function (error, stdout, stderr) { console.log({ error, stdout, stderr }); await callback(error, stdout, stderr); - resolve(true); + resolve(!error); }); }); diff --git a/ft_build/utils.ts b/ft_build/utils.ts index 5996d33f..0d0725cd 100644 --- a/ft_build/utils.ts +++ b/ft_build/utils.ts @@ -15,7 +15,7 @@ function firetableUser(user: admin.auth.UserRecord) { export function commandErrorHandler(meta: { user: admin.auth.UserRecord; description?: string; - combiledScript?: string; + functionConfigTs?: string; sparksConfig?: string; }) { return async function (error, stdout, stderr) { @@ -32,7 +32,7 @@ export function commandErrorHandler(meta: { errorStackTrace: error?.stack ?? "", command: error?.cmd ?? "", description: meta?.description ?? "", - combiledScript: meta?.combiledScript ?? "", + functionConfigTs: meta?.functionConfigTs ?? "", sparksConfig: meta?.sparksConfig ?? "", };