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

package/dist/index.d.mts

@@ -4,6 +4,7 @@
 type ObjectKey = string | number;
 /**
  * 通用键值对映射 - 使用 Record 以保持灵活性和性能
+ * 通过索引签名支持动态属性访问
  */
 type KeyMap = Record<string, unknown>;
 /**
@@ -62,7 +63,8 @@ type FetchType = 'jump' | 'sinceId' | 'page' | 'seenIds' | 'auto';
 /**
  * 请求参数的基础约束
  */
-interface RequestParams extends KeyMap {
+interface RequestParams {
+    [key: string]: unknown;
     __refresh__?: boolean;
     __reload__?: boolean;
     is_up?: 0 | 1 | boolean;
@@ -105,75 +107,73 @@ type FetchResultCallback<P, R> = (_obj: {
     data: ApiResponse<R>;
     refresh: boolean;
 }) => void;
-interface CommonParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType> {
+interface CommonParams<P = RequestParams, R = ResultType> {
     readonly func: ApiContract<P, R>;
     readonly type?: FetchType;
     readonly query?: P;
     readonly uniqueKey?: string;
     readonly callback?: FetchResultCallback<P, R>;
 }
-interface BaseFetchConfig<P extends RequestParams = RequestParams, R extends ResultType = ResultType> extends CommonParams<P, R> {
+interface BaseFetchConfig<P = RequestParams, R = ResultType> extends CommonParams<P, R> {
     readonly getter: FieldGetter;
     readonly setter: FieldSetter;
 }
 /**
  * 初始化状态的参数对外接口
  */
-interface InitStateParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType> {
+interface InitStateParams<P = RequestParams, R = ResultType> {
     readonly func: ApiContract<P, R>;
-    readonly type: FetchType;
     readonly query?: P;
     readonly opts?: Partial<DefaultField>;
 }
 /**
  * 初始化状态的参数（内部）
  */
-interface InitStateType<P extends RequestParams = RequestParams, R extends ResultType = ResultType> extends InitStateParams<P, R> {
+interface InitStateType<P = RequestParams, R = ResultType> extends InitStateParams<P, R> {
     readonly getter: FieldGetter;
     readonly setter: FieldSetter;
 }
 /**
  * 初始化数据的参数对外接口
  */
-type InitDataParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType> = CommonParams<P, R>;
+type InitDataParams<P = RequestParams, R = ResultType> = CommonParams<P, R>;
 /**
  * 初始化数据的参数（内部）
  */
-type InitDataType<P extends RequestParams = RequestParams, R extends ResultType = ResultType> = BaseFetchConfig<P, R>;
+type InitDataType<P = RequestParams, R = ResultType> = BaseFetchConfig<P, R>;
 /**
  * 加载更多的参数对外接口
  */
-interface LoadMoreParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType> extends CommonParams<P, R> {
+interface LoadMoreParams<P = RequestParams, R = ResultType> extends CommonParams<P, R> {
     readonly errorRetry?: boolean;
 }
 /**
  * 加载更多的参数（内部）
  */
-interface LoadMoreType<P extends RequestParams = RequestParams, R extends ResultType = ResultType> extends BaseFetchConfig<P, R> {
+interface LoadMoreType<P = RequestParams, R = ResultType> extends BaseFetchConfig<P, R> {
     readonly errorRetry?: boolean;
 }
 /**
  * 更新状态的参数（内部使用）
  */
-interface UpdateStateType<P extends RequestParams = RequestParams, R extends ResultType = ResultType, T extends KeyMap = KeyMap> {
+interface UpdateStateType<P = RequestParams, R = ResultType, T = KeyMap> {
     readonly getter: FieldGetter;
     readonly setter: FieldSetter;
     readonly func: ApiContract<P, R>;
     readonly query?: P;
     readonly method: string;
-    readonly value: T;
+    readonly value: T | T[] | KeyMap | KeyMap[];
     readonly id?: ObjectKey | ObjectKey[];
     readonly changeKey?: string;
 }
 /**
  * 更新状态的参数（对外接口）
  */
-interface UpdateStateParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType, T extends KeyMap = KeyMap> {
+interface UpdateStateParams<P = RequestParams, R = ResultType, T = KeyMap> {
     readonly func: ApiContract<P, R>;
-    readonly type: FetchType;
     readonly query?: P;
     readonly method: string;
-    readonly value: T | ResultArrayType | ResultObjectType | KeyMap;
+    readonly value: T | T[] | KeyMap | KeyMap[];
     readonly id?: ObjectKey | ObjectKey[];
     readonly changeKey?: string;
     readonly uniqueKey?: string;
@@ -198,14 +198,14 @@ interface SetErrorType {
     readonly fieldName: string;
     readonly error: Error | null;
 }
-interface ApiContract<P extends RequestParams = RequestParams, R extends ResultType = ResultType> {
+interface ApiContract<P = RequestParams, R = ResultType> {
     (params: P): Promise<ApiResponse<R>>;
     readonly id: string;
     readonly type: FetchType;
     readonly uniqueKey: string;
     readonly paramsIgnore: string[];
 }
-declare function createApi<P extends RequestParams, R extends ResultType>(options: {
+declare function createApi<P = RequestParams, R = ResultType>(options: {
     id: string;
     type?: FetchType;
     uniqueKey?: string;
@@ -213,13 +213,13 @@ declare function createApi<P extends RequestParams, R extends ResultType>(option
     fetcher: (params: P) => Promise<ApiResponse<R>>;
 }): ApiContract<P, R>;
 
-declare const initState: <P extends RequestParams = RequestParams, R extends ResultType = ResultType>({ getter, setter, func, query, opts }: InitStateType<P, R>) => Promise<void>;
-declare const initData: <P extends RequestParams = RequestParams, R extends ResultType = ResultType>({ getter, setter, func, query, callback }: InitDataType<P, R>) => Promise<void>;
+declare const initState: <P = RequestParams, R = ResultType>({ getter, setter, func, query, opts }: InitStateType<P, R>) => Promise<void>;
+declare const initData: <P = RequestParams, R = ResultType>({ getter, setter, func, query, callback }: InitDataType<P, R>) => Promise<void>;
 /**
  * 加载更多数据
  */
-declare const loadMore: <P extends RequestParams = RequestParams, R extends ResultType = ResultType>({ getter, setter, query, func, errorRetry, callback }: LoadMoreType<P, R>) => Promise<void>;
-declare const updateState: <P extends RequestParams = RequestParams, R extends ResultType = ResultType, T extends KeyMap = KeyMap>({ getter, setter, func, query, method, value, id, changeKey }: UpdateStateType<P, R, T>) => Promise<unknown>;
+declare const loadMore: <P = RequestParams, R = ResultType>({ getter, setter, query, func, errorRetry, callback }: LoadMoreType<P, R>) => Promise<void>;
+declare const updateState: <P = RequestParams, R = ResultType, T = KeyMap>({ getter, setter, func, query, method, id, value, changeKey }: UpdateStateType<P, R, T>) => Promise<unknown>;
 
 declare const isArray: (data: unknown) => data is unknown[];
 /**
@@ -248,7 +248,7 @@ declare const isKeyMapArray: (value: unknown) => value is KeyMap[];
 declare const isObjectKeyArray: (value: unknown) => value is ObjectKey[];
 declare const isObjectResult: (data: unknown) => data is Record<string, unknown>;
 declare const generateDefaultField: (opts?: Partial<DefaultField>) => DefaultField;
-declare const generateFieldName: <P extends RequestParams = RequestParams, R extends ResultType = ResultType>({ func, query }: {
+declare const generateFieldName: <P = RequestParams, R = ResultType>({ func, query }: {
     func: ApiContract<P, R>;
     query?: P;
 }) => string;

package/dist/index.d.ts

@@ -4,6 +4,7 @@
 type ObjectKey = string | number;
 /**
  * 通用键值对映射 - 使用 Record 以保持灵活性和性能
+ * 通过索引签名支持动态属性访问
  */
 type KeyMap = Record<string, unknown>;
 /**
@@ -62,7 +63,8 @@ type FetchType = 'jump' | 'sinceId' | 'page' | 'seenIds' | 'auto';
 /**
  * 请求参数的基础约束
  */
-interface RequestParams extends KeyMap {
+interface RequestParams {
+    [key: string]: unknown;
     __refresh__?: boolean;
     __reload__?: boolean;
     is_up?: 0 | 1 | boolean;
@@ -105,75 +107,73 @@ type FetchResultCallback<P, R> = (_obj: {
     data: ApiResponse<R>;
     refresh: boolean;
 }) => void;
-interface CommonParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType> {
+interface CommonParams<P = RequestParams, R = ResultType> {
     readonly func: ApiContract<P, R>;
     readonly type?: FetchType;
     readonly query?: P;
     readonly uniqueKey?: string;
     readonly callback?: FetchResultCallback<P, R>;
 }
-interface BaseFetchConfig<P extends RequestParams = RequestParams, R extends ResultType = ResultType> extends CommonParams<P, R> {
+interface BaseFetchConfig<P = RequestParams, R = ResultType> extends CommonParams<P, R> {
     readonly getter: FieldGetter;
     readonly setter: FieldSetter;
 }
 /**
  * 初始化状态的参数对外接口
  */
-interface InitStateParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType> {
+interface InitStateParams<P = RequestParams, R = ResultType> {
     readonly func: ApiContract<P, R>;
-    readonly type: FetchType;
     readonly query?: P;
     readonly opts?: Partial<DefaultField>;
 }
 /**
  * 初始化状态的参数（内部）
  */
-interface InitStateType<P extends RequestParams = RequestParams, R extends ResultType = ResultType> extends InitStateParams<P, R> {
+interface InitStateType<P = RequestParams, R = ResultType> extends InitStateParams<P, R> {
     readonly getter: FieldGetter;
     readonly setter: FieldSetter;
 }
 /**
  * 初始化数据的参数对外接口
  */
-type InitDataParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType> = CommonParams<P, R>;
+type InitDataParams<P = RequestParams, R = ResultType> = CommonParams<P, R>;
 /**
  * 初始化数据的参数（内部）
  */
-type InitDataType<P extends RequestParams = RequestParams, R extends ResultType = ResultType> = BaseFetchConfig<P, R>;
+type InitDataType<P = RequestParams, R = ResultType> = BaseFetchConfig<P, R>;
 /**
  * 加载更多的参数对外接口
  */
-interface LoadMoreParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType> extends CommonParams<P, R> {
+interface LoadMoreParams<P = RequestParams, R = ResultType> extends CommonParams<P, R> {
     readonly errorRetry?: boolean;
 }
 /**
  * 加载更多的参数（内部）
  */
-interface LoadMoreType<P extends RequestParams = RequestParams, R extends ResultType = ResultType> extends BaseFetchConfig<P, R> {
+interface LoadMoreType<P = RequestParams, R = ResultType> extends BaseFetchConfig<P, R> {
     readonly errorRetry?: boolean;
 }
 /**
  * 更新状态的参数（内部使用）
  */
-interface UpdateStateType<P extends RequestParams = RequestParams, R extends ResultType = ResultType, T extends KeyMap = KeyMap> {
+interface UpdateStateType<P = RequestParams, R = ResultType, T = KeyMap> {
     readonly getter: FieldGetter;
     readonly setter: FieldSetter;
     readonly func: ApiContract<P, R>;
     readonly query?: P;
     readonly method: string;
-    readonly value: T;
+    readonly value: T | T[] | KeyMap | KeyMap[];
     readonly id?: ObjectKey | ObjectKey[];
     readonly changeKey?: string;
 }
 /**
  * 更新状态的参数（对外接口）
  */
-interface UpdateStateParams<P extends RequestParams = RequestParams, R extends ResultType = ResultType, T extends KeyMap = KeyMap> {
+interface UpdateStateParams<P = RequestParams, R = ResultType, T = KeyMap> {
     readonly func: ApiContract<P, R>;
-    readonly type: FetchType;
     readonly query?: P;
     readonly method: string;
-    readonly value: T | ResultArrayType | ResultObjectType | KeyMap;
+    readonly value: T | T[] | KeyMap | KeyMap[];
     readonly id?: ObjectKey | ObjectKey[];
     readonly changeKey?: string;
     readonly uniqueKey?: string;
@@ -198,14 +198,14 @@ interface SetErrorType {
     readonly fieldName: string;
     readonly error: Error | null;
 }
-interface ApiContract<P extends RequestParams = RequestParams, R extends ResultType = ResultType> {
+interface ApiContract<P = RequestParams, R = ResultType> {
     (params: P): Promise<ApiResponse<R>>;
     readonly id: string;
     readonly type: FetchType;
     readonly uniqueKey: string;
     readonly paramsIgnore: string[];
 }
-declare function createApi<P extends RequestParams, R extends ResultType>(options: {
+declare function createApi<P = RequestParams, R = ResultType>(options: {
     id: string;
     type?: FetchType;
     uniqueKey?: string;
@@ -213,13 +213,13 @@ declare function createApi<P extends RequestParams, R extends ResultType>(option
     fetcher: (params: P) => Promise<ApiResponse<R>>;
 }): ApiContract<P, R>;
 
-declare const initState: <P extends RequestParams = RequestParams, R extends ResultType = ResultType>({ getter, setter, func, query, opts }: InitStateType<P, R>) => Promise<void>;
-declare const initData: <P extends RequestParams = RequestParams, R extends ResultType = ResultType>({ getter, setter, func, query, callback }: InitDataType<P, R>) => Promise<void>;
+declare const initState: <P = RequestParams, R = ResultType>({ getter, setter, func, query, opts }: InitStateType<P, R>) => Promise<void>;
+declare const initData: <P = RequestParams, R = ResultType>({ getter, setter, func, query, callback }: InitDataType<P, R>) => Promise<void>;
 /**
  * 加载更多数据
  */
-declare const loadMore: <P extends RequestParams = RequestParams, R extends ResultType = ResultType>({ getter, setter, query, func, errorRetry, callback }: LoadMoreType<P, R>) => Promise<void>;
-declare const updateState: <P extends RequestParams = RequestParams, R extends ResultType = ResultType, T extends KeyMap = KeyMap>({ getter, setter, func, query, method, value, id, changeKey }: UpdateStateType<P, R, T>) => Promise<unknown>;
+declare const loadMore: <P = RequestParams, R = ResultType>({ getter, setter, query, func, errorRetry, callback }: LoadMoreType<P, R>) => Promise<void>;
+declare const updateState: <P = RequestParams, R = ResultType, T = KeyMap>({ getter, setter, func, query, method, id, value, changeKey }: UpdateStateType<P, R, T>) => Promise<unknown>;
 
 declare const isArray: (data: unknown) => data is unknown[];
 /**
@@ -248,7 +248,7 @@ declare const isKeyMapArray: (value: unknown) => value is KeyMap[];
 declare const isObjectKeyArray: (value: unknown) => value is ObjectKey[];
 declare const isObjectResult: (data: unknown) => data is Record<string, unknown>;
 declare const generateDefaultField: (opts?: Partial<DefaultField>) => DefaultField;
-declare const generateFieldName: <P extends RequestParams = RequestParams, R extends ResultType = ResultType>({ func, query }: {
+declare const generateFieldName: <P = RequestParams, R = ResultType>({ func, query }: {
     func: ApiContract<P, R>;
     query?: P;
 }) => string;

package/dist/index.global.js

@@ -133,11 +133,12 @@ var FlowList = (function (exports) {
     if (!query) {
       return result;
     }
-    const filteredKeys = Object.keys(query).filter((key) => !func.paramsIgnore.includes(key)).sort();
+    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 = query[key];
+      const value = queryObj[key];
       let safeValue;
       if (typeof value === "object" && value !== null) {
         safeValue = stableSerialize(value);
@@ -234,7 +235,10 @@ var FlowList = (function (exports) {
         const stringifyId = String(getObjectDeepValue(col, changingKey));
         const index = fieldArrayMap.get(stringifyId);
         if (index !== void 0) {
-          fieldArray[index] = { ...fieldArray[index], ...col };
+          const existingItem = fieldArray[index];
+          if (isKeyMap(existingItem)) {
+            Object.assign(existingItem, col);
+          }
         }
       }
     } else if (isKeyMap(value)) {
@@ -245,7 +249,10 @@ var FlowList = (function (exports) {
         if (!isKeyMap(col)) continue;
         const index = fieldArrayMap.get(uniqueId);
         if (index !== void 0) {
-          fieldArray[index] = { ...fieldArray[index], ...col };
+          const existingItem = fieldArray[index];
+          if (isKeyMap(existingItem)) {
+            Object.assign(existingItem, col);
+          }
         }
       }
     }
@@ -270,8 +277,25 @@ var FlowList = (function (exports) {
     const valueObj = value;
     if (isArray(value)) {
       const currentArr = isArray(resultField) ? resultField : [];
-      const newValue = insertBefore ? [...value, ...currentArr] : [...currentArr, ...value];
-      field.result = newValue;
+      if (insertBefore) {
+        if (value.length === 0) {
+          return;
+        }
+        if (currentArr.length === 0) {
+          field.result = value;
+          return;
+        }
+        field.result = value.concat(currentArr);
+      } else {
+        if (value.length === 0) {
+          return;
+        }
+        if (currentArr.length === 0) {
+          field.result = value;
+          return;
+        }
+        field.result = currentArr.concat(value);
+      }
       return;
     }
     let target = resultField;
@@ -499,8 +523,9 @@ var FlowList = (function (exports) {
   }) => new Promise((resolve, reject) => {
     const fieldName = generateFieldName({ func, query });
     const fieldData = getter(fieldName);
-    const doRefresh = !!query?.__refresh__;
-    const needReset = !!query?.__reload__;
+    const queryAsParams = query;
+    const doRefresh = !!queryAsParams?.__refresh__;
+    const needReset = !!queryAsParams?.__reload__;
     if (fieldData && fieldData.loading) return resolve();
     if (fieldData && fieldData.fetched && !doRefresh) return resolve();
     const params = generateRequestParams({
@@ -577,6 +602,7 @@ var FlowList = (function (exports) {
     if (fieldData.extra) {
       params[enum_default.FIELD_DATA.EXTRA_KEY] = fieldData.extra;
     }
+    const queryAsParams = query;
     setter({
       key: fieldName,
       type: enum_default.SETTER_TYPE.MERGE,
@@ -590,7 +616,7 @@ var FlowList = (function (exports) {
             fieldName,
             type: func.type,
             page: params.page || 0,
-            insertBefore: !!query?.is_up
+            insertBefore: !!queryAsParams?.is_up
           }).then(() => {
             callback?.({
               params,
@@ -630,8 +656,8 @@ var FlowList = (function (exports) {
     func,
     query,
     method,
-    value,
     id,
+    value,
     changeKey
   }) => {
     return new Promise((resolve, reject) => {