@data-client/core 0.13.5 → 0.14.0

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

@@ -6,9 +6,9 @@ export declare function invalidateReducer(state: State<unknown>, action: Invalid
     meta: {
         [x: string]: {
             readonly date: number;
-            readonly error?: import("packages/normalizr/lib/index.js").ErrorTypes;
             readonly expiresAt: number;
             readonly prevExpiresAt?: number;
+            readonly error?: import("packages/normalizr/lib/index.js").ErrorTypes;
             readonly invalidated?: boolean;
             readonly errorPolicy?: "hard" | "soft" | undefined;
         };
@@ -22,9 +22,9 @@ export declare function invalidateReducer(state: State<unknown>, action: Invalid
     entityMeta: {
         readonly [entityKey: string]: {
             readonly [pk: string]: {
+                readonly fetchedAt: number;
                 readonly date: number;
                 readonly expiresAt: number;
-                readonly fetchedAt: number;
             };
         };
     };

package/lib/state/reducer/invalidateReducer.js

@@ -17,7 +17,7 @@ export function invalidateReducer(state, action) {
     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)) {
@@ -31,4 +31,4 @@ export function invalidateReducer(state, action) {
     meta
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJJTlZBTElEQVRFX1RZUEUiLCJpbnZhbGlkYXRlUmVkdWNlciIsInN0YXRlIiwiYWN0aW9uIiwiZW5kcG9pbnRzIiwibWV0YSIsImludmFsaWRhdGVLZXkiLCJrZXkiLCJpdGVtTWV0YSIsImV4cGlyZXNBdCIsImludmFsaWRhdGVkIiwiZXJyb3IiLCJ0eXBlIiwiT2JqZWN0Iiwia2V5cyIsImZvckVhY2giLCJ0ZXN0S2V5Il0sInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YXRlL3JlZHVjZXIvaW52YWxpZGF0ZVJlZHVjZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSU5WQUxJREFURV9UWVBFIH0gZnJvbSAnLi4vLi4vYWN0aW9uVHlwZXMuanMnO1xuaW1wb3J0IHR5cGUge1xuICBTdGF0ZSxcbiAgSW52YWxpZGF0ZUFsbEFjdGlvbixcbiAgSW52YWxpZGF0ZUFjdGlvbixcbn0gZnJvbSAnLi4vLi4vdHlwZXMuanMnO1xuXG5leHBvcnQgZnVuY3Rpb24gaW52YWxpZGF0ZVJlZHVjZXIoXG4gIHN0YXRlOiBTdGF0ZTx1bmtub3duPixcbiAgYWN0aW9uOiBJbnZhbGlkYXRlQWN0aW9uIHwgSW52YWxpZGF0ZUFsbEFjdGlvbixcbikge1xuICBjb25zdCBlbmRwb2ludHMgPSB7IC4uLnN0YXRlLmVuZHBvaW50cyB9O1xuICBjb25zdCBtZXRhID0geyAuLi5zdGF0ZS5tZXRhIH07XG4gIGNvbnN0IGludmFsaWRhdGVLZXkgPSAoa2V5OiBzdHJpbmcpID0+IHtcbiAgICBkZWxldGUgZW5kcG9pbnRzW2tleV07XG4gICAgY29uc3QgaXRlbU1ldGEgPSB7XG4gICAgICAuLi5tZXRhW2tleV0sXG4gICAgICBleHBpcmVzQXQ6IDAsXG4gICAgICBpbnZhbGlkYXRlZDogdHJ1ZSxcbiAgICB9O1xuICAgIGRlbGV0ZSBpdGVtTWV0YS5lcnJvcjtcbiAgICBtZXRhW2tleV0gPSBpdGVtTWV0YTtcbiAgfTtcbiAgaWYgKGFjdGlvbi50eXBlID09PSBJTlZBTElEQVRFX1RZUEUpIHtcbiAgICBpbnZhbGlkYXRlS2V5KGFjdGlvbi5tZXRhLmtleSk7XG4gIH0gZWxzZSB7XG4gICAgT2JqZWN0LmtleXMoZW5kcG9pbnRzKS5mb3JFYWNoKGtleSA9PiB7XG4gICAgICBpZiAoYWN0aW9uLnRlc3RLZXkoa2V5KSkge1xuICAgICAgICBpbnZhbGlkYXRlS2V5KGtleSk7XG4gICAgICB9XG4gICAgfSk7XG4gIH1cblxuICByZXR1cm4ge1xuICAgIC4uLnN0YXRlLFxuICAgIGVuZHBvaW50cyxcbiAgICBtZXRhLFxuICB9O1xufVxuIl0sIm1hcHBpbmdzIjoiQUFBQSxTQUFTQSxlQUFlLFFBQVEsc0JBQXNCO0FBT3RELE9BQU8sU0FBU0MsaUJBQWlCQSxDQUMvQkMsS0FBcUIsRUFDckJDLE1BQThDLEVBQzlDO0VBQ0EsTUFBTUMsU0FBUyxHQUFHO0lBQUUsR0FBR0YsS0FBSyxDQUFDRTtFQUFVLENBQUM7RUFDeEMsTUFBTUMsSUFBSSxHQUFHO0lBQUUsR0FBR0gsS0FBSyxDQUFDRztFQUFLLENBQUM7RUFDOUIsTUFBTUMsYUFBYSxHQUFJQyxHQUFXLElBQUs7SUFDckMsT0FBT0gsU0FBUyxDQUFDRyxHQUFHLENBQUM7SUFDckIsTUFBTUMsUUFBUSxHQUFHO01BQ2YsR0FBR0gsSUFBSSxDQUFDRSxHQUFHLENBQUM7TUFDWkUsU0FBUyxFQUFFLENBQUM7TUFDWkMsV0FBVyxFQUFFO0lBQ2YsQ0FBQztJQUNELE9BQU9GLFFBQVEsQ0FBQ0csS0FBSztJQUNyQk4sSUFBSSxDQUFDRSxHQUFHLENBQUMsR0FBR0MsUUFBUTtFQUN0QixDQUFDO0VBQ0QsSUFBSUwsTUFBTSxDQUFDUyxJQUFJLEtBQUtaLGVBQWUsRUFBRTtJQUNuQ00sYUFBYSxDQUFDSCxNQUFNLENBQUNFLElBQUksQ0FBQ0UsR0FBRyxDQUFDO0VBQ2hDLENBQUMsTUFBTTtJQUNMTSxNQUFNLENBQUNDLElBQUksQ0FBQ1YsU0FBUyxDQUFDLENBQUNXLE9BQU8sQ0FBQ1IsR0FBRyxJQUFJO01BQ3BDLElBQUlKLE1BQU0sQ0FBQ2EsT0FBTyxDQUFDVCxHQUFHLENBQUMsRUFBRTtRQUN2QkQsYUFBYSxDQUFDQyxHQUFHLENBQUM7TUFDcEI7SUFDRixDQUFDLENBQUM7RUFDSjtFQUVBLE9BQU87SUFDTCxHQUFHTCxLQUFLO0lBQ1JFLFNBQVM7SUFDVEM7RUFDRixDQUFDO0FBQ0giLCJpZ25vcmVMaXN0IjpbXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJJTlZBTElEQVRFX1RZUEUiLCJpbnZhbGlkYXRlUmVkdWNlciIsInN0YXRlIiwiYWN0aW9uIiwiZW5kcG9pbnRzIiwibWV0YSIsImludmFsaWRhdGVLZXkiLCJrZXkiLCJpdGVtTWV0YSIsImV4cGlyZXNBdCIsImludmFsaWRhdGVkIiwiZXJyb3IiLCJ0eXBlIiwiT2JqZWN0Iiwia2V5cyIsImZvckVhY2giLCJ0ZXN0S2V5Il0sInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YXRlL3JlZHVjZXIvaW52YWxpZGF0ZVJlZHVjZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSU5WQUxJREFURV9UWVBFIH0gZnJvbSAnLi4vLi4vYWN0aW9uVHlwZXMuanMnO1xuaW1wb3J0IHR5cGUge1xuICBTdGF0ZSxcbiAgSW52YWxpZGF0ZUFsbEFjdGlvbixcbiAgSW52YWxpZGF0ZUFjdGlvbixcbn0gZnJvbSAnLi4vLi4vdHlwZXMuanMnO1xuXG5leHBvcnQgZnVuY3Rpb24gaW52YWxpZGF0ZVJlZHVjZXIoXG4gIHN0YXRlOiBTdGF0ZTx1bmtub3duPixcbiAgYWN0aW9uOiBJbnZhbGlkYXRlQWN0aW9uIHwgSW52YWxpZGF0ZUFsbEFjdGlvbixcbikge1xuICBjb25zdCBlbmRwb2ludHMgPSB7IC4uLnN0YXRlLmVuZHBvaW50cyB9O1xuICBjb25zdCBtZXRhID0geyAuLi5zdGF0ZS5tZXRhIH07XG4gIGNvbnN0IGludmFsaWRhdGVLZXkgPSAoa2V5OiBzdHJpbmcpID0+IHtcbiAgICBkZWxldGUgZW5kcG9pbnRzW2tleV07XG4gICAgY29uc3QgaXRlbU1ldGEgPSB7XG4gICAgICAuLi5tZXRhW2tleV0sXG4gICAgICBleHBpcmVzQXQ6IDAsXG4gICAgICBpbnZhbGlkYXRlZDogdHJ1ZSxcbiAgICB9O1xuICAgIGRlbGV0ZSBpdGVtTWV0YS5lcnJvcjtcbiAgICBtZXRhW2tleV0gPSBpdGVtTWV0YTtcbiAgfTtcbiAgaWYgKGFjdGlvbi50eXBlID09PSBJTlZBTElEQVRFX1RZUEUpIHtcbiAgICBpbnZhbGlkYXRlS2V5KGFjdGlvbi5rZXkpO1xuICB9IGVsc2Uge1xuICAgIE9iamVjdC5rZXlzKGVuZHBvaW50cykuZm9yRWFjaChrZXkgPT4ge1xuICAgICAgaWYgKGFjdGlvbi50ZXN0S2V5KGtleSkpIHtcbiAgICAgICAgaW52YWxpZGF0ZUtleShrZXkpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgcmV0dXJuIHtcbiAgICAuLi5zdGF0ZSxcbiAgICBlbmRwb2ludHMsXG4gICAgbWV0YSxcbiAgfTtcbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsZUFBZSxRQUFRLHNCQUFzQjtBQU90RCxPQUFPLFNBQVNDLGlCQUFpQkEsQ0FDL0JDLEtBQXFCLEVBQ3JCQyxNQUE4QyxFQUM5QztFQUNBLE1BQU1DLFNBQVMsR0FBRztJQUFFLEdBQUdGLEtBQUssQ0FBQ0U7RUFBVSxDQUFDO0VBQ3hDLE1BQU1DLElBQUksR0FBRztJQUFFLEdBQUdILEtBQUssQ0FBQ0c7RUFBSyxDQUFDO0VBQzlCLE1BQU1DLGFBQWEsR0FBSUMsR0FBVyxJQUFLO0lBQ3JDLE9BQU9ILFNBQVMsQ0FBQ0csR0FBRyxDQUFDO0lBQ3JCLE1BQU1DLFFBQVEsR0FBRztNQUNmLEdBQUdILElBQUksQ0FBQ0UsR0FBRyxDQUFDO01BQ1pFLFNBQVMsRUFBRSxDQUFDO01BQ1pDLFdBQVcsRUFBRTtJQUNmLENBQUM7SUFDRCxPQUFPRixRQUFRLENBQUNHLEtBQUs7SUFDckJOLElBQUksQ0FBQ0UsR0FBRyxDQUFDLEdBQUdDLFFBQVE7RUFDdEIsQ0FBQztFQUNELElBQUlMLE1BQU0sQ0FBQ1MsSUFBSSxLQUFLWixlQUFlLEVBQUU7SUFDbkNNLGFBQWEsQ0FBQ0gsTUFBTSxDQUFDSSxHQUFHLENBQUM7RUFDM0IsQ0FBQyxNQUFNO0lBQ0xNLE1BQU0sQ0FBQ0MsSUFBSSxDQUFDVixTQUFTLENBQUMsQ0FBQ1csT0FBTyxDQUFDUixHQUFHLElBQUk7TUFDcEMsSUFBSUosTUFBTSxDQUFDYSxPQUFPLENBQUNULEdBQUcsQ0FBQyxFQUFFO1FBQ3ZCRCxhQUFhLENBQUNDLEdBQUcsQ0FBQztNQUNwQjtJQUNGLENBQUMsQ0FBQztFQUNKO0VBRUEsT0FBTztJQUNMLEdBQUdMLEtBQUs7SUFDUkUsU0FBUztJQUNUQztFQUNGLENBQUM7QUFDSCIsImlnbm9yZUxpc3QiOltdfQ==

package/lib/state/reducer/setReducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setReducer.d.ts","sourceRoot":"","sources":["../../../src/state/reducer/setReducer.ts"],"names":[],"mappings":"AAEA,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEvD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EACrB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,kBA0CvB"}
+{"version":3,"file":"setReducer.d.ts","sourceRoot":"","sources":["../../../src/state/reducer/setReducer.ts"],"names":[],"mappings":"AAEA,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEvD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EACrB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,kBAoCvB"}

package/lib/state/reducer/setReducer.js

@@ -2,7 +2,7 @@ import { normalize } from '@data-client/normalizr';
 export function setReducer(state, action, controller) {
   let value;
   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 {
@@ -13,7 +13,7 @@ export function setReducer(state, action, controller) {
       entities,
       indexes,
       entityMeta
-    } = normalize(value, action.schema, action.meta.args, state.entities, state.indexes, state.entityMeta, action.meta);
+    } = normalize(action.schema, value, action.args, state, action.meta);
     return {
       entities,
       indexes,
@@ -33,4 +33,4 @@ export function setReducer(state, action, controller) {
     return state;
   }
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJub3JtYWxpemUiLCJzZXRSZWR1Y2VyIiwic3RhdGUiLCJhY3Rpb24iLCJjb250cm9sbGVyIiwidmFsdWUiLCJwcmV2aW91c1ZhbHVlIiwiZ2V0Iiwic2NoZW1hIiwibWV0YSIsImFyZ3MiLCJ1bmRlZmluZWQiLCJlbnRpdGllcyIsImluZGV4ZXMiLCJlbnRpdHlNZXRhIiwiZW5kcG9pbnRzIiwib3B0aW1pc3RpYyIsImxhc3RSZXNldCIsImVycm9yIiwicHJvY2VzcyIsImVudiIsIk5PREVfRU5WIiwiY29uc29sZSJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGF0ZS9yZWR1Y2VyL3NldFJlZHVjZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbm9ybWFsaXplIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCBDb250cm9sbGVyIGZyb20gJy4uLy4uL2NvbnRyb2xsZXIvQ29udHJvbGxlci5qcyc7XG5pbXBvcnQgdHlwZSB7IFN0YXRlLCBTZXRBY3Rpb24gfSBmcm9tICcuLi8uLi90eXBlcy5qcyc7XG5cbmV4cG9ydCBmdW5jdGlvbiBzZXRSZWR1Y2VyKFxuICBzdGF0ZTogU3RhdGU8dW5rbm93bj4sXG4gIGFjdGlvbjogU2V0QWN0aW9uLFxuICBjb250cm9sbGVyOiBDb250cm9sbGVyLFxuKSB7XG4gIGxldCB2YWx1ZTogYW55O1xuICBpZiAodHlwZW9mIGFjdGlvbi52YWx1ZSA9PT0gJ2Z1bmN0aW9uJykge1xuICAgIGNvbnN0IHByZXZpb3VzVmFsdWUgPSBjb250cm9sbGVyLmdldChcbiAgICAgIGFjdGlvbi5zY2hlbWEsXG4gICAgICAuLi5hY3Rpb24ubWV0YS5hcmdzLFxuICAgICAgc3RhdGUsXG4gICAgKTtcbiAgICBpZiAocHJldmlvdXNWYWx1ZSA9PT0gdW5kZWZpbmVkKSByZXR1cm4gc3RhdGU7XG4gICAgdmFsdWUgPSBhY3Rpb24udmFsdWUocHJldmlvdXNWYWx1ZSk7XG4gIH0gZWxzZSB7XG4gICAgdmFsdWUgPSBhY3Rpb24udmFsdWU7XG4gIH1cbiAgdHJ5IHtcbiAgICBjb25zdCB7IGVudGl0aWVzLCBpbmRleGVzLCBlbnRpdHlNZXRhIH0gPSBub3JtYWxpemUoXG4gICAgICB2YWx1ZSxcbiAgICAgIGFjdGlvbi5zY2hlbWEsXG4gICAgICBhY3Rpb24ubWV0YS5hcmdzIGFzIGFueSxcbiAgICAgIHN0YXRlLmVudGl0aWVzLFxuICAgICAgc3RhdGUuaW5kZXhlcyxcbiAgICAgIHN0YXRlLmVudGl0eU1ldGEsXG4gICAgICBhY3Rpb24ubWV0YSxcbiAgICApO1xuICAgIHJldHVybiB7XG4gICAgICBlbnRpdGllcyxcbiAgICAgIGluZGV4ZXMsXG4gICAgICBlbmRwb2ludHM6IHN0YXRlLmVuZHBvaW50cyxcbiAgICAgIGVudGl0eU1ldGEsXG4gICAgICBtZXRhOiBzdGF0ZS5tZXRhLFxuICAgICAgb3B0aW1pc3RpYzogc3RhdGUub3B0aW1pc3RpYyxcbiAgICAgIGxhc3RSZXNldDogc3RhdGUubGFzdFJlc2V0LFxuICAgIH07XG4gICAgLy8gcmVkdWNlciBtdXN0IHVwZGF0ZSB0aGUgc3RhdGUsIHNvIGluIGNhc2Ugb2YgcHJvY2Vzc2luZyBlcnJvcnMgd2Ugc2ltcGx5IGNvbXB1dGUgdGhlIGVuZHBvaW50cyBpbmxpbmVcbiAgfSBjYXRjaCAoZXJyb3I6IGFueSkge1xuICAgIC8vIHRoaXMgaXMgbm90IGFsd2F5cyBidWJibGVkIHVwLCBzbyBsZXQncyBkb3VibGUgc3VyZSB0aGlzIGRvZXNuJ3QgZmFpbCBzaWxlbnRseVxuICAgIC8qIGlzdGFuYnVsIGlnbm9yZSBlbHNlICovXG4gICAgaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpO1xuICAgIH1cbiAgICByZXR1cm4gc3RhdGU7XG4gIH1cbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsU0FBUyxRQUFRLHdCQUF3QjtBQUtsRCxPQUFPLFNBQVNDLFVBQVVBLENBQ3hCQyxLQUFxQixFQUNyQkMsTUFBaUIsRUFDakJDLFVBQXNCLEVBQ3RCO0VBQ0EsSUFBSUMsS0FBVTtFQUNkLElBQUksT0FBT0YsTUFBTSxDQUFDRSxLQUFLLEtBQUssVUFBVSxFQUFFO0lBQ3RDLE1BQU1DLGFBQWEsR0FBR0YsVUFBVSxDQUFDRyxHQUFHLENBQ2xDSixNQUFNLENBQUNLLE1BQU0sRUFDYixHQUFHTCxNQUFNLENBQUNNLElBQUksQ0FBQ0MsSUFBSSxFQUNuQlIsS0FDRixDQUFDO0lBQ0QsSUFBSUksYUFBYSxLQUFLSyxTQUFTLEVBQUUsT0FBT1QsS0FBSztJQUM3Q0csS0FBSyxHQUFHRixNQUFNLENBQUNFLEtBQUssQ0FBQ0MsYUFBYSxDQUFDO0VBQ3JDLENBQUMsTUFBTTtJQUNMRCxLQUFLLEdBQUdGLE1BQU0sQ0FBQ0UsS0FBSztFQUN0QjtFQUNBLElBQUk7SUFDRixNQUFNO01BQUVPLFFBQVE7TUFBRUMsT0FBTztNQUFFQztJQUFXLENBQUMsR0FBR2QsU0FBUyxDQUNqREssS0FBSyxFQUNMRixNQUFNLENBQUNLLE1BQU0sRUFDYkwsTUFBTSxDQUFDTSxJQUFJLENBQUNDLElBQUksRUFDaEJSLEtBQUssQ0FBQ1UsUUFBUSxFQUNkVixLQUFLLENBQUNXLE9BQU8sRUFDYlgsS0FBSyxDQUFDWSxVQUFVLEVBQ2hCWCxNQUFNLENBQUNNLElBQ1QsQ0FBQztJQUNELE9BQU87TUFDTEcsUUFBUTtNQUNSQyxPQUFPO01BQ1BFLFNBQVMsRUFBRWIsS0FBSyxDQUFDYSxTQUFTO01BQzFCRCxVQUFVO01BQ1ZMLElBQUksRUFBRVAsS0FBSyxDQUFDTyxJQUFJO01BQ2hCTyxVQUFVLEVBQUVkLEtBQUssQ0FBQ2MsVUFBVTtNQUM1QkMsU0FBUyxFQUFFZixLQUFLLENBQUNlO0lBQ25CLENBQUM7SUFDRDtFQUNGLENBQUMsQ0FBQyxPQUFPQyxLQUFVLEVBQUU7SUFDbkI7SUFDQTtJQUNBLElBQUlDLE9BQU8sQ0FBQ0MsR0FBRyxDQUFDQyxRQUFRLEtBQUssWUFBWSxFQUFFO01BQ3pDQyxPQUFPLENBQUNKLEtBQUssQ0FBQ0EsS0FBSyxDQUFDO0lBQ3RCO0lBQ0EsT0FBT2hCLEtBQUs7RUFDZDtBQUNGIiwiaWdub3JlTGlzdCI6W119
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJub3JtYWxpemUiLCJzZXRSZWR1Y2VyIiwic3RhdGUiLCJhY3Rpb24iLCJjb250cm9sbGVyIiwidmFsdWUiLCJwcmV2aW91c1ZhbHVlIiwiZ2V0Iiwic2NoZW1hIiwiYXJncyIsInVuZGVmaW5lZCIsImVudGl0aWVzIiwiaW5kZXhlcyIsImVudGl0eU1ldGEiLCJtZXRhIiwiZW5kcG9pbnRzIiwib3B0aW1pc3RpYyIsImxhc3RSZXNldCIsImVycm9yIiwicHJvY2VzcyIsImVudiIsIk5PREVfRU5WIiwiY29uc29sZSJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGF0ZS9yZWR1Y2VyL3NldFJlZHVjZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbm9ybWFsaXplIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCBDb250cm9sbGVyIGZyb20gJy4uLy4uL2NvbnRyb2xsZXIvQ29udHJvbGxlci5qcyc7XG5pbXBvcnQgdHlwZSB7IFN0YXRlLCBTZXRBY3Rpb24gfSBmcm9tICcuLi8uLi90eXBlcy5qcyc7XG5cbmV4cG9ydCBmdW5jdGlvbiBzZXRSZWR1Y2VyKFxuICBzdGF0ZTogU3RhdGU8dW5rbm93bj4sXG4gIGFjdGlvbjogU2V0QWN0aW9uLFxuICBjb250cm9sbGVyOiBDb250cm9sbGVyLFxuKSB7XG4gIGxldCB2YWx1ZTogYW55O1xuICBpZiAodHlwZW9mIGFjdGlvbi52YWx1ZSA9PT0gJ2Z1bmN0aW9uJykge1xuICAgIGNvbnN0IHByZXZpb3VzVmFsdWUgPSBjb250cm9sbGVyLmdldChhY3Rpb24uc2NoZW1hLCAuLi5hY3Rpb24uYXJncywgc3RhdGUpO1xuICAgIGlmIChwcmV2aW91c1ZhbHVlID09PSB1bmRlZmluZWQpIHJldHVybiBzdGF0ZTtcbiAgICB2YWx1ZSA9IGFjdGlvbi52YWx1ZShwcmV2aW91c1ZhbHVlKTtcbiAgfSBlbHNlIHtcbiAgICB2YWx1ZSA9IGFjdGlvbi52YWx1ZTtcbiAgfVxuICB0cnkge1xuICAgIGNvbnN0IHsgZW50aXRpZXMsIGluZGV4ZXMsIGVudGl0eU1ldGEgfSA9IG5vcm1hbGl6ZShcbiAgICAgIGFjdGlvbi5zY2hlbWEsXG4gICAgICB2YWx1ZSxcbiAgICAgIGFjdGlvbi5hcmdzLFxuICAgICAgc3RhdGUsXG4gICAgICBhY3Rpb24ubWV0YSxcbiAgICApO1xuICAgIHJldHVybiB7XG4gICAgICBlbnRpdGllcyxcbiAgICAgIGluZGV4ZXMsXG4gICAgICBlbmRwb2ludHM6IHN0YXRlLmVuZHBvaW50cyxcbiAgICAgIGVudGl0eU1ldGEsXG4gICAgICBtZXRhOiBzdGF0ZS5tZXRhLFxuICAgICAgb3B0aW1pc3RpYzogc3RhdGUub3B0aW1pc3RpYyxcbiAgICAgIGxhc3RSZXNldDogc3RhdGUubGFzdFJlc2V0LFxuICAgIH07XG4gICAgLy8gcmVkdWNlciBtdXN0IHVwZGF0ZSB0aGUgc3RhdGUsIHNvIGluIGNhc2Ugb2YgcHJvY2Vzc2luZyBlcnJvcnMgd2Ugc2ltcGx5IGNvbXB1dGUgdGhlIGVuZHBvaW50cyBpbmxpbmVcbiAgfSBjYXRjaCAoZXJyb3I6IGFueSkge1xuICAgIC8vIHRoaXMgaXMgbm90IGFsd2F5cyBidWJibGVkIHVwLCBzbyBsZXQncyBkb3VibGUgc3VyZSB0aGlzIGRvZXNuJ3QgZmFpbCBzaWxlbnRseVxuICAgIC8qIGlzdGFuYnVsIGlnbm9yZSBlbHNlICovXG4gICAgaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpO1xuICAgIH1cbiAgICByZXR1cm4gc3RhdGU7XG4gIH1cbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsU0FBUyxRQUFRLHdCQUF3QjtBQUtsRCxPQUFPLFNBQVNDLFVBQVVBLENBQ3hCQyxLQUFxQixFQUNyQkMsTUFBaUIsRUFDakJDLFVBQXNCLEVBQ3RCO0VBQ0EsSUFBSUMsS0FBVTtFQUNkLElBQUksT0FBT0YsTUFBTSxDQUFDRSxLQUFLLEtBQUssVUFBVSxFQUFFO0lBQ3RDLE1BQU1DLGFBQWEsR0FBR0YsVUFBVSxDQUFDRyxHQUFHLENBQUNKLE1BQU0sQ0FBQ0ssTUFBTSxFQUFFLEdBQUdMLE1BQU0sQ0FBQ00sSUFBSSxFQUFFUCxLQUFLLENBQUM7SUFDMUUsSUFBSUksYUFBYSxLQUFLSSxTQUFTLEVBQUUsT0FBT1IsS0FBSztJQUM3Q0csS0FBSyxHQUFHRixNQUFNLENBQUNFLEtBQUssQ0FBQ0MsYUFBYSxDQUFDO0VBQ3JDLENBQUMsTUFBTTtJQUNMRCxLQUFLLEdBQUdGLE1BQU0sQ0FBQ0UsS0FBSztFQUN0QjtFQUNBLElBQUk7SUFDRixNQUFNO01BQUVNLFFBQVE7TUFBRUMsT0FBTztNQUFFQztJQUFXLENBQUMsR0FBR2IsU0FBUyxDQUNqREcsTUFBTSxDQUFDSyxNQUFNLEVBQ2JILEtBQUssRUFDTEYsTUFBTSxDQUFDTSxJQUFJLEVBQ1hQLEtBQUssRUFDTEMsTUFBTSxDQUFDVyxJQUNULENBQUM7SUFDRCxPQUFPO01BQ0xILFFBQVE7TUFDUkMsT0FBTztNQUNQRyxTQUFTLEVBQUViLEtBQUssQ0FBQ2EsU0FBUztNQUMxQkYsVUFBVTtNQUNWQyxJQUFJLEVBQUVaLEtBQUssQ0FBQ1ksSUFBSTtNQUNoQkUsVUFBVSxFQUFFZCxLQUFLLENBQUNjLFVBQVU7TUFDNUJDLFNBQVMsRUFBRWYsS0FBSyxDQUFDZTtJQUNuQixDQUFDO0lBQ0Q7RUFDRixDQUFDLENBQUMsT0FBT0MsS0FBVSxFQUFFO0lBQ25CO0lBQ0E7SUFDQSxJQUFJQyxPQUFPLENBQUNDLEdBQUcsQ0FBQ0MsUUFBUSxLQUFLLFlBQVksRUFBRTtNQUN6Q0MsT0FBTyxDQUFDSixLQUFLLENBQUNBLEtBQUssQ0FBQztJQUN0QjtJQUNBLE9BQU9oQixLQUFLO0VBQ2Q7QUFDRiIsImlnbm9yZUxpc3QiOltdfQ==

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

@@ -1 +1 @@
-{"version":3,"file":"setResponseReducer.d.ts","sourceRoot":"","sources":["../../../src/state/reducer/setResponseReducer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,gCAAgC,CAAC;AAC7D,OAAO,KAAK,EACV,KAAK,EACL,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAExB,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EACrB,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,EAC5C,UAAU,EAAE,UAAU,kBA8FvB"}
+{"version":3,"file":"setResponseReducer.d.ts","sourceRoot":"","sources":["../../../src/state/reducer/setResponseReducer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,gCAAgC,CAAC;AAC7D,OAAO,KAAK,EACV,KAAK,EACL,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAExB,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EACrB,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,EAC5C,UAAU,EAAE,UAAU,kBA4FvB"}

package/lib/state/reducer/setResponseReducer.js

@@ -3,19 +3,19 @@ import { OPTIMISTIC_TYPE } from '../../actionTypes.js';
 import AbortOptimistic from '../../controller/AbortOptimistic.js';
 export function setResponseReducer(state, action, controller) {
   if (action.error) {
-    return reduceError(state, action, action.payload);
+    return reduceError(state, action, action.response);
   }
   try {
-    var _state$meta$action$me;
-    let payload;
-    // for true set's payload is contained in action
+    var _state$meta$action$ke;
+    let response;
+    // for true set's response is contained in action
     if (action.type === OPTIMISTIC_TYPE) {
       // this should never happen
       /* istanbul ignore if */
       if (!action.endpoint.getOptimisticResponse) return state;
       try {
         // compute optimistic response based on current state
-        payload = action.endpoint.getOptimisticResponse.call(action.endpoint, controller.snapshot(state, action.meta.fetchedAt), ...action.meta.args);
+        response = action.endpoint.getOptimisticResponse.call(action.endpoint, controller.snapshot(state, action.meta.fetchedAt), ...action.args);
       } catch (e) {
         // AbortOptimistic means 'do nothing', otherwise we count the exception as endpoint failure
         if (e.constructor === AbortOptimistic) {
@@ -24,21 +24,21 @@ export function setResponseReducer(state, action, controller) {
         throw e;
       }
     } else {
-      payload = action.payload;
+      response = action.response;
     }
     const {
       result,
       entities,
       indexes,
       entityMeta
-    } = normalize(payload, action.endpoint.schema, action.meta.args, state.entities, state.indexes, state.entityMeta, action.meta);
+    } = normalize(action.endpoint.schema, response, action.args, state, action.meta);
     const endpoints = {
       ...state.endpoints,
-      [action.meta.key]: result
+      [action.key]: result
     };
     try {
       if (action.endpoint.update) {
-        const updaters = action.endpoint.update(result, ...action.meta.args);
+        const updaters = action.endpoint.update(result, ...action.args);
         Object.keys(updaters).forEach(key => {
           endpoints[key] = updaters[key](endpoints[key]);
         });
@@ -46,7 +46,7 @@ export function setResponseReducer(state, action, controller) {
       // no reason to completely fail because of user-code error
       // integrity of this state update is still guaranteed
     } catch (error) {
-      console.error(`The following error occured during Endpoint.update() for ${action.meta.key}`);
+      console.error(`The following error occured during Endpoint.update() for ${action.key}`);
       console.error(error);
     }
     return {
@@ -56,10 +56,10 @@ export function setResponseReducer(state, action, controller) {
       entityMeta,
       meta: {
         ...state.meta,
-        [action.meta.key]: {
+        [action.key]: {
           date: action.meta.date,
           expiresAt: action.meta.expiresAt,
-          prevExpiresAt: (_state$meta$action$me = state.meta[action.meta.key]) == null ? void 0 : _state$meta$action$me.expiresAt
+          prevExpiresAt: (_state$meta$action$ke = state.meta[action.key]) == null ? void 0 : _state$meta$action$ke.expiresAt
         }
       },
       optimistic: filterOptimistic(state, action),
@@ -68,8 +68,8 @@ export function setResponseReducer(state, action, controller) {
     // reducer must update the state, so in case of processing errors we simply compute the endpoints inline
   } catch (error) {
     if (typeof error === 'object') {
-      error.message = `Error processing ${action.meta.key}\n\nFull Schema: ${JSON.stringify(action.endpoint.schema, undefined, 2)}\n\nError:\n${error.message}`;
-      if ('payload' in action) error.payload = action.payload;
+      error.message = `Error processing ${action.key}\n\nFull Schema: ${JSON.stringify(action.endpoint.schema, undefined, 2)}\n\nError:\n${error.message}`;
+      if ('response' in action) error.response = action.response;
       error.status = 400;
     }
 
@@ -95,7 +95,7 @@ function reduceError(state, action, error) {
     ...state,
     meta: {
       ...state.meta,
-      [action.meta.key]: {
+      [action.key]: {
         date: action.meta.date,
         error,
         expiresAt: action.meta.expiresAt,
@@ -107,6 +107,6 @@ function reduceError(state, action, error) {
 }
 /** Filter all requests with same serialization that did not start after the resolving request */
 function filterOptimistic(state, resolvingAction) {
-  return state.optimistic.filter(optimisticAction => optimisticAction.meta.key !== resolvingAction.meta.key || (optimisticAction.type === OPTIMISTIC_TYPE ? optimisticAction.meta.fetchedAt !== resolvingAction.meta.fetchedAt : optimisticAction.meta.date > resolvingAction.meta.date));
+  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","payload","_state$meta$action$me","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.payload);\n  }\n  try {\n    let payload: any;\n    // for true set's payload 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        payload = action.endpoint.getOptimisticResponse.call(\n          action.endpoint,\n          controller.snapshot(state, action.meta.fetchedAt),\n          ...action.meta.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      payload = action.payload;\n    }\n    const { result, entities, indexes, entityMeta } = normalize(\n      payload,\n      action.endpoint.schema,\n      action.meta.args as any,\n      state.entities,\n      state.indexes,\n      state.entityMeta,\n      action.meta,\n    );\n    const endpoints: Record<string, unknown> = {\n      ...state.endpoints,\n      [action.meta.key]: result,\n    };\n    try {\n      if (action.endpoint.update) {\n        const updaters = action.endpoint.update(result, ...action.meta.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.meta.key}`,\n      );\n      console.error(error);\n    }\n    return {\n      entities,\n      indexes,\n      endpoints,\n      entityMeta,\n      meta: {\n        ...state.meta,\n        [action.meta.key]: {\n          date: action.meta.date,\n          expiresAt: action.meta.expiresAt,\n          prevExpiresAt: state.meta[action.meta.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.meta.key\n      }\\n\\nFull Schema: ${JSON.stringify(\n        action.endpoint.schema,\n        undefined,\n        2,\n      )}\\n\\nError:\\n${error.message}`;\n      if ('payload' in action) error.payload = action.payload;\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.meta.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.meta.key !== resolvingAction.meta.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      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":[]}

package/lib/types.d.ts

@@ -3,6 +3,7 @@ import type { UpdateFunction, AbstractInstanceType } from '@data-client/normaliz
 import type { ErrorTypes } from '@data-client/normalizr';
 import type { ActionTypes, SetResponseAction, OptimisticAction } from './actions.js';
 import type { Dispatch, Middleware, MiddlewareAPI } from './middlewareTypes.js';
+export * from './actions.js';
 export type { AbstractInstanceType, UpdateFunction };
 export type PK = string;
 export interface State<T> {
@@ -18,9 +19,9 @@ export interface State<T> {
     readonly meta: {
         readonly [key: string]: {
             readonly date: number;
-            readonly error?: ErrorTypes;
             readonly expiresAt: number;
             readonly prevExpiresAt?: number;
+            readonly error?: ErrorTypes;
             readonly invalidated?: boolean;
             readonly errorPolicy?: 'hard' | 'soft' | undefined;
         };
@@ -28,16 +29,15 @@ export interface State<T> {
     readonly entityMeta: {
         readonly [entityKey: string]: {
             readonly [pk: string]: {
+                readonly fetchedAt: number;
                 readonly date: number;
                 readonly expiresAt: number;
-                readonly fetchedAt: number;
             };
         };
     };
     readonly optimistic: (SetResponseAction | OptimisticAction)[];
     readonly lastReset: number;
 }
-export * from './actions.js';
 export interface Manager<Actions = ActionTypes> {
     getMiddleware(): Middleware<Actions>;
     cleanup(): void;

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,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,KAAK,CAAC,EAAE,UAAU,CAAC;YAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;YAChC,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,IAAI,EAAE,MAAM,CAAC;gBACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;gBAC3B,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,cAAc,cAAc,CAAC;AAE7B,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,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"}

package/lib/types.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-client/core",
-  "version": "0.13.5",
+  "version": "0.14.0",
   "description": "High performance mutable data framework.",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -121,7 +121,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.0",
-    "@data-client/normalizr": "^0.12.3",
+    "@data-client/normalizr": "^0.14.0",
     "flux-standard-action": "^2.1.1"
   },
   "devDependencies": {

package/src/actions.ts

@@ -28,102 +28,98 @@ type EndpointDefault = EndpointInterface & {
   update?: EndpointUpdateFunction<EndpointInterface>;
 };
 
-/* SET */
-export interface SetMeta {
-  args: readonly any[];
-  fetchedAt: number;
-  date: number;
-  expiresAt: number;
+/** General meta-data for operators */
+export interface ActionMeta {
+  readonly fetchedAt: number;
+  readonly date: number;
+  readonly expiresAt: number;
 }
 
+/** Action for Controller.set() */
 export interface SetAction<S extends Queryable = any> {
   type: typeof SET_TYPE;
   schema: S;
-  meta: SetMeta;
+  args: readonly any[];
+  meta: ActionMeta;
   value: {} | ((previousValue: Denormalize<S>) => {});
 }
 
 /* setResponse */
-export interface SetResponseMeta {
+export interface SetResponseActionBase<
+  E extends EndpointAndUpdate<E> = EndpointDefault,
+> {
+  type: typeof SET_RESPONSE_TYPE;
+  endpoint: E;
   args: readonly any[];
   key: string;
-  fetchedAt: number;
-  date: number;
-  expiresAt: number;
+  meta: ActionMeta;
 }
 export interface SetResponseActionSuccess<
   E extends EndpointAndUpdate<E> = EndpointDefault,
-> {
-  type: typeof SET_RESPONSE_TYPE;
-  endpoint: E;
-  meta: SetResponseMeta;
-  payload: ResolveType<E>;
+> extends SetResponseActionBase<E> {
+  response: ResolveType<E>;
   error?: false;
 }
 export interface SetResponseActionError<
   E extends EndpointAndUpdate<E> = EndpointDefault,
-> {
-  type: typeof SET_RESPONSE_TYPE;
-  endpoint: E;
-  meta: SetResponseMeta;
-  payload: UnknownError;
+> extends SetResponseActionBase<E> {
+  response: UnknownError;
   error: true;
 }
+/** Action for Controller.setResponse() */
 export type SetResponseAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > = SetResponseActionSuccess<E> | SetResponseActionError<E>;
 
 /* FETCH */
-export interface FetchMeta<A extends readonly any[] = readonly any[]> {
-  args: A;
-  key: string;
-  throttle: boolean;
+export interface FetchMeta {
+  fetchedAt: number;
   resolve: (value?: any | PromiseLike<any>) => void;
   reject: (reason?: any) => void;
   promise: PromiseLike<any>;
-  createdAt: number;
-  // indicates whether network manager processed it
-  nm?: boolean;
 }
 
+/** Action for Controller.fetch() */
 export interface FetchAction<E extends EndpointAndUpdate<E> = EndpointDefault> {
   type: typeof FETCH_TYPE;
   endpoint: E;
-  meta: FetchMeta<readonly [...Parameters<E>]>;
-  payload: () => ReturnType<E>;
+  args: readonly [...Parameters<E>];
+  key: string;
+  meta: FetchMeta;
 }
 
 /* OPTIMISTIC */
+/** Action for Endpoint.getOptimisticResponse() */
 export interface OptimisticAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
   type: typeof OPTIMISTIC_TYPE;
   endpoint: E;
-  meta: SetResponseMeta;
+  args: readonly any[];
+  key: string;
+  meta: ActionMeta;
   error?: false;
 }
 
 /* SUBSCRIBE */
+/** Action for Controller.subscribe() */
 export interface SubscribeAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
   type: typeof SUBSCRIBE_TYPE;
   endpoint: E;
-  meta: {
-    args: readonly any[];
-    key: string;
-  };
+  args: readonly any[];
+  key: string;
 }
 
+/** Action for Controller.unsubscribe() */
 export interface UnsubscribeAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
   type: typeof UNSUBSCRIBE_TYPE;
   endpoint: E;
-  meta: {
-    args: readonly any[];
-    key: string;
-  };
+  args: readonly any[];
+  key: string;
 }
 
 /* EXPIRY */
@@ -140,9 +136,7 @@ export interface InvalidateAllAction {
 
 export interface InvalidateAction {
   type: typeof INVALIDATE_TYPE;
-  meta: {
-    key: string;
-  };
+  key: string;
 }
 
 /* RESET */

package/src/controller/Controller.ts

@@ -20,17 +20,19 @@ import {
 } from '@data-client/normalizr';
 
 import AbortOptimistic from './AbortOptimistic.js';
-import createExpireAll from './createExpireAll.js';
-import createFetch from './createFetch.js';
-import createInvalidate from './createInvalidate.js';
-import createInvalidateAll from './createInvalidateAll.js';
-import createReset from './createReset.js';
-import createSet from './createSet.js';
-import createSetResponse from './createSetResponse.js';
 import {
   createUnsubscription,
   createSubscription,
-} from './createSubscription.js';
+} from './actions/createSubscription.js';
+import {
+  createExpireAll,
+  createFetch,
+  createInvalidate,
+  createInvalidateAll,
+  createReset,
+  createSet,
+  createSetResponse,
+} from './actions/index.js';
 import ensurePojo from './ensurePojo.js';
 import type { EndpointUpdateFunction } from './types.js';
 import { initialState } from '../state/reducer/createReducer.js';
@@ -117,7 +119,7 @@ export default class Controller<
 
     if (endpoint.schema) {
       return action.meta.promise.then(input =>
-        denormalize(input, endpoint.schema, {}, args),
+        denormalize(endpoint.schema, input, {}, args),
       ) as any;
     }
     return action.meta.promise as any;
@@ -251,7 +253,7 @@ export default class Controller<
   };
 
   /**
-   * Resolves an inflight fetch. `fetchedAt` should `fetch`'s `createdAt`
+   * Resolves an inflight fetch.
    * @see https://dataclient.io/docs/api/Controller#resolve
    */
   resolve = <
@@ -430,11 +432,11 @@ export default class Controller<
       shouldQuery ?
         // nothing in endpoints cache, so try querying if we have a schema to do so
         this.memo.buildQueryKey(
-          key,
           schema,
           args,
           state.entities as any,
           state.indexes,
+          key,
         )
       : cacheEndpoints;
 
@@ -464,8 +466,8 @@ export default class Controller<
     // second argument is false if any entities are missing
     // eslint-disable-next-line prefer-const
     const { data, paths } = this.memo.denormalize(
-      input,
       schema,
+      input,
       state.entities,
       args,
     ) as { data: any; paths: EntityPath[] };
@@ -500,16 +502,7 @@ export default class Controller<
       .slice(0, rest.length - 1)
       .map(ensurePojo) as SchemaArgs<S>;
 
-    // NOTE: different orders can result in cache busting here; but since it's just a perf penalty we will allow for now
-    const key = JSON.stringify(args);
-
-    return this.memo.query(
-      key,
-      schema,
-      args,
-      state.entities as any,
-      state.indexes,
-    );
+    return this.memo.query(schema, args, state.entities as any, state.indexes);
   }
 
   private getSchemaResponse<T>(

package/src/controller/__tests__/Controller.ts

@@ -36,8 +36,8 @@ describe('Controller', () => {
         tags: ['a', 'best', 'react'],
       };
       const { entities, result } = normalize(
-        payload,
         CoolerArticleResource.get.schema,
+        payload,
       );
       const fetchKey = CoolerArticleResource.get.key({ id: payload.id });
       const state = {
@@ -73,8 +73,8 @@ describe('Controller', () => {
         tags: ['a', 'best', 'react'],
       };
       const { entities, result } = normalize(
-        payload,
         CoolerArticleResource.get.schema,
+        payload,
       );
       const fetchKey = CoolerArticleResource.get.key({ id: payload.id });
       const state = {

package/src/controller/actions/createExpireAll.ts

@@ -0,0 +1,11 @@
+import { EXPIREALL_TYPE } from '../../actionTypes.js';
+import type { ExpireAllAction } from '../../types.js';
+
+export function createExpireAll(
+  testKey: (key: string) => boolean,
+): ExpireAllAction {
+  return {
+    type: EXPIREALL_TYPE,
+    testKey,
+  };
+}