@data-client/core 0.14.1 → 0.14.4

package/lib/state/reducer/setReducer.js

@@ -16,10 +16,10 @@ export function setReducer(state, action, controller) {
     } = normalize(action.schema, value, action.args, state, action.meta);
     return {
       entities,
-      indexes,
       endpoints: state.endpoints,
-      entityMeta,
+      indexes,
       meta: state.meta,
+      entityMeta,
       optimistic: state.optimistic,
       lastReset: state.lastReset
     };
@@ -33,4 +33,4 @@ export function setReducer(state, action, controller) {
     return state;
   }
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJub3JtYWxpemUiLCJzZXRSZWR1Y2VyIiwic3RhdGUiLCJhY3Rpb24iLCJjb250cm9sbGVyIiwidmFsdWUiLCJwcmV2aW91c1ZhbHVlIiwiZ2V0Iiwic2NoZW1hIiwiYXJncyIsInVuZGVmaW5lZCIsImVudGl0aWVzIiwiaW5kZXhlcyIsImVudGl0eU1ldGEiLCJtZXRhIiwiZW5kcG9pbnRzIiwib3B0aW1pc3RpYyIsImxhc3RSZXNldCIsImVycm9yIiwicHJvY2VzcyIsImVudiIsIk5PREVfRU5WIiwiY29uc29sZSJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGF0ZS9yZWR1Y2VyL3NldFJlZHVjZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbm9ybWFsaXplIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCBDb250cm9sbGVyIGZyb20gJy4uLy4uL2NvbnRyb2xsZXIvQ29udHJvbGxlci5qcyc7XG5pbXBvcnQgdHlwZSB7IFN0YXRlLCBTZXRBY3Rpb24gfSBmcm9tICcuLi8uLi90eXBlcy5qcyc7XG5cbmV4cG9ydCBmdW5jdGlvbiBzZXRSZWR1Y2VyKFxuICBzdGF0ZTogU3RhdGU8dW5rbm93bj4sXG4gIGFjdGlvbjogU2V0QWN0aW9uLFxuICBjb250cm9sbGVyOiBDb250cm9sbGVyLFxuKSB7XG4gIGxldCB2YWx1ZTogYW55O1xuICBpZiAodHlwZW9mIGFjdGlvbi52YWx1ZSA9PT0gJ2Z1bmN0aW9uJykge1xuICAgIGNvbnN0IHByZXZpb3VzVmFsdWUgPSBjb250cm9sbGVyLmdldChhY3Rpb24uc2NoZW1hLCAuLi5hY3Rpb24uYXJncywgc3RhdGUpO1xuICAgIGlmIChwcmV2aW91c1ZhbHVlID09PSB1bmRlZmluZWQpIHJldHVybiBzdGF0ZTtcbiAgICB2YWx1ZSA9IGFjdGlvbi52YWx1ZShwcmV2aW91c1ZhbHVlKTtcbiAgfSBlbHNlIHtcbiAgICB2YWx1ZSA9IGFjdGlvbi52YWx1ZTtcbiAgfVxuICB0cnkge1xuICAgIGNvbnN0IHsgZW50aXRpZXMsIGluZGV4ZXMsIGVudGl0eU1ldGEgfSA9IG5vcm1hbGl6ZShcbiAgICAgIGFjdGlvbi5zY2hlbWEsXG4gICAgICB2YWx1ZSxcbiAgICAgIGFjdGlvbi5hcmdzLFxuICAgICAgc3RhdGUsXG4gICAgICBhY3Rpb24ubWV0YSxcbiAgICApO1xuICAgIHJldHVybiB7XG4gICAgICBlbnRpdGllcyxcbiAgICAgIGluZGV4ZXMsXG4gICAgICBlbmRwb2ludHM6IHN0YXRlLmVuZHBvaW50cyxcbiAgICAgIGVudGl0eU1ldGEsXG4gICAgICBtZXRhOiBzdGF0ZS5tZXRhLFxuICAgICAgb3B0aW1pc3RpYzogc3RhdGUub3B0aW1pc3RpYyxcbiAgICAgIGxhc3RSZXNldDogc3RhdGUubGFzdFJlc2V0LFxuICAgIH07XG4gICAgLy8gcmVkdWNlciBtdXN0IHVwZGF0ZSB0aGUgc3RhdGUsIHNvIGluIGNhc2Ugb2YgcHJvY2Vzc2luZyBlcnJvcnMgd2Ugc2ltcGx5IGNvbXB1dGUgdGhlIGVuZHBvaW50cyBpbmxpbmVcbiAgfSBjYXRjaCAoZXJyb3I6IGFueSkge1xuICAgIC8vIHRoaXMgaXMgbm90IGFsd2F5cyBidWJibGVkIHVwLCBzbyBsZXQncyBkb3VibGUgc3VyZSB0aGlzIGRvZXNuJ3QgZmFpbCBzaWxlbnRseVxuICAgIC8qIGlzdGFuYnVsIGlnbm9yZSBlbHNlICovXG4gICAgaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpO1xuICAgIH1cbiAgICByZXR1cm4gc3RhdGU7XG4gIH1cbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsU0FBUyxRQUFRLHdCQUF3QjtBQUtsRCxPQUFPLFNBQVNDLFVBQVVBLENBQ3hCQyxLQUFxQixFQUNyQkMsTUFBaUIsRUFDakJDLFVBQXNCLEVBQ3RCO0VBQ0EsSUFBSUMsS0FBVTtFQUNkLElBQUksT0FBT0YsTUFBTSxDQUFDRSxLQUFLLEtBQUssVUFBVSxFQUFFO0lBQ3RDLE1BQU1DLGFBQWEsR0FBR0YsVUFBVSxDQUFDRyxHQUFHLENBQUNKLE1BQU0sQ0FBQ0ssTUFBTSxFQUFFLEdBQUdMLE1BQU0sQ0FBQ00sSUFBSSxFQUFFUCxLQUFLLENBQUM7SUFDMUUsSUFBSUksYUFBYSxLQUFLSSxTQUFTLEVBQUUsT0FBT1IsS0FBSztJQUM3Q0csS0FBSyxHQUFHRixNQUFNLENBQUNFLEtBQUssQ0FBQ0MsYUFBYSxDQUFDO0VBQ3JDLENBQUMsTUFBTTtJQUNMRCxLQUFLLEdBQUdGLE1BQU0sQ0FBQ0UsS0FBSztFQUN0QjtFQUNBLElBQUk7SUFDRixNQUFNO01BQUVNLFFBQVE7TUFBRUMsT0FBTztNQUFFQztJQUFXLENBQUMsR0FBR2IsU0FBUyxDQUNqREcsTUFBTSxDQUFDSyxNQUFNLEVBQ2JILEtBQUssRUFDTEYsTUFBTSxDQUFDTSxJQUFJLEVBQ1hQLEtBQUssRUFDTEMsTUFBTSxDQUFDVyxJQUNULENBQUM7SUFDRCxPQUFPO01BQ0xILFFBQVE7TUFDUkMsT0FBTztNQUNQRyxTQUFTLEVBQUViLEtBQUssQ0FBQ2EsU0FBUztNQUMxQkYsVUFBVTtNQUNWQyxJQUFJLEVBQUVaLEtBQUssQ0FBQ1ksSUFBSTtNQUNoQkUsVUFBVSxFQUFFZCxLQUFLLENBQUNjLFVBQVU7TUFDNUJDLFNBQVMsRUFBRWYsS0FBSyxDQUFDZTtJQUNuQixDQUFDO0lBQ0Q7RUFDRixDQUFDLENBQUMsT0FBT0MsS0FBVSxFQUFFO0lBQ25CO0lBQ0E7SUFDQSxJQUFJQyxPQUFPLENBQUNDLEdBQUcsQ0FBQ0MsUUFBUSxLQUFLLFlBQVksRUFBRTtNQUN6Q0MsT0FBTyxDQUFDSixLQUFLLENBQUNBLEtBQUssQ0FBQztJQUN0QjtJQUNBLE9BQU9oQixLQUFLO0VBQ2Q7QUFDRiIsImlnbm9yZUxpc3QiOltdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJub3JtYWxpemUiLCJzZXRSZWR1Y2VyIiwic3RhdGUiLCJhY3Rpb24iLCJjb250cm9sbGVyIiwidmFsdWUiLCJwcmV2aW91c1ZhbHVlIiwiZ2V0Iiwic2NoZW1hIiwiYXJncyIsInVuZGVmaW5lZCIsImVudGl0aWVzIiwiaW5kZXhlcyIsImVudGl0eU1ldGEiLCJtZXRhIiwiZW5kcG9pbnRzIiwib3B0aW1pc3RpYyIsImxhc3RSZXNldCIsImVycm9yIiwicHJvY2VzcyIsImVudiIsIk5PREVfRU5WIiwiY29uc29sZSJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGF0ZS9yZWR1Y2VyL3NldFJlZHVjZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbm9ybWFsaXplIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCBDb250cm9sbGVyIGZyb20gJy4uLy4uL2NvbnRyb2xsZXIvQ29udHJvbGxlci5qcyc7XG5pbXBvcnQgdHlwZSB7IFN0YXRlLCBTZXRBY3Rpb24gfSBmcm9tICcuLi8uLi90eXBlcy5qcyc7XG5cbmV4cG9ydCBmdW5jdGlvbiBzZXRSZWR1Y2VyKFxuICBzdGF0ZTogU3RhdGU8dW5rbm93bj4sXG4gIGFjdGlvbjogU2V0QWN0aW9uLFxuICBjb250cm9sbGVyOiBDb250cm9sbGVyLFxuKSB7XG4gIGxldCB2YWx1ZTogYW55O1xuICBpZiAodHlwZW9mIGFjdGlvbi52YWx1ZSA9PT0gJ2Z1bmN0aW9uJykge1xuICAgIGNvbnN0IHByZXZpb3VzVmFsdWUgPSBjb250cm9sbGVyLmdldChhY3Rpb24uc2NoZW1hLCAuLi5hY3Rpb24uYXJncywgc3RhdGUpO1xuICAgIGlmIChwcmV2aW91c1ZhbHVlID09PSB1bmRlZmluZWQpIHJldHVybiBzdGF0ZTtcbiAgICB2YWx1ZSA9IGFjdGlvbi52YWx1ZShwcmV2aW91c1ZhbHVlKTtcbiAgfSBlbHNlIHtcbiAgICB2YWx1ZSA9IGFjdGlvbi52YWx1ZTtcbiAgfVxuICB0cnkge1xuICAgIGNvbnN0IHsgZW50aXRpZXMsIGluZGV4ZXMsIGVudGl0eU1ldGEgfSA9IG5vcm1hbGl6ZShcbiAgICAgIGFjdGlvbi5zY2hlbWEsXG4gICAgICB2YWx1ZSxcbiAgICAgIGFjdGlvbi5hcmdzLFxuICAgICAgc3RhdGUsXG4gICAgICBhY3Rpb24ubWV0YSxcbiAgICApO1xuICAgIHJldHVybiB7XG4gICAgICBlbnRpdGllcyxcbiAgICAgIGVuZHBvaW50czogc3RhdGUuZW5kcG9pbnRzLFxuICAgICAgaW5kZXhlcyxcbiAgICAgIG1ldGE6IHN0YXRlLm1ldGEsXG4gICAgICBlbnRpdHlNZXRhLFxuICAgICAgb3B0aW1pc3RpYzogc3RhdGUub3B0aW1pc3RpYyxcbiAgICAgIGxhc3RSZXNldDogc3RhdGUubGFzdFJlc2V0LFxuICAgIH07XG4gICAgLy8gcmVkdWNlciBtdXN0IHVwZGF0ZSB0aGUgc3RhdGUsIHNvIGluIGNhc2Ugb2YgcHJvY2Vzc2luZyBlcnJvcnMgd2Ugc2ltcGx5IGNvbXB1dGUgdGhlIGVuZHBvaW50cyBpbmxpbmVcbiAgfSBjYXRjaCAoZXJyb3I6IGFueSkge1xuICAgIC8vIHRoaXMgaXMgbm90IGFsd2F5cyBidWJibGVkIHVwLCBzbyBsZXQncyBkb3VibGUgc3VyZSB0aGlzIGRvZXNuJ3QgZmFpbCBzaWxlbnRseVxuICAgIC8qIGlzdGFuYnVsIGlnbm9yZSBlbHNlICovXG4gICAgaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpO1xuICAgIH1cbiAgICByZXR1cm4gc3RhdGU7XG4gIH1cbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsU0FBUyxRQUFRLHdCQUF3QjtBQUtsRCxPQUFPLFNBQVNDLFVBQVVBLENBQ3hCQyxLQUFxQixFQUNyQkMsTUFBaUIsRUFDakJDLFVBQXNCLEVBQ3RCO0VBQ0EsSUFBSUMsS0FBVTtFQUNkLElBQUksT0FBT0YsTUFBTSxDQUFDRSxLQUFLLEtBQUssVUFBVSxFQUFFO0lBQ3RDLE1BQU1DLGFBQWEsR0FBR0YsVUFBVSxDQUFDRyxHQUFHLENBQUNKLE1BQU0sQ0FBQ0ssTUFBTSxFQUFFLEdBQUdMLE1BQU0sQ0FBQ00sSUFBSSxFQUFFUCxLQUFLLENBQUM7SUFDMUUsSUFBSUksYUFBYSxLQUFLSSxTQUFTLEVBQUUsT0FBT1IsS0FBSztJQUM3Q0csS0FBSyxHQUFHRixNQUFNLENBQUNFLEtBQUssQ0FBQ0MsYUFBYSxDQUFDO0VBQ3JDLENBQUMsTUFBTTtJQUNMRCxLQUFLLEdBQUdGLE1BQU0sQ0FBQ0UsS0FBSztFQUN0QjtFQUNBLElBQUk7SUFDRixNQUFNO01BQUVNLFFBQVE7TUFBRUMsT0FBTztNQUFFQztJQUFXLENBQUMsR0FBR2IsU0FBUyxDQUNqREcsTUFBTSxDQUFDSyxNQUFNLEVBQ2JILEtBQUssRUFDTEYsTUFBTSxDQUFDTSxJQUFJLEVBQ1hQLEtBQUssRUFDTEMsTUFBTSxDQUFDVyxJQUNULENBQUM7SUFDRCxPQUFPO01BQ0xILFFBQVE7TUFDUkksU0FBUyxFQUFFYixLQUFLLENBQUNhLFNBQVM7TUFDMUJILE9BQU87TUFDUEUsSUFBSSxFQUFFWixLQUFLLENBQUNZLElBQUk7TUFDaEJELFVBQVU7TUFDVkcsVUFBVSxFQUFFZCxLQUFLLENBQUNjLFVBQVU7TUFDNUJDLFNBQVMsRUFBRWYsS0FBSyxDQUFDZTtJQUNuQixDQUFDO0lBQ0Q7RUFDRixDQUFDLENBQUMsT0FBT0MsS0FBVSxFQUFFO0lBQ25CO0lBQ0E7SUFDQSxJQUFJQyxPQUFPLENBQUNDLEdBQUcsQ0FBQ0MsUUFBUSxLQUFLLFlBQVksRUFBRTtNQUN6Q0MsT0FBTyxDQUFDSixLQUFLLENBQUNBLEtBQUssQ0FBQztJQUN0QjtJQUNBLE9BQU9oQixLQUFLO0VBQ2Q7QUFDRiIsImlnbm9yZUxpc3QiOltdfQ==

package/lib/state/reducer/setResponseReducer.d.ts

@@ -4,11 +4,8 @@ export declare function setResponseReducer(state: State<unknown>, action: Optimi
     entities: {
         [x: string]: any;
     };
-    indexes: import("@data-client/normalizr").NormalizedIndex;
     endpoints: Record<string, unknown>;
-    entityMeta: import("packages/normalizr/lib/types.js").EntitiesToMeta<{
-        [x: string]: any;
-    }>;
+    indexes: import("@data-client/normalizr").NormalizedIndex;
     meta: {
         [x: string]: {
             readonly date: number;
@@ -23,6 +20,9 @@ export declare function setResponseReducer(state: State<unknown>, action: Optimi
             prevExpiresAt: number;
         };
     };
+    entityMeta: import("packages/normalizr/lib/types.js").EntitiesToMeta<{
+        [x: string]: any;
+    }>;
     optimistic: (SetResponseAction | OptimisticAction<import("@data-client/normalizr").EndpointInterface<import("@data-client/normalizr").FetchFunction, import("@data-client/normalizr").Schema | undefined, boolean | undefined> & {
         update?: import("../../index.js").EndpointUpdateFunction<import("@data-client/normalizr").EndpointInterface>;
     }>)[];

package/lib/state/reducer/setResponseReducer.js

@@ -51,9 +51,8 @@ export function setResponseReducer(state, action, controller) {
     }
     return {
       entities,
-      indexes,
       endpoints,
-      entityMeta,
+      indexes,
       meta: {
         ...state.meta,
         [action.key]: {
@@ -62,6 +61,7 @@ export function setResponseReducer(state, action, controller) {
           prevExpiresAt: (_state$meta$action$ke = state.meta[action.key]) == null ? void 0 : _state$meta$action$ke.expiresAt
         }
       },
+      entityMeta,
       optimistic: filterOptimistic(state, action),
       lastReset: state.lastReset
     };
@@ -109,4 +109,4 @@ function reduceError(state, action, error) {
 function filterOptimistic(state, resolvingAction) {
   return state.optimistic.filter(optimisticAction => optimisticAction.key !== resolvingAction.key || (optimisticAction.type === OPTIMISTIC_TYPE ? optimisticAction.meta.fetchedAt !== resolvingAction.meta.fetchedAt : optimisticAction.meta.date > resolvingAction.meta.date));
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["normalize","OPTIMISTIC_TYPE","AbortOptimistic","setResponseReducer","state","action","controller","error","reduceError","response","_state$meta$action$ke","type","endpoint","getOptimisticResponse","call","snapshot","meta","fetchedAt","args","e","constructor","result","entities","indexes","entityMeta","schema","endpoints","key","update","updaters","Object","keys","forEach","console","date","expiresAt","prevExpiresAt","optimistic","filterOptimistic","lastReset","message","JSON","stringify","undefined","status","process","env","NODE_ENV","name","errorPolicy","resolvingAction","filter","optimisticAction"],"sources":["../../../src/state/reducer/setResponseReducer.ts"],"sourcesContent":["import { normalize } from '@data-client/normalizr';\n\nimport { OPTIMISTIC_TYPE } from '../../actionTypes.js';\nimport AbortOptimistic from '../../controller/AbortOptimistic.js';\nimport type Controller from '../../controller/Controller.js';\nimport type {\n  State,\n  SetResponseAction,\n  OptimisticAction,\n} from '../../types.js';\n\nexport function setResponseReducer(\n  state: State<unknown>,\n  action: OptimisticAction | SetResponseAction,\n  controller: Controller,\n) {\n  if (action.error) {\n    return reduceError(state, action, action.response);\n  }\n  try {\n    let response: any;\n    // for true set's response is contained in action\n    if (action.type === OPTIMISTIC_TYPE) {\n      // this should never happen\n      /* istanbul ignore if */\n      if (!action.endpoint.getOptimisticResponse) return state;\n      try {\n        // compute optimistic response based on current state\n        response = action.endpoint.getOptimisticResponse.call(\n          action.endpoint,\n          controller.snapshot(state, action.meta.fetchedAt),\n          ...action.args,\n        );\n      } catch (e: any) {\n        // AbortOptimistic means 'do nothing', otherwise we count the exception as endpoint failure\n        if (e.constructor === AbortOptimistic) {\n          return state;\n        }\n        throw e;\n      }\n    } else {\n      response = action.response;\n    }\n    const { result, entities, indexes, entityMeta } = normalize(\n      action.endpoint.schema,\n      response,\n      action.args,\n      state,\n      action.meta,\n    );\n    const endpoints: Record<string, unknown> = {\n      ...state.endpoints,\n      [action.key]: result,\n    };\n    try {\n      if (action.endpoint.update) {\n        const updaters = action.endpoint.update(result, ...action.args);\n        Object.keys(updaters).forEach(key => {\n          endpoints[key] = updaters[key](endpoints[key]);\n        });\n      }\n      // no reason to completely fail because of user-code error\n      // integrity of this state update is still guaranteed\n    } catch (error) {\n      console.error(\n        `The following error occured during Endpoint.update() for ${action.key}`,\n      );\n      console.error(error);\n    }\n    return {\n      entities,\n      indexes,\n      endpoints,\n      entityMeta,\n      meta: {\n        ...state.meta,\n        [action.key]: {\n          date: action.meta.date,\n          expiresAt: action.meta.expiresAt,\n          prevExpiresAt: state.meta[action.key]?.expiresAt,\n        },\n      },\n      optimistic: filterOptimistic(state, action),\n      lastReset: state.lastReset,\n    };\n    // reducer must update the state, so in case of processing errors we simply compute the endpoints inline\n  } catch (error: any) {\n    if (typeof error === 'object') {\n      error.message = `Error processing ${\n        action.key\n      }\\n\\nFull Schema: ${JSON.stringify(\n        action.endpoint.schema,\n        undefined,\n        2,\n      )}\\n\\nError:\\n${error.message}`;\n      if ('response' in action) error.response = action.response;\n      error.status = 400;\n    }\n\n    // this is not always bubbled up, so let's double sure this doesn't fail silently\n    /* istanbul ignore else */\n    if (process.env.NODE_ENV !== 'production') {\n      console.error(error);\n    }\n    return reduceError(state, action, error);\n  }\n}\n\nfunction reduceError(\n  state: State<unknown>,\n  action: SetResponseAction | OptimisticAction,\n  error: any,\n): State<unknown> {\n  if (error.name === 'AbortError') {\n    // In case we abort simply undo the optimistic update and act like no fetch even occured\n    // We still want those watching promises from fetch directly to observed the abort, but we don't want to\n    // Trigger errors in this case. This means theoretically improperly built abortes useResource() could suspend forever.\n    return {\n      ...state,\n      optimistic: filterOptimistic(state, action),\n    };\n  }\n  return {\n    ...state,\n    meta: {\n      ...state.meta,\n      [action.key]: {\n        date: action.meta.date,\n        error,\n        expiresAt: action.meta.expiresAt,\n        errorPolicy: action.endpoint.errorPolicy?.(error),\n      },\n    },\n    optimistic: filterOptimistic(state, action),\n  };\n}\n/** Filter all requests with same serialization that did not start after the resolving request */\nfunction filterOptimistic(\n  state: State<unknown>,\n  resolvingAction: SetResponseAction | OptimisticAction,\n) {\n  return state.optimistic.filter(\n    optimisticAction =>\n      optimisticAction.key !== resolvingAction.key ||\n      (optimisticAction.type === OPTIMISTIC_TYPE ?\n        optimisticAction.meta.fetchedAt !== resolvingAction.meta.fetchedAt\n      : optimisticAction.meta.date > resolvingAction.meta.date),\n  );\n}\n"],"mappings":"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","ignoreList":[]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["normalize","OPTIMISTIC_TYPE","AbortOptimistic","setResponseReducer","state","action","controller","error","reduceError","response","_state$meta$action$ke","type","endpoint","getOptimisticResponse","call","snapshot","meta","fetchedAt","args","e","constructor","result","entities","indexes","entityMeta","schema","endpoints","key","update","updaters","Object","keys","forEach","console","date","expiresAt","prevExpiresAt","optimistic","filterOptimistic","lastReset","message","JSON","stringify","undefined","status","process","env","NODE_ENV","name","errorPolicy","resolvingAction","filter","optimisticAction"],"sources":["../../../src/state/reducer/setResponseReducer.ts"],"sourcesContent":["import { normalize } from '@data-client/normalizr';\n\nimport { OPTIMISTIC_TYPE } from '../../actionTypes.js';\nimport AbortOptimistic from '../../controller/AbortOptimistic.js';\nimport type Controller from '../../controller/Controller.js';\nimport type {\n  State,\n  SetResponseAction,\n  OptimisticAction,\n} from '../../types.js';\n\nexport function setResponseReducer(\n  state: State<unknown>,\n  action: OptimisticAction | SetResponseAction,\n  controller: Controller,\n) {\n  if (action.error) {\n    return reduceError(state, action, action.response);\n  }\n  try {\n    let response: any;\n    // for true set's response is contained in action\n    if (action.type === OPTIMISTIC_TYPE) {\n      // this should never happen\n      /* istanbul ignore if */\n      if (!action.endpoint.getOptimisticResponse) return state;\n      try {\n        // compute optimistic response based on current state\n        response = action.endpoint.getOptimisticResponse.call(\n          action.endpoint,\n          controller.snapshot(state, action.meta.fetchedAt),\n          ...action.args,\n        );\n      } catch (e: any) {\n        // AbortOptimistic means 'do nothing', otherwise we count the exception as endpoint failure\n        if (e.constructor === AbortOptimistic) {\n          return state;\n        }\n        throw e;\n      }\n    } else {\n      response = action.response;\n    }\n    const { result, entities, indexes, entityMeta } = normalize(\n      action.endpoint.schema,\n      response,\n      action.args,\n      state,\n      action.meta,\n    );\n    const endpoints: Record<string, unknown> = {\n      ...state.endpoints,\n      [action.key]: result,\n    };\n    try {\n      if (action.endpoint.update) {\n        const updaters = action.endpoint.update(result, ...action.args);\n        Object.keys(updaters).forEach(key => {\n          endpoints[key] = updaters[key](endpoints[key]);\n        });\n      }\n      // no reason to completely fail because of user-code error\n      // integrity of this state update is still guaranteed\n    } catch (error) {\n      console.error(\n        `The following error occured during Endpoint.update() for ${action.key}`,\n      );\n      console.error(error);\n    }\n    return {\n      entities,\n      endpoints,\n      indexes,\n      meta: {\n        ...state.meta,\n        [action.key]: {\n          date: action.meta.date,\n          expiresAt: action.meta.expiresAt,\n          prevExpiresAt: state.meta[action.key]?.expiresAt,\n        },\n      },\n      entityMeta,\n      optimistic: filterOptimistic(state, action),\n      lastReset: state.lastReset,\n    };\n    // reducer must update the state, so in case of processing errors we simply compute the endpoints inline\n  } catch (error: any) {\n    if (typeof error === 'object') {\n      error.message = `Error processing ${\n        action.key\n      }\\n\\nFull Schema: ${JSON.stringify(\n        action.endpoint.schema,\n        undefined,\n        2,\n      )}\\n\\nError:\\n${error.message}`;\n      if ('response' in action) error.response = action.response;\n      error.status = 400;\n    }\n\n    // this is not always bubbled up, so let's double sure this doesn't fail silently\n    /* istanbul ignore else */\n    if (process.env.NODE_ENV !== 'production') {\n      console.error(error);\n    }\n    return reduceError(state, action, error);\n  }\n}\n\nfunction reduceError(\n  state: State<unknown>,\n  action: SetResponseAction | OptimisticAction,\n  error: any,\n): State<unknown> {\n  if (error.name === 'AbortError') {\n    // In case we abort simply undo the optimistic update and act like no fetch even occured\n    // We still want those watching promises from fetch directly to observed the abort, but we don't want to\n    // Trigger errors in this case. This means theoretically improperly built abortes useResource() could suspend forever.\n    return {\n      ...state,\n      optimistic: filterOptimistic(state, action),\n    };\n  }\n  return {\n    ...state,\n    meta: {\n      ...state.meta,\n      [action.key]: {\n        date: action.meta.date,\n        error,\n        expiresAt: action.meta.expiresAt,\n        errorPolicy: action.endpoint.errorPolicy?.(error),\n      },\n    },\n    optimistic: filterOptimistic(state, action),\n  };\n}\n/** Filter all requests with same serialization that did not start after the resolving request */\nfunction filterOptimistic(\n  state: State<unknown>,\n  resolvingAction: SetResponseAction | OptimisticAction,\n) {\n  return state.optimistic.filter(\n    optimisticAction =>\n      optimisticAction.key !== resolvingAction.key ||\n      (optimisticAction.type === OPTIMISTIC_TYPE ?\n        optimisticAction.meta.fetchedAt !== resolvingAction.meta.fetchedAt\n      : optimisticAction.meta.date > resolvingAction.meta.date),\n  );\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/types.d.ts

@@ -12,10 +12,10 @@ export interface State<T> {
             readonly [pk: string]: T;
         } | undefined;
     };
-    readonly indexes: NormalizedIndex;
     readonly endpoints: {
         readonly [key: string]: unknown | PK[] | PK | undefined;
     };
+    readonly indexes: NormalizedIndex;
     readonly meta: {
         readonly [key: string]: {
             readonly date: number;

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEhF,cAAc,cAAc,CAAC;AAE7B,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,CAAC;AAErD,MAAM,MAAM,EAAE,GAAG,MAAM,CAAC;AAExB,MAAM,WAAW,KAAK,CAAC,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,CAAA;SAAE,GAAG,SAAS,CAAC;KACxE,CAAC;IACF,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE;QAClB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;KACzD,CAAC;IACF,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG;YACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;YAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;YAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;YAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACpD,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG;YAC5B,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG;gBACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;gBAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;aAC5B,CAAC;SACH,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAC9D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,OAAO,CAAC,OAAO,GAAG,WAAW;IAC5C,aAAa,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,IAAI,IAAI,CAAC;IAChB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;CACpC;AAED,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEhF,cAAc,cAAc,CAAC;AAE7B,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,CAAC;AAErD,MAAM,MAAM,EAAE,GAAG,MAAM,CAAC;AAExB,MAAM,WAAW,KAAK,CAAC,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,CAAA;SAAE,GAAG,SAAS,CAAC;KACxE,CAAC;IACF,QAAQ,CAAC,SAAS,EAAE;QAClB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;KACzD,CAAC;IACF,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG;YACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;YAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;YAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;YAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACpD,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG;YAC5B,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG;gBACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;gBAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;aAC5B,CAAC;SACH,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAC9D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,OAAO,CAAC,OAAO,GAAG,WAAW;IAC5C,aAAa,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,IAAI,IAAI,CAAC;IAChB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;CACpC;AAED,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC"}

package/lib/types.js

@@ -1,3 +1,3 @@
 export * from './actions.js';
 export {};
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vc3JjL3R5cGVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vcm1hbGl6ZWRJbmRleCB9IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUge1xuICBVcGRhdGVGdW5jdGlvbixcbiAgQWJzdHJhY3RJbnN0YW5jZVR5cGUsXG59IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUgeyBFcnJvclR5cGVzIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCB0eXBlIHtcbiAgQWN0aW9uVHlwZXMsXG4gIFNldFJlc3BvbnNlQWN0aW9uLFxuICBPcHRpbWlzdGljQWN0aW9uLFxufSBmcm9tICcuL2FjdGlvbnMuanMnO1xuaW1wb3J0IHR5cGUgeyBEaXNwYXRjaCwgTWlkZGxld2FyZSwgTWlkZGxld2FyZUFQSSB9IGZyb20gJy4vbWlkZGxld2FyZVR5cGVzLmpzJztcblxuZXhwb3J0ICogZnJvbSAnLi9hY3Rpb25zLmpzJztcblxuZXhwb3J0IHR5cGUgeyBBYnN0cmFjdEluc3RhbmNlVHlwZSwgVXBkYXRlRnVuY3Rpb24gfTtcblxuZXhwb3J0IHR5cGUgUEsgPSBzdHJpbmc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgU3RhdGU8VD4ge1xuICByZWFkb25seSBlbnRpdGllczoge1xuICAgIHJlYWRvbmx5IFtlbnRpdHlLZXk6IHN0cmluZ106IHsgcmVhZG9ubHkgW3BrOiBzdHJpbmddOiBUIH0gfCB1bmRlZmluZWQ7XG4gIH07XG4gIHJlYWRvbmx5IGluZGV4ZXM6IE5vcm1hbGl6ZWRJbmRleDtcbiAgcmVhZG9ubHkgZW5kcG9pbnRzOiB7XG4gICAgcmVhZG9ubHkgW2tleTogc3RyaW5nXTogdW5rbm93biB8IFBLW10gfCBQSyB8IHVuZGVmaW5lZDtcbiAgfTtcbiAgcmVhZG9ubHkgbWV0YToge1xuICAgIHJlYWRvbmx5IFtrZXk6IHN0cmluZ106IHtcbiAgICAgIHJlYWRvbmx5IGRhdGU6IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IGV4cGlyZXNBdDogbnVtYmVyO1xuICAgICAgcmVhZG9ubHkgcHJldkV4cGlyZXNBdD86IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IGVycm9yPzogRXJyb3JUeXBlcztcbiAgICAgIHJlYWRvbmx5IGludmFsaWRhdGVkPzogYm9vbGVhbjtcbiAgICAgIHJlYWRvbmx5IGVycm9yUG9saWN5PzogJ2hhcmQnIHwgJ3NvZnQnIHwgdW5kZWZpbmVkO1xuICAgIH07XG4gIH07XG4gIHJlYWRvbmx5IGVudGl0eU1ldGE6IHtcbiAgICByZWFkb25seSBbZW50aXR5S2V5OiBzdHJpbmddOiB7XG4gICAgICByZWFkb25seSBbcGs6IHN0cmluZ106IHtcbiAgICAgICAgcmVhZG9ubHkgZmV0Y2hlZEF0OiBudW1iZXI7XG4gICAgICAgIHJlYWRvbmx5IGRhdGU6IG51bWJlcjtcbiAgICAgICAgcmVhZG9ubHkgZXhwaXJlc0F0OiBudW1iZXI7XG4gICAgICB9O1xuICAgIH07XG4gIH07XG4gIHJlYWRvbmx5IG9wdGltaXN0aWM6IChTZXRSZXNwb25zZUFjdGlvbiB8IE9wdGltaXN0aWNBY3Rpb24pW107XG4gIHJlYWRvbmx5IGxhc3RSZXNldDogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIE1hbmFnZXI8QWN0aW9ucyA9IEFjdGlvblR5cGVzPiB7XG4gIGdldE1pZGRsZXdhcmUoKTogTWlkZGxld2FyZTxBY3Rpb25zPjtcbiAgY2xlYW51cCgpOiB2b2lkO1xuICBpbml0PzogKHN0YXRlOiBTdGF0ZTxhbnk+KSA9PiB2b2lkO1xufVxuXG5leHBvcnQgdHlwZSB7IERpc3BhdGNoLCBNaWRkbGV3YXJlLCBNaWRkbGV3YXJlQVBJIH07XG4iXSwibWFwcGluZ3MiOiJBQWNBLGNBQWMsY0FBYztBQUFDIiwiaWdub3JlTGlzdCI6W119
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vc3JjL3R5cGVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vcm1hbGl6ZWRJbmRleCB9IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUge1xuICBVcGRhdGVGdW5jdGlvbixcbiAgQWJzdHJhY3RJbnN0YW5jZVR5cGUsXG59IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUgeyBFcnJvclR5cGVzIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCB0eXBlIHtcbiAgQWN0aW9uVHlwZXMsXG4gIFNldFJlc3BvbnNlQWN0aW9uLFxuICBPcHRpbWlzdGljQWN0aW9uLFxufSBmcm9tICcuL2FjdGlvbnMuanMnO1xuaW1wb3J0IHR5cGUgeyBEaXNwYXRjaCwgTWlkZGxld2FyZSwgTWlkZGxld2FyZUFQSSB9IGZyb20gJy4vbWlkZGxld2FyZVR5cGVzLmpzJztcblxuZXhwb3J0ICogZnJvbSAnLi9hY3Rpb25zLmpzJztcblxuZXhwb3J0IHR5cGUgeyBBYnN0cmFjdEluc3RhbmNlVHlwZSwgVXBkYXRlRnVuY3Rpb24gfTtcblxuZXhwb3J0IHR5cGUgUEsgPSBzdHJpbmc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgU3RhdGU8VD4ge1xuICByZWFkb25seSBlbnRpdGllczoge1xuICAgIHJlYWRvbmx5IFtlbnRpdHlLZXk6IHN0cmluZ106IHsgcmVhZG9ubHkgW3BrOiBzdHJpbmddOiBUIH0gfCB1bmRlZmluZWQ7XG4gIH07XG4gIHJlYWRvbmx5IGVuZHBvaW50czoge1xuICAgIHJlYWRvbmx5IFtrZXk6IHN0cmluZ106IHVua25vd24gfCBQS1tdIHwgUEsgfCB1bmRlZmluZWQ7XG4gIH07XG4gIHJlYWRvbmx5IGluZGV4ZXM6IE5vcm1hbGl6ZWRJbmRleDtcbiAgcmVhZG9ubHkgbWV0YToge1xuICAgIHJlYWRvbmx5IFtrZXk6IHN0cmluZ106IHtcbiAgICAgIHJlYWRvbmx5IGRhdGU6IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IGV4cGlyZXNBdDogbnVtYmVyO1xuICAgICAgcmVhZG9ubHkgcHJldkV4cGlyZXNBdD86IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IGVycm9yPzogRXJyb3JUeXBlcztcbiAgICAgIHJlYWRvbmx5IGludmFsaWRhdGVkPzogYm9vbGVhbjtcbiAgICAgIHJlYWRvbmx5IGVycm9yUG9saWN5PzogJ2hhcmQnIHwgJ3NvZnQnIHwgdW5kZWZpbmVkO1xuICAgIH07XG4gIH07XG4gIHJlYWRvbmx5IGVudGl0eU1ldGE6IHtcbiAgICByZWFkb25seSBbZW50aXR5S2V5OiBzdHJpbmddOiB7XG4gICAgICByZWFkb25seSBbcGs6IHN0cmluZ106IHtcbiAgICAgICAgcmVhZG9ubHkgZmV0Y2hlZEF0OiBudW1iZXI7XG4gICAgICAgIHJlYWRvbmx5IGRhdGU6IG51bWJlcjtcbiAgICAgICAgcmVhZG9ubHkgZXhwaXJlc0F0OiBudW1iZXI7XG4gICAgICB9O1xuICAgIH07XG4gIH07XG4gIHJlYWRvbmx5IG9wdGltaXN0aWM6IChTZXRSZXNwb25zZUFjdGlvbiB8IE9wdGltaXN0aWNBY3Rpb24pW107XG4gIHJlYWRvbmx5IGxhc3RSZXNldDogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIE1hbmFnZXI8QWN0aW9ucyA9IEFjdGlvblR5cGVzPiB7XG4gIGdldE1pZGRsZXdhcmUoKTogTWlkZGxld2FyZTxBY3Rpb25zPjtcbiAgY2xlYW51cCgpOiB2b2lkO1xuICBpbml0PzogKHN0YXRlOiBTdGF0ZTxhbnk+KSA9PiB2b2lkO1xufVxuXG5leHBvcnQgdHlwZSB7IERpc3BhdGNoLCBNaWRkbGV3YXJlLCBNaWRkbGV3YXJlQVBJIH07XG4iXSwibWFwcGluZ3MiOiJBQWNBLGNBQWMsY0FBYztBQUFDIiwiaWdub3JlTGlzdCI6W119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-client/core",
-  "version": "0.14.1",
+  "version": "0.14.4",
   "description": "High performance mutable data framework.",
   "sideEffects": false,
   "main": "dist/index.js",

package/src/controller/actions/createFetch.ts

@@ -27,9 +27,9 @@ export function createFetch<
 
   return {
     type: FETCH_TYPE,
-    endpoint,
-    args,
     key: endpoint.key(...args),
+    args,
+    endpoint,
     meta,
   };
 }

package/src/controller/actions/createOptimistic.ts

@@ -24,9 +24,9 @@ export function createOptimistic<
 
   return {
     type: OPTIMISTIC_TYPE,
-    endpoint,
-    args,
     key: endpoint.key(...args),
+    args,
+    endpoint,
     meta: createMeta(endpoint.dataExpiryLength ?? 60000, fetchedAt),
   };
 }

package/src/controller/actions/createSet.ts

@@ -23,9 +23,9 @@ export function createSet<S extends Queryable>(
 ): SetAction<S> {
   return {
     type: SET_TYPE,
-    schema,
     value,
     args: args.map(ensurePojo) as SchemaArgs<S>,
+    schema,
     meta: createMeta(60000, fetchedAt),
   };
 }

package/src/controller/actions/createSetResponse.ts

@@ -63,10 +63,10 @@ export function createSetResponse<
 
   return {
     type: SET_RESPONSE_TYPE,
-    endpoint,
+    key: endpoint.key(...args),
     response,
     args: args.map(ensurePojo),
-    key: endpoint.key(...args),
+    endpoint,
     meta: createMeta(expiryLength, fetchedAt),
     error,
   };

package/src/controller/actions/createSubscription.ts

@@ -21,8 +21,8 @@ export function createUnsubscription<E extends EndpointInterface>(
 ): UnsubscribeAction<E> {
   return {
     type: UNSUBSCRIBE_TYPE,
-    endpoint,
-    args,
     key: endpoint.key(...args),
+    args,
+    endpoint,
   };
 }

package/src/manager/DevtoolsManager.ts

@@ -37,6 +37,18 @@ if (process.env.NODE_ENV !== 'production') {
   DEFAULT_CONFIG = {
     name: `Data Client: ${globalThis.document?.title}`,
     autoPause: true,
+    features: {
+      pause: true, // start/pause recording of dispatched actions
+      lock: true, // lock/unlock dispatching actions and side effects
+      persist: false, // persist states on page reloading
+      export: true, // export history of actions in a file
+      import: 'custom', // import history of actions from a file
+      jump: true, // jump back and forth (time travelling)
+      skip: true, // skip (cancel) actions
+      reorder: true, // drag and drop actions in the history list
+      dispatch: false, // dispatch custom actions or action creators
+      test: false, // generate tests for the selected actions
+    },
     actionSanitizer: (action: ActionTypes) => {
       if (!('endpoint' in action)) return action;
       return {
@@ -131,6 +143,7 @@ export default class DevToolsManager implements Manager {
         const reducer = createReducer(controller as any);
         let state = controller.getState();
         return next => action => {
+          const shouldSkip = skipLogging?.(action);
           const ret = next(action);
           if (this.started) {
             // we track state changes here since getState() will only update after a batch commit
@@ -139,7 +152,7 @@ export default class DevToolsManager implements Manager {
             state = controller.getState();
           }
           ret.then(() => {
-            if (skipLogging?.(action)) return;
+            if (shouldSkip) return;
             this.handleAction(action, state.optimistic.reduce(reducer, state));
           });
           return ret;

package/src/manager/NetworkManager.ts

@@ -38,7 +38,7 @@ export default class NetworkManager implements Manager {
   protected controller: Controller = new Controller();
   declare cleanupDate?: number;
 
-  constructor(dataExpiryLength = 60000, errorExpiryLength = 1000) {
+  constructor({ dataExpiryLength = 60000, errorExpiryLength = 1000 } = {}) {
     this.dataExpiryLength = dataExpiryLength;
     this.errorExpiryLength = errorExpiryLength;
 

package/src/manager/SubscriptionManager.ts

@@ -32,8 +32,9 @@ export interface SubscriptionConstructable {
  *
  * @see https://dataclient.io/docs/api/SubscriptionManager
  */
-export default class SubscriptionManager<S extends SubscriptionConstructable>
-  implements Manager<Actions>
+export default class SubscriptionManager<
+  S extends SubscriptionConstructable = SubscriptionConstructable,
+> implements Manager<Actions>
 {
   protected subscriptions: {
     [key: string]: InstanceType<S>;

package/src/manager/__tests__/applyManager.ts

@@ -0,0 +1,38 @@
+import Controller from '../../controller/Controller';
+import applyManager from '../applyManager';
+import NetworkManager from '../NetworkManager';
+
+function onError(e: any) {
+  e.preventDefault();
+}
+beforeEach(() => {
+  if (typeof addEventListener === 'function')
+    addEventListener('error', onError);
+});
+afterEach(() => {
+  if (typeof removeEventListener === 'function')
+    removeEventListener('error', onError);
+});
+
+it('applyManagers should console.warn() when no NetworkManager is provided', () => {
+  const warnspy = jest
+    .spyOn(global.console, 'warn')
+    .mockImplementation(() => {});
+  try {
+    applyManager([], new Controller());
+    expect(warnspy.mock.calls.length).toBe(2);
+  } finally {
+    warnspy.mockRestore();
+  }
+});
+it('applyManagers should not console.warn() when NetworkManager is provided', () => {
+  const warnspy = jest
+    .spyOn(global.console, 'warn')
+    .mockImplementation(() => {});
+  try {
+    applyManager([new NetworkManager()], new Controller());
+    expect(warnspy.mock.calls.length).toBe(0);
+  } finally {
+    warnspy.mockRestore();
+  }
+});

package/src/manager/__tests__/networkManager.ts

@@ -134,7 +134,7 @@ describe('NetworkManager', () => {
     let NM: NetworkManager;
     let middleware: Middleware;
     beforeEach(() => {
-      NM = new NetworkManager(42, 7);
+      NM = new NetworkManager({ dataExpiryLength: 42, errorExpiryLength: 7 });
       middleware = NM.getMiddleware();
     });
     afterEach(() => {

package/src/manager/applyManager.ts

@@ -1,3 +1,4 @@
+import NetworkManager from './NetworkManager.js';
 import type Controller from '../controller/Controller.js';
 import type { Reducer, Dispatch, ReducerState } from '../middlewareTypes.js';
 import { Manager } from '../types.js';
@@ -6,11 +7,23 @@ export default function applyManager(
   managers: Manager[],
   controller: Controller,
 ): Middleware[] {
-  return managers.map(manager => {
+  /* istanbul ignore next */
+  if (
+    process.env.NODE_ENV !== 'production' &&
+    !managers.find(mgr => mgr instanceof NetworkManager)
+  ) {
+    console.warn('NetworkManager not found; this is a required manager.');
+    console.warn(
+      'See https://dataclient.io/docs/guides/redux for hooking up redux',
+    );
+  }
+  return managers.map((manager, i) => {
     const middleware = manager.getMiddleware();
     return ({ dispatch, getState }) => {
-      (controller as any).dispatch = dispatch;
-      (controller as any).getState = getState;
+      if (i === 0) {
+        (controller as any).dispatch = dispatch;
+        (controller as any).getState = getState;
+      }
       // controller is a superset of the middleware API
       return middleware(controller as Controller<any>);
     };

package/src/manager/devtoolsTypes.ts

@@ -1,4 +1,7 @@
-type Action = any;
+import { ActionTypes } from '../actions.js';
+import { State } from '../types.js';
+
+type Action = ActionTypes;
 type ActionCreator<T> = any;
 
 // taken from https://github.com/reduxjs/redux-devtools/blob/main/packages/redux-devtools-extension/src/index.ts
@@ -78,7 +81,7 @@ export interface EnhancerOptions {
   /**
    * function which takes `state` object and index as arguments, and should return `state` object back.
    */
-  stateSanitizer?: <S>(state: S, index: number) => S;
+  stateSanitizer?: <S extends State<unknown>>(state: S, index: number) => S;
   /**
    * *string or array of strings as regex* - actions types to be hidden / shown in the monitors (while passed to the reducers).
    * If `actionsWhitelist` specified, `actionsBlacklist` is ignored.
@@ -105,7 +108,10 @@ export interface EnhancerOptions {
    * called for every action before sending, takes `state` and `action` object, and returns `true` in case it allows sending the current data to the monitor.
    * Use it as a more advanced version of `actionsDenylist`/`actionsAllowlist` parameters.
    */
-  predicate?: <S, A extends Action>(state: S, action: A) => boolean;
+  predicate?: <S extends State<unknown>, A extends Action>(
+    state: S,
+    action: A,
+  ) => boolean;
   /**
    * if specified as `false`, it will not record the changes till clicking on `Start recording` button.
    * Available only for Redux enhancer, for others use `autoPause`.

package/src/state/__tests__/reducer.ts

@@ -595,7 +595,7 @@ describe('reducer', () => {
     const newState = reducer(iniState, action);
     expect(newState.entities).toBe(iniState.entities);
   });
-  it('rdc/fetch should console.warn()', () => {
+  it('rdc/fetch should not console.warn()', () => {
     const warnspy = jest
       .spyOn(global.console, 'warn')
       .mockImplementation(() => {});
@@ -618,7 +618,8 @@ describe('reducer', () => {
       };
       const newState = reducer(iniState, action);
       expect(newState).toBe(iniState);
-      expect(warnspy.mock.calls.length).toBe(2);
+      // moved warns to applyManager() vv
+      expect(warnspy.mock.calls.length).toBe(0);
     } finally {
       warnspy.mockRestore();
     }

package/src/state/reducer/createReducer.ts

@@ -66,8 +66,8 @@ export default function createReducer(controller: Controller): ReducerType {
 
 export const initialState: State<unknown> = {
   entities: {},
-  indexes: {},
   endpoints: {},
+  indexes: {},
   meta: {},
   entityMeta: {},
   optimistic: [],

package/src/state/reducer/fetchReducer.ts

@@ -12,18 +12,6 @@ export function fetchReducer(state: State<unknown>, action: FetchAction) {
       ...state,
       optimistic: [...state.optimistic, setAction],
     };
-  } else {
-    // If 'fetch' action reaches the reducer there are no middlewares installed to handle it
-    /* istanbul ignore next */
-    if (process.env.NODE_ENV !== 'production') {
-      console.warn(
-        'Fetch appears unhandled - you are likely missing the NetworkManager middleware',
-      );
-      console.warn(
-        'See https://dataclient.io/docs/guides/redux for hooking up redux',
-      );
-    }
-
-    return state;
   }
+  return state;
 }

package/src/state/reducer/setReducer.ts

@@ -26,10 +26,10 @@ export function setReducer(
     );
     return {
       entities,
-      indexes,
       endpoints: state.endpoints,
-      entityMeta,
+      indexes,
       meta: state.meta,
+      entityMeta,
       optimistic: state.optimistic,
       lastReset: state.lastReset,
     };

package/src/state/reducer/setResponseReducer.ts

@@ -69,9 +69,8 @@ export function setResponseReducer(
     }
     return {
       entities,
-      indexes,
       endpoints,
-      entityMeta,
+      indexes,
       meta: {
         ...state.meta,
         [action.key]: {
@@ -80,6 +79,7 @@ export function setResponseReducer(
           prevExpiresAt: state.meta[action.key]?.expiresAt,
         },
       },
+      entityMeta,
       optimistic: filterOptimistic(state, action),
       lastReset: state.lastReset,
     };

package/src/types.ts

@@ -22,10 +22,10 @@ export interface State<T> {
   readonly entities: {
     readonly [entityKey: string]: { readonly [pk: string]: T } | undefined;
   };
-  readonly indexes: NormalizedIndex;
   readonly endpoints: {
     readonly [key: string]: unknown | PK[] | PK | undefined;
   };
+  readonly indexes: NormalizedIndex;
   readonly meta: {
     readonly [key: string]: {
       readonly date: number;

package/ts3.4/manager/NetworkManager.d.ts

@@ -31,7 +31,10 @@ export default class NetworkManager implements Manager {
     protected middleware: Middleware;
     protected controller: Controller;
     cleanupDate?: number;
-    constructor(dataExpiryLength?: number, errorExpiryLength?: number);
+    constructor({ dataExpiryLength, errorExpiryLength }?: {
+        dataExpiryLength?: number | undefined;
+        errorExpiryLength?: number | undefined;
+    });
     /** Used by DevtoolsManager to determine whether to log an action */
     skipLogging(action: ActionTypes): boolean;
     /** On mount */

package/ts3.4/manager/SubscriptionManager.d.ts

@@ -18,7 +18,7 @@ export interface SubscriptionConstructable {
  *
  * @see https://dataclient.io/docs/api/SubscriptionManager
  */
-export default class SubscriptionManager<S extends SubscriptionConstructable> implements Manager<Actions> {
+export default class SubscriptionManager<S extends SubscriptionConstructable = SubscriptionConstructable> implements Manager<Actions> {
     protected subscriptions: {
         [key: string]: InstanceType<S>;
     };

package/ts3.4/manager/devtoolsTypes.d.ts

@@ -1,4 +1,6 @@
-type Action = any;
+import { ActionTypes } from '../actions.js';
+import { State } from '../types.js';
+type Action = ActionTypes;
 type ActionCreator<T> = any;
 export interface EnhancerOptions {
     /**
@@ -72,7 +74,7 @@ export interface EnhancerOptions {
     /**
      * function which takes `state` object and index as arguments, and should return `state` object back.
      */
-    stateSanitizer?: <S>(state: S, index: number) => S;
+    stateSanitizer?: <S extends State<unknown>>(state: S, index: number) => S;
     /**
      * *string or array of strings as regex* - actions types to be hidden / shown in the monitors (while passed to the reducers).
      * If `actionsWhitelist` specified, `actionsBlacklist` is ignored.
@@ -99,7 +101,7 @@ export interface EnhancerOptions {
      * called for every action before sending, takes `state` and `action` object, and returns `true` in case it allows sending the current data to the monitor.
      * Use it as a more advanced version of `actionsDenylist`/`actionsAllowlist` parameters.
      */
-    predicate?: <S, A extends Action>(state: S, action: A) => boolean;
+    predicate?: <S extends State<unknown>, A extends Action>(state: S, action: A) => boolean;
     /**
      * if specified as `false`, it will not record the changes till clicking on `Start recording` button.
      * Available only for Redux enhancer, for others use `autoPause`.

package/ts3.4/state/reducer/expireReducer.d.ts

@@ -15,10 +15,10 @@ export declare function expireReducer(state: State<unknown>, action: ExpireAllAc
             readonly [pk: string]: unknown;
         } | undefined;
     };
-    indexes: import("packages/normalizr/lib/interface.js").NormalizedIndex;
     endpoints: {
         readonly [key: string]: unknown | import("../../types.js").PK[] | import("../../types.js").PK | undefined;
     };
+    indexes: import("packages/normalizr/lib/interface.js").NormalizedIndex;
     entityMeta: {
         readonly [entityKey: string]: {
             readonly [pk: string]: {

package/ts3.4/state/reducer/setReducer.d.ts

@@ -4,13 +4,10 @@ export declare function setReducer(state: State<unknown>, action: SetAction, con
     entities: {
         [x: string]: any;
     };
-    indexes: import("@data-client/normalizr").NormalizedIndex;
     endpoints: {
         readonly [key: string]: unknown;
     };
-    entityMeta: import("packages/normalizr/lib/types.js").EntitiesToMeta<{
-        [x: string]: any;
-    }>;
+    indexes: import("@data-client/normalizr").NormalizedIndex;
     meta: {
         readonly [key: string]: {
             readonly date: number;
@@ -21,6 +18,9 @@ export declare function setReducer(state: State<unknown>, action: SetAction, con
             readonly errorPolicy?: "hard" | "soft" | undefined;
         };
     };
+    entityMeta: import("packages/normalizr/lib/types.js").EntitiesToMeta<{
+        [x: string]: any;
+    }>;
     optimistic: (import("../../actions.js").SetResponseAction | import("../../actions.js").OptimisticAction<import("@data-client/normalizr").EndpointInterface<import("@data-client/normalizr").FetchFunction, import("@data-client/normalizr").Schema | undefined, boolean | undefined> & {
         update?: import("../../index.js").EndpointUpdateFunction<import("@data-client/normalizr").EndpointInterface>;
     }>)[];

package/ts3.4/state/reducer/setResponseReducer.d.ts

@@ -4,11 +4,8 @@ export declare function setResponseReducer(state: State<unknown>, action: Optimi
     entities: {
         [x: string]: any;
     };
-    indexes: import("@data-client/normalizr").NormalizedIndex;
     endpoints: Record<string, unknown>;
-    entityMeta: import("packages/normalizr/lib/types.js").EntitiesToMeta<{
-        [x: string]: any;
-    }>;
+    indexes: import("@data-client/normalizr").NormalizedIndex;
     meta: {
         [x: string]: {
             readonly date: number;
@@ -23,6 +20,9 @@ export declare function setResponseReducer(state: State<unknown>, action: Optimi
             prevExpiresAt: number;
         };
     };
+    entityMeta: import("packages/normalizr/lib/types.js").EntitiesToMeta<{
+        [x: string]: any;
+    }>;
     optimistic: (SetResponseAction | OptimisticAction<import("@data-client/normalizr").EndpointInterface<import("@data-client/normalizr").FetchFunction, import("@data-client/normalizr").Schema | undefined, boolean | undefined> & {
         update?: import("../../index.js").EndpointUpdateFunction<import("@data-client/normalizr").EndpointInterface>;
     }>)[];