@flowlist/js-core 4.0.4-beta.0 → 4.0.6-beta.0

package/dist/index.global.js

@@ -51,25 +51,27 @@ var FlowList = (function (exports) {
     generateFieldName: () => generateFieldName,
     generateRequestParams: () => generateRequestParams,
     getObjectDeepValue: () => getObjectDeepValue,
+    getResultAsArray: () => getResultAsArray,
     isArray: () => isArray,
     isKeyMap: () => isKeyMap,
     isKeyMapArray: () => isKeyMapArray,
     isObjectKey: () => isObjectKey,
     isObjectKeyArray: () => isObjectKeyArray,
     isObjectResult: () => isObjectResult,
-    isResultArray: () => isResultArray,
     isResultObject: () => isResultObject,
     searchValueByKey: () => searchValueByKey,
     setReactivityField: () => setReactivityField,
+    stableSerialize: () => stableSerialize,
+    toObjectKey: () => toObjectKey,
+    updateArrayItem: () => updateArrayItem,
     updateObjectDeepValue: () => updateObjectDeepValue
   });
   var isArray = (data) => Array.isArray(data);
-  var isResultArray = (data) => Array.isArray(data);
-  var isResultObject = (data) => !Array.isArray(data) && typeof data === "object" && data !== null;
+  var isResultObject = (data) => !isArray(data) && typeof data === "object" && data !== null;
   var isObjectKey = (value) => typeof value === "string" || typeof value === "number";
-  var isKeyMap = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-  var isKeyMapArray = (value) => Array.isArray(value) && value.every((item) => typeof item === "object" && item !== null);
-  var isObjectKeyArray = (value) => Array.isArray(value) && value.every((item) => typeof item === "string" || typeof item === "number");
+  var isKeyMap = (value) => typeof value === "object" && value !== null && !isArray(value);
+  var isKeyMapArray = (value) => isArray(value) && value.every((item) => typeof item === "object" && item !== null);
+  var isObjectKeyArray = (value) => isArray(value) && value.every((item) => typeof item === "string" || typeof item === "number");
   var stableSerialize = (value) => {
     if (value === null || typeof value !== "object") {
       return String(value);
@@ -115,6 +117,7 @@ var FlowList = (function (exports) {
   };
   var generateDefaultField = (opts = {}) => ({
     result: [],
+    // 默认为空数组，但强制转换为泛型 T
     noMore: false,
     nothing: false,
     loading: false,
@@ -161,11 +164,7 @@ var FlowList = (function (exports) {
       if (result == null || typeof result !== "object") {
         return void 0;
       }
-      if (isKeyMap(result)) {
-        result = result[keysArr[i]];
-      } else {
-        return void 0;
-      }
+      result = result[keysArr[i]];
     }
     return result;
   };
@@ -194,7 +193,7 @@ var FlowList = (function (exports) {
     }
   };
   var searchValueByKey = (result, id, key) => {
-    if (isResultArray(result)) {
+    if (isArray(result)) {
       const index = computeMatchedItemIndex(id, result, key);
       return index >= 0 ? result[index] : void 0;
     }
@@ -258,18 +257,19 @@ var FlowList = (function (exports) {
     }
   };
   var setReactivityField = (field, key, value, type, insertBefore) => {
+    const fieldAny = field;
     if (type === enum_default.FETCH_TYPE.PAGINATION) {
-      field[key] = value;
+      fieldAny[key] = value;
       return;
     }
     if (key !== enum_default.FIELD_DATA.RESULT_KEY) {
       if (isArray(value)) {
-        const current = field[key];
+        const current = fieldAny[key];
         const currentArr = isArray(current) ? current : [];
         const newValue = insertBefore ? [...value, ...currentArr] : [...currentArr, ...value];
-        field[key] = newValue;
+        fieldAny[key] = newValue;
       } else {
-        field[key] = value;
+        fieldAny[key] = value;
       }
       return;
     }
@@ -277,24 +277,21 @@ var FlowList = (function (exports) {
     const valueObj = value;
     if (isArray(value)) {
       const currentArr = isArray(resultField) ? resultField : [];
+      const valueArr = value;
       if (insertBefore) {
-        if (value.length === 0) {
-          return;
-        }
+        if (valueArr.length === 0) return;
         if (currentArr.length === 0) {
-          field.result = value;
+          field.result = valueArr;
           return;
         }
-        field.result = value.concat(currentArr);
+        field.result = valueArr.concat(currentArr);
       } else {
-        if (value.length === 0) {
-          return;
-        }
+        if (valueArr.length === 0) return;
         if (currentArr.length === 0) {
-          field.result = value;
+          field.result = valueArr;
           return;
         }
-        field.result = currentArr.concat(value);
+        field.result = currentArr.concat(valueArr);
       }
       return;
     }
@@ -361,27 +358,28 @@ var FlowList = (function (exports) {
   }) => {
     const result = { ...query };
     const isFetched = field.fetched;
+    const fieldResultAny = field.result;
     const getSafeObjectKey = (item) => {
       return extractUniqueKey(item, uniqueKey);
     };
     if (isFetched) {
       if (type === enum_default.FETCH_TYPE.AUTO) {
-        if (isResultArray(field.result)) {
-          result.seen_ids = getSeenIdsString(field.result, uniqueKey);
-          const targetIndex = query.is_up ? 0 : field.result.length - 1;
-          const targetItem = field.result[targetIndex];
+        if (isArray(fieldResultAny)) {
+          result.seen_ids = getSeenIdsString(fieldResultAny, uniqueKey);
+          const targetIndex = query.is_up ? 0 : fieldResultAny.length - 1;
+          const targetItem = fieldResultAny[targetIndex];
           result.since_id = getSafeObjectKey(targetItem);
         }
         result.is_up = query.is_up ? 1 : 0;
         result.page = typeof query.page === "number" ? query.page : field.page + 1;
       } else if (type === enum_default.FETCH_TYPE.HAS_LOADED_IDS) {
-        if (isResultArray(field.result)) {
-          result.seen_ids = getSeenIdsString(field.result, uniqueKey);
+        if (isArray(fieldResultAny)) {
+          result.seen_ids = getSeenIdsString(fieldResultAny, uniqueKey);
         }
       } else if (type === enum_default.FETCH_TYPE.SINCE_FIRST_OR_END_ID) {
-        if (isResultArray(field.result)) {
-          const targetIndex = query.is_up ? 0 : field.result.length - 1;
-          const targetItem = field.result[targetIndex];
+        if (isArray(fieldResultAny)) {
+          const targetIndex = query.is_up ? 0 : fieldResultAny.length - 1;
+          const targetItem = fieldResultAny[targetIndex];
           result.since_id = getSafeObjectKey(targetItem);
         }
         result.is_up = query.is_up ? 1 : 0;
@@ -409,6 +407,24 @@ var FlowList = (function (exports) {
     }
     return result;
   };
+  var toObjectKey = (id) => {
+    if (id === void 0) return void 0;
+    if (isObjectKey(id)) return id;
+    if (isObjectKeyArray(id) && id.length > 0) return id[0];
+    return void 0;
+  };
+  var getResultAsArray = (field) => {
+    const result = field[enum_default.FIELD_DATA.RESULT_KEY];
+    return isArray(result) ? result : null;
+  };
+  var updateArrayItem = (arr, index, updater) => {
+    if (index >= 0 && index < arr.length) {
+      const item = arr[index];
+      if (isKeyMap(item)) {
+        arr[index] = updater(item);
+      }
+    }
+  };
 
   // src/setters.ts
   var SET_DATA = ({
@@ -490,6 +506,39 @@ var FlowList = (function (exports) {
   };
 
   // src/actions.ts
+  var generateFieldName2 = ({
+    func,
+    query
+  }) => {
+    let result = func.id;
+    if (!query) return result;
+    const queryObj = query;
+    const filteredKeys = Object.keys(queryObj).filter((key) => !func.paramsIgnore.includes(key)).sort();
+    for (const key of filteredKeys) {
+      const value = queryObj[key];
+      const safeValue = typeof value === "object" && value !== null ? stableSerialize(value) : String(value);
+      result += `-${key}-${encodeURIComponent(safeValue)}`;
+    }
+    return result;
+  };
+  var createApi = (options) => {
+    const fn = ((params) => options.fetcher(params));
+    const metadata = {
+      id: options.id,
+      type: options.type || enum_default.FETCH_TYPE.SCROLL_LOAD_MORE,
+      uniqueKey: options.uniqueKey || enum_default.DEFAULT_UNIQUE_KEY_NAME,
+      paramsIgnore: [
+        "page",
+        "is_up",
+        "since_id",
+        "seen_ids",
+        "__refresh__",
+        "__reload__",
+        ...options.paramsIgnore || []
+      ]
+    };
+    return Object.freeze(Object.assign(fn, metadata));
+  };
   var initState = ({
     getter,
     setter,
@@ -498,19 +547,13 @@ var FlowList = (function (exports) {
     opts
   }) => {
     return new Promise((resolve) => {
-      const fieldName = generateFieldName({ func, query });
-      const fieldData = getter(fieldName);
-      if (fieldData) {
-        resolve();
-        return;
-      }
+      const fieldName = generateFieldName2({ func, query });
+      if (getter(fieldName)) return resolve();
       setter({
         key: fieldName,
         type: enum_default.SETTER_TYPE.RESET,
         value: generateDefaultField(opts),
-        callback: () => {
-          resolve();
-        }
+        callback: () => resolve()
       });
     });
   };
@@ -521,17 +564,17 @@ var FlowList = (function (exports) {
     query,
     callback
   }) => new Promise((resolve, reject) => {
-    const fieldName = generateFieldName({ func, query });
+    const fieldName = generateFieldName2({ func, query });
     const fieldData = getter(fieldName);
-    const queryAsParams = query;
-    const doRefresh = !!queryAsParams?.__refresh__;
-    const needReset = !!queryAsParams?.__reload__;
+    const doRefresh = !!query?.__refresh__;
+    const needReset = !!query?.__reload__;
+    const directlyLoadData = doRefresh && !needReset;
+    if (fieldData && fieldData.error && !doRefresh) return resolve();
     if (fieldData && fieldData.loading) return resolve();
     if (fieldData && fieldData.fetched && !doRefresh) return resolve();
     const params = generateRequestParams({
-      field: fieldData || generateDefaultField(),
+      field: generateDefaultField({ ...fieldData, fetched: false }),
       uniqueKey: func.uniqueKey,
-      // 自动从契约获取
       type: func.type,
       query
     });
@@ -547,15 +590,11 @@ var FlowList = (function (exports) {
             page: params.page || 0,
             insertBefore: false
           }).then(() => {
-            callback?.({
-              params,
-              data,
-              refresh: doRefresh
-            });
+            callback?.({ params, data, refresh: doRefresh });
             resolve();
           });
         };
-        if (doRefresh && !needReset) {
+        if (directlyLoadData) {
           setter({
             key: fieldName,
             type: enum_default.SETTER_TYPE.RESET,
@@ -570,16 +609,16 @@ var FlowList = (function (exports) {
         reject(error);
       });
     };
-    setter({
-      key: fieldName,
-      type: enum_default.SETTER_TYPE.RESET,
-      value: {
-        ...generateDefaultField(),
-        loading: true,
-        error: null
-      },
-      callback: executeFetch
-    });
+    if (directlyLoadData) {
+      executeFetch();
+    } else {
+      setter({
+        key: fieldName,
+        type: enum_default.SETTER_TYPE.RESET,
+        value: { ...generateDefaultField(), loading: true, error: null },
+        callback: executeFetch
+      });
+    }
   });
   var loadMore = ({
     getter,
@@ -589,40 +628,38 @@ var FlowList = (function (exports) {
     errorRetry,
     callback
   }) => new Promise((resolve, reject) => {
-    const fieldName = generateFieldName({ func, query });
+    const fieldName = generateFieldName2({ func, query });
     const fieldData = getter(fieldName);
     if (!fieldData || fieldData.loading || fieldData.nothing) return resolve();
     if (fieldData.noMore && !errorRetry) return resolve();
+    const type = func.type;
+    if (type === enum_default.FETCH_TYPE.PAGINATION && query?.page != null && Number(query.page) === fieldData.page) {
+      return resolve();
+    }
+    const loadingState = type === enum_default.FETCH_TYPE.PAGINATION ? { loading: true, error: null, result: [], extra: null } : { loading: true, error: null };
     const params = generateRequestParams({
       field: fieldData,
       uniqueKey: func.uniqueKey,
-      type: func.type,
+      type,
       query
     });
-    if (fieldData.extra) {
-      params[enum_default.FIELD_DATA.EXTRA_KEY] = fieldData.extra;
-    }
-    const queryAsParams = query;
+    if (fieldData.extra) params.extra = fieldData.extra;
     setter({
       key: fieldName,
       type: enum_default.SETTER_TYPE.MERGE,
-      value: { loading: true, error: null },
+      value: loadingState,
       callback: () => {
         func(params).then((data) => {
           SET_DATA({
             getter,
             setter,
             data,
+            type,
             fieldName,
-            type: func.type,
             page: params.page || 0,
-            insertBefore: !!queryAsParams?.is_up
+            insertBefore: !!query?.is_up
           }).then(() => {
-            callback?.({
-              params,
-              data,
-              refresh: false
-            });
+            callback?.({ params, data, refresh: false });
             resolve();
           });
         }).catch((error) => {
@@ -632,24 +669,6 @@ var FlowList = (function (exports) {
       }
     });
   });
-  var toObjectKey = (id) => {
-    if (id === void 0) return void 0;
-    if (isObjectKey(id)) return id;
-    if (isObjectKeyArray(id) && id.length > 0) return id[0];
-    return void 0;
-  };
-  var getResultAsArray = (field) => {
-    const result = field[enum_default.FIELD_DATA.RESULT_KEY];
-    return isResultArray(result) ? result : null;
-  };
-  var updateArrayItem = (arr, index, updater) => {
-    if (index >= 0 && index < arr.length) {
-      const item = arr[index];
-      if (isKeyMap(item)) {
-        arr[index] = updater(item);
-      }
-    }
-  };
   var updateState = ({
     getter,
     setter,
@@ -661,7 +680,7 @@ var FlowList = (function (exports) {
     changeKey
   }) => {
     return new Promise((resolve, reject) => {
-      const fieldName = generateFieldName({ func, query });
+      const fieldName = generateFieldName2({ func, query });
       const fieldData = getter(fieldName);
       if (!fieldData) {
         reject(new Error(`Field ${fieldName} not found.`));
@@ -820,30 +839,9 @@ var FlowList = (function (exports) {
     });
   };
 
-  // src/types.ts
-  function createApi(options) {
-    const fn = Object.assign(
-      (params) => options.fetcher(params),
-      {
-        id: options.id,
-        type: options.type || enum_default.FETCH_TYPE.SCROLL_LOAD_MORE,
-        uniqueKey: options.uniqueKey || enum_default.DEFAULT_UNIQUE_KEY_NAME,
-        paramsIgnore: [
-          "page",
-          "is_up",
-          "since_id",
-          "seen_ids",
-          "__refresh__",
-          "__reload__",
-          ...options.paramsIgnore || []
-        ]
-      }
-    );
-    return Object.freeze(fn);
-  }
-
   exports.ENUM = enum_default;
   exports.createApi = createApi;
+  exports.generateFieldName = generateFieldName2;
   exports.initData = initData;
   exports.initState = initState;
   exports.loadMore = loadMore;