react-firebase-ql 2.0.8 → 2.1.0

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAIA,2CAAyB"}

package/esm/client/index.js

@@ -0,0 +1,5 @@
+export { useAuth } from '../client/useAuth';
+export { useCount } from '../client/useCounter';
+export { useFetch } from '../client/useFetch';
+export { useStream } from '../client/useStream';
+//# sourceMappingURL=index.js.map

package/esm/client/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC"}

package/esm/client/useAuth.js

@@ -0,0 +1,12 @@
+'use client';
+import { useEffect } from 'react';
+import { onAuthStateChanged } from 'firebase/auth';
+export function useAuth(auth, callback) {
+    useEffect(() => {
+        const unsubscribe = onAuthStateChanged(auth, async (authUser) => {
+            callback(authUser);
+        });
+        return () => unsubscribe();
+    }, []);
+}
+//# sourceMappingURL=useAuth.js.map

package/esm/client/useAuth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAuth.js","sourceRoot":"","sources":["../../src/client/useAuth.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAQ,kBAAkB,EAAQ,MAAM,eAAe,CAAC;AAG/D,MAAM,UAAU,OAAO,CAAC,IAAU,EAAE,QAAmC;IACrE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC/D,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACnB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

package/esm/client/useCounter.js

@@ -0,0 +1,30 @@
+'use client';
+import { errorLogger } from "firebase-client-ql";
+import { useCallback, useEffect, useState } from "react";
+export const useCount = (param) => {
+    const [data, setData] = useState(0);
+    const [loading, setLoading] = useState(true);
+    const fetcher = useCallback(async () => {
+        if (!param.where)
+            return;
+        try {
+            const model = param.model;
+            const found = await model.countData(param.where);
+            setData(found);
+        }
+        catch (error) {
+            errorLogger("useCount: ", error);
+        }
+        finally {
+            setLoading(false);
+        }
+    }, [
+        JSON.stringify(param.where),
+        loading
+    ]);
+    useEffect(() => {
+        fetcher();
+    }, [fetcher]);
+    return [data, loading, setLoading];
+};
+//# sourceMappingURL=useCounter.js.map

package/esm/client/useCounter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useCounter.js","sourceRoot":"","sources":["../../src/client/useCounter.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAa,WAAW,EAAe,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAA4B,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAIlF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAuB,KAG9C,EAAwD,EAAE;IAEvD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACnC,IAAK,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO;QAE1B,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC1B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YAChD,OAAO,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,WAAW,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;gBAAS,CAAC;YACP,UAAU,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACL,CAAC,EAAE;QACC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;QAC3B,OAAO;KACV,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,EAAE,CAAC;IACd,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACvC,CAAC,CAAA"}

package/esm/client/useFetch.js

@@ -0,0 +1,45 @@
+'use client';
+import { errorLogger } from "firebase-client-ql";
+import { useCallback, useEffect, useState } from "react";
+export const useFetch = (param) => {
+    const [data, setData] = useState();
+    const [loading, setLoading] = useState(true);
+    const fetcher = useCallback(async () => {
+        var _a, _b, _c, _d;
+        if (!param.reference && !param.where)
+            return;
+        try {
+            const model = param.model;
+            if (param.reference) {
+                const found = await model.find(param.reference);
+                if (found)
+                    setData(model.data);
+            }
+            else if (param.where) {
+                const found = await model.findWhere({
+                    wh: param.where,
+                    lim: (_b = (_a = param.filter) === null || _a === void 0 ? void 0 : _a.limit) !== null && _b !== void 0 ? _b : 100,
+                    order: (_c = param.filter) === null || _c === void 0 ? void 0 : _c.orderBy,
+                    offset: (_d = param.filter) === null || _d === void 0 ? void 0 : _d.offset
+                });
+                setData(found);
+            }
+        }
+        catch (error) {
+            errorLogger("useFetch: ", error);
+        }
+        finally {
+            setLoading(false);
+        }
+    }, [
+        param.reference,
+        JSON.stringify(param.where),
+        JSON.stringify(param.filter),
+        loading
+    ]);
+    useEffect(() => {
+        fetcher();
+    }, [fetcher]);
+    return [data, loading, setLoading];
+};
+//# sourceMappingURL=useFetch.js.map

package/esm/client/useFetch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useFetch.js","sourceRoot":"","sources":["../../src/client/useFetch.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAa,WAAW,EAAe,MAAM,oBAAoB,CAAA;AACxE,OAAO,EAA4B,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAIlF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAuB,KAS9C,EAAyE,EAAE;IAExE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,EAAW,CAAC;IAC5C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;;QACnC,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO;QAE7C,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAE1B,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBAClB,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAChD,IAAI,KAAK;oBAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACnC,CAAC;iBAAM,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACrB,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC;oBAChC,EAAE,EAAE,KAAK,CAAC,KAAK;oBACf,GAAG,EAAE,MAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,mCAAI,GAAG;oBAC/B,KAAK,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,OAAO;oBAC5B,MAAM,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM;iBAC/B,CAAC,CAAC;gBACH,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,WAAW,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;gBAAS,CAAC;YACP,UAAU,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACL,CAAC,EAAE;QACC,KAAK,CAAC,SAAS;QACf,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;QAC5B,OAAO;KACV,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,EAAE,CAAC;IACd,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACvC,CAAC,CAAA"}

package/esm/client/useStream.js

@@ -0,0 +1,37 @@
+'use client';
+import { errorLogger } from 'firebase-client-ql';
+import { useEffect } from 'react';
+export const useStream = (param, callback) => {
+    useEffect(() => {
+        let unsubscribe;
+        try {
+            const { model, reference, where, filter } = param;
+            if (reference) {
+                unsubscribe = model.stream((data) => {
+                    if (data)
+                        callback(data);
+                }, reference);
+            }
+            else if (where) {
+                const allInvalid = where.every((item) => item.value === undefined);
+                if (allInvalid) {
+                    callback([]);
+                    return;
+                }
+                unsubscribe = model.streamWhere(where, (data) => {
+                    if (data)
+                        callback(data);
+                }, 100, filter === null || filter === void 0 ? void 0 : filter.orderBy, filter === null || filter === void 0 ? void 0 : filter.offset);
+            }
+        }
+        catch (error) {
+            errorLogger('useStream error:', error);
+        }
+        return () => {
+            if (typeof unsubscribe === 'function') {
+                unsubscribe();
+            }
+        };
+    }, [JSON.stringify(param.where), JSON.stringify(param.filter), param.reference]);
+};
+//# sourceMappingURL=useStream.js.map

package/esm/client/useStream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useStream.js","sourceRoot":"","sources":["../../src/client/useStream.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAa,WAAW,EAAe,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGlC,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,KAQC,EACD,QAA6B,EACvB,EAAE;IACR,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,WAAqC,CAAC;QAE1C,IAAI,CAAC;YACH,MAAM,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;YAEjD,IAAI,SAAS,EAAE,CAAC;gBACd,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE;oBACvC,IAAI,IAAI;wBAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC3B,CAAC,EAAE,SAAS,CAAC,CAAC;YAChB,CAAC;iBAAM,IAAI,KAAK,EAAE,CAAC;gBACjB,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;gBACnE,IAAI,UAAU,EAAE,CAAC;oBACf,QAAQ,CAAC,EAAE,CAAC,CAAC;oBACb,OAAO;gBACT,CAAC;gBAED,WAAW,GAAG,KAAK,CAAC,WAAW,CAC7B,KAAK,EACL,CAAC,IAAS,EAAE,EAAE;oBACZ,IAAI,IAAI;wBAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC3B,CAAC,EACD,GAAG,EACH,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EACf,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CACf,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC;QAGD,OAAO,GAAG,EAAE;YACV,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE,CAAC;gBACtC,WAAW,EAAE,CAAC;YAChB,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;AACnF,CAAC,CAAC"}

package/esm/index.js

@@ -0,0 +1,2 @@
+export * from './client';
+//# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC"}

package/package.json

@@ -1,40 +1,37 @@
 {
   "name": "react-firebase-ql",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "description": "A React helper library that simplifies using Firebase with side effects and live queries.",
-  "main": "dist/index.cjs.js",
-  "module": "dist/index.esm.js",
+  "main": "dist/index.js",
+  "module": "esm/index.js",
   "types": "dist/index.d.ts",
+  "files": ["dist", "esm", "src"],
   "private": false,
-  "files": [
-    "dist"
-  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/breedware/react-firebase-ql.git"
   },
   "keywords": [
-    "react",
-    "firebase",
-    "hooks",
-    "library",
-    "firebase-ql",
-    "firebase sql",
-    "react-firebase"
+    "react", "firebase", "hooks", "library", "firebase-ql", "firebase sql", "react-firebase"
   ],
   "author": "Breedware Limited",
   "license": "MIT",
   "scripts": {
-    "clean": "rimraf dist",
-    "build": "tsup src/client/index.ts --dts --format esm,cjs --out-dir dist",
+    "clean": "rimraf dist esm",
+    "prebuild": "npm run clean",
+    "build:cjs": "tsc --module commonjs --outDir dist",
+    "build:esm": "tsc --module esnext --outDir esm",
+    "build": "npm run build:esm && npm run build:cjs",
     "prepublishOnly": "npm run build",
+    "prepare": "npm run build",
+    "preversion": "npm run build",
+    "postversion": "git push --follow-tags",
     "test": "vitest",
-    "lint": "eslint . --ext .ts,.tsx,.js",
-    "prepare": "npm run build"
+    "lint": "eslint . --ext .ts,.tsx,.js"
   },
   "peerDependencies": {
     "react": ">=18",
-    "firebase-client-ql" : ">=4"
+    "firebase-client-ql": ">=4"
   },
   "devDependencies": {
     "@testing-library/react": "^16.3.0",
@@ -45,16 +42,12 @@
     "typescript": "^5.9.3",
     "vitest": "^0.30.1"
   },
-
   "sideEffects": false,
   "exports": {
     ".": {
-      "browser": {
-        "import": "./dist/index.esm.js",
-        "require": "./dist/index.cjs.js"
-      },
-      "default": "./dist/index.esm.js"
+      "import": "./esm/index.js",
+      "require": "./dist/index.js",
+      "default": "./esm/index.js"
     }
   }
-
 }

package/src/client/index.ts

@@ -0,0 +1,5 @@
+
+export { useAuth } from '../client/useAuth';
+export { useCount } from '../client/useCounter';
+export { useFetch } from '../client/useFetch';
+export { useStream } from '../client/useStream';

package/src/client/useAuth.ts

@@ -0,0 +1,14 @@
+'use client';
+import { useEffect } from 'react';
+import { Auth, onAuthStateChanged, User } from 'firebase/auth';
+
+
+export function useAuth(auth: Auth, callback: (user: User | null)=>void) {
+  useEffect(() => {
+    const unsubscribe = onAuthStateChanged(auth, async (authUser) => {
+     callback(authUser)
+    });
+
+    return () => unsubscribe();
+  }, []);
+}

package/src/client/useCounter.ts

@@ -0,0 +1,38 @@
+'use client'
+
+import { BaseModel, errorLogger, whereClause } from "firebase-client-ql";
+import { Dispatch, SetStateAction, useCallback, useEffect, useState } from "react"
+
+
+// Count firestore data
+export const useCount = <T extends BaseModel >(param: {
+    model: T | any,
+    where?: whereClause[],
+}): [number, boolean, Dispatch<SetStateAction<boolean>>] => {
+
+    const [data, setData] = useState<number>(0);
+    const [loading, setLoading] = useState(true);
+
+    const fetcher = useCallback(async () => {
+        if ( !param.where) return;
+
+        try {
+            const model = param.model;
+            const found = await model.countData(param.where)
+            setData(found);
+        } catch (error) {
+            errorLogger("useCount: ", error);
+        } finally {
+            setLoading(false);
+        }
+    }, [
+        JSON.stringify(param.where),
+        loading
+    ]);
+
+    useEffect(() => {
+        fetcher();
+    }, [fetcher]);
+
+    return [data, loading, setLoading];
+}

package/src/client/useFetch.ts

@@ -0,0 +1,57 @@
+'use client'
+
+import { BaseModel, errorLogger, whereClause } from "firebase-client-ql"
+import { Dispatch, SetStateAction, useCallback, useEffect, useState } from "react"
+
+
+// 👇 Hook is now generic
+export const useFetch = <T extends BaseModel >(param: {
+    model: T | any
+    where?: whereClause[],
+    reference?: string,
+    filter?: {
+        orderBy?: { parameter: string, direction?: 'asc' | 'desc' };
+        offset?: string;
+        limit?: number;
+    }
+}): [typeof param.model.data, boolean, Dispatch<SetStateAction<boolean>>] => {
+
+    const [data, setData] = useState<unknown>();
+    const [loading, setLoading] = useState(true);
+
+    const fetcher = useCallback(async () => {
+        if (!param.reference && !param.where) return;
+
+        try {
+            const model = param.model;
+
+            if (param.reference) {
+                const found = await model.find(param.reference);
+                if (found) setData(model.data);
+            } else if (param.where) {
+                const found = await model.findWhere({
+                    wh: param.where,
+                    lim: param.filter?.limit ?? 100,
+                    order: param.filter?.orderBy,
+                    offset: param.filter?.offset
+                });
+                setData(found);
+            }
+        } catch (error) {
+            errorLogger("useFetch: ", error);
+        } finally {
+            setLoading(false);
+        }
+    }, [
+        param.reference,
+        JSON.stringify(param.where),
+        JSON.stringify(param.filter),
+        loading
+    ]);
+
+    useEffect(() => {
+        fetcher();
+    }, [fetcher]);
+
+    return [data, loading, setLoading];
+}

package/src/client/useStream.ts

@@ -0,0 +1,57 @@
+'use client';
+
+import { BaseModel, errorLogger, whereClause } from 'firebase-client-ql';
+import { useEffect } from 'react';
+
+
+export const useStream = <T extends BaseModel>(
+  param: {
+    model: T | any;
+    where?: whereClause[];
+    reference?: string;
+    filter?: {
+      orderBy?: { parameter: string; direction?: 'asc' | 'desc' };
+      offset?: string;
+    };
+  },
+  callback: (data: any) => void
+): void => {
+  useEffect(() => {
+    let unsubscribe: (() => void) | undefined;
+
+    try {
+      const {model, reference, where, filter } = param;
+
+      if (reference) {
+        unsubscribe = model.stream((data: any) => {
+          if (data) callback(data);
+        }, reference);
+      } else if (where) {
+        const allInvalid = where.every((item) => item.value === undefined);
+        if (allInvalid) {
+          callback([]);
+          return;
+        }
+
+        unsubscribe = model.streamWhere(
+          where,
+          (data: any) => {
+            if (data) callback(data);
+          },
+          100,
+          filter?.orderBy,
+          filter?.offset
+        );
+      }
+    } catch (error) {
+      errorLogger('useStream error:', error);
+    }
+
+    // Proper cleanup
+    return () => {
+      if (typeof unsubscribe === 'function') {
+        unsubscribe();
+      }
+    };
+  }, [JSON.stringify(param.where), JSON.stringify(param.filter), param.reference]);
+};

package/src/index.ts

@@ -0,0 +1,5 @@
+/**
+ * ⚠️ Client-only exports
+ * These hooks must NOT be imported in Server Components
+ */
+export * from './client';