@teamkeel/functions-runtime 0.413.3 → 0.413.5

package/dist/index.d.cts

@@ -497,7 +497,7 @@ interface BaseInputConfig<T> {
     helpText?: string;
     optional?: boolean;
     disabled?: boolean;
-    validate?: (data: T) => Promise<boolean | string>;
+    validate?: (data: T) => Promise<null | string> | string | null;
 }
 interface BaseUiInputResponse<K, TData> {
     __type: K;
@@ -507,6 +507,7 @@ interface BaseUiInputResponse<K, TData> {
     helpText?: string;
     optional?: boolean;
     disabled?: boolean;
+    validationError?: string;
 }
 interface BaseUiDisplayResponse<K> {
     __type: K;
@@ -557,18 +558,24 @@ interface FlowConfig {
     title?: string;
     description?: string;
 }
+interface FlowConfigAPI {
+    stages?: StageConfigObject[];
+    title: string;
+    description?: string;
+}
 type FlowFunction<C extends FlowConfig, I extends any = {}> = (ctx: FlowContext<C>, inputs: I) => Promise<void>;
 type ExtractStageKeys<T extends FlowConfig> = T extends {
     stages: infer S;
 } ? S extends ReadonlyArray<infer U> ? U extends string ? U : U extends {
     key: infer K extends string;
 } ? K : never : never : never;
-type StageConfig = string | {
+type StageConfigObject = {
     key: string;
     name: string;
     description?: string;
     initiallyHidden?: boolean;
 };
+type StageConfig = string | StageConfigObject;
 declare function createFlowContext<C extends FlowConfig>(runId: string, data: any, spanId: string): FlowContext<C>;
 
 declare function ksuid(): string;
@@ -739,4 +746,4 @@ type dateDuration = `${number}Y${number}M${number}D` | `${number}Y${number}M` |
 type timeDuration = `${number}H${number}M${number}S` | `${number}H${number}M` | `${number}M${number}S` | `${number}H${number}S` | `${number}H` | `${number}M` | `${number}S`;
 type DurationString = `P${dateDuration}T${timeDuration}` | `P${dateDuration}` | `PT${timeDuration}`;
 
-export { type BooleanArrayQueryWhereCondition, type BooleanArrayWhereCondition, type BooleanWhereCondition, type ContextAPI, type DateArrayQueryWhereCondition, type DateArrayWhereCondition, type DateQueryInput, type DateWhereCondition, Duration, type DurationString, type DurationWhereCondition, ErrorPresets, type Errors, type ExtractStageKeys, File, type FlowConfig, type FlowContext, type FlowFunction, type FuncWithConfig, type FunctionConfig, type IDWhereCondition, InlineFile, ModelAPI, type NumberArrayQueryWhereCondition, type NumberArrayWhereCondition, type NumberWhereCondition, PERMISSION_STATE, type PageInfo, Permissions, type RelativeDateString, RequestHeaders, type Response, type SortDirection, type Step, type StringArrayQueryWhereCondition, type StringArrayWhereCondition, type StringWhereCondition, type TimestampQueryInput, type UI, type UIApiResponses, checkBuiltInPermissions, createFlowContext, handleFlow, handleJob, handleRequest, handleRoute, handleSubscriber, ksuid, tracing, useDatabase };
+export { type BooleanArrayQueryWhereCondition, type BooleanArrayWhereCondition, type BooleanWhereCondition, type ContextAPI, type DateArrayQueryWhereCondition, type DateArrayWhereCondition, type DateQueryInput, type DateWhereCondition, Duration, type DurationString, type DurationWhereCondition, ErrorPresets, type Errors, type ExtractStageKeys, File, type FlowConfig, type FlowConfigAPI, type FlowContext, type FlowFunction, type FuncWithConfig, type FunctionConfig, type IDWhereCondition, InlineFile, ModelAPI, type NumberArrayQueryWhereCondition, type NumberArrayWhereCondition, type NumberWhereCondition, PERMISSION_STATE, type PageInfo, Permissions, type RelativeDateString, RequestHeaders, type Response, type SortDirection, type Step, type StringArrayQueryWhereCondition, type StringArrayWhereCondition, type StringWhereCondition, type TimestampQueryInput, type UI, type UIApiResponses, checkBuiltInPermissions, createFlowContext, handleFlow, handleJob, handleRequest, handleRoute, handleSubscriber, ksuid, tracing, useDatabase };

package/dist/index.d.ts

@@ -497,7 +497,7 @@ interface BaseInputConfig<T> {
     helpText?: string;
     optional?: boolean;
     disabled?: boolean;
-    validate?: (data: T) => Promise<boolean | string>;
+    validate?: (data: T) => Promise<null | string> | string | null;
 }
 interface BaseUiInputResponse<K, TData> {
     __type: K;
@@ -507,6 +507,7 @@ interface BaseUiInputResponse<K, TData> {
     helpText?: string;
     optional?: boolean;
     disabled?: boolean;
+    validationError?: string;
 }
 interface BaseUiDisplayResponse<K> {
     __type: K;
@@ -557,18 +558,24 @@ interface FlowConfig {
     title?: string;
     description?: string;
 }
+interface FlowConfigAPI {
+    stages?: StageConfigObject[];
+    title: string;
+    description?: string;
+}
 type FlowFunction<C extends FlowConfig, I extends any = {}> = (ctx: FlowContext<C>, inputs: I) => Promise<void>;
 type ExtractStageKeys<T extends FlowConfig> = T extends {
     stages: infer S;
 } ? S extends ReadonlyArray<infer U> ? U extends string ? U : U extends {
     key: infer K extends string;
 } ? K : never : never : never;
-type StageConfig = string | {
+type StageConfigObject = {
     key: string;
     name: string;
     description?: string;
     initiallyHidden?: boolean;
 };
+type StageConfig = string | StageConfigObject;
 declare function createFlowContext<C extends FlowConfig>(runId: string, data: any, spanId: string): FlowContext<C>;
 
 declare function ksuid(): string;
@@ -739,4 +746,4 @@ type dateDuration = `${number}Y${number}M${number}D` | `${number}Y${number}M` |
 type timeDuration = `${number}H${number}M${number}S` | `${number}H${number}M` | `${number}M${number}S` | `${number}H${number}S` | `${number}H` | `${number}M` | `${number}S`;
 type DurationString = `P${dateDuration}T${timeDuration}` | `P${dateDuration}` | `PT${timeDuration}`;
 
-export { type BooleanArrayQueryWhereCondition, type BooleanArrayWhereCondition, type BooleanWhereCondition, type ContextAPI, type DateArrayQueryWhereCondition, type DateArrayWhereCondition, type DateQueryInput, type DateWhereCondition, Duration, type DurationString, type DurationWhereCondition, ErrorPresets, type Errors, type ExtractStageKeys, File, type FlowConfig, type FlowContext, type FlowFunction, type FuncWithConfig, type FunctionConfig, type IDWhereCondition, InlineFile, ModelAPI, type NumberArrayQueryWhereCondition, type NumberArrayWhereCondition, type NumberWhereCondition, PERMISSION_STATE, type PageInfo, Permissions, type RelativeDateString, RequestHeaders, type Response, type SortDirection, type Step, type StringArrayQueryWhereCondition, type StringArrayWhereCondition, type StringWhereCondition, type TimestampQueryInput, type UI, type UIApiResponses, checkBuiltInPermissions, createFlowContext, handleFlow, handleJob, handleRequest, handleRoute, handleSubscriber, ksuid, tracing, useDatabase };
+export { type BooleanArrayQueryWhereCondition, type BooleanArrayWhereCondition, type BooleanWhereCondition, type ContextAPI, type DateArrayQueryWhereCondition, type DateArrayWhereCondition, type DateQueryInput, type DateWhereCondition, Duration, type DurationString, type DurationWhereCondition, ErrorPresets, type Errors, type ExtractStageKeys, File, type FlowConfig, type FlowConfigAPI, type FlowContext, type FlowFunction, type FuncWithConfig, type FunctionConfig, type IDWhereCondition, InlineFile, ModelAPI, type NumberArrayQueryWhereCondition, type NumberArrayWhereCondition, type NumberWhereCondition, PERMISSION_STATE, type PageInfo, Permissions, type RelativeDateString, RequestHeaders, type Response, type SortDirection, type Step, type StringArrayQueryWhereCondition, type StringArrayWhereCondition, type StringWhereCondition, type TimestampQueryInput, type UI, type UIApiResponses, checkBuiltInPermissions, createFlowContext, handleFlow, handleJob, handleRequest, handleRoute, handleSubscriber, ksuid, tracing, useDatabase };

package/dist/index.js

@@ -2290,7 +2290,7 @@ async function handleRoute(request, config) {
 }
 __name(handleRoute, "handleRoute");
 
-// src/handleFlow.js
+// src/handleFlow.ts
 import {
   createJSONRPCErrorResponse as createJSONRPCErrorResponse6,
   createJSONRPCSuccessResponse as createJSONRPCSuccessResponse5,
@@ -2417,18 +2417,39 @@ var selectOne = /* @__PURE__ */ __name((name, options) => {
 }, "selectOne");
 
 // src/flows/ui/page.ts
-var page = /* @__PURE__ */ __name((options) => {
+async function page(options, data) {
   const content = options.content;
-  const contentUiConfig = content.map((c) => c.uiConfig).filter(Boolean);
+  let hasValidationErrors = false;
+  const contentUiConfig = await Promise.all(
+    content.map(async (c) => {
+      const isInput = "__type" in c && c.__type == "input";
+      const hasData = data && c.uiConfig.name in data;
+      if (isInput && hasData && c.validate) {
+        const validationError = await c.validate(data[c.uiConfig.name]);
+        if (typeof validationError === "string") {
+          hasValidationErrors = true;
+          return {
+            ...c.uiConfig,
+            validationError
+          };
+        }
+      }
+      return c.uiConfig;
+    }).filter(Boolean)
+  );
   return {
-    __type: "ui.page",
-    stage: options.stage,
-    title: options.title,
-    description: options.description,
-    content: contentUiConfig,
-    actions: options.actions
+    page: {
+      __type: "ui.page",
+      stage: options.stage,
+      title: options.title,
+      description: options.description,
+      content: contentUiConfig,
+      actions: options.actions
+    },
+    hasValidationErrors
   };
-}, "page");
+}
+__name(page, "page");
 
 // src/flows/disrupts.ts
 var FlowDisrupt = class {
@@ -2642,10 +2663,14 @@ function createFlowContext(runId, data, spanId) {
             type: "UI" /* UI */,
             startTime: /* @__PURE__ */ new Date()
           }).returningAll().executeTakeFirst();
-          throw new UIRenderDisrupt(step?.id, page(options));
+          throw new UIRenderDisrupt(step?.id, (await page(options, null)).page);
         }
         if (!data) {
-          throw new UIRenderDisrupt(step?.id, page(options));
+          throw new UIRenderDisrupt(step?.id, (await page(options, null)).page);
+        }
+        const p = await page(options, data);
+        if (p.hasValidationErrors) {
+          throw new UIRenderDisrupt(step?.id, p.page);
         }
         await db.updateTable("keel.flow_step").set({
           status: "COMPLETED" /* COMPLETED */,
@@ -2692,7 +2717,8 @@ function withTimeout(promiseFn, timeout) {
 }
 __name(withTimeout, "withTimeout");
 
-// src/handleFlow.js
+// src/handleFlow.ts
+import { sentenceCase } from "change-case";
 async function handleFlow(request, config) {
   const activeContext = opentelemetry6.propagation.extract(
     opentelemetry6.context.active(),
@@ -2733,7 +2759,20 @@ async function handleFlow(request, config) {
           span.spanContext().spanId
         );
         const flowFunction = flows[request.method].fn;
-        flowConfig = flows[request.method].config;
+        const rawFlowConfig = flows[request.method].config;
+        flowConfig = {
+          ...rawFlowConfig,
+          title: rawFlowConfig.title || sentenceCase(request.method || "flow"),
+          stages: rawFlowConfig.stages?.map((stage) => {
+            if (typeof stage === "string") {
+              return {
+                key: stage,
+                name: stage
+              };
+            }
+            return stage;
+          })
+        };
         const inputs = parseInputs(flowRun.input);
         try {
           await tryExecuteFlow(db, async () => {
@@ -2758,7 +2797,7 @@ async function handleFlow(request, config) {
           span.recordException(e);
           span.setStatus({
             code: opentelemetry6.SpanStatusCode.ERROR,
-            message: e.message
+            message: e instanceof Error ? e.message : "unknown error"
           });
           if (e instanceof ExhuastedRetriesDisrupt) {
             return createJSONRPCSuccessResponse5(request.id, {
@@ -2771,7 +2810,7 @@ async function handleFlow(request, config) {
           return createJSONRPCSuccessResponse5(request.id, {
             runId,
             runCompleted: true,
-            error: e.message,
+            error: e instanceof Error ? e.message : "unknown error",
             config: flowConfig
           });
         }