@data-client/core 0.14.13 → 0.14.16

package/lib/state/reducer/invalidateReducer.js

@@ -1,4 +1,4 @@
-import { INVALIDATE_TYPE } from '../../actionTypes.js';
+import { INVALIDATE } from '../../actionTypes.js';
 export function invalidateReducer(state, action) {
   const endpoints = {
     ...state.endpoints
@@ -16,7 +16,7 @@ export function invalidateReducer(state, action) {
     delete itemMeta.error;
     meta[key] = itemMeta;
   };
-  if (action.type === INVALIDATE_TYPE) {
+  if (action.type === INVALIDATE) {
     invalidateKey(action.key);
   } else {
     Object.keys(endpoints).forEach(key => {
@@ -31,4 +31,4 @@ export function invalidateReducer(state, action) {
     meta
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJJTlZBTElEQVRFX1RZUEUiLCJpbnZhbGlkYXRlUmVkdWNlciIsInN0YXRlIiwiYWN0aW9uIiwiZW5kcG9pbnRzIiwibWV0YSIsImludmFsaWRhdGVLZXkiLCJrZXkiLCJpdGVtTWV0YSIsImV4cGlyZXNBdCIsImludmFsaWRhdGVkIiwiZXJyb3IiLCJ0eXBlIiwiT2JqZWN0Iiwia2V5cyIsImZvckVhY2giLCJ0ZXN0S2V5Il0sInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YXRlL3JlZHVjZXIvaW52YWxpZGF0ZVJlZHVjZXIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSU5WQUxJREFURV9UWVBFIH0gZnJvbSAnLi4vLi4vYWN0aW9uVHlwZXMuanMnO1xuaW1wb3J0IHR5cGUge1xuICBTdGF0ZSxcbiAgSW52YWxpZGF0ZUFsbEFjdGlvbixcbiAgSW52YWxpZGF0ZUFjdGlvbixcbn0gZnJvbSAnLi4vLi4vdHlwZXMuanMnO1xuXG5leHBvcnQgZnVuY3Rpb24gaW52YWxpZGF0ZVJlZHVjZXIoXG4gIHN0YXRlOiBTdGF0ZTx1bmtub3duPixcbiAgYWN0aW9uOiBJbnZhbGlkYXRlQWN0aW9uIHwgSW52YWxpZGF0ZUFsbEFjdGlvbixcbikge1xuICBjb25zdCBlbmRwb2ludHMgPSB7IC4uLnN0YXRlLmVuZHBvaW50cyB9O1xuICBjb25zdCBtZXRhID0geyAuLi5zdGF0ZS5tZXRhIH07XG4gIGNvbnN0IGludmFsaWRhdGVLZXkgPSAoa2V5OiBzdHJpbmcpID0+IHtcbiAgICBkZWxldGUgZW5kcG9pbnRzW2tleV07XG4gICAgY29uc3QgaXRlbU1ldGEgPSB7XG4gICAgICAuLi5tZXRhW2tleV0sXG4gICAgICBleHBpcmVzQXQ6IDAsXG4gICAgICBpbnZhbGlkYXRlZDogdHJ1ZSxcbiAgICB9O1xuICAgIGRlbGV0ZSBpdGVtTWV0YS5lcnJvcjtcbiAgICBtZXRhW2tleV0gPSBpdGVtTWV0YTtcbiAgfTtcbiAgaWYgKGFjdGlvbi50eXBlID09PSBJTlZBTElEQVRFX1RZUEUpIHtcbiAgICBpbnZhbGlkYXRlS2V5KGFjdGlvbi5rZXkpO1xuICB9IGVsc2Uge1xuICAgIE9iamVjdC5rZXlzKGVuZHBvaW50cykuZm9yRWFjaChrZXkgPT4ge1xuICAgICAgaWYgKGFjdGlvbi50ZXN0S2V5KGtleSkpIHtcbiAgICAgICAgaW52YWxpZGF0ZUtleShrZXkpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgcmV0dXJuIHtcbiAgICAuLi5zdGF0ZSxcbiAgICBlbmRwb2ludHMsXG4gICAgbWV0YSxcbiAgfTtcbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsZUFBZSxRQUFRLHNCQUFzQjtBQU90RCxPQUFPLFNBQVNDLGlCQUFpQkEsQ0FDL0JDLEtBQXFCLEVBQ3JCQyxNQUE4QyxFQUM5QztFQUNBLE1BQU1DLFNBQVMsR0FBRztJQUFFLEdBQUdGLEtBQUssQ0FBQ0U7RUFBVSxDQUFDO0VBQ3hDLE1BQU1DLElBQUksR0FBRztJQUFFLEdBQUdILEtBQUssQ0FBQ0c7RUFBSyxDQUFDO0VBQzlCLE1BQU1DLGFBQWEsR0FBSUMsR0FBVyxJQUFLO0lBQ3JDLE9BQU9ILFNBQVMsQ0FBQ0csR0FBRyxDQUFDO0lBQ3JCLE1BQU1DLFFBQVEsR0FBRztNQUNmLEdBQUdILElBQUksQ0FBQ0UsR0FBRyxDQUFDO01BQ1pFLFNBQVMsRUFBRSxDQUFDO01BQ1pDLFdBQVcsRUFBRTtJQUNmLENBQUM7SUFDRCxPQUFPRixRQUFRLENBQUNHLEtBQUs7SUFDckJOLElBQUksQ0FBQ0UsR0FBRyxDQUFDLEdBQUdDLFFBQVE7RUFDdEIsQ0FBQztFQUNELElBQUlMLE1BQU0sQ0FBQ1MsSUFBSSxLQUFLWixlQUFlLEVBQUU7SUFDbkNNLGFBQWEsQ0FBQ0gsTUFBTSxDQUFDSSxHQUFHLENBQUM7RUFDM0IsQ0FBQyxNQUFNO0lBQ0xNLE1BQU0sQ0FBQ0MsSUFBSSxDQUFDVixTQUFTLENBQUMsQ0FBQ1csT0FBTyxDQUFDUixHQUFHLElBQUk7TUFDcEMsSUFBSUosTUFBTSxDQUFDYSxPQUFPLENBQUNULEdBQUcsQ0FBQyxFQUFFO1FBQ3ZCRCxhQUFhLENBQUNDLEdBQUcsQ0FBQztNQUNwQjtJQUNGLENBQUMsQ0FBQztFQUNKO0VBRUEsT0FBTztJQUNMLEdBQUdMLEtBQUs7SUFDUkUsU0FBUztJQUNUQztFQUNGLENBQUM7QUFDSCIsImlnbm9yZUxpc3QiOltdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJJTlZBTElEQVRFIiwiaW52YWxpZGF0ZVJlZHVjZXIiLCJzdGF0ZSIsImFjdGlvbiIsImVuZHBvaW50cyIsIm1ldGEiLCJpbnZhbGlkYXRlS2V5Iiwia2V5IiwiaXRlbU1ldGEiLCJleHBpcmVzQXQiLCJpbnZhbGlkYXRlZCIsImVycm9yIiwidHlwZSIsIk9iamVjdCIsImtleXMiLCJmb3JFYWNoIiwidGVzdEtleSJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGF0ZS9yZWR1Y2VyL2ludmFsaWRhdGVSZWR1Y2VyLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElOVkFMSURBVEUgfSBmcm9tICcuLi8uLi9hY3Rpb25UeXBlcy5qcyc7XG5pbXBvcnQgdHlwZSB7XG4gIFN0YXRlLFxuICBJbnZhbGlkYXRlQWxsQWN0aW9uLFxuICBJbnZhbGlkYXRlQWN0aW9uLFxufSBmcm9tICcuLi8uLi90eXBlcy5qcyc7XG5cbmV4cG9ydCBmdW5jdGlvbiBpbnZhbGlkYXRlUmVkdWNlcihcbiAgc3RhdGU6IFN0YXRlPHVua25vd24+LFxuICBhY3Rpb246IEludmFsaWRhdGVBY3Rpb24gfCBJbnZhbGlkYXRlQWxsQWN0aW9uLFxuKSB7XG4gIGNvbnN0IGVuZHBvaW50cyA9IHsgLi4uc3RhdGUuZW5kcG9pbnRzIH07XG4gIGNvbnN0IG1ldGEgPSB7IC4uLnN0YXRlLm1ldGEgfTtcbiAgY29uc3QgaW52YWxpZGF0ZUtleSA9IChrZXk6IHN0cmluZykgPT4ge1xuICAgIGRlbGV0ZSBlbmRwb2ludHNba2V5XTtcbiAgICBjb25zdCBpdGVtTWV0YSA9IHtcbiAgICAgIC4uLm1ldGFba2V5XSxcbiAgICAgIGV4cGlyZXNBdDogMCxcbiAgICAgIGludmFsaWRhdGVkOiB0cnVlLFxuICAgIH07XG4gICAgZGVsZXRlIGl0ZW1NZXRhLmVycm9yO1xuICAgIG1ldGFba2V5XSA9IGl0ZW1NZXRhO1xuICB9O1xuICBpZiAoYWN0aW9uLnR5cGUgPT09IElOVkFMSURBVEUpIHtcbiAgICBpbnZhbGlkYXRlS2V5KGFjdGlvbi5rZXkpO1xuICB9IGVsc2Uge1xuICAgIE9iamVjdC5rZXlzKGVuZHBvaW50cykuZm9yRWFjaChrZXkgPT4ge1xuICAgICAgaWYgKGFjdGlvbi50ZXN0S2V5KGtleSkpIHtcbiAgICAgICAgaW52YWxpZGF0ZUtleShrZXkpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgcmV0dXJuIHtcbiAgICAuLi5zdGF0ZSxcbiAgICBlbmRwb2ludHMsXG4gICAgbWV0YSxcbiAgfTtcbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsVUFBVSxRQUFRLHNCQUFzQjtBQU9qRCxPQUFPLFNBQVNDLGlCQUFpQkEsQ0FDL0JDLEtBQXFCLEVBQ3JCQyxNQUE4QyxFQUM5QztFQUNBLE1BQU1DLFNBQVMsR0FBRztJQUFFLEdBQUdGLEtBQUssQ0FBQ0U7RUFBVSxDQUFDO0VBQ3hDLE1BQU1DLElBQUksR0FBRztJQUFFLEdBQUdILEtBQUssQ0FBQ0c7RUFBSyxDQUFDO0VBQzlCLE1BQU1DLGFBQWEsR0FBSUMsR0FBVyxJQUFLO0lBQ3JDLE9BQU9ILFNBQVMsQ0FBQ0csR0FBRyxDQUFDO0lBQ3JCLE1BQU1DLFFBQVEsR0FBRztNQUNmLEdBQUdILElBQUksQ0FBQ0UsR0FBRyxDQUFDO01BQ1pFLFNBQVMsRUFBRSxDQUFDO01BQ1pDLFdBQVcsRUFBRTtJQUNmLENBQUM7SUFDRCxPQUFPRixRQUFRLENBQUNHLEtBQUs7SUFDckJOLElBQUksQ0FBQ0UsR0FBRyxDQUFDLEdBQUdDLFFBQVE7RUFDdEIsQ0FBQztFQUNELElBQUlMLE1BQU0sQ0FBQ1MsSUFBSSxLQUFLWixVQUFVLEVBQUU7SUFDOUJNLGFBQWEsQ0FBQ0gsTUFBTSxDQUFDSSxHQUFHLENBQUM7RUFDM0IsQ0FBQyxNQUFNO0lBQ0xNLE1BQU0sQ0FBQ0MsSUFBSSxDQUFDVixTQUFTLENBQUMsQ0FBQ1csT0FBTyxDQUFDUixHQUFHLElBQUk7TUFDcEMsSUFBSUosTUFBTSxDQUFDYSxPQUFPLENBQUNULEdBQUcsQ0FBQyxFQUFFO1FBQ3ZCRCxhQUFhLENBQUNDLEdBQUcsQ0FBQztNQUNwQjtJQUNGLENBQUMsQ0FBQztFQUNKO0VBRUEsT0FBTztJQUNMLEdBQUdMLEtBQUs7SUFDUkUsU0FBUztJQUNUQztFQUNGLENBQUM7QUFDSCIsImlnbm9yZUxpc3QiOltdfQ==

package/lib/state/reducer/setResponseReducer.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-client/core",
-  "version": "0.14.13",
+  "version": "0.14.16",
   "description": "Async State Management without the Management. REST, GraphQL, SSE, Websockets, Fetch",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -121,7 +121,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.0",
-    "@data-client/normalizr": "^0.14.10",
+    "@data-client/normalizr": "^0.14.16",
     "flux-standard-action": "^2.1.1"
   },
   "devDependencies": {

package/src/actionTypes.ts

@@ -1,11 +1,23 @@
-export const FETCH_TYPE = 'rdc/fetch' as const;
-export const SET_TYPE = 'rdc/set' as const;
-export const SET_RESPONSE_TYPE = 'rdc/setresponse' as const;
-export const OPTIMISTIC_TYPE = 'rdc/optimistic' as const;
-export const RESET_TYPE = 'rdc/reset' as const;
-export const SUBSCRIBE_TYPE = 'rdc/subscribe' as const;
-export const UNSUBSCRIBE_TYPE = 'rdc/unsubscribe' as const;
-export const INVALIDATE_TYPE = 'rdc/invalidate' as const;
-export const INVALIDATEALL_TYPE = 'rdc/invalidateall' as const;
-export const EXPIREALL_TYPE = 'rdc/expireall' as const;
-export const GC_TYPE = 'rdc/gc' as const;
+export const FETCH = 'rdc/fetch' as const;
+export const SET = 'rdc/set' as const;
+export const SET_RESPONSE = 'rdc/setresponse' as const;
+export const OPTIMISTIC = 'rdc/optimistic' as const;
+export const RESET = 'rdc/reset' as const;
+export const SUBSCRIBE = 'rdc/subscribe' as const;
+export const UNSUBSCRIBE = 'rdc/unsubscribe' as const;
+export const INVALIDATE = 'rdc/invalidate' as const;
+export const INVALIDATEALL = 'rdc/invalidateall' as const;
+export const EXPIREALL = 'rdc/expireall' as const;
+export const GC = 'rdc/gc' as const;
+
+export const FETCH_TYPE = FETCH;
+export const SET_TYPE = SET;
+export const SET_RESPONSE_TYPE = SET_RESPONSE;
+export const OPTIMISTIC_TYPE = OPTIMISTIC;
+export const RESET_TYPE = RESET;
+export const SUBSCRIBE_TYPE = SUBSCRIBE;
+export const UNSUBSCRIBE_TYPE = UNSUBSCRIBE;
+export const INVALIDATE_TYPE = INVALIDATE;
+export const INVALIDATEALL_TYPE = INVALIDATEALL;
+export const EXPIREALL_TYPE = EXPIREALL;
+export const GC_TYPE = GC;

package/src/actions.ts

@@ -7,17 +7,17 @@ import type {
 } from '@data-client/normalizr';
 
 import type {
-  SET_TYPE,
-  RESET_TYPE,
-  FETCH_TYPE,
-  SUBSCRIBE_TYPE,
-  UNSUBSCRIBE_TYPE,
-  INVALIDATE_TYPE,
-  GC_TYPE,
-  OPTIMISTIC_TYPE,
-  INVALIDATEALL_TYPE,
-  EXPIREALL_TYPE,
-  SET_RESPONSE_TYPE,
+  SET,
+  RESET,
+  FETCH,
+  SUBSCRIBE,
+  UNSUBSCRIBE,
+  INVALIDATE,
+  GC,
+  OPTIMISTIC,
+  INVALIDATEALL,
+  EXPIREALL,
+  SET_RESPONSE,
 } from './actionTypes.js';
 import type { EndpointUpdateFunction } from './controller/types.js';
 
@@ -37,7 +37,7 @@ export interface ActionMeta {
 
 /** Action for Controller.set() */
 export interface SetAction<S extends Queryable = any> {
-  type: typeof SET_TYPE;
+  type: typeof SET;
   schema: S;
   args: readonly any[];
   meta: ActionMeta;
@@ -48,7 +48,7 @@ export interface SetAction<S extends Queryable = any> {
 export interface SetResponseActionBase<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
-  type: typeof SET_RESPONSE_TYPE;
+  type: typeof SET_RESPONSE;
   endpoint: E;
   args: readonly any[];
   key: string;
@@ -81,7 +81,7 @@ export interface FetchMeta {
 
 /** Action for Controller.fetch() */
 export interface FetchAction<E extends EndpointAndUpdate<E> = EndpointDefault> {
-  type: typeof FETCH_TYPE;
+  type: typeof FETCH;
   endpoint: E;
   args: readonly [...Parameters<E>];
   key: string;
@@ -93,7 +93,7 @@ export interface FetchAction<E extends EndpointAndUpdate<E> = EndpointDefault> {
 export interface OptimisticAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
-  type: typeof OPTIMISTIC_TYPE;
+  type: typeof OPTIMISTIC;
   endpoint: E;
   args: readonly any[];
   key: string;
@@ -106,7 +106,7 @@ export interface OptimisticAction<
 export interface SubscribeAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
-  type: typeof SUBSCRIBE_TYPE;
+  type: typeof SUBSCRIBE;
   endpoint: E;
   args: readonly any[];
   key: string;
@@ -116,7 +116,7 @@ export interface SubscribeAction<
 export interface UnsubscribeAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
-  type: typeof UNSUBSCRIBE_TYPE;
+  type: typeof UNSUBSCRIBE;
   endpoint: E;
   args: readonly any[];
   key: string;
@@ -124,30 +124,30 @@ export interface UnsubscribeAction<
 
 /* EXPIRY */
 export interface ExpireAllAction {
-  type: typeof EXPIREALL_TYPE;
+  type: typeof EXPIREALL;
   testKey: (key: string) => boolean;
 }
 
 /* INVALIDATE */
 export interface InvalidateAllAction {
-  type: typeof INVALIDATEALL_TYPE;
+  type: typeof INVALIDATEALL;
   testKey: (key: string) => boolean;
 }
 
 export interface InvalidateAction {
-  type: typeof INVALIDATE_TYPE;
+  type: typeof INVALIDATE;
   key: string;
 }
 
 /* RESET */
 export interface ResetAction {
-  type: typeof RESET_TYPE;
+  type: typeof RESET;
   date: number;
 }
 
 /* GC */
 export interface GCAction {
-  type: typeof GC_TYPE;
+  type: typeof GC;
   entities: [string, string][];
   endpoints: string[];
 }

package/src/controller/actions/createExpireAll.ts

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

package/src/controller/actions/createFetch.ts

@@ -1,6 +1,6 @@
 import type { EndpointInterface, NI } from '@data-client/normalizr';
 
-import { FETCH_TYPE } from '../../actionTypes.js';
+import { FETCH } from '../../actionTypes.js';
 import type { FetchAction, FetchMeta } from '../../types.js';
 import { EndpointUpdateFunction } from '../types.js';
 
@@ -26,7 +26,7 @@ export function createFetch<
   };
 
   return {
-    type: FETCH_TYPE,
+    type: FETCH,
     key: endpoint.key(...args),
     args,
     endpoint,

package/src/controller/actions/createInvalidate.ts

@@ -1,6 +1,6 @@
 import type { EndpointInterface } from '@data-client/normalizr';
 
-import { INVALIDATE_TYPE } from '../../actionTypes.js';
+import { INVALIDATE } from '../../actionTypes.js';
 import type { InvalidateAction } from '../../types.js';
 
 export function createInvalidate<E extends EndpointInterface>(
@@ -8,7 +8,7 @@ export function createInvalidate<E extends EndpointInterface>(
   { args }: { args: readonly [...Parameters<E>] },
 ): InvalidateAction {
   return {
-    type: INVALIDATE_TYPE,
+    type: INVALIDATE,
     key: endpoint.key(...args),
   };
 }

package/src/controller/actions/createInvalidateAll.ts

@@ -1,11 +1,11 @@
-import { INVALIDATEALL_TYPE } from '../../actionTypes.js';
+import { INVALIDATEALL } from '../../actionTypes.js';
 import type { InvalidateAllAction } from '../../types.js';
 
 export function createInvalidateAll(
   testKey: (key: string) => boolean,
 ): InvalidateAllAction {
   return {
-    type: INVALIDATEALL_TYPE,
+    type: INVALIDATEALL,
     testKey,
   };
 }

package/src/controller/actions/createOptimistic.ts

@@ -1,7 +1,7 @@
 import type { EndpointInterface } from '@data-client/normalizr';
 
 import { createMeta } from './createMeta.js';
-import { OPTIMISTIC_TYPE } from '../../actionTypes.js';
+import { OPTIMISTIC } from '../../actionTypes.js';
 import type { OptimisticAction } from '../../types.js';
 import type { EndpointUpdateFunction } from '../types.js';
 
@@ -23,7 +23,7 @@ export function createOptimistic<
   }
 
   return {
-    type: OPTIMISTIC_TYPE,
+    type: OPTIMISTIC,
     key: endpoint.key(...args),
     args,
     endpoint,

package/src/controller/actions/createReset.ts

@@ -1,9 +1,9 @@
-import { RESET_TYPE } from '../../actionTypes.js';
+import { RESET } from '../../actionTypes.js';
 import type { ResetAction } from '../../types.js';
 
 export function createReset(): ResetAction {
   return {
-    type: RESET_TYPE,
+    type: RESET,
     date: Date.now(),
   };
 }

package/src/controller/actions/createSet.ts

@@ -5,7 +5,7 @@ import type {
 } from '@data-client/normalizr';
 
 import { createMeta } from './createMeta.js';
-import { SET_TYPE } from '../../actionTypes.js';
+import { SET } from '../../actionTypes.js';
 import type { SetAction } from '../../types.js';
 import ensurePojo from '../ensurePojo.js';
 
@@ -22,7 +22,7 @@ export function createSet<S extends Queryable>(
   },
 ): SetAction<S> {
   return {
-    type: SET_TYPE,
+    type: SET,
     value,
     args: args.map(ensurePojo) as SchemaArgs<S>,
     schema,

package/src/controller/actions/createSetResponse.ts

@@ -1,7 +1,7 @@
 import type { EndpointInterface, ResolveType } from '@data-client/normalizr';
 
 import { createMeta } from './createMeta.js';
-import { SET_RESPONSE_TYPE } from '../../actionTypes.js';
+import { SET_RESPONSE } from '../../actionTypes.js';
 import type { SetResponseAction } from '../../types.js';
 import ensurePojo from '../ensurePojo.js';
 import { EndpointUpdateFunction } from '../types.js';
@@ -62,7 +62,7 @@ export function createSetResponse<
   }
 
   return {
-    type: SET_RESPONSE_TYPE,
+    type: SET_RESPONSE,
     key: endpoint.key(...args),
     response,
     args: args.map(ensurePojo),

package/src/controller/actions/createSubscription.ts

@@ -1,6 +1,6 @@
 import type { EndpointInterface } from '@data-client/normalizr';
 
-import { SUBSCRIBE_TYPE, UNSUBSCRIBE_TYPE } from '../../actionTypes.js';
+import { SUBSCRIBE, UNSUBSCRIBE } from '../../actionTypes.js';
 import type { SubscribeAction, UnsubscribeAction } from '../../types.js';
 
 export function createSubscription<E extends EndpointInterface>(
@@ -8,7 +8,7 @@ export function createSubscription<E extends EndpointInterface>(
   { args }: { args: readonly [...Parameters<E>] },
 ): SubscribeAction<E> {
   return {
-    type: SUBSCRIBE_TYPE,
+    type: SUBSCRIBE,
     endpoint,
     args,
     key: endpoint.key(...args),
@@ -20,7 +20,7 @@ export function createUnsubscription<E extends EndpointInterface>(
   { args }: { args: readonly [...Parameters<E>] },
 ): UnsubscribeAction<E> {
   return {
-    type: UNSUBSCRIBE_TYPE,
+    type: UNSUBSCRIBE,
     key: endpoint.key(...args),
     args,
     endpoint,

package/src/manager/LogoutManager.ts

@@ -1,4 +1,4 @@
-import { SET_RESPONSE_TYPE } from '../actionTypes.js';
+import { SET_RESPONSE } from '../actionTypes.js';
 import type Controller from '../controller/Controller.js';
 import { UnknownError } from '../index.js';
 import type { Manager, Middleware } from '../types.js';
@@ -16,7 +16,7 @@ export default class LogoutManager implements Manager {
   middleware: Middleware = controller => next => async action => {
     await next(action);
     if (
-      action.type === SET_RESPONSE_TYPE &&
+      action.type === SET_RESPONSE &&
       action.error &&
       this.shouldLogout(action.response)
     ) {

package/src/manager/NetworkManager.ts

@@ -1,4 +1,4 @@
-import { SET_RESPONSE_TYPE, FETCH_TYPE, RESET_TYPE } from '../actionTypes.js';
+import { SET_RESPONSE, FETCH, RESET } from '../actionTypes.js';
 import { createSetResponse } from '../controller/actions/index.js';
 import Controller from '../controller/Controller.js';
 import type {
@@ -46,7 +46,7 @@ export default class NetworkManager implements Manager {
     this.controller = controller;
     return next => action => {
       switch (action.type) {
-        case FETCH_TYPE:
+        case FETCH:
           this.handleFetch(action);
           // This is the only case that causes any state change
           // It's important to intercept other fetches as we don't want to trigger reducers during
@@ -58,7 +58,7 @@ export default class NetworkManager implements Manager {
             return next(action);
           }
           return Promise.resolve();
-        case SET_RESPONSE_TYPE:
+        case SET_RESPONSE:
           // only set after new state is computed
           return next(action).then(() => {
             if (action.key in this.fetched) {
@@ -79,7 +79,7 @@ export default class NetworkManager implements Manager {
               }
             }
           });
-        case RESET_TYPE: {
+        case RESET: {
           const rejectors = { ...this.rejectors };
 
           this.clearAll();
@@ -112,7 +112,7 @@ export default class NetworkManager implements Manager {
   /** Used by DevtoolsManager to determine whether to log an action */
   skipLogging(action: ActionTypes) {
     /* istanbul ignore next */
-    return action.type === FETCH_TYPE && action.key in this.fetched;
+    return action.type === FETCH && action.key in this.fetched;
   }
 
   allSettled() {

package/src/manager/SubscriptionManager.ts

@@ -1,4 +1,4 @@
-import { SUBSCRIBE_TYPE, UNSUBSCRIBE_TYPE } from '../actionTypes.js';
+import { SUBSCRIBE, UNSUBSCRIBE } from '../actionTypes.js';
 import Controller from '../controller/Controller.js';
 import type {
   Manager,
@@ -51,14 +51,14 @@ export default class SubscriptionManager<
     this.controller = controller;
     return next => action => {
       switch (action.type) {
-        case SUBSCRIBE_TYPE:
+        case SUBSCRIBE:
           try {
             this.handleSubscribe(action);
           } catch (e) {
             console.error(e);
           }
           return Promise.resolve();
-        case UNSUBSCRIBE_TYPE:
+        case UNSUBSCRIBE:
           this.handleUnsubscribe(action);
           return Promise.resolve();
         default:

package/src/manager/__tests__/logoutManager.ts

@@ -1,7 +1,7 @@
 import { CoolerArticleResource } from '__tests__/new';
 
 import { Controller, initialState } from '../..';
-import { FETCH_TYPE, RESET_TYPE } from '../../actionTypes';
+import { FETCH, RESET } from '../../actionTypes';
 import { createSetResponse } from '../../controller/actions';
 import LogoutManager from '../LogoutManager.js';
 
@@ -73,7 +73,7 @@ describe('LogoutManager', () => {
       await manager.middleware(API)(next)(action);
 
       expect(dispatch.mock.calls.length).toBe(1);
-      expect(dispatch.mock.calls[0][0]?.type).toBe(RESET_TYPE);
+      expect(dispatch.mock.calls[0][0]?.type).toBe(RESET);
     });
 
     it('should call custom handleLogout', async () => {
@@ -97,7 +97,7 @@ describe('LogoutManager', () => {
     });
 
     it('should let other actions pass through', async () => {
-      const action = { type: FETCH_TYPE };
+      const action = { type: FETCH };
       next.mockReset();
 
       await manager.middleware(API)(next)(action as any);

package/src/manager/__tests__/networkManager.ts

@@ -1,7 +1,7 @@
 import { Endpoint } from '@data-client/endpoint';
 import { Article, ArticleResource } from '__tests__/new';
 
-import { SET_RESPONSE_TYPE } from '../../actionTypes';
+import { SET_RESPONSE } from '../../actionTypes';
 import { createFetch } from '../../controller/actions';
 import Controller from '../../controller/Controller';
 import NetworkManager from '../../manager/NetworkManager';
@@ -159,7 +159,7 @@ describe('NetworkManager', () => {
       await new Promise(resolve => setTimeout(resolve, 0));
 
       const action: SetResponseAction = {
-        type: SET_RESPONSE_TYPE,
+        type: SET_RESPONSE,
         endpoint: fetchResolveAction.endpoint,
         response,
         args: fetchResolveAction.args,
@@ -195,7 +195,7 @@ describe('NetworkManager', () => {
       await new Promise(resolve => setTimeout(resolve, 0));
 
       const action: SetResponseAction = {
-        type: SET_RESPONSE_TYPE,
+        type: SET_RESPONSE,
         endpoint: fetchSetWithUpdatersAction.endpoint,
         response,
         args: fetchSetWithUpdatersAction.args,
@@ -231,7 +231,7 @@ describe('NetworkManager', () => {
       await new Promise(resolve => setTimeout(resolve, 0));
 
       const action: SetResponseAction = {
-        type: SET_RESPONSE_TYPE,
+        type: SET_RESPONSE,
         endpoint: fetchRpcWithUpdatersAction.endpoint,
         response,
         args: fetchRpcWithUpdatersAction.args,
@@ -267,7 +267,7 @@ describe('NetworkManager', () => {
       // mutations resolve before dispatch, so we must wait for next tick to see set
       await new Promise(resolve => setTimeout(resolve, 0));
       expect(dispatch).toHaveBeenCalledWith({
-        type: SET_RESPONSE_TYPE,
+        type: SET_RESPONSE,
         endpoint: fetchRpcWithUpdatersAndOptimisticAction.endpoint,
         response,
         args: fetchRpcWithUpdatersAndOptimisticAction.args,
@@ -338,7 +338,7 @@ describe('NetworkManager', () => {
       } catch (error) {
         expect(next).not.toHaveBeenCalled();
         expect(dispatch).toHaveBeenCalledWith({
-          type: SET_RESPONSE_TYPE,
+          type: SET_RESPONSE,
           response: error,
           key: fetchRejectAction.key,
           meta: {

package/src/manager/__tests__/subscriptionManager.ts

@@ -4,7 +4,7 @@ import { actionTypes, Controller, initialState } from '../..';
 import { SubscribeAction, UnsubscribeAction } from '../../types';
 import SubscriptionManager, { Subscription } from '../SubscriptionManager.js';
 
-const { UNSUBSCRIBE_TYPE, SUBSCRIBE_TYPE, SET_RESPONSE_TYPE } = actionTypes;
+const { UNSUBSCRIBE, SUBSCRIBE, SET_RESPONSE } = actionTypes;
 
 function onError(e: any) {
   e.preventDefault();
@@ -55,7 +55,7 @@ describe('SubscriptionManager', () => {
           () => Promise.reject(new Error('Failed'))
         : () => Promise.resolve(response);
       return {
-        type: SUBSCRIBE_TYPE,
+        type: SUBSCRIBE,
         endpoint: PollingArticleResource.get.extend({ fetch }),
         args: [{ id: response.id }],
         key: PollingArticleResource.get.key({ id: response.id }),
@@ -65,7 +65,7 @@ describe('SubscriptionManager', () => {
       response: Record<string, any>,
     ): UnsubscribeAction {
       return {
-        type: UNSUBSCRIBE_TYPE,
+        type: UNSUBSCRIBE,
         endpoint: PollingArticleResource.get,
         key: PollingArticleResource.get.key({ id: response.id }),
         args: [{ id: response.id }],
@@ -185,7 +185,7 @@ describe('SubscriptionManager', () => {
     });
 
     it('should let other actions pass through', () => {
-      const action = { type: SET_RESPONSE_TYPE };
+      const action = { type: SET_RESPONSE };
       next.mockReset();
 
       manager.middleware(API)(next)(action as any);