initial refactor

app/src/ui/modules/flows/components/TriggerComponent.tsx

@@ -1,11 +1,10 @@
 import { Handle, type Node, type NodeProps, Position } from "@xyflow/react";
-import { Const, transformObject } from "core/utils";
+import { transformObject } from "core/utils";
 import { type Trigger, TriggerMap } from "flows";
 import type { IconType } from "react-icons";
 import { TbCircleLetterT } from "react-icons/tb";
 import { JsonSchemaForm } from "ui/components/form/json-schema";
-import * as tbbox from "@sinclair/typebox";
-const { Type } = tbbox;
+import { s } from "core/object/schema";
 
 export type TaskComponentProps = NodeProps<Node<{ trigger: Trigger }>> & {
    Icon?: IconType;
@@ -14,9 +13,9 @@ export type TaskComponentProps = NodeProps<Node<{ trigger: Trigger }>> & {
 
 const triggerSchemas = Object.values(
    transformObject(TriggerMap, (trigger, name) =>
-      Type.Object(
+      s.object(
          {
-            type: Const(name),
+            type: s.literal(name),
             config: trigger.cls.schema,
          },
          { title: String(name), additionalProperties: false },
@@ -47,7 +46,7 @@ export function TriggerComponent({
             <div className="flex flex-col gap-2 px-3 py-2">
                <JsonSchemaForm
                   className="legacy"
-                  schema={Type.Union(triggerSchemas)}
+                  schema={s.anyOf(triggerSchemas)}
                   onChange={console.log}
                   formData={trigger}
                   {...props}

app/src/ui/modules/flows/components2/nodes/tasks/FetchTaskNode.tsx

@@ -1,30 +1,25 @@
-import { typeboxResolver } from "@hookform/resolvers/typebox";
-import { Input, NativeSelect, Select, TextInput } from "@mantine/core";
+import { Input, TextInput } from "@mantine/core";
 import { useToggle } from "@mantine/hooks";
 import { IconMinus, IconPlus, IconWorld } from "@tabler/icons-react";
 import type { Node, NodeProps } from "@xyflow/react";
-import type { Static } from "core/utils";
+import { s } from "core/object/schema";
 import { FetchTask } from "flows";
-import { useRef, useState } from "react";
+import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { Button } from "ui/components/buttons/Button";
 import { JsonViewer } from "ui/components/code/JsonViewer";
 import { SegmentedControl } from "ui/components/form/SegmentedControl";
 import { MantineSelect } from "ui/components/form/hook-form-mantine/MantineSelect";
-import { type TFlowNodeData, useFlowSelector } from "../../../hooks/use-flow";
+import type { TFlowNodeData } from "../../../hooks/use-flow";
 import { KeyValueInput } from "../../form/KeyValueInput";
 import { BaseNode } from "../BaseNode";
-import * as tbbox from "@sinclair/typebox";
-const { Type } = tbbox;
 
-const schema = Type.Composite([
-   FetchTask.schema,
-   Type.Object({
-      query: Type.Optional(Type.Record(Type.String(), Type.String())),
-   }),
-]);
+const schema = s.object({
+   query: s.record(s.string()).optional(),
+   ...FetchTask.schema.properties,
+});
 
-type TFetchTaskSchema = Static<typeof FetchTask.schema>;
+type TFetchTaskSchema = s.Static<typeof FetchTask.schema>;
 type FetchTaskFormProps = NodeProps<Node<TFlowNodeData>> & {
    params: TFetchTaskSchema;
    onChange: (params: any) => void;
@@ -42,8 +37,9 @@ export function FetchTaskForm({ onChange, params, ...props }: FetchTaskFormProps
       watch,
       control,
    } = useForm({
-      resolver: typeboxResolver(schema),
-      defaultValues: params as Static<typeof schema>,
+      // @todo: add resolver
+      //resolver: typeboxResolver(schema),
+      defaultValues: params as s.Static<typeof schema>,
       mode: "onChange",
       //defaultValues: (state.relations?.create?.[0] ?? {}) as Static<typeof schema>
    });

app/src/ui/modules/flows/components2/nodes/tasks/TaskNode.tsx

@@ -1,14 +1,10 @@
-import { TypeRegistry } from "@sinclair/typebox";
 import { type Node, type NodeProps, Position } from "@xyflow/react";
-import { registerCustomTypeboxKinds } from "core/utils";
 import type { TAppFlowTaskSchema } from "flows/AppFlows";
 import { useFlowCanvas, useFlowSelector } from "../../../hooks/use-flow";
 import { Handle } from "../Handle";
 import { FetchTaskForm } from "./FetchTaskNode";
 import { RenderNode } from "./RenderNode";
 
-registerCustomTypeboxKinds(TypeRegistry);
-
 const TaskComponents = {
    fetch: FetchTaskForm,
    render: RenderNode,

app/src/ui/modules/flows/components2/nodes/triggers/TriggerNode.tsx

@@ -1,7 +1,6 @@
-import { typeboxResolver } from "@hookform/resolvers/typebox";
 import { TextInput } from "@mantine/core";
 import type { Node, NodeProps } from "@xyflow/react";
-import { Const, type Static, registerCustomTypeboxKinds, transformObject } from "core/utils";
+import { transformObject } from "core/utils";
 import { TriggerMap } from "flows";
 import type { TAppFlowTriggerSchema } from "flows/AppFlows";
 import { useForm } from "react-hook-form";
@@ -11,22 +10,18 @@ import { MantineSelect } from "ui/components/form/hook-form-mantine/MantineSelec
 import { useFlowCanvas, useFlowSelector } from "../../../hooks/use-flow";
 import { BaseNode } from "../BaseNode";
 import { Handle } from "../Handle";
-import * as tb from "@sinclair/typebox";
-const { Type, TypeRegistry } = tb;
+import { s } from "core/object/schema";
 
-// @todo: check if this could become an issue
-registerCustomTypeboxKinds(TypeRegistry);
-
-const schema = Type.Object({
-   trigger: Type.Union(
+const schema = s.object({
+   trigger: s.anyOf(
       Object.values(
          transformObject(TriggerMap, (trigger, name) =>
-            Type.Object(
+            s.strictObject(
                {
-                  type: Const(name),
+                  type: s.literal(name),
                   config: trigger.cls.schema,
                },
-               { title: String(name), additionalProperties: false },
+               { title: String(name) },
             ),
          ),
       ),
@@ -50,13 +45,14 @@ export const TriggerNode = (props: NodeProps<Node<TAppFlowTriggerSchema & { labe
       watch,
       control,
    } = useForm({
-      resolver: typeboxResolver(schema),
-      defaultValues: { trigger: state } as Static<typeof schema>,
+      // @todo: add resolver
+      //resolver: typeboxResolver(schema),
+      defaultValues: { trigger: state } as s.Static<typeof schema>,
       mode: "onChange",
    });
    const data = watch("trigger");
 
-   async function onSubmit(data: Static<typeof schema>) {
+   async function onSubmit(data: s.Static<typeof schema>) {
       console.log("submit", data.trigger);
       // @ts-ignore
       await actions.trigger.update(data.trigger);

app/src/ui/modules/flows/hooks/use-flow/index.tsx

@@ -46,7 +46,7 @@ export const flowStateAtom = atom<TFlowState>({
 
 const FlowCanvasContext = createContext<FlowContextType>(undefined!);
 
-const DEFAULT_FLOW = { trigger: {}, tasks: {}, connections: {} };
+const DEFAULT_FLOW: TAppFlowSchema = { trigger: { type: "manual" }, tasks: {}, connections: {} };
 export function FlowCanvasProvider({ children, name }: { children: any; name?: string }) {
    //const [dirty, setDirty] = useState(false);
    const setFlowState = useSetAtom(flowStateAtom);
@@ -71,7 +71,7 @@ export function FlowCanvasProvider({ children, name }: { children: any; name?: s
          update: async (trigger: TAppFlowTriggerSchema | any) => {
             console.log("update trigger", trigger);
             setFlowState((state) => {
-               const flow = state.flow || DEFAULT_FLOW;
+               const flow = state.flow || (DEFAULT_FLOW as any);
                return { ...state, dirty: true, flow: { ...flow, trigger } };
             });
             //return s.actions.patch("flows", `flows.flows.${name}`, { trigger });