@rebasepro/firebase 0.12.1-canary.gf5f1d39 → 0.13.0

package/dist/hooks/useFirestoreDriver.d.ts

@@ -53,5 +53,5 @@ export declare function useFirestoreDriver({ firebaseApp, textSearchControllerBu
  * @param data
  * @group Firestore
  */
-export declare function firestoreToCMSModel(data: unknown): unknown;
-export declare function cmsToFirestoreModel(data: unknown, firestore: Firestore, inArray?: boolean): unknown;
+export declare function firestoreToRebaseModel(data: unknown): unknown;
+export declare function rebaseToFirestoreModel(data: unknown, firestore: Firestore, inArray?: boolean): unknown;

package/dist/index.es.js

@@ -14,7 +14,7 @@ import { removeUndefined } from "@rebasepro/utils";
 import { AdminModeControllerProvider, ErrorView, ModeControllerProvider, Rebase, RebaseLogo, RebaseRoutes, SnackbarProvider, useBrowserTitleAndIcon, useBuildAdminModeController, useBuildLocalConfigurationPersistence, useBuildModeController, useModeController, useSnackbarController } from "@rebasepro/app";
 import { AppBar, CollectionRegistryContext, Drawer, NavigationStateContext, RebaseRoute, Scaffold, SideDialogs, SidePanelProvider, UrlContext, useBuildCollectionRegistryController, useBuildNavigationStateController, useBuildUrlController } from "@rebasepro/admin";
 import { ArrowLeftIcon, Button, CenteredView, CircularProgress, CircularProgressCenter, IconButton, LoadingButton, MailIcon, PhoneIcon, TextField, Typography, UserIcon, cls, iconSize } from "@rebasepro/ui";
-import { Navigate, Outlet, Route } from "react-router-dom";
+import { Navigate, Outlet, Route } from "react-router";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 //#region src/hooks/useFirebaseAuthController.ts
 /**
@@ -472,10 +472,11 @@ function useAppCheck({ firebaseApp, options }) {
 		setAppCheckLoading(true);
 		const { provider, isTokenAutoRefreshEnabled } = options;
 		removeCurrentAppCheckDiv();
-		verifyToken(initializeAppCheck(firebaseApp, {
+		const appCheck = initializeAppCheck(firebaseApp, {
 			provider,
 			isTokenAutoRefreshEnabled
-		})).then(() => {
+		});
+		verifyToken(appCheck).then(() => {
 			setAppCheckLoading(false);
 		});
 		initialCheck.current = true;
@@ -513,7 +514,8 @@ var docsToCollectionTree = (docs) => {
 	Object.keys(collectionsMap).sort((a, b) => b.split(COLLECTION_PATH_SEPARATOR).length - a.split(COLLECTION_PATH_SEPARATOR).length).forEach((id) => {
 		const collection = collectionsMap[id];
 		if (id.includes(COLLECTION_PATH_SEPARATOR)) {
-			const parentCollection = collectionsMap[id.split(COLLECTION_PATH_SEPARATOR).slice(0, -1).join(COLLECTION_PATH_SEPARATOR)];
+			const parentId = id.split(COLLECTION_PATH_SEPARATOR).slice(0, -1).join(COLLECTION_PATH_SEPARATOR);
+			const parentCollection = collectionsMap[parentId];
 			if (parentCollection) parentCollection.subcollections = () => [...parentCollection.subcollections?.() ?? [], collection];
 			delete collectionsMap[id];
 		}
@@ -698,7 +700,8 @@ var localSearchControllerBuilder = ({ firebaseApp }) => {
 		return new Promise((resolve, reject) => {
 			if (collectionProp) {
 				console.debug("Init local search controller", path);
-				listeners[path] = onSnapshot(query(collection(databaseId ? getFirestore(firebaseApp, databaseId) : getFirestore(firebaseApp), path)), {
+				const col = collection(databaseId ? getFirestore(firebaseApp, databaseId) : getFirestore(firebaseApp), path);
+				listeners[path] = onSnapshot(query(col), {
 					next: (entity) => {
 						if (entity.metadata.fromCache && entity.metadata.hasPendingWrites) return;
 						const docs = entity.docs.map((doc) => ({
@@ -977,7 +980,7 @@ function useFirestoreDriver({ firebaseApp, textSearchControllerBuilder, firestor
 				return;
 			}
 			if (op === "like" || op === "ilike" || op === "not-like" || op === "not-ilike") throw new Error(`Firestore does not support the "${op}" operator (SQL pattern matching). Use a full-text search index or the collection's searchString instead.`);
-			queryParams.push(where(key, op, cmsToFirestoreModel(value, firestore)));
+			queryParams.push(where(key, op, rebaseToFirestoreModel(value, firestore)));
 		});
 		if (orderBy$1 && order) queryParams.push(orderBy(orderBy$1, order));
 		if (startAfter$1) queryParams.push(startAfter(startAfter$1));
@@ -1165,7 +1168,7 @@ function useFirestoreDriver({ firebaseApp, textSearchControllerBuilder, firestor
 			values: valuesProp,
 			collection: collection$1
 		});
-		const values = cmsToFirestoreModel(valuesProp, getFirestore(firebaseApp));
+		const values = rebaseToFirestoreModel(valuesProp, getFirestore(firebaseApp));
 		console.debug("2", {
 			path,
 			id,
@@ -1185,7 +1188,7 @@ function useFirestoreDriver({ firebaseApp, textSearchControllerBuilder, firestor
 		else documentReference = doc(collectionReference);
 		return setDoc(documentReference, values, { merge: true }).then(() => {
 			return {
-				...firestoreToCMSModel(values),
+				...firestoreToRebaseModel(values),
 				id: documentReference.id
 			};
 		}).catch((error) => {
@@ -1219,7 +1222,7 @@ function useFirestoreDriver({ firebaseApp, textSearchControllerBuilder, firestor
 		const databaseId = collection$2?.databaseId;
 		const firestore = databaseId ? getFirestore(firebaseApp, databaseId) : getFirestore(firebaseApp);
 		if (value === void 0 || value === null) return Promise.resolve(true);
-		return (await getDocs(query(collection(firestore, path), where(name, "==", cmsToFirestoreModel(value, firestore))))).docs.filter((doc) => doc.id !== id).length === 0;
+		return (await getDocs(query(collection(firestore, path), where(name, "==", rebaseToFirestoreModel(value, firestore))))).docs.filter((doc) => doc.id !== id).length === 0;
 	}, [firebaseApp]);
 	const count = useCallback(async ({ path, filter, order, orderBy, collection }) => {
 		if (!firebaseApp) throw Error("useFirestoreDriver Firebase not initialised");
@@ -1273,7 +1276,7 @@ function useFirestoreDriver({ firebaseApp, textSearchControllerBuilder, firestor
 }
 var createRowFromDocument = (docSnap) => {
 	return {
-		...firestoreToCMSModel(docSnap.data()),
+		...firestoreToRebaseModel(docSnap.data()),
 		id: docSnap.id
 	};
 };
@@ -1287,7 +1290,7 @@ var createRowFromDocument = (docSnap) => {
 * @param data
 * @group Firestore
 */
-function firestoreToCMSModel(data) {
+function firestoreToRebaseModel(data) {
 	if (data === null || data === void 0) return null;
 	if (typeof data === "object" && data !== null && "isEqual" in data && typeof data.isEqual === "function" && deleteField().isEqual(data)) return;
 	if (typeof data === "object" && data !== null && "isEqual" in data && typeof data.isEqual === "function" && serverTimestamp().isEqual(data)) return null;
@@ -1307,11 +1310,11 @@ function firestoreToCMSModel(data) {
 			databaseId
 		});
 	}
-	if (Array.isArray(data)) return data.map(firestoreToCMSModel).filter((v) => v !== void 0);
+	if (Array.isArray(data)) return data.map(firestoreToRebaseModel).filter((v) => v !== void 0);
 	if (typeof data === "object") {
 		const result = {};
 		for (const key of Object.keys(data)) {
-			const childValue = firestoreToCMSModel(data[key]);
+			const childValue = firestoreToRebaseModel(data[key]);
 			if (childValue !== void 0) result[key] = childValue;
 		}
 		return result;
@@ -1327,10 +1330,10 @@ function getCMSPathFromFirestorePath(fsPath) {
 	to = to === -1 ? fsPath.length : to;
 	return fsPath.substring(0, to);
 }
-function cmsToFirestoreModel(data, firestore, inArray = false) {
+function rebaseToFirestoreModel(data, firestore, inArray = false) {
 	if (data === void 0) return deleteField();
 	else if (data === null) return null;
-	else if (Array.isArray(data)) return data.filter((v) => v !== void 0).map((v) => cmsToFirestoreModel(v, firestore, true));
+	else if (Array.isArray(data)) return data.filter((v) => v !== void 0).map((v) => rebaseToFirestoreModel(v, firestore, true));
 	else if (typeof data === "object" && data !== null && "isEntityReference" in data && typeof data.isEntityReference === "function" && data.isEntityReference()) {
 		const entityRef = data;
 		return doc(entityRef.databaseId ? getFirestore(firestore.app, entityRef.databaseId) : firestore, entityRef.path, entityRef.id);
@@ -1341,7 +1344,7 @@ function cmsToFirestoreModel(data, firestore, inArray = false) {
 	else if (data instanceof Date) return Timestamp.fromDate(data);
 	else if (data && typeof data === "object" && "__type__" in data && data.__type__ === "__vector__") return vector(data.value || []);
 	else if (data && typeof data === "object") return Object.entries(data).map(([key, v]) => {
-		const firestoreModel = cmsToFirestoreModel(v, firestore);
+		const firestoreModel = rebaseToFirestoreModel(v, firestore);
 		if (firestoreModel !== void 0) return { [key]: firestoreModel };
 		else return {};
 	}).reduce((a, b) => ({
@@ -1575,7 +1578,8 @@ function useBuildUserManagement({ authController, dataSourceDelegate, roles: rol
 				console.debug("Updating users", rows);
 				setUsersError(void 0);
 				try {
-					setUsersWithRoleIds(rowsToUsers(rows));
+					const newUsers = rowsToUsers(rows);
+					setUsersWithRoleIds(newUsers);
 				} catch (e) {
 					setUsersWithRoleIds([]);
 					console.error("Error loading users", e);
@@ -2645,6 +2649,6 @@ function RebaseFirebaseApp({ name, logo, logoDark, accessGate, collections, view
 	}) });
 }
 //#endregion
-export { FirebaseLoginView, LoginButton, RECAPTCHA_CONTAINER_ID, RebaseFirebaseApp, buildCollectionId, buildExternalSearchController, buildPineconeSearchController, buildRebaseSearchController, cmsToFirestoreModel, docToCollection, docsToCollectionTree, firestoreToCMSModel, getFirestoreDataInPath, localSearchControllerBuilder, performAlgoliaTextSearch, performPineconeTextSearch, useAppCheck, useBuildUserManagement, useFirebaseAccessGate, useFirebaseAuthController, useFirebaseRTDBDelegate, useFirebaseStorageSource, useFirestoreDriver, useInitialiseFirebase, useRecaptcha };
+export { FirebaseLoginView, LoginButton, RECAPTCHA_CONTAINER_ID, RebaseFirebaseApp, buildCollectionId, buildExternalSearchController, buildPineconeSearchController, buildRebaseSearchController, docToCollection, docsToCollectionTree, firestoreToRebaseModel, getFirestoreDataInPath, localSearchControllerBuilder, performAlgoliaTextSearch, performPineconeTextSearch, rebaseToFirestoreModel, useAppCheck, useBuildUserManagement, useFirebaseAccessGate, useFirebaseAuthController, useFirebaseRTDBDelegate, useFirebaseStorageSource, useFirestoreDriver, useInitialiseFirebase, useRecaptcha };
 
 //# sourceMappingURL=index.es.js.map