@rebasepro/client 0.8.0 → 0.9.0

package/src/index.ts

@@ -1,4 +1,5 @@
 import { createTransport, RebaseClientConfig } from "./transport";
+import { RebaseClientError } from "./errors";
 import { createAuth, CreateAuthOptions } from "./auth";
 import { createAdmin, CreateAdminOptions } from "./admin";
 import { createCron, CreateCronOptions } from "./cron";
@@ -10,27 +11,68 @@ import { ClientStorageSourceRegistry } from "./storage-registry";
 import { RebaseWebSocketClient } from "./websocket";
 import {
     DEFAULT_STORAGE_SOURCE_KEY,
+    InsertOf,
     RebaseClient,
-    RebaseData,
+    RebaseSdkData,
+    RowOf,
     StorageSource,
     StorageSourceDefinition,
-    StorageSourceRegistry
+    StorageSourceRegistry,
+    UpdateOf
 } from "@rebasepro/types";
 import { toSnakeCase } from "@rebasepro/utils";
 
-export * from "./transport";
-export * from "./auth";
-export * from "./admin";
-export * from "./cron";
-export * from "./api-keys";
-export * from "./collection";
-export * from "./query_builder";
-export * from "./websocket";
-export * from "./storage";
-export * from "./storage-registry";
-export * from "./reviver";
-export * from "./functions";
-export type { Entity, FindResponse } from "@rebasepro/types";
+// ─── Public API surface ──────────────────────────────────────────────────────
+//
+// This barrel is the public API of `@rebasepro/client`. It is an explicit,
+// curated list — NOT `export *` — so that adding an export to a module below
+// does not silently republish it to app developers. Internal factories
+// (`createTransport`, `createAuth`, `createCollectionClient`, …), the raw
+// `Transport`, the storage-source registry impl, the JSON reviver, and the
+// concrete `SDKQueryBuilder` class are intentionally NOT re-exported: they are
+// implementation details of `createRebaseClient()` and have no external
+// consumers. App developers reach them through the client instance, never by
+// importing the factory. To add something to the public surface, add it here
+// deliberately.
+
+// Errors — the single error type thrown by SDK HTTP calls, plus the
+// data-proxy's unknown-collection error.
+export { RebaseApiError } from "./transport";
+export { RebaseClientError } from "./errors";
+
+// Query + collection types (annotate SDK results; construct via the fluent API).
+export type { RebaseClientConfig, FindParams, FindResponse } from "./transport";
+export type { CollectionClient } from "./collection";
+export type { FindResult, SDKCollectionClient, SDKQueryBuilderInterface, PaginationMeta } from "@rebasepro/types";
+
+// Logical-condition helpers for `.where(or(...), and(...))`.
+export { QueryBuilder, or, and, cond } from "@rebasepro/common";
+
+// Auth: session/token types, config, and the pluggable storage strategies.
+export { createCookieStorage, createMemoryStorage } from "./auth";
+export type { AuthConfig, AuthStorage, CookieStorageOptions, CreateAuthOptions } from "./auth";
+export type { RebaseSession, AuthTokens, AuthChangeEvent, DeviceSession } from "@rebasepro/types";
+/** @deprecated Import `User` / `AuthTokens` from `@rebasepro/types` instead. */
+export type { RebaseUser, RebaseTokens } from "./auth";
+
+// Control-plane client option/DTO types (the client instance exposes the impls).
+export type { CreateAdminOptions } from "./admin";
+export type { AdminUser } from "./admin";
+export type { CreateCronOptions } from "./cron";
+export type {
+    ApiKeyMasked,
+    ApiKeyPermission,
+    ApiKeyWithSecret,
+    CreateApiKeyRequest,
+    CreateApiKeysOptions,
+    UpdateApiKeyRequest
+} from "./api-keys";
+export type { FunctionInvokeOptions, FunctionsClient } from "./functions";
+
+// Realtime: the WebSocket client class is internal to `createRebaseClient()`,
+// but re-exported (see @internal on the class) because the `client-postgresql`
+// driver constructs it directly. Not a stable app-facing API.
+export { RebaseWebSocketClient } from "./websocket";
 
 export interface CreateRebaseClientOptions extends RebaseClientConfig {
     auth?: CreateAuthOptions;
@@ -62,17 +104,21 @@ type KebabToCamelCase<S extends string> =
     ? `${T}${Capitalize<KebabToCamelCase<U>>}`
     : S;
 
+// Resolve a generated `Database` entry from a (kebab-case) slug literal,
+// or `unknown` when the slug isn't in the schema — the extractors below
+// then fall back to the open row / partial shapes.
+type DBEntry<DB, S extends string> =
+    KebabToCamelCase<S> extends keyof DB ? DB[KebabToCamelCase<S>] : unknown;
+
 type TypedDataLayer<DB> = {
     collection<S extends string>(slug: S): CollectionClient<
-        KebabToCamelCase<S> extends keyof DB
-            ? (DB[KebabToCamelCase<S>] extends { Row: infer R extends Record<string, unknown> } ? R : Record<string, unknown>)
-            : Record<string, unknown>
+        RowOf<DBEntry<DB, S>>,
+        InsertOf<DBEntry<DB, S>>,
+        UpdateOf<DBEntry<DB, S>>
     >;
 } & {
-    [K in keyof DB]: CollectionClient<
-        DB[K] extends { Row: infer R extends Record<string, unknown> } ? R : Record<string, unknown>
-    >;
-} & RebaseData;
+    [K in keyof DB]: CollectionClient<RowOf<DB[K]>, InsertOf<DB[K]>, UpdateOf<DB[K]>>;
+} & RebaseSdkData;
 
 /**
  * The return type of `createRebaseClient<DB>()`.
@@ -81,7 +127,7 @@ type TypedDataLayer<DB> = {
  * capabilities populated and the `data` layer narrowed to provide
  * typed collection accessors when a `DB` schema generic is supplied.
  */
-export type CreateRebaseClientResult<DB = Record<string, unknown>> = Omit<RebaseClient, "data"> & {
+export type CreateRebaseClientResult<DB = Record<string, unknown>> = Omit<RebaseClient<DB>, "data" | "email"> & {
     setToken: (token: string | null) => void;
     setAuthTokenGetter: (getter: () => Promise<string | null>) => void;
     setOnUnauthorized: (handler: () => Promise<boolean>) => void;
@@ -241,7 +287,62 @@ export function createRebaseClient<DB = Record<string, unknown>>(options: Create
         });
     }
 
+    /**
+     * Suggest the closest known collection key for a mistyped accessor.
+     * Uses edit-distance-1 and prefix matching — no external dependency.
+     */
+    function suggestCollection(prop: string, knownKeys: string[]): string | undefined {
+        // Prefix match (e.g. "prod" → "products")
+        const prefixMatch = knownKeys.find(k => k.startsWith(prop) || prop.startsWith(k));
+        if (prefixMatch) return prefixMatch;
+
+        // Edit-distance-1: deletions, insertions, substitutions, transpositions
+        for (const key of knownKeys) {
+            if (Math.abs(key.length - prop.length) > 1) continue;
+            let diffs = 0;
+            const longer = key.length >= prop.length ? key : prop;
+            const shorter = key.length >= prop.length ? prop : key;
+            if (longer.length === shorter.length) {
+                // Same length: allow 1 substitution or 1 transposition
+                for (let i = 0; i < longer.length; i++) {
+                    if (longer[i] !== shorter[i]) {
+                        // Check for transposition
+                        if (
+                            i + 1 < longer.length &&
+                            longer[i] === shorter[i + 1] &&
+                            longer[i + 1] === shorter[i]
+                        ) {
+                            diffs++;
+                            i++; // skip next char (already accounted for)
+                            if (diffs > 1) break;
+                            continue;
+                        }
+                        diffs++;
+                    }
+                    if (diffs > 1) break;
+                }
+            } else {
+                // Length differs by 1: allow 1 insertion/deletion
+                let li = 0;
+                let si = 0;
+                while (li < longer.length) {
+                    if (si < shorter.length && longer[li] === shorter[si]) {
+                        si++;
+                    } else {
+                        diffs++;
+                    }
+                    li++;
+                    if (diffs > 1) break;
+                }
+            }
+            if (diffs <= 1) return key;
+        }
+
+        return undefined;
+    }
+
     const collectionClients = new Map<string, CollectionClient<Record<string, unknown>>>();
+    let untypedWarned = false;
 
     function collection(slug: string): CollectionClient<Record<string, unknown>> {
         if (!collectionClients.has(slug)) {
@@ -259,11 +360,30 @@ export function createRebaseClient<DB = Record<string, unknown>>(options: Create
             }
             if (typeof prop === "symbol") return undefined;
             if (typeof prop === "string" && prop !== "then" && prop !== "toJSON" && prop !== "$$typeof") {
-                if (options.collections && prop in options.collections) {
-                    return collection(options.collections[prop]);
+                if (options.collections) {
+                    if (prop in options.collections) {
+                        return collection(options.collections[prop]);
+                    }
+                    // Strict mode: the developer supplied a typed dictionary,
+                    // so we know the full set of valid accessors.
+                    const knownKeys = Object.keys(options.collections);
+                    const suggestion = suggestCollection(prop, knownKeys);
+                    const knownList = knownKeys.join(", ");
+                    let msg = `Unknown collection accessor "${prop}". Known collections: ${knownList}.`;
+                    if (suggestion) msg += ` Did you mean "${suggestion}"?`;
+                    msg += ` Use data.collection("<slug>") for dynamic slugs.`;
+                    throw new RebaseClientError(msg);
                 }
-                // Convert camelCase property names to snake_case slugs.
+                // Untyped fallback: convert camelCase property names to snake_case slugs.
                 // e.g. `companyMembers` → `company_members`
+                if (!untypedWarned) {
+                    untypedWarned = true;
+                    console.warn(
+                        `[Rebase] Untyped data access detected (client.data.${prop}). ` +
+                        `Collection names are resolved via snake_case conversion, which may cause silent 404s at request time. ` +
+                        `Pass a \`collections\` dictionary to createRebaseClient() or use the generated SDK for type-safe access.`
+                    );
+                }
                 const slug = toSnakeCase(prop);
                 return collection(slug);
             }
@@ -297,7 +417,6 @@ export function createRebaseClient<DB = Record<string, unknown>>(options: Create
             return res.data ?? (res as T);
         },
         data: dataProxy,
-        email: undefined
     } as unknown as CreateRebaseClientResult<DB>;
 
     return target;

package/src/reviver.ts

@@ -1,4 +1,4 @@
-import { EntityReference, EntityRelation, GeoPoint, Vector, Entity } from "@rebasepro/types";
+import { EntityReference, EntityRelation, GeoPoint, Vector } from "@rebasepro/types";
 
 export function rebaseReviver(_key: string, value: unknown): unknown {
     if (value && typeof value === "object" && "__type" in value) {
@@ -25,7 +25,7 @@ export function rebaseReviver(_key: string, value: unknown): unknown {
                 return new EntityRelation(
                     record.id as string | number,
                     record.path as string,
-                    record.data as Entity | undefined
+                    record.data as Record<string, unknown> | undefined
                 );
             case "GeoPoint":
                 return new GeoPoint(record.latitude as number, record.longitude as number);

package/src/sdk_query_builder.ts

@@ -0,0 +1,138 @@
+import {
+    FindParams,
+    FindResult,
+    LogicalCondition,
+    SDKCollectionClient,
+    SDKQueryBuilderInterface,
+    WhereFilterOp,
+    WhereValue
+} from "@rebasepro/types";
+
+/**
+ * SDK Query Builder — returns flat rows (`FindResult<M>`) instead of
+ * Entity-wrapped results (`FindResponse<M>`).
+ *
+ * @example
+ * const { data } = await rebase.data.posts
+ *     .where("status", "==", "published")
+ *     .orderBy("created_at", "desc")
+ *     .limit(10)
+ *     .find();
+ *
+ * console.log(data[0].title); // flat access
+ */
+export class SDKQueryBuilder<M extends Record<string, unknown> = Record<string, unknown>> implements SDKQueryBuilderInterface<M> {
+    private params: FindParams = { where: {} };
+
+    constructor(private collection: SDKCollectionClient<M>) {}
+
+    /**
+     * Add a filter condition to your query.
+     * @example
+     * client.data.users.where('age', '>=', 18).find()
+     */
+    where<K extends keyof M & string>(column: K, operator: WhereFilterOp, value: WhereValue<M[K]>): this;
+    where(logicalCondition: LogicalCondition): this;
+    where(columnOrCondition: string | LogicalCondition, operator?: WhereFilterOp, value?: unknown): this {
+        if (typeof columnOrCondition === "object" && columnOrCondition !== null && "type" in columnOrCondition) {
+            this.params.logical = columnOrCondition as LogicalCondition;
+            return this;
+        }
+
+        if (!this.params.where) {
+            this.params.where = {};
+        }
+
+        const column = columnOrCondition as string;
+        const condition: [WhereFilterOp, unknown] = [operator!, value];
+        const existing = this.params.where[column];
+
+        if (existing === undefined) {
+            this.params.where[column] = condition;
+        } else if (Array.isArray(existing) && existing.length > 0 && Array.isArray(existing[0])) {
+            (this.params.where[column] as [WhereFilterOp, unknown][]).push(condition);
+        } else {
+            let firstCondition: [WhereFilterOp, unknown];
+            if (Array.isArray(existing) && existing.length === 2 && typeof existing[0] === "string") {
+                firstCondition = existing as [WhereFilterOp, unknown];
+            } else {
+                firstCondition = ["==", existing];
+            }
+            this.params.where[column] = [firstCondition, condition];
+        }
+
+        return this;
+    }
+
+    /**
+     * Order the results by a specific column.
+     */
+    orderBy(column: keyof M & string, direction: "asc" | "desc" = "asc"): this {
+        this.params.orderBy = [column, direction];
+        return this;
+    }
+
+    /**
+     * Limit the number of results returned.
+     */
+    limit(count: number): this {
+        this.params.limit = count;
+        return this;
+    }
+
+    /**
+     * Skip the first N results.
+     */
+    offset(count: number): this {
+        this.params.offset = count;
+        return this;
+    }
+
+    /**
+     * Set a free-text search string if supported by the backend.
+     */
+    search(searchString: string): this {
+        this.params.searchString = searchString;
+        return this;
+    }
+
+    /**
+     * Include related entities in the response.
+     * Relations will be populated with full data instead of just IDs.
+     *
+     * @param relations - Relation names to include, or "*" for all.
+     * @example
+     * client.data.posts.include("tags", "author").find()
+     */
+    include(...relations: string[]): this {
+        this.params.include = relations;
+        return this;
+    }
+
+    /**
+     * Execute the find query and return the results as flat rows.
+     */
+    async find(): Promise<FindResult<M>> {
+        return this.collection.find(this.params);
+    }
+
+    /**
+     * Count the records matching this query.
+     */
+    async count(): Promise<number> {
+        if (!this.collection.count) {
+            throw new Error("count() is not supported by this collection client.");
+        }
+        return this.collection.count(this.params);
+    }
+
+    /**
+     * Listen to realtime updates matching this query.
+     */
+    listen(onUpdate: (data: FindResult<M>) => void, onError?: (error: Error) => void): () => void {
+        if (!this.collection.listen) {
+            throw new Error("Listen is only available when RebaseClient is configured with a websocketUrl.");
+        }
+        return this.collection.listen(this.params, onUpdate, onError);
+    }
+}

package/src/storage.ts

@@ -1,4 +1,4 @@
-import { StorageSource, UploadFileProps, UploadFileResult, DownloadConfig, StorageListResult, DownloadMetadata } from "@rebasepro/types";
+import { StorageSource, UploadFileProps, UploadFileResult, DownloadConfig, StorageListResult, DownloadMetadata, PUBLIC_STORAGE_PREFIX, isPublicStoragePath } from "@rebasepro/types";
 import { Transport } from "./transport";
 
 /**
@@ -10,7 +10,7 @@ import { Transport } from "./transport";
  *                    `StorageController` is resolved from the registry.
  */
 export function createStorage(transport: Transport, storageId?: string): StorageSource {
-    const urlsCache = new Map<string, DownloadConfig>();
+    const urlsCache = new Map<string, { config: DownloadConfig; expiresAt?: number }>();
 
     /** Append ?storageId=... to a path when multi-backend routing is active. */
     const withStorageId = (path: string): string => {
@@ -23,12 +23,22 @@ export function createStorage(transport: Transport, storageId?: string): Storage
         file,
         key,
         metadata,
-        bucket
+        bucket,
+        public: isPublic
     }: UploadFileProps): Promise<UploadFileResult> {
         const formData = new FormData();
         formData.append("file", file);
 
-        if (key) formData.append("key", key);
+        // Public objects live under the public prefix so they can be served
+        // token-less via a stable, permanent URL. Normalize the key here so the
+        // stored path is self-describing (no server round-trip needed to know
+        // it's public).
+        let effectiveKey = key;
+        if (isPublic && effectiveKey && !isPublicStoragePath(effectiveKey)) {
+            effectiveKey = `${PUBLIC_STORAGE_PREFIX}${effectiveKey.replace(/^\/+/, "")}`;
+        }
+
+        if (effectiveKey) formData.append("key", effectiveKey);
         if (bucket) formData.append("bucket", bucket);
         if (storageId) formData.append("storageId", storageId);
 
@@ -57,8 +67,13 @@ export function createStorage(transport: Transport, storageId?: string): Storage
         bucket?: string
     ): Promise<DownloadConfig> {
         const cacheKey = bucket ? `${bucket}/${keyOrUrl}` : keyOrUrl;
-        const cached = urlsCache.get(cacheKey);
-        if (cached) return cached;
+        const cachedEntry = urlsCache.get(cacheKey);
+        if (cachedEntry) {
+            if (!cachedEntry.expiresAt || cachedEntry.expiresAt > Date.now()) {
+                return cachedEntry.config;
+            }
+            urlsCache.delete(cacheKey);
+        }
 
         let filePath = keyOrUrl;
 
@@ -71,30 +86,58 @@ export function createStorage(transport: Transport, storageId?: string): Storage
         }
 
         if (!filePath || filePath.trim() === "" || filePath === "/") {
-            return { url: null,
-fileNotFound: true };
+            return { url: null, fileNotFound: true };
+        }
+
+        // ── Public objects ────────────────────────────────────────────────
+        // A public file (under the public prefix) is served token-less via a
+        // stable, permanent, CDN-cacheable URL. No metadata round-trip and no
+        // token are needed — build the URL directly and cache it forever.
+        if (isPublicStoragePath(filePath)) {
+            const publicConfig: DownloadConfig = {
+                url: withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}`)
+            };
+            urlsCache.set(cacheKey, { config: publicConfig }); // no expiry
+            return publicConfig;
         }
 
         try {
             const result = await transport.request<{ data: DownloadMetadata }>(withStorageId(`/storage/metadata/${filePath}`));
 
-            const activeToken = await transport.resolveToken();
-            const tokenQuery = activeToken ? `?token=${activeToken}` : "";
+            // Public object (server-confirmed): token-less permanent URL.
+            if (result.data.public) {
+                const publicConfig: DownloadConfig = {
+                    url: withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}`),
+                    metadata: result.data
+                };
+                urlsCache.set(cacheKey, { config: publicConfig }); // no expiry
+                return publicConfig;
+            }
+
+            // Private object: use the short-lived, file-scoped download token
+            // minted by the server. We deliberately do NOT fall back to the
+            // caller's access token — a URL must never carry a full-privilege
+            // credential. If no scoped token is present the URL fails closed.
+            const scopedToken = result.data.token;
+            const tokenQuery = scopedToken ? `?token=${scopedToken}` : "";
 
             const downloadConfig: DownloadConfig = {
                 // `withStorageId` picks `?` or `&` based on whether the token
                 // query is already present, so the URL stays valid even when
-                // there is no auth token.
+                // there is no token.
                 url: withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}${tokenQuery}`),
                 metadata: result.data
             };
 
-            urlsCache.set(cacheKey, downloadConfig);
+            const expiresAt = result.data.tokenExpiresIn
+                ? Date.now() + (result.data.tokenExpiresIn - 10) * 1000 // subtract 10s buffer
+                : undefined;
+
+            urlsCache.set(cacheKey, { config: downloadConfig, expiresAt });
             return downloadConfig;
         } catch (e: unknown) {
             if (e instanceof Error && "status" in e && (e as { status: number }).status === 404) {
-                return { url: null,
-fileNotFound: true };
+                return { url: null, fileNotFound: true };
             }
             throw e;
         }
@@ -104,33 +147,22 @@ fileNotFound: true };
         key: string,
         bucket?: string
     ): Promise<File | null> {
-        let filePath = key;
-
-        if (filePath && (filePath.startsWith("local://") || filePath.startsWith("s3://") || filePath.startsWith("gs://"))) {
-            filePath = filePath.substring(filePath.indexOf("://") + 3);
-        }
-
-        if (bucket && filePath && !filePath.startsWith(bucket)) {
-            filePath = `${bucket}/${filePath}`;
-        }
-
-        if (!filePath || filePath.trim() === "" || filePath === "/") {
+        const downloadConfig = await getSignedUrl(key, bucket);
+        if (downloadConfig.fileNotFound || !downloadConfig.url) {
             return null;
         }
 
-        // We must use plain fetch because transport.request expects JSON response, but here we want a Blob.
-        const url = withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}`);
-
-        // This is a bit manual, but necessary for blob handling
-        const response = await transport.fetchFn(url, {
-            headers: transport.getHeaders ? transport.getHeaders() : {}
+        // Fetch using the signed URL directly. Since the scoped token is in the ?token= query param,
+        // we explicitly omit any Authorization headers to prevent passing full access tokens to file serving routes.
+        const response = await transport.fetchFn(downloadConfig.url, {
+            headers: {}
         });
 
         if (response.status === 404) return null;
         if (!response.ok) throw new Error("Failed to get file");
 
         const blob = await response.blob();
-        const fileName = filePath.split("/").pop() || "file";
+        const fileName = (bucket ? `${bucket}/${key}` : key).split("/").pop() || "file";
         return new File([blob], fileName, { type: blob.type });
     }
 

package/src/transport.ts

@@ -1,7 +1,13 @@
-import { FindParams as TypesFindParams, FindResponse as TypesFindResponse } from "@rebasepro/types";
-import { serializeFilter, serializeLogicalCondition } from "@rebasepro/common";
+import { FindParams as TypesFindParams, FindResponse as TypesFindResponse, RebaseApiError } from "@rebasepro/types";
+import { serializeFilter, serializeLogicalCondition, serializeOrderBy } from "@rebasepro/common";
 import { rebaseReviver } from "./reviver";
 
+// The canonical client error now lives in `@rebasepro/types` so every package
+// (client, auth, …) throws one type. Re-exported here to preserve the historical
+// `import { RebaseApiError } from ".../transport"` path used across the SDK.
+export { RebaseApiError } from "@rebasepro/types";
+export type { RebaseErrorInit } from "@rebasepro/types";
+
 export interface RebaseClientConfig {
     baseUrl?: string;
     token?: string;
@@ -17,20 +23,6 @@ export interface RebaseClientConfig {
 export type FindParams = TypesFindParams;
 export type FindResponse<T> = TypesFindResponse<T extends Record<string, unknown> ? T : Record<string, unknown>>;
 
-export class RebaseApiError extends Error {
-    status: number;
-    code?: string;
-    details?: unknown;
-
-    constructor(status: number, message: string, code?: string, details?: unknown) {
-        super(message);
-        this.name = "RebaseApiError";
-        this.status = status;
-        this.code = code;
-        this.details = details;
-    }
-}
-
 export function buildQueryString(params?: FindParams): string {
     if (!params) return "";
     const parts: string[] = [];
@@ -40,7 +32,8 @@ export function buildQueryString(params?: FindParams): string {
     if (params.page != null) parts.push(`page=${params.page}`);
 
     if (params.orderBy) {
-        parts.push(`orderBy=${encodeURIComponent(params.orderBy)}`);
+        const wire = serializeOrderBy(params.orderBy);
+        if (wire) parts.push(`orderBy=${encodeURIComponent(wire)}`);
     }
 
     if (params.searchString) {
@@ -138,12 +131,15 @@ headers });
             }
         }
 
+        // The server always emits the canonical `{ error: { message, code, details? } }`
+        // envelope (formatted by the central errorHandler), so we read strictly
+        // from `body.error.*`.
         const getErrorField = (obj: Record<string, unknown>, field: string): unknown => {
             const err = obj?.error;
-            if (err && typeof err === "object" && err !== null && field in (err as Record<string, unknown>)) {
+            if (err && typeof err === "object" && err !== null) {
                 return (err as Record<string, unknown>)[field];
             }
-            return obj?.[field];
+            return undefined;
         };
 
         if (res.status === 401 && onUnauthorizedHandler) {
@@ -176,10 +172,12 @@ headers: retryHeaders });
                         fallbackMessage = `Endpoint not found (${method} ${path}). This usually means the collection is not registered on the backend, or the frontend API URL configuration (e.g. VITE_API_URL) is missing or pointing to the wrong host.`;
                     }
                     throw new RebaseApiError(
-                        retryRes.status,
                         String(getErrorField(retryBody, "message") || fallbackMessage || `Request failed with status ${retryRes.status}`),
-                        getErrorField(retryBody, "code") as string | undefined,
-                        getErrorField(retryBody, "details")
+                        {
+                            status: retryRes.status,
+                            code: getErrorField(retryBody, "code") as string | undefined,
+                            details: getErrorField(retryBody, "details")
+                        }
                     );
                 }
                 return retryBody as T;
@@ -193,10 +191,12 @@ headers: retryHeaders });
                 fallbackMessage = `Endpoint not found (${method} ${path}). This usually means the collection is not registered on the backend, or the frontend API URL configuration (e.g. VITE_API_URL) is missing or pointing to the wrong host.`;
             }
             throw new RebaseApiError(
-                res.status,
                 String(getErrorField(body, "message") || fallbackMessage || `Request failed with status ${res.status}`),
-                getErrorField(body, "code") as string | undefined,
-                getErrorField(body, "details")
+                {
+                    status: res.status,
+                    code: getErrorField(body, "code") as string | undefined,
+                    details: getErrorField(body, "details")
+                }
             );
         }