@data-client/core 0.10.0 → 0.11.0

package/lib/state/reducer/invalidateReducer.js

@@ -1,13 +1,13 @@
 import { INVALIDATE_TYPE } from '../../actionTypes.js';
 export function invalidateReducer(state, action) {
-  const results = {
-    ...state.results
+  const endpoints = {
+    ...state.endpoints
   };
   const meta = {
     ...state.meta
   };
   const invalidateKey = key => {
-    delete results[key];
+    delete endpoints[key];
     const itemMeta = {
       ...meta[key],
       expiresAt: 0,
@@ -19,7 +19,7 @@ export function invalidateReducer(state, action) {
   if (action.type === INVALIDATE_TYPE) {
     invalidateKey(action.meta.key);
   } else {
-    Object.keys(results).forEach(key => {
+    Object.keys(endpoints).forEach(key => {
       if (action.testKey(key)) {
         invalidateKey(key);
       }
@@ -27,8 +27,8 @@ export function invalidateReducer(state, action) {
   }
   return {
     ...state,
-    results,
+    endpoints,
     meta
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJJTlZBTElEQVRFX1RZUEUiLCJpbnZhbGlkYXRlUmVkdWNlciIsInN0YXRlIiwiYWN0aW9uIiwicmVzdWx0cyIsIm1ldGEiLCJpbnZhbGlkYXRlS2V5Iiwia2V5IiwiaXRlbU1ldGEiLCJleHBpcmVzQXQiLCJpbnZhbGlkYXRlZCIsImVycm9yIiwidHlwZSIsIk9iamVjdCIsImtleXMiLCJmb3JFYWNoIiwidGVzdEtleSJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGF0ZS9yZWR1Y2VyL2ludmFsaWRhdGVSZWR1Y2VyLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElOVkFMSURBVEVfVFlQRSB9IGZyb20gJy4uLy4uL2FjdGlvblR5cGVzLmpzJztcbmltcG9ydCB0eXBlIHtcbiAgU3RhdGUsXG4gIEludmFsaWRhdGVBbGxBY3Rpb24sXG4gIEludmFsaWRhdGVBY3Rpb24sXG59IGZyb20gJy4uLy4uL3R5cGVzLmpzJztcblxuZXhwb3J0IGZ1bmN0aW9uIGludmFsaWRhdGVSZWR1Y2VyKFxuICBzdGF0ZTogU3RhdGU8dW5rbm93bj4sXG4gIGFjdGlvbjogSW52YWxpZGF0ZUFjdGlvbiB8IEludmFsaWRhdGVBbGxBY3Rpb24sXG4pIHtcbiAgY29uc3QgcmVzdWx0cyA9IHsgLi4uc3RhdGUucmVzdWx0cyB9O1xuICBjb25zdCBtZXRhID0geyAuLi5zdGF0ZS5tZXRhIH07XG4gIGNvbnN0IGludmFsaWRhdGVLZXkgPSAoa2V5OiBzdHJpbmcpID0+IHtcbiAgICBkZWxldGUgcmVzdWx0c1trZXldO1xuICAgIGNvbnN0IGl0ZW1NZXRhID0ge1xuICAgICAgLi4ubWV0YVtrZXldLFxuICAgICAgZXhwaXJlc0F0OiAwLFxuICAgICAgaW52YWxpZGF0ZWQ6IHRydWUsXG4gICAgfTtcbiAgICBkZWxldGUgaXRlbU1ldGEuZXJyb3I7XG4gICAgbWV0YVtrZXldID0gaXRlbU1ldGE7XG4gIH07XG4gIGlmIChhY3Rpb24udHlwZSA9PT0gSU5WQUxJREFURV9UWVBFKSB7XG4gICAgaW52YWxpZGF0ZUtleShhY3Rpb24ubWV0YS5rZXkpO1xuICB9IGVsc2Uge1xuICAgIE9iamVjdC5rZXlzKHJlc3VsdHMpLmZvckVhY2goa2V5ID0+IHtcbiAgICAgIGlmIChhY3Rpb24udGVzdEtleShrZXkpKSB7XG4gICAgICAgIGludmFsaWRhdGVLZXkoa2V5KTtcbiAgICAgIH1cbiAgICB9KTtcbiAgfVxuXG4gIHJldHVybiB7XG4gICAgLi4uc3RhdGUsXG4gICAgcmVzdWx0cyxcbiAgICBtZXRhLFxuICB9O1xufVxuIl0sIm1hcHBpbmdzIjoiQUFBQSxTQUFTQSxlQUFlLFFBQVEsc0JBQXNCO0FBT3RELE9BQU8sU0FBU0MsaUJBQWlCQSxDQUMvQkMsS0FBcUIsRUFDckJDLE1BQThDLEVBQzlDO0VBQ0EsTUFBTUMsT0FBTyxHQUFHO0lBQUUsR0FBR0YsS0FBSyxDQUFDRTtFQUFRLENBQUM7RUFDcEMsTUFBTUMsSUFBSSxHQUFHO0lBQUUsR0FBR0gsS0FBSyxDQUFDRztFQUFLLENBQUM7RUFDOUIsTUFBTUMsYUFBYSxHQUFJQyxHQUFXLElBQUs7SUFDckMsT0FBT0gsT0FBTyxDQUFDRyxHQUFHLENBQUM7SUFDbkIsTUFBTUMsUUFBUSxHQUFHO01BQ2YsR0FBR0gsSUFBSSxDQUFDRSxHQUFHLENBQUM7TUFDWkUsU0FBUyxFQUFFLENBQUM7TUFDWkMsV0FBVyxFQUFFO0lBQ2YsQ0FBQztJQUNELE9BQU9GLFFBQVEsQ0FBQ0csS0FBSztJQUNyQk4sSUFBSSxDQUFDRSxHQUFHLENBQUMsR0FBR0MsUUFBUTtFQUN0QixDQUFDO0VBQ0QsSUFBSUwsTUFBTSxDQUFDUyxJQUFJLEtBQUtaLGVBQWUsRUFBRTtJQUNuQ00sYUFBYSxDQUFDSCxNQUFNLENBQUNFLElBQUksQ0FBQ0UsR0FBRyxDQUFDO0VBQ2hDLENBQUMsTUFBTTtJQUNMTSxNQUFNLENBQUNDLElBQUksQ0FBQ1YsT0FBTyxDQUFDLENBQUNXLE9BQU8sQ0FBQ1IsR0FBRyxJQUFJO01BQ2xDLElBQUlKLE1BQU0sQ0FBQ2EsT0FBTyxDQUFDVCxHQUFHLENBQUMsRUFBRTtRQUN2QkQsYUFBYSxDQUFDQyxHQUFHLENBQUM7TUFDcEI7SUFDRixDQUFDLENBQUM7RUFDSjtFQUVBLE9BQU87SUFDTCxHQUFHTCxLQUFLO0lBQ1JFLE9BQU87SUFDUEM7RUFDRixDQUFDO0FBQ0gifQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJJTlZBTElEQVRFX1RZUEUiLCJpbnZhbGlkYXRlUmVkdWNlciIsInN0YXRlIiwiYWN0aW9uIiwiZW5kcG9pbnRzIiwibWV0YSIsImludmFsaWRhdGVLZXkiLCJrZXkiLCJpdGVtTWV0YSIsImV4cGlyZXNBdCIsImludmFsaWRhdGVkIiwiZXJyb3IiLCJ0eXBlIiwiT2JqZWN0Iiwia2V5cyIsImZvckVhY2giLCJ0ZXN0S2V5Il0sInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YXRlL3JlZHVjZXIvaW52YWxpZGF0ZVJlZHVjZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSU5WQUxJREFURV9UWVBFIH0gZnJvbSAnLi4vLi4vYWN0aW9uVHlwZXMuanMnO1xuaW1wb3J0IHR5cGUge1xuICBTdGF0ZSxcbiAgSW52YWxpZGF0ZUFsbEFjdGlvbixcbiAgSW52YWxpZGF0ZUFjdGlvbixcbn0gZnJvbSAnLi4vLi4vdHlwZXMuanMnO1xuXG5leHBvcnQgZnVuY3Rpb24gaW52YWxpZGF0ZVJlZHVjZXIoXG4gIHN0YXRlOiBTdGF0ZTx1bmtub3duPixcbiAgYWN0aW9uOiBJbnZhbGlkYXRlQWN0aW9uIHwgSW52YWxpZGF0ZUFsbEFjdGlvbixcbikge1xuICBjb25zdCBlbmRwb2ludHMgPSB7IC4uLnN0YXRlLmVuZHBvaW50cyB9O1xuICBjb25zdCBtZXRhID0geyAuLi5zdGF0ZS5tZXRhIH07XG4gIGNvbnN0IGludmFsaWRhdGVLZXkgPSAoa2V5OiBzdHJpbmcpID0+IHtcbiAgICBkZWxldGUgZW5kcG9pbnRzW2tleV07XG4gICAgY29uc3QgaXRlbU1ldGEgPSB7XG4gICAgICAuLi5tZXRhW2tleV0sXG4gICAgICBleHBpcmVzQXQ6IDAsXG4gICAgICBpbnZhbGlkYXRlZDogdHJ1ZSxcbiAgICB9O1xuICAgIGRlbGV0ZSBpdGVtTWV0YS5lcnJvcjtcbiAgICBtZXRhW2tleV0gPSBpdGVtTWV0YTtcbiAgfTtcbiAgaWYgKGFjdGlvbi50eXBlID09PSBJTlZBTElEQVRFX1RZUEUpIHtcbiAgICBpbnZhbGlkYXRlS2V5KGFjdGlvbi5tZXRhLmtleSk7XG4gIH0gZWxzZSB7XG4gICAgT2JqZWN0LmtleXMoZW5kcG9pbnRzKS5mb3JFYWNoKGtleSA9PiB7XG4gICAgICBpZiAoYWN0aW9uLnRlc3RLZXkoa2V5KSkge1xuICAgICAgICBpbnZhbGlkYXRlS2V5KGtleSk7XG4gICAgICB9XG4gICAgfSk7XG4gIH1cblxuICByZXR1cm4ge1xuICAgIC4uLnN0YXRlLFxuICAgIGVuZHBvaW50cyxcbiAgICBtZXRhLFxuICB9O1xufVxuIl0sIm1hcHBpbmdzIjoiQUFBQSxTQUFTQSxlQUFlLFFBQVEsc0JBQXNCO0FBT3RELE9BQU8sU0FBU0MsaUJBQWlCQSxDQUMvQkMsS0FBcUIsRUFDckJDLE1BQThDLEVBQzlDO0VBQ0EsTUFBTUMsU0FBUyxHQUFHO0lBQUUsR0FBR0YsS0FBSyxDQUFDRTtFQUFVLENBQUM7RUFDeEMsTUFBTUMsSUFBSSxHQUFHO0lBQUUsR0FBR0gsS0FBSyxDQUFDRztFQUFLLENBQUM7RUFDOUIsTUFBTUMsYUFBYSxHQUFJQyxHQUFXLElBQUs7SUFDckMsT0FBT0gsU0FBUyxDQUFDRyxHQUFHLENBQUM7SUFDckIsTUFBTUMsUUFBUSxHQUFHO01BQ2YsR0FBR0gsSUFBSSxDQUFDRSxHQUFHLENBQUM7TUFDWkUsU0FBUyxFQUFFLENBQUM7TUFDWkMsV0FBVyxFQUFFO0lBQ2YsQ0FBQztJQUNELE9BQU9GLFFBQVEsQ0FBQ0csS0FBSztJQUNyQk4sSUFBSSxDQUFDRSxHQUFHLENBQUMsR0FBR0MsUUFBUTtFQUN0QixDQUFDO0VBQ0QsSUFBSUwsTUFBTSxDQUFDUyxJQUFJLEtBQUtaLGVBQWUsRUFBRTtJQUNuQ00sYUFBYSxDQUFDSCxNQUFNLENBQUNFLElBQUksQ0FBQ0UsR0FBRyxDQUFDO0VBQ2hDLENBQUMsTUFBTTtJQUNMTSxNQUFNLENBQUNDLElBQUksQ0FBQ1YsU0FBUyxDQUFDLENBQUNXLE9BQU8sQ0FBQ1IsR0FBRyxJQUFJO01BQ3BDLElBQUlKLE1BQU0sQ0FBQ2EsT0FBTyxDQUFDVCxHQUFHLENBQUMsRUFBRTtRQUN2QkQsYUFBYSxDQUFDQyxHQUFHLENBQUM7TUFDcEI7SUFDRixDQUFDLENBQUM7RUFDSjtFQUVBLE9BQU87SUFDTCxHQUFHTCxLQUFLO0lBQ1JFLFNBQVM7SUFDVEM7RUFDRixDQUFDO0FBQ0giLCJpZ25vcmVMaXN0IjpbXX0=

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":"AAGA,OAAO,KAAK,UAAU,MAAM,gCAAgC,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEzE,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EACrB,MAAM,EAAE,gBAAgB,GAAG,SAAS,EACpC,UAAU,EAAE,UAAU,kBA6FvB"}
+{"version":3,"file":"setReducer.d.ts","sourceRoot":"","sources":["../../../src/state/reducer/setReducer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,gCAAgC,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEzE,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EACrB,MAAM,EAAE,gBAAgB,GAAG,SAAS,EACpC,UAAU,EAAE,UAAU,kBA6FvB"}

package/lib/state/reducer/setReducer.js

@@ -1,5 +1,6 @@
 import { normalize } from '@data-client/normalizr';
 import { OPTIMISTIC_TYPE } from '../../actionTypes.js';
+import AbortOptimistic from '../../controller/AbortOptimistic.js';
 export function setReducer(state, action, controller) {
   if (action.error) {
     return reduceError(state, action, action.payload);
@@ -15,9 +16,8 @@ export function setReducer(state, action, controller) {
         // compute optimistic response based on current state
         payload = action.endpoint.getOptimisticResponse.call(action.endpoint, controller.snapshot(state, action.meta.fetchedAt), ...action.meta.args);
       } catch (e) {
-        var _e$constructor;
         // AbortOptimistic means 'do nothing', otherwise we count the exception as endpoint failure
-        if (((_e$constructor = e.constructor) == null ? void 0 : _e$constructor.name) === 'AbortOptimistic') {
+        if (e.constructor === AbortOptimistic) {
           return state;
         }
         throw e;
@@ -31,15 +31,15 @@ export function setReducer(state, action, controller) {
       indexes,
       entityMeta
     } = normalize(payload, action.endpoint.schema, action.meta.args, state.entities, state.indexes, state.entityMeta, action.meta);
-    const results = {
-      ...state.results,
+    const endpoints = {
+      ...state.endpoints,
       [action.meta.key]: result
     };
     try {
       if (action.endpoint.update) {
         const updaters = action.endpoint.update(result, ...action.meta.args);
         Object.keys(updaters).forEach(key => {
-          results[key] = updaters[key](results[key]);
+          endpoints[key] = updaters[key](endpoints[key]);
         });
       }
       // no reason to completely fail because of user-code error
@@ -51,7 +51,7 @@ export function setReducer(state, action, controller) {
     return {
       entities,
       indexes,
-      results,
+      endpoints,
       entityMeta,
       meta: {
         ...state.meta,
@@ -64,7 +64,7 @@ export function setReducer(state, action, controller) {
       optimistic: filterOptimistic(state, action),
       lastReset: state.lastReset
     };
-    // reducer must update the state, so in case of processing errors we simply compute the results inline
+    // 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}`;
@@ -108,4 +108,4 @@ function reduceError(state, action, error) {
 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));
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["normalize","OPTIMISTIC_TYPE","setReducer","state","action","controller","error","reduceError","payload","_state$meta$action$me","type","endpoint","getOptimisticResponse","call","snapshot","meta","fetchedAt","args","e","_e$constructor","constructor","name","result","entities","indexes","entityMeta","schema","results","key","update","updaters","Object","keys","forEach","console","date","expiresAt","prevExpiresAt","optimistic","filterOptimistic","lastReset","message","JSON","stringify","undefined","status","process","env","NODE_ENV","errorPolicy","resolvingAction","filter","optimisticAction"],"sources":["../../../src/state/reducer/setReducer.ts"],"sourcesContent":["import { normalize } from '@data-client/normalizr';\n\nimport { OPTIMISTIC_TYPE } from '../../actionTypes.js';\nimport type Controller from '../../controller/Controller.js';\nimport type { State, SetAction, OptimisticAction } from '../../types.js';\n\nexport function setReducer(\n  state: State<unknown>,\n  action: OptimisticAction | SetAction,\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      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?.name === '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 results = {\n      ...state.results,\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          results[key] = updaters[key](results[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      results,\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 results 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: SetAction | 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: SetAction | 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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"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["normalize","OPTIMISTIC_TYPE","AbortOptimistic","setReducer","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/setReducer.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 { State, SetAction, OptimisticAction } from '../../types.js';\n\nexport function setReducer(\n  state: State<unknown>,\n  action: OptimisticAction | SetAction,\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      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 = {\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: SetAction | 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: SetAction | 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":[]}

package/lib/state/selectMeta.js

@@ -1,4 +1,4 @@
 export default function selectMeta(state, fetchKey) {
   return state.meta[fetchKey];
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJzZWxlY3RNZXRhIiwic3RhdGUiLCJmZXRjaEtleSIsIm1ldGEiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RhdGUvc2VsZWN0TWV0YS50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFN0YXRlIH0gZnJvbSAnLi4vdHlwZXMuanMnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBzZWxlY3RNZXRhPFIgPSBhbnk+KFxuICBzdGF0ZTogU3RhdGU8Uj4sXG4gIGZldGNoS2V5OiBzdHJpbmcsXG4pOiBTdGF0ZTxSPlsnbWV0YSddW3N0cmluZ10ge1xuICByZXR1cm4gc3RhdGUubWV0YVtmZXRjaEtleV07XG59XG4iXSwibWFwcGluZ3MiOiJBQUVBLGVBQWUsU0FBU0EsVUFBVUEsQ0FDaENDLEtBQWUsRUFDZkMsUUFBZ0IsRUFDVTtFQUMxQixPQUFPRCxLQUFLLENBQUNFLElBQUksQ0FBQ0QsUUFBUSxDQUFDO0FBQzdCIn0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJzZWxlY3RNZXRhIiwic3RhdGUiLCJmZXRjaEtleSIsIm1ldGEiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RhdGUvc2VsZWN0TWV0YS50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFN0YXRlIH0gZnJvbSAnLi4vdHlwZXMuanMnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBzZWxlY3RNZXRhPFIgPSBhbnk+KFxuICBzdGF0ZTogU3RhdGU8Uj4sXG4gIGZldGNoS2V5OiBzdHJpbmcsXG4pOiBTdGF0ZTxSPlsnbWV0YSddW3N0cmluZ10ge1xuICByZXR1cm4gc3RhdGUubWV0YVtmZXRjaEtleV07XG59XG4iXSwibWFwcGluZ3MiOiJBQUVBLGVBQWUsU0FBU0EsVUFBVUEsQ0FDaENDLEtBQWUsRUFDZkMsUUFBZ0IsRUFDVTtFQUMxQixPQUFPRCxLQUFLLENBQUNFLElBQUksQ0FBQ0QsUUFBUSxDQUFDO0FBQzdCIiwiaWdub3JlTGlzdCI6W119

package/lib/types.d.ts

@@ -14,7 +14,7 @@ export interface State<T> {
         } | undefined;
     };
     readonly indexes: NormalizedIndex;
-    readonly results: {
+    readonly endpoints: {
         readonly [key: string]: unknown | PK[] | PK | undefined;
     };
     readonly meta: {

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,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEhF,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC;AAEvC,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,OAAO,EAAE;QAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,SAAS,CAAA;KAAE,CAAC;IAC9E,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,SAAS,GAAG,gBAAgB,CAAC,EAAE,CAAC;IACtD,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,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEhF,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC;AAEvC,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,SAAS,GAAG,gBAAgB,CAAC,EAAE,CAAC;IACtD,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"}

package/lib/types.js

@@ -1,3 +1,3 @@
 export * from './actions.js';
 export {};
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vc3JjL3R5cGVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vcm1hbGl6ZWRJbmRleCB9IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUge1xuICBVcGRhdGVGdW5jdGlvbixcbiAgQWJzdHJhY3RJbnN0YW5jZVR5cGUsXG59IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUgeyBFcnJvclR5cGVzIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCB0eXBlIHsgQWN0aW9uVHlwZXMsIFNldEFjdGlvbiwgT3B0aW1pc3RpY0FjdGlvbiB9IGZyb20gJy4vYWN0aW9ucy5qcyc7XG5pbXBvcnQgeyBTRVRfVFlQRSB9IGZyb20gJy4vYWN0aW9uVHlwZXMuanMnO1xuaW1wb3J0IHR5cGUgeyBEaXNwYXRjaCwgTWlkZGxld2FyZSwgTWlkZGxld2FyZUFQSSB9IGZyb20gJy4vbWlkZGxld2FyZVR5cGVzLmpzJztcblxuZXhwb3J0IHR5cGUgeyBBYnN0cmFjdEluc3RhbmNlVHlwZSwgVXBkYXRlRnVuY3Rpb24gfTtcblxuZXhwb3J0IHR5cGUgU2V0VHlwZXMgPSB0eXBlb2YgU0VUX1RZUEU7XG5cbmV4cG9ydCB0eXBlIFBLID0gc3RyaW5nO1xuXG5leHBvcnQgaW50ZXJmYWNlIFN0YXRlPFQ+IHtcbiAgcmVhZG9ubHkgZW50aXRpZXM6IHtcbiAgICByZWFkb25seSBbZW50aXR5S2V5OiBzdHJpbmddOiB7IHJlYWRvbmx5IFtwazogc3RyaW5nXTogVCB9IHwgdW5kZWZpbmVkO1xuICB9O1xuICByZWFkb25seSBpbmRleGVzOiBOb3JtYWxpemVkSW5kZXg7XG4gIHJlYWRvbmx5IHJlc3VsdHM6IHsgcmVhZG9ubHkgW2tleTogc3RyaW5nXTogdW5rbm93biB8IFBLW10gfCBQSyB8IHVuZGVmaW5lZCB9O1xuICByZWFkb25seSBtZXRhOiB7XG4gICAgcmVhZG9ubHkgW2tleTogc3RyaW5nXToge1xuICAgICAgcmVhZG9ubHkgZGF0ZTogbnVtYmVyO1xuICAgICAgcmVhZG9ubHkgZXJyb3I/OiBFcnJvclR5cGVzO1xuICAgICAgcmVhZG9ubHkgZXhwaXJlc0F0OiBudW1iZXI7XG4gICAgICByZWFkb25seSBwcmV2RXhwaXJlc0F0PzogbnVtYmVyO1xuICAgICAgcmVhZG9ubHkgaW52YWxpZGF0ZWQ/OiBib29sZWFuO1xuICAgICAgcmVhZG9ubHkgZXJyb3JQb2xpY3k/OiAnaGFyZCcgfCAnc29mdCcgfCB1bmRlZmluZWQ7XG4gICAgfTtcbiAgfTtcbiAgcmVhZG9ubHkgZW50aXR5TWV0YToge1xuICAgIHJlYWRvbmx5IFtlbnRpdHlLZXk6IHN0cmluZ106IHtcbiAgICAgIHJlYWRvbmx5IFtwazogc3RyaW5nXToge1xuICAgICAgICByZWFkb25seSBkYXRlOiBudW1iZXI7XG4gICAgICAgIHJlYWRvbmx5IGV4cGlyZXNBdDogbnVtYmVyO1xuICAgICAgICByZWFkb25seSBmZXRjaGVkQXQ6IG51bWJlcjtcbiAgICAgIH07XG4gICAgfTtcbiAgfTtcbiAgcmVhZG9ubHkgb3B0aW1pc3RpYzogKFNldEFjdGlvbiB8IE9wdGltaXN0aWNBY3Rpb24pW107XG4gIHJlYWRvbmx5IGxhc3RSZXNldDogbnVtYmVyO1xufVxuXG5leHBvcnQgKiBmcm9tICcuL2FjdGlvbnMuanMnO1xuXG5leHBvcnQgaW50ZXJmYWNlIE1hbmFnZXI8QWN0aW9ucyA9IEFjdGlvblR5cGVzPiB7XG4gIGdldE1pZGRsZXdhcmUoKTogTWlkZGxld2FyZTxBY3Rpb25zPjtcbiAgY2xlYW51cCgpOiB2b2lkO1xuICBpbml0PzogKHN0YXRlOiBTdGF0ZTxhbnk+KSA9PiB2b2lkO1xufVxuXG5leHBvcnQgdHlwZSB7IERpc3BhdGNoLCBNaWRkbGV3YXJlLCBNaWRkbGV3YXJlQVBJIH07XG4iXSwibWFwcGluZ3MiOiJBQThDQSxjQUFjLGNBQWM7QUFBQyJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vc3JjL3R5cGVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vcm1hbGl6ZWRJbmRleCB9IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUge1xuICBVcGRhdGVGdW5jdGlvbixcbiAgQWJzdHJhY3RJbnN0YW5jZVR5cGUsXG59IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUgeyBFcnJvclR5cGVzIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCB0eXBlIHsgQWN0aW9uVHlwZXMsIFNldEFjdGlvbiwgT3B0aW1pc3RpY0FjdGlvbiB9IGZyb20gJy4vYWN0aW9ucy5qcyc7XG5pbXBvcnQgeyBTRVRfVFlQRSB9IGZyb20gJy4vYWN0aW9uVHlwZXMuanMnO1xuaW1wb3J0IHR5cGUgeyBEaXNwYXRjaCwgTWlkZGxld2FyZSwgTWlkZGxld2FyZUFQSSB9IGZyb20gJy4vbWlkZGxld2FyZVR5cGVzLmpzJztcblxuZXhwb3J0IHR5cGUgeyBBYnN0cmFjdEluc3RhbmNlVHlwZSwgVXBkYXRlRnVuY3Rpb24gfTtcblxuZXhwb3J0IHR5cGUgU2V0VHlwZXMgPSB0eXBlb2YgU0VUX1RZUEU7XG5cbmV4cG9ydCB0eXBlIFBLID0gc3RyaW5nO1xuXG5leHBvcnQgaW50ZXJmYWNlIFN0YXRlPFQ+IHtcbiAgcmVhZG9ubHkgZW50aXRpZXM6IHtcbiAgICByZWFkb25seSBbZW50aXR5S2V5OiBzdHJpbmddOiB7IHJlYWRvbmx5IFtwazogc3RyaW5nXTogVCB9IHwgdW5kZWZpbmVkO1xuICB9O1xuICByZWFkb25seSBpbmRleGVzOiBOb3JtYWxpemVkSW5kZXg7XG4gIHJlYWRvbmx5IGVuZHBvaW50czoge1xuICAgIHJlYWRvbmx5IFtrZXk6IHN0cmluZ106IHVua25vd24gfCBQS1tdIHwgUEsgfCB1bmRlZmluZWQ7XG4gIH07XG4gIHJlYWRvbmx5IG1ldGE6IHtcbiAgICByZWFkb25seSBba2V5OiBzdHJpbmddOiB7XG4gICAgICByZWFkb25seSBkYXRlOiBudW1iZXI7XG4gICAgICByZWFkb25seSBlcnJvcj86IEVycm9yVHlwZXM7XG4gICAgICByZWFkb25seSBleHBpcmVzQXQ6IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IHByZXZFeHBpcmVzQXQ/OiBudW1iZXI7XG4gICAgICByZWFkb25seSBpbnZhbGlkYXRlZD86IGJvb2xlYW47XG4gICAgICByZWFkb25seSBlcnJvclBvbGljeT86ICdoYXJkJyB8ICdzb2Z0JyB8IHVuZGVmaW5lZDtcbiAgICB9O1xuICB9O1xuICByZWFkb25seSBlbnRpdHlNZXRhOiB7XG4gICAgcmVhZG9ubHkgW2VudGl0eUtleTogc3RyaW5nXToge1xuICAgICAgcmVhZG9ubHkgW3BrOiBzdHJpbmddOiB7XG4gICAgICAgIHJlYWRvbmx5IGRhdGU6IG51bWJlcjtcbiAgICAgICAgcmVhZG9ubHkgZXhwaXJlc0F0OiBudW1iZXI7XG4gICAgICAgIHJlYWRvbmx5IGZldGNoZWRBdDogbnVtYmVyO1xuICAgICAgfTtcbiAgICB9O1xuICB9O1xuICByZWFkb25seSBvcHRpbWlzdGljOiAoU2V0QWN0aW9uIHwgT3B0aW1pc3RpY0FjdGlvbilbXTtcbiAgcmVhZG9ubHkgbGFzdFJlc2V0OiBudW1iZXI7XG59XG5cbmV4cG9ydCAqIGZyb20gJy4vYWN0aW9ucy5qcyc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgTWFuYWdlcjxBY3Rpb25zID0gQWN0aW9uVHlwZXM+IHtcbiAgZ2V0TWlkZGxld2FyZSgpOiBNaWRkbGV3YXJlPEFjdGlvbnM+O1xuICBjbGVhbnVwKCk6IHZvaWQ7XG4gIGluaXQ/OiAoc3RhdGU6IFN0YXRlPGFueT4pID0+IHZvaWQ7XG59XG5cbmV4cG9ydCB0eXBlIHsgRGlzcGF0Y2gsIE1pZGRsZXdhcmUsIE1pZGRsZXdhcmVBUEkgfTtcbiJdLCJtYXBwaW5ncyI6IkFBZ0RBLGNBQWMsY0FBYztBQUFDIiwiaWdub3JlTGlzdCI6W119

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@data-client/core",
-  "version": "0.10.0",
-  "description": "High performance reactive framework for async data.",
+  "version": "0.11.0",
+  "description": "High performance mutable data framework.",
   "sideEffects": false,
   "main": "dist/index.js",
   "react-native": "legacy/index.js",
@@ -120,7 +120,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.0",
-    "@data-client/normalizr": "^0.10.0",
+    "@data-client/normalizr": "^0.11.0",
     "flux-standard-action": "^2.1.1"
   },
   "devDependencies": {

package/src/actions.ts

@@ -137,7 +137,7 @@ export interface ResetAction {
 export interface GCAction {
   type: typeof GC_TYPE;
   entities: [string, string][];
-  results: string[];
+  endpoints: string[];
 }
 
 export type ActionTypes =

package/src/controller/AbortOptimistic.ts

@@ -0,0 +1 @@
+export default class AbortOptimistic extends Error {}

package/src/controller/Controller.ts

@@ -1,24 +1,25 @@
 import type {
   ErrorTypes,
   SnapshotInterface,
-  DenormalizeCache,
   Schema,
   Denormalize,
+  Queryable,
+  SchemaArgs,
 } from '@data-client/normalizr';
 import {
-  WeakEntityMap,
   ExpiryStatus,
   EndpointInterface,
   FetchFunction,
   ResolveType,
   DenormalizeNullable,
-  Path,
-  denormalizeCached,
+  EntityPath,
+  MemoCache,
   isEntity,
   denormalize,
+  validateQueryKey,
 } from '@data-client/normalizr';
-import { inferResults, validateInference } from '@data-client/normalizr';
 
+import AbortOptimistic from './AbortOptimistic.js';
 import createExpireAll from './createExpireAll.js';
 import createFetch from './createFetch.js';
 import createInvalidate from './createInvalidate.js';
@@ -41,7 +42,7 @@ export type DataClientDispatch = (value: ActionTypes) => Promise<void>;
 interface ConstructorProps<D extends GenericDispatch = DataClientDispatch> {
   dispatch?: D;
   getState?: () => State<unknown>;
-  globalCache?: DenormalizeCache;
+  memo?: Pick<MemoCache, 'denormalize' | 'query' | 'buildQueryKey'>;
 }
 
 const unsetDispatch = (action: unknown): Promise<void> => {
@@ -77,19 +78,22 @@ export default class Controller<
    * @see https://dataclient.io/docs/api/Controller#getState
    */
   declare readonly getState: () => State<unknown>;
-  declare readonly globalCache: DenormalizeCache;
+  /**
+   * Singleton to maintain referential equality between calls
+   */
+  declare readonly memo: Pick<
+    MemoCache,
+    'denormalize' | 'query' | 'buildQueryKey'
+  >;
 
   constructor({
     dispatch = unsetDispatch as any,
     getState = unsetState,
-    globalCache = {
-      entities: {},
-      results: {},
-    },
+    memo = new MemoCache(),
   }: ConstructorProps<D> = {}) {
     this.dispatch = dispatch;
     this.getState = getState;
-    this.globalCache = globalCache;
+    this.memo = memo;
   }
 
   /*************** Action Dispatchers ***************/
@@ -239,7 +243,7 @@ export default class Controller<
           args: readonly [...Parameters<E>];
           response: any;
           fetchedAt: number;
-          error?: false;
+          error?: false | undefined;
         },
   ): Promise<void> => {
     return this.dispatch(createSet(endpoint, meta as any));
@@ -324,9 +328,9 @@ export default class Controller<
     const key = endpoint.key(...args);
 
     const meta = selectMeta(state, key);
-    const results = state.results[key];
+    const error = state.endpoints[key];
 
-    if (results !== undefined && meta?.errorPolicy === 'soft') return;
+    if (error !== undefined && meta?.errorPolicy === 'soft') return;
 
     return meta?.error as any;
   };
@@ -335,85 +339,164 @@ export default class Controller<
    * Gets the (globally referentially stable) response for a given endpoint/args pair from state given.
    * @see https://dataclient.io/docs/api/Controller#getResponse
    */
-  getResponse = <
+  getResponse<E extends EndpointInterface>(
+    endpoint: E,
+    ...rest: readonly [null, State<unknown>]
+  ): {
+    data: DenormalizeNullable<E['schema']>;
+    expiryStatus: ExpiryStatus;
+    expiresAt: number;
+  };
+
+  getResponse<E extends EndpointInterface>(
+    endpoint: E,
+    ...rest: readonly [...Parameters<E>, State<unknown>]
+  ): {
+    data: DenormalizeNullable<E['schema']>;
+    expiryStatus: ExpiryStatus;
+    expiresAt: number;
+  };
+
+  getResponse<
     E extends Pick<EndpointInterface, 'key' | 'schema' | 'invalidIfStale'>,
-    Args extends readonly [...Parameters<E['key']>] | readonly [null],
   >(
     endpoint: E,
-    ...rest: [...Args, State<unknown>]
+    ...rest: readonly [
+      ...(readonly [...Parameters<E['key']>] | readonly [null]),
+      State<unknown>,
+    ]
   ): {
     data: DenormalizeNullable<E['schema']>;
     expiryStatus: ExpiryStatus;
     expiresAt: number;
-  } => {
+  };
+
+  getResponse(
+    endpoint: EndpointInterface,
+    ...rest: readonly [...unknown[], State<unknown>]
+  ): {
+    data: unknown;
+    expiryStatus: ExpiryStatus;
+    expiresAt: number;
+  } {
     const state = rest[rest.length - 1] as State<unknown>;
     // this is typescript generics breaking
     const args: any = rest
       .slice(0, rest.length - 1)
-      .map(ensurePojo) as Parameters<E['key']>;
+      // handle FormData
+      .map(ensurePojo);
     const isActive = args.length !== 1 || args[0] !== null;
     const key = isActive ? endpoint.key(...args) : '';
-    const cacheResults = isActive ? state.results[key] : undefined;
+    const cacheEndpoints = isActive ? state.endpoints[key] : undefined;
     const schema = endpoint.schema;
     const meta = selectMeta(state, key);
     let expiresAt = meta?.expiresAt;
-
-    let invalidResults = false;
-    let results;
-    if (cacheResults === undefined && endpoint.schema !== undefined) {
-      results = inferResults(
-        endpoint.schema,
-        args,
-        state.indexes,
-        state.entities,
-      );
-      invalidResults = !validateInference(results);
-      if (!expiresAt && invalidResults) expiresAt = 1;
-    } else {
-      results = cacheResults;
-    }
+    // if we have no endpoint entry, and our endpoint has a schema - try querying the store
+    const shouldQuery = cacheEndpoints === undefined && schema !== undefined;
+
+    const input =
+      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,
+        )
+      : cacheEndpoints;
 
     if (!isActive) {
+      // when not active simply return the query input without denormalizing
       return {
-        data: results as any,
+        data: input as any,
         expiryStatus: ExpiryStatus.Valid,
         expiresAt: Infinity,
       };
     }
 
-    if (!endpoint.schema || !schemaHasEntity(endpoint.schema)) {
+    let isInvalid = false;
+    if (shouldQuery) {
+      isInvalid = !validateQueryKey(input);
+    } else if (!schema || !schemaHasEntity(schema)) {
       return {
-        data: results,
+        data: cacheEndpoints,
         expiryStatus:
           meta?.invalidated ? ExpiryStatus.Invalid
-          : cacheResults && !endpoint.invalidIfStale ? ExpiryStatus.Valid
+          : cacheEndpoints && !endpoint.invalidIfStale ? ExpiryStatus.Valid
           : ExpiryStatus.InvalidIfStale,
         expiresAt: expiresAt || 0,
-      } as {
-        data: DenormalizeNullable<E['schema']>;
-        expiryStatus: ExpiryStatus;
-        expiresAt: number;
       };
     }
 
-    if (!this.globalCache.results[key])
-      this.globalCache.results[key] = new WeakEntityMap();
-
     // second argument is false if any entities are missing
     // eslint-disable-next-line prefer-const
-    const { data, paths } = denormalizeCached(
-      results,
+    const { data, paths } = this.memo.denormalize(
+      input,
       schema,
       state.entities,
-      this.globalCache.entities,
-      this.globalCache.results[key],
       args,
-    ) as { data: DenormalizeNullable<E['schema']>; paths: Path[] };
+    ) as { data: any; paths: EntityPath[] };
+
+    // note: isInvalid can only be true if shouldQuery is true
+    if (!expiresAt && isInvalid) expiresAt = 1;
+
+    return this.getSchemaResponse(
+      data,
+      paths,
+      state.entityMeta,
+      expiresAt,
+      endpoint.invalidIfStale || isInvalid,
+      meta,
+    );
+  }
+
+  /**
+   * Queries the store for a Querable schema
+   * @see https://dataclient.io/docs/api/Controller#get
+   */
+  get<S extends Queryable>(
+    schema: S,
+    ...rest: readonly [
+      ...SchemaArgs<S>,
+      Pick<State<unknown>, 'entities' | 'entityMeta'>,
+    ]
+  ): DenormalizeNullable<S> | undefined {
+    const state = rest[rest.length - 1] as State<any>;
+    // this is typescript generics breaking
+    const args: any = rest
+      .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,
+    );
+  }
+
+  private getSchemaResponse<T>(
+    data: T,
+    paths: EntityPath[],
+    entityMeta: State<unknown>['entityMeta'],
+    expiresAt: number,
+    invalidIfStale: boolean,
+    meta: { error?: unknown; invalidated?: unknown } = {},
+  ): {
+    data: T;
+    expiryStatus: ExpiryStatus;
+    expiresAt: number;
+  } {
     const invalidDenormalize = typeof data === 'symbol';
 
     // fallback to entity expiry time
     if (!expiresAt) {
-      expiresAt = entityExpiresAt(paths, state.entityMeta);
+      expiresAt = entityExpiresAt(paths, entityMeta);
     }
 
     // https://dataclient.io/docs/concepts/expiry-policy#expiry-status
@@ -422,18 +505,17 @@ export default class Controller<
     const expiryStatus =
       meta?.invalidated || (invalidDenormalize && !meta?.error) ?
         ExpiryStatus.Invalid
-      : invalidDenormalize || endpoint.invalidIfStale || invalidResults ?
-        ExpiryStatus.InvalidIfStale
+      : invalidDenormalize || invalidIfStale ? ExpiryStatus.InvalidIfStale
       : ExpiryStatus.Valid;
 
     return { data, expiryStatus, expiresAt };
-  };
+  }
 }
 
 // benchmark: https://www.measurethat.net/Benchmarks/Show/24691/0/min-reducer-vs-imperative-with-paths
 // earliest expiry dictates age
 function entityExpiresAt(
-  paths: Path[],
+  paths: EntityPath[],
   entityMeta: {
     readonly [entityKey: string]: {
       readonly [pk: string]: {
@@ -455,7 +537,7 @@ function entityExpiresAt(
 
 /** Determine whether the schema has any entities.
  *
- * Without entities, denormalization is not needed, and results should not be inferred.
+ * Without entities, denormalization is not needed, and results should not be queried.
  */
 function schemaHasEntity(schema: Schema): boolean {
   if (isEntity(schema)) return true;
@@ -478,6 +560,7 @@ class Snapshot<T = unknown> implements SnapshotInterface {
   private state: State<T>;
   private controller: Controller;
   readonly fetchedAt: number;
+  readonly abort = new AbortOptimistic();
 
   constructor(controller: Controller, state: State<T>, fetchedAt = 0) {
     this.state = state;
@@ -487,20 +570,48 @@ class Snapshot<T = unknown> implements SnapshotInterface {
 
   /*************** Data Access ***************/
   /** @see https://dataclient.io/docs/api/Snapshot#getResponse */
-  getResponse = <
+  getResponse<E extends EndpointInterface>(
+    endpoint: E,
+    ...args: readonly [null]
+  ): {
+    data: DenormalizeNullable<E['schema']>;
+    expiryStatus: ExpiryStatus;
+    expiresAt: number;
+  };
+
+  getResponse<E extends EndpointInterface>(
+    endpoint: E,
+    ...args: readonly [...Parameters<E>]
+  ): {
+    data: DenormalizeNullable<E['schema']>;
+    expiryStatus: ExpiryStatus;
+    expiresAt: number;
+  };
+
+  getResponse<
     E extends Pick<EndpointInterface, 'key' | 'schema' | 'invalidIfStale'>,
-    Args extends readonly [...Parameters<E['key']>],
   >(
     endpoint: E,
-    ...args: Args
+    ...args: readonly [...Parameters<E['key']>] | readonly [null]
   ): {
     data: DenormalizeNullable<E['schema']>;
     expiryStatus: ExpiryStatus;
     expiresAt: number;
-  } => {
-    return this.controller.getResponse(endpoint, ...args, this.state);
   };
 
+  getResponse<
+    E extends Pick<EndpointInterface, 'key' | 'schema' | 'invalidIfStale'>,
+  >(
+    endpoint: E,
+    ...args: readonly [...Parameters<E['key']>] | readonly [null]
+  ): {
+    data: DenormalizeNullable<E['schema']>;
+    expiryStatus: ExpiryStatus;
+    expiresAt: number;
+  } {
+    return this.controller.getResponse(endpoint, ...args, this.state);
+  }
+
   /** @see https://dataclient.io/docs/api/Snapshot#getError */
   getError = <
     E extends Pick<EndpointInterface, 'key'>,
@@ -511,4 +622,15 @@ class Snapshot<T = unknown> implements SnapshotInterface {
   ): ErrorTypes | undefined => {
     return this.controller.getError(endpoint, ...args, this.state);
   };
+
+  /**
+   * Retrieved memoized value for any Querable schema
+   * @see https://dataclient.io/docs/api/Snapshot#get
+   */
+  get<S extends Queryable>(
+    schema: S,
+    ...args: SchemaArgs<S>
+  ): DenormalizeNullable<S> | undefined {
+    return this.controller.get(schema, ...args, this.state);
+  }
 }