@flowlist/js-core 1.7.6 → 2.2.0

package/dist/js-core.umd.js

@@ -1 +1 @@
-var __defProp=Object.defineProperty,__defProps=Object.defineProperties,__getOwnPropDescs=Object.getOwnPropertyDescriptors,__getOwnPropSymbols=Object.getOwnPropertySymbols,__hasOwnProp=Object.prototype.hasOwnProperty,__propIsEnum=Object.prototype.propertyIsEnumerable,__defNormalProp=(e,t,r)=>t in e?__defProp(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,__spreadValues=(e,t)=>{for(var r in t||(t={}))__hasOwnProp.call(t,r)&&__defNormalProp(e,r,t[r]);if(__getOwnPropSymbols)for(var r of __getOwnPropSymbols(t))__propIsEnum.call(t,r)&&__defNormalProp(e,r,t[r]);return e},__spreadProps=(e,t)=>__defProps(e,__getOwnPropDescs(t));!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).JsCore={})}(this,(function(e){"use strict";const t=["jump","sinceId","page","seenIds","auto"];var r={SETTER_TYPE:{RESET:0,MERGE:1},FETCH_TYPE_ARRAY:t,FETCH_TYPE:{PAGINATION:t[0],SINCE_FIRST_OR_END_ID:t[1],SCROLL_LOAD_MORE:t[2],HAS_LOADED_IDS:t[3],AUTO:t[4]},CHANGE_TYPE:{SEARCH_FIELD:"search",RESET_FIELD:"reset",RESULT_UPDATE_KV:"update",RESULT_ADD_AFTER:"push",RESULT_ADD_BEFORE:"unshift",RESULT_REMOVE_BY_ID:"delete",RESULT_INSERT_TO_BEFORE:"insert-before",RESULT_INSERT_TO_AFTER:"insert-after",RESULT_LIST_MERGE:"patch",RESULT_ITEM_MERGE:"merge"},FIELD_DATA:{RESULT_KEY:"result",EXTRA_KEY:"extra"},DEFAULT_UNIQUE_KEY_NAME:"id"};const _=(e={})=>__spreadValues(__spreadValues({},{result:[],noMore:!1,nothing:!1,loading:!1,error:null,extra:null,fetched:!1,page:0,total:0}),e);let E=0;const a=({func:e,type:t,query:r={}})=>{let _=`${e="string"==typeof e?e:"custom-func-"+E++}-${t=t||"auto"}`;return Object.keys(r).filter((e=>!~["undefined","object","function"].indexOf(typeof r[e])&&!~["page","is_up","since_id","seen_ids","__refresh__","__reload__"].indexOf(e))).sort().forEach((e=>{_+=`-${e}-${r[e]}`})),_},n=(e,t)=>{if(!t)return e||"";let r=e||"";return(T(t)?t:t.split(".")).forEach((e=>{r=r[e]})),r||""},o=(e,t,r)=>{if(/\./.test(t)){const _=t.split("."),E=_.pop();let a=e;_.forEach((e=>{a=a[e]})),a[E]=r}else e[t]=r},s=(e,t,r)=>{if(T(e)){const _=l(t,e,r);if(_<0)return;return e[_]}return e[t]},l=(e,t,r)=>{let _=-1;for(let E=0;E<t.length;E++)if(n(t[E],r.toString()).toString()===(e||"").toString()){_=E;break}return _},c=(e,t,r)=>{T(t)?t.forEach((t=>{const _=n(t,r).toString();e.forEach(((E,a)=>{n(E,r).toString()===_&&(e[a]=__spreadValues(__spreadValues({},E),t))}))})):Object.keys(t).forEach((_=>{const E=(_||"").toString();e.forEach(((a,o)=>{n(a,r).toString()===E&&(e[o]=__spreadValues(__spreadValues({},a),t[_]))}))}))},T=e=>"[object Array]"===Object.prototype.toString.call(e),i=(e,t,_,E,a)=>{E!==r.FETCH_TYPE.PAGINATION?T(_)?e[t]=a?_.concat(e[t]||[]):(e[t]||[]).concat(_):t===r.FIELD_DATA.RESULT_KEY?(T(e[t])&&(e[t]={}),Object.keys(_).forEach((r=>{e[t][r]=e[t][r]?a?_[r].concat(e[t][r]):e[t][r].concat(_[r]):_[r]}))):e[t]=_:e[t]=_},u=e=>{let t=0;return T(e)?t=e.length:Object.keys(e).forEach((r=>{t+=e[r].length})),t},p=({field:e,uniqueKey:t,query:_,type:E})=>{const a={};if(_=_||{},e.fetched){const o=t||r.DEFAULT_UNIQUE_KEY_NAME;E===r.FETCH_TYPE.AUTO?(a.seen_ids=e.result.map((e=>n(e,o))).join(","),a.since_id=n(e.result[_.is_up?0:e.result.length-1],o),a.is_up=_.is_up?1:0,a.page=_.page||e.page+1):E===r.FETCH_TYPE.HAS_LOADED_IDS?a.seen_ids=e.result.map((e=>n(e,o))).join(","):E===r.FETCH_TYPE.SINCE_FIRST_OR_END_ID?(a.since_id=n(e.result[_.is_up?0:e.result.length-1],o),a.is_up=_.is_up?1:0):E===r.FETCH_TYPE.PAGINATION?a.page=_.page:E===r.FETCH_TYPE.SCROLL_LOAD_MORE&&(a.page=e.page+1)}else E===r.FETCH_TYPE.AUTO?(a.seen_ids="",a.since_id=_.sinceId||(_.is_up?999999999:0),a.is_up=_.is_up?1:0,a.page=_.page||e.page||1):E===r.FETCH_TYPE.HAS_LOADED_IDS?a.seen_ids="":E===r.FETCH_TYPE.SINCE_FIRST_OR_END_ID?(a.since_id=_.sinceId||(_.is_up?999999999:0),a.is_up=_.is_up?1:0):E===r.FETCH_TYPE.PAGINATION?a.page=_.page||e.page:E===r.FETCH_TYPE.SCROLL_LOAD_MORE&&(a.page=1);return __spreadValues(__spreadValues({},_),a)};var f=Object.freeze({__proto__:null,[Symbol.toStringTag]:"Module",generateDefaultField:_,generateFieldName:a,getObjectDeepValue:n,updateObjectDeepValue:o,searchValueByKey:s,computeMatchedItemIndex:l,combineArrayData:c,isArray:T,setReactivityField:i,computeResultLength:u,generateRequestParams:p});const d=({getter:e,setter:t,cache:_,data:E,fieldName:a,type:n,fromLocal:o,cacheTimeout:s,page:l,insertBefore:c})=>new Promise(((T,p)=>{if(o)return void t({key:a,type:r.SETTER_TYPE.RESET,value:E,callback:()=>{T(null)}});const f=e(a);if(!f)return void p();const{result:d,extra:A}=E,R=0===u(d);f.nothing=!f.fetched&&R,f.fetched=!0,f.total=E.total||0,n===r.FETCH_TYPE.PAGINATION?(f.noMore=!1,f.page=+l):(f.noMore=E.no_more||R,f.page=f.page+1),f.loading=!1,i(f,r.FIELD_DATA.RESULT_KEY,d,n,c),A&&i(f,r.FIELD_DATA.EXTRA_KEY,A,n,c),t({key:a,type:r.SETTER_TYPE.RESET,value:f,callback:()=>{s&&_&&!f.nothing?_.set({key:a,value:f,timeout:s}).then(T).catch(T):T(null)}})})),A=({setter:e,fieldName:t,error:_})=>{e({key:t,type:r.SETTER_TYPE.MERGE,value:{error:_,loading:!1}})};e.ENUM=r,e.initData=({getter:e,setter:t,cache:E,func:n,type:o,query:s={},api:l,cacheTimeout:c,uniqueKey:T,callback:i})=>new Promise(((u,f)=>{const R=a({func:n,type:o,query:s}),y=e(R),S=!!s.__refresh__,g=!!s.__reload__;if(y&&y.error&&!S)return u(null);if(y&&y.loading)return u(null);const D=y&&y.fetched&&!S;if(D)return u(null);const P=p({field:__spreadProps(__spreadValues({},y),{fetched:!1}),uniqueKey:T,query:s,type:o});let h=!1;const L=()=>{new Promise((e=>{const r=()=>{("string"==typeof n?l[n]:n)(P).then(e).catch((e=>{A({setter:t,fieldName:R,error:e}),f(e)}))};c&&E?E.get({key:R}).then((t=>{h=!0,e(t)})).catch((()=>{r()})):r()})).then((a=>{const n=()=>{d({getter:e,setter:t,cache:E,data:a,fieldName:R,type:o,fromLocal:h,cacheTimeout:c,page:P.page||0,insertBefore:!1}).then((()=>{i&&i({params:P,data:a,refresh:S}),u(null)}))};g?t({key:R,type:r.SETTER_TYPE.RESET,value:_(),callback:n}):n()}))};D||g?L():t({key:R,type:r.SETTER_TYPE.RESET,value:__spreadProps(__spreadValues({},_()),{loading:!0,error:null}),callback:L})})),e.initState=({getter:e,setter:t,func:E,type:n,query:o={},opts:s={}})=>new Promise((l=>{const c=a({func:E,type:n,query:o});e(c)?l(null):t({key:c,type:r.SETTER_TYPE.RESET,value:_(s),callback:()=>{l(null)}})})),e.loadMore=({getter:e,setter:t,cache:_,query:E={},type:n,func:o,api:s,cacheTimeout:l,uniqueKey:c,errorRetry:T,callback:i})=>new Promise(((u,f)=>{const R=a({func:o,type:n,query:E}),y=e(R);if(!y)return u(null);if(y.loading)return u(null);if(y.nothing)return u(null);if(y.noMore&&!T)return u(null);if(n===r.FETCH_TYPE.PAGINATION&&+E.page===y.page)return u(null);let S;S=n===r.FETCH_TYPE.PAGINATION?{loading:!0,error:null,[r.FIELD_DATA.RESULT_KEY]:[],[r.FIELD_DATA.EXTRA_KEY]:null}:{loading:!0,error:null};const g=p({field:y,uniqueKey:c,query:E,type:n});g[r.FIELD_DATA.EXTRA_KEY]=y[r.FIELD_DATA.EXTRA_KEY];t({key:R,type:r.SETTER_TYPE.MERGE,value:S,callback:()=>{("string"==typeof o?s[o]:o)(g).then((r=>{d({getter:e,setter:t,cache:_,data:r,fieldName:R,type:n,fromLocal:!1,cacheTimeout:l,page:g.page||0,insertBefore:!!E.is_up}).then((()=>{i&&i({params:g,data:r,refresh:!1}),u(null)}))})).catch((e=>{A({setter:t,fieldName:R,error:e}),f(e)}))}})})),e.updateState=({getter:e,setter:t,cache:_,type:E,func:i,query:p={},method:f,value:d,id:A,uniqueKey:R,changeKey:y,cacheTimeout:S})=>new Promise(((g,D)=>{const P=a({func:i,type:E,query:p}),h=e(P);if(!h)return void D();const L=A||"",I=R||r.DEFAULT_UNIQUE_KEY_NAME,O=y||r.FIELD_DATA.RESULT_KEY,Y=u(h[r.FIELD_DATA.RESULT_KEY]);if(f===r.CHANGE_TYPE.SEARCH_FIELD)g(s(h[r.FIELD_DATA.RESULT_KEY],L,I));else if(f===r.CHANGE_TYPE.RESULT_UPDATE_KV){const e=l(L,h[r.FIELD_DATA.RESULT_KEY],I);o(h[r.FIELD_DATA.RESULT_KEY][e],O,d)}else if(f===r.CHANGE_TYPE.RESULT_ITEM_MERGE){const e=l(L,h[r.FIELD_DATA.RESULT_KEY],I);h[r.FIELD_DATA.RESULT_KEY][e]=__spreadValues(__spreadValues({},h[r.FIELD_DATA.RESULT_KEY][e]),d)}else if(f===r.CHANGE_TYPE.RESET_FIELD)o(h,O,d);else{let e=n(h,O);const t=l(L,e,I);switch(f){case r.CHANGE_TYPE.RESULT_ADD_AFTER:T(d)?e=e.concat(d):e.push(d);break;case r.CHANGE_TYPE.RESULT_ADD_BEFORE:T(d)?e=d.concat(e):e.unshift(d);break;case r.CHANGE_TYPE.RESULT_REMOVE_BY_ID:t>=0?e.splice(t,1):T(L)&&(e=e.filter((e=>-1===L.indexOf(e[I]))));break;case r.CHANGE_TYPE.RESULT_INSERT_TO_BEFORE:t>=0&&e.splice(t,0,d);break;case r.CHANGE_TYPE.RESULT_INSERT_TO_AFTER:t>=0&&e.splice(t+1,0,d);break;case r.CHANGE_TYPE.RESULT_LIST_MERGE:c(e,d,I)}h[O]=e}const F=u(h[r.FIELD_DATA.RESULT_KEY]);h.total=h.total+F-Y,h.nothing=0===F,t({key:P,type:r.SETTER_TYPE.MERGE,value:h,callback:()=>{S&&_?_.set({key:P,value:h,timeout:S}).then(g).catch(g):g(null)}})})),e.utils=f,Object.defineProperty(e,"__esModule",{value:!0}),e[Symbol.toStringTag]="Module"}));
+var J=Object.defineProperty,W=Object.defineProperties;var Z=Object.getOwnPropertyDescriptors;var k=Object.getOwnPropertySymbols;var v=Object.prototype.hasOwnProperty,q=Object.prototype.propertyIsEnumerable;var w=(l,c,n)=>c in l?J(l,c,{enumerable:!0,configurable:!0,writable:!0,value:n}):l[c]=n,u=(l,c)=>{for(var n in c||(c={}))v.call(c,n)&&w(l,n,c[n]);if(k)for(var n of k(c))q.call(c,n)&&w(l,n,c[n]);return l},G=(l,c)=>W(l,Z(c));(function(l,c){typeof exports=="object"&&typeof module!="undefined"?c(exports):typeof define=="function"&&define.amd?define(["exports"],c):(l=typeof globalThis!="undefined"?globalThis:l||self,c(l.JsCore={}))})(this,function(l){"use strict";const c=["jump","sinceId","page","seenIds","auto"];var n={SETTER_TYPE:{RESET:0,MERGE:1},FETCH_TYPE_ARRAY:c,FETCH_TYPE:{PAGINATION:c[0],SINCE_FIRST_OR_END_ID:c[1],SCROLL_LOAD_MORE:c[2],HAS_LOADED_IDS:c[3],AUTO:c[4]},CHANGE_TYPE:{SEARCH_FIELD:"search",RESET_FIELD:"reset",RESULT_UPDATE_KV:"update",RESULT_ADD_AFTER:"push",RESULT_ADD_BEFORE:"unshift",RESULT_REMOVE_BY_ID:"delete",RESULT_INSERT_TO_BEFORE:"insert-before",RESULT_INSERT_TO_AFTER:"insert-after",RESULT_LIST_MERGE:"patch",RESULT_ITEM_MERGE:"merge"},FIELD_DATA:{RESULT_KEY:"result",EXTRA_KEY:"extra"},DEFAULT_UNIQUE_KEY_NAME:"id"};const j=t=>t.result===void 0,U=(t={})=>u({result:[],noMore:!1,nothing:!1,loading:!0,error:null,extra:null,fetched:!1,page:0,total:0},t),O=({func:t,type:_,query:e={}})=>{t=typeof t=="string"?t:`api-${Math.random().toString(36).substring(2)}`,_=_||"auto";let s=`${t}-${_}`;return Object.keys(e).filter(E=>!~["undefined","object","function"].indexOf(typeof e[E])&&!~["page","is_up","since_id","seen_ids","__refresh__","__reload__"].indexOf(E)).sort().forEach(E=>{s+=`-${E}-${e[E]}`}),s},L=(t,_)=>{if(!_)return t||"";let e=t||"";return(F(_)?_:_.split(".")).forEach(E=>{e=e[E]}),e||""},M=(t,_,e)=>{if(/\./.test(_)){const s=_.split("."),E=s.pop();let i=t;s.forEach(o=>{i=i[o]}),i[E]=e}else t[_]=e},K=(t,_,e)=>{if(F(t)){const s=N(_,t,e);return s<0?void 0:t[s]}return t[_]},N=(t,_,e)=>{let s=-1;for(let E=0;E<_.length;E++)if(L(_[E],e.toString()).toString()===(t||"").toString()){s=E;break}return s},x=(t,_,e)=>{F(_)?_.forEach(s=>{const E=L(s,e).toString();t.forEach((i,o)=>{L(i,e).toString()===E&&(t[o]=u(u({},i),s))})}):Object.keys(_).forEach(s=>{const E=(s||"").toString();t.forEach((i,o)=>{L(i,e).toString()===E&&(t[o]=u(u({},i),_[s]))})})},F=t=>Object.prototype.toString.call(t)==="[object Array]",H=(t,_,e,s,E)=>{if(s===n.FETCH_TYPE.PAGINATION){t[_]=e;return}if(F(e)){t[_]=E?e.concat(t[_]||[]):(t[_]||[]).concat(e);return}if(_!==n.FIELD_DATA.RESULT_KEY){t[_]=e;return}F(t[_])&&(t[_]={}),Object.keys(e).forEach(i=>{t[_][i]=t[_][i]?E?e[i].concat(t[_][i]):t[_][i].concat(e[i]):e[i]})},C=t=>{let _=0;return F(t)?_=t.length:Object.keys(t).forEach(e=>{_+=t[e].length}),_},b=({field:t,uniqueKey:_,query:e={},type:s})=>{const E={};if(t.fetched){const i=_||n.DEFAULT_UNIQUE_KEY_NAME;s===n.FETCH_TYPE.AUTO?(E.seen_ids=t.result.map(o=>L(o,i)).join(","),E.since_id=L(t.result[e.is_up?0:t.result.length-1],i),E.is_up=e.is_up?1:0,E.page=e.page||t.page+1):s===n.FETCH_TYPE.HAS_LOADED_IDS?E.seen_ids=t.result.map(o=>L(o,i)).join(","):s===n.FETCH_TYPE.SINCE_FIRST_OR_END_ID?(E.since_id=L(t.result[e.is_up?0:t.result.length-1],i),E.is_up=e.is_up?1:0):s===n.FETCH_TYPE.PAGINATION?E.page=e.page:s===n.FETCH_TYPE.SCROLL_LOAD_MORE&&(E.page=t.page+1)}else s===n.FETCH_TYPE.AUTO?(E.seen_ids="",E.since_id=e.sinceId||(e.is_up?999999999:0),E.is_up=e.is_up?1:0,E.page=e.page||t.page||1):s===n.FETCH_TYPE.HAS_LOADED_IDS?E.seen_ids="":s===n.FETCH_TYPE.SINCE_FIRST_OR_END_ID?(E.since_id=e.sinceId||(e.is_up?999999999:0),E.is_up=e.is_up?1:0):s===n.FETCH_TYPE.PAGINATION?E.page=e.page||t.page:s===n.FETCH_TYPE.SCROLL_LOAD_MORE&&(E.page=1);return u(u({},e),E)};var B=Object.freeze(Object.defineProperty({__proto__:null,isObjectResult:j,generateDefaultField:U,generateFieldName:O,getObjectDeepValue:L,updateObjectDeepValue:M,searchValueByKey:K,computeMatchedItemIndex:N,combineArrayData:x,isArray:F,setReactivityField:H,computeResultLength:C,generateRequestParams:b},Symbol.toStringTag,{value:"Module"}));const V=({getter:t,setter:_,data:e,fieldName:s,type:E,page:i,insertBefore:o})=>new Promise((I,S)=>{const a=t(s);if(!a){S();return}let A,f;if(j(e))A=e,a.nothing=!1,a.fetched=!0,a.noMore=!0,a.page=-1;else{A=e.result,f=e.extra;const R=C(A)===0;a.nothing=a.fetched?!1:R,a.fetched=!0,a.total=e.total||0,E===n.FETCH_TYPE.PAGINATION?(a.noMore=!1,a.page=+i):(a.noMore=e.no_more||R,a.page=a.page+1)}a.loading=!1,H(a,n.FIELD_DATA.RESULT_KEY,A,E,o),f&&H(a,n.FIELD_DATA.EXTRA_KEY,f,E,o),_({key:s,type:n.SETTER_TYPE.RESET,value:a,callback:()=>{I(null)}})}),m=({setter:t,fieldName:_,error:e})=>{t({key:_,type:n.SETTER_TYPE.MERGE,value:{error:e,loading:!1}})},X=({getter:t,setter:_,func:e,type:s,query:E,opts:i})=>new Promise(o=>{const I=O({func:e,type:s,query:E});if(t(I)){o(null);return}_({key:I,type:n.SETTER_TYPE.RESET,value:U(i),callback:()=>{o(null)}})}),$=({getter:t,setter:_,func:e,type:s,query:E,api:i,uniqueKey:o,callback:I})=>new Promise((S,a)=>{const A=O({func:e,type:s,query:E}),f=t(A),R=!!(E!=null&&E.__refresh__),T=!!(E!=null&&E.__reload__);if(f&&f.error&&!R||f&&f.loading&&f.fetched&&!R&&!T)return S(null);const D=f&&f.fetched&&!R;if(D)return S(null);const g=b({field:G(u({},f),{fetched:!1}),uniqueKey:o,query:E,type:s}),d=()=>{(()=>new Promise(h=>{(()=>{const Y=typeof e=="string"?i[e]:e;if(!Y){const P=new Error("func is not a function");m({setter:_,fieldName:A,error:P}),a(P)}Y(g).then(h).catch(P=>{m({setter:_,fieldName:A,error:P}),a(P)})})()}))().then(h=>{const r=()=>{V({getter:t,setter:_,data:h,fieldName:A,type:s,page:g.page||0,insertBefore:!1}).then(()=>{I&&I({params:g,data:h,refresh:R}),S(null)})};T?_({key:A,type:n.SETTER_TYPE.RESET,value:U(),callback:r}):r()})};!D&&!T?_({key:A,type:n.SETTER_TYPE.RESET,value:G(u({},U()),{loading:!0,error:null}),callback:d}):d()}),Q=({getter:t,setter:_,query:e,type:s,func:E,api:i,uniqueKey:o,errorRetry:I,callback:S})=>new Promise((a,A)=>{const f=O({func:E,type:s,query:e}),R=t(f);if(!R||R.loading||R.nothing||R.noMore&&!I||s===n.FETCH_TYPE.PAGINATION&&e&&+e.page===R.page)return a(null);let T;s===n.FETCH_TYPE.PAGINATION?T={loading:!0,error:null,[n.FIELD_DATA.RESULT_KEY]:[],[n.FIELD_DATA.EXTRA_KEY]:null}:T={loading:!0,error:null};const D=b({field:R,uniqueKey:o,query:e,type:s});D[n.FIELD_DATA.EXTRA_KEY]=R[n.FIELD_DATA.EXTRA_KEY];const g=()=>{const d=typeof E=="string"?i[E]:E;if(!d){const p=new Error("func is not a function");m({setter:_,fieldName:f,error:p}),A(p)}d(D).then(p=>{V({getter:t,setter:_,data:p,fieldName:f,type:s,page:D.page||0,insertBefore:!!(e!=null&&e.is_up)}).then(()=>{S&&S({params:D,data:p,refresh:!1}),a(null)})}).catch(p=>{m({setter:_,fieldName:f,error:p}),A(p)})};_({key:f,type:n.SETTER_TYPE.MERGE,value:T,callback:g})}),z=({getter:t,setter:_,type:e,func:s,query:E,method:i,value:o,id:I,uniqueKey:S,changeKey:a})=>new Promise((A,f)=>{const R=O({func:s,type:e,query:E}),T=t(R);if(!T){f();return}if(T.page===-1){A(null);return}const D=I||"",g=S||n.DEFAULT_UNIQUE_KEY_NAME,d=a||n.FIELD_DATA.RESULT_KEY,p=C(T[n.FIELD_DATA.RESULT_KEY]);if(i===n.CHANGE_TYPE.SEARCH_FIELD)A(K(T[n.FIELD_DATA.RESULT_KEY],D,g));else if(i===n.CHANGE_TYPE.RESULT_UPDATE_KV){const r=N(D,T[n.FIELD_DATA.RESULT_KEY],g);M(T[n.FIELD_DATA.RESULT_KEY][r],d,o)}else if(i===n.CHANGE_TYPE.RESULT_ITEM_MERGE){const r=N(D,T[n.FIELD_DATA.RESULT_KEY],g);T[n.FIELD_DATA.RESULT_KEY][r]=u(u({},T[n.FIELD_DATA.RESULT_KEY][r]),o)}else if(i===n.CHANGE_TYPE.RESET_FIELD)M(T,d,o);else{let r=L(T,d);const Y=N(D,r,g);switch(i){case n.CHANGE_TYPE.RESULT_ADD_AFTER:F(o)?r=r.concat(o):r.push(o);break;case n.CHANGE_TYPE.RESULT_ADD_BEFORE:F(o)?r=o.concat(r):r.unshift(o);break;case n.CHANGE_TYPE.RESULT_REMOVE_BY_ID:Y>=0?r.splice(Y,1):F(D)&&(r=r.filter(P=>D.indexOf(P[g])===-1));break;case n.CHANGE_TYPE.RESULT_INSERT_TO_BEFORE:Y>=0&&r.splice(Y,0,o);break;case n.CHANGE_TYPE.RESULT_INSERT_TO_AFTER:Y>=0&&r.splice(Y+1,0,o);break;case n.CHANGE_TYPE.RESULT_LIST_MERGE:x(r,o,g);break}T[d]=r}const h=C(T[n.FIELD_DATA.RESULT_KEY]);T.total=T.total+h-p,T.nothing=h===0,_({key:R,type:n.SETTER_TYPE.MERGE,value:T,callback:()=>{A(null)}})});l.ENUM=n,l.initData=$,l.initState=X,l.loadMore=Q,l.updateState=z,l.utils=B,Object.defineProperties(l,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowlist/js-core",
-  "version": "1.7.6",
+  "version": "2.2.0",
   "main": "dist/js-core.umd.js",
   "module": "dist/js-core.es.js",
   "types": "dist/index.d.ts",
@@ -31,25 +31,26 @@
     "lint": "eslint --ext js,jsx,ts,tsx,vue . --fix"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.18.0",
-    "@typescript-eslint/parser": "^4.18.0",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-typescript": "^7.0.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-vue": "^7.0.0",
     "@babel/preset-env": "^7.14.7",
     "@babel/preset-typescript": "^7.14.5",
-    "@types/jest": "^26.0.24",
-    "@vue/cli-plugin-unit-jest": "~4.5.11",
-    "@vue/cli-service": "~4.5.11",
-    "@vue/test-utils": "^1.1.3",
-    "faker": "^5.4.0",
+    "@faker-js/faker": "^6.1.2",
+    "@types/jest": "^27.4.1",
+    "@typescript-eslint/eslint-plugin": "^5.19.0",
+    "@typescript-eslint/parser": "^5.19.0",
+    "@vue/cli-plugin-unit-jest": "~5.0.4",
+    "@vue/cli-service": "~5.0.4",
+    "@vue/eslint-config-prettier": "^7.0.0",
+    "@vue/eslint-config-typescript": "^10.0.0",
+    "@vue/test-utils": "^2.0.0-rc.19",
+    "eslint": "^8.13.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^8.6.0",
     "jest-localstorage-mock": "^2.4.8",
-    "ts-babel": "^6.1.7",
     "prettier": "^2.3.2",
-    "typescript": "^3.0.0",
+    "ts-babel": "^6.1.7",
+    "ts-jest": "^27.1.4",
+    "typescript": "^4.6.3",
     "vite": "^2.3.8",
-    "vite-plugin-dts": "^0.5.2"
+    "vite-plugin-dts": "^1.0.5"
   }
 }

package/src/actions.ts

@@ -25,8 +25,8 @@ export const initState = ({
   setter,
   func,
   type,
-  query = {},
-  opts = {}
+  query,
+  opts
 }: initStateType): Promise<null> => {
   return new Promise((resolve) => {
     const fieldName = generateFieldName({ func, type, query })
@@ -50,26 +50,24 @@ export const initState = ({
 export const initData = ({
   getter,
   setter,
-  cache,
   func,
   type,
-  query = {},
+  query,
   api,
-  cacheTimeout,
   uniqueKey,
   callback
 }: initDataType): Promise<any> =>
   new Promise((resolve, reject) => {
     const fieldName = generateFieldName({ func, type, query })
     const fieldData = getter(fieldName)
-    const doRefresh = !!query.__refresh__
-    const needReset = !!query.__reload__
+    const doRefresh = !!query?.__refresh__
+    const needReset = !!query?.__reload__
     // 如果 error 了，就不再请求
     if (fieldData && fieldData.error && !doRefresh) {
       return resolve(null)
     }
     // 正在请求中，return
-    if (fieldData && fieldData.loading) {
+    if (fieldData && fieldData.loading && fieldData.fetched && !doRefresh && !needReset) {
       return resolve(null)
     }
     // 这个 field 已经请求过了
@@ -87,14 +85,17 @@ export const initData = ({
       query,
       type
     })
-    let fromLocal = false
 
     const getData = () => {
       const loadData = () =>
         new Promise((res) => {
           const getDataFromAPI = () => {
             const funcCaller = typeof func === 'string' ? api[func] : func
-
+            if (!funcCaller) {
+              const error = new Error('func is not a function')
+              SET_ERROR({ setter, fieldName, error })
+              reject(error)
+            }
             funcCaller(params)
               .then(res)
               .catch((error: Error) => {
@@ -103,19 +104,7 @@ export const initData = ({
               })
           }
 
-          if (cacheTimeout && cache) {
-            cache
-              .get({ key: fieldName })
-              .then((data) => {
-                fromLocal = true
-                res(data)
-              })
-              .catch(() => {
-                getDataFromAPI()
-              })
-          } else {
-            getDataFromAPI()
-          }
+          getDataFromAPI()
         })
 
       loadData().then((data) => {
@@ -123,12 +112,9 @@ export const initData = ({
           SET_DATA({
             getter,
             setter,
-            cache,
             data,
             fieldName,
             type,
-            fromLocal,
-            cacheTimeout,
             page: params.page || 0,
             insertBefore: false
           }).then(() => {
@@ -177,12 +163,10 @@ export const initData = ({
 export const loadMore = ({
   getter,
   setter,
-  cache,
-  query = {},
+  query,
   type,
   func,
   api,
-  cacheTimeout,
   uniqueKey,
   errorRetry,
   callback
@@ -207,7 +191,11 @@ export const loadMore = ({
       return resolve(null)
     }
 
-    if (type === ENUM.FETCH_TYPE.PAGINATION && +query.page === fieldData.page) {
+    if (
+      type === ENUM.FETCH_TYPE.PAGINATION &&
+      query &&
+      +query.page === fieldData.page
+    ) {
       return resolve(null)
     }
 
@@ -239,20 +227,21 @@ export const loadMore = ({
 
     const getData = () => {
       const funcCaller = typeof func === 'string' ? api[func] : func
-
+      if (!funcCaller) {
+        const error = new Error('func is not a function')
+        SET_ERROR({ setter, fieldName, error })
+        reject(error)
+      }
       funcCaller(params)
         .then((data: any) => {
           SET_DATA({
             getter,
             setter,
-            cache,
             data,
             fieldName,
             type,
-            fromLocal: false,
-            cacheTimeout,
             page: params.page || 0,
-            insertBefore: !!query.is_up
+            insertBefore: !!query?.is_up
           }).then(() => {
             if (callback) {
               callback({
@@ -281,16 +270,14 @@ export const loadMore = ({
 export const updateState = ({
   getter,
   setter,
-  cache,
   type,
   func,
-  query = {},
+  query,
   method,
   value,
   id,
   uniqueKey,
-  changeKey,
-  cacheTimeout
+  changeKey
 }: updateStateType) => {
   return new Promise((resolve, reject) => {
     const fieldName = generateFieldName({ func, type, query })
@@ -300,6 +287,11 @@ export const updateState = ({
       return
     }
 
+    if (fieldData.page === -1) {
+      resolve(null)
+      return
+    }
+
     const _id = id || ''
     const _uniqueKey = uniqueKey || ENUM.DEFAULT_UNIQUE_KEY_NAME
     const _changeKey = changeKey || ENUM.FIELD_DATA.RESULT_KEY
@@ -397,18 +389,6 @@ export const updateState = ({
       type: ENUM.SETTER_TYPE.MERGE,
       value: fieldData,
       callback: () => {
-        if (cacheTimeout && cache) {
-          cache
-            .set({
-              key: fieldName,
-              value: fieldData,
-              timeout: cacheTimeout
-            })
-            .then(resolve)
-            .catch(resolve)
-          return
-        }
-
         resolve(null)
       }
     })

package/src/setters.ts

@@ -1,50 +1,48 @@
-import { computeResultLength, setReactivityField } from './utils'
+import { computeResultLength, setReactivityField, isObjectResult } from './utils'
 import ENUM from './enum'
 import type { setDataType, setErrorType } from './types'
 
 export const SET_DATA = ({
   getter,
   setter,
-  cache,
   data,
   fieldName,
   type,
-  fromLocal,
-  cacheTimeout,
   page,
   insertBefore
 }: setDataType): Promise<any> => {
   return new Promise((resolve, reject) => {
-    if (fromLocal) {
-      setter({
-        key: fieldName,
-        type: ENUM.SETTER_TYPE.RESET,
-        value: data,
-        callback: () => {
-          resolve(null)
-        }
-      })
-      return
-    }
-
     const fieldData = getter(fieldName)
     if (!fieldData) {
       reject()
       return
     }
 
-    const { result, extra } = data
-    const isEmpty = computeResultLength(result) === 0
-    fieldData.nothing = fieldData.fetched ? false : isEmpty
-    fieldData.fetched = true
-    fieldData.total = data.total || 0
-    if (type === ENUM.FETCH_TYPE.PAGINATION) {
-      fieldData.noMore = false
-      fieldData.page = +page
+    let result
+    let extra
+
+    if (isObjectResult(data)) {
+      result = data
+      fieldData.nothing = false
+      fieldData.fetched = true
+      fieldData.noMore = true
+      fieldData.page = -1
     } else {
-      fieldData.noMore = data.no_more || isEmpty
-      fieldData.page = fieldData.page + 1
+      result = data.result
+      extra = data.extra
+      const isEmpty = computeResultLength(result) === 0
+      fieldData.nothing = fieldData.fetched ? false : isEmpty
+      fieldData.fetched = true
+      fieldData.total = data.total || 0
+      if (type === ENUM.FETCH_TYPE.PAGINATION) {
+        fieldData.noMore = false
+        fieldData.page = +page
+      } else {
+        fieldData.noMore = data.no_more || isEmpty
+        fieldData.page = fieldData.page + 1
+      }
     }
+
     fieldData.loading = false
     setReactivityField(
       fieldData,
@@ -68,18 +66,6 @@ export const SET_DATA = ({
       type: ENUM.SETTER_TYPE.RESET,
       value: fieldData,
       callback: () => {
-        if (cacheTimeout && cache && !fieldData.nothing) {
-          cache
-            .set({
-              key: fieldName,
-              value: fieldData,
-              timeout: cacheTimeout
-            })
-            .then(resolve)
-            .catch(resolve)
-          return
-        }
-
         resolve(null)
       }
     })

package/src/types.ts

@@ -33,13 +33,13 @@ export type fieldKeys =
 export type generateFieldProps = {
   func: string | (() => {})
   type: fetchTypes
-  query: keyMap
+  query?: keyMap
 }
 
 export type generateParamsType = {
   field: defaultField
   uniqueKey: string
-  query: keyMap
+  query?: keyMap
   type: fetchTypes
 }
 
@@ -66,24 +66,9 @@ export type initStateType = {
   opts?: keyMap
 }
 
-export type cacheType = {
-  get: ({ key }: { key: string }) => Promise<any>
-  set: ({
-    key,
-    value,
-    timeout
-  }: {
-    key: string
-    value: any
-    timeout?: number
-  }) => Promise<any>
-  del: ({ key }: { key: string }) => void
-}
-
 export type initDataType = {
   getter: (str: string) => defaultField
   setter: (obj: setterFuncParams) => void
-  cache: cacheType
   func: string | (() => {})
   type: fetchTypes
   query?: keyMap
@@ -96,7 +81,6 @@ export type initDataType = {
 export type loadMoreType = {
   getter: (str: string) => defaultField
   setter: (obj: setterFuncParams) => void
-  cache: cacheType
   func: string | (() => {})
   type: fetchTypes
   query?: keyMap
@@ -110,7 +94,6 @@ export type loadMoreType = {
 export type updateStateType = {
   getter: (str: string) => defaultField
   setter: (obj: setterFuncParams) => void
-  cache: cacheType
   func: string | (() => {})
   type: fetchTypes
   query?: keyMap
@@ -125,12 +108,9 @@ export type updateStateType = {
 export type setDataType = {
   getter: (str: string) => defaultField
   setter: (obj: setterFuncParams) => void
-  cache: cacheType
   data: any
   fieldName: string
   type: fetchTypes
-  fromLocal: boolean
-  cacheTimeout: number
   page: number
   insertBefore: boolean
 }

package/src/utils.ts

@@ -12,12 +12,16 @@ import type {
   generateParamsResp
 } from './types'
 
+export const isObjectResult = (data: Record<string, any>): boolean => {
+  return data.result === undefined
+}
+
 export const generateDefaultField = (opts = {}): defaultField => ({
   ...{
     result: [],
     noMore: false,
     nothing: false,
-    loading: false,
+    loading: true,
     error: null,
     extra: null,
     fetched: false,
@@ -27,7 +31,6 @@ export const generateDefaultField = (opts = {}): defaultField => ({
   ...opts
 })
 
-let seed = 0
 /**
  * 根据参数生成 field 的 namespace
  * @param {string} func
@@ -40,7 +43,10 @@ export const generateFieldName = ({
   type,
   query = {}
 }: generateFieldProps): string => {
-  func = typeof func === 'string' ? func : `custom-func-${seed++}`
+  func =
+    typeof func === 'string'
+      ? func
+      : `api-${Math.random().toString(36).substring(2)}`
   type = type || 'auto'
   let result = `${func}-${type}`
   Object.keys(query)
@@ -263,11 +269,10 @@ export const computeResultLength = (data: fieldResult): number => {
 export const generateRequestParams = ({
   field,
   uniqueKey,
-  query,
+  query = {},
   type
 }: generateParamsType): generateParamsResp => {
   const result: generateParamsResp = {}
-  query = query || {}
   if (field.fetched) {
     const changing = uniqueKey || ENUM.DEFAULT_UNIQUE_KEY_NAME
     if (type === ENUM.FETCH_TYPE.AUTO) {

package/dist/src/actions.d.ts

@@ -1,5 +0,0 @@
-import type { initStateType, initDataType, loadMoreType, updateStateType } from './types';
-export declare const initState: ({ getter, setter, func, type, query, opts }: initStateType) => Promise<null>;
-export declare const initData: ({ getter, setter, cache, func, type, query, api, cacheTimeout, uniqueKey, callback }: initDataType) => Promise<any>;
-export declare const loadMore: ({ getter, setter, cache, query, type, func, api, cacheTimeout, uniqueKey, errorRetry, callback }: loadMoreType) => Promise<any>;
-export declare const updateState: ({ getter, setter, cache, type, func, query, method, value, id, uniqueKey, changeKey, cacheTimeout }: updateStateType) => Promise<unknown>;

package/dist/src/enum.d.ts

@@ -1,32 +0,0 @@
-declare const _default: {
-    SETTER_TYPE: {
-        RESET: number;
-        MERGE: number;
-    };
-    FETCH_TYPE_ARRAY: string[];
-    FETCH_TYPE: {
-        PAGINATION: string;
-        SINCE_FIRST_OR_END_ID: string;
-        SCROLL_LOAD_MORE: string;
-        HAS_LOADED_IDS: string;
-        AUTO: string;
-    };
-    CHANGE_TYPE: {
-        SEARCH_FIELD: string;
-        RESET_FIELD: string;
-        RESULT_UPDATE_KV: string;
-        RESULT_ADD_AFTER: string;
-        RESULT_ADD_BEFORE: string;
-        RESULT_REMOVE_BY_ID: string;
-        RESULT_INSERT_TO_BEFORE: string;
-        RESULT_INSERT_TO_AFTER: string;
-        RESULT_LIST_MERGE: string;
-        RESULT_ITEM_MERGE: string;
-    };
-    FIELD_DATA: {
-        RESULT_KEY: string;
-        EXTRA_KEY: string;
-    };
-    DEFAULT_UNIQUE_KEY_NAME: string;
-};
-export default _default;

package/dist/src/index.d.ts

@@ -1,4 +0,0 @@
-export * from './actions';
-export * as utils from './utils';
-export { default as ENUM } from './enum';
-export * from './types';

package/dist/src/setters.d.ts

@@ -1,3 +0,0 @@
-import type { setDataType, setErrorType } from './types';
-export declare const SET_DATA: ({ getter, setter, cache, data, fieldName, type, fromLocal, cacheTimeout, page, insertBefore }: setDataType) => Promise<any>;
-export declare const SET_ERROR: ({ setter, fieldName, error }: setErrorType) => void;