@flowlist/js-core 4.0.5-beta.0 → 4.0.7-beta.0

package/dist/index.global.js

@@ -354,6 +354,7 @@ var FlowList = (function (exports) {
     field,
     uniqueKey = enum_default.DEFAULT_UNIQUE_KEY_NAME,
     query = {},
+    is_up = false,
     type
   }) => {
     const result = { ...query };
@@ -366,11 +367,11 @@ var FlowList = (function (exports) {
       if (type === enum_default.FETCH_TYPE.AUTO) {
         if (isArray(fieldResultAny)) {
           result.seen_ids = getSeenIdsString(fieldResultAny, uniqueKey);
-          const targetIndex = query.is_up ? 0 : fieldResultAny.length - 1;
+          const targetIndex = is_up ? 0 : fieldResultAny.length - 1;
           const targetItem = fieldResultAny[targetIndex];
           result.since_id = getSafeObjectKey(targetItem);
         }
-        result.is_up = query.is_up ? 1 : 0;
+        result.is_up = 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 (isArray(fieldResultAny)) {
@@ -378,11 +379,11 @@ var FlowList = (function (exports) {
         }
       } else if (type === enum_default.FETCH_TYPE.SINCE_FIRST_OR_END_ID) {
         if (isArray(fieldResultAny)) {
-          const targetIndex = query.is_up ? 0 : fieldResultAny.length - 1;
+          const targetIndex = is_up ? 0 : fieldResultAny.length - 1;
           const targetItem = fieldResultAny[targetIndex];
           result.since_id = getSafeObjectKey(targetItem);
         }
-        result.is_up = query.is_up ? 1 : 0;
+        result.is_up = is_up ? 1 : 0;
       } else if (type === enum_default.FETCH_TYPE.PAGINATION) {
         result.page = typeof query.page === "number" ? query.page : void 0;
       } else if (type === enum_default.FETCH_TYPE.SCROLL_LOAD_MORE) {
@@ -391,14 +392,14 @@ var FlowList = (function (exports) {
     } else {
       if (type === enum_default.FETCH_TYPE.AUTO) {
         result.seen_ids = "";
-        result.since_id = isObjectKey(query.sinceId) ? query.sinceId : query.is_up ? 999999999 : 0;
-        result.is_up = query.is_up ? 1 : 0;
+        result.since_id = isObjectKey(query.sinceId) ? query.sinceId : "";
+        result.is_up = 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) {
         result.seen_ids = "";
       } else if (type === enum_default.FETCH_TYPE.SINCE_FIRST_OR_END_ID) {
-        result.since_id = isObjectKey(query.sinceId) ? query.sinceId : query.is_up ? 999999999 : 0;
-        result.is_up = query.is_up ? 1 : 0;
+        result.since_id = isObjectKey(query.sinceId) ? query.sinceId : "";
+        result.is_up = is_up ? 1 : 0;
       } else if (type === enum_default.FETCH_TYPE.PAGINATION) {
         result.page = typeof query.page === "number" ? query.page : field.page;
       } else if (type === enum_default.FETCH_TYPE.SCROLL_LOAD_MORE) {
@@ -506,6 +507,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,
+      is_up: options.is_up || false,
+      paramsIgnore: [
+        "page",
+        "since_id",
+        "seen_ids",
+        "__refresh__",
+        "__reload__",
+        ...options.paramsIgnore || []
+      ]
+    };
+    return Object.freeze(Object.assign(fn, metadata));
+  };
   var initState = ({
     getter,
     setter,
@@ -515,18 +549,12 @@ var FlowList = (function (exports) {
   }) => {
     return new Promise((resolve) => {
       const fieldName = generateFieldName2({ func, query });
-      const fieldData = getter(fieldName);
-      if (fieldData) {
-        resolve();
-        return;
-      }
+      if (getter(fieldName)) return resolve();
       setter({
         key: fieldName,
         type: enum_default.SETTER_TYPE.RESET,
         value: generateDefaultField(opts),
-        callback: () => {
-          resolve();
-        }
+        callback: () => resolve()
       });
     });
   };
@@ -546,14 +574,11 @@ var FlowList = (function (exports) {
     if (fieldData && fieldData.loading) return resolve();
     if (fieldData && fieldData.fetched && !doRefresh) return resolve();
     const params = generateRequestParams({
-      field: generateDefaultField({
-        ...fieldData,
-        fetched: false
-      }),
+      field: generateDefaultField({ ...fieldData, fetched: false }),
       uniqueKey: func.uniqueKey,
       type: func.type,
+      is_up: func.is_up,
       query
-      // 内部生成逻辑兼容
     });
     const executeFetch = () => {
       func(params).then((data) => {
@@ -567,11 +592,7 @@ var FlowList = (function (exports) {
             page: params.page || 0,
             insertBefore: false
           }).then(() => {
-            callback?.({
-              params,
-              data,
-              refresh: doRefresh
-            });
+            callback?.({ params, data, refresh: doRefresh });
             resolve();
           });
         };
@@ -596,11 +617,7 @@ var FlowList = (function (exports) {
       setter({
         key: fieldName,
         type: enum_default.SETTER_TYPE.RESET,
-        value: {
-          ...generateDefaultField(),
-          loading: true,
-          error: null
-        },
+        value: { ...generateDefaultField(), loading: true, error: null },
         callback: executeFetch
       });
     }
@@ -615,36 +632,21 @@ var FlowList = (function (exports) {
   }) => new Promise((resolve, reject) => {
     const fieldName = generateFieldName2({ func, query });
     const fieldData = getter(fieldName);
-    const type = func.type;
     if (!fieldData || fieldData.loading || fieldData.nothing) return resolve();
     if (fieldData.noMore && !errorRetry) return resolve();
-    if (type === enum_default.FETCH_TYPE.PAGINATION && query && query.page != null && Number(query.page) === fieldData.page) {
-      resolve();
-      return;
-    }
-    let loadingState;
-    if (type === enum_default.FETCH_TYPE.PAGINATION) {
-      loadingState = {
-        loading: true,
-        error: null,
-        [enum_default.FIELD_DATA.RESULT_KEY]: [],
-        [enum_default.FIELD_DATA.EXTRA_KEY]: null
-      };
-    } else {
-      loadingState = {
-        loading: true,
-        error: null
-      };
+    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,
+      is_up: func.is_up,
       query
     });
-    if (fieldData.extra) {
-      params[enum_default.FIELD_DATA.EXTRA_KEY] = fieldData.extra;
-    }
+    if (fieldData.extra) params.extra = fieldData.extra;
     setter({
       key: fieldName,
       type: enum_default.SETTER_TYPE.MERGE,
@@ -658,13 +660,9 @@ var FlowList = (function (exports) {
             type,
             fieldName,
             page: params.page || 0,
-            insertBefore: !!query?.is_up
+            insertBefore: func.is_up
           }).then(() => {
-            callback?.({
-              params,
-              data,
-              refresh: false
-            });
+            callback?.({ params, data, refresh: false });
             resolve();
           });
         }).catch((error) => {
@@ -697,7 +695,7 @@ var FlowList = (function (exports) {
       }
       const _id = id;
       const _uniqueKey = func.uniqueKey || enum_default.DEFAULT_UNIQUE_KEY_NAME;
-      changeKey || enum_default.FIELD_DATA.RESULT_KEY;
+      const _changeKey = changeKey || enum_default.FIELD_DATA.RESULT_KEY;
       const beforeLength = computeResultLength(
         fieldData[enum_default.FIELD_DATA.RESULT_KEY]
       );
@@ -712,6 +710,121 @@ var FlowList = (function (exports) {
         const searchResult = resultArray ? searchValueByKey(resultArray, objectKeyId, _uniqueKey) : void 0;
         resolve(searchResult);
         return;
+      } else if (method === enum_default.CHANGE_TYPE.RESULT_UPDATE_KV) {
+        const objectKeyId = toObjectKey(_id);
+        if (objectKeyId === void 0) {
+          reject(new Error("ID is required for RESULT_UPDATE_KV."));
+          return;
+        }
+        if (resultArray) {
+          const matchedIndex = computeMatchedItemIndex(
+            objectKeyId,
+            resultArray,
+            _uniqueKey
+          );
+          if (matchedIndex >= 0 && isKeyMap(resultArray[matchedIndex])) {
+            updateObjectDeepValue(resultArray[matchedIndex], _changeKey, value);
+          }
+        }
+        resolve(null);
+      } else if (method === enum_default.CHANGE_TYPE.RESULT_ITEM_MERGE) {
+        const objectKeyId = toObjectKey(_id);
+        if (objectKeyId === void 0) {
+          reject(new Error("ID is required for RESULT_ITEM_MERGE."));
+          return;
+        }
+        if (resultArray && isKeyMap(value)) {
+          const matchedIndex = computeMatchedItemIndex(
+            objectKeyId,
+            resultArray,
+            _uniqueKey
+          );
+          updateArrayItem(resultArray, matchedIndex, (item) => ({
+            ...item,
+            ...value
+          }));
+        }
+        resolve(null);
+      } else if (method === enum_default.CHANGE_TYPE.RESET_FIELD) {
+        if (_changeKey === enum_default.FIELD_DATA.RESULT_KEY && isKeyMapArray(value)) {
+          newFieldData.result = value;
+        } else if (_changeKey === enum_default.FIELD_DATA.EXTRA_KEY && isKeyMap(value)) {
+          newFieldData.extra = value;
+        }
+        resolve(null);
+      } else {
+        let modifyValue;
+        if (_changeKey === enum_default.FIELD_DATA.RESULT_KEY) {
+          modifyValue = newFieldData.result;
+        } else if (_changeKey === enum_default.FIELD_DATA.EXTRA_KEY) {
+          modifyValue = newFieldData.extra;
+        } else {
+          modifyValue = getObjectDeepValue(newFieldData, _changeKey);
+        }
+        if (modifyValue == null) {
+          modifyValue = [];
+        }
+        const objectKeyId = toObjectKey(_id);
+        const matchedIndex = objectKeyId !== void 0 && isKeyMapArray(modifyValue) ? computeMatchedItemIndex(objectKeyId, modifyValue, _uniqueKey) : -1;
+        switch (method) {
+          case enum_default.CHANGE_TYPE.RESULT_ADD_AFTER:
+            if (isArray(modifyValue)) {
+              modifyValue = isArray(value) ? [...modifyValue, ...value] : [...modifyValue, value];
+            }
+            break;
+          case enum_default.CHANGE_TYPE.RESULT_ADD_BEFORE:
+            if (isArray(modifyValue)) {
+              modifyValue = isArray(value) ? [...value, ...modifyValue] : [value, ...modifyValue];
+            }
+            break;
+          case enum_default.CHANGE_TYPE.RESULT_REMOVE_BY_ID:
+            if (isKeyMapArray(modifyValue)) {
+              if (matchedIndex >= 0) {
+                modifyValue.splice(matchedIndex, 1);
+              } else if (isObjectKeyArray(_id)) {
+                const idSet = new Set(_id);
+                modifyValue = modifyValue.filter((item) => {
+                  const itemKey = getObjectDeepValue(item, _uniqueKey);
+                  return !isObjectKey(itemKey) || !idSet.has(itemKey);
+                });
+              }
+            }
+            break;
+          case enum_default.CHANGE_TYPE.RESULT_INSERT_TO_BEFORE:
+            if (isArray(modifyValue) && matchedIndex >= 0) {
+              modifyValue.splice(matchedIndex, 0, value);
+            }
+            break;
+          case enum_default.CHANGE_TYPE.RESULT_INSERT_TO_AFTER:
+            if (isArray(modifyValue) && matchedIndex >= 0) {
+              modifyValue.splice(matchedIndex + 1, 0, value);
+            }
+            break;
+          case enum_default.CHANGE_TYPE.RESULT_LIST_MERGE:
+            if (isKeyMapArray(modifyValue)) {
+              if (isKeyMapArray(value)) {
+                combineArrayData(modifyValue, value, _uniqueKey);
+              } else if (isKeyMap(value)) {
+                const valueAsRecord = {};
+                for (const [k, v] of Object.entries(value)) {
+                  if (isKeyMap(v)) {
+                    valueAsRecord[k] = v;
+                  }
+                }
+                combineArrayData(modifyValue, valueAsRecord, _uniqueKey);
+              }
+            }
+            break;
+          default:
+            resolve(null);
+            return;
+        }
+        if (_changeKey === enum_default.FIELD_DATA.RESULT_KEY && isKeyMapArray(modifyValue)) {
+          newFieldData.result = modifyValue;
+        } else if (_changeKey === enum_default.FIELD_DATA.EXTRA_KEY && isKeyMap(modifyValue)) {
+          newFieldData.extra = modifyValue;
+        }
+        resolve(null);
       }
       const afterLength = computeResultLength(
         newFieldData[enum_default.FIELD_DATA.RESULT_KEY]
@@ -728,47 +841,6 @@ var FlowList = (function (exports) {
       });
     });
   };
-  var createApi = (options) => {
-    const fn = (params) => options.fetcher(params);
-    fn.id = options.id;
-    fn.type = options.type || enum_default.FETCH_TYPE.SCROLL_LOAD_MORE;
-    fn.uniqueKey = options.uniqueKey || enum_default.DEFAULT_UNIQUE_KEY_NAME;
-    fn.paramsIgnore = [
-      "page",
-      "is_up",
-      "since_id",
-      "seen_ids",
-      "__refresh__",
-      "__reload__",
-      ...options.paramsIgnore || []
-    ];
-    return fn;
-  };
-  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();
-    const len = filteredKeys.length;
-    for (let i = 0; i < len; i++) {
-      const key = filteredKeys[i];
-      const value = queryObj[key];
-      let safeValue;
-      if (typeof value === "object" && value !== null) {
-        safeValue = stableSerialize(value);
-      } else {
-        safeValue = String(value);
-      }
-      const encoded = encodeURIComponent(safeValue);
-      result += `-${key}-${encoded}`;
-    }
-    return result;
-  };
 
   exports.ENUM = enum_default;
   exports.createApi = createApi;