@rebasepro/client 0.0.1-canary.4d4fb3e → 0.0.1-canary.ca2cb6e

package/dist/index.es.js

@@ -1,3 +1,42 @@
+import { Vector, GeoPoint, EntityRelation, EntityReference } from "@rebasepro/types";
+import { toSnakeCase } from "@rebasepro/utils";
+function rebaseReviver(_key, value) {
+  if (value && typeof value === "object" && "__type" in value) {
+    const record = value;
+    switch (record.__type) {
+      case "date":
+      case "Date": {
+        if (typeof record.value !== "string") {
+          return value;
+        }
+        const date = new Date(record.value);
+        return isNaN(date.getTime()) ? null : date;
+      }
+      case "reference":
+      case "EntityReference":
+        return new EntityReference({
+          id: String(record.id),
+          path: record.path,
+          driver: record.driver,
+          databaseId: record.databaseId
+        });
+      case "relation":
+      case "EntityRelation":
+        return new EntityRelation(
+          record.id,
+          record.path,
+          record.data
+        );
+      case "GeoPoint":
+        return new GeoPoint(record.latitude, record.longitude);
+      case "Vector":
+        return new Vector(record.value);
+      default:
+        return value;
+    }
+  }
+  return value;
+}
 class RebaseApiError extends Error {
   status;
   code;
@@ -10,6 +49,30 @@ class RebaseApiError extends Error {
     this.details = details;
   }
 }
+const OP_MAP = {
+  "==": "eq",
+  "!=": "neq",
+  ">": "gt",
+  ">=": "gte",
+  "<": "lt",
+  "<=": "lte",
+  "not-in": "nin",
+  "array-contains": "cs",
+  "array-contains-any": "csa"
+};
+function normalizeWhereValue(value) {
+  if (value === null) return "eq.null";
+  if (typeof value === "boolean") return `eq.${value}`;
+  if (typeof value === "number") return String(value);
+  if (Array.isArray(value) && value.length === 2) {
+    const [rawOp, val] = value;
+    const op = OP_MAP[rawOp] ?? rawOp;
+    if (val === null) return `${op}.null`;
+    if (Array.isArray(val)) return `${op}.(${val.join(",")})`;
+    return `${op}.${val}`;
+  }
+  return String(value);
+}
 function buildQueryString(params) {
   if (!params) return "";
   const parts = [];
@@ -19,12 +82,16 @@ function buildQueryString(params) {
   if (params.orderBy) {
     parts.push(`orderBy=${encodeURIComponent(params.orderBy)}`);
   }
+  if (params.searchString) {
+    parts.push(`searchString=${encodeURIComponent(params.searchString)}`);
+  }
   if (params.include && params.include.length > 0) {
     parts.push(`include=${encodeURIComponent(params.include.join(","))}`);
   }
   if (params.where) {
     for (const [field, value] of Object.entries(params.where)) {
-      parts.push(`${encodeURIComponent(field)}=${encodeURIComponent(String(value))}`);
+      const normalized = normalizeWhereValue(value);
+      parts.push(`${encodeURIComponent(field)}=${encodeURIComponent(normalized)}`);
     }
   }
   return parts.length > 0 ? "?" + parts.join("&") : "";
@@ -43,7 +110,8 @@ function createTransport(config) {
     };
   }
   async function request(path, init) {
-    const url = config.baseUrl.replace(/\/$/, "") + apiPath + path;
+    const base = config.baseUrl ? config.baseUrl.replace(/\/$/, "") : "";
+    const url = base + apiPath + path;
     let activeToken = token;
     if (tokenGetter) {
       try {
@@ -58,9 +126,19 @@ function createTransport(config) {
     if (init?.body instanceof FormData) {
       delete headers["Content-Type"];
     }
-    const res = await fetchFn(url, { ...init, headers });
+    const res = await fetchFn(url, {
+      ...init,
+      headers
+    });
     if (res.status === 204) return void 0;
-    const body = await res.json().catch(() => ({}));
+    const text = await res.text().catch(() => "");
+    let body = {};
+    if (text) {
+      try {
+        body = JSON.parse(text, rebaseReviver);
+      } catch (e) {
+      }
+    }
     if (res.status === 401 && onUnauthorizedHandler) {
       const retried = await onUnauthorizedHandler();
       if (retried) {
@@ -75,13 +153,28 @@ function createTransport(config) {
           }
         }
         const retryHeaders = getHeaders(retryToken, init);
-        const retryRes = await fetchFn(url, { ...init, headers: retryHeaders });
+        const retryRes = await fetchFn(url, {
+          ...init,
+          headers: retryHeaders
+        });
         if (retryRes.status === 204) return void 0;
-        const retryBody = await retryRes.json().catch(() => ({}));
+        const retryText = await retryRes.text().catch(() => "");
+        let retryBody = {};
+        if (retryText) {
+          try {
+            retryBody = JSON.parse(retryText, rebaseReviver);
+          } catch (e) {
+          }
+        }
         if (!retryRes.ok) {
+          let fallbackMessage = retryRes.statusText;
+          if (retryRes.status === 404 && !fallbackMessage) {
+            const method = init?.method || "GET";
+            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,
-            retryBody?.error?.message || retryBody?.message || retryRes.statusText,
+            retryBody?.error?.message || retryBody?.message || fallbackMessage || `Request failed with status ${retryRes.status}`,
             retryBody?.error?.code || retryBody?.code,
             retryBody?.error?.details || retryBody?.details
           );
@@ -90,9 +183,14 @@ function createTransport(config) {
       }
     }
     if (!res.ok) {
+      let fallbackMessage = res.statusText;
+      if (res.status === 404 && !fallbackMessage) {
+        const method = init?.method || "GET";
+        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,
-        body?.error?.message || body?.message || res.statusText,
+        body?.error?.message || body?.message || fallbackMessage || `Request failed with status ${res.status}`,
         body?.error?.code || body?.code,
         body?.error?.details || body?.details
       );
@@ -111,7 +209,7 @@ function createTransport(config) {
       onUnauthorizedHandler = handler;
     },
     get baseUrl() {
-      return config.baseUrl.replace(/\/$/, "");
+      return config.baseUrl ? config.baseUrl.replace(/\/$/, "") : "";
     },
     get apiPath() {
       return apiPath;
@@ -248,16 +346,26 @@ function createAuth(transport, options) {
     const res = await fetchFn(authUrl("/login"), {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ email, password })
+      body: JSON.stringify({
+        email,
+        password
+      })
     });
     const body = await res.json().catch(() => ({}));
     if (!res.ok) throwApiError(res.status, body, res.statusText);
     const session = handleAuthResponse(body, "SIGNED_IN");
-    return { user: session.user, accessToken: session.accessToken, refreshToken: session.refreshToken };
+    return {
+      user: session.user,
+      accessToken: session.accessToken,
+      refreshToken: session.refreshToken
+    };
   }
   async function signUp(email, password, displayName) {
     const fetchFn = getFetch();
-    const payload = { email, password };
+    const payload = {
+      email,
+      password
+    };
     if (displayName !== void 0) payload.displayName = displayName;
     const res = await fetchFn(authUrl("/register"), {
       method: "POST",
@@ -267,7 +375,11 @@ function createAuth(transport, options) {
     const body = await res.json().catch(() => ({}));
     if (!res.ok) throwApiError(res.status, body, res.statusText);
     const session = handleAuthResponse(body, "SIGNED_IN");
-    return { user: session.user, accessToken: session.accessToken, refreshToken: session.refreshToken };
+    return {
+      user: session.user,
+      accessToken: session.accessToken,
+      refreshToken: session.refreshToken
+    };
   }
   async function signInWithGoogle(idToken) {
     const fetchFn = getFetch();
@@ -279,7 +391,108 @@ function createAuth(transport, options) {
     const body = await res.json().catch(() => ({}));
     if (!res.ok) throwApiError(res.status, body, res.statusText);
     const session = handleAuthResponse(body, "SIGNED_IN");
-    return { user: session.user, accessToken: session.accessToken, refreshToken: session.refreshToken };
+    return {
+      user: session.user,
+      accessToken: session.accessToken,
+      refreshToken: session.refreshToken
+    };
+  }
+  async function signInWithLinkedin(code, redirectUri) {
+    const fetchFn = getFetch();
+    const res = await fetchFn(authUrl("/linkedin"), {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        code,
+        redirectUri
+      })
+    });
+    const body = await res.json().catch(() => ({}));
+    if (!res.ok) throwApiError(res.status, body, res.statusText);
+    const session = handleAuthResponse(body, "SIGNED_IN");
+    return {
+      user: session.user,
+      accessToken: session.accessToken,
+      refreshToken: session.refreshToken
+    };
+  }
+  async function signInWithOAuth(providerId, payload) {
+    const fetchFn = getFetch();
+    const res = await fetchFn(authUrl(`/${providerId}`), {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(payload)
+    });
+    const body = await res.json().catch(() => ({}));
+    if (!res.ok) throwApiError(res.status, body, res.statusText);
+    const session = handleAuthResponse(body, "SIGNED_IN");
+    return {
+      user: session.user,
+      accessToken: session.accessToken,
+      refreshToken: session.refreshToken
+    };
+  }
+  async function signInWithGitHub(code, redirectUri) {
+    return signInWithOAuth("github", {
+      code,
+      redirectUri
+    });
+  }
+  async function signInWithMicrosoft(code, redirectUri) {
+    return signInWithOAuth("microsoft", {
+      code,
+      redirectUri
+    });
+  }
+  async function signInWithApple(code, redirectUri, user) {
+    return signInWithOAuth("apple", {
+      code,
+      redirectUri,
+      user
+    });
+  }
+  async function signInWithFacebook(code, redirectUri) {
+    return signInWithOAuth("facebook", {
+      code,
+      redirectUri
+    });
+  }
+  async function signInWithTwitter(code, redirectUri, codeVerifier) {
+    return signInWithOAuth("twitter", {
+      code,
+      redirectUri,
+      codeVerifier
+    });
+  }
+  async function signInWithDiscord(code, redirectUri) {
+    return signInWithOAuth("discord", {
+      code,
+      redirectUri
+    });
+  }
+  async function signInWithGitLab(code, redirectUri) {
+    return signInWithOAuth("gitlab", {
+      code,
+      redirectUri
+    });
+  }
+  async function signInWithBitbucket(code, redirectUri) {
+    return signInWithOAuth("bitbucket", {
+      code,
+      redirectUri
+    });
+  }
+  async function signInWithSlack(code, redirectUri) {
+    return signInWithOAuth("slack", {
+      code,
+      redirectUri
+    });
+  }
+  async function signInWithSpotify(code, redirectUri) {
+    return signInWithOAuth("spotify", {
+      code,
+      redirectUri
+    });
   }
   async function signOut() {
     const fetchFn = getFetch();
@@ -337,7 +550,10 @@ function createAuth(transport, options) {
       body: JSON.stringify(updates)
     });
     if (currentSession) {
-      currentSession = { ...currentSession, user: data.user };
+      currentSession = {
+        ...currentSession,
+        user: data.user
+      };
       saveSession(currentSession);
       emit("USER_UPDATED", currentSession);
     }
@@ -359,7 +575,10 @@ function createAuth(transport, options) {
     const res = await fetchFn(authUrl("/reset-password"), {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ token, password })
+      body: JSON.stringify({
+        token,
+        password
+      })
     });
     const body = await res.json().catch(() => ({}));
     if (!res.ok) throwApiError(res.status, body, res.statusText);
@@ -368,7 +587,10 @@ function createAuth(transport, options) {
   async function changePassword(oldPassword, newPassword) {
     return transport.request(authPath + "/change-password", {
       method: "POST",
-      body: JSON.stringify({ oldPassword, newPassword })
+      body: JSON.stringify({
+        oldPassword,
+        newPassword
+      })
     });
   }
   async function sendVerificationEmail() {
@@ -447,6 +669,18 @@ function createAuth(transport, options) {
     signInWithEmail,
     signUp,
     signInWithGoogle,
+    signInWithLinkedin,
+    signInWithOAuth,
+    signInWithGitHub,
+    signInWithMicrosoft,
+    signInWithApple,
+    signInWithFacebook,
+    signInWithTwitter,
+    signInWithDiscord,
+    signInWithGitLab,
+    signInWithBitbucket,
+    signInWithSlack,
+    signInWithSpotify,
     signOut,
     refreshSession,
     getUser,
@@ -546,6 +780,49 @@ function createAdmin(transport, options) {
     bootstrap
   };
 }
+function createCron(transport, options) {
+  const cronPath = options?.cronPath || "/cron";
+  async function listJobs() {
+    return transport.request(cronPath, { method: "GET" });
+  }
+  async function getJob(jobId) {
+    return transport.request(
+      cronPath + "/" + encodeURIComponent(jobId),
+      { method: "GET" }
+    );
+  }
+  async function triggerJob(jobId) {
+    return transport.request(
+      cronPath + "/" + encodeURIComponent(jobId) + "/trigger",
+      { method: "POST" }
+    );
+  }
+  async function getJobLogs(jobId, options2) {
+    const params = new URLSearchParams();
+    if (options2?.limit !== void 0) params.set("limit", String(options2.limit));
+    const qs = params.toString();
+    return transport.request(
+      cronPath + "/" + encodeURIComponent(jobId) + "/logs" + (qs ? "?" + qs : ""),
+      { method: "GET" }
+    );
+  }
+  async function toggleJob(jobId, enabled) {
+    return transport.request(
+      cronPath + "/" + encodeURIComponent(jobId),
+      {
+        method: "PUT",
+        body: JSON.stringify({ enabled })
+      }
+    );
+  }
+  return {
+    listJobs,
+    getJob,
+    triggerJob,
+    getJobLogs,
+    toggleJob
+  };
+}
 function mapOperator(op) {
   switch (op) {
     case "==":
@@ -577,7 +854,7 @@ class QueryBuilder {
   params = { where: {} };
   /**
    * Add a filter condition to your query.
-   * @example 
+   * @example
    * client.collection('users').where('age', '>=', 18).find()
    */
   where(column, operator, value) {
@@ -596,7 +873,7 @@ class QueryBuilder {
   }
   /**
    * Order the results by a specific column.
-   * @example 
+   * @example
    * client.collection('users').orderBy('createdAt', 'desc').find()
    */
   orderBy(column, ascending = "asc") {
@@ -659,7 +936,46 @@ class QueryBuilder {
 function parseWhereFilter(where) {
   if (!where) return void 0;
   const filters = {};
-  for (const [key, value] of Object.entries(where)) {
+  for (const [key, rawValue] of Object.entries(where)) {
+    if (rawValue === null) {
+      filters[key] = ["==", null];
+      continue;
+    }
+    if (typeof rawValue === "boolean") {
+      filters[key] = ["==", rawValue];
+      continue;
+    }
+    if (typeof rawValue === "number") {
+      filters[key] = ["==", rawValue];
+      continue;
+    }
+    if (Array.isArray(rawValue) && rawValue.length === 2) {
+      const [rawOp, val] = rawValue;
+      const OP_TO_FILTER = {
+        "eq": "==",
+        "neq": "!=",
+        "gt": ">",
+        "gte": ">=",
+        "lt": "<",
+        "lte": "<=",
+        "==": "==",
+        "!=": "!=",
+        ">": ">",
+        ">=": ">=",
+        "<": "<",
+        "<=": "<=",
+        "in": "in",
+        "nin": "not-in",
+        "not-in": "not-in",
+        "cs": "array-contains",
+        "csa": "array-contains-any",
+        "array-contains": "array-contains",
+        "array-contains-any": "array-contains-any"
+      };
+      filters[key] = [OP_TO_FILTER[rawOp] ?? "==", val];
+      continue;
+    }
+    const value = String(rawValue);
     const dotIndex = value.indexOf(".");
     if (dotIndex > 0) {
       const opStr = value.substring(0, dotIndex);
@@ -707,7 +1023,7 @@ function parseWhereFilter(where) {
       if (val === "true") val = true;
       else if (val === "false") val = false;
       else if (val === "null") val = null;
-      else if (typeof val === "string" && /^[0-9]+(\.[0-9]+)?$/.test(val)) val = Number(val);
+      else if (typeof val === "string" && /^[0-9]+(\.[0-9]+)?$/.test(val) && key !== "id" && !key.endsWith("_id")) val = Number(val);
       filters[key] = [op, val];
     } else {
       filters[key] = ["==", value];
@@ -724,7 +1040,7 @@ function rowToEntity(row, slug) {
 }
 function createCollectionClient(transport, slug, ws) {
   const basePath = `/data/${slug}`;
-  return {
+  const client = {
     async find(params) {
       const qs = buildQueryString(params);
       const raw = await transport.request(basePath + qs, { method: "GET" });
@@ -761,74 +1077,84 @@ function createCollectionClient(transport, slug, ws) {
         method: "DELETE"
       });
     },
-    ...ws && {
-      listen(params, onUpdate, onError) {
-        return ws.listenCollection(
-          {
-            path: slug,
-            filter: parseWhereFilter(params?.where),
-            limit: params?.limit,
-            startAfter: params?.offset ? String(params.offset) : void 0,
-            orderBy: params?.orderBy?.split(":")[0],
-            order: params?.orderBy?.split(":")[1],
-            searchString: params?.searchString
-          },
-          (entities) => {
-            const requestedLimit = params?.limit || 20;
-            onUpdate({
-              data: entities,
-              meta: {
-                total: entities.length,
-                limit: requestedLimit,
-                offset: params?.offset || 0,
-                hasMore: entities.length >= requestedLimit
-              }
-            });
-          },
-          onError
-        );
-      },
-      listenById(id, onUpdate, onError) {
-        return ws.listenEntity(
-          { path: slug, entityId: String(id) },
-          (entity) => {
-            if (entity) {
-              onUpdate(entity);
-            } else {
-              onUpdate(void 0);
-            }
-          },
-          onError
-        );
-      }
-    },
     // Fluent builder instantiation
     where(column, operator, value) {
-      return new QueryBuilder(this).where(column, operator, value);
+      return new QueryBuilder(client).where(column, operator, value);
     },
     orderBy(column, ascending) {
-      return new QueryBuilder(this).orderBy(column, ascending);
+      return new QueryBuilder(client).orderBy(column, ascending);
     },
     limit(count) {
-      return new QueryBuilder(this).limit(count);
+      return new QueryBuilder(client).limit(count);
     },
     offset(count) {
-      return new QueryBuilder(this).offset(count);
+      return new QueryBuilder(client).offset(count);
     },
     search(searchString) {
-      return new QueryBuilder(this).search(searchString);
+      return new QueryBuilder(client).search(searchString);
     },
     include(...relations) {
-      return new QueryBuilder(this).include(...relations);
+      return new QueryBuilder(client).include(...relations);
     }
   };
+  if (ws) {
+    client.listen = (params, onUpdate, onError) => {
+      return ws.listenCollection(
+        {
+          path: slug,
+          filter: parseWhereFilter(params?.where),
+          limit: params?.limit,
+          startAfter: params?.offset ? String(params.offset) : void 0,
+          orderBy: params?.orderBy?.split(":")[0],
+          order: params?.orderBy?.split(":")[1],
+          searchString: params?.searchString
+        },
+        (entities) => {
+          const requestedLimit = params?.limit || 20;
+          onUpdate({
+            data: entities,
+            meta: {
+              total: entities.length,
+              limit: requestedLimit,
+              offset: params?.offset || 0,
+              hasMore: entities.length >= requestedLimit
+            }
+          });
+        },
+        onError
+      );
+    };
+    client.listenById = (id, onUpdate, onError) => {
+      return ws.listenEntity(
+        {
+          path: slug,
+          entityId: String(id)
+        },
+        (entity) => {
+          if (entity) {
+            onUpdate(entity);
+          } else {
+            onUpdate(void 0);
+          }
+        },
+        onError
+      );
+    };
+  }
+  return client;
+}
+function rehydrateEntity(entity) {
+  return entity;
 }
 function extractMessageError(message) {
   const payload = message.payload;
   const errPayload = payload?.error;
   const errorMessage = typeof errPayload === "object" ? errPayload.message : payload?.message || (typeof errPayload === "string" ? errPayload : void 0) || message.error || "Unknown error";
   const errorCode = typeof errPayload === "object" ? errPayload.code : payload?.code;
-  return { errorMessage, errorCode };
+  return {
+    errorMessage,
+    errorCode
+  };
 }
 class ApiError extends Error {
   code;
@@ -869,6 +1195,7 @@ class RebaseWebSocketClient {
   maxReconnectAttempts = 5;
   isConnected = false;
   messageQueue = [];
+  reconnectTimeout = null;
   isAuthenticated = false;
   authPromise = null;
   WebSocketConstructor;
@@ -924,18 +1251,29 @@ class RebaseWebSocketClient {
     if (this.isConnected && !this.isAuthenticated && !this.authPromise) {
       console.log("WebSocket auto-authenticating after token getter set");
       this.getAuthToken().then((token) => {
+        if (!this.ws) return;
         if (token) {
-          this.authenticate(token).catch((e) => console.warn("WebSocket auto-auth failed:", e));
+          this.authenticate(token).catch((e) => {
+            if (this.ws) console.warn("WebSocket auto-auth failed:", e);
+          });
         }
       }).catch((e) => {
-        console.warn("WebSocket auto-auth failed:", e);
+        if (this.ws) console.warn("WebSocket auto-auth failed:", e);
       });
     }
   }
   disconnect() {
     this.isAuthenticated = false;
     this.authPromise = null;
+    if (this.reconnectTimeout) {
+      clearTimeout(this.reconnectTimeout);
+      this.reconnectTimeout = null;
+    }
     if (this.ws) {
+      this.ws.onclose = null;
+      this.ws.onerror = null;
+      this.ws.onopen = null;
+      this.ws.onmessage = null;
       this.ws.close();
       this.ws = null;
     }
@@ -970,7 +1308,7 @@ class RebaseWebSocketClient {
       };
       this.ws.onmessage = (event) => {
         try {
-          const message = JSON.parse(event.data);
+          const message = JSON.parse(event.data, rebaseReviver);
           this.handleWebSocketMessage(message);
         } catch (error) {
           console.error("Error parsing WebSocket message:", error);
@@ -1020,7 +1358,11 @@ class RebaseWebSocketClient {
     this.reconnectAttempts++;
     const delay = Math.min(1e3 * Math.pow(2, this.reconnectAttempts), 3e4);
     console.log(`Attempting to reconnect in ${delay}ms (attempt ${this.reconnectAttempts})`);
-    setTimeout(() => {
+    if (this.reconnectTimeout) {
+      clearTimeout(this.reconnectTimeout);
+    }
+    this.reconnectTimeout = setTimeout(() => {
+      this.reconnectTimeout = null;
       this.initWebSocket();
     }, delay);
   }
@@ -1049,7 +1391,7 @@ class RebaseWebSocketClient {
       if (subscriptionKey) {
         const collectionSub = this.collectionSubscriptions.get(subscriptionKey);
         if (collectionSub) {
-          const incomingEntities = message.entities || [];
+          const incomingEntities = (message.entities || []).map((e) => rehydrateEntity(e));
           const entities = this.mergeEntities(collectionSub.latestData, incomingEntities);
           collectionSub.latestData = entities;
           collectionSub.lastUpdated = Date.now();
@@ -1073,7 +1415,7 @@ class RebaseWebSocketClient {
       if (subscriptionKey) {
         const collectionSub = this.collectionSubscriptions.get(subscriptionKey);
         if (collectionSub && collectionSub.isInitialDataReceived && collectionSub.latestData) {
-          const patchEntity = message.entity;
+          const patchEntity = message.entity ? rehydrateEntity(message.entity) : message.entity;
           const patchEntityId = message.entityId;
           let updated;
           if (patchEntity === null || patchEntity === void 0) {
@@ -1108,7 +1450,7 @@ class RebaseWebSocketClient {
       if (subscriptionKey) {
         const entitySub = this.entitySubscriptions.get(subscriptionKey);
         if (entitySub) {
-          const entity = message.entity ?? null;
+          const entity = message.entity ? rehydrateEntity(message.entity) : null;
           entitySub.latestData = entity;
           entitySub.lastUpdated = Date.now();
           entitySub.isInitialDataReceived = true;
@@ -1276,21 +1618,21 @@ class RebaseWebSocketClient {
       type: "FETCH_COLLECTION",
       payload: props
     });
-    return response.entities || [];
+    return (response.entities || []).map((e) => rehydrateEntity(e));
   }
   async fetchEntity(props) {
     const response = await this.sendMessage({
       type: "FETCH_ENTITY",
       payload: props
     });
-    return response.entity;
+    return response.entity ? rehydrateEntity(response.entity) : void 0;
   }
   async saveEntity(props) {
     const response = await this.sendMessage({
       type: "SAVE_ENTITY",
       payload: props
     });
-    return response.entity;
+    return rehydrateEntity(response.entity);
   }
   async deleteEntity(props) {
     await this.sendMessage({
@@ -1301,7 +1643,10 @@ class RebaseWebSocketClient {
   async executeSql(sql, options) {
     const response = await this.sendMessage({
       type: "EXECUTE_SQL",
-      payload: { sql, options }
+      payload: {
+        sql,
+        options
+      }
     });
     return response.result || [];
   }
@@ -1356,7 +1701,35 @@ class RebaseWebSocketClient {
       type: "FETCH_TABLE_METADATA",
       payload: { tableName }
     });
-    return response.metadata || { columns: [], foreignKeys: [], junctions: [], policies: [] };
+    return response.metadata || {
+      columns: [],
+      foreignKeys: [],
+      junctions: [],
+      policies: []
+    };
+  }
+  async createBranch(name, options) {
+    const response = await this.sendMessage({
+      type: "CREATE_BRANCH",
+      payload: {
+        name,
+        options
+      }
+    });
+    return response.branch;
+  }
+  async deleteBranch(name) {
+    await this.sendMessage({
+      type: "DELETE_BRANCH",
+      payload: { name }
+    });
+  }
+  async listBranches() {
+    const response = await this.sendMessage({
+      type: "LIST_BRANCHES",
+      payload: {}
+    });
+    return response.branches || [];
   }
   /**
    * Recursively compare two values for structural equality.
@@ -1442,7 +1815,10 @@ class RebaseWebSocketClient {
           const allKeys = /* @__PURE__ */ new Set([...Object.keys(normCached), ...Object.keys(normIncoming)]);
           for (const key of allKeys) {
             if (!this.deepEqual(normCached[key], normIncoming[key])) {
-              mismatches[key] = { cached: normCached[key], incoming: normIncoming[key] };
+              mismatches[key] = {
+                cached: normCached[key],
+                incoming: normIncoming[key]
+              };
             }
           }
           console.log(`[RebaseWS] Row ${incomingEntity.id} refetch mismatch:
@@ -1459,7 +1835,10 @@ class RebaseWebSocketClient {
     const existingSubscription = this.collectionSubscriptions.get(subscriptionKey);
     if (existingSubscription) {
       const callbackMap2 = existingSubscription.callbacks;
-      callbackMap2.set(callbackId, { onUpdate, onError });
+      callbackMap2.set(callbackId, {
+        onUpdate,
+        onError
+      });
       if (existingSubscription.latestData !== void 0 && existingSubscription.isInitialDataReceived) {
         try {
           onUpdate(existingSubscription.latestData);
@@ -1486,7 +1865,10 @@ class RebaseWebSocketClient {
     }
     const backendSubscriptionId = `collection_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
     const callbackMap = /* @__PURE__ */ new Map();
-    callbackMap.set(callbackId, { onUpdate, onError });
+    callbackMap.set(callbackId, {
+      onUpdate,
+      onError
+    });
     this.collectionSubscriptions.set(subscriptionKey, {
       backendSubscriptionId,
       callbacks: callbackMap,
@@ -1526,7 +1908,10 @@ class RebaseWebSocketClient {
     const existingSubscription = this.entitySubscriptions.get(subscriptionKey);
     if (existingSubscription) {
       const callbackMap2 = existingSubscription.callbacks;
-      callbackMap2.set(callbackId, { onUpdate, onError });
+      callbackMap2.set(callbackId, {
+        onUpdate,
+        onError
+      });
       if (existingSubscription.latestData !== void 0 && existingSubscription.isInitialDataReceived) {
         try {
           onUpdate(existingSubscription.latestData);
@@ -1553,7 +1938,10 @@ class RebaseWebSocketClient {
     }
     const backendSubscriptionId = `entity_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
     const callbackMap = /* @__PURE__ */ new Map();
-    callbackMap.set(callbackId, { onUpdate, onError });
+    callbackMap.set(callbackId, {
+      onUpdate,
+      onError
+    });
     this.entitySubscriptions.set(subscriptionKey, {
       backendSubscriptionId,
       callbacks: callbackMap,
@@ -1654,23 +2042,21 @@ class RebaseWebSocketClient {
 }
 function createStorage(transport) {
   const urlsCache = /* @__PURE__ */ new Map();
-  async function uploadFile({
+  async function putObject({
     file,
-    fileName,
-    path,
+    key,
     metadata,
     bucket
   }) {
     const formData = new FormData();
     formData.append("file", file);
-    if (fileName) formData.append("fileName", fileName);
-    if (path) formData.append("path", path);
+    if (key) formData.append("key", key);
     if (bucket) formData.append("bucket", bucket);
     if (metadata) {
-      for (const [key, value] of Object.entries(metadata)) {
+      for (const [key2, value] of Object.entries(metadata)) {
         if (value !== void 0 && value !== null) {
           formData.append(
-            `metadata_${key}`,
+            `metadata_${key2}`,
             typeof value === "string" ? value : JSON.stringify(value)
           );
         }
@@ -1680,18 +2066,18 @@ function createStorage(transport) {
       method: "POST",
       body: formData,
       headers: {
-        // transport.request merges headers, so to prevent it setting application/json we can delete it 
+        // transport.request merges headers, so to prevent it setting application/json we can delete it
         // in transport if body is FormData, or we can explicitly set it to an empty string.
         // Let's rely on standard behaviour for now and adjust transport if it fails.
       }
     });
     return result.data;
   }
-  async function getDownloadURL(pathOrUrl, bucket) {
-    const cacheKey = bucket ? `${bucket}/${pathOrUrl}` : pathOrUrl;
+  async function getSignedUrl(keyOrUrl, bucket) {
+    const cacheKey = bucket ? `${bucket}/${keyOrUrl}` : keyOrUrl;
     const cached = urlsCache.get(cacheKey);
     if (cached) return cached;
-    let filePath = pathOrUrl;
+    let filePath = keyOrUrl;
     if (filePath && (filePath.startsWith("local://") || filePath.startsWith("s3://"))) {
       filePath = filePath.substring(filePath.indexOf("://") + 3);
     }
@@ -1699,7 +2085,10 @@ function createStorage(transport) {
       filePath = `${bucket}/${filePath}`;
     }
     if (!filePath || filePath.trim() === "" || filePath === "/") {
-      return { url: null, fileNotFound: true };
+      return {
+        url: null,
+        fileNotFound: true
+      };
     }
     try {
       const result = await transport.request(`/storage/metadata/${filePath}`);
@@ -1713,13 +2102,16 @@ function createStorage(transport) {
       return downloadConfig;
     } catch (e) {
       if (e instanceof Error && "status" in e && e.status === 404) {
-        return { url: null, fileNotFound: true };
+        return {
+          url: null,
+          fileNotFound: true
+        };
       }
       throw e;
     }
   }
-  async function getFile(path, bucket) {
-    let filePath = path;
+  async function getObject(key, bucket) {
+    let filePath = key;
     if (filePath && (filePath.startsWith("local://") || filePath.startsWith("s3://"))) {
       filePath = filePath.substring(filePath.indexOf("://") + 3);
     }
@@ -1739,8 +2131,8 @@ function createStorage(transport) {
     const fileName = filePath.split("/").pop() || "file";
     return new File([blob], fileName, { type: blob.type });
   }
-  async function deleteFile(path, bucket) {
-    let filePath = path;
+  async function deleteObject(key, bucket) {
+    let filePath = key;
     if (filePath && (filePath.startsWith("local://") || filePath.startsWith("s3://"))) {
       filePath = filePath.substring(filePath.indexOf("://") + 3);
     }
@@ -1755,11 +2147,11 @@ function createStorage(transport) {
     } catch (e) {
       if (!(e instanceof Error && "status" in e && e.status === 404)) throw e;
     }
-    urlsCache.delete(bucket ? `${bucket}/${path}` : path);
+    urlsCache.delete(bucket ? `${bucket}/${key}` : key);
   }
-  async function list(path, options) {
+  async function listObjects(prefix, options) {
     const params = new URLSearchParams();
-    if (path) params.set("path", path);
+    if (prefix) params.set("prefix", prefix);
     if (options?.bucket) params.set("bucket", options.bucket);
     if (options?.maxResults) params.set("maxResults", String(options.maxResults));
     if (options?.pageToken) params.set("pageToken", options.pageToken);
@@ -1767,20 +2159,28 @@ function createStorage(transport) {
     return result.data;
   }
   return {
-    uploadFile,
-    getDownloadURL,
-    getFile,
-    deleteFile,
-    list
+    putObject,
+    getSignedUrl,
+    getObject,
+    deleteObject,
+    listObjects
   };
 }
 function deriveWebSocketUrl(baseUrl) {
+  if (!baseUrl) {
+    if (typeof window !== "undefined") {
+      const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
+      return `${protocol}//${window.location.host}`;
+    }
+    return "";
+  }
   return baseUrl.replace(/^https:\/\//, "wss://").replace(/^http:\/\//, "ws://").replace(/\/$/, "");
 }
 function createRebaseClient(options) {
   const transport = createTransport(options);
   const auth = createAuth(transport, options.auth);
   const admin = createAdmin(transport, options.admin);
+  const cron = createCron(transport, options.cron);
   const storage = createStorage(transport);
   const resolvedWsUrl = options.websocketUrl ?? deriveWebSocketUrl(options.baseUrl);
   let ws;
@@ -1804,14 +2204,14 @@ function createRebaseClient(options) {
     });
   }
   if (!options.onUnauthorized) {
-    options.onUnauthorized = async () => {
+    transport.setOnUnauthorized(async () => {
       try {
         await auth.refreshSession();
         return true;
       } catch (e) {
         return false;
       }
-    };
+    });
   }
   const collectionClients = /* @__PURE__ */ new Map();
   function collection(slug) {
@@ -1828,7 +2228,8 @@ function createRebaseClient(options) {
       }
       if (typeof prop === "symbol") return void 0;
       if (typeof prop === "string" && prop !== "then" && prop !== "toJSON" && prop !== "$$typeof") {
-        return collection(prop);
+        const slug = toSnakeCase(prop);
+        return collection(slug);
       }
       return void 0;
     }
@@ -1836,6 +2237,7 @@ function createRebaseClient(options) {
   const target = {
     auth,
     admin,
+    cron,
     storage,
     ws,
     setToken: transport.setToken,
@@ -1852,19 +2254,10 @@ function createRebaseClient(options) {
       });
       return res.data ?? res;
     },
-    data: dataProxy
+    data: dataProxy,
+    email: void 0
   };
-  return new Proxy(target, {
-    get(obj, prop) {
-      if (prop in obj) {
-        return obj[prop];
-      }
-      if (typeof prop === "string" && prop !== "then") {
-        return collection(prop);
-      }
-      return void 0;
-    }
-  });
+  return target;
 }
 export {
   ApiError,
@@ -1874,9 +2267,11 @@ export {
   createAdmin,
   createAuth,
   createCollectionClient,
+  createCron,
   createMemoryStorage,
   createRebaseClient,
   createStorage,
-  createTransport
+  createTransport,
+  rebaseReviver
 };
 //# sourceMappingURL=index.es.js.map