placementt-core 1.20.196 → 11.0.533

package/src/firebase/firebaseQuery.tsx

@@ -1,140 +1,143 @@
-import {addDoc, collection, CollectionReference, deleteDoc, doc,
-    DocumentData, DocumentReference, FieldValue, getCountFromServer, getDoc,
-    getDocs, onSnapshot, Query, query, QueryConstraint, QueryDocumentSnapshot, setDoc, updateDoc, where} from "firebase/firestore";
-import {SetStateAction} from "react";
-import {db} from "./firebaseConfig";
-import {pathToArr} from "./util";
-import {Products} from "../typeDefinitions";
-import { AppDispatch } from "../config";
-
-export default class FirebaseQuery {
-    private createQuery(queryType:"collection"|"doc", path:string[]|string, constraints?:QueryConstraint[]|QueryConstraint) {
-        switch (queryType) {
-        case "collection":
-            return query(collection(db, ...(pathToArr(path) as [any])), ...[...(constraints ? Array.isArray(constraints) ? constraints : [constraints] : [])]);
-        case "doc":
-            return doc(db, ...(pathToArr(path) as [any]));
-        }
-    }
-
-    async getCount(path:string[]|string, constraints?:QueryConstraint[]|QueryConstraint):Promise<number> {
-        console.log("GET COUNT", path, constraints);
-        const countObject = await getCountFromServer(this.createQuery("collection", path, constraints) as Query).catch((e) => console.log(e));
-        if (!countObject) return 0;
-        return (countObject).data().count;
-    }
-
-    async add(path:string[]|string, data:{[key:string]:unknown}) {
-        if (path.length % 2 === 0) {
-            throw new Error("Provide a collection reference");
-        }
-        return await addDoc(this.createQuery("collection", path) as CollectionReference, data);
-    }
-
-    async set(path:string[]|string, data:{[key:string]:unknown}, merge=false) {
-        if (path.length % 2 === 1) {
-            throw new Error("Provide a document reference");
-        }
-        return await setDoc(this.createQuery("doc", path) as DocumentReference, data, {merge: merge});
-    }
-
-    async update(path:string[]|string, data:{ [key: string]: unknown}) {
-        if (path.length % 2 === 1) {
-            throw new Error("Provide a document reference");
-        }
-        console.log("update", path, data);
-        return await updateDoc(this.createQuery("doc", path) as DocumentReference, data as { [key: string]: FieldValue | Partial<unknown> | undefined});
-    }
-
-    async delete(path:string[]|string) {
-        if (path.length % 2 === 1) {
-            throw new Error("Provide a document reference");
-        }
-        await deleteDoc(this.createQuery("doc", path) as DocumentReference);
-    }
-
-    async copy(path: string[]|string, id: string, oId: string, product: Products) {
-        const existing = await this.getDocData([...path, id]);
-        console.log("existing", existing);
-        existing.name = await this.getUniqueDocName(path, existing.name, oId, product);
-        if (existing.default) {
-            existing.default = false;
-        }
-        return await this.add(path, existing);
-    }
-
-    async getUniqueDocName(path: string[]|string, name: string, oId: string, product: Products): Promise<string> {
-        const q = this.createQuery("collection", path, [where("name", "==", name), where("oId", "==", oId), where("product", "==", product)]);
-
-        const querySnapshot = await getDocs(q as Query);
-        if (!querySnapshot.empty) {
-            return this.getUniqueDocName(path, name += "-", oId, product);
-        }
-        return name;
-    }
-
-    async getDocData(path:string[]|string) {
-        console.log("GET DOC", path);
-        if (path.length % 2 === 1) {
-            throw new Error("Provide a document reference");
-        }
-        const result = await getDoc(this.createQuery("doc", path) as DocumentReference).catch((error) => {
-            console.log(`Error in snapshot ${path}`, error);
-            throw error;
-        });
-        const resultData = result.data() || {};
-        resultData.id = result.id;
-        return resultData;
-    }
-
-    async getDocsWhere(path: string[]|string, constraints?:QueryConstraint[]|QueryConstraint, rawDocs=false) {
-        const q = this.createQuery("collection", path, constraints);
-
-        const docs = await getDocs(q as Query).catch((e) => console.log(e, q));
-        if (rawDocs) return docs;
-        if (!docs) return {};
-        console.log("GET DOCS WHERE", docs.size, path, constraints);
-
-        return docs.docs.reduce((acc: {[k: string]: any}, document) => {
-            const docData = {...document.data(), id: document.id};
-            acc[document.id] = docData;
-            return acc;
-        }, {});
-    }
-
-    async collectionUpdate(data:{[key:string]:unknown}, path: string[]|string, constraints?:QueryConstraint[]|QueryConstraint) {
-        if (path.length % 2 === 0) {
-            throw new Error("Provide a collection reference");
-        }
-        const q = this.createQuery("collection", path, constraints) as Query;
-        (await getDocs(q)).docs.forEach((doc) => {
-            this.update(doc.ref.path.split("/"), data);
-        });
-    }
-
-    documentSnapshot(path: string[]|string, setState: SetStateAction<any>) {
-        const q = this.createQuery("doc", path) as DocumentReference;
-        return onSnapshot(q, (doc) => {
-            setState({...doc.data(), id: doc.id});
-        }, (error) => {
-            console.log(`Error in snapshot ${path}`, error);
-        });
-    }
-
-    collectionSnapshot(setState:SetStateAction<any>, path: string[]|string, constraints?:QueryConstraint[]|QueryConstraint, dispatch?: AppDispatch) {
-        const q = this.createQuery("collection", path, constraints) as Query<DocumentData>;
-
-        return onSnapshot(q, (querySnapshot: DocumentData) => {
-            const itemList: {[key: string]: any} = {};
-
-            querySnapshot.docs.forEach((doc: QueryDocumentSnapshot) => {
-                const item = doc.data();
-                item.id = doc.id;
-                itemList[doc.id] = item;
-            });
-            dispatch ? dispatch(setState(itemList)) : setState(itemList);
-        }, (error) => {
-            console.log(`Error in snapshot ${path}`, error);
-        });
-    }
-}
+import {addDoc, collection, CollectionReference, deleteDoc, doc,
+    DocumentData, DocumentReference, FieldValue, getCountFromServer, getDoc,
+    getDocs, onSnapshot, Query, query, QueryConstraint, QueryDocumentSnapshot, setDoc, updateDoc, where} from "firebase/firestore";
+import {SetStateAction} from "react";
+import {db} from "./firebaseConfig";
+import {pathToArr} from "./util";
+import {Products} from "../typeDefinitions";
+import { AppDispatch } from "../config";
+
+export default class FirebaseQuery {
+    private createQuery(queryType:"collection"|"doc", path:string[]|string, constraints?:QueryConstraint[]|QueryConstraint) {
+        switch (queryType) {
+        case "collection":
+            return query(collection(db, ...(pathToArr(path) as [any])), ...[...(constraints ? Array.isArray(constraints) ? constraints : [constraints] : [])]);
+        case "doc":
+            return doc(db, ...(pathToArr(path) as [any]));
+        }
+    }
+
+    async getCount(path:string[]|string, constraints?:QueryConstraint[]|QueryConstraint):Promise<number> {
+        console.log("GET COUNT", path, constraints);
+        const countObject = await getCountFromServer(this.createQuery("collection", path, constraints) as Query).catch((e) => console.log(e));
+        if (!countObject) return 0;
+        return (countObject).data().count;
+    }
+
+    async add(path:string[]|string, data:{[key:string]:unknown}) {
+        if (path.length % 2 === 0) {
+            throw new Error("Provide a collection reference");
+        }
+        return await addDoc(this.createQuery("collection", path) as CollectionReference, data);
+    }
+
+    async set(path:string[]|string, data:{[key:string]:unknown}, merge=false) {
+        if (path.length % 2 === 1) {
+            throw new Error("Provide a document reference");
+        }
+        return await setDoc(this.createQuery("doc", path) as DocumentReference, data, {merge: merge});
+    }
+
+    async update(path:string[]|string, data:{ [key: string]: unknown}) {
+        if (path.length % 2 === 1) {
+            throw new Error("Provide a document reference");
+        }
+        console.log("update", path, data);
+        return await updateDoc(this.createQuery("doc", path) as DocumentReference, data as { [key: string]: FieldValue | Partial<unknown> | undefined});
+    }
+
+    async delete(path:string[]|string) {
+        if (path.length % 2 === 1) {
+            throw new Error("Provide a document reference");
+        }
+        await deleteDoc(this.createQuery("doc", path) as DocumentReference);
+    }
+
+    async copy(path: string[]|string, id: string, oId: string, product: Products) {
+        const existing = await this.getDocData([...path, id]);
+        console.log("existing", existing);
+        existing.name = await this.getUniqueDocName(path, existing.name, oId, product);
+        if (existing.default) {
+            existing.default = false;
+        }
+        return await this.add(path, existing);
+    }
+
+    async getUniqueDocName(path: string[]|string, name: string, oId: string, product: Products): Promise<string> {
+        const q = this.createQuery("collection", path, [where("name", "==", name), where("oId", "==", oId), where("product", "==", product)]);
+
+        const querySnapshot = await getDocs(q as Query);
+        if (!querySnapshot.empty) {
+            return this.getUniqueDocName(path, name += "-", oId, product);
+        }
+        return name;
+    }
+
+    async getDocData(path:string[]|string) {
+        console.log("GET DOC", path);
+        if (path.length % 2 === 1) {
+            throw new Error("Provide a document reference");
+        }
+        const result = await getDoc(this.createQuery("doc", path) as DocumentReference).catch((error) => {
+            console.log(`Error in snapshot ${path}`, error);
+            throw error;
+        });
+        const resultData = result.data() || {};
+        resultData.id = result.id;
+        return resultData;
+    }
+
+    async getDocsWhere(path: string[]|string, constraints?:QueryConstraint[]|QueryConstraint, rawDocs=false) {
+        const q = this.createQuery("collection", path, constraints);
+
+        const docs = await getDocs(q as Query).catch((e) => console.log(e, q));
+        if (rawDocs) return docs;
+        if (!docs) return {};
+        console.log("GET DOCS WHERE", docs.size, path, constraints);
+
+        return docs.docs.reduce((acc: {[k: string]: any}, document) => {
+            const docData = {...document.data(), id: document.id};
+            acc[document.id] = docData;
+            return acc;
+        }, {});
+    }
+
+    async collectionUpdate(data:{[key:string]:unknown}, path: string[]|string, constraints?:QueryConstraint[]|QueryConstraint) {
+        if (path.length % 2 === 0) {
+            throw new Error("Provide a collection reference");
+        }
+        const q = this.createQuery("collection", path, constraints) as Query;
+        (await getDocs(q)).docs.forEach((doc) => {
+            this.update(doc.ref.path.split("/"), data);
+        });
+    }
+
+    documentSnapshot(path: string[]|string, setState: SetStateAction<any>) {
+        console.log("Building snapshot query: ", path);
+        const q = this.createQuery("doc", path) as DocumentReference;
+        console.log("Query created");
+        return onSnapshot(q, (doc) => {
+            console.log("Data", doc.data());
+            setState({...doc.data(), id: doc.id});
+        }, (error) => {
+            console.log(`Error in snapshot ${path}`, error);
+        });
+    }
+
+    collectionSnapshot(setState:SetStateAction<any>, path: string[]|string, constraints?:QueryConstraint[]|QueryConstraint, dispatch?: AppDispatch) {
+        const q = this.createQuery("collection", path, constraints) as Query<DocumentData>;
+
+        return onSnapshot(q, (querySnapshot: DocumentData) => {
+            const itemList: {[key: string]: any} = {};
+
+            querySnapshot.docs.forEach((doc: QueryDocumentSnapshot) => {
+                const item = doc.data();
+                item.id = doc.id;
+                itemList[doc.id] = item;
+            });
+            dispatch ? dispatch(setState(itemList)) : setState(itemList);
+        }, (error) => {
+            console.log(`Error in snapshot ${path}`, error);
+        });
+    }
+}

package/src/firebase/persistence.ts

@@ -1,84 +1,84 @@
-import {Persistence, ReactNativeAsyncStorage} from "firebase/auth";
-
-export const enum PersistenceType {
-  SESSION = "SESSION",
-  LOCAL = "LOCAL",
-  NONE = "NONE"
-}
-
-export type PersistedBlob = Record<string, unknown>;
-
-export interface Instantiator<T> {
-  (blob: PersistedBlob): T;
-}
-
-export type PersistenceValue = PersistedBlob | string;
-
-export const STORAGE_AVAILABLE_KEY = "__sak";
-
-export interface StorageEventListener {
-  (value: PersistenceValue | null): void;
-}
-
-export interface PersistenceInternal extends Persistence {
-  type: PersistenceType;
-  _isAvailable(): Promise<boolean>;
-  _set(key: string, value: PersistenceValue): Promise<void>;
-  _get<T extends PersistenceValue>(key: string): Promise<T | null>;
-  _remove(key: string): Promise<void>;
-  _addListener(key: string, listener: StorageEventListener): void;
-  _removeListener(key: string, listener: StorageEventListener): void;
-  // Should this persistence allow migration up the chosen hierarchy?
-  _shouldAllowMigration?: boolean;
-}
-
-export function getReactNativePersistence(
-    storage: ReactNativeAsyncStorage
-): Persistence {
-    // In the _getInstance() implementation (see src/core/persistence/index.ts),
-    // we expect each "externs.Persistence" object passed to us by the user to
-    // be able to be instantiated (as a class) using "new". That function also
-    // expects the constructor to be empty. Since ReactNativeStorage requires the
-    // underlying storage layer, we need to be able to create subclasses
-    // (closures, esentially) that have the storage layer but empty constructor.
-    return class implements PersistenceInternal {
-    static type = "LOCAL" as const;
-    readonly type: PersistenceType = PersistenceType.LOCAL;
-
-    async _isAvailable(): Promise<boolean> {
-        try {
-            if (!storage) {
-                return false;
-            }
-            await storage.setItem(STORAGE_AVAILABLE_KEY, "1");
-            await storage.removeItem(STORAGE_AVAILABLE_KEY);
-            return true;
-        } catch {
-            return false;
-        }
-    }
-
-    _set(key: string, value: PersistenceValue): Promise<void> {
-        return storage.setItem(key, JSON.stringify(value));
-    }
-
-    async _get<T extends PersistenceValue>(key: string): Promise<T | null> {
-        const json = await storage.getItem(key);
-        return json ? JSON.parse(json) : null;
-    }
-
-    _remove(key: string): Promise<void> {
-        return storage.removeItem(key);
-    }
-
-    _addListener(_key: string, _listener: StorageEventListener): void {
-        // Listeners are not supported for React Native storage.
-        return;
-    }
-
-    _removeListener(_key: string, _listener: StorageEventListener): void {
-        // Listeners are not supported for React Native storage.
-        return;
-    }
-    };
-}
+import {Persistence, ReactNativeAsyncStorage} from "firebase/auth";
+
+export const enum PersistenceType {
+  SESSION = "SESSION",
+  LOCAL = "LOCAL",
+  NONE = "NONE"
+}
+
+export type PersistedBlob = Record<string, unknown>;
+
+export interface Instantiator<T> {
+  (blob: PersistedBlob): T;
+}
+
+export type PersistenceValue = PersistedBlob | string;
+
+export const STORAGE_AVAILABLE_KEY = "__sak";
+
+export interface StorageEventListener {
+  (value: PersistenceValue | null): void;
+}
+
+export interface PersistenceInternal extends Persistence {
+  type: PersistenceType;
+  _isAvailable(): Promise<boolean>;
+  _set(key: string, value: PersistenceValue): Promise<void>;
+  _get<T extends PersistenceValue>(key: string): Promise<T | null>;
+  _remove(key: string): Promise<void>;
+  _addListener(key: string, listener: StorageEventListener): void;
+  _removeListener(key: string, listener: StorageEventListener): void;
+  // Should this persistence allow migration up the chosen hierarchy?
+  _shouldAllowMigration?: boolean;
+}
+
+export function getReactNativePersistence(
+    storage: ReactNativeAsyncStorage
+): Persistence {
+    // In the _getInstance() implementation (see src/core/persistence/index.ts),
+    // we expect each "externs.Persistence" object passed to us by the user to
+    // be able to be instantiated (as a class) using "new". That function also
+    // expects the constructor to be empty. Since ReactNativeStorage requires the
+    // underlying storage layer, we need to be able to create subclasses
+    // (closures, esentially) that have the storage layer but empty constructor.
+    return class implements PersistenceInternal {
+    static type = "LOCAL" as const;
+    readonly type: PersistenceType = PersistenceType.LOCAL;
+
+    async _isAvailable(): Promise<boolean> {
+        try {
+            if (!storage) {
+                return false;
+            }
+            await storage.setItem(STORAGE_AVAILABLE_KEY, "1");
+            await storage.removeItem(STORAGE_AVAILABLE_KEY);
+            return true;
+        } catch {
+            return false;
+        }
+    }
+
+    _set(key: string, value: PersistenceValue): Promise<void> {
+        return storage.setItem(key, JSON.stringify(value));
+    }
+
+    async _get<T extends PersistenceValue>(key: string): Promise<T | null> {
+        const json = await storage.getItem(key);
+        return json ? JSON.parse(json) : null;
+    }
+
+    _remove(key: string): Promise<void> {
+        return storage.removeItem(key);
+    }
+
+    _addListener(_key: string, _listener: StorageEventListener): void {
+        // Listeners are not supported for React Native storage.
+        return;
+    }
+
+    _removeListener(_key: string, _listener: StorageEventListener): void {
+        // Listeners are not supported for React Native storage.
+        return;
+    }
+    };
+}