useResetReducer bugfix and format for minification

Author: patrickroberts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "suspense-service",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Suspense integration library for React",
   "repository": "github:patrickroberts/suspense-service",
   "main": "dst/cjs/suspense-service.js",

src/IdContext/Consumer/index.tsx

@@ -12,15 +12,15 @@ export function createIdContextConsumer<T>(
   { Consumer }: Context<Environment<T>>,
 ): IdContextConsumer<T> {
   const EnvironmentConsumer: IdContextConsumer<T> = ({ id, children }) => {
-    const render = useCallback((env: Environment<T>) => {
-      const value = unwrap(env, id);
+    const render = useCallback(
+      (env: Environment<T>) => children(unwrap(env, id)),
+      [id, children],
+    );
 
-      return children(value);
-    }, [id, children]);
-
-    return useMemo(() => (
-      <Consumer>{render}</Consumer>
-    ), [render]);
+    return useMemo(
+      () => <Consumer>{render}</Consumer>,
+      [render],
+    );
   };
 
   EnvironmentConsumer.defaultProps = defaultProps;

src/IdContext/Environment.ts

@@ -2,25 +2,18 @@ import Id from './Id';
 
 /** @internal */
 export default interface Environment<T> {
-  has (key: Id): boolean;
-  get (key: Id): T | undefined;
-  [Symbol.iterator] (): IterableIterator<[Id, T]>;
+  has(key: Id): boolean;
+  get(key: Id): T | undefined;
+  [Symbol.iterator](): IterableIterator<[Id, T]>;
 }
 
 /** @ignore */
-export function wrap<T>(
-  env: Environment<T>,
-  value: T,
-  id: Id = null,
-): Environment<T> {
+export function wrap<T>(env: Environment<T>, value: T, id: Id = null): Environment<T> {
   return new Map(env).set(id, value).set(null, value);
 }
 
 /** @ignore */
-export function unwrap<T>(
-  env: Environment<T>,
-  id: Id = null,
-): T {
+export function unwrap<T>(env: Environment<T>, id: Id = null): T {
   if (!env.has(id)) {
     throw new Error(`Provider with id ${String(id)} is not in scope`);
   }

src/IdContext/Provider/index.tsx

@@ -14,13 +14,15 @@ export function createIdContextProvider<T>(
   const { Provider } = EnvironmentContext;
   const EnvironmentProvider: IdContextProvider<T> = ({ value, id, children }) => {
     const prev = useContext(EnvironmentContext);
-    const next = useMemo(() => (
-      wrap(prev, value, id)
-    ), [value, id, prev]);
+    const next = useMemo(
+      () => wrap(prev, value, id),
+      [value, id, prev],
+    );
 
-    return useMemo(() => (
-      <Provider value={next}>{children}</Provider>
-    ), [children, next]);
+    return useMemo(
+      () => <Provider value={next}>{children}</Provider>,
+      [children, next],
+    );
   };
 
   EnvironmentProvider.defaultProps = defaultProps;

src/Service/Consumer/index.tsx

@@ -16,17 +16,13 @@ export function createServiceConsumer<TRequest, TResponse>(
   const ResourceConsumer: ServiceConsumer<TRequest, TResponse> = ({ id, children }) => {
     const render = useCallback((
       resourceAndSetState: [Resource<TResponse>, Dispatch<SetStateAction<TRequest>>],
-    ) => {
-      const resource = resourceAndSetState[0];
-      const setState = resourceAndSetState[1];
-      const response = resource();
+    ) => children(resourceAndSetState[0](), resourceAndSetState[1]),
+    [children]);
 
-      return children(response, setState);
-    }, [children]);
-
-    return useMemo(() => (
-      <Consumer id={id}>{render}</Consumer>
-    ), [id, render]);
+    return useMemo(
+      () => <Consumer id={id}>{render}</Consumer>,
+      [id, render],
+    );
   };
 
   ResourceConsumer.defaultProps = defaultProps;

src/Service/Handler.ts

@@ -31,13 +31,10 @@ export function createUseHandler<TRequest, TResponse>(
 
       state = { promise, status: Status.Pending };
       return () => {
-        const { status } = state;
-
         switch (state.status) {
           case Status.Pending: throw state.promise;
           case Status.Fulfilled: return state.value;
-          case Status.Rejected: throw state.reason;
-          default: throw new Error(`Unexpected status ${status}`);
+          default: throw state.reason;
         }
       };
     }, [request, id]);

src/Service/Provider/index.tsx

@@ -19,18 +19,17 @@ export function createServiceProvider<TRequest, TResponse>(
     request, id, children, fallback, reset,
   }) => {
     const stateAndSetState = useResetState(request, reset);
-    const state = stateAndSetState[0];
+    const resource = useHandler(stateAndSetState[0], id);
     const setState = stateAndSetState[1];
-    const resource = useHandler(state, id);
-    const element = useMemo(() => (
-      fallback != null
-        ? <Suspense fallback={fallback}>{children}</Suspense>
-        : children
-    ), [children, fallback]);
+    const element = useMemo(
+      () => (fallback == null ? children : <Suspense fallback={fallback}>{children}</Suspense>),
+      [children, fallback],
+    );
 
-    return useMemo(() => (
-      <Provider value={[resource, setState]} id={id}>{element}</Provider>
-    ), [resource, setState, id, element]);
+    return useMemo(
+      () => <Provider value={[resource, setState]} id={id}>{element}</Provider>,
+      [resource, setState, id, element],
+    );
   };
 
   ResourceProvider.defaultProps = defaultProps;

src/Service/Status.ts

@@ -2,7 +2,7 @@
 const enum Status {
   Pending,
   Fulfilled,
-  Rejected
+  Rejected,
 }
 
 export default Status;

src/Service/index.ts

@@ -35,7 +35,7 @@ export function createService<TRequest, TResponse>(
   handler: Handler<TRequest, TResponse>,
 ): Service<TRequest, TResponse> {
   const ResourceContext = createIdContext<[
-    Resource<TResponse>, Dispatch<SetStateAction<TRequest>>
+    Resource<TResponse>, Dispatch<SetStateAction<TRequest>>,
   ]>(defaultValue);
 
   return {
@@ -54,11 +54,8 @@ export function useServiceState<TRequest, TResponse>(
   service: Service<TRequest, TResponse>, id: Id = null,
 ): [TResponse, Dispatch<SetStateAction<TRequest>>] {
   const resourceAndSetState = useIdContext(service[kResource], id);
-  const resource = resourceAndSetState[0];
-  const setState = resourceAndSetState[1];
-  const response = resource();
 
-  return [response, setState];
+  return [resourceAndSetState[0](), resourceAndSetState[1]];
 }
 
 /**

src/State/useResetReducer.ts

@@ -20,8 +20,12 @@ export default function useResetReducer<R extends Reducer<any, any>>(
     initialState,
     state: initialState,
     dispatch: (action: ReducerAction<R>) => {
-      current.state = current.reducer(current.state, action);
-      forceUpdate();
+      const nextState = current.reducer(current.state, action);
+
+      if (!Object.is(current.state, nextState)) {
+        current.state = nextState;
+        forceUpdate();
+      }
     },
   });