@rebasepro/client 0.7.0 → 0.8.0

package/dist/index.umd.js

@@ -1,11 +1,11 @@
 (function(global, factory) {
-	typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@rebasepro/types"), require("@rebasepro/common"), require("@rebasepro/utils")) : typeof define === "function" && define.amd ? define([
+	typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@rebasepro/common"), require("@rebasepro/types"), require("@rebasepro/utils")) : typeof define === "function" && define.amd ? define([
 		"exports",
-		"@rebasepro/types",
 		"@rebasepro/common",
+		"@rebasepro/types",
 		"@rebasepro/utils"
-	], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["Rebase Client"] = {}, global._rebasepro_types, global._rebasepro_common, global._rebasepro_utils));
-})(this, function(exports, _rebasepro_types, _rebasepro_common, _rebasepro_utils) {
+	], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["Rebase Client"] = {}, global._rebasepro_common, global._rebasepro_types, global._rebasepro_utils));
+})(this, function(exports, _rebasepro_common, _rebasepro_types, _rebasepro_utils) {
 	Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 	//#region src/reviver.ts
 	function rebaseReviver(_key, value) {
@@ -48,61 +48,6 @@
 			this.details = details;
 		}
 	};
-	/**
-	* Maps a short operator alias to the PostgREST-style short code.
-	*/
-	var OP_MAP = {
-		"==": "eq",
-		"!=": "neq",
-		">": "gt",
-		">=": "gte",
-		"<": "lt",
-		"<=": "lte",
-		"not-in": "nin",
-		"array-contains": "cs",
-		"array-contains-any": "csa"
-	};
-	/**
-	* Normalise a single `WhereFieldValue` into the PostgREST query-string
-	* representation the backend expects.
-	*
-	* Supports:
-	*  - `null`          → `"eq.null"`
-	*  - `true`/`false`  → `"eq.true"` / `"eq.false"`
-	*  - `42`            → `"42"` (plain equality)
-	*  - `"active"`      → `"active"` (plain equality, backward-compat)
-	*  - `"gte.18"`      → `"gte.18"` (pass-through PostgREST string)
-	*  - `[">=", 18]`    → `"gte.18"` (tuple syntax)
-	*  - `["in", [1,2]]` → `"in.(1,2)"` (tuple with array value)
-	*  - `["!=", null]`  → `"neq.null"`
-	*/
-	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)) {
-			const [rawOp, val] = (Array.isArray(value[0]) ? value : [value])[0] || [];
-			if (rawOp) {
-				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 serializeLogicalCondition(cond) {
-		if ("type" in cond) {
-			const sub = (cond.conditions ?? []).map(serializeLogicalCondition).join(",");
-			return `${cond.type}(${sub})`;
-		} else {
-			const op = OP_MAP[cond.operator] ?? cond.operator;
-			let formattedValue = cond.value;
-			if (Array.isArray(cond.value)) formattedValue = `(${cond.value.join(",")})`;
-			else if (cond.value === null) formattedValue = "null";
-			return `${cond.column}.${op}.${formattedValue}`;
-		}
-	}
 	function buildQueryString(params) {
 		if (!params) return "";
 		const parts = [];
@@ -114,16 +59,13 @@
 		if (params.include && params.include.length > 0) parts.push(`include=${encodeURIComponent(params.include.join(","))}`);
 		if (params.logical) {
 			const root = params.logical;
-			const serialized = (root.conditions ?? []).map(serializeLogicalCondition).join(",");
+			const serialized = (root.conditions ?? []).map(_rebasepro_common.serializeLogicalCondition).join(",");
 			parts.push(`${root.type}=${encodeURIComponent(`(${serialized})`)}`);
 		}
-		if (params.where) for (const [field, value] of Object.entries(params.where)) if (Array.isArray(value) && value.length > 0 && Array.isArray(value[0])) for (const subVal of value) {
-			const normalized = normalizeWhereValue(subVal);
-			parts.push(`${encodeURIComponent(field)}=${encodeURIComponent(normalized)}`);
-		}
-		else {
-			const normalized = normalizeWhereValue(value);
-			parts.push(`${encodeURIComponent(field)}=${encodeURIComponent(normalized)}`);
+		if (params.where) {
+			const serialized = (0, _rebasepro_common.serializeFilter)(params.where);
+			for (const [field, value] of Object.entries(serialized)) if (Array.isArray(value)) for (const v of value) parts.push(`${encodeURIComponent(field)}=${encodeURIComponent(v)}`);
+			else parts.push(`${encodeURIComponent(field)}=${encodeURIComponent(value)}`);
 		}
 		return parts.length > 0 ? "?" + parts.join("&") : "";
 	}
@@ -875,94 +817,6 @@
 	}
 	//#endregion
 	//#region src/collection.ts
-	function parseWhereFilter(where) {
-		if (!where) return void 0;
-		const filters = {};
-		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"
-		};
-		const parseSingle = (rawValue, fieldKey) => {
-			if (rawValue === null) return ["==", null];
-			if (typeof rawValue === "boolean") return ["==", rawValue];
-			if (typeof rawValue === "number") return ["==", rawValue];
-			if (Array.isArray(rawValue) && rawValue.length === 2 && typeof rawValue[0] === "string") {
-				const [rawOp, val] = rawValue;
-				return [OP_TO_FILTER[rawOp] ?? "==", val];
-			}
-			const value = String(rawValue);
-			const dotIndex = value.indexOf(".");
-			if (dotIndex > 0) {
-				const opStr = value.substring(0, dotIndex);
-				const valStr = value.substring(dotIndex + 1);
-				let op = "==";
-				let val = valStr;
-				switch (opStr) {
-					case "eq":
-						op = "==";
-						break;
-					case "neq":
-						op = "!=";
-						break;
-					case "gt":
-						op = ">";
-						break;
-					case "gte":
-						op = ">=";
-						break;
-					case "lt":
-						op = "<";
-						break;
-					case "lte":
-						op = "<=";
-						break;
-					case "in":
-						op = "in";
-						val = valStr.startsWith("(") && valStr.endsWith(")") ? valStr.slice(1, -1).split(",").map((v) => v.trim()) : valStr.split(",");
-						break;
-					case "nin":
-						op = "not-in";
-						val = valStr.startsWith("(") && valStr.endsWith(")") ? valStr.slice(1, -1).split(",").map((v) => v.trim()) : valStr.split(",");
-						break;
-					case "cs":
-						op = "array-contains";
-						break;
-					case "csa":
-						op = "array-contains-any";
-						val = valStr.startsWith("(") && valStr.endsWith(")") ? valStr.slice(1, -1).split(",").map((v) => v.trim()) : valStr.split(",");
-						break;
-					default:
-						op = "==";
-						val = value;
-				}
-				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) && fieldKey !== "id" && !fieldKey.endsWith("_id")) val = Number(val);
-				return [op, val];
-			} else return ["==", value];
-		};
-		for (const [key, rawValue] of Object.entries(where)) if (Array.isArray(rawValue) && rawValue.length > 0 && Array.isArray(rawValue[0])) filters[key] = rawValue.map((r) => parseSingle(r, key));
-		else filters[key] = parseSingle(rawValue, key);
-		return filters;
-	}
 	/**
 	* Wrap a flat row (returned by the REST API as `{ id, ...fields }`) into
 	* a proper `Entity<M>` structure expected by the core framework.
@@ -1027,8 +881,8 @@
 				if (typeof columnOrCondition === "object") return builder.where(columnOrCondition);
 				return builder.where(columnOrCondition, operator, value);
 			},
-			orderBy(column, ascending) {
-				return new _rebasepro_common.QueryBuilder(client).orderBy(column, ascending);
+			orderBy(column, direction) {
+				return new _rebasepro_common.QueryBuilder(client).orderBy(column, direction);
 			},
 			limit(count) {
 				return new _rebasepro_common.QueryBuilder(client).limit(count);
@@ -1045,26 +899,45 @@
 		};
 		if (ws) {
 			client.listen = (params, onUpdate, onError) => {
-				return ws.listenCollection({
+				let active = true;
+				let lastUpdateId = 0;
+				const unsub = ws.listenCollection({
 					path: slug,
-					filter: parseWhereFilter(params?.where),
+					filter: 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 currentUpdateId = ++lastUpdateId;
 					const requestedLimit = params?.limit || 20;
+					const offset = params?.offset || 0;
 					onUpdate({
 						data: entities,
 						meta: {
 							total: entities.length,
 							limit: requestedLimit,
-							offset: params?.offset || 0,
+							offset,
 							hasMore: entities.length >= requestedLimit
 						}
 					});
+					if (client.count) client.count(params).then((total) => {
+						if (active && currentUpdateId === lastUpdateId) onUpdate({
+							data: entities,
+							meta: {
+								total,
+								limit: requestedLimit,
+								offset,
+								hasMore: offset + entities.length < total
+							}
+						});
+					}).catch(() => {});
 				}, onError);
+				return () => {
+					active = false;
+					unsub();
+				};
 			};
 			client.listenById = (id, onUpdate, onError) => {
 				return ws.listenEntity({
@@ -1104,17 +977,31 @@
 	}
 	//#endregion
 	//#region src/storage.ts
-	function createStorage(transport) {
+	/**
+	* Create a StorageSource that talks to the Rebase backend REST API.
+	*
+	* @param transport - HTTP transport instance
+	* @param storageId - Optional storage-source key for multi-backend routing.
+	*                    When set, it is forwarded to the server so the correct
+	*                    `StorageController` is resolved from the registry.
+	*/
+	function createStorage(transport, storageId) {
 		const urlsCache = /* @__PURE__ */ new Map();
+		/** Append ?storageId=... to a path when multi-backend routing is active. */
+		const withStorageId = (path) => {
+			if (!storageId) return path;
+			return `${path}${path.includes("?") ? "&" : "?"}storageId=${encodeURIComponent(storageId)}`;
+		};
 		async function putObject({ file, key, metadata, bucket }) {
 			const formData = new FormData();
 			formData.append("file", file);
 			if (key) formData.append("key", key);
 			if (bucket) formData.append("bucket", bucket);
+			if (storageId) formData.append("storageId", storageId);
 			if (metadata) {
 				for (const [key, value] of Object.entries(metadata)) if (value !== void 0 && value !== null) formData.append(`metadata_${key}`, typeof value === "string" ? value : JSON.stringify(value));
 			}
-			return (await transport.request("/storage/upload", {
+			return (await transport.request(withStorageId("/storage/upload"), {
 				method: "POST",
 				body: formData,
 				headers: {}
@@ -1125,18 +1012,18 @@
 			const cached = urlsCache.get(cacheKey);
 			if (cached) return cached;
 			let filePath = keyOrUrl;
-			if (filePath && (filePath.startsWith("local://") || filePath.startsWith("s3://"))) filePath = filePath.substring(filePath.indexOf("://") + 3);
+			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 === "/") return {
 				url: null,
 				fileNotFound: true
 			};
 			try {
-				const result = await transport.request(`/storage/metadata/${filePath}`);
+				const result = await transport.request(withStorageId(`/storage/metadata/${filePath}`));
 				const activeToken = await transport.resolveToken();
 				const tokenQuery = activeToken ? `?token=${activeToken}` : "";
 				const downloadConfig = {
-					url: `${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}${tokenQuery}`,
+					url: withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}${tokenQuery}`),
 					metadata: result.data
 				};
 				urlsCache.set(cacheKey, downloadConfig);
@@ -1151,10 +1038,10 @@
 		}
 		async function getObject(key, bucket) {
 			let filePath = key;
-			if (filePath && (filePath.startsWith("local://") || filePath.startsWith("s3://"))) filePath = filePath.substring(filePath.indexOf("://") + 3);
+			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 === "/") return null;
-			const url = `${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}`;
+			const url = withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}`);
 			const response = await transport.fetchFn(url, { headers: transport.getHeaders ? transport.getHeaders() : {} });
 			if (response.status === 404) return null;
 			if (!response.ok) throw new Error("Failed to get file");
@@ -1164,11 +1051,11 @@
 		}
 		async function deleteObject(key, bucket) {
 			let filePath = key;
-			if (filePath && (filePath.startsWith("local://") || filePath.startsWith("s3://"))) filePath = filePath.substring(filePath.indexOf("://") + 3);
+			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 === "/") return;
 			try {
-				await transport.request(`/storage/file/${filePath}`, { method: "DELETE" });
+				await transport.request(withStorageId(`/storage/file/${filePath}`), { method: "DELETE" });
 			} catch (e) {
 				if (!(e instanceof Error && "status" in e && e.status === 404)) throw e;
 			}
@@ -1180,6 +1067,7 @@
 			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);
+			if (storageId) params.set("storageId", storageId);
 			return (await transport.request(`/storage/list?${params.toString()}`)).data;
 		}
 		return {
@@ -1191,6 +1079,62 @@
 		};
 	}
 	//#endregion
+	//#region src/storage-registry.ts
+	/**
+	* Default implementation of the client-side `StorageSourceRegistry`.
+	*/
+	var ClientStorageSourceRegistry = class ClientStorageSourceRegistry {
+		sources = /* @__PURE__ */ new Map();
+		/**
+		* Register a storage source.
+		* @param key - Unique key matching a `StorageSourceDefinition.key`
+		* @param source - The `StorageSource` instance
+		*/
+		register(key, source) {
+			this.sources.set(key, source);
+		}
+		getDefault() {
+			const source = this.sources.get(_rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY);
+			if (!source) throw new Error(`[StorageSourceRegistry] No default storage source registered. Register one with key "${_rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY}".`);
+			return source;
+		}
+		get(key) {
+			if (key === void 0 || key === null) return this.sources.get(_rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY);
+			return this.sources.get(key);
+		}
+		getOrDefault(key) {
+			if (key === void 0 || key === null) return this.getDefault();
+			const source = this.sources.get(key);
+			if (source) return source;
+			console.warn(`[StorageSourceRegistry] Storage source "${key}" not found, falling back to "${_rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY}".`);
+			return this.getDefault();
+		}
+		has(key) {
+			return this.sources.has(key);
+		}
+		list() {
+			return Array.from(this.sources.keys());
+		}
+		/**
+		* Build a registry from `StorageSourceDefinition[]` and an HTTP transport.
+		*
+		* - Sources with `transport: "server"` are auto-wired via `createStorage(transport, key)`.
+		* - Sources with `transport: "direct"` are **not** auto-wired — they must
+		*   be registered manually after this call (e.g. via a Firebase hook).
+		*
+		* @param definitions - Array of storage source definitions
+		* @param transport - HTTP transport for server-backed sources
+		*/
+		static fromDefinitions(definitions, transport) {
+			const registry = new ClientStorageSourceRegistry();
+			for (const def of definitions) if (def.transport === "server") {
+				const source = createStorage(transport, def.key === _rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY ? void 0 : def.key);
+				registry.register(def.key, source);
+			}
+			return registry;
+		}
+	};
+	//#endregion
 	//#region src/websocket.ts
 	/**
 	* Extract error message and code from a WebSocket message payload.
@@ -2128,6 +2072,23 @@
 		const apiKeys = createApiKeys(transport, options.apiKeys);
 		const storage = createStorage(transport);
 		const functions = createFunctionsClient(transport);
+		const createStorageSource = (storageId) => storageId === _rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY ? storage : createStorage(transport, storageId);
+		const storageRegistry = new ClientStorageSourceRegistry();
+		storageRegistry.register(_rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY, storage);
+		for (const def of options.storageSources ?? []) if (def.transport === "server" && def.key !== _rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY) storageRegistry.register(def.key, createStorageSource(def.key));
+		let storageSourcesPromise;
+		const fetchStorageSources = () => {
+			if (storageSourcesPromise) return storageSourcesPromise;
+			storageSourcesPromise = transport.request("/storage/sources").then((res) => {
+				const defs = res.data ?? [];
+				for (const def of defs) if (def.transport === "server" && def.key !== _rebasepro_types.DEFAULT_STORAGE_SOURCE_KEY && !storageRegistry.has(def.key)) storageRegistry.register(def.key, createStorageSource(def.key));
+				return defs;
+			}).catch((e) => {
+				storageSourcesPromise = void 0;
+				throw e;
+			});
+			return storageSourcesPromise;
+		};
 		const resolvedWsUrl = options.websocketUrl ?? deriveWebSocketUrl(options.baseUrl);
 		let ws;
 		if (resolvedWsUrl) {
@@ -2173,7 +2134,10 @@
 		const dataProxy = new Proxy({ collection }, { get(_target, prop) {
 			if (prop === "collection") return collection;
 			if (typeof prop === "symbol") return void 0;
-			if (typeof prop === "string" && prop !== "then" && prop !== "toJSON" && prop !== "$$typeof") return collection((0, _rebasepro_utils.toSnakeCase)(prop));
+			if (typeof prop === "string" && prop !== "then" && prop !== "toJSON" && prop !== "$$typeof") {
+				if (options.collections && prop in options.collections) return collection(options.collections[prop]);
+				return collection((0, _rebasepro_utils.toSnakeCase)(prop));
+			}
 		} });
 		return {
 			auth,
@@ -2182,6 +2146,9 @@
 			apiKeys,
 			functions,
 			storage,
+			storageRegistry,
+			createStorageSource,
+			fetchStorageSources,
 			ws,
 			setToken: transport.setToken,
 			setAuthTokenGetter: transport.setAuthTokenGetter,
@@ -2203,6 +2170,7 @@
 	}
 	//#endregion
 	exports.ApiError = ApiError;
+	exports.ClientStorageSourceRegistry = ClientStorageSourceRegistry;
 	Object.defineProperty(exports, "QueryBuilder", {
 		enumerable: true,
 		get: function() {