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

package/dist/index.js

@@ -50,25 +50,27 @@ __export(utils_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);
@@ -114,6 +116,7 @@ var isObjectResult = (data) => {
 };
 var generateDefaultField = (opts = {}) => ({
   result: [],
+  // 默认为空数组，但强制转换为泛型 T
   noMore: false,
   nothing: false,
   loading: false,
@@ -160,11 +163,7 @@ var getObjectDeepValue = (field, keys) => {
     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;
 };
@@ -193,7 +192,7 @@ var updateObjectDeepValue = (field, changeKey, value) => {
   }
 };
 var searchValueByKey = (result, id, key) => {
-  if (isResultArray(result)) {
+  if (isArray(result)) {
     const index = computeMatchedItemIndex(id, result, key);
     return index >= 0 ? result[index] : void 0;
   }
@@ -257,18 +256,19 @@ var combineArrayData = (fieldArray, value, changingKey) => {
   }
 };
 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;
   }
@@ -276,24 +276,21 @@ var setReactivityField = (field, key, value, type, insertBefore) => {
   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;
   }
@@ -360,27 +357,28 @@ var generateRequestParams = ({
 }) => {
   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;
@@ -408,6 +406,24 @@ var generateRequestParams = ({
   }
   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 = ({
@@ -497,7 +513,7 @@ var initState = ({
   opts
 }) => {
   return new Promise((resolve) => {
-    const fieldName = generateFieldName({ func, query });
+    const fieldName = generateFieldName2({ func, query });
     const fieldData = getter(fieldName);
     if (fieldData) {
       resolve();
@@ -520,19 +536,23 @@ var initData = ({
   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
+    // 内部生成逻辑兼容
   });
   const executeFetch = () => {
     func(params).then((data) => {
@@ -554,7 +574,7 @@ var initData = ({
           resolve();
         });
       };
-      if (doRefresh && !needReset) {
+      if (directlyLoadData) {
         setter({
           key: fieldName,
           type: enum_default.SETTER_TYPE.RESET,
@@ -569,16 +589,20 @@ var initData = ({
       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,
@@ -588,34 +612,52 @@ var loadMore = ({
   errorRetry,
   callback
 }) => new Promise((resolve, reject) => {
-  const fieldName = generateFieldName({ func, query });
+  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 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;
   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,
@@ -631,24 +673,6 @@ var loadMore = ({
     }
   });
 });
-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,
@@ -660,7 +684,7 @@ var updateState = ({
   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.`));
@@ -672,7 +696,7 @@ var updateState = ({
     }
     const _id = id;
     const _uniqueKey = func.uniqueKey || enum_default.DEFAULT_UNIQUE_KEY_NAME;
-    const _changeKey = changeKey || enum_default.FIELD_DATA.RESULT_KEY;
+    changeKey || enum_default.FIELD_DATA.RESULT_KEY;
     const beforeLength = computeResultLength(
       fieldData[enum_default.FIELD_DATA.RESULT_KEY]
     );
@@ -687,121 +711,6 @@ var updateState = ({
       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]
@@ -818,31 +727,51 @@ var updateState = ({
     });
   });
 };
-
-// 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 || []
-      ]
+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);
     }
-  );
-  return Object.freeze(fn);
-}
+    const encoded = encodeURIComponent(safeValue);
+    result += `-${key}-${encoded}`;
+  }
+  return result;
+};
 
 exports.ENUM = enum_default;
 exports.createApi = createApi;
+exports.generateFieldName = generateFieldName2;
 exports.initData = initData;
 exports.initState = initState;
 exports.loadMore = loadMore;