reactfire 4.0.0-exp.cb3fede → 4.0.0-exp.eb1428b

package/src/useObservable.ts

@@ -63,55 +63,75 @@ export interface ObservableStatus<T> {
   firstValuePromise: Promise<void>;
 }
 
+function reducerFactory<T>(observable: SuspenseSubject<T>) {
+  return function reducer(state: ObservableStatus<T>, action: 'value' | 'error' | 'complete'): ObservableStatus<T> {
+    // always make sure these values are in sync with the observable
+    const newState = {
+      ...state,
+      hasEmitted: state.hasEmitted || observable.hasValue,
+      error: observable.ourError,
+      firstValuePromise: observable.firstEmission,
+    };
+    if (observable.hasValue) {
+      newState.data = observable.value;
+    }
+
+    switch (action) {
+      case 'value':
+        newState.status = 'success';
+        return newState;
+      case 'error':
+        newState.status = 'error';
+        return newState;
+      case 'complete':
+        newState.isComplete = true;
+        return newState;
+      default:
+        throw new Error(`invalid action "${action}"`);
+    }
+  };
+}
+
 export function useObservable<T = unknown>(observableId: string, source: Observable<T>, config: ReactFireOptions = {}): ObservableStatus<T> {
+  // Register the observable with the cache
   if (!observableId) {
     throw new Error('cannot call useObservable without an observableId');
   }
   const observable = preloadObservable(source, observableId);
 
+  // Suspend if suspense is enabled and no initial data exists
   const hasInitialData = config.hasOwnProperty('initialData') || config.hasOwnProperty('startWithValue');
-
+  const hasData = observable.hasValue || hasInitialData;
   const suspenseEnabled = useSuspenseEnabledFromConfigAndContext(config.suspense);
-
-  if (suspenseEnabled === true && !observable.hasValue && (!config?.initialData ?? !config?.startWithValue)) {
+  if (suspenseEnabled === true && !hasData) {
     throw observable.firstEmission;
   }
 
-  const [latest, setValue] = React.useState(() => (observable.hasValue ? observable.value : config.initialData ?? config.startWithValue));
-  const [isComplete, setIsComplete] = React.useState(false);
-  const [hasError, setHasError] = React.useState(false);
+  const initialState: ObservableStatus<T> = {
+    status: hasData ? 'success' : 'loading',
+    hasEmitted: hasData,
+    isComplete: false,
+    data: observable.hasValue ? observable.value : config?.initialData ?? config?.startWithValue,
+    error: observable.ourError,
+    firstValuePromise: observable.firstEmission,
+  };
+  const [status, dispatch] = React.useReducer<React.Reducer<ObservableStatus<T>, 'value' | 'error' | 'complete'>>(reducerFactory<T>(observable), initialState);
+
   React.useEffect(() => {
     const subscription = observable.subscribe({
-      next: (v) => {
-        setValue(() => v);
+      next: () => {
+        dispatch('value');
       },
       error: (e) => {
-        setHasError(true);
+        dispatch('error');
         throw e;
       },
       complete: () => {
-        setIsComplete(true);
+        dispatch('complete');
       },
     });
     return () => subscription.unsubscribe();
   }, [observable]);
 
-  let status: ObservableStatus<T>['status'];
-
-  if (hasError) {
-    status = 'error';
-  } else if (observable.hasValue || hasInitialData) {
-    status = 'success';
-  } else {
-    status = 'loading';
-  }
-
-  return {
-    status,
-    hasEmitted: observable.hasValue || hasInitialData,
-    isComplete: isComplete,
-    data: latest,
-    error: observable.ourError,
-    firstValuePromise: observable.firstEmission,
-  };
+  return status;
 }

package/dist/remote-config/getValue.d.ts

@@ -1,10 +0,0 @@
-import { Observable } from 'rxjs';
-import type { RemoteConfig, Value as RemoteConfigValue } from 'firebase/remote-config';
-export declare type AllParameters = {
-    [key: string]: RemoteConfigValue;
-};
-export declare function getValue(remoteConfig: RemoteConfig, key: string): Observable<RemoteConfigValue>;
-export declare function getString(remoteConfig: RemoteConfig, key: string): Observable<string>;
-export declare function getNumber(remoteConfig: RemoteConfig, key: string): Observable<number>;
-export declare function getBoolean(remoteConfig: RemoteConfig, key: string): Observable<boolean>;
-export declare function getAll(remoteConfig: RemoteConfig): Observable<AllParameters>;

package/src/remote-config/getValue.tsx

@@ -1,58 +0,0 @@
-import { Observable } from 'rxjs';
-import {
-  ensureInitialized,
-  getValue as rcGetValue,
-  getString as rcGetString,
-  getNumber as rcGetNumber,
-  getBoolean as rcGetBoolean,
-  getAll as rcGetAll,
-} from 'firebase/remote-config';
-
-import type { RemoteConfig, Value as RemoteConfigValue } from 'firebase/remote-config';
-
-export type AllParameters = {
-  [key: string]: RemoteConfigValue;
-};
-
-interface ParameterSettings<T> {
-  remoteConfig: RemoteConfig;
-  key: string;
-  getter: (key: string) => T;
-}
-
-// TODO(davideast): Replace with RxFire functions when they land
-function parameter$<T>({ remoteConfig, key, getter }: ParameterSettings<T>): Observable<T> {
-  return new Observable((subscriber) => {
-    ensureInitialized(remoteConfig).then(() => {
-      // 'this' for the getter loses context in the next()
-      // call, so it needs to be bound.
-      subscriber.next(getter.bind(remoteConfig)(key));
-    });
-  });
-}
-
-export function getValue(remoteConfig: RemoteConfig, key: string) {
-  const getter = () => rcGetValue(remoteConfig, key);
-  return parameter$({ remoteConfig, key, getter });
-}
-
-export function getString(remoteConfig: RemoteConfig, key: string) {
-  const getter = () => rcGetString(remoteConfig, key);
-  return parameter$<string>({ remoteConfig, key, getter });
-}
-
-export function getNumber(remoteConfig: RemoteConfig, key: string) {
-  const getter = () => rcGetNumber(remoteConfig, key);
-  return parameter$<number>({ remoteConfig, key, getter });
-}
-
-export function getBoolean(remoteConfig: RemoteConfig, key: string) {
-  const getter = () => rcGetBoolean(remoteConfig, key);
-  return parameter$<boolean>({ remoteConfig, key, getter });
-}
-
-export function getAll(remoteConfig: RemoteConfig) {
-  const getter = () => rcGetAll(remoteConfig);
-  // No key is needed for getAll()
-  return parameter$<AllParameters>({ remoteConfig, key: '', getter });
-}