added validator for rjsf, hook form via standard schema

app/src/ui/components/form/json-schema/JsonSchemaForm.tsx

@@ -5,10 +5,10 @@ import { cloneDeep } from "lodash-es";
 import { forwardRef, useId, useImperativeHandle, useRef, useState } from "react";
 import { fields as Fields } from "./fields";
 import { templates as Templates } from "./templates";
-import { RJSFTypeboxValidator } from "./typebox/RJSFTypeboxValidator";
 import { widgets as Widgets } from "./widgets";
+import { JsonvTsValidator } from "./JsonvTsValidator";
 
-const validator = new RJSFTypeboxValidator();
+const validator = new JsonvTsValidator();
 
 // @todo: don't import FormProps, instead, copy it here instead of "any"
 export type JsonSchemaFormProps = any & {

app/src/ui/components/form/json-schema/JsonSchemaValidator.ts

@@ -1,121 +0,0 @@
-import { type OutputUnit, Validator } from "@cfworker/json-schema";
-import type {
-   CustomValidator,
-   ErrorSchema,
-   ErrorTransformer,
-   FormContextType,
-   RJSFSchema,
-   RJSFValidationError,
-   StrictRJSFSchema,
-   UiSchema,
-   ValidationData,
-   ValidatorType,
-} from "@rjsf/utils";
-import { toErrorSchema } from "@rjsf/utils";
-import { get } from "lodash-es";
-
-function removeUndefinedKeys(obj: any): any {
-   if (!obj) return obj;
-
-   if (typeof obj === "object") {
-      Object.keys(obj).forEach((key) => {
-         if (obj[key] === undefined) {
-            delete obj[key];
-         } else if (typeof obj[key] === "object") {
-            removeUndefinedKeys(obj[key]);
-         }
-      });
-   }
-
-   if (Array.isArray(obj)) {
-      return obj.filter((item) => item !== undefined);
-   }
-
-   return obj;
-}
-
-function onlyKeepMostSpecific(errors: OutputUnit[]) {
-   const mostSpecific = errors.filter((error) => {
-      return !errors.some((other) => {
-         return error !== other && other.instanceLocation.startsWith(error.instanceLocation);
-      });
-   });
-   return mostSpecific;
-}
-
-const debug = true;
-const validate = true;
-
-export class JsonSchemaValidator<
-   T = any,
-   S extends StrictRJSFSchema = RJSFSchema,
-   F extends FormContextType = any,
-> implements ValidatorType
-{
-   // @ts-ignore
-   rawValidation<Result extends OutputUnit = OutputUnit>(schema: S, formData?: T) {
-      if (!validate) return { errors: [], validationError: null };
-
-      debug && console.log("JsonSchemaValidator.rawValidation", schema, formData);
-      const validator = new Validator(schema as any);
-      const validation = validator.validate(removeUndefinedKeys(formData));
-      const specificErrors = onlyKeepMostSpecific(validation.errors);
-
-      return { errors: specificErrors, validationError: null as any };
-   }
-
-   validateFormData(
-      formData: T | undefined,
-      schema: S,
-      customValidate?: CustomValidator,
-      transformErrors?: ErrorTransformer,
-      uiSchema?: UiSchema,
-   ): ValidationData<T> {
-      if (!validate) return { errors: [], errorSchema: {} as any };
-
-      debug &&
-         console.log(
-            "JsonSchemaValidator.validateFormData",
-            formData,
-            schema,
-            customValidate,
-            transformErrors,
-            uiSchema,
-         );
-      const { errors } = this.rawValidation(schema, formData);
-      debug && console.log("errors", { errors });
-
-      const transformedErrors = errors
-         //.filter((error) => error.keyword !== "properties")
-         .map((error) => {
-            const schemaLocation = error.keywordLocation.replace(/^#\/?/, "").split("/").join(".");
-            const propertyError = get(schema, schemaLocation);
-            const errorText = `${error.error.replace(/\.$/, "")}${propertyError ? ` "${propertyError}"` : ""}`;
-            //console.log(error, schemaLocation, get(schema, schemaLocation));
-            return {
-               name: error.keyword,
-               message: errorText,
-               property: "." + error.instanceLocation.replace(/^#\/?/, "").split("/").join("."),
-               schemaPath: error.keywordLocation,
-               stack: error.error,
-            };
-         });
-      debug && console.log("transformed", transformedErrors);
-
-      return {
-         errors: transformedErrors,
-         errorSchema: toErrorSchema(transformedErrors),
-      } as any;
-   }
-
-   toErrorList(errorSchema?: ErrorSchema<T>, fieldPath?: string[]): RJSFValidationError[] {
-      debug && console.log("JsonSchemaValidator.toErrorList", errorSchema, fieldPath);
-      return [];
-   }
-
-   isValid(schema: S, formData: T | undefined, rootSchema: S): boolean {
-      if (!validate) return true;
-      debug && console.log("JsonSchemaValidator.isValid", schema, formData, rootSchema);
-      return this.rawValidation(schema, formData).errors.length === 0;
-   }
-}

app/src/ui/components/form/json-schema/JsonvTsValidator.ts

@@ -1,6 +1,4 @@
-import { Check } from "@sinclair/typebox/value";
-import { Errors } from "@sinclair/typebox/errors";
-import { FromSchema } from "./from-schema";
+import * as s from "jsonv-ts";
 
 import type {
    CustomValidator,
@@ -16,7 +14,7 @@ import { toErrorSchema } from "@rjsf/utils";
 
 const validate = true;
 
-export class RJSFTypeboxValidator<T = any, S extends StrictRJSFSchema = RJSFSchema>
+export class JsonvTsValidator<T = any, S extends StrictRJSFSchema = RJSFSchema>
    implements ValidatorType
 {
    // @ts-ignore
@@ -24,16 +22,16 @@ export class RJSFTypeboxValidator<T = any, S extends StrictRJSFSchema = RJSFSche
       if (!validate) {
          return { errors: [], validationError: null as any };
       }
-      const tbSchema = FromSchema(schema as unknown);
 
-      //console.log("--validation", tbSchema, formData);
+      const jsSchema = s.fromSchema(schema as any);
+      const result = jsSchema.validate(formData);
 
-      if (Check(tbSchema, formData)) {
+      if (result.valid) {
          return { errors: [], validationError: null as any };
       }
 
       return {
-         errors: [...Errors(tbSchema, formData)],
+         errors: result.errors,
          validationError: null as any,
       };
    }
@@ -48,14 +46,12 @@ export class RJSFTypeboxValidator<T = any, S extends StrictRJSFSchema = RJSFSche
       const { errors } = this.rawValidation(schema, formData);
 
       const transformedErrors = errors.map((error) => {
-         const schemaLocation = error.path.substring(1).split("/").join(".");
-
          return {
             name: "any",
-            message: error.message,
-            property: "." + schemaLocation,
-            schemaPath: error.path,
-            stack: error.message,
+            message: error.error,
+            property: "." + error.instanceLocation.substring(1).split("/").join("."),
+            schemaPath: error.instanceLocation,
+            stack: error.error,
          };
       });
 

app/src/ui/components/form/json-schema/typebox/from-schema.ts

@@ -1,299 +0,0 @@
-/*--------------------------------------------------------------------------
-
-@sinclair/typebox/prototypes
-
-The MIT License (MIT)
-
-Copyright (c) 2017-2024 Haydn Paterson (sinclair) <haydn.developer@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----------------------------------------------------------------------------*/
-
-import * as Type from "@sinclair/typebox";
-
-// ------------------------------------------------------------------
-// Schematics
-// ------------------------------------------------------------------
-const IsExact = (value: unknown, expect: unknown) => value === expect;
-const IsSValue = (value: unknown): value is SValue =>
-   Type.ValueGuard.IsString(value) ||
-   Type.ValueGuard.IsNumber(value) ||
-   Type.ValueGuard.IsBoolean(value);
-const IsSEnum = (value: unknown): value is SEnum =>
-   Type.ValueGuard.IsObject(value) &&
-   Type.ValueGuard.IsArray(value.enum) &&
-   value.enum.every((value) => IsSValue(value));
-const IsSAllOf = (value: unknown): value is SAllOf =>
-   Type.ValueGuard.IsObject(value) && Type.ValueGuard.IsArray(value.allOf);
-const IsSAnyOf = (value: unknown): value is SAnyOf =>
-   Type.ValueGuard.IsObject(value) && Type.ValueGuard.IsArray(value.anyOf);
-const IsSOneOf = (value: unknown): value is SOneOf =>
-   Type.ValueGuard.IsObject(value) && Type.ValueGuard.IsArray(value.oneOf);
-const IsSTuple = (value: unknown): value is STuple =>
-   Type.ValueGuard.IsObject(value) &&
-   IsExact(value.type, "array") &&
-   Type.ValueGuard.IsArray(value.items);
-const IsSArray = (value: unknown): value is SArray =>
-   Type.ValueGuard.IsObject(value) &&
-   IsExact(value.type, "array") &&
-   !Type.ValueGuard.IsArray(value.items) &&
-   Type.ValueGuard.IsObject(value.items);
-const IsSConst = (value: unknown): value is SConst =>
-   // biome-ignore lint: reason
-   Type.ValueGuard.IsObject(value) && Type.ValueGuard.IsObject(value["const"]);
-const IsSString = (value: unknown): value is SString =>
-   Type.ValueGuard.IsObject(value) && IsExact(value.type, "string");
-const IsSNumber = (value: unknown): value is SNumber =>
-   Type.ValueGuard.IsObject(value) && IsExact(value.type, "number");
-const IsSInteger = (value: unknown): value is SInteger =>
-   Type.ValueGuard.IsObject(value) && IsExact(value.type, "integer");
-const IsSBoolean = (value: unknown): value is SBoolean =>
-   Type.ValueGuard.IsObject(value) && IsExact(value.type, "boolean");
-const IsSNull = (value: unknown): value is SBoolean =>
-   Type.ValueGuard.IsObject(value) && IsExact(value.type, "null");
-const IsSProperties = (value: unknown): value is SProperties => Type.ValueGuard.IsObject(value);
-// prettier-ignore
-// biome-ignore format:
-const IsSObject = (value: unknown): value is SObject => Type.ValueGuard.IsObject(value) && IsExact(value.type, 'object') && IsSProperties(value.properties) && (value.required === undefined || Type.ValueGuard.IsArray(value.required) && value.required.every((value: unknown) => Type.ValueGuard.IsString(value)))
-type SValue = string | number | boolean;
-type SEnum = Readonly<{ enum: readonly SValue[] }>;
-type SAllOf = Readonly<{ allOf: readonly unknown[] }>;
-type SAnyOf = Readonly<{ anyOf: readonly unknown[] }>;
-type SOneOf = Readonly<{ oneOf: readonly unknown[] }>;
-type SProperties = Record<PropertyKey, unknown>;
-type SObject = Readonly<{
-   type: "object";
-   properties: SProperties;
-   required?: readonly string[];
-}>;
-type STuple = Readonly<{ type: "array"; items: readonly unknown[] }>;
-type SArray = Readonly<{ type: "array"; items: unknown }>;
-type SConst = Readonly<{ const: SValue }>;
-type SString = Readonly<{ type: "string" }>;
-type SNumber = Readonly<{ type: "number" }>;
-type SInteger = Readonly<{ type: "integer" }>;
-type SBoolean = Readonly<{ type: "boolean" }>;
-type SNull = Readonly<{ type: "null" }>;
-// ------------------------------------------------------------------
-// FromRest
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromRest<T extends readonly unknown[], Acc extends Type.TSchema[] = []> = (
-  // biome-ignore lint: reason
-  T extends readonly [infer L extends unknown, ...infer R extends unknown[]]
-    ? TFromSchema<L> extends infer S extends Type.TSchema
-      ? TFromRest<R, [...Acc, S]>
-      : TFromRest<R, [...Acc]>
-    : Acc
-)
-function FromRest<T extends readonly unknown[]>(T: T): TFromRest<T> {
-   return T.map((L) => FromSchema(L)) as never;
-}
-// ------------------------------------------------------------------
-// FromEnumRest
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromEnumRest<T extends readonly SValue[], Acc extends Type.TSchema[] = []> = (
-  T extends readonly [infer L extends SValue, ...infer R extends SValue[]]
-    ? TFromEnumRest<R, [...Acc, Type.TLiteral<L>]>
-    : Acc
-)
-function FromEnumRest<T extends readonly SValue[]>(T: T): TFromEnumRest<T> {
-   return T.map((L) => Type.Literal(L)) as never;
-}
-// ------------------------------------------------------------------
-// AllOf
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromAllOf<T extends SAllOf> = (
-  TFromRest<T['allOf']> extends infer Rest extends Type.TSchema[]
-    ? Type.TIntersectEvaluated<Rest>
-    : Type.TNever
-)
-function FromAllOf<T extends SAllOf>(T: T): TFromAllOf<T> {
-   return Type.IntersectEvaluated(FromRest(T.allOf), T);
-}
-// ------------------------------------------------------------------
-// AnyOf
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromAnyOf<T extends SAnyOf> = (
-  TFromRest<T['anyOf']> extends infer Rest extends Type.TSchema[]
-    ? Type.TUnionEvaluated<Rest>
-    : Type.TNever
-)
-function FromAnyOf<T extends SAnyOf>(T: T): TFromAnyOf<T> {
-   return Type.UnionEvaluated(FromRest(T.anyOf), T);
-}
-// ------------------------------------------------------------------
-// OneOf
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromOneOf<T extends SOneOf> = (
-  TFromRest<T['oneOf']> extends infer Rest extends Type.TSchema[]
-    ? Type.TUnionEvaluated<Rest>
-    : Type.TNever
-)
-function FromOneOf<T extends SOneOf>(T: T): TFromOneOf<T> {
-   return Type.UnionEvaluated(FromRest(T.oneOf), T);
-}
-// ------------------------------------------------------------------
-// Enum
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromEnum<T extends SEnum> = (
-  TFromEnumRest<T['enum']> extends infer Elements extends Type.TSchema[]
-    ? Type.TUnionEvaluated<Elements>
-    : Type.TNever
-)
-function FromEnum<T extends SEnum>(T: T): TFromEnum<T> {
-   return Type.UnionEvaluated(FromEnumRest(T.enum));
-}
-// ------------------------------------------------------------------
-// Tuple
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromTuple<T extends STuple> = (
-  TFromRest<T['items']> extends infer Elements extends Type.TSchema[]
-    ? Type.TTuple<Elements>
-    : Type.TTuple<[]>
-)
-// prettier-ignore
-// biome-ignore format:
-function FromTuple<T extends STuple>(T: T): TFromTuple<T> {
-  return Type.Tuple(FromRest(T.items), T) as never
-}
-// ------------------------------------------------------------------
-// Array
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromArray<T extends SArray> = (
-  TFromSchema<T['items']> extends infer Items extends Type.TSchema
-    ? Type.TArray<Items>
-    : Type.TArray<Type.TUnknown>
-)
-// prettier-ignore
-// biome-ignore format:
-function FromArray<T extends SArray>(T: T): TFromArray<T> {
-  return Type.Array(FromSchema(T.items), T) as never
-}
-// ------------------------------------------------------------------
-// Const
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-type TFromConst<T extends SConst> = (
-  Type.Ensure<Type.TLiteral<T['const']>>
-)
-function FromConst<T extends SConst>(T: T) {
-   return Type.Literal(T.const, T);
-}
-// ------------------------------------------------------------------
-// Object
-// ------------------------------------------------------------------
-type TFromPropertiesIsOptional<
-   K extends PropertyKey,
-   R extends string | unknown,
-> = unknown extends R ? true : K extends R ? false : true;
-// prettier-ignore
-// biome-ignore format:
-type TFromProperties<T extends SProperties, R extends string | unknown> = Type.Evaluate<{
-  -readonly [K in keyof T]: TFromPropertiesIsOptional<K, R> extends true
-    ? Type.TOptional<TFromSchema<T[K]>>
-    : TFromSchema<T[K]>
-}>
-// prettier-ignore
-// biome-ignore format:
-type TFromObject<T extends SObject> = (
-  TFromProperties<T['properties'], Exclude<T['required'], undefined>[number]> extends infer Properties extends Type.TProperties
-    ? Type.TObject<Properties>
-    : Type.TObject<{}>
-)
-function FromObject<T extends SObject>(T: T): TFromObject<T> {
-   const properties = globalThis.Object.getOwnPropertyNames(T.properties).reduce((Acc, K) => {
-      return {
-         // biome-ignore lint:
-         ...Acc,
-         [K]:
-            // biome-ignore lint: reason
-            T.required && T.required.includes(K)
-               ? FromSchema(T.properties[K])
-               : Type.Optional(FromSchema(T.properties[K])),
-      };
-   }, {} as Type.TProperties);
-
-   if ("additionalProperties" in T) {
-      return Type.Object(properties, {
-         additionalProperties: FromSchema(T.additionalProperties),
-      }) as never;
-   }
-
-   return Type.Object(properties, T) as never;
-}
-// ------------------------------------------------------------------
-// FromSchema
-// ------------------------------------------------------------------
-// prettier-ignore
-// biome-ignore format:
-export type TFromSchema<T> = (
-  T extends SAllOf ? TFromAllOf<T> :
-  T extends SAnyOf ? TFromAnyOf<T> :
-  T extends SOneOf ? TFromOneOf<T> :
-  T extends SEnum ? TFromEnum<T> :
-  T extends SObject ? TFromObject<T> :
-  T extends STuple ? TFromTuple<T> :
-  T extends SArray ? TFromArray<T> :
-  T extends SConst ? TFromConst<T> :
-  T extends SString ? Type.TString :
-  T extends SNumber ? Type.TNumber :
-  T extends SInteger ? Type.TInteger :
-  T extends SBoolean ? Type.TBoolean :
-  T extends SNull ? Type.TNull :
-  Type.TUnknown
-)
-/** Parses a TypeBox type from raw JsonSchema */
-export function FromSchema<T>(T: T): TFromSchema<T> {
-   // prettier-ignore
-   // biome-ignore format:
-   return (
-    IsSAllOf(T) ? FromAllOf(T) :
-    IsSAnyOf(T) ? FromAnyOf(T) :
-    IsSOneOf(T) ? FromOneOf(T) :
-    IsSEnum(T) ? FromEnum(T) :
-    IsSObject(T) ? FromObject(T) :
-    IsSTuple(T) ? FromTuple(T) :
-    IsSArray(T) ? FromArray(T) :
-    IsSConst(T) ? FromConst(T) :
-    IsSString(T) ? Type.String(T) :
-    IsSNumber(T) ? Type.Number(T) :
-    IsSInteger(T) ? Type.Integer(T) :
-    IsSBoolean(T) ? Type.Boolean(T) :
-    IsSNull(T) ? Type.Null(T) :
-    Type.Unknown(T || {})
-  ) as never
-}

app/src/ui/modules/data/components/schema/create-modal/step.entity.fields.tsx

@@ -13,6 +13,7 @@ import {
 import { ModalBody, ModalFooter, type TCreateModalSchema, useStepContext } from "./CreateModal";
 import { useBkndData } from "ui/client/schema/data/use-bknd-data";
 import type { s } from "core/object/schema";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 
 const schema = entitiesSchema;
 type Schema = s.Static<typeof schema>;
@@ -41,8 +42,7 @@ export function StepEntityFields() {
       setValue,
    } = useForm({
       mode: "onTouched",
-      // @todo: add resolver
-      //resolver: typeboxResolver(schema),
+      resolver: standardSchemaResolver(schema),
       defaultValues: initial as NonNullable<Schema>,
    });
 

app/src/ui/modules/data/components/schema/create-modal/step.entity.tsx

@@ -1,5 +1,4 @@
-//import { typeboxResolver } from "@hookform/resolvers/typebox";
-
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 import { TextInput, Textarea } from "@mantine/core";
 import { useFocusTrap } from "@mantine/hooks";
 import { useForm } from "react-hook-form";
@@ -17,8 +16,7 @@ export function StepEntity() {
    const { nextStep, stepBack, state, setState } = useStepContext<TCreateModalSchema>();
    const { register, handleSubmit, formState, watch, control } = useForm({
       mode: "onTouched",
-      // @todo: add resolver
-      //resolver: typeboxResolver(entitySchema),
+      resolver: standardSchemaResolver(entitySchema),
       defaultValues: state.entities?.create?.[0] ?? {},
    });
    /*const data = watch();

app/src/ui/modules/data/components/schema/create-modal/step.relation.tsx

@@ -12,6 +12,7 @@ import { useStepContext } from "ui/components/steps/Steps";
 import { useEvent } from "ui/hooks/use-event";
 import { ModalBody, ModalFooter, type TCreateModalSchema } from "./CreateModal";
 import { s, stringIdentifier } from "core/object/schema";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 
 const Relations: {
    type: RelationType;
@@ -66,8 +67,7 @@ export function StepRelation() {
       watch,
       control,
    } = useForm({
-      // @todo: implement resolver
-      //resolver: typeboxResolver(schema),
+      resolver: standardSchemaResolver(schema),
       defaultValues: (state.relations?.create?.[0] ?? {}) as s.Static<typeof schema>,
    });
    const data = watch();

app/src/ui/modules/data/components/schema/create-modal/templates/media/template.media.component.tsx

@@ -15,6 +15,7 @@ import {
    useStepContext,
 } from "../../CreateModal";
 import { s, stringIdentifier } from "core/object/schema";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 
 const schema = s.object({
    entity: stringIdentifier,
@@ -34,8 +35,7 @@ export function TemplateMediaComponent() {
       control,
    } = useForm({
       mode: "onChange",
-      // @todo: add resolver
-      //resolver: typeboxResolver(schema),
+      resolver: standardSchemaResolver(schema),
       defaultValues: schema.template(state.initial ?? {}) as TCreateModalMediaSchema,
       //defaultValues: Default(schema, state.initial ?? {}) as TCreateModalMediaSchema,
    });

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

@@ -13,6 +13,7 @@ import { MantineSelect } from "ui/components/form/hook-form-mantine/MantineSelec
 import type { TFlowNodeData } from "../../../hooks/use-flow";
 import { KeyValueInput } from "../../form/KeyValueInput";
 import { BaseNode } from "../BaseNode";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 
 const schema = s.object({
    query: s.record(s.string()).optional(),
@@ -37,8 +38,7 @@ export function FetchTaskForm({ onChange, params, ...props }: FetchTaskFormProps
       watch,
       control,
    } = useForm({
-      // @todo: add resolver
-      //resolver: typeboxResolver(schema),
+      resolver: standardSchemaResolver(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/triggers/TriggerNode.tsx

@@ -11,6 +11,7 @@ import { useFlowCanvas, useFlowSelector } from "../../../hooks/use-flow";
 import { BaseNode } from "../BaseNode";
 import { Handle } from "../Handle";
 import { s } from "core/object/schema";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 
 const schema = s.object({
    trigger: s.anyOf(
@@ -45,8 +46,7 @@ export const TriggerNode = (props: NodeProps<Node<TAppFlowTriggerSchema & { labe
       watch,
       control,
    } = useForm({
-      // @todo: add resolver
-      //resolver: typeboxResolver(schema),
+      resolver: standardSchemaResolver(schema),
       defaultValues: { trigger: state } as s.Static<typeof schema>,
       mode: "onChange",
    });

app/src/ui/routes/auth/forms/role.form.tsx

@@ -1,4 +1,3 @@
-//import { typeboxResolver } from "@hookform/resolvers/typebox";
 import { Input, Switch, Tooltip } from "@mantine/core";
 import { guardRoleSchema } from "auth/auth-schema";
 import { ucFirst } from "core/utils";
@@ -8,6 +7,7 @@ import { useBknd } from "ui/client/bknd";
 import { Button } from "ui/components/buttons/Button";
 import { MantineSwitch } from "ui/components/form/hook-form-mantine/MantineSwitch";
 import type { s } from "core/object/schema";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 
 const schema = guardRoleSchema;
 type Role = s.Static<typeof guardRoleSchema>;
@@ -34,8 +34,7 @@ export const AuthRoleForm = forwardRef<
       reset,
       getValues,
    } = useForm({
-      // @todo: add resolver
-      //resolver: typeboxResolver(schema),
+      resolver: standardSchemaResolver(schema),
       defaultValues: role,
    });
 

app/src/ui/routes/data/forms/entity.fields.form.tsx

@@ -22,6 +22,7 @@ import { useRoutePathState } from "ui/hooks/use-route-path-state";
 import { MantineSelect } from "ui/components/form/hook-form-mantine/MantineSelect";
 import type { TPrimaryFieldFormat } from "data/fields/PrimaryField";
 import { s, stringIdentifier } from "core/object/schema";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 
 const fieldsSchemaObject = originalFieldsSchemaObject;
 const fieldsSchema = s.anyOf(Object.values(fieldsSchemaObject));
@@ -88,8 +89,7 @@ export const EntityFieldsForm = forwardRef<EntityFieldsFormRef, EntityFieldsForm
          reset,
       } = useForm({
          mode: "all",
-         // @todo: add resolver
-         //resolver: typeboxResolver(schema),
+         resolver: standardSchemaResolver(schema),
          defaultValues: {
             fields: entityFields,
          } as TFieldsFormSchema,

app/src/ui/routes/flows/components/FlowCreateModal.tsx

@@ -14,6 +14,7 @@ import {
 } from "../../../components/modal/Modal2";
 import { Step, Steps, useStepContext } from "../../../components/steps/Steps";
 import { s, stringIdentifier } from "core/object/schema";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 
 export type TCreateFlowModalSchema = any;
 const triggerNames = Object.keys(TRIGGERS) as unknown as (keyof typeof TRIGGERS)[];
@@ -55,8 +56,7 @@ export function StepCreate() {
       register,
       formState: { isValid, errors },
    } = useForm({
-      // @todo: implement resolver
-      //resolver: typeboxResolver(schema),
+      resolver: standardSchemaResolver(schema),
       defaultValues: {
          name: "",
          trigger: "manual",

app/src/ui/routes/test/index.tsx

@@ -1,5 +1,4 @@
 import AppShellAccordionsTest from "ui/routes/test/tests/appshell-accordions-test";
-import JsonSchemaFormReactTest from "ui/routes/test/tests/json-schema-form-react-test";
 
 import FormyTest from "ui/routes/test/tests/formy-test";
 import HtmlFormTest from "ui/routes/test/tests/html-form-test";
@@ -49,7 +48,6 @@ const tests = {
    SWRAndAPI,
    SwrAndDataApi,
    DropzoneElementTest,
-   JsonSchemaFormReactTest,
    JsonSchemaForm3,
    FormyTest,
    HtmlFormTest,

app/src/ui/routes/test/tests/json-schema-form-react-test.tsx

@@ -1,54 +0,0 @@
-import { Form, type Validator } from "json-schema-form-react";
-import { useState } from "react";
-
-import { type TSchema, Type } from "@sinclair/typebox";
-import { Value, type ValueError } from "@sinclair/typebox/value";
-
-class TypeboxValidator implements Validator<ValueError> {
-   async validate(schema: TSchema, data: any) {
-      return Value.Check(schema, data) ? [] : [...Value.Errors(schema, data)];
-   }
-}
-const validator = new TypeboxValidator();
-
-const schema = Type.Object({
-   name: Type.String(),
-   age: Type.Optional(Type.Number()),
-});
-
-export default function JsonSchemaFormReactTest() {
-   const [data, setData] = useState(null);
-
-   return (
-      <>
-         <Form
-            schema={schema}
-            /*onChange={setData}
-            onSubmit={setData}*/
-            validator={validator}
-            validationMode="change"
-         >
-            {({ errors, dirty, reset }) => (
-               <>
-                  <div>
-                     <b>
-                        Form {dirty ? "*" : ""} (valid: {errors.length === 0 ? "valid" : "invalid"})
-                     </b>
-                  </div>
-                  <div>
-                     <input type="text" name="name" />
-                     <input type="number" name="age" />
-                  </div>
-                  <div>
-                     <button type="submit">submit</button>
-                     <button type="button" onClick={reset}>
-                        reset
-                     </button>
-                  </div>
-               </>
-            )}
-         </Form>
-         <pre>{JSON.stringify(data, null, 2)}</pre>
-      </>
-   );
-}

app/src/ui/routes/test/tests/react-hook-errors.tsx

@@ -1,11 +1,11 @@
-import { typeboxResolver } from "@hookform/resolvers/typebox";
+import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
 import { TextInput } from "@mantine/core";
-import { Type } from "@sinclair/typebox";
 import { useForm } from "react-hook-form";
+import { s } from "core/object/schema";
 
-const schema = Type.Object({
-   example: Type.Optional(Type.String()),
-   exampleRequired: Type.String({ minLength: 2 }),
+const schema = s.object({
+   example: s.string().optional(),
+   exampleRequired: s.string({ minLength: 2 }),
 });
 
 export default function ReactHookErrors() {
@@ -15,8 +15,10 @@ export default function ReactHookErrors() {
       watch,
       formState: { errors },
    } = useForm({
-      resolver: typeboxResolver(schema),
+      resolver: standardSchemaResolver(schema),
    });
+   const data = watch();
+
    const onSubmit = (data) => console.log(data);
 
    console.log(watch("example")); // watch input value by passing the name of it