@data-client/core 0.13.5 → 0.14.0

package/src/manager/__tests__/networkManager.ts

@@ -2,11 +2,11 @@ import { Endpoint } from '@data-client/endpoint';
 import { Article, ArticleResource } from '__tests__/new';
 
 import { SET_RESPONSE_TYPE } from '../../actionTypes';
+import { createFetch } from '../../controller/actions';
 import Controller from '../../controller/Controller';
-import createFetch from '../../controller/createFetch';
 import NetworkManager from '../../manager/NetworkManager';
 import { initialState } from '../../state/reducer/createReducer';
-import { Middleware } from '../../types';
+import { Middleware, SetResponseAction } from '../../types';
 
 describe('NetworkManager', () => {
   const manager = new NetworkManager();
@@ -154,18 +154,21 @@ describe('NetworkManager', () => {
 
       middleware(API)(next)(fetchResolveAction);
 
-      const data = await fetchResolveAction.payload();
+      const response = await fetchResolveAction.endpoint(
+        ...fetchResolveAction.args,
+      );
 
       // mutations resolve before dispatch, so we must wait for next tick to see set
       await new Promise(resolve => setTimeout(resolve, 0));
 
-      const action = {
+      const action: SetResponseAction = {
         type: SET_RESPONSE_TYPE,
         endpoint: fetchResolveAction.endpoint,
-        payload: data,
+        response,
+        args: fetchResolveAction.args,
+        key: fetchResolveAction.key,
+        error: expect.anything(),
         meta: {
-          args: fetchResolveAction.meta.args,
-          key: fetchResolveAction.meta.key,
           date: expect.any(Number),
           expiresAt: expect.any(Number),
           fetchedAt: expect.any(Number),
@@ -187,18 +190,21 @@ describe('NetworkManager', () => {
 
       middleware(API)(next)(fetchSetWithUpdatersAction);
 
-      const data = await fetchSetWithUpdatersAction.payload();
+      const response = await fetchSetWithUpdatersAction.endpoint(
+        ...fetchSetWithUpdatersAction.args,
+      );
 
       // mutations resolve before dispatch, so we must wait for next tick to see set
       await new Promise(resolve => setTimeout(resolve, 0));
 
-      const action = {
+      const action: SetResponseAction = {
         type: SET_RESPONSE_TYPE,
         endpoint: fetchSetWithUpdatersAction.endpoint,
-        payload: data,
+        response,
+        args: fetchSetWithUpdatersAction.args,
+        key: fetchSetWithUpdatersAction.key,
+        error: expect.anything(),
         meta: {
-          args: fetchSetWithUpdatersAction.meta.args,
-          key: fetchSetWithUpdatersAction.meta.key,
           date: expect.any(Number),
           expiresAt: expect.any(Number),
           fetchedAt: expect.any(Number),
@@ -220,18 +226,21 @@ describe('NetworkManager', () => {
 
       middleware(API)(next)(fetchRpcWithUpdatersAction);
 
-      const data = await fetchRpcWithUpdatersAction.payload();
+      const response = await fetchRpcWithUpdatersAction.endpoint(
+        ...fetchRpcWithUpdatersAction.args,
+      );
 
       // mutations resolve before dispatch, so we must wait for next tick to see set
       await new Promise(resolve => setTimeout(resolve, 0));
 
-      const action = {
+      const action: SetResponseAction = {
         type: SET_RESPONSE_TYPE,
         endpoint: fetchRpcWithUpdatersAction.endpoint,
-        payload: data,
+        response,
+        args: fetchRpcWithUpdatersAction.args,
+        key: fetchRpcWithUpdatersAction.key,
+        error: expect.anything(),
         meta: {
-          args: fetchRpcWithUpdatersAction.meta.args,
-          key: fetchRpcWithUpdatersAction.meta.key,
           date: expect.any(Number),
           expiresAt: expect.any(Number),
           fetchedAt: expect.any(Number),
@@ -253,7 +262,9 @@ describe('NetworkManager', () => {
 
       middleware(API)(next)(fetchRpcWithUpdatersAndOptimisticAction);
 
-      const data = await fetchRpcWithUpdatersAndOptimisticAction.payload();
+      const response = await fetchRpcWithUpdatersAndOptimisticAction.endpoint(
+        ...fetchRpcWithUpdatersAndOptimisticAction.args,
+      );
 
       expect(next).toHaveBeenCalled();
       // mutations resolve before dispatch, so we must wait for next tick to see set
@@ -261,10 +272,11 @@ describe('NetworkManager', () => {
       expect(dispatch).toHaveBeenCalledWith({
         type: SET_RESPONSE_TYPE,
         endpoint: fetchRpcWithUpdatersAndOptimisticAction.endpoint,
-        payload: data,
+        response,
+        args: fetchRpcWithUpdatersAndOptimisticAction.args,
+        key: fetchRpcWithUpdatersAndOptimisticAction.key,
+        error: expect.anything(),
         meta: {
-          args: fetchRpcWithUpdatersAndOptimisticAction.meta.args,
-          key: fetchRpcWithUpdatersAndOptimisticAction.meta.key,
           date: expect.any(Number),
           expiresAt: expect.any(Number),
           fetchedAt: expect.any(Number),
@@ -286,7 +298,7 @@ describe('NetworkManager', () => {
         endpoint: detailEndpoint.extend({ dataExpiryLength: 314 }),
       });
 
-      await fetchResolveAction.payload();
+      await fetchResolveAction.endpoint(...fetchResolveAction.args);
 
       expect(dispatch).toHaveBeenCalled();
       const { meta } = dispatch.mock.calls[0][0];
@@ -307,7 +319,7 @@ describe('NetworkManager', () => {
         endpoint: detailEndpoint.extend({ dataExpiryLength: undefined }),
       });
 
-      await fetchResolveAction.payload();
+      await fetchResolveAction.endpoint(...fetchResolveAction.args);
 
       expect(dispatch).toHaveBeenCalled();
       const { meta } = dispatch.mock.calls[0][0];
@@ -330,9 +342,9 @@ describe('NetworkManager', () => {
         expect(next).not.toHaveBeenCalled();
         expect(dispatch).toHaveBeenCalledWith({
           type: SET_RESPONSE_TYPE,
-          payload: error,
+          response: error,
+          key: fetchRejectAction.key,
           meta: {
-            key: fetchRejectAction.meta.key,
             date: expect.any(Number),
             expiresAt: expect.any(Number),
           },

package/src/manager/__tests__/pollingSubscription.ts

@@ -1,8 +1,8 @@
 import { Endpoint } from '@data-client/endpoint';
 import { Article, PollingArticleResource } from '__tests__/new';
 
+import { createSubscription } from '../../controller/actions/createSubscription';
 import Controller from '../../controller/Controller';
-import { createSubscription } from '../../controller/createSubscription';
 import { initialState } from '../../state/reducer/createReducer';
 import ConnectionListener from '../ConnectionListener';
 import DefaultConnectionListener from '../DefaultConnectionListener';
@@ -178,13 +178,13 @@ describe('PollingSubscription', () => {
       jest.advanceTimersByTime(5000);
       expect(dispatch.mock.calls.length).toBe(1);
       dispatch.mock.calls[0].forEach((element: any) => {
-        delete element?.meta?.createdAt;
+        delete element?.meta?.fetchedAt;
       });
       expect(dispatch.mock.calls[0]).toMatchSnapshot();
       jest.advanceTimersByTime(5000);
       expect(dispatch.mock.calls.length).toBe(2);
       dispatch.mock.calls[1].forEach((element: any) => {
-        delete element?.meta?.createdAt;
+        delete element?.meta?.fetchedAt;
       });
 
       expect(dispatch.mock.calls[1]).toMatchSnapshot();

package/src/manager/__tests__/subscriptionManager.ts

@@ -48,32 +48,28 @@ describe('SubscriptionManager', () => {
 
   describe('middleware', () => {
     function createSubscribeAction(
-      payload: Record<string, any>,
+      response: Record<string, any>,
       reject = false,
     ): SubscribeAction {
       const fetch =
         reject ?
           () => Promise.reject(new Error('Failed'))
-        : () => Promise.resolve(payload);
+        : () => Promise.resolve(response);
       return {
         type: SUBSCRIBE_TYPE,
-        endpoint: PollingArticleResource.get,
-        meta: {
-          key: PollingArticleResource.get.key({ id: payload.id }),
-          args: [{ id: payload.id }],
-        },
+        endpoint: PollingArticleResource.get.extend({ fetch }),
+        args: [{ id: response.id }],
+        key: PollingArticleResource.get.key({ id: response.id }),
       };
     }
     function createUnsubscribeAction(
-      payload: Record<string, any>,
+      response: Record<string, any>,
     ): UnsubscribeAction {
       return {
         type: UNSUBSCRIBE_TYPE,
         endpoint: PollingArticleResource.get,
-        meta: {
-          key: PollingArticleResource.get.key({ id: payload.id }),
-          args: [{ id: payload.id }],
-        },
+        key: PollingArticleResource.get.key({ id: response.id }),
+        args: [{ id: response.id }],
       };
     }
 
@@ -93,14 +89,14 @@ describe('SubscriptionManager', () => {
       middleware(API)(next)(action);
 
       expect(next).not.toHaveBeenCalled();
-      expect((manager as any).subscriptions[action.meta.key]).toBeDefined();
+      expect((manager as any).subscriptions[action.key]).toBeDefined();
     });
     it('subscribe should add a subscription (no frequency)', () => {
       const action = createSubscribeAction({ id: 597 });
       middleware(API)(next)(action);
 
       expect(next).not.toHaveBeenCalled();
-      expect((manager as any).subscriptions[action.meta.key]).toBeDefined();
+      expect((manager as any).subscriptions[action.key]).toBeDefined();
     });
 
     it('subscribe with same should call subscription.add', () => {
@@ -108,20 +104,20 @@ describe('SubscriptionManager', () => {
       middleware(API)(next)(action);
 
       expect(
-        (manager as any).subscriptions[action.meta.key].add.mock.calls.length,
+        (manager as any).subscriptions[action.key].add.mock.calls.length,
       ).toBe(1);
       middleware(API)(next)(action);
       expect(
-        (manager as any).subscriptions[action.meta.key].add.mock.calls.length,
+        (manager as any).subscriptions[action.key].add.mock.calls.length,
       ).toBe(2);
     });
     it('subscribe with another should create another', () => {
       const action = createSubscribeAction({ id: 7, title: 'four cakes' });
       middleware(API)(next)(action);
 
-      expect((manager as any).subscriptions[action.meta.key]).toBeDefined();
+      expect((manager as any).subscriptions[action.key]).toBeDefined();
       expect(
-        (manager as any).subscriptions[action.meta.key].add.mock.calls.length,
+        (manager as any).subscriptions[action.key].add.mock.calls.length,
       ).toBe(0);
     });
     it('subscribe with another should not call previous', () => {
@@ -134,13 +130,13 @@ describe('SubscriptionManager', () => {
 
     it('unsubscribe should delete when remove returns true', () => {
       const action = createUnsubscribeAction({ id: 7, title: 'four cakes' });
-      (manager as any).subscriptions[action.meta.key].remove.mockImplementation(
+      (manager as any).subscriptions[action.key].remove.mockImplementation(
         () => true,
       );
 
       middleware(API)(next)(action);
 
-      expect((manager as any).subscriptions[action.meta.key]).not.toBeDefined();
+      expect((manager as any).subscriptions[action.key]).not.toBeDefined();
     });
 
     it('unsubscribe should delete when remove returns true (no frequency)', () => {
@@ -149,27 +145,26 @@ describe('SubscriptionManager', () => {
       );
 
       const action = createUnsubscribeAction({ id: 50, title: 'four cakes' });
-      (manager as any).subscriptions[action.meta.key].remove.mockImplementation(
+      (manager as any).subscriptions[action.key].remove.mockImplementation(
         () => true,
       );
 
       middleware(API)(next)(action);
 
-      expect((manager as any).subscriptions[action.meta.key]).not.toBeDefined();
+      expect((manager as any).subscriptions[action.key]).not.toBeDefined();
     });
 
     it('unsubscribe should not delete when remove returns false', () => {
       const action = createUnsubscribeAction({ id: 5, title: 'four cakes' });
-      (manager as any).subscriptions[action.meta.key].remove.mockImplementation(
+      (manager as any).subscriptions[action.key].remove.mockImplementation(
         () => false,
       );
 
       middleware(API)(next)(action);
 
-      expect((manager as any).subscriptions[action.meta.key]).toBeDefined();
+      expect((manager as any).subscriptions[action.key]).toBeDefined();
       expect(
-        (manager as any).subscriptions[action.meta.key].remove.mock.calls
-          .length,
+        (manager as any).subscriptions[action.key].remove.mock.calls.length,
       ).toBe(1);
     });
 
@@ -181,7 +176,7 @@ describe('SubscriptionManager', () => {
 
       middleware(API)(next)(action);
 
-      expect((manager as any).subscriptions[action.meta.key]).not.toBeDefined();
+      expect((manager as any).subscriptions[action.key]).not.toBeDefined();
 
       expect(spy.mock.calls[0]).toMatchInlineSnapshot(`
         [

package/src/state/__tests__/reducer.ts

@@ -34,22 +34,22 @@ describe('reducer', () => {
 
   describe('singles', () => {
     const id = 20;
-    const payload = { id, title: 'hi', content: 'this is the content' };
+    const response = { id, title: 'hi', content: 'this is the content' };
     const action: SetResponseAction = {
       type: SET_RESPONSE_TYPE,
-      payload,
+      response,
       endpoint: ArticleResource.get,
+      args: [{ id }],
+      key: ArticleResource.get.url({ id }),
       meta: {
-        args: [{ id }],
-        key: ArticleResource.get.url({ id }),
         date: 5000000000,
         expiresAt: 5000500000,
         fetchedAt: 5000000000,
       },
     };
-    const partialResultAction = {
+    const partialResultAction: SetResponseAction = {
       ...action,
-      payload: { id, title: 'hello' },
+      response: { id, title: 'hello' },
     };
     const iniState = initialState;
     let newState = initialState;
@@ -59,7 +59,7 @@ describe('reducer', () => {
     });
     it('should overwrite existing entity', () => {
       const getEntity = (state: any): Article =>
-        state.entities[Article.key][`${Article.pk(action.payload)}`];
+        state.entities[Article.key][`${Article.pk(action.response)}`];
       const prevEntity = getEntity(newState);
       expect(prevEntity).toBeDefined();
       const nextState = reducer(newState, action);
@@ -69,7 +69,7 @@ describe('reducer', () => {
     });
     it('should merge partial entity with existing entity', () => {
       const getEntity = (state: any): Article =>
-        state.entities[Article.key][`${Article.pk(action.payload)}`];
+        state.entities[Article.key][`${Article.pk(action.response)}`];
       const prevEntity = getEntity(newState);
       expect(prevEntity).toBeDefined();
       const nextState = reducer(newState, partialResultAction);
@@ -78,16 +78,17 @@ describe('reducer', () => {
       expect(nextEntity).toBeDefined();
 
       expect(nextEntity.title).not.toBe(prevEntity.title);
-      expect(nextEntity.title).toBe(partialResultAction.payload.title);
+      expect(nextEntity.title).toBe(partialResultAction.response.title);
 
       expect(nextEntity.content).toBe(prevEntity.content);
       expect(nextEntity.content).not.toBe(undefined);
 
       expect(
-        nextState.entityMeta[Article.key][`${Article.pk(action.payload)}`],
+        nextState.entityMeta[Article.key][`${Article.pk(action.response)}`],
       ).toBeDefined();
       expect(
-        nextState.entityMeta[Article.key][`${Article.pk(action.payload)}`].date,
+        nextState.entityMeta[Article.key][`${Article.pk(action.response)}`]
+          .date,
       ).toBe(action.meta.date);
     });
 
@@ -101,7 +102,7 @@ describe('reducer', () => {
         },
       };
       const getMeta = (state: any): { expiresAt: number } =>
-        state.entityMeta[Article.key][`${Article.pk(action.payload)}`];
+        state.entityMeta[Article.key][`${Article.pk(action.response)}`];
       const prevMeta = getMeta(newState);
       expect(prevMeta).toBeDefined();
       const nextState = reducer(newState, localAction);
@@ -122,9 +123,9 @@ describe('reducer', () => {
         },
       };
       const getMeta = (state: any): { date: number } =>
-        state.entityMeta[Article.key][`${Article.pk(action.payload)}`];
+        state.entityMeta[Article.key][`${Article.pk(action.response)}`];
       const getEntity = (state: any): Article =>
-        state.entities[Article.key][`${Article.pk(action.payload)}`];
+        state.entities[Article.key][`${Article.pk(action.response)}`];
       const prevEntity = getEntity(newState);
       const prevMeta = getMeta(newState);
       expect(prevMeta).toBeDefined();
@@ -181,9 +182,9 @@ describe('reducer', () => {
         },
       };
       const getMeta = (state: any): { date: number; expiresAt: number } =>
-        state.entityMeta[ExpiresSoon.key][`${ExpiresSoon.pk(action.payload)}`];
+        state.entityMeta[ExpiresSoon.key][`${ExpiresSoon.pk(action.response)}`];
       const getEntity = (state: any): ExpiresSoon =>
-        state.entities[ExpiresSoon.key][`${ExpiresSoon.pk(action.payload)}`];
+        state.entities[ExpiresSoon.key][`${ExpiresSoon.pk(action.response)}`];
 
       const prevEntity = getEntity(newState);
       const prevMeta = getMeta(newState);
@@ -220,8 +221,8 @@ describe('reducer', () => {
       type: SET_TYPE,
       value,
       schema: Counter,
+      args: [{ id }],
       meta: {
-        args: [{ id }],
         date: 0,
         fetchedAt: 0,
         expiresAt: 1000000000000,
@@ -250,8 +251,8 @@ describe('reducer', () => {
       type: SET_TYPE,
       value,
       schema: Counter,
+      args: [{ id }],
       meta: {
-        args: [{ id }],
         date: 0,
         fetchedAt: 0,
         expiresAt: 1000000000000,
@@ -278,8 +279,8 @@ describe('reducer', () => {
       type: SET_TYPE,
       value,
       schema: Article,
+      args: [{ id }],
       meta: {
-        args: [{ id }],
         date: 0,
         fetchedAt: 0,
         expiresAt: 1000000000000,
@@ -300,8 +301,8 @@ describe('reducer', () => {
       type: SET_TYPE,
       value,
       schema: Article,
+      args: [{ id }],
       meta: {
-        args: [{ id }],
         date: 0,
         fetchedAt: 0,
         expiresAt: 1000000000000,
@@ -317,14 +318,14 @@ describe('reducer', () => {
 
   it('mutate should never change endpoints', () => {
     const id = 20;
-    const payload = { id, title: 'hi', content: 'this is the content' };
+    const response = { id, title: 'hi', content: 'this is the content' };
     const action: SetResponseAction = {
       type: SET_RESPONSE_TYPE,
-      payload,
+      response,
       endpoint: ArticleResource.get,
+      args: [{ id }],
+      key: ArticleResource.get.key(response),
       meta: {
-        args: [{ id }],
-        key: ArticleResource.get.key(payload),
         date: 0,
         fetchedAt: 0,
         expiresAt: 1000000000000,
@@ -332,7 +333,7 @@ describe('reducer', () => {
     };
     const iniState = {
       ...initialState,
-      endpoints: { abc: '5', [ArticleResource.get.key(payload)]: `${id}` },
+      endpoints: { abc: '5', [ArticleResource.get.key(response)]: `${id}` },
     };
     const newState = reducer(iniState, action);
     expect(newState.endpoints).toStrictEqual(iniState.endpoints);
@@ -341,11 +342,11 @@ describe('reducer', () => {
     const id = 20;
     const action: SetResponseAction = {
       type: SET_RESPONSE_TYPE,
-      payload: { id },
+      response: { id },
       endpoint: ArticleResource.delete,
+      args: [{ id }],
+      key: ArticleResource.delete.key({ id }),
       meta: {
-        args: [{ id }],
-        key: ArticleResource.delete.key({ id }),
         fetchedAt: 0,
         date: 0,
         expiresAt: 0,
@@ -491,9 +492,7 @@ describe('reducer', () => {
     const id = 20;
     const action: InvalidateAction = {
       type: INVALIDATE_TYPE,
-      meta: {
-        key: id.toString(),
-      },
+      key: id.toString(),
     };
     const iniState: any = {
       ...initialState,
@@ -530,11 +529,11 @@ describe('reducer', () => {
     const error = new Error('hi');
     const action: SetResponseAction = {
       type: SET_RESPONSE_TYPE,
-      payload: error,
+      response: error,
       endpoint: ArticleResource.get,
+      args: [{ id }],
+      key: ArticleResource.get.key({ id }),
       meta: {
-        args: [{ id }],
-        key: ArticleResource.get.key({ id }),
         fetchedAt: 5000000000,
         date: 5000000000,
         expiresAt: 5000500000,
@@ -550,11 +549,11 @@ describe('reducer', () => {
     const error = new Error('hi');
     const action: SetResponseAction = {
       type: SET_RESPONSE_TYPE,
-      payload: error,
+      response: error,
       endpoint: ArticleResource.get,
+      args: [{ id }],
+      key: ArticleResource.get.key({ id }),
       meta: {
-        args: [{ id }],
-        key: ArticleResource.get.key({ id }),
         fetchedAt: 0,
         date: 0,
         expiresAt: 10000000000000000000,
@@ -571,11 +570,11 @@ describe('reducer', () => {
     const error = new Error('hi');
     const action: SetResponseAction = {
       type: SET_RESPONSE_TYPE,
-      payload: error,
+      response: error,
       endpoint: ArticleResource.delete,
+      args: [{ id }],
+      key: ArticleResource.delete.key({ id }),
       meta: {
-        args: [{ id }],
-        key: ArticleResource.delete.key({ id }),
         fetchedAt: 0,
         date: 0,
         expiresAt: 0,
@@ -603,16 +602,14 @@ describe('reducer', () => {
     try {
       const action: FetchAction = {
         type: FETCH_TYPE,
-        payload: () => new Promise<any>(() => null),
         endpoint: ArticleResource.get,
+        args: [{ id: 5 }],
+        key: ArticleResource.get.url({ id: 5 }),
         meta: {
-          args: [{ id: 5 }],
-          key: ArticleResource.get.url({ id: 5 }),
-          throttle: true,
           reject: (v: any) => null,
           resolve: (v: any) => null,
           promise: new Promise((v: any) => null),
-          createdAt: 0,
+          fetchedAt: 0,
         },
       };
       const iniState = {

package/src/state/reducer/fetchReducer.ts

@@ -1,19 +1,17 @@
-import createOptimistic from '../../controller/createOptimistic.js';
-import type {
-  State,
-  SetResponseAction,
-  OptimisticAction,
-  FetchAction,
-} from '../../types.js';
+import { createOptimistic } from '../../controller/actions/createOptimistic.js';
+import type { State, FetchAction } from '../../types.js';
 
 export function fetchReducer(state: State<unknown>, action: FetchAction) {
-  let setAction: SetResponseAction | OptimisticAction;
-
   if (action.endpoint.getOptimisticResponse && action.endpoint.sideEffect) {
-    setAction = createOptimistic(action.endpoint, {
-      args: action.meta.args,
-      fetchedAt: action.meta.createdAt,
-    });
+    const setAction = createOptimistic(
+      action.endpoint,
+      action.args,
+      action.meta.fetchedAt,
+    );
+    return {
+      ...state,
+      optimistic: [...state.optimistic, setAction],
+    };
   } else {
     // If 'fetch' action reaches the reducer there are no middlewares installed to handle it
     /* istanbul ignore next */
@@ -22,14 +20,10 @@ export function fetchReducer(state: State<unknown>, action: FetchAction) {
         'Fetch appears unhandled - you are likely missing the NetworkManager middleware',
       );
       console.warn(
-        'See https://dataclient.io/docs/guides/redux#indextsx for hooking up redux',
+        'See https://dataclient.io/docs/guides/redux for hooking up redux',
       );
     }
 
     return state;
   }
-  return {
-    ...state,
-    optimistic: [...state.optimistic, setAction],
-  };
 }

package/src/state/reducer/invalidateReducer.ts

@@ -22,7 +22,7 @@ export function invalidateReducer(
     meta[key] = itemMeta;
   };
   if (action.type === INVALIDATE_TYPE) {
-    invalidateKey(action.meta.key);
+    invalidateKey(action.key);
   } else {
     Object.keys(endpoints).forEach(key => {
       if (action.testKey(key)) {

package/src/state/reducer/setReducer.ts

@@ -10,11 +10,7 @@ export function setReducer(
 ) {
   let value: any;
   if (typeof action.value === 'function') {
-    const previousValue = controller.get(
-      action.schema,
-      ...action.meta.args,
-      state,
-    );
+    const previousValue = controller.get(action.schema, ...action.args, state);
     if (previousValue === undefined) return state;
     value = action.value(previousValue);
   } else {
@@ -22,12 +18,10 @@ export function setReducer(
   }
   try {
     const { entities, indexes, entityMeta } = normalize(
-      value,
       action.schema,
-      action.meta.args as any,
-      state.entities,
-      state.indexes,
-      state.entityMeta,
+      value,
+      action.args,
+      state,
       action.meta,
     );
     return {