@flowlist/js-core 3.0.8 → 3.0.10

package/dist/index.d.mts

@@ -172,43 +172,18 @@ declare const initData: ({ getter, setter, func, type, query, api, uniqueKey, ca
 declare const loadMore: ({ getter, setter, query, type, func, api, uniqueKey, errorRetry, callback }: LoadMoreType) => Promise<void>;
 declare const updateState: ({ getter, setter, func, type, query, method, value, id, uniqueKey, changeKey }: UpdateStateType) => Promise<unknown>;
 
-/**
- * 判断数据是否为对象结果（即没有 result 字段）
- * 注意：这里我们假设 "对象结果" 指的是一个普通的对象，而不是 ApiResponse。
- */
+declare const isArray: (data: unknown) => data is unknown[];
 declare const isObjectResult: (data: unknown) => data is Record<string, unknown>;
-/**
- * 生成默认字段
- */
 declare const generateDefaultField: (opts?: Partial<DefaultField>) => DefaultField;
-/**
- * 根据参数生成 field 的 namespace
- */
 declare const generateFieldName: ({ func, type, query }: InitDataParams) => string;
-/**
- * 根据 key 从 object 里拿 value
- */
 declare const getObjectDeepValue: (field: unknown, keys?: string | string[]) => unknown;
-/**
- * 安全地更新对象的深层值
- */
 declare const updateObjectDeepValue: (field: Record<string, unknown>, changeKey: string, value: unknown) => void;
 type ResultArrayType = KeyMap[];
 type ResultObjectType = Record<ObjectKey, KeyMap[]>;
 declare const searchValueByKey: (result: ResultArrayType | ResultObjectType, id: ObjectKey, key: string) => unknown;
 declare const computeMatchedItemIndex: (itemId: ObjectKey, fieldArr: ResultArrayType, changingKey: string) => number;
 declare const combineArrayData: (fieldArray: ResultArrayType, value: ResultArrayType | Record<ObjectKey, KeyMap>, changingKey: string) => void;
-/**
- * 判断参数是否为数组
- */
-declare const isArray: (data: unknown) => data is unknown[];
-/**
- * 设置一个响应式的数据到对象上
- */
 declare const setReactivityField: (field: DefaultField, key: FieldKeys, value: unknown, type: FetchType, insertBefore: boolean) => void;
-/**
- * 计算一个数据列的长度
- */
 declare const computeResultLength: (data: unknown) => number;
 declare const generateRequestParams: ({ field, uniqueKey, query, type }: GenerateParamsType) => GenerateParamsResp;
 

package/dist/index.d.ts

@@ -172,43 +172,18 @@ declare const initData: ({ getter, setter, func, type, query, api, uniqueKey, ca
 declare const loadMore: ({ getter, setter, query, type, func, api, uniqueKey, errorRetry, callback }: LoadMoreType) => Promise<void>;
 declare const updateState: ({ getter, setter, func, type, query, method, value, id, uniqueKey, changeKey }: UpdateStateType) => Promise<unknown>;
 
-/**
- * 判断数据是否为对象结果（即没有 result 字段）
- * 注意：这里我们假设 "对象结果" 指的是一个普通的对象，而不是 ApiResponse。
- */
+declare const isArray: (data: unknown) => data is unknown[];
 declare const isObjectResult: (data: unknown) => data is Record<string, unknown>;
-/**
- * 生成默认字段
- */
 declare const generateDefaultField: (opts?: Partial<DefaultField>) => DefaultField;
-/**
- * 根据参数生成 field 的 namespace
- */
 declare const generateFieldName: ({ func, type, query }: InitDataParams) => string;
-/**
- * 根据 key 从 object 里拿 value
- */
 declare const getObjectDeepValue: (field: unknown, keys?: string | string[]) => unknown;
-/**
- * 安全地更新对象的深层值
- */
 declare const updateObjectDeepValue: (field: Record<string, unknown>, changeKey: string, value: unknown) => void;
 type ResultArrayType = KeyMap[];
 type ResultObjectType = Record<ObjectKey, KeyMap[]>;
 declare const searchValueByKey: (result: ResultArrayType | ResultObjectType, id: ObjectKey, key: string) => unknown;
 declare const computeMatchedItemIndex: (itemId: ObjectKey, fieldArr: ResultArrayType, changingKey: string) => number;
 declare const combineArrayData: (fieldArray: ResultArrayType, value: ResultArrayType | Record<ObjectKey, KeyMap>, changingKey: string) => void;
-/**
- * 判断参数是否为数组
- */
-declare const isArray: (data: unknown) => data is unknown[];
-/**
- * 设置一个响应式的数据到对象上
- */
 declare const setReactivityField: (field: DefaultField, key: FieldKeys, value: unknown, type: FetchType, insertBefore: boolean) => void;
-/**
- * 计算一个数据列的长度
- */
 declare const computeResultLength: (data: unknown) => number;
 declare const generateRequestParams: ({ field, uniqueKey, query, type }: GenerateParamsType) => GenerateParamsResp;
 

package/dist/index.global.js

@@ -59,6 +59,42 @@ var FlowList = (function (exports) {
   };
 
   // src/utils.ts
+  var isArray = (data) => {
+    return Array.isArray(data);
+  };
+  var stableSerialize = (value) => {
+    if (value === null || typeof value !== "object") {
+      return String(value);
+    }
+    try {
+      if (Array.isArray(value)) {
+        return JSON.stringify(value);
+      }
+      const keys = Object.keys(value).sort();
+      const obj = {};
+      for (const k of keys) {
+        obj[k] = value[k];
+      }
+      return JSON.stringify(obj);
+    } catch {
+      return "[Circular Object/Value]";
+    }
+  };
+  var extractUniqueKey = (item, uniqueKey) => {
+    if (typeof item !== "object" || item === null) return void 0;
+    const changing = uniqueKey || enum_default.DEFAULT_UNIQUE_KEY_NAME;
+    const val = item[changing] ?? void 0;
+    if (typeof val === "string" || typeof val === "number") {
+      return val;
+    }
+    if (typeof changing === "string" && changing.includes(".")) {
+      const deepVal = getObjectDeepValue(item, changing);
+      if (typeof deepVal === "string" || typeof deepVal === "number") {
+        return deepVal;
+      }
+    }
+    return void 0;
+  };
   var isObjectResult = (data) => {
     if (typeof data !== "object" || data === null) {
       return false;
@@ -84,11 +120,11 @@ var FlowList = (function (exports) {
     type,
     query = {}
   }) => {
-    const funcName = typeof func === "string" ? func : `api-${Math.random().toString(36).substring(2)}`;
+    const funcName = typeof func === "string" ? func : (typeof func === "function" ? func.name : void 0) || `api-${Math.random().toString(36).substring(2, 8)}`;
     const fetchType = type || "auto";
     let result = `${funcName}-${fetchType}`;
     const filteredKeys = Object.keys(query).filter(
-      (key) => !["undefined", "function"].includes(typeof query[key]) && ![
+      (key) => query[key] !== void 0 && typeof query[key] !== "function" && ![
         "page",
         "is_up",
         "since_id",
@@ -97,12 +133,19 @@ var FlowList = (function (exports) {
         "__reload__"
       ].includes(key)
     );
-    filteredKeys.sort().forEach((key) => {
+    filteredKeys.sort();
+    const querySuffix = filteredKeys.map((key) => {
       const value = query[key];
-      const safeValue = typeof value === "object" ? JSON.stringify(value) : String(value);
+      let safeValue;
+      if (typeof value === "object" && value !== null) {
+        safeValue = stableSerialize(value);
+      } else {
+        safeValue = String(value);
+      }
       const encoded = encodeURIComponent(safeValue);
-      result += `-${key}-${encoded}`;
-    });
+      return `-${key}-${encoded}`;
+    }).join("");
+    result += querySuffix;
     return result;
   };
   var getObjectDeepValue = (field, keys = "") => {
@@ -125,7 +168,7 @@ var FlowList = (function (exports) {
     const lastKey = keys.pop();
     let current = field;
     for (const key of keys) {
-      if (current == null || typeof current !== "object") {
+      if (current[key] == null || typeof current[key] !== "object") {
         current[key] = {};
       }
       current = current[key];
@@ -157,14 +200,21 @@ var FlowList = (function (exports) {
     return -1;
   };
   var combineArrayData = (fieldArray, value, changingKey) => {
+    const fieldArrayMap = /* @__PURE__ */ new Map();
+    for (let i = 0; i < fieldArray.length; i++) {
+      const item = fieldArray[i];
+      if (typeof item !== "object" || item === null) continue;
+      const id = getObjectDeepValue(item, changingKey);
+      if (id !== void 0) {
+        fieldArrayMap.set(String(id), i);
+      }
+    }
     if (isArray(value)) {
       for (const col of value) {
         if (typeof col !== "object" || col === null) continue;
         const stringifyId = String(getObjectDeepValue(col, changingKey));
-        const index = fieldArray.findIndex(
-          (item) => typeof item === "object" && item !== null && String(getObjectDeepValue(item, changingKey)) === stringifyId
-        );
-        if (index !== -1) {
+        const index = fieldArrayMap.get(stringifyId);
+        if (index !== void 0 && index !== -1) {
           fieldArray[index] = { ...fieldArray[index], ...col };
         }
       }
@@ -172,48 +222,53 @@ var FlowList = (function (exports) {
       for (const [uniqueId, col] of Object.entries(value)) {
         if (typeof col !== "object" || col === null) continue;
         const stringifyId = String(uniqueId);
-        const index = fieldArray.findIndex(
-          (item) => typeof item === "object" && item !== null && String(getObjectDeepValue(item, changingKey)) === stringifyId
-        );
-        if (index !== -1) {
+        const index = fieldArrayMap.get(stringifyId);
+        if (index !== void 0 && index !== -1) {
           fieldArray[index] = { ...fieldArray[index], ...col };
         }
       }
     }
   };
-  var isArray = (data) => {
-    return Array.isArray(data);
-  };
   var setReactivityField = (field, key, value, type, insertBefore) => {
     if (type === enum_default.FETCH_TYPE.PAGINATION) {
       field[key] = value;
       return;
     }
-    if (isArray(value)) {
-      const current = field[key];
-      const currentArr = isArray(current) ? current : [];
-      const newValue = insertBefore ? value.concat(currentArr) : currentArr.concat(value);
-      field[key] = newValue;
-      return;
-    }
     if (key !== enum_default.FIELD_DATA.RESULT_KEY) {
-      field[key] = value;
+      if (isArray(value)) {
+        const current = field[key];
+        const currentArr = isArray(current) ? current : [];
+        const newValue = insertBefore ? [...value, ...currentArr] : [...currentArr, ...value];
+        field[key] = newValue;
+      } else {
+        field[key] = value;
+      }
       return;
     }
     const resultField = field.result;
+    const valueObj = value;
+    if (isArray(value)) {
+      const currentArr = isArray(resultField) ? resultField : [];
+      const newValue = insertBefore ? [...value, ...currentArr] : [...currentArr, ...value];
+      field.result = newValue;
+      return;
+    }
+    let target = resultField;
     if (isArray(resultField)) {
-      field.result = {};
+      target = {};
+      field.result = target;
+    } else if (typeof resultField !== "object" || resultField === null) {
+      target = {};
+      field.result = target;
     }
-    const valueObj = value;
-    const target = field.result;
     Object.keys(valueObj).forEach((subKey) => {
       const existing = target[subKey];
       const incoming = valueObj[subKey];
       if (existing !== void 0) {
         if (insertBefore) {
-          target[subKey] = isArray(incoming) && isArray(existing) ? incoming.concat(existing) : incoming;
+          target[subKey] = isArray(incoming) && isArray(existing) ? [...incoming, ...existing] : incoming;
         } else {
-          target[subKey] = isArray(existing) && isArray(incoming) ? existing.concat(incoming) : incoming;
+          target[subKey] = isArray(existing) && isArray(incoming) ? [...existing, ...incoming] : incoming;
         }
       } else {
         target[subKey] = incoming;
@@ -225,15 +280,27 @@ var FlowList = (function (exports) {
       return data.length;
     }
     if (data && typeof data === "object") {
-      return Object.values(data).reduce((acc, val) => {
+      let acc = 0;
+      for (const val of Object.values(data)) {
         if (isArray(val)) {
-          return acc + val.length;
+          acc += val.length;
         }
-        return acc;
-      }, 0);
+      }
+      return acc;
     }
     return 0;
   };
+  var getSeenIdsString = (arr, uniqueKey) => {
+    if (!isArray(arr)) return "";
+    const ids = [];
+    for (const item of arr) {
+      const id = extractUniqueKey(item, uniqueKey);
+      if (id !== void 0) {
+        ids.push(id);
+      }
+    }
+    return ids.join(",");
+  };
   var generateRequestParams = ({
     field,
     uniqueKey,
@@ -241,20 +308,14 @@ var FlowList = (function (exports) {
     type
   }) => {
     const result = {};
-    const changing = uniqueKey || enum_default.DEFAULT_UNIQUE_KEY_NAME;
     const isFetched = field.fetched;
     const getSafeObjectKey = (item) => {
-      if (typeof item !== "object" || item === null) return void 0;
-      const val = getObjectDeepValue(item, changing);
-      if (typeof val === "string" || typeof val === "number") {
-        return val;
-      }
-      return void 0;
+      return extractUniqueKey(item, uniqueKey);
     };
     if (isFetched) {
       if (type === enum_default.FETCH_TYPE.AUTO) {
         if (isArray(field.result)) {
-          result.seen_ids = field.result.map((item) => getSafeObjectKey(item)).filter((id) => id !== void 0).join(",");
+          result.seen_ids = getSeenIdsString(field.result, uniqueKey);
           const targetIndex = query.is_up ? 0 : field.result.length - 1;
           const targetItem = field.result[targetIndex];
           result.since_id = getSafeObjectKey(targetItem);
@@ -263,7 +324,7 @@ var FlowList = (function (exports) {
         result.page = typeof query.page === "number" ? query.page : field.page + 1;
       } else if (type === enum_default.FETCH_TYPE.HAS_LOADED_IDS) {
         if (isArray(field.result)) {
-          result.seen_ids = field.result.map((item) => getSafeObjectKey(item)).filter((id) => id !== void 0).join(",");
+          result.seen_ids = getSeenIdsString(field.result, uniqueKey);
         }
       } else if (type === enum_default.FETCH_TYPE.SINCE_FIRST_OR_END_ID) {
         if (isArray(field.result)) {
@@ -386,7 +447,6 @@ var FlowList = (function (exports) {
     getter,
     setter,
     func,
-    // string only
     type,
     query,
     opts
@@ -412,7 +472,6 @@ var FlowList = (function (exports) {
     getter,
     setter,
     func,
-    // string | function
     type,
     query,
     api,
@@ -446,7 +505,7 @@ var FlowList = (function (exports) {
       type
     });
     const getData = () => {
-      const loadData = () => new Promise((res, rej) => {
+      const apiCaller = () => new Promise((res, rej) => {
         const getDataFromAPI = () => {
           const funcCaller = typeof func === "string" && api ? api[func] : func;
           if (typeof funcCaller === "function") {
@@ -458,7 +517,7 @@ var FlowList = (function (exports) {
         };
         getDataFromAPI();
       });
-      loadData().then((data) => {
+      apiCaller().then((data) => {
         const setData = () => {
           SET_DATA({
             getter,
@@ -473,14 +532,13 @@ var FlowList = (function (exports) {
               callback({
                 params,
                 data,
-                // <-- 'data' is now properly in scope
                 refresh: doRefresh
               });
             }
             resolve();
           });
         };
-        if (needReset) {
+        if (doRefresh && !needReset) {
           setter({
             key: fieldName,
             type: enum_default.SETTER_TYPE.RESET,
@@ -492,19 +550,20 @@ var FlowList = (function (exports) {
         }
       }).catch(reject);
     };
-    if (!dontFetch && !needReset) {
+    if (doRefresh && !needReset) {
+      getData();
+    } else {
       setter({
         key: fieldName,
         type: enum_default.SETTER_TYPE.RESET,
         value: {
           ...generateDefaultField(),
           loading: true,
-          error: null
+          error: null,
+          extra: null
         },
         callback: getData
       });
-    } else {
-      getData();
     }
   });
   var loadMore = ({