changed tb imports

app/src/ui/client/schema/data/use-bknd-data.ts

@@ -1,4 +1,4 @@
-import { Type, TypeInvalidError, parse, transformObject } from "core/utils";
+import { TypeInvalidError, parse, transformObject } from "core/utils";
 import { constructEntity } from "data";
 import {
    type TAppDataEntity,
@@ -13,6 +13,8 @@ import {
 import { useBknd } from "ui/client/bknd";
 import type { TSchemaActions } from "ui/client/schema/actions";
 import { bkndModals } from "ui/modals";
+import * as tb from "@sinclair/typebox";
+const { Type } = tb;
 
 export function useBkndData() {
    const { config, app, schema, actions: bkndActions } = useBknd();

app/src/ui/elements/auth/AuthForm.tsx

@@ -1,6 +1,5 @@
 import type { AppAuthOAuthStrategy, AppAuthSchema } from "auth/auth-schema";
 import clsx from "clsx";
-import { Type } from "core/utils";
 import { Form } from "json-schema-form-react";
 import { transform } from "lodash-es";
 import type { ComponentPropsWithoutRef } from "react";
@@ -11,6 +10,8 @@ import type { ValueError } from "@sinclair/typebox/value";
 import { type TSchema, Value } from "core/utils";
 import type { Validator } from "json-schema-form-react";
 import { useTheme } from "ui/client/use-theme";
+import * as tbbox from "@sinclair/typebox";
+const { Type } = tbbox;
 
 class TypeboxValidator implements Validator<ValueError> {
    async validate(schema: TSchema, data: any) {

app/src/ui/hooks/use-search.ts

@@ -2,7 +2,6 @@ import {
    type Static,
    type StaticDecode,
    type TSchema,
-   Type,
    decodeSearch,
    encodeSearch,
    parseDecode,

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

@@ -1,6 +1,6 @@
 import type { ModalProps } from "@mantine/core";
 import type { ContextModalProps } from "@mantine/modals";
-import { type Static, StringEnum, StringIdentifier, Type } from "core/utils";
+import { type Static, StringEnum, StringIdentifier } from "core/utils";
 import { entitiesSchema, fieldsSchema, relationsSchema } from "data/data-schema";
 import { useState } from "react";
 import { type Modal2Ref, ModalBody, ModalFooter, ModalTitle } from "ui/components/modal/Modal2";
@@ -11,6 +11,8 @@ import { StepEntityFields } from "./step.entity.fields";
 import { StepRelation } from "./step.relation";
 import { StepSelect } from "./step.select";
 import Templates from "./templates/register";
+import * as tbbox from "@sinclair/typebox";
+const { Type } = tbbox;
 
 export type CreateModalRef = Modal2Ref;
 

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

@@ -2,15 +2,9 @@ import { typeboxResolver } from "@hookform/resolvers/typebox";
 import { Switch, TextInput } from "@mantine/core";
 import { TypeRegistry } from "@sinclair/typebox";
 import { IconDatabase } from "@tabler/icons-react";
-import {
-   type Static,
-   StringEnum,
-   StringIdentifier,
-   Type,
-   registerCustomTypeboxKinds,
-} from "core/utils";
+import { type Static, StringEnum, StringIdentifier, registerCustomTypeboxKinds } from "core/utils";
 import { ManyToOneRelation, type RelationType, RelationTypes } from "data";
-import { type ReactNode, startTransition, useEffect } from "react";
+import type { ReactNode } from "react";
 import { type Control, type FieldValues, type UseFormRegister, useForm } from "react-hook-form";
 import { TbRefresh } from "react-icons/tb";
 import { useBknd } from "ui/client/bknd";
@@ -20,6 +14,8 @@ import { MantineSelect } from "ui/components/form/hook-form-mantine/MantineSelec
 import { useStepContext } from "ui/components/steps/Steps";
 import { useEvent } from "ui/hooks/use-event";
 import { ModalBody, ModalFooter, type TCreateModalSchema } from "./CreateModal";
+import * as tbbox from "@sinclair/typebox";
+const { Type } = tbbox;
 
 // @todo: check if this could become an issue
 registerCustomTypeboxKinds(TypeRegistry);

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

@@ -1,13 +1,6 @@
 import { typeboxResolver } from "@hookform/resolvers/typebox";
 import { Radio, TextInput } from "@mantine/core";
-import {
-   Default,
-   type Static,
-   StringEnum,
-   StringIdentifier,
-   Type,
-   transformObject,
-} from "core/utils";
+import { Default, type Static, StringEnum, StringIdentifier, transformObject } from "core/utils";
 import type { MediaFieldConfig } from "media/MediaField";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -22,6 +15,8 @@ import {
    type TFieldCreate,
    useStepContext,
 } from "../../CreateModal";
+import * as tbbox from "@sinclair/typebox";
+const { Type } = tbbox;
 
 const schema = Type.Object({
    entity: StringIdentifier,

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

@@ -1,9 +1,11 @@
 import { Handle, type Node, type NodeProps, Position } from "@xyflow/react";
-import { Const, Type, transformObject } from "core/utils";
+import { Const, 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;
 
 export type TaskComponentProps = NodeProps<Node<{ trigger: Trigger }>> & {
    Icon?: IconType;

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

@@ -4,7 +4,6 @@ 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 { Type } from "core/utils";
 import { FetchTask } from "flows";
 import { useRef, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -15,6 +14,8 @@ import { MantineSelect } from "ui/components/form/hook-form-mantine/MantineSelec
 import { type TFlowNodeData, useFlowSelector } 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,

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

@@ -1,20 +1,9 @@
 import { typeboxResolver } from "@hookform/resolvers/typebox";
 import { TextInput } from "@mantine/core";
-import { TypeRegistry } from "@sinclair/typebox";
-import { Clean } from "@sinclair/typebox/value";
-import { type Node, type NodeProps, Position } from "@xyflow/react";
-import {
-   Const,
-   type Static,
-   StringEnum,
-   Type,
-   registerCustomTypeboxKinds,
-   transformObject,
-} from "core/utils";
+import type { Node, NodeProps } from "@xyflow/react";
+import { Const, type Static, registerCustomTypeboxKinds, transformObject } from "core/utils";
 import { TriggerMap } from "flows";
 import type { TAppFlowTriggerSchema } from "flows/AppFlows";
-import { isEqual } from "lodash-es";
-import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { JsonViewer } from "ui/components/code/JsonViewer";
 import { MantineSegmentedControl } from "ui/components/form/hook-form-mantine/MantineSegmentedControl";
@@ -22,6 +11,8 @@ 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;
 
 // @todo: check if this could become an issue
 registerCustomTypeboxKinds(TypeRegistry);

app/src/ui/routes/auth/auth.settings.tsx

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { isDebug } from "core";
-import { TbAlertCircle, TbChevronDown, TbChevronUp } from "react-icons/tb";
+import { TbChevronDown, TbChevronUp } from "react-icons/tb";
 import { useBknd } from "ui/client/BkndProvider";
 import { useBkndAuth } from "ui/client/schema/auth/use-bknd-auth";
 import { Button } from "ui/components/buttons/Button";

app/src/ui/routes/data/data.$entity.create.tsx

@@ -1,4 +1,3 @@
-import { Type } from "core/utils";
 import type { EntityData } from "data";
 import { useState } from "react";
 import { useEntityMutate } from "ui/client";
@@ -12,6 +11,8 @@ import { Breadcrumbs2 } from "ui/layouts/AppShell/Breadcrumbs2";
 import { routes } from "ui/lib/routes";
 import { EntityForm } from "ui/modules/data/components/EntityForm";
 import { useEntityForm } from "ui/modules/data/hooks/useEntityForm";
+import * as tbbox from "@sinclair/typebox";
+const { Type } = tbbox;
 
 export function DataEntityCreate({ params }) {
    const { $data } = useBkndData();

app/src/ui/routes/data/data.$entity.index.tsx

@@ -1,4 +1,3 @@
-import { Type } from "core/utils";
 import { type Entity, querySchema } from "data";
 import { Fragment } from "react";
 import { TbDots } from "react-icons/tb";
@@ -15,6 +14,8 @@ import * as AppShell from "ui/layouts/AppShell/AppShell";
 import { routes, useNavigate } from "ui/lib/routes";
 import { useCreateUserModal } from "ui/modules/auth/hooks/use-create-user-modal";
 import { EntityTable2 } from "ui/modules/data/components/EntityTable2";
+import * as tbbox from "@sinclair/typebox";
+const { Type } = tbbox;
 
 // @todo: migrate to Typebox
 const searchSchema = Type.Composite(

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

@@ -5,7 +5,6 @@ import {
    Default,
    type Static,
    StringIdentifier,
-   Type,
    objectCleanEmpty,
    ucFirstAllSnakeToPascalWithSpaces,
 } from "core/utils";
@@ -27,6 +26,8 @@ import { type SortableItemProps, SortableList } from "ui/components/list/Sortabl
 import { Popover } from "ui/components/overlay/Popover";
 import { type TFieldSpec, fieldSpecs } from "ui/modules/data/components/fields-specs";
 import { dataFieldsUiSchema } from "../../settings/routes/data.settings";
+import * as tbbox from "@sinclair/typebox";
+const { Type } = tbbox;
 
 const fieldsSchemaObject = originalFieldsSchemaObject;
 const fieldsSchema = Type.Union(Object.values(fieldsSchemaObject));

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

@@ -2,13 +2,7 @@ import { typeboxResolver } from "@hookform/resolvers/typebox";
 import { TextInput } from "@mantine/core";
 import { useFocusTrap } from "@mantine/hooks";
 import { TypeRegistry } from "@sinclair/typebox";
-import {
-   type Static,
-   StringEnum,
-   StringIdentifier,
-   Type,
-   registerCustomTypeboxKinds,
-} from "core/utils";
+import { type Static, StringEnum, StringIdentifier, registerCustomTypeboxKinds } from "core/utils";
 import { TRIGGERS } from "flows/flows-schema";
 import { forwardRef, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -22,6 +16,8 @@ import {
    ModalTitle,
 } from "../../../components/modal/Modal2";
 import { Step, Steps, useStepContext } from "../../../components/steps/Steps";
+import * as tbbox from "@sinclair/typebox";
+const { Type } = tbbox;
 
 registerCustomTypeboxKinds(TypeRegistry);