@data-client/core 0.9.0 → 0.9.2

package/README.md

@@ -1,7 +1,7 @@
 # [![Reactive Data Client](./data_client_logo_and_text.svg?sanitize=true)](https://dataclient.io)
 
-[![CircleCI](https://circleci.com/gh/data-client/data-client/tree/master.svg?style=shield)](https://circleci.com/gh/data-client/data-client)
-[![Coverage Status](https://img.shields.io/codecov/c/gh/data-client/data-client/master.svg?style=flat-square)](https://app.codecov.io/gh/data-client/data-client?branch=master)
+[![CircleCI](https://circleci.com/gh/reactive/data-client/tree/master.svg?style=shield)](https://circleci.com/gh/reactive/data-client)
+[![Coverage Status](https://img.shields.io/codecov/c/gh/reactive/data-client/master.svg?style=flat-square)](https://app.codecov.io/gh/reactive/data-client?branch=master)
 [![npm downloads](https://img.shields.io/npm/dt/@data-client/core.svg?style=flat-square)](https://www.npmjs.com/package/@data-client/core)
 [![bundle size](https://img.shields.io/bundlephobia/minzip/@data-client/core?style=flat-square)](https://bundlephobia.com/result?p=@data-client/core)
 [![npm version](https://img.shields.io/npm/v/@data-client/core.svg?style=flat-square)](https://www.npmjs.com/package/@data-client/core)
@@ -13,8 +13,8 @@ automatic expiry policies, data normalization. Consumes [TypeScript Standard End
 <div align="center">
 
 **[📖Read The Docs](https://dataclient.io/docs)** &nbsp;|&nbsp; [🏁Getting Started](https://dataclient.io/docs/getting-started/installation) &nbsp;|&nbsp;
-[🎮Todo Demo](https://stackblitz.com/github/data-client/data-client/tree/master/examples/todo-app?file=src%2Fpages%2FHome%2FTodoList.tsx) &nbsp;|&nbsp;
-[🎮Github Demo](https://stackblitz.com/github/data-client/data-client/tree/master/examples/github-app?file=src%2Fpages%2FIssueList.tsx)
+[🎮Todo Demo](https://stackblitz.com/github/reactive/data-client/tree/master/examples/todo-app?file=src%2Fpages%2FHome%2FTodoList.tsx) &nbsp;|&nbsp;
+[🎮Github Demo](https://stackblitz.com/github/reactive/data-client/tree/master/examples/github-app?file=src%2Fpages%2FIssueList.tsx)
 
 </div>
 

package/dist/index.js

@@ -1352,11 +1352,17 @@ class DevToolsManager {
       this.middleware = controller => {
         this.controller = controller;
         const reducer = createReducer(controller);
+        let state = controller.getState();
         return next => action => {
           const ret = next(action);
+          if (this.started) {
+            // we track state changes here since getState() will only update after a batch commit
+            state = reducer(state, action);
+          } else {
+            state = controller.getState();
+          }
           ret.then(() => {
             if (skipLogging != null && skipLogging(action)) return;
-            const state = controller.getState();
             this.handleAction(action, state.optimistic.reduce(reducer, state));
           });
           return ret;

package/dist/index.umd.min.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("@data-client/normalizr")):"function"==typeof define&&define.amd?define(["exports","@data-client/normalizr"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).dataClientCore={},e.normalizr)}(this,(function(e,t){"use strict";var s="function"==typeof requestIdleCallback?requestIdleCallback:e=>setTimeout(e,0);const i="rdc/fetch",r="rdc/set",n="rdc/optimistic",a="rdc/reset",o="rdc/subscribe",l="rdc/unsubscribe",c="rdc/invalidate",h="rdc/invalidateall",d="rdc/expireall",u="rdc/gc";var p=Object.freeze({__proto__:null,FETCH_TYPE:i,SET_TYPE:r,OPTIMISTIC_TYPE:n,RESET_TYPE:a,SUBSCRIBE_TYPE:o,UNSUBSCRIBE_TYPE:l,INVALIDATE_TYPE:c,INVALIDATEALL_TYPE:h,EXPIREALL_TYPE:d,GC_TYPE:u});function f(e,t){let s;return t.endpoint.getOptimisticResponse&&t.endpoint.sideEffect?(s=function(e,{args:t,fetchedAt:s}){var i;const r=null!=(i=e.dataExpiryLength)?i:6e4,a=Date.now(),o={args:t,fetchedAt:s,date:a,expiresAt:a+r,key:e.key(...t)};return{type:n,endpoint:e,meta:o}}(t.endpoint,{args:t.meta.args,fetchedAt:t.meta.createdAt}),Object.assign({},e,{optimistic:[...e.optimistic,s]})):e}function y(e,t,s){return"AbortError"===s.name?Object.assign({},e,{optimistic:m(e,t)}):Object.assign({},e,{meta:Object.assign({},e.meta,{[t.meta.key]:{date:t.meta.date,error:s,expiresAt:t.meta.expiresAt,errorPolicy:null==t.endpoint.errorPolicy?void 0:t.endpoint.errorPolicy(s)}}),optimistic:m(e,t)})}function m(e,t){return e.optimistic.filter((e=>e.meta.key!==t.meta.key||(e.type===n?e.meta.fetchedAt!==t.meta.fetchedAt:e.meta.date>t.meta.date)))}function g(e){return function(s,o){switch(s||(s=v),o.type){case u:return o.entities.forEach((([e,t])=>{var i,r;null==(i=s.entities[e])||delete i[t],null==(r=s.entityMeta[e])||delete r[t]})),o.results.forEach((e=>{delete s.results[e],delete s.meta[e]})),s;case i:return f(s,o);case n:case r:return function(e,s,i){if(s.error)return y(e,s,s.payload);try{var r;let o;if(s.type===n){if(!s.endpoint.getOptimisticResponse)return e;try{o=s.endpoint.getOptimisticResponse.call(s.endpoint,i.snapshot(e,s.meta.fetchedAt),...s.meta.args)}catch(t){var a;if("AbortOptimistic"===(null==(a=t.constructor)?void 0:a.name))return e;throw t}}else o=s.payload;const{result:l,entities:c,indexes:h,entityMeta:d}=t.normalize(o,s.endpoint.schema,s.meta.args,e.entities,e.indexes,e.entityMeta,s.meta),u=Object.assign({},e.results,{[s.meta.key]:l});try{if(s.endpoint.update){const e=s.endpoint.update(l,...s.meta.args);Object.keys(e).forEach((t=>{u[t]=e[t](u[t])}))}}catch(e){console.error(`The following error occured during Endpoint.update() for ${s.meta.key}`),console.error(e)}return{entities:c,indexes:h,results:u,entityMeta:d,meta:Object.assign({},e.meta,{[s.meta.key]:{date:s.meta.date,expiresAt:s.meta.expiresAt,prevExpiresAt:null==(r=e.meta[s.meta.key])?void 0:r.expiresAt}}),optimistic:m(e,s),lastReset:e.lastReset}}catch(t){return"object"==typeof t&&(t.message=`Error processing ${s.meta.key}\n\nFull Schema: ${JSON.stringify(s.endpoint.schema,void 0,2)}\n\nError:\n${t.message}`,"payload"in s&&(t.payload=s.payload),t.status=400),y(e,s,t)}}(s,o,e);case h:case c:return function(e,t){const s=Object.assign({},e.results),i=Object.assign({},e.meta),r=e=>{delete s[e];const t=Object.assign({},i[e],{expiresAt:0,invalidated:!0});delete t.error,i[e]=t};return t.type===c?r(t.meta.key):Object.keys(s).forEach((e=>{t.testKey(e)&&r(e)})),Object.assign({},e,{results:s,meta:i})}(s,o);case d:return function(e,t){const s=Object.assign({},e.meta);return Object.keys(s).forEach((e=>{t.testKey(e)&&(s[e]=Object.assign({},s[e],{expiresAt:1}))})),Object.assign({},e,{meta:s})}(s,o);case a:return Object.assign({},v,{lastReset:o.date});default:return s}}}const v={entities:{},indexes:{},results:{},meta:{},entityMeta:{},optimistic:[],lastReset:0};var b=Object.freeze({__proto__:null,inferResults:t.inferResults,INVALID:t.INVALID,RIC:s,initialState:v});function E(e,{args:t}){const s=e.key(...t);let r=0,n=0;const a=new Promise(((e,t)=>{[r,n]=[e,t]})),o={args:t,key:s,throttle:!e.sideEffect,resolve:r,reject:n,promise:a,createdAt:Date.now(),nm:!1};return{type:i,payload:()=>e(...t),meta:o,endpoint:e}}var L="undefined"!=typeof FormData?e=>e instanceof FormData?Object.fromEntries(e.entries()):e:e=>e;function O(e,{args:t,fetchedAt:s,response:i,error:n=!1}){var a,o;const l=n?null!=(a=e.errorExpiryLength)?a:1e3:null!=(o=e.dataExpiryLength)?o:6e4,c=Date.now(),h={args:t.map(L),fetchedAt:null!=s?s:c,date:c,expiresAt:c+l,key:e.key(...t)},d={type:r,payload:i,endpoint:e,meta:h};return n&&(d.error=!0),d}function I(e,t){return e.meta[t]}const w=e=>{throw new Error("Dispatching while constructing your middleware is not allowed. Other middleware would not be applied to this dispatch.")},S=()=>v;class A{constructor({dispatch:e=w,getState:s=S,globalCache:i={entities:{},results:{}}}={}){this.fetch=(e,...s)=>{const i=E(e,{args:s});return this.dispatch(i),e.schema?i.meta.promise.then((i=>t.denormalize(i,e.schema,{},s))):i.meta.promise},this.fetchIfStale=(e,...s)=>{const{data:i,expiresAt:r,expiryStatus:n}=this.getResponse(e,...s,this.getState());return n!==t.ExpiryStatus.Invalid&&Date.now()<=r?i:this.fetch(e,...s)},this.invalidate=(e,...t)=>null!==t[0]?this.dispatch(function(e,{args:t}){return{type:c,meta:{key:e.key(...t)}}}(e,{args:t})):Promise.resolve(),this.invalidateAll=e=>this.dispatch({type:h,testKey:t=>e.testKey(t)}),this.expireAll=e=>this.dispatch({type:d,testKey:t=>e.testKey(t)}),this.resetEntireStore=()=>this.dispatch({type:a,date:Date.now()}),this.setResponse=(e,...t)=>{const s=t[t.length-1],i=O(e,{args:t.slice(0,t.length-1),response:s});return this.dispatch(i)},this.setError=(e,...t)=>{const s=t[t.length-1],i=O(e,{args:t.slice(0,t.length-1),response:s,error:!0});return this.dispatch(i)},this.resolve=(e,t)=>this.dispatch(O(e,t)),this.subscribe=(e,...t)=>null!==t[0]?this.dispatch(function(e,{args:t}){return{type:o,endpoint:e,meta:{args:t,key:e.key(...t)}}}(e,{args:t})):Promise.resolve(),this.unsubscribe=(e,...t)=>null!==t[0]?this.dispatch(function(e,{args:t}){return{type:l,endpoint:e,meta:{args:t,key:e.key(...t)}}}(e,{args:t})):Promise.resolve(),this.snapshot=(e,t)=>new x(this,e,t),this.getError=(e,...t)=>{if(null===t[0])return;const s=t[t.length-1],i=t.slice(0,t.length-1),r=e.key(...i),n=I(s,r);return void 0===s.results[r]||"soft"!==(null==n?void 0:n.errorPolicy)?null==n?void 0:n.error:void 0},this.getResponse=(e,...s)=>{const i=s[s.length-1],r=s.slice(0,s.length-1).map(L),n=1!==r.length||null!==r[0],a=n?e.key(...r):"",o=n?i.results[a]:void 0,l=e.schema,c=I(i,a);let h,d=null==c?void 0:c.expiresAt,u=!1;if(void 0===o&&void 0!==e.schema?(h=t.inferResults(e.schema,r,i.indexes,i.entities),u=!t.validateInference(h),!d&&u&&(d=1)):h=o,!n)return{data:h,expiryStatus:t.ExpiryStatus.Valid,expiresAt:1/0};if(!e.schema||!k(e.schema))return{data:h,expiryStatus:null!=c&&c.invalidated?t.ExpiryStatus.Invalid:o&&!e.invalidIfStale?t.ExpiryStatus.Valid:t.ExpiryStatus.InvalidIfStale,expiresAt:d||0};this.globalCache.results[a]||(this.globalCache.results[a]=new t.WeakEntityMap);const{data:p,paths:f}=t.denormalizeCached(h,l,i.entities,this.globalCache.entities,this.globalCache.results[a],r),y="symbol"==typeof p;d||(d=function(e,t){let s=1/0;for(const{pk:n,key:a}of e){var i,r;const e=null==(i=t[a])||null==(r=i[n])?void 0:r.expiresAt;e<s&&(s=e)}return s}(f,i.entityMeta));return{data:p,expiryStatus:null!=c&&c.invalidated||y&&(null==c||!c.error)?t.ExpiryStatus.Invalid:y||e.invalidIfStale||u?t.ExpiryStatus.InvalidIfStale:t.ExpiryStatus.Valid,expiresAt:d}},this.dispatch=e,this.getState=s,this.globalCache=i}}function k(e){if(t.isEntity(e))return!0;if(Array.isArray(e))return 0!==e.length&&k(e[0]);if(e&&("object"==typeof e||"function"==typeof e)){const t="schema"in e?e.schema:e;return"function"==typeof t?k(t):Object.values(t).some((e=>k(e)))}return!1}class x{constructor(e,t,s=0){this.state=void 0,this.controller=void 0,this.fetchedAt=void 0,this.getResponse=(e,...t)=>this.controller.getResponse(e,...t,this.state),this.getError=(e,...t)=>this.controller.getError(e,...t,this.state),this.state=t,this.controller=e,this.fetchedAt=s}}class j extends Error{constructor(){super("Aborted due to RESET"),this.name="ResetError"}}class T{isOnline(){return void 0===navigator.onLine||navigator.onLine}addOnlineListener(e){addEventListener("online",e)}removeOnlineListener(e){removeEventListener("online",e)}addOfflineListener(e){addEventListener("offline",e)}removeOfflineListener(e){removeEventListener("offline",e)}}class _{isOnline(){return!0}addOnlineListener(){}removeOnlineListener(){}addOfflineListener(){}removeOfflineListener(){}}let R;R="undefined"!=typeof navigator&&"function"==typeof addEventListener?T:_;var q=R;let P={};Object.hasOwn=Object.hasOwn||function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},Object.defineProperty(e,"ExpiryStatus",{enumerable:!0,get:function(){return t.ExpiryStatus}}),e.Controller=A,e.DefaultConnectionListener=q,e.DevToolsManager=class{constructor(e,t){this.started=!1,this.actions=[],this.devTools="undefined"!=typeof window&&window.__REDUX_DEVTOOLS_EXTENSION__&&window.__REDUX_DEVTOOLS_EXTENSION__.connect(Object.assign({},P,{config:e})),this.devTools?this.middleware=e=>{this.controller=e;const s=g(e);return i=>r=>{const n=i(r);return n.then((()=>{if(null!=t&&t(r))return;const i=e.getState();this.handleAction(r,i.optimistic.reduce(s,i))})),n}}:this.middleware=()=>e=>t=>e(t)}handleAction(e,t){this.started?this.devTools.send(e,t,void 0,"RDC"):this.actions.push([e,t])}init(e){this.devTools&&this.devTools.init(e)}cleanup(){}getMiddleware(){return this.middleware}},e.LogoutManager=class{constructor({handleLogout:e,shouldLogout:t}={}){e&&(this.handleLogout=e),t&&(this.shouldLogout=t),this.middleware=e=>t=>async s=>{await t(s),s.type===r&&s.error&&this.shouldLogout(s.payload)&&this.handleLogout(e)}}cleanup(){}getMiddleware(){return this.middleware}shouldLogout(e){return 401===e.status}handleLogout(e){e.resetEntireStore()}},e.NetworkManager=class{constructor(e=6e4,t=1e3){this.fetched=Object.create(null),this.resolvers={},this.rejectors={},this.fetchedAt={},this.controller=new A,this.dataExpiryLength=e,this.errorExpiryLength=t,this.middleware=e=>(this.controller=e,t=>s=>{switch(s.type){case i:return this.handleFetch(s),void 0!==s.endpoint.getOptimisticResponse&&s.endpoint.sideEffect?t(s):Promise.resolve();case r:return t(s).then((()=>{if(s.meta.key in this.fetched){var t;const i=null==(t=e.getState().meta[s.meta.key])?void 0:t.error;i?this.handleSet(O(s.endpoint,{args:s.meta.args,response:i,fetchedAt:s.meta.fetchedAt,error:!0})):this.handleSet(s)}}));case a:{const e=Object.assign({},this.rejectors);return this.clearAll(),t(s).then((()=>{for(const t in e)e[t](new j)}))}default:return t(s)}})}skipLogging(e){return e.type===i&&e.meta.key in this.fetched}init(){delete this.cleanupDate}cleanup(){this.cleanupDate=Date.now()}allSettled(){const e=Object.values(this.fetched);if(e.length)return Promise.allSettled(e)}clearAll(){for(const e in this.rejectors)this.clear(e)}clear(e){this.fetched[e].catch((()=>{})),delete this.resolvers[e],delete this.rejectors[e],delete this.fetched[e],delete this.fetchedAt[e]}getLastReset(){return this.cleanupDate?this.cleanupDate:this.controller.getState().lastReset}handleFetch(e){const t=e.payload,{key:s,throttle:i,resolve:r,reject:n,createdAt:a}=e.meta,o=()=>{let s=t();return i||(s=(e=>e.then((e=>(r(e),e))).catch((e=>{throw n(e),e})))(s)),s=s.then((t=>{let s=this.getLastReset();return a>=s&&this.controller.resolve(e.endpoint,{args:e.meta.args,response:t,fetchedAt:a}),t})).catch((t=>{const s=this.getLastReset();throw a>=s&&this.controller.resolve(e.endpoint,{args:e.meta.args,response:t,fetchedAt:a,error:!0}),t})),s};return i?this.throttle(s,o,a).then((e=>r(e))).catch((e=>n(e))):o().catch((()=>{}))}handleSet(e){if(e.meta.key in this.fetched){let t;t=e.error?this.rejectors[e.meta.key]:this.resolvers[e.meta.key],t(e.payload),this.clear(e.meta.key)}}getMiddleware(){return this.middleware}throttle(e,t,i){const r=this.getLastReset();return e in this.fetched&&this.fetchedAt[e]>r||(this.fetched[e]=new Promise(((t,s)=>{this.resolvers[e]=t,this.rejectors[e]=s})),this.fetchedAt[e]=i,s((()=>{t().catch((()=>null))}),{timeout:500})),this.fetched[e]}},e.PollingSubscription=class{constructor(e,t,s){if(this.frequencyHistogram=new Map,this.offlineListener=()=>{this.cleanup(),this.connectionListener.addOnlineListener(this.onlineListener)},this.onlineListener=()=>{this.connectionListener.removeOnlineListener(this.onlineListener);const e=Date.now();this.startId=setTimeout((()=>{this.startId&&(delete this.startId,this.update(),this.run())}),Math.max(0,this.lastFetchTime()-e+this.frequency)),this.connectionListener.addOfflineListener(this.offlineListener)},void 0===e.endpoint.pollFrequency)throw new Error("frequency needed for polling subscription");this.endpoint=e.endpoint,this.frequency=e.endpoint.pollFrequency,this.args=e.meta.args,this.key=e.meta.key,this.frequencyHistogram.set(this.frequency,1),this.controller=t,this.connectionListener=s||new q,this.connectionListener.isOnline()?this.onlineListener():this.offlineListener()}add(e){void 0!==e&&(this.frequencyHistogram.has(e)?this.frequencyHistogram.set(e,this.frequencyHistogram.get(e)+1):(this.frequencyHistogram.set(e,1),e<this.frequency&&(this.frequency=e,this.run())))}remove(e){if(void 0===e)return!1;if(this.frequencyHistogram.has(e)&&(this.frequencyHistogram.set(e,this.frequencyHistogram.get(e)-1),this.frequencyHistogram.get(e)<1)){if(this.frequencyHistogram.delete(e),0===this.frequencyHistogram.size)return this.cleanup(),!0;e<=this.frequency&&(this.frequency=Math.min(...this.frequencyHistogram.keys()),this.run())}return!1}cleanup(){this.intervalId&&(clearInterval(this.intervalId),delete this.intervalId),this.lastIntervalId&&(clearInterval(this.lastIntervalId),delete this.lastIntervalId),this.startId&&(clearTimeout(this.startId),delete this.startId),this.connectionListener.removeOnlineListener(this.onlineListener),this.connectionListener.removeOfflineListener(this.offlineListener)}update(){const e=this.endpoint,t=function(...t){return e.call(this,...t)};Object.assign(t,this.endpoint),t.dataExpiryLength=this.frequency/2,t.errorExpiryLength=this.frequency/10,t.errorPolicy=()=>"soft",t.key=()=>this.key,this.controller.fetch(t,...this.args).catch((()=>null))}run(){this.startId||(this.intervalId&&(this.lastIntervalId=this.intervalId),this.intervalId=setInterval((()=>{this.lastIntervalId&&(clearInterval(this.lastIntervalId),delete this.lastIntervalId),this.intervalId&&this.update()}),this.frequency))}lastFetchTime(){var e,t;return null!=(e=null==(t=this.controller.getState().meta[this.key])?void 0:t.date)?e:0}},e.ResetError=j,e.SubscriptionManager=class{constructor(e){this.subscriptions={},this.controller=new A,this.Subscription=e,this.middleware=e=>(this.controller=e,e=>t=>{switch(t.type){case o:try{this.handleSubscribe(t)}catch(e){console.error(e)}return Promise.resolve();case l:return this.handleUnsubscribe(t),Promise.resolve();default:return e(t)}})}cleanup(){for(const e in this.subscriptions)this.subscriptions[e].cleanup()}handleSubscribe(e){const t=e.meta.key;if(t in this.subscriptions){const s=e.endpoint.pollFrequency;this.subscriptions[t].add(s)}else this.subscriptions[t]=new this.Subscription(e,this.controller)}handleUnsubscribe(e){const t=e.meta.key;if(t in this.subscriptions){const s=e.endpoint.pollFrequency;this.subscriptions[t].remove(s)&&delete this.subscriptions[t]}}getMiddleware(){return this.middleware}},e.__INTERNAL__=b,e.actionTypes=p,e.applyManager=function(e,t){return e.map((e=>{const s=e.getMiddleware();return({dispatch:e,getState:i})=>(t.dispatch=e,t.getState=i,s(t))}))},e.createFetch=E,e.createReducer=g,e.createSet=O,e.initialState=v,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("@data-client/normalizr")):"function"==typeof define&&define.amd?define(["exports","@data-client/normalizr"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).dataClientCore={},e.normalizr)}(this,(function(e,t){"use strict";var s="function"==typeof requestIdleCallback?requestIdleCallback:e=>setTimeout(e,0);const i="rdc/fetch",r="rdc/set",n="rdc/optimistic",a="rdc/reset",o="rdc/subscribe",l="rdc/unsubscribe",c="rdc/invalidate",h="rdc/invalidateall",d="rdc/expireall",u="rdc/gc";var p=Object.freeze({__proto__:null,FETCH_TYPE:i,SET_TYPE:r,OPTIMISTIC_TYPE:n,RESET_TYPE:a,SUBSCRIBE_TYPE:o,UNSUBSCRIBE_TYPE:l,INVALIDATE_TYPE:c,INVALIDATEALL_TYPE:h,EXPIREALL_TYPE:d,GC_TYPE:u});function f(e,t){let s;return t.endpoint.getOptimisticResponse&&t.endpoint.sideEffect?(s=function(e,{args:t,fetchedAt:s}){var i;const r=null!=(i=e.dataExpiryLength)?i:6e4,a=Date.now(),o={args:t,fetchedAt:s,date:a,expiresAt:a+r,key:e.key(...t)};return{type:n,endpoint:e,meta:o}}(t.endpoint,{args:t.meta.args,fetchedAt:t.meta.createdAt}),Object.assign({},e,{optimistic:[...e.optimistic,s]})):e}function y(e,t,s){return"AbortError"===s.name?Object.assign({},e,{optimistic:m(e,t)}):Object.assign({},e,{meta:Object.assign({},e.meta,{[t.meta.key]:{date:t.meta.date,error:s,expiresAt:t.meta.expiresAt,errorPolicy:null==t.endpoint.errorPolicy?void 0:t.endpoint.errorPolicy(s)}}),optimistic:m(e,t)})}function m(e,t){return e.optimistic.filter((e=>e.meta.key!==t.meta.key||(e.type===n?e.meta.fetchedAt!==t.meta.fetchedAt:e.meta.date>t.meta.date)))}function g(e){return function(s,o){switch(s||(s=v),o.type){case u:return o.entities.forEach((([e,t])=>{var i,r;null==(i=s.entities[e])||delete i[t],null==(r=s.entityMeta[e])||delete r[t]})),o.results.forEach((e=>{delete s.results[e],delete s.meta[e]})),s;case i:return f(s,o);case n:case r:return function(e,s,i){if(s.error)return y(e,s,s.payload);try{var r;let o;if(s.type===n){if(!s.endpoint.getOptimisticResponse)return e;try{o=s.endpoint.getOptimisticResponse.call(s.endpoint,i.snapshot(e,s.meta.fetchedAt),...s.meta.args)}catch(t){var a;if("AbortOptimistic"===(null==(a=t.constructor)?void 0:a.name))return e;throw t}}else o=s.payload;const{result:l,entities:c,indexes:h,entityMeta:d}=t.normalize(o,s.endpoint.schema,s.meta.args,e.entities,e.indexes,e.entityMeta,s.meta),u=Object.assign({},e.results,{[s.meta.key]:l});try{if(s.endpoint.update){const e=s.endpoint.update(l,...s.meta.args);Object.keys(e).forEach((t=>{u[t]=e[t](u[t])}))}}catch(e){console.error(`The following error occured during Endpoint.update() for ${s.meta.key}`),console.error(e)}return{entities:c,indexes:h,results:u,entityMeta:d,meta:Object.assign({},e.meta,{[s.meta.key]:{date:s.meta.date,expiresAt:s.meta.expiresAt,prevExpiresAt:null==(r=e.meta[s.meta.key])?void 0:r.expiresAt}}),optimistic:m(e,s),lastReset:e.lastReset}}catch(t){return"object"==typeof t&&(t.message=`Error processing ${s.meta.key}\n\nFull Schema: ${JSON.stringify(s.endpoint.schema,void 0,2)}\n\nError:\n${t.message}`,"payload"in s&&(t.payload=s.payload),t.status=400),y(e,s,t)}}(s,o,e);case h:case c:return function(e,t){const s=Object.assign({},e.results),i=Object.assign({},e.meta),r=e=>{delete s[e];const t=Object.assign({},i[e],{expiresAt:0,invalidated:!0});delete t.error,i[e]=t};return t.type===c?r(t.meta.key):Object.keys(s).forEach((e=>{t.testKey(e)&&r(e)})),Object.assign({},e,{results:s,meta:i})}(s,o);case d:return function(e,t){const s=Object.assign({},e.meta);return Object.keys(s).forEach((e=>{t.testKey(e)&&(s[e]=Object.assign({},s[e],{expiresAt:1}))})),Object.assign({},e,{meta:s})}(s,o);case a:return Object.assign({},v,{lastReset:o.date});default:return s}}}const v={entities:{},indexes:{},results:{},meta:{},entityMeta:{},optimistic:[],lastReset:0};var b=Object.freeze({__proto__:null,inferResults:t.inferResults,INVALID:t.INVALID,RIC:s,initialState:v});function E(e,{args:t}){const s=e.key(...t);let r=0,n=0;const a=new Promise(((e,t)=>{[r,n]=[e,t]})),o={args:t,key:s,throttle:!e.sideEffect,resolve:r,reject:n,promise:a,createdAt:Date.now(),nm:!1};return{type:i,payload:()=>e(...t),meta:o,endpoint:e}}var L="undefined"!=typeof FormData?e=>e instanceof FormData?Object.fromEntries(e.entries()):e:e=>e;function O(e,{args:t,fetchedAt:s,response:i,error:n=!1}){var a,o;const l=n?null!=(a=e.errorExpiryLength)?a:1e3:null!=(o=e.dataExpiryLength)?o:6e4,c=Date.now(),h={args:t.map(L),fetchedAt:null!=s?s:c,date:c,expiresAt:c+l,key:e.key(...t)},d={type:r,payload:i,endpoint:e,meta:h};return n&&(d.error=!0),d}function I(e,t){return e.meta[t]}const S=e=>{throw new Error("Dispatching while constructing your middleware is not allowed. Other middleware would not be applied to this dispatch.")},w=()=>v;class A{constructor({dispatch:e=S,getState:s=w,globalCache:i={entities:{},results:{}}}={}){this.fetch=(e,...s)=>{const i=E(e,{args:s});return this.dispatch(i),e.schema?i.meta.promise.then((i=>t.denormalize(i,e.schema,{},s))):i.meta.promise},this.fetchIfStale=(e,...s)=>{const{data:i,expiresAt:r,expiryStatus:n}=this.getResponse(e,...s,this.getState());return n!==t.ExpiryStatus.Invalid&&Date.now()<=r?i:this.fetch(e,...s)},this.invalidate=(e,...t)=>null!==t[0]?this.dispatch(function(e,{args:t}){return{type:c,meta:{key:e.key(...t)}}}(e,{args:t})):Promise.resolve(),this.invalidateAll=e=>this.dispatch({type:h,testKey:t=>e.testKey(t)}),this.expireAll=e=>this.dispatch({type:d,testKey:t=>e.testKey(t)}),this.resetEntireStore=()=>this.dispatch({type:a,date:Date.now()}),this.setResponse=(e,...t)=>{const s=t[t.length-1],i=O(e,{args:t.slice(0,t.length-1),response:s});return this.dispatch(i)},this.setError=(e,...t)=>{const s=t[t.length-1],i=O(e,{args:t.slice(0,t.length-1),response:s,error:!0});return this.dispatch(i)},this.resolve=(e,t)=>this.dispatch(O(e,t)),this.subscribe=(e,...t)=>null!==t[0]?this.dispatch(function(e,{args:t}){return{type:o,endpoint:e,meta:{args:t,key:e.key(...t)}}}(e,{args:t})):Promise.resolve(),this.unsubscribe=(e,...t)=>null!==t[0]?this.dispatch(function(e,{args:t}){return{type:l,endpoint:e,meta:{args:t,key:e.key(...t)}}}(e,{args:t})):Promise.resolve(),this.snapshot=(e,t)=>new x(this,e,t),this.getError=(e,...t)=>{if(null===t[0])return;const s=t[t.length-1],i=t.slice(0,t.length-1),r=e.key(...i),n=I(s,r);return void 0===s.results[r]||"soft"!==(null==n?void 0:n.errorPolicy)?null==n?void 0:n.error:void 0},this.getResponse=(e,...s)=>{const i=s[s.length-1],r=s.slice(0,s.length-1).map(L),n=1!==r.length||null!==r[0],a=n?e.key(...r):"",o=n?i.results[a]:void 0,l=e.schema,c=I(i,a);let h,d=null==c?void 0:c.expiresAt,u=!1;if(void 0===o&&void 0!==e.schema?(h=t.inferResults(e.schema,r,i.indexes,i.entities),u=!t.validateInference(h),!d&&u&&(d=1)):h=o,!n)return{data:h,expiryStatus:t.ExpiryStatus.Valid,expiresAt:1/0};if(!e.schema||!k(e.schema))return{data:h,expiryStatus:null!=c&&c.invalidated?t.ExpiryStatus.Invalid:o&&!e.invalidIfStale?t.ExpiryStatus.Valid:t.ExpiryStatus.InvalidIfStale,expiresAt:d||0};this.globalCache.results[a]||(this.globalCache.results[a]=new t.WeakEntityMap);const{data:p,paths:f}=t.denormalizeCached(h,l,i.entities,this.globalCache.entities,this.globalCache.results[a],r),y="symbol"==typeof p;d||(d=function(e,t){let s=1/0;for(const{pk:n,key:a}of e){var i,r;const e=null==(i=t[a])||null==(r=i[n])?void 0:r.expiresAt;e<s&&(s=e)}return s}(f,i.entityMeta));return{data:p,expiryStatus:null!=c&&c.invalidated||y&&(null==c||!c.error)?t.ExpiryStatus.Invalid:y||e.invalidIfStale||u?t.ExpiryStatus.InvalidIfStale:t.ExpiryStatus.Valid,expiresAt:d}},this.dispatch=e,this.getState=s,this.globalCache=i}}function k(e){if(t.isEntity(e))return!0;if(Array.isArray(e))return 0!==e.length&&k(e[0]);if(e&&("object"==typeof e||"function"==typeof e)){const t="schema"in e?e.schema:e;return"function"==typeof t?k(t):Object.values(t).some((e=>k(e)))}return!1}class x{constructor(e,t,s=0){this.state=void 0,this.controller=void 0,this.fetchedAt=void 0,this.getResponse=(e,...t)=>this.controller.getResponse(e,...t,this.state),this.getError=(e,...t)=>this.controller.getError(e,...t,this.state),this.state=t,this.controller=e,this.fetchedAt=s}}class j extends Error{constructor(){super("Aborted due to RESET"),this.name="ResetError"}}class T{isOnline(){return void 0===navigator.onLine||navigator.onLine}addOnlineListener(e){addEventListener("online",e)}removeOnlineListener(e){removeEventListener("online",e)}addOfflineListener(e){addEventListener("offline",e)}removeOfflineListener(e){removeEventListener("offline",e)}}class _{isOnline(){return!0}addOnlineListener(){}removeOnlineListener(){}addOfflineListener(){}removeOfflineListener(){}}let R;R="undefined"!=typeof navigator&&"function"==typeof addEventListener?T:_;var q=R;let P={};Object.hasOwn=Object.hasOwn||function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},Object.defineProperty(e,"ExpiryStatus",{enumerable:!0,get:function(){return t.ExpiryStatus}}),e.Controller=A,e.DefaultConnectionListener=q,e.DevToolsManager=class{constructor(e,t){this.started=!1,this.actions=[],this.devTools="undefined"!=typeof window&&window.__REDUX_DEVTOOLS_EXTENSION__&&window.__REDUX_DEVTOOLS_EXTENSION__.connect(Object.assign({},P,{config:e})),this.devTools?this.middleware=e=>{this.controller=e;const s=g(e);let i=e.getState();return r=>n=>{const a=r(n);return i=this.started?s(i,n):e.getState(),a.then((()=>{null!=t&&t(n)||this.handleAction(n,i.optimistic.reduce(s,i))})),a}}:this.middleware=()=>e=>t=>e(t)}handleAction(e,t){this.started?this.devTools.send(e,t,void 0,"RDC"):this.actions.push([e,t])}init(e){this.devTools&&this.devTools.init(e)}cleanup(){}getMiddleware(){return this.middleware}},e.LogoutManager=class{constructor({handleLogout:e,shouldLogout:t}={}){e&&(this.handleLogout=e),t&&(this.shouldLogout=t),this.middleware=e=>t=>async s=>{await t(s),s.type===r&&s.error&&this.shouldLogout(s.payload)&&this.handleLogout(e)}}cleanup(){}getMiddleware(){return this.middleware}shouldLogout(e){return 401===e.status}handleLogout(e){e.resetEntireStore()}},e.NetworkManager=class{constructor(e=6e4,t=1e3){this.fetched=Object.create(null),this.resolvers={},this.rejectors={},this.fetchedAt={},this.controller=new A,this.dataExpiryLength=e,this.errorExpiryLength=t,this.middleware=e=>(this.controller=e,t=>s=>{switch(s.type){case i:return this.handleFetch(s),void 0!==s.endpoint.getOptimisticResponse&&s.endpoint.sideEffect?t(s):Promise.resolve();case r:return t(s).then((()=>{if(s.meta.key in this.fetched){var t;const i=null==(t=e.getState().meta[s.meta.key])?void 0:t.error;i?this.handleSet(O(s.endpoint,{args:s.meta.args,response:i,fetchedAt:s.meta.fetchedAt,error:!0})):this.handleSet(s)}}));case a:{const e=Object.assign({},this.rejectors);return this.clearAll(),t(s).then((()=>{for(const t in e)e[t](new j)}))}default:return t(s)}})}skipLogging(e){return e.type===i&&e.meta.key in this.fetched}init(){delete this.cleanupDate}cleanup(){this.cleanupDate=Date.now()}allSettled(){const e=Object.values(this.fetched);if(e.length)return Promise.allSettled(e)}clearAll(){for(const e in this.rejectors)this.clear(e)}clear(e){this.fetched[e].catch((()=>{})),delete this.resolvers[e],delete this.rejectors[e],delete this.fetched[e],delete this.fetchedAt[e]}getLastReset(){return this.cleanupDate?this.cleanupDate:this.controller.getState().lastReset}handleFetch(e){const t=e.payload,{key:s,throttle:i,resolve:r,reject:n,createdAt:a}=e.meta,o=()=>{let s=t();return i||(s=(e=>e.then((e=>(r(e),e))).catch((e=>{throw n(e),e})))(s)),s=s.then((t=>{let s=this.getLastReset();return a>=s&&this.controller.resolve(e.endpoint,{args:e.meta.args,response:t,fetchedAt:a}),t})).catch((t=>{const s=this.getLastReset();throw a>=s&&this.controller.resolve(e.endpoint,{args:e.meta.args,response:t,fetchedAt:a,error:!0}),t})),s};return i?this.throttle(s,o,a).then((e=>r(e))).catch((e=>n(e))):o().catch((()=>{}))}handleSet(e){if(e.meta.key in this.fetched){let t;t=e.error?this.rejectors[e.meta.key]:this.resolvers[e.meta.key],t(e.payload),this.clear(e.meta.key)}}getMiddleware(){return this.middleware}throttle(e,t,i){const r=this.getLastReset();return e in this.fetched&&this.fetchedAt[e]>r||(this.fetched[e]=new Promise(((t,s)=>{this.resolvers[e]=t,this.rejectors[e]=s})),this.fetchedAt[e]=i,s((()=>{t().catch((()=>null))}),{timeout:500})),this.fetched[e]}},e.PollingSubscription=class{constructor(e,t,s){if(this.frequencyHistogram=new Map,this.offlineListener=()=>{this.cleanup(),this.connectionListener.addOnlineListener(this.onlineListener)},this.onlineListener=()=>{this.connectionListener.removeOnlineListener(this.onlineListener);const e=Date.now();this.startId=setTimeout((()=>{this.startId&&(delete this.startId,this.update(),this.run())}),Math.max(0,this.lastFetchTime()-e+this.frequency)),this.connectionListener.addOfflineListener(this.offlineListener)},void 0===e.endpoint.pollFrequency)throw new Error("frequency needed for polling subscription");this.endpoint=e.endpoint,this.frequency=e.endpoint.pollFrequency,this.args=e.meta.args,this.key=e.meta.key,this.frequencyHistogram.set(this.frequency,1),this.controller=t,this.connectionListener=s||new q,this.connectionListener.isOnline()?this.onlineListener():this.offlineListener()}add(e){void 0!==e&&(this.frequencyHistogram.has(e)?this.frequencyHistogram.set(e,this.frequencyHistogram.get(e)+1):(this.frequencyHistogram.set(e,1),e<this.frequency&&(this.frequency=e,this.run())))}remove(e){if(void 0===e)return!1;if(this.frequencyHistogram.has(e)&&(this.frequencyHistogram.set(e,this.frequencyHistogram.get(e)-1),this.frequencyHistogram.get(e)<1)){if(this.frequencyHistogram.delete(e),0===this.frequencyHistogram.size)return this.cleanup(),!0;e<=this.frequency&&(this.frequency=Math.min(...this.frequencyHistogram.keys()),this.run())}return!1}cleanup(){this.intervalId&&(clearInterval(this.intervalId),delete this.intervalId),this.lastIntervalId&&(clearInterval(this.lastIntervalId),delete this.lastIntervalId),this.startId&&(clearTimeout(this.startId),delete this.startId),this.connectionListener.removeOnlineListener(this.onlineListener),this.connectionListener.removeOfflineListener(this.offlineListener)}update(){const e=this.endpoint,t=function(...t){return e.call(this,...t)};Object.assign(t,this.endpoint),t.dataExpiryLength=this.frequency/2,t.errorExpiryLength=this.frequency/10,t.errorPolicy=()=>"soft",t.key=()=>this.key,this.controller.fetch(t,...this.args).catch((()=>null))}run(){this.startId||(this.intervalId&&(this.lastIntervalId=this.intervalId),this.intervalId=setInterval((()=>{this.lastIntervalId&&(clearInterval(this.lastIntervalId),delete this.lastIntervalId),this.intervalId&&this.update()}),this.frequency))}lastFetchTime(){var e,t;return null!=(e=null==(t=this.controller.getState().meta[this.key])?void 0:t.date)?e:0}},e.ResetError=j,e.SubscriptionManager=class{constructor(e){this.subscriptions={},this.controller=new A,this.Subscription=e,this.middleware=e=>(this.controller=e,e=>t=>{switch(t.type){case o:try{this.handleSubscribe(t)}catch(e){console.error(e)}return Promise.resolve();case l:return this.handleUnsubscribe(t),Promise.resolve();default:return e(t)}})}cleanup(){for(const e in this.subscriptions)this.subscriptions[e].cleanup()}handleSubscribe(e){const t=e.meta.key;if(t in this.subscriptions){const s=e.endpoint.pollFrequency;this.subscriptions[t].add(s)}else this.subscriptions[t]=new this.Subscription(e,this.controller)}handleUnsubscribe(e){const t=e.meta.key;if(t in this.subscriptions){const s=e.endpoint.pollFrequency;this.subscriptions[t].remove(s)&&delete this.subscriptions[t]}}getMiddleware(){return this.middleware}},e.__INTERNAL__=b,e.actionTypes=p,e.applyManager=function(e,t){return e.map((e=>{const s=e.getMiddleware();return({dispatch:e,getState:i})=>(t.dispatch=e,t.getState=i,s(t))}))},e.createFetch=E,e.createReducer=g,e.createSet=O,e.initialState=v,Object.defineProperty(e,"__esModule",{value:!0})}));

package/legacy/manager/DevtoolsManager.js

@@ -89,11 +89,17 @@ export default class DevToolsManager {
       this.middleware = controller => {
         this.controller = controller;
         const reducer = createReducer(controller);
+        let state = controller.getState();
         return next => action => {
           const ret = next(action);
+          if (this.started) {
+            // we track state changes here since getState() will only update after a batch commit
+            state = reducer(state, action);
+          } else {
+            state = controller.getState();
+          }
           ret.then(() => {
             if (skipLogging != null && skipLogging(action)) return;
-            const state = controller.getState();
             this.handleAction(action, state.optimistic.reduce(reducer, state));
           });
           return ret;
@@ -128,4 +134,4 @@ export default class DevToolsManager {
     return this.middleware;
   }
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["createReducer","DEFAULT_CONFIG","process","env","NODE_ENV","_globalThis$document","extraEndpointKeys","serializeEndpoint","endpoint","_toJSON","_endpoint$schema","serial","name","schema","toJSON","sideEffect","forEach","key","HASINTL","Intl","globalThis","document","title","autoPause","actionSanitizer","action","Object","assign","serialize","options","undefined","replacer","value","isFinite","endsWith","DateTimeFormat","hour","minute","second","fractionalSecondDigits","format","DevToolsManager","constructor","config","skipLogging","started","actions","devTools","window","__REDUX_DEVTOOLS_EXTENSION__","connect","subscribe","msg","type","length","state","handleAction","payload","controller","resetEntireStore","middleware","reducer","next","ret","then","getState","optimistic","reduce","send","push","init","cleanup","getMiddleware"],"sources":["../../src/manager/DevtoolsManager.ts"],"sourcesContent":["/* eslint-disable no-inner-declarations */\nimport type { DevToolsConfig } from './devtoolsTypes.js';\nimport type { Middleware } from './LogoutManager.js';\nimport { Controller, EndpointInterface } from '../index.js';\nimport createReducer from '../state/reducer/createReducer.js';\nimport type { Manager, State, ActionTypes } from '../types.js';\n\nexport type { DevToolsConfig };\n\nlet DEFAULT_CONFIG = {};\n\nif (process.env.NODE_ENV !== 'production') {\n  const extraEndpointKeys = [\n    'dataExpiryLength',\n    'errorExpiryLength',\n    'errorPolicy',\n    'invalidIfStale',\n    'pollFrequency',\n    'getOptimisticResponse',\n    'update',\n  ];\n\n  function serializeEndpoint(endpoint: EndpointInterface) {\n    const serial: any = {\n      name: endpoint.name,\n      schema: (endpoint.schema as any)?.toJSON?.() ?? endpoint.schema,\n      sideEffect: endpoint.sideEffect,\n    };\n    extraEndpointKeys.forEach(key => {\n      if (key in endpoint)\n        serial[key] = endpoint[key as keyof EndpointInterface];\n    });\n    return serial;\n  }\n\n  const HASINTL = typeof Intl !== 'undefined';\n  DEFAULT_CONFIG = {\n    name: `Data Client: ${globalThis.document?.title}`,\n    autoPause: true,\n    actionSanitizer: (action: ActionTypes) => {\n      if (!('endpoint' in action)) return action;\n      return {\n        ...action,\n        endpoint: serializeEndpoint(action.endpoint),\n      };\n    },\n    serialize: {\n      options: undefined,\n      /* istanbul ignore next */\n      replacer: HASINTL\n        ? (key: string | number | symbol, value: unknown) => {\n            if (\n              typeof value === 'number' &&\n              typeof key === 'string' &&\n              isFinite(value) &&\n              (key === 'date' || key.endsWith('At'))\n            ) {\n              return Intl.DateTimeFormat('en-US', {\n                hour: 'numeric',\n                minute: 'numeric',\n                second: 'numeric',\n                fractionalSecondDigits: 3,\n              }).format(value);\n            }\n            return value;\n          }\n        : undefined,\n    },\n  };\n}\n\n/** Integrates with https://github.com/reduxjs/redux-devtools\n *\n * Options: https://github.com/reduxjs/redux-devtools/blob/main/extension/docs/API/Arguments.md\n *\n * @see https://dataclient.io/docs/api/DevToolsManager\n */\nexport default class DevToolsManager implements Manager {\n  protected declare middleware: Middleware;\n  protected declare devTools: undefined | any;\n  protected started = false;\n  protected actions: [ActionTypes, State<unknown>][] = [];\n  protected declare controller: Controller;\n\n  constructor(\n    config?: DevToolsConfig,\n    skipLogging?: (action: ActionTypes) => boolean,\n  ) {\n    /* istanbul ignore next */\n    this.devTools =\n      typeof window !== 'undefined' &&\n      (window as any).__REDUX_DEVTOOLS_EXTENSION__ &&\n      (window as any).__REDUX_DEVTOOLS_EXTENSION__.connect({\n        ...DEFAULT_CONFIG,\n        config,\n      });\n    if (process.env.NODE_ENV !== 'production' && this.devTools) {\n      this.devTools.subscribe((msg: any) => {\n        switch (msg.type) {\n          case 'START':\n            this.started = true;\n\n            if (this.actions.length) {\n              this.actions.forEach(([action, state]) => {\n                this.handleAction(action, state);\n              });\n              this.actions = [];\n            }\n            break;\n          case 'STOP':\n            this.started = false;\n            break;\n          case 'DISPATCH':\n            if (msg.payload.type === 'RESET') {\n              this.controller.resetEntireStore();\n            }\n            break;\n        }\n      });\n    }\n\n    /* istanbul ignore if */\n    /* istanbul ignore next */\n    if (this.devTools) {\n      this.middleware = controller => {\n        this.controller = controller;\n        const reducer = createReducer(controller as any);\n        return next => action => {\n          const ret = next(action);\n          ret.then(() => {\n            if (skipLogging?.(action)) return;\n            const state = controller.getState();\n            this.handleAction(action, state.optimistic.reduce(reducer, state));\n          });\n          return ret;\n        };\n      };\n    } else {\n      this.middleware = () => next => action => next(action);\n    }\n  }\n\n  handleAction(action: any, state: any) {\n    if (this.started) {\n      this.devTools.send(action, state, undefined, 'RDC');\n    } else {\n      // queue actions\n      this.actions.push([action, state]);\n    }\n  }\n\n  /** Called when initial state is ready */\n  init(state: State<any>) {\n    /* istanbul ignore if */\n    if (this.devTools) this.devTools.init(state);\n  }\n\n  /** Ensures all subscriptions are cleaned up. */\n  cleanup() {}\n\n  /** Attaches Manager to store\n   *\n   */\n  getMiddleware() {\n    return this.middleware;\n  }\n}\n"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["createReducer","DEFAULT_CONFIG","process","env","NODE_ENV","_globalThis$document","extraEndpointKeys","serializeEndpoint","endpoint","_toJSON","_endpoint$schema","serial","name","schema","toJSON","sideEffect","forEach","key","HASINTL","Intl","globalThis","document","title","autoPause","actionSanitizer","action","Object","assign","serialize","options","undefined","replacer","value","isFinite","endsWith","DateTimeFormat","hour","minute","second","fractionalSecondDigits","format","DevToolsManager","constructor","config","skipLogging","started","actions","devTools","window","__REDUX_DEVTOOLS_EXTENSION__","connect","subscribe","msg","type","length","state","handleAction","payload","controller","resetEntireStore","middleware","reducer","getState","next","ret","then","optimistic","reduce","send","push","init","cleanup","getMiddleware"],"sources":["../../src/manager/DevtoolsManager.ts"],"sourcesContent":["/* eslint-disable no-inner-declarations */\nimport type { DevToolsConfig } from './devtoolsTypes.js';\nimport type { Middleware } from './LogoutManager.js';\nimport { Controller, EndpointInterface } from '../index.js';\nimport createReducer from '../state/reducer/createReducer.js';\nimport type { Manager, State, ActionTypes } from '../types.js';\n\nexport type { DevToolsConfig };\n\nlet DEFAULT_CONFIG = {};\n\nif (process.env.NODE_ENV !== 'production') {\n  const extraEndpointKeys = [\n    'dataExpiryLength',\n    'errorExpiryLength',\n    'errorPolicy',\n    'invalidIfStale',\n    'pollFrequency',\n    'getOptimisticResponse',\n    'update',\n  ];\n\n  function serializeEndpoint(endpoint: EndpointInterface) {\n    const serial: any = {\n      name: endpoint.name,\n      schema: (endpoint.schema as any)?.toJSON?.() ?? endpoint.schema,\n      sideEffect: endpoint.sideEffect,\n    };\n    extraEndpointKeys.forEach(key => {\n      if (key in endpoint)\n        serial[key] = endpoint[key as keyof EndpointInterface];\n    });\n    return serial;\n  }\n\n  const HASINTL = typeof Intl !== 'undefined';\n  DEFAULT_CONFIG = {\n    name: `Data Client: ${globalThis.document?.title}`,\n    autoPause: true,\n    actionSanitizer: (action: ActionTypes) => {\n      if (!('endpoint' in action)) return action;\n      return {\n        ...action,\n        endpoint: serializeEndpoint(action.endpoint),\n      };\n    },\n    serialize: {\n      options: undefined,\n      /* istanbul ignore next */\n      replacer: HASINTL\n        ? (key: string | number | symbol, value: unknown) => {\n            if (\n              typeof value === 'number' &&\n              typeof key === 'string' &&\n              isFinite(value) &&\n              (key === 'date' || key.endsWith('At'))\n            ) {\n              return Intl.DateTimeFormat('en-US', {\n                hour: 'numeric',\n                minute: 'numeric',\n                second: 'numeric',\n                fractionalSecondDigits: 3,\n              }).format(value);\n            }\n            return value;\n          }\n        : undefined,\n    },\n  };\n}\n\n/** Integrates with https://github.com/reduxjs/redux-devtools\n *\n * Options: https://github.com/reduxjs/redux-devtools/blob/main/extension/docs/API/Arguments.md\n *\n * @see https://dataclient.io/docs/api/DevToolsManager\n */\nexport default class DevToolsManager implements Manager {\n  protected declare middleware: Middleware;\n  protected declare devTools: undefined | any;\n  protected started = false;\n  protected actions: [ActionTypes, State<unknown>][] = [];\n  protected declare controller: Controller;\n\n  constructor(\n    config?: DevToolsConfig,\n    skipLogging?: (action: ActionTypes) => boolean,\n  ) {\n    /* istanbul ignore next */\n    this.devTools =\n      typeof window !== 'undefined' &&\n      (window as any).__REDUX_DEVTOOLS_EXTENSION__ &&\n      (window as any).__REDUX_DEVTOOLS_EXTENSION__.connect({\n        ...DEFAULT_CONFIG,\n        config,\n      });\n    if (process.env.NODE_ENV !== 'production' && this.devTools) {\n      this.devTools.subscribe((msg: any) => {\n        switch (msg.type) {\n          case 'START':\n            this.started = true;\n\n            if (this.actions.length) {\n              this.actions.forEach(([action, state]) => {\n                this.handleAction(action, state);\n              });\n              this.actions = [];\n            }\n            break;\n          case 'STOP':\n            this.started = false;\n            break;\n          case 'DISPATCH':\n            if (msg.payload.type === 'RESET') {\n              this.controller.resetEntireStore();\n            }\n            break;\n        }\n      });\n    }\n\n    /* istanbul ignore if */\n    /* istanbul ignore next */\n    if (this.devTools) {\n      this.middleware = controller => {\n        this.controller = controller;\n        const reducer = createReducer(controller as any);\n        let state = controller.getState();\n        return next => action => {\n          const ret = next(action);\n          if (this.started) {\n            // we track state changes here since getState() will only update after a batch commit\n            state = reducer(state, action);\n          } else {\n            state = controller.getState();\n          }\n          ret.then(() => {\n            if (skipLogging?.(action)) return;\n            this.handleAction(action, state.optimistic.reduce(reducer, state));\n          });\n          return ret;\n        };\n      };\n    } else {\n      this.middleware = () => next => action => next(action);\n    }\n  }\n\n  handleAction(action: any, state: any) {\n    if (this.started) {\n      this.devTools.send(action, state, undefined, 'RDC');\n    } else {\n      // queue actions\n      this.actions.push([action, state]);\n    }\n  }\n\n  /** Called when initial state is ready */\n  init(state: State<any>) {\n    /* istanbul ignore if */\n    if (this.devTools) this.devTools.init(state);\n  }\n\n  /** Ensures all subscriptions are cleaned up. */\n  cleanup() {}\n\n  /** Attaches Manager to store\n   *\n   */\n  getMiddleware() {\n    return this.middleware;\n  }\n}\n"],"mappings":"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"}

package/lib/manager/DevtoolsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevtoolsManager.d.ts","sourceRoot":"","sources":["../../src/manager/DevtoolsManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/D,YAAY,EAAE,cAAc,EAAE,CAAC;AAgE/B;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,YAAW,OAAO;IACrD,UAAkB,UAAU,EAAE,UAAU,CAAC;IACzC,UAAkB,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5C,SAAS,CAAC,OAAO,UAAS;IAC1B,SAAS,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAM;IACxD,UAAkB,UAAU,EAAE,UAAU,CAAC;gBAGvC,MAAM,CAAC,EAAE,cAAc,EACvB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO;IAwDhD,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG;IASpC,yCAAyC;IACzC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;IAKtB,gDAAgD;IAChD,OAAO;IAEP;;OAEG;IACH,aAAa;CAGd"}
+{"version":3,"file":"DevtoolsManager.d.ts","sourceRoot":"","sources":["../../src/manager/DevtoolsManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/D,YAAY,EAAE,cAAc,EAAE,CAAC;AAgE/B;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,YAAW,OAAO;IACrD,UAAkB,UAAU,EAAE,UAAU,CAAC;IACzC,UAAkB,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5C,SAAS,CAAC,OAAO,UAAS;IAC1B,SAAS,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAM;IACxD,UAAkB,UAAU,EAAE,UAAU,CAAC;gBAGvC,MAAM,CAAC,EAAE,cAAc,EACvB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO;IA8DhD,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG;IASpC,yCAAyC;IACzC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;IAKtB,gDAAgD;IAChD,OAAO;IAEP;;OAEG;IACH,aAAa;CAGd"}

package/lib/manager/DevtoolsManager.js

@@ -91,11 +91,17 @@ export default class DevToolsManager {
       this.middleware = controller => {
         this.controller = controller;
         const reducer = createReducer(controller);
+        let state = controller.getState();
         return next => action => {
           const ret = next(action);
+          if (this.started) {
+            // we track state changes here since getState() will only update after a batch commit
+            state = reducer(state, action);
+          } else {
+            state = controller.getState();
+          }
           ret.then(() => {
             if (skipLogging != null && skipLogging(action)) return;
-            const state = controller.getState();
             this.handleAction(action, state.optimistic.reduce(reducer, state));
           });
           return ret;
@@ -130,4 +136,4 @@ export default class DevToolsManager {
     return this.middleware;
   }
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["createReducer","DEFAULT_CONFIG","process","env","NODE_ENV","_globalThis$document","extraEndpointKeys","serializeEndpoint","endpoint","_toJSON","_endpoint$schema","serial","name","schema","toJSON","sideEffect","forEach","key","HASINTL","Intl","globalThis","document","title","autoPause","actionSanitizer","action","serialize","options","undefined","replacer","value","isFinite","endsWith","DateTimeFormat","hour","minute","second","fractionalSecondDigits","format","DevToolsManager","constructor","config","skipLogging","started","actions","devTools","window","__REDUX_DEVTOOLS_EXTENSION__","connect","subscribe","msg","type","length","state","handleAction","payload","controller","resetEntireStore","middleware","reducer","next","ret","then","getState","optimistic","reduce","send","push","init","cleanup","getMiddleware"],"sources":["../../src/manager/DevtoolsManager.ts"],"sourcesContent":["/* eslint-disable no-inner-declarations */\nimport type { DevToolsConfig } from './devtoolsTypes.js';\nimport type { Middleware } from './LogoutManager.js';\nimport { Controller, EndpointInterface } from '../index.js';\nimport createReducer from '../state/reducer/createReducer.js';\nimport type { Manager, State, ActionTypes } from '../types.js';\n\nexport type { DevToolsConfig };\n\nlet DEFAULT_CONFIG = {};\n\nif (process.env.NODE_ENV !== 'production') {\n  const extraEndpointKeys = [\n    'dataExpiryLength',\n    'errorExpiryLength',\n    'errorPolicy',\n    'invalidIfStale',\n    'pollFrequency',\n    'getOptimisticResponse',\n    'update',\n  ];\n\n  function serializeEndpoint(endpoint: EndpointInterface) {\n    const serial: any = {\n      name: endpoint.name,\n      schema: (endpoint.schema as any)?.toJSON?.() ?? endpoint.schema,\n      sideEffect: endpoint.sideEffect,\n    };\n    extraEndpointKeys.forEach(key => {\n      if (key in endpoint)\n        serial[key] = endpoint[key as keyof EndpointInterface];\n    });\n    return serial;\n  }\n\n  const HASINTL = typeof Intl !== 'undefined';\n  DEFAULT_CONFIG = {\n    name: `Data Client: ${globalThis.document?.title}`,\n    autoPause: true,\n    actionSanitizer: (action: ActionTypes) => {\n      if (!('endpoint' in action)) return action;\n      return {\n        ...action,\n        endpoint: serializeEndpoint(action.endpoint),\n      };\n    },\n    serialize: {\n      options: undefined,\n      /* istanbul ignore next */\n      replacer: HASINTL\n        ? (key: string | number | symbol, value: unknown) => {\n            if (\n              typeof value === 'number' &&\n              typeof key === 'string' &&\n              isFinite(value) &&\n              (key === 'date' || key.endsWith('At'))\n            ) {\n              return Intl.DateTimeFormat('en-US', {\n                hour: 'numeric',\n                minute: 'numeric',\n                second: 'numeric',\n                fractionalSecondDigits: 3,\n              }).format(value);\n            }\n            return value;\n          }\n        : undefined,\n    },\n  };\n}\n\n/** Integrates with https://github.com/reduxjs/redux-devtools\n *\n * Options: https://github.com/reduxjs/redux-devtools/blob/main/extension/docs/API/Arguments.md\n *\n * @see https://dataclient.io/docs/api/DevToolsManager\n */\nexport default class DevToolsManager implements Manager {\n  protected declare middleware: Middleware;\n  protected declare devTools: undefined | any;\n  protected started = false;\n  protected actions: [ActionTypes, State<unknown>][] = [];\n  protected declare controller: Controller;\n\n  constructor(\n    config?: DevToolsConfig,\n    skipLogging?: (action: ActionTypes) => boolean,\n  ) {\n    /* istanbul ignore next */\n    this.devTools =\n      typeof window !== 'undefined' &&\n      (window as any).__REDUX_DEVTOOLS_EXTENSION__ &&\n      (window as any).__REDUX_DEVTOOLS_EXTENSION__.connect({\n        ...DEFAULT_CONFIG,\n        config,\n      });\n    if (process.env.NODE_ENV !== 'production' && this.devTools) {\n      this.devTools.subscribe((msg: any) => {\n        switch (msg.type) {\n          case 'START':\n            this.started = true;\n\n            if (this.actions.length) {\n              this.actions.forEach(([action, state]) => {\n                this.handleAction(action, state);\n              });\n              this.actions = [];\n            }\n            break;\n          case 'STOP':\n            this.started = false;\n            break;\n          case 'DISPATCH':\n            if (msg.payload.type === 'RESET') {\n              this.controller.resetEntireStore();\n            }\n            break;\n        }\n      });\n    }\n\n    /* istanbul ignore if */\n    /* istanbul ignore next */\n    if (this.devTools) {\n      this.middleware = controller => {\n        this.controller = controller;\n        const reducer = createReducer(controller as any);\n        return next => action => {\n          const ret = next(action);\n          ret.then(() => {\n            if (skipLogging?.(action)) return;\n            const state = controller.getState();\n            this.handleAction(action, state.optimistic.reduce(reducer, state));\n          });\n          return ret;\n        };\n      };\n    } else {\n      this.middleware = () => next => action => next(action);\n    }\n  }\n\n  handleAction(action: any, state: any) {\n    if (this.started) {\n      this.devTools.send(action, state, undefined, 'RDC');\n    } else {\n      // queue actions\n      this.actions.push([action, state]);\n    }\n  }\n\n  /** Called when initial state is ready */\n  init(state: State<any>) {\n    /* istanbul ignore if */\n    if (this.devTools) this.devTools.init(state);\n  }\n\n  /** Ensures all subscriptions are cleaned up. */\n  cleanup() {}\n\n  /** Attaches Manager to store\n   *\n   */\n  getMiddleware() {\n    return this.middleware;\n  }\n}\n"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["createReducer","DEFAULT_CONFIG","process","env","NODE_ENV","_globalThis$document","extraEndpointKeys","serializeEndpoint","endpoint","_toJSON","_endpoint$schema","serial","name","schema","toJSON","sideEffect","forEach","key","HASINTL","Intl","globalThis","document","title","autoPause","actionSanitizer","action","serialize","options","undefined","replacer","value","isFinite","endsWith","DateTimeFormat","hour","minute","second","fractionalSecondDigits","format","DevToolsManager","constructor","config","skipLogging","started","actions","devTools","window","__REDUX_DEVTOOLS_EXTENSION__","connect","subscribe","msg","type","length","state","handleAction","payload","controller","resetEntireStore","middleware","reducer","getState","next","ret","then","optimistic","reduce","send","push","init","cleanup","getMiddleware"],"sources":["../../src/manager/DevtoolsManager.ts"],"sourcesContent":["/* eslint-disable no-inner-declarations */\nimport type { DevToolsConfig } from './devtoolsTypes.js';\nimport type { Middleware } from './LogoutManager.js';\nimport { Controller, EndpointInterface } from '../index.js';\nimport createReducer from '../state/reducer/createReducer.js';\nimport type { Manager, State, ActionTypes } from '../types.js';\n\nexport type { DevToolsConfig };\n\nlet DEFAULT_CONFIG = {};\n\nif (process.env.NODE_ENV !== 'production') {\n  const extraEndpointKeys = [\n    'dataExpiryLength',\n    'errorExpiryLength',\n    'errorPolicy',\n    'invalidIfStale',\n    'pollFrequency',\n    'getOptimisticResponse',\n    'update',\n  ];\n\n  function serializeEndpoint(endpoint: EndpointInterface) {\n    const serial: any = {\n      name: endpoint.name,\n      schema: (endpoint.schema as any)?.toJSON?.() ?? endpoint.schema,\n      sideEffect: endpoint.sideEffect,\n    };\n    extraEndpointKeys.forEach(key => {\n      if (key in endpoint)\n        serial[key] = endpoint[key as keyof EndpointInterface];\n    });\n    return serial;\n  }\n\n  const HASINTL = typeof Intl !== 'undefined';\n  DEFAULT_CONFIG = {\n    name: `Data Client: ${globalThis.document?.title}`,\n    autoPause: true,\n    actionSanitizer: (action: ActionTypes) => {\n      if (!('endpoint' in action)) return action;\n      return {\n        ...action,\n        endpoint: serializeEndpoint(action.endpoint),\n      };\n    },\n    serialize: {\n      options: undefined,\n      /* istanbul ignore next */\n      replacer: HASINTL\n        ? (key: string | number | symbol, value: unknown) => {\n            if (\n              typeof value === 'number' &&\n              typeof key === 'string' &&\n              isFinite(value) &&\n              (key === 'date' || key.endsWith('At'))\n            ) {\n              return Intl.DateTimeFormat('en-US', {\n                hour: 'numeric',\n                minute: 'numeric',\n                second: 'numeric',\n                fractionalSecondDigits: 3,\n              }).format(value);\n            }\n            return value;\n          }\n        : undefined,\n    },\n  };\n}\n\n/** Integrates with https://github.com/reduxjs/redux-devtools\n *\n * Options: https://github.com/reduxjs/redux-devtools/blob/main/extension/docs/API/Arguments.md\n *\n * @see https://dataclient.io/docs/api/DevToolsManager\n */\nexport default class DevToolsManager implements Manager {\n  protected declare middleware: Middleware;\n  protected declare devTools: undefined | any;\n  protected started = false;\n  protected actions: [ActionTypes, State<unknown>][] = [];\n  protected declare controller: Controller;\n\n  constructor(\n    config?: DevToolsConfig,\n    skipLogging?: (action: ActionTypes) => boolean,\n  ) {\n    /* istanbul ignore next */\n    this.devTools =\n      typeof window !== 'undefined' &&\n      (window as any).__REDUX_DEVTOOLS_EXTENSION__ &&\n      (window as any).__REDUX_DEVTOOLS_EXTENSION__.connect({\n        ...DEFAULT_CONFIG,\n        config,\n      });\n    if (process.env.NODE_ENV !== 'production' && this.devTools) {\n      this.devTools.subscribe((msg: any) => {\n        switch (msg.type) {\n          case 'START':\n            this.started = true;\n\n            if (this.actions.length) {\n              this.actions.forEach(([action, state]) => {\n                this.handleAction(action, state);\n              });\n              this.actions = [];\n            }\n            break;\n          case 'STOP':\n            this.started = false;\n            break;\n          case 'DISPATCH':\n            if (msg.payload.type === 'RESET') {\n              this.controller.resetEntireStore();\n            }\n            break;\n        }\n      });\n    }\n\n    /* istanbul ignore if */\n    /* istanbul ignore next */\n    if (this.devTools) {\n      this.middleware = controller => {\n        this.controller = controller;\n        const reducer = createReducer(controller as any);\n        let state = controller.getState();\n        return next => action => {\n          const ret = next(action);\n          if (this.started) {\n            // we track state changes here since getState() will only update after a batch commit\n            state = reducer(state, action);\n          } else {\n            state = controller.getState();\n          }\n          ret.then(() => {\n            if (skipLogging?.(action)) return;\n            this.handleAction(action, state.optimistic.reduce(reducer, state));\n          });\n          return ret;\n        };\n      };\n    } else {\n      this.middleware = () => next => action => next(action);\n    }\n  }\n\n  handleAction(action: any, state: any) {\n    if (this.started) {\n      this.devTools.send(action, state, undefined, 'RDC');\n    } else {\n      // queue actions\n      this.actions.push([action, state]);\n    }\n  }\n\n  /** Called when initial state is ready */\n  init(state: State<any>) {\n    /* istanbul ignore if */\n    if (this.devTools) this.devTools.init(state);\n  }\n\n  /** Ensures all subscriptions are cleaned up. */\n  cleanup() {}\n\n  /** Attaches Manager to store\n   *\n   */\n  getMiddleware() {\n    return this.middleware;\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-client/core",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "High performance reactive framework for async data.",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -112,15 +112,15 @@
   "homepage": "https://dataclient.io",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com:data-client/data-client.git",
+    "url": "git+ssh://git@github.com:reactive/data-client.git",
     "directory": "packages/core"
   },
   "bugs": {
-    "url": "https://github.com/data-client/data-client/issues"
+    "url": "https://github.com/reactive/data-client/issues"
   },
   "dependencies": {
     "@babel/runtime": "^7.17.0",
-    "@data-client/normalizr": "^0.8.0",
+    "@data-client/normalizr": "^0.9.2",
     "flux-standard-action": "^2.1.1"
   },
   "devDependencies": {

package/src/manager/DevtoolsManager.ts

@@ -125,11 +125,17 @@ export default class DevToolsManager implements Manager {
       this.middleware = controller => {
         this.controller = controller;
         const reducer = createReducer(controller as any);
+        let state = controller.getState();
         return next => action => {
           const ret = next(action);
+          if (this.started) {
+            // we track state changes here since getState() will only update after a batch commit
+            state = reducer(state, action);
+          } else {
+            state = controller.getState();
+          }
           ret.then(() => {
             if (skipLogging?.(action)) return;
-            const state = controller.getState();
             this.handleAction(action, state.optimistic.reduce(reducer, state));
           });
           return ret;