@rebasepro/client-firebase 0.2.3 → 0.2.4

package/src/hooks/useFirestoreDriver.ts

@@ -1,4 +1,5 @@
 import { DataDriver, DeleteEntityProps, Entity, EntityCollection, EntityReference, FetchCollectionProps, FetchEntityProps, FilterCombination, FilterValues, GeoPoint, ListenCollectionProps, ListenEntityProps, SaveEntityProps, WhereFilterOp } from "@rebasepro/types";
+import { User } from "@firebase/auth";
 import {
     collection as collectionClause,
     CollectionReference,
@@ -27,6 +28,7 @@ import {
     vector,
     where as whereClause
 } from "@firebase/firestore";
+import type { FieldValue } from "@firebase/firestore";
 import { FirebaseApp } from "@firebase/app";
 import { FirestoreTextSearchController, FirestoreTextSearchControllerBuilder } from "../types/text_search";
 import { useCallback, useEffect, useRef } from "react";
@@ -477,7 +479,7 @@ export function useFirestoreDriver({
             } else {
                 documentReference = doc(collectionReference);
             }
-            return setDoc(documentReference, values, { merge: true })
+            return setDoc(documentReference, values as Record<string, unknown>, { merge: true })
                 .then(() => {
                     return {
                         id: documentReference.id,
@@ -524,7 +526,7 @@ export function useFirestoreDriver({
         checkUniqueField: useCallback(async (
             path: string,
             name: string,
-            value: any,
+            value: unknown,
             entityId?: string | number,
             collection?: EntityCollection<any>
         ): Promise<boolean> => {
@@ -618,7 +620,7 @@ const createEntityFromDocument = <M extends Record<string, any>>(
     docSnap: DocumentSnapshot,
     databaseId?: string
 ): Entity<M> => {
-    const values = firestoreToCMSModel(docSnap.data());
+    const values = firestoreToCMSModel(docSnap.data()) as M;
     const path = getCMSPathFromFirestorePath(docSnap.ref.path);
     return {
         id: docSnap.id,
@@ -638,16 +640,16 @@ const createEntityFromDocument = <M extends Record<string, any>>(
  * @param data
  * @group Firestore
  */
-export function firestoreToCMSModel(data: any): any {
+export function firestoreToCMSModel(data: unknown): unknown {
     if (data === null || data === undefined) return null;
-    if (deleteField().isEqual(data)) {
+    if (typeof data === "object" && data !== null && "isEqual" in data && typeof (data as FieldValue).isEqual === "function" && deleteField().isEqual(data as FieldValue)) {
         return undefined;
     }
-    if (serverTimestamp().isEqual(data)) {
+    if (typeof data === "object" && data !== null && "isEqual" in data && typeof (data as FieldValue).isEqual === "function" && serverTimestamp().isEqual(data as FieldValue)) {
         return null;
     }
-    if (data instanceof Timestamp || (typeof data.toDate === "function" && data.toDate() instanceof Date)) {
-        return data.toDate();
+    if (data instanceof Timestamp || (typeof data === "object" && data !== null && "toDate" in data && typeof (data as Record<string, unknown>).toDate === "function" && ((data as Record<string, unknown>).toDate as () => unknown)() instanceof Date)) {
+        return (data as { toDate: () => Date }).toDate();
     }
     if (data instanceof Date) {
         return data;
@@ -655,9 +657,9 @@ export function firestoreToCMSModel(data: any): any {
     if (typeof data === "object" && "__type__" in data && data.__type__ === "__vector__") {
         return data; // already translated
     }
-    if (data instanceof VectorValue || (typeof data === "object" && data !== null && typeof data.toArray === "function" && data.constructor?.name === "VectorValue")) {
+    if (data instanceof VectorValue || (typeof data === "object" && data !== null && "toArray" in data && typeof (data as Record<string, unknown>).toArray === "function" && (data as { constructor?: { name?: string } }).constructor?.name === "VectorValue")) {
         return { __type__: "__vector__",
-value: data.toArray() };
+value: (data as { toArray: () => number[] }).toArray() };
     }
 
     if (data instanceof FirestoreGeoPoint) {
@@ -674,9 +676,9 @@ databaseId });
         return data.map(firestoreToCMSModel).filter(v => v !== undefined);
     }
     if (typeof data === "object") {
-        const result: Record<string, any> = {};
+        const result: Record<string, unknown> = {};
         for (const key of Object.keys(data)) {
-            const childValue = firestoreToCMSModel(data[key]);
+            const childValue = firestoreToCMSModel((data as Record<string, unknown>)[key]);
             if (childValue !== undefined)
                 result[key] = childValue;
         }
@@ -696,24 +698,26 @@ function getCMSPathFromFirestorePath(fsPath: string): string {
 }
 
 
-export function cmsToFirestoreModel(data: any, firestore: Firestore, inArray = false): any {
+export function cmsToFirestoreModel(data: unknown, firestore: Firestore, inArray = false): unknown {
     if (data === undefined) {
         return deleteField();
     } else if (data === null) {
         return null;
     } else if (Array.isArray(data)) {
-        return data.filter(v => v !== undefined).map(v => cmsToFirestoreModel(v, firestore, true));
-    } else if (data.isEntityReference && data.isEntityReference()) {
-        const targetFirestore = data.databaseId ? getFirestore(firestore.app, data.databaseId) : firestore;
-        return doc(targetFirestore, data.path, data.id);
-    } else if (data && typeof data === "object" && data.__type === "relation" && data.path && data.id) {
-        return doc(firestore, data.path, String(data.id));
+        return (data as unknown[]).filter(v => v !== undefined).map(v => cmsToFirestoreModel(v, firestore, true));
+    } else if (typeof data === "object" && data !== null && "isEntityReference" in data && typeof (data as Record<string, unknown>).isEntityReference === "function" && (data as { isEntityReference: () => boolean }).isEntityReference()) {
+        const entityRef = data as EntityReference;
+        const targetFirestore = entityRef.databaseId ? getFirestore(firestore.app, entityRef.databaseId) : firestore;
+        return doc(targetFirestore, entityRef.path, entityRef.id);
+    } else if (data && typeof data === "object" && "__type" in data && (data as Record<string, unknown>).__type === "relation" && "path" in data && "id" in data) {
+        const rel = data as { path: string; id: string | number };
+        return doc(firestore, rel.path, String(rel.id));
     } else if (data instanceof GeoPoint) {
         return new FirestoreGeoPoint(data.latitude, data.longitude);
     } 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" && "__type__" in data && (data as Record<string, unknown>).__type__ === "__vector__") {
+        return vector((data as { value?: number[] }).value || []);
     } else if (data && typeof data === "object") {
         return Object.entries(data)
             .map(([key, v]) => {
@@ -729,7 +733,7 @@ export function cmsToFirestoreModel(data: any, firestore: Firestore, inArray = f
     return data;
 }
 
-function currentTime(): any {
+function currentTime(): unknown {
     return serverTimestamp();
 }
 
@@ -774,7 +778,7 @@ function buildTextSearchControllerWithLocalSearch({
         search: async (props: {
             searchString: string,
             path: string,
-            currentUser?: any,
+            currentUser?: User,
             databaseId?: string
         }) => {
             const search = await textSearchController.search(props);

package/src/hooks/useInitialiseFirebase.ts

@@ -71,9 +71,9 @@ export function useInitialiseFirebase({
             setConfigError(undefined);
             setFirebaseConfigLoading(false);
             setFirebaseApp(initialisedFirebaseApp);
-        } catch (e: any) {
+        } catch (e: unknown) {
             console.error("Error initialising Firebase", e);
-            setConfigError(hostingError + "\n" + (e.message ?? JSON.stringify(e)));
+            setConfigError(hostingError + "\n" + (e instanceof Error ? e.message : JSON.stringify(e)));
         }
     }, [name]);
 

package/src/utils/algolia.ts

@@ -8,17 +8,17 @@ import { buildExternalSearchController } from "./text_search_controller";
  * @param query
  * @group Firebase
  */
-export function performAlgoliaTextSearch(client: any, indexName: string, query: string): Promise<readonly string[]> {
+export function performAlgoliaTextSearch(client: { searchSingleIndex: (params: Record<string, unknown>) => Promise<{ hits: Array<{ objectID: string }> }> }, indexName: string, query: string): Promise<readonly string[]> {
 
     console.debug("Performing Algolia query", client, query);
 
     return client.searchSingleIndex({
         indexName,
         searchParams: { query }
-    }).then(({ hits }: any) => {
-        return hits.map((hit: any) => hit.objectID as string);
+    }).then(({ hits }) => {
+        return hits.map((hit) => hit.objectID);
     })
-        .catch((err: any) => {
+        .catch((err: unknown) => {
             console.error(err);
             return [];
         });

package/src/utils/local_text_search_controller.ts

@@ -103,7 +103,7 @@ export const localSearchControllerBuilder: FirestoreTextSearchControllerBuilder
                 return (a.score ?? 0) - (b.score ?? 0);
             }
         });
-        return searchResult.map((e: any) => e.item.id);
+        return searchResult.map((e) => e.item.id);
     };
 
     return {

package/src/utils/rebase_search_controller.ts

@@ -96,7 +96,7 @@ export function buildRebaseSearchController(
     const extensionInstanceId = options?.extensionInstanceId || "typesense-search";
 
     let searchConfig: SearchConfig | null = null;
-    let typesenseClient: any = null;
+    let typesenseClient: unknown = null;
     let initPromise: Promise<void> | null = null;
 
     return ({ firebaseApp }: { firebaseApp: FirebaseApp }): FirestoreTextSearchController => {
@@ -131,12 +131,12 @@ export function buildRebaseSearchController(
                     if (options?.collections && options.collections.length > 0) {
                         searchConfig.collectionsToIndex = options.collections;
                     }
-                } catch (error: any) {
+                } catch (error: unknown) {
                     console.error("Failed to get search config from extension:", error);
                     throw new Error(
                         "Failed to initialize Rebase Search. " +
                         "Make sure the rebase-search extension is installed and configured. " +
-                        `Error: ${error.message || error}`
+                        `Error: ${error instanceof Error ? error.message : String(error)}`
                     );
                 }
             }
@@ -253,11 +253,11 @@ export function buildRebaseSearchController(
             }
 
             try {
-                const collection = await typesenseClient.collections(collectionName).retrieve();
+                const collection = await (typesenseClient as Record<string, Function>).collections(collectionName).retrieve();
 
                 // Extract string fields from the schema
-                const stringFields = collection.fields
-                    .filter((f: any) => {
+                const stringFields = (collection.fields as Array<{ type: string; name: string }>)
+                    .filter((f) => {
                         // Include string and string[] types, exclude internal fields
                         const isStringType = f.type === "string" ||
                             f.type === "string[]" ||
@@ -266,12 +266,12 @@ export function buildRebaseSearchController(
                         const isNotInternal = !f.name.startsWith("_") && f.name !== ".*";
                         return isStringType && isNotInternal;
                     })
-                    .map((f: any) => f.name);
+                    .map((f) => f.name);
 
                 schemaCache.set(collectionName, stringFields);
                 return stringFields;
-            } catch (error: any) {
-                if (error.httpStatus === 404) {
+            } catch (error: unknown) {
+                if (error instanceof Error && "httpStatus" in error && (error as Record<string, unknown>).httpStatus === 404) {
                     throw new Error(
                         `Collection "${collectionName}" not found in Typesense. ` +
                         "Make sure the collection has been indexed. Try running the backfill function."
@@ -322,7 +322,7 @@ export function buildRebaseSearchController(
             const queryBy = searchableFields.join(",");
 
             try {
-                const searchParams: any = {
+                const searchParams: Record<string, unknown> = {
                     q: props.searchString,
                     query_by: queryBy,
                     per_page: 100,
@@ -335,18 +335,18 @@ export function buildRebaseSearchController(
                     searchParams.filter_by = parentFilter;
                 }
 
-                const result = await typesenseClient
+                const result = await (typesenseClient as Record<string, Function>)
                     .collections(collectionName)
                     .documents()
                     .search(searchParams);
 
                 // Extract document IDs from hits
-                const ids = result.hits?.map((hit: any) => hit.document.id) ?? [];
+                const ids = (result.hits as Array<{ document: { id: string } }> | undefined)?.map((hit) => hit.document.id) ?? [];
 
                 return ids as readonly string[];
-            } catch (error: any) {
+            } catch (error: unknown) {
                 // Parse error message for user-friendly display
-                const message = error.message || error.toString();
+                const message = error instanceof Error ? error.message : String(error);
                 throw new Error(`Search failed: ${message}`);
             }
         };