@ram_28/kf-ai-sdk 2.0.18 → 2.0.20-beta.0

package/sdk/auth/authClient.ts

@@ -9,11 +9,7 @@ import type {
   LoginOptionsType,
   LogoutOptionsType,
 } from "./types";
-import {
-  getAuthBaseUrl,
-  getAuthConfig,
-  getProviderConfig,
-} from "./authConfig";
+import { getAuthBaseUrl, getAuthConfig, getProviderConfig } from "./authConfig";
 import { getDefaultHeaders } from "../api/client";
 
 /**
@@ -52,7 +48,7 @@ export async function fetchSession(): Promise<SessionResponseType> {
     }
     throw new AuthenticationError(
       `Session check failed: ${response.statusText}`,
-      response.status
+      response.status,
     );
   }
 
@@ -82,7 +78,7 @@ export async function fetchSession(): Promise<SessionResponseType> {
  */
 export function initiateLogin(
   provider?: AuthProviderNameType,
-  options?: LoginOptionsType
+  options?: LoginOptionsType,
 ): Promise<never> {
   return new Promise(() => {
     const config = getAuthConfig();
@@ -91,7 +87,7 @@ export function initiateLogin(
     // Validate base URL
     if (!baseUrl) {
       throw new Error(
-        'Auth base URL is not configured. Call setApiBaseUrl("https://...") or configureAuth({ baseUrl: "https://..." }) first.'
+        'Auth base URL is not configured. Call setApiBaseUrl("https://...") or configureAuth({ baseUrl: "https://..." }) first.',
       );
     }
 
@@ -100,9 +96,10 @@ export function initiateLogin(
 
     // Validate provider config
     if (!providerConfig) {
-      const availableProviders = Object.keys(config.providers || {}).join(", ") || "none";
+      const availableProviders =
+        Object.keys(config.providers || {}).join(", ") || "none";
       throw new Error(
-        `Auth provider "${selectedProvider}" is not configured. Available providers: ${availableProviders}`
+        `Auth provider "${selectedProvider}" is not configured. Available providers: ${availableProviders}`,
       );
     }
 
@@ -110,7 +107,7 @@ export function initiateLogin(
     if (!providerConfig.loginPath) {
       throw new Error(
         `Login path not configured for provider "${selectedProvider}". ` +
-        `Configure it with: configureAuth({ providers: { ${selectedProvider}: { loginPath: '/api/auth/...' } } })`
+          `Configure it with: configureAuth({ providers: { ${selectedProvider}: { loginPath: '/api/auth/...' } } })`,
       );
     }
 
@@ -121,14 +118,14 @@ export function initiateLogin(
     } catch {
       throw new Error(
         `Failed to construct login URL. Base URL: "${baseUrl}", Login path: "${providerConfig.loginPath}". ` +
-        `Ensure baseUrl is a valid URL (e.g., "https://example.com").`
+          `Ensure baseUrl is a valid URL (e.g., "https://example.com").`,
       );
     }
 
     if (options?.callbackUrl || config.callbackUrl) {
       loginUrl.searchParams.set(
         "callbackUrl",
-        options?.callbackUrl || config.callbackUrl || window.location.href
+        options?.callbackUrl || config.callbackUrl || window.location.href,
       );
     }
 
@@ -138,7 +135,7 @@ export function initiateLogin(
       });
     }
 
-    window.open(loginUrl.toString(), '_blank');
+    window.open(loginUrl.toString(), "_blank");
     // Promise never resolves - login opens in new tab
   });
 }
@@ -147,21 +144,18 @@ export function initiateLogin(
  * Logout the current user
  * Optionally calls the logout endpoint before clearing client state
  */
-export async function performLogout(options?: LogoutOptionsType): Promise<void> {
+export async function performLogout(
+  options?: LogoutOptionsType,
+): Promise<void> {
   const config = getAuthConfig();
   const baseUrl = getAuthBaseUrl();
-  const headers = getDefaultHeaders();
 
   const providerConfig = getProviderConfig(config.defaultProvider);
   const logoutPath = providerConfig?.logoutPath;
 
   if (logoutPath && options?.callLogoutEndpoint !== false) {
     try {
-      await fetch(`${baseUrl}${logoutPath}`, {
-        method: "POST",
-        headers,
-        credentials: "include",
-      });
+      await fetch(`${baseUrl}${logoutPath}`);
     } catch (error) {
       console.warn("Logout endpoint call failed:", error);
     }

package/sdk/auth/authConfig.ts

@@ -43,7 +43,7 @@ let authConfig: AuthConfigType = { ...defaultAuthConfig };
  *   autoRedirect: true,
  *   providers: {
  *     google: { loginPath: "/api/auth/google/login" },
- *     azure: { loginPath: "/api/auth/azure/login" },
+ *     microsoft: { loginPath: "/api/auth/microsoft/login" },
  *   },
  * });
  * ```

package/sdk/auth/types.ts

@@ -29,7 +29,7 @@ export type AuthStatusType = "loading" | "authenticated" | "unauthenticated";
 /**
  * Authentication provider type (extensible for multiple OAuth providers)
  */
-export type AuthProviderNameType = "google" | "azure" | "github" | "custom";
+export type AuthProviderNameType = "google" | "microsoft" | "github" | "azure" | "custom";
 
 /**
  * Auth endpoint configuration for a specific provider

package/sdk/bdo/core/Item.ts

@@ -196,9 +196,18 @@ export class Item<T extends Record<string, unknown>> {
     }) as Item<T>;
   }
 
+  /**
+   * Require instanceId or throw.
+   * TODO: Support create flow via draftInteraction to get temp _id
+   */
   private _requireInstanceId(): string {
     const id = this._data._id as string | undefined;
-    return id || "draft";
+    if (!id) {
+      throw new Error(
+        "Cannot perform attachment operation: item has no _id. Save the item first.",
+      );
+    }
+    return id;
   }
 
   /**

package/sdk/bdo/fields/ReferenceField.ts

@@ -71,7 +71,7 @@ export class ReferenceField<TRef = unknown> extends BaseField<
    * Fetch referenced records from the backend via the fetchField API.
    * Requires the field to be bound to a parent BDO.
    */
-  async fetchOptions(instanceId: string = "draft"): Promise<TRef[]> {
+  async fetchOptions(instanceId: string): Promise<TRef[]> {
     if (!this._parentBoId) {
       throw new Error(
         `Field ${this.id} not bound to a BDO. Cannot fetch options.`

package/sdk/bdo/fields/SelectField.ts

@@ -57,7 +57,7 @@ export class SelectField<T extends string | number = string> extends BaseField<T
   /**
    * Fetch dynamic options from the backend, returned as typed SelectOption[]
    */
-  async fetchOptions(instanceId: string = "draft"): Promise<SelectOptionType<T>[]> {
+  async fetchOptions(instanceId: string): Promise<SelectOptionType<T>[]> {
     if (!this._parentBoId) {
       throw new Error(
         `Field ${this.id} not bound to a BDO. Cannot fetch options.`

package/sdk/bdo/fields/UserField.ts

@@ -32,7 +32,7 @@ export class UserField extends BaseField<UserFieldType> {
    * Fetch user records from the backend via the fetchField API.
    * Requires the field to be bound to a parent BDO.
    */
-  async fetchOptions(instanceId: string = "draft"): Promise<UserFieldType[]> {
+  async fetchOptions(instanceId: string): Promise<UserFieldType[]> {
     if (!this._parentBoId) {
       throw new Error(
         `Field ${this.id} not bound to a BDO. Cannot fetch options.`,

package/sdk/components/hooks/useActivityForm/types.ts

@@ -15,7 +15,6 @@ import type {
 } from 'react-hook-form';
 
 import type { Activity } from '../../../workflow/Activity';
-import type { CreateUpdateResponseType } from '../../../types/common';
 
 // Reuse shared types from useBDOForm — identical interfaces, no duplication
 import type {
@@ -105,8 +104,11 @@ export interface UseActivityFormReturn<A extends Activity<any, any, any>> {
     ExtractActivityReadonly<A>
   >;
 
-  /** Handle form submission — validates, updates dirty fields, then completes the activity */
-  handleSubmit: HandleSubmitType<CreateUpdateResponseType>;
+  /** Handle form submission — calls activity.update() */
+  handleSubmit: HandleSubmitType<AllActivityFields<A>>;
+
+  /** Handle form completion — calls activity.update() + activity.complete() */
+  handleComplete: HandleSubmitType<AllActivityFields<A>>;
 
   /** Watch field values */
   watch: UseFormWatch<AllActivityFields<A>>;
@@ -139,7 +141,7 @@ export interface UseActivityFormReturn<A extends Activity<any, any, any>> {
   /** Form has been modified */
   isDirty: boolean;
 
-  /** Form is currently submitting */
+  /** Form is currently submitting (save or complete) */
   isSubmitting: boolean;
 
   /** Form submission was successful */

package/sdk/components/hooks/useActivityForm/useActivityForm.ts

@@ -10,9 +10,12 @@ import { useForm as useReactHookForm } from 'react-hook-form';
 import { useQuery } from '@tanstack/react-query';
 
 import type { Activity } from '../../../workflow/Activity';
-import type { UseActivityFormOptions, UseActivityFormReturn } from './types';
+import type {
+  UseActivityFormOptions,
+  UseActivityFormReturn,
+  AllActivityFields,
+} from './types';
 
-import type { CreateUpdateResponseType } from '../../../types/common';
 import { createActivityResolver } from './createActivityResolver';
 import { createActivityItemProxy } from './createActivityItemProxy';
 import {
@@ -297,13 +300,13 @@ export function useActivityForm<A extends Activity<any, any, any>>(
   );
 
   // ============================================================
-  // HANDLE SUBMIT — activity.update() + activity.complete()
+  // HANDLE SUBMIT — activity.update()
   // ============================================================
 
   const handleSubmit = useCallback(
     (
       onSuccess?: (
-        data: CreateUpdateResponseType,
+        data: AllActivityFields<A>,
         e?: React.BaseSyntheticEvent,
       ) => void | Promise<void>,
       onError?: (
@@ -316,7 +319,7 @@ export function useActivityForm<A extends Activity<any, any, any>>(
           setIsSubmitting(true);
 
           try {
-            // Only send dirty (changed) fields — matches useBDOForm behavior
+            // Only send dirty (changed) fields — matches useBDOForm update behavior
             // Use getValues() to capture Image/File values set via setValue()
             // that RHF resolver doesn't include in `data`
             const cleanedData: Record<string, unknown> = {};
@@ -336,7 +339,7 @@ export function useActivityForm<A extends Activity<any, any, any>>(
                 : value;
             }
 
-            // Send remaining dirty fields via update
+            // Save via activity.update()
             if (Object.keys(cleanedData).length > 0) {
               await activityRef.update(
                 activity_instance_id,
@@ -344,10 +347,7 @@ export function useActivityForm<A extends Activity<any, any, any>>(
               );
             }
 
-            // Complete the activity — advances the workflow
-            const result = await activityRef.complete(activity_instance_id);
-
-            await onSuccess?.(result, event);
+            await onSuccess?.(data as AllActivityFields<A>, event);
           } catch (error) {
             onError?.(toError(error), event);
           } finally {
@@ -362,6 +362,68 @@ export function useActivityForm<A extends Activity<any, any, any>>(
     [rhf, activityRef, readonlyFieldNames, allFields, activity_instance_id],
   ) as UseActivityFormReturn<A>['handleSubmit'];
 
+  // ============================================================
+  // HANDLE COMPLETE — activity.update() + activity.complete()
+  // ============================================================
+
+  const handleComplete = useCallback(
+    (
+      onSuccess?: (
+        data: AllActivityFields<A>,
+        e?: React.BaseSyntheticEvent,
+      ) => void | Promise<void>,
+      onError?: (
+        error: any,
+        e?: React.BaseSyntheticEvent,
+      ) => void | Promise<void>,
+    ) => {
+      return rhf.handleSubmit(
+        async (data, event) => {
+          setIsSubmitting(true);
+
+          try {
+            // Only send dirty (changed) fields — matches useBDOForm update behavior
+            // Use getValues() to capture Image/File values set via setValue()
+            // that RHF resolver doesn't include in `data`
+            const cleanedData: Record<string, unknown> = {};
+            const readonlySet = new Set(readonlyFieldNames);
+            const dirtyFields = rhf.formState.dirtyFields;
+            const allValues = rhf.getValues() as Record<string, unknown>;
+
+            for (const key of Object.keys(allValues)) {
+              if (readonlySet.has(key) || !dirtyFields[key]) continue;
+              const value =
+                allValues[key] !== undefined
+                  ? allValues[key]
+                  : (data as Record<string, unknown>)[key];
+              const field = allFields[key];
+              cleanedData[key] = field
+                ? coerceFieldValue(field, value)
+                : value;
+            }
+
+            if (Object.keys(cleanedData).length > 0) {
+              await activityRef.update(
+                activity_instance_id,
+                cleanedData as any,
+              );
+            }
+            await activityRef.complete(activity_instance_id);
+            await onSuccess?.(data as AllActivityFields<A>, event);
+          } catch (error) {
+            onError?.(toError(error), event);
+          } finally {
+            setIsSubmitting(false);
+          }
+        },
+        (errors, event) => {
+          onError?.(errors, event);
+        },
+      );
+    },
+    [rhf, activityRef, readonlyFieldNames, allFields, activity_instance_id],
+  ) as UseActivityFormReturn<A>['handleComplete'];
+
   // ============================================================
   // CLEAR ERRORS
   // ============================================================
@@ -386,6 +448,7 @@ export function useActivityForm<A extends Activity<any, any, any>>(
     // Form methods
     register,
     handleSubmit,
+    handleComplete,
     watch: rhf.watch as any,
     setValue: rhf.setValue as any,
     getValues: rhf.getValues as any,

package/sdk/components/hooks/useActivityTable/types.ts

@@ -1,4 +1,5 @@
 import type { Activity } from '../../../workflow/Activity';
+import type { ActivityInstanceFieldsType } from '../../../workflow/types';
 import type { UseTableReturnType, PaginationStateType } from '../useTable/types';
 import type { UseFilterOptionsType } from '../useFilter/types';
 import type { SortType } from '../../../types/common';
@@ -15,12 +16,12 @@ export type ActivityTableStatusType =
   (typeof ActivityTableStatus)[keyof typeof ActivityTableStatus];
 
 /**
- * Row type — inferred from Activity's getInProgressList() return type.
- * Resolves to ActivityInstanceType (proxy with .get()/.set()).
+ * Row type for activity table data.
+ * System fields and entity fields are flat at the top level.
  */
 export type ActivityRowType<A extends Activity<any, any, any>> =
-  A extends { getInProgressList(opts?: any): Promise<(infer R)[]> }
-    ? R
+  A extends Activity<infer E, any, any>
+    ? ActivityInstanceFieldsType & E
     : never;
 
 export interface UseActivityTableOptionsType<

package/sdk/components/hooks/useActivityTable/useActivityTable.ts

@@ -13,24 +13,22 @@ export function useActivityTable<A extends Activity<any, any, any>>(
   const { activity, status, ...rest } = options;
   const { businessProcessId, activityId } = activity.meta;
 
+  const ops = useMemo(() => activity._getOps(), [activity]);
+
   const listFn = useMemo(
     () =>
       status === 'inprogress'
-        ? async (opts: any) => ({
-            Data: (await activity.getInProgressList(opts)) as ActivityRowType<A>[],
-          })
-        : async (opts: any) => ({
-            Data: (await activity.getCompletedList(opts)) as ActivityRowType<A>[],
-          }),
-    [activity, status],
+        ? (opts: any) => ops.inProgressList(opts)
+        : (opts: any) => ops.completedList(opts),
+    [ops, status],
   );
 
   const countFn = useMemo(
     () =>
       status === 'inprogress'
-        ? async (opts: any) => ({ Count: await activity.inProgressCount(opts) })
-        : async (opts: any) => ({ Count: await activity.completedCount(opts) }),
-    [activity, status],
+        ? (opts: any) => ops.inProgressCount(opts)
+        : (opts: any) => ops.completedCount(opts),
+    [ops, status],
   );
 
   return useTable<ActivityRowType<A>>({

package/sdk/components/hooks/useBDOForm/createItemProxy.ts

@@ -21,8 +21,9 @@ import type {
  * Key principle: Item has NO state. It's a view over RHF's state.
  * Editable fields get set(), readonly fields do not.
  *
- * In create mode (no _id), attachment and fetch operations use 'draft' as the
- * instanceId, which the backend accepts as a placeholder.
+ * Draft-based upload: In create mode (no _id), upload() automatically creates
+ * a draft record via draftInteraction() to get an _id, then uploads immediately.
+ * On form submit, if a draft _id exists, update() is used instead of create().
  *
  * @param bdo - The BDO instance for field metadata
  * @param form - The RHF useForm return object
@@ -35,11 +36,34 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
   const fields = bdo.getFields();
   const accessorCache = new Map<string, EditableFormFieldAccessorType<unknown> | ReadonlyFormFieldAccessorType<unknown>>();
 
+  // Draft tracking for create mode — shared across all attachment fields in this form
   const boIdShared = bdo.getBoId();
-
-  /** Returns the real _id in edit mode, or 'draft' in create mode */
-  const getInstanceId = (): string =>
-    (form.getValues("_id" as Path<FieldValues>) as string) || "draft";
+  let draftId: string | null = null;
+  let draftPromise: Promise<string> | null = null;
+
+  /**
+   * Ensures a record _id exists for attachment uploads.
+   * In edit mode, returns the existing _id.
+   * In create mode, creates a draft record via draftInteraction() to get an _id.
+   * The draft _id is shared across all attachment fields and only created once.
+   */
+  async function ensureDraft(): Promise<string> {
+    // If form already has an _id (edit mode or previous draft), use it
+    const existing = form.getValues("_id" as Path<FieldValues>) as string | undefined;
+    if (existing) return existing;
+    if (draftId) return draftId;
+    if (!draftPromise) {
+      draftPromise = api(boIdShared).draftInteraction({}).then((d: any) => {
+        draftId = d._id;
+        form.setValue("_id" as Path<FieldValues>, draftId as any, { shouldDirty: false });
+        return draftId!;
+      }).catch((err: Error) => {
+        draftPromise = null;
+        throw err;
+      });
+    }
+    return draftPromise;
+  }
 
   return new Proxy({} as FormItemType<ExtractEditableType<B>, ExtractReadonlyType<B>>, {
     get(_, prop: string | symbol) {
@@ -63,6 +87,11 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
         return () => form.trigger();
       }
 
+      // Internal: check if a draft was created (used by handleSubmit)
+      if (prop === "_hasDraft") {
+        return () => !!draftId;
+      }
+
       // Return cached accessor if available
       if (accessorCache.has(prop)) {
         return accessorCache.get(prop);
@@ -153,12 +182,17 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
         // Enrich Image/File field accessors with attachment methods (draft-based upload)
         if (fieldMeta.Type === "Image" || fieldMeta.Type === "File") {
           const boId = boIdShared;
+          const requireInstanceId = (): string => {
+            const id = form.getValues("_id" as Path<FieldValues>) as string | undefined;
+            if (!id) throw new Error("Save the record before attachment operations");
+            return id;
+          };
 
           if (fieldMeta.Type === "Image") {
             // Image: single file upload — always uploads immediately (draft in create mode)
             (accessor as any).upload = async (file: File): Promise<FileType> => {
               validateFileExtension(file.name, "Image");
-              const id = getInstanceId();
+              const id = await ensureDraft();
 
               const [uploadInfo] = await api(boId).getUploadUrl(id, prop, [
                 { FileName: file.name, Size: file.size, FileExtension: extractFileExtension(file.name) },
@@ -182,7 +216,7 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
 
             (accessor as any).deleteAttachment = async (): Promise<void> => {
               const val = form.getValues(prop as Path<FieldValues>) as any;
-              const instanceId = getInstanceId();
+              const instanceId = requireInstanceId();
               if (!(val?._id)) throw new Error(`${prop} has no image to delete`);
               await api(boId).deleteAttachment(instanceId, prop, val._id);
               form.setValue(prop as Path<FieldValues>, null as any, { shouldDirty: true });
@@ -190,7 +224,7 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
 
             (accessor as any).getDownloadUrl = async (viewType?: AttachmentViewType): Promise<FileDownloadResponseType> => {
               const val = form.getValues(prop as Path<FieldValues>) as any;
-              const instanceId = getInstanceId();
+              const instanceId = requireInstanceId();
               if (!(val?._id)) throw new Error(`${prop} has no image`);
               return api(boId).getDownloadUrl(instanceId, prop, val._id, viewType);
             };
@@ -198,7 +232,7 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
             // File field — multi-file, always uploads immediately (draft in create mode)
             (accessor as any).upload = async (files: File[]): Promise<FileType[]> => {
               for (const file of files) validateFileExtension(file.name, "File");
-              const id = getInstanceId();
+              const id = await ensureDraft();
 
               const requests = files.map((file) => ({
                 FileName: file.name,
@@ -230,7 +264,7 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
 
             (accessor as any).deleteAttachment = async (attachmentId: string): Promise<void> => {
               const current = (form.getValues(prop as Path<FieldValues>) as any[]) ?? [];
-              const instanceId = getInstanceId();
+              const instanceId = requireInstanceId();
               await api(boId).deleteAttachment(instanceId, prop, attachmentId);
               form.setValue(
                 prop as Path<FieldValues>,
@@ -243,13 +277,13 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
               attachmentId: string,
               viewType?: AttachmentViewType,
             ): Promise<FileDownloadResponseType> => {
-              const instanceId = getInstanceId();
+              const instanceId = requireInstanceId();
               return api(boId).getDownloadUrl(instanceId, prop, attachmentId, viewType);
             };
             (accessor as any).getDownloadUrls = async (
               viewType?: AttachmentViewType,
             ): Promise<FileDownloadResponseType[]> => {
-              const instanceId = getInstanceId();
+              const instanceId = requireInstanceId();
               return api(boId).getDownloadUrls(instanceId, prop, viewType);
             };
           }
@@ -280,11 +314,16 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
       // Enrich readonly Image/File field accessors with download methods
       if (fieldMeta.Type === "Image" || fieldMeta.Type === "File") {
         const boId = boIdShared;
+        const requireInstanceId = (): string => {
+          const id = form.getValues("_id" as Path<FieldValues>) as string | undefined;
+          if (!id) throw new Error("Cannot perform attachment operation: item has no _id. Save the item first.");
+          return id;
+        };
 
         if (fieldMeta.Type === "Image") {
           (accessor as any).getDownloadUrl = async (viewType?: AttachmentViewType): Promise<FileDownloadResponseType> => {
             const val = form.getValues(prop as Path<FieldValues>) as any;
-            const instanceId = getInstanceId();
+            const instanceId = requireInstanceId();
             if (!(val?._id)) throw new Error(`${prop} has no image to download`);
             return api(boId).getDownloadUrl(instanceId, prop, val._id, viewType);
           };
@@ -293,13 +332,13 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
             attachmentId: string,
             viewType?: AttachmentViewType,
           ): Promise<FileDownloadResponseType> => {
-            const instanceId = getInstanceId();
+            const instanceId = requireInstanceId();
             return api(boId).getDownloadUrl(instanceId, prop, attachmentId, viewType);
           };
           (accessor as any).getDownloadUrls = async (
             viewType?: AttachmentViewType,
           ): Promise<FileDownloadResponseType[]> => {
-            const instanceId = getInstanceId();
+            const instanceId = requireInstanceId();
             return api(boId).getDownloadUrls(instanceId, prop, viewType);
           };
         }
@@ -313,6 +352,8 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
       if (typeof prop === "symbol") return false;
       if (prop === "_id" || prop === "toJSON" || prop === "validate")
         return true;
+      if (prop === "_hasDraft")
+        return true;
       return prop in fields;
     },
 
@@ -324,7 +365,7 @@ export function createItemProxy<B extends BaseBdo<any, any, any>>(
       if (typeof prop === "symbol") return undefined;
       return {
         configurable: true,
-        enumerable: prop !== "toJSON" && prop !== "validate",
+        enumerable: prop !== "toJSON" && prop !== "validate" && prop !== "_hasDraft",
       };
     },
   });

package/sdk/components/hooks/useBDOTable/types.ts

@@ -1,32 +1,22 @@
-import type { ListOptionsType, SortType } from '../../../types/common';
 import type { UseTableReturnType, PaginationStateType } from '../useTable/types';
 import type { UseFilterOptionsType } from '../useFilter/types';
+import type { SortType } from '../../../types/common';
 
-/** Structural constraint — any object with list() and count() */
-export interface BDOTableSourceType {
-  meta: { readonly _id: string; readonly name: string };
-  list(options?: ListOptionsType): Promise<any[]>;
-  count(options?: ListOptionsType): Promise<number>;
-}
-
-/** Infer row type from BDO's list() return type */
-export type BDORowType<B extends BDOTableSourceType> =
-  B extends { list(opts?: any): Promise<(infer R)[]> } ? R : never;
-
-export interface UseBDOTableOptionsType<B extends BDOTableSourceType> {
-  /** BDO instance — list() and count() are called for data */
-  bdo: B;
+export interface UseBDOTableOptionsType<T> {
+  /** BDO instance — only meta._id is used (for API routing) */
+  bdo: {
+    meta: { readonly _id: string; readonly name: string };
+  };
   /** Initial state */
   initialState?: {
     sort?: SortType;
     pagination?: PaginationStateType;
-    filter?: UseFilterOptionsType<BDORowType<B>>;
+    filter?: UseFilterOptionsType<T>;
   };
   /** Error callback */
   onError?: (error: Error) => void;
-  /** Success callback — receives Item rows from current page */
-  onSuccess?: (data: BDORowType<B>[]) => void;
+  /** Success callback — receives rows from current page */
+  onSuccess?: (data: T[]) => void;
 }
 
-export type UseBDOTableReturnType<B extends BDOTableSourceType> =
-  UseTableReturnType<BDORowType<B>>;
+export type UseBDOTableReturnType<T> = UseTableReturnType<T>;

package/sdk/components/hooks/useBDOTable/useBDOTable.ts

@@ -1,20 +1,16 @@
+import { api } from '../../../api/client';
 import { useTable } from '../useTable';
-import type {
-  BDOTableSourceType,
-  BDORowType,
-  UseBDOTableOptionsType,
-  UseBDOTableReturnType,
-} from './types';
+import type { UseBDOTableOptionsType, UseBDOTableReturnType } from './types';
 
-export function useBDOTable<B extends BDOTableSourceType>(
-  options: UseBDOTableOptionsType<B>,
-): UseBDOTableReturnType<B> {
+export function useBDOTable<T = any>(
+  options: UseBDOTableOptionsType<T>,
+): UseBDOTableReturnType<T> {
   const { bdo, ...rest } = options;
 
-  return useTable<BDORowType<B>>({
+  return useTable<T>({
     queryKey: ['table', bdo.meta._id],
-    listFn: async (opts) => ({ Data: await bdo.list(opts) }),
-    countFn: async (opts) => ({ Count: await bdo.count(opts) }),
+    listFn: (opts) => api<T>(bdo.meta._id).list(opts),
+    countFn: (opts) => api<T>(bdo.meta._id).count(opts),
     ...rest,
   });
 }