@flowlist/js-core 2.0.0 → 2.1.0

package/dist/index.d.ts

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

package/dist/js-core.es.js

@@ -49,6 +49,9 @@ var ENUM = {
   },
   DEFAULT_UNIQUE_KEY_NAME: "id"
 };
+const isObjectResult = (data) => {
+  return data.result === void 0;
+};
 const generateDefaultField = (opts = {}) => __spreadValues(__spreadValues({}, {
   result: [],
   noMore: false,
@@ -180,11 +183,10 @@ const computeResultLength = (data) => {
 const generateRequestParams = ({
   field,
   uniqueKey,
-  query,
+  query = {},
   type
 }) => {
   const result = {};
-  query = query || {};
   if (field.fetched) {
     const changing = uniqueKey || ENUM.DEFAULT_UNIQUE_KEY_NAME;
     if (type === ENUM.FETCH_TYPE.AUTO) {
@@ -223,6 +225,7 @@ const generateRequestParams = ({
 };
 var utils = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
+  isObjectResult,
   generateDefaultField,
   generateFieldName,
   getObjectDeepValue,
@@ -250,17 +253,28 @@ const SET_DATA = ({
       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, ENUM.FIELD_DATA.RESULT_KEY, result, type, insertBefore);
@@ -290,8 +304,8 @@ const initState = ({
   setter,
   func,
   type,
-  query = {},
-  opts = {}
+  query,
+  opts
 }) => {
   return new Promise((resolve) => {
     const fieldName = generateFieldName({ func, type, query });
@@ -315,15 +329,15 @@ const initData = ({
   setter,
   func,
   type,
-  query = {},
+  query,
   api,
   uniqueKey,
   callback
 }) => 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 == null ? void 0 : query.__refresh__);
+  const needReset = !!(query == null ? void 0 : query.__reload__);
   if (fieldData && fieldData.error && !doRefresh) {
     return resolve(null);
   }
@@ -403,7 +417,7 @@ const initData = ({
 const loadMore = ({
   getter,
   setter,
-  query = {},
+  query,
   type,
   func,
   api,
@@ -425,7 +439,7 @@ const loadMore = ({
   if (fieldData.noMore && !errorRetry) {
     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);
   }
   let loadingState;
@@ -459,7 +473,7 @@ const loadMore = ({
         fieldName,
         type,
         page: params.page || 0,
-        insertBefore: !!query.is_up
+        insertBefore: !!(query == null ? void 0 : query.is_up)
       }).then(() => {
         if (callback) {
           callback({
@@ -487,7 +501,7 @@ const updateState = ({
   setter,
   type,
   func,
-  query = {},
+  query,
   method,
   value,
   id,
@@ -501,6 +515,10 @@ const updateState = ({
       reject();
       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;

package/dist/js-core.umd.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowlist/js-core",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "main": "dist/js-core.umd.js",
   "module": "dist/js-core.es.js",
   "types": "dist/index.d.ts",

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 })
@@ -52,7 +52,7 @@ export const initData = ({
   setter,
   func,
   type,
-  query = {},
+  query,
   api,
   uniqueKey,
   callback
@@ -60,8 +60,8 @@ export const initData = ({
   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)
@@ -159,7 +159,7 @@ export const initData = ({
 export const loadMore = ({
   getter,
   setter,
-  query = {},
+  query,
   type,
   func,
   api,
@@ -187,7 +187,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)
     }
 
@@ -229,7 +233,7 @@ export const loadMore = ({
             fieldName,
             type,
             page: params.page || 0,
-            insertBefore: !!query.is_up
+            insertBefore: !!query?.is_up
           }).then(() => {
             if (callback) {
               callback({
@@ -260,7 +264,7 @@ export const updateState = ({
   setter,
   type,
   func,
-  query = {},
+  query,
   method,
   value,
   id,
@@ -275,6 +279,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

package/src/setters.ts

@@ -1,4 +1,4 @@
-import { computeResultLength, setReactivityField } from './utils'
+import { computeResultLength, setReactivityField, isObjectResult } from './utils'
 import ENUM from './enum'
 import type { setDataType, setErrorType } from './types'
 
@@ -18,18 +18,31 @@ export const SET_DATA = ({
       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,

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
 }
 

package/src/utils.ts

@@ -12,6 +12,10 @@ import type {
   generateParamsResp
 } from './types'
 
+export const isObjectResult = (data: Record<string, any>): boolean => {
+  return data.result === undefined
+}
+
 export const generateDefaultField = (opts = {}): defaultField => ({
   ...{
     result: [],
@@ -265,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/src/index.ts

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