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

package/dist/index.mjs

@@ -67,8 +67,29 @@ var isArray = (data) => Array.isArray(data);
 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 && !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 isKeyMapArray = (value) => {
+  if (!isArray(value)) return false;
+  const len = value.length;
+  for (let i = 0; i < len; i++) {
+    const item = value[i];
+    if (typeof item !== "object" || item === null) {
+      return false;
+    }
+  }
+  return true;
+};
+var isObjectKeyArray = (value) => {
+  if (!isArray(value)) return false;
+  const len = value.length;
+  for (let i = 0; i < len; i++) {
+    const item = value[i];
+    const itemType = typeof item;
+    if (itemType !== "string" && itemType !== "number") {
+      return false;
+    }
+  }
+  return true;
+};
 var stableSerialize = (value) => {
   if (value === null || typeof value !== "object") {
     return String(value);
@@ -129,16 +150,25 @@ var generateFieldName = ({
   func,
   query
 }) => {
-  let result = func.id;
   if (!query) {
-    return result;
+    return func.id;
   }
-  const queryObj = query;
-  const filteredKeys = Object.keys(queryObj).filter((key) => !func.paramsIgnore.includes(key)).sort();
+  let result = func.id;
+  const keys = Object.keys(query);
+  const paramsIgnore = func.paramsIgnore;
+  const filteredKeys = [];
+  const keysLen = keys.length;
+  for (let i = 0; i < keysLen; i++) {
+    const key = keys[i];
+    if (!paramsIgnore.includes(key)) {
+      filteredKeys.push(key);
+    }
+  }
+  filteredKeys.sort();
   const len = filteredKeys.length;
   for (let i = 0; i < len; i++) {
     const key = filteredKeys[i];
-    const value = queryObj[key];
+    const value = query[key];
     let safeValue;
     if (typeof value === "object" && value !== null) {
       safeValue = stableSerialize(value);
@@ -151,19 +181,15 @@ var generateFieldName = ({
   return result;
 };
 var getObjectDeepValue = (field, keys) => {
-  if (!keys || isArray(keys) && keys.length === 0) {
+  if (!keys || Array.isArray(keys) && keys.length === 0)
     return field;
+  const keysArr = Array.isArray(keys) ? keys : keys.split(".");
+  let cur = field;
+  for (let i = 0, n = keysArr.length; i < n; ++i) {
+    if (cur == null || typeof cur !== "object") return void 0;
+    cur = cur[keysArr[i]];
   }
-  const keysArr = isArray(keys) ? keys : keys.split(".");
-  let result = field;
-  const len = keysArr.length;
-  for (let i = 0; i < len; i++) {
-    if (result == null || typeof result !== "object") {
-      return void 0;
-    }
-    result = result[keysArr[i]];
-  }
-  return result;
+  return cur;
 };
 var updateObjectDeepValue = (field, changeKey, value) => {
   if (!changeKey) return;
@@ -202,12 +228,23 @@ var searchValueByKey = (result, id, key) => {
 var computeMatchedItemIndex = (itemId, fieldArr, changingKey) => {
   const stringifiedItemId = String(itemId);
   const len = fieldArr.length;
-  for (let i = 0; i < len; i++) {
-    const item = fieldArr[i];
-    if (!isKeyMap(item)) continue;
-    const itemValue = getObjectDeepValue(item, changingKey);
-    if (String(itemValue) === stringifiedItemId) {
-      return i;
+  const isSimpleKey = !changingKey.includes(".");
+  if (isSimpleKey) {
+    for (let i = 0; i < len; i++) {
+      const item = fieldArr[i];
+      if (!isKeyMap(item)) continue;
+      if (String(item[changingKey]) === stringifiedItemId) {
+        return i;
+      }
+    }
+  } else {
+    for (let i = 0; i < len; i++) {
+      const item = fieldArr[i];
+      if (!isKeyMap(item)) continue;
+      const itemValue = getObjectDeepValue(item, changingKey);
+      if (String(itemValue) === stringifiedItemId) {
+        return i;
+      }
     }
   }
   return -1;
@@ -233,7 +270,7 @@ var combineArrayData = (fieldArray, value, changingKey) => {
       if (index !== void 0) {
         const existingItem = fieldArray[index];
         if (isKeyMap(existingItem)) {
-          Object.assign(existingItem, col);
+          fieldArray[index] = { ...existingItem, ...col };
         }
       }
     }
@@ -247,7 +284,7 @@ var combineArrayData = (fieldArray, value, changingKey) => {
       if (index !== void 0) {
         const existingItem = fieldArray[index];
         if (isKeyMap(existingItem)) {
-          Object.assign(existingItem, col);
+          fieldArray[index] = { ...existingItem, ...col };
         }
       }
     }
@@ -263,40 +300,29 @@ var setReactivityField = (field, key, value, type, insertBefore) => {
     if (isArray(value)) {
       const current = fieldAny[key];
       const currentArr = isArray(current) ? current : [];
-      const newValue = insertBefore ? [...value, ...currentArr] : [...currentArr, ...value];
-      fieldAny[key] = newValue;
+      fieldAny[key] = insertBefore ? value.concat(currentArr) : currentArr.concat(value);
     } else {
       fieldAny[key] = value;
     }
     return;
   }
   const resultField = field.result;
-  const valueObj = value;
   if (isArray(value)) {
-    const currentArr = isArray(resultField) ? resultField : [];
     const valueArr = value;
-    if (insertBefore) {
-      if (valueArr.length === 0) return;
-      if (currentArr.length === 0) {
-        field.result = valueArr;
-        return;
-      }
-      field.result = valueArr.concat(currentArr);
-    } else {
-      if (valueArr.length === 0) return;
-      if (currentArr.length === 0) {
-        field.result = valueArr;
-        return;
-      }
-      field.result = currentArr.concat(valueArr);
+    const valueLen = valueArr.length;
+    if (valueLen === 0) return;
+    const currentArr = isArray(resultField) ? resultField : [];
+    const currentLen = currentArr.length;
+    if (currentLen === 0) {
+      field.result = valueArr;
+      return;
     }
+    field.result = insertBefore ? valueArr.concat(currentArr) : currentArr.concat(valueArr);
     return;
   }
+  const valueObj = value;
   let target = resultField;
-  if (isArray(resultField)) {
-    target = {};
-    field.result = target;
-  } else if (typeof resultField !== "object" || resultField === null) {
+  if (isArray(resultField) || typeof resultField !== "object" || resultField === null) {
     target = {};
     field.result = target;
   }
@@ -307,10 +333,10 @@ var setReactivityField = (field, key, value, type, insertBefore) => {
     const existing = target[subKey];
     const incoming = valueObj[subKey];
     if (existing !== void 0) {
-      if (insertBefore) {
-        target[subKey] = isArray(incoming) && isArray(existing) ? [...incoming, ...existing] : incoming;
+      if (isArray(existing) && isArray(incoming)) {
+        target[subKey] = insertBefore ? incoming.concat(existing) : existing.concat(incoming);
       } else {
-        target[subKey] = isArray(existing) && isArray(incoming) ? [...existing, ...incoming] : incoming;
+        target[subKey] = incoming;
       }
     } else {
       target[subKey] = incoming;
@@ -351,6 +377,7 @@ var generateRequestParams = ({
   field,
   uniqueKey = enum_default.DEFAULT_UNIQUE_KEY_NAME,
   query = {},
+  is_up = false,
   type
 }) => {
   const result = { ...query };
@@ -363,11 +390,11 @@ var generateRequestParams = ({
     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)) {
@@ -375,11 +402,11 @@ var generateRequestParams = ({
       }
     } 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) {
@@ -388,14 +415,14 @@ var generateRequestParams = ({
   } 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) {
@@ -524,9 +551,9 @@ var createApi = (options) => {
     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",
-      "is_up",
       "since_id",
       "seen_ids",
       "__refresh__",
@@ -573,6 +600,7 @@ var initData = ({
     field: generateDefaultField({ ...fieldData, fetched: false }),
     uniqueKey: func.uniqueKey,
     type: func.type,
+    is_up: func.is_up,
     query
   });
   const executeFetch = () => {
@@ -638,6 +666,7 @@ var loadMore = ({
     field: fieldData,
     uniqueKey: func.uniqueKey,
     type,
+    is_up: func.is_up,
     query
   });
   if (fieldData.extra) params.extra = fieldData.extra;
@@ -654,7 +683,7 @@ var loadMore = ({
           type,
           fieldName,
           page: params.page || 0,
-          insertBefore: !!query?.is_up
+          insertBefore: func.is_up
         }).then(() => {
           callback?.({ params, data, refresh: false });
           resolve();
@@ -694,7 +723,11 @@ var updateState = ({
       fieldData[enum_default.FIELD_DATA.RESULT_KEY]
     );
     const newFieldData = { ...fieldData };
-    const resultArray = getResultAsArray(newFieldData);
+    let resultArray = getResultAsArray(fieldData);
+    if (resultArray) {
+      resultArray = [...resultArray];
+      newFieldData.result = resultArray;
+    }
     if (method === enum_default.CHANGE_TYPE.SEARCH_FIELD) {
       const objectKeyId = toObjectKey(_id);
       if (objectKeyId === void 0) {
@@ -717,7 +750,9 @@ var updateState = ({
           _uniqueKey
         );
         if (matchedIndex >= 0 && isKeyMap(resultArray[matchedIndex])) {
-          updateObjectDeepValue(resultArray[matchedIndex], _changeKey, value);
+          const newItem = { ...resultArray[matchedIndex] };
+          updateObjectDeepValue(newItem, _changeKey, value);
+          resultArray[matchedIndex] = newItem;
         }
       }
       resolve(null);
@@ -749,7 +784,7 @@ var updateState = ({
     } else {
       let modifyValue;
       if (_changeKey === enum_default.FIELD_DATA.RESULT_KEY) {
-        modifyValue = newFieldData.result;
+        modifyValue = resultArray || newFieldData.result;
       } else if (_changeKey === enum_default.FIELD_DATA.EXTRA_KEY) {
         modifyValue = newFieldData.extra;
       } else {
@@ -774,7 +809,9 @@ var updateState = ({
         case enum_default.CHANGE_TYPE.RESULT_REMOVE_BY_ID:
           if (isKeyMapArray(modifyValue)) {
             if (matchedIndex >= 0) {
-              modifyValue.splice(matchedIndex, 1);
+              const newArray = [...modifyValue];
+              newArray.splice(matchedIndex, 1);
+              modifyValue = newArray;
             } else if (isObjectKeyArray(_id)) {
               const idSet = new Set(_id);
               modifyValue = modifyValue.filter((item) => {
@@ -786,18 +823,23 @@ var updateState = ({
           break;
         case enum_default.CHANGE_TYPE.RESULT_INSERT_TO_BEFORE:
           if (isArray(modifyValue) && matchedIndex >= 0) {
-            modifyValue.splice(matchedIndex, 0, value);
+            const newArray = [...modifyValue];
+            newArray.splice(matchedIndex, 0, value);
+            modifyValue = newArray;
           }
           break;
         case enum_default.CHANGE_TYPE.RESULT_INSERT_TO_AFTER:
           if (isArray(modifyValue) && matchedIndex >= 0) {
-            modifyValue.splice(matchedIndex + 1, 0, value);
+            const newArray = [...modifyValue];
+            newArray.splice(matchedIndex + 1, 0, value);
+            modifyValue = newArray;
           }
           break;
         case enum_default.CHANGE_TYPE.RESULT_LIST_MERGE:
           if (isKeyMapArray(modifyValue)) {
+            const newArray = [...modifyValue];
             if (isKeyMapArray(value)) {
-              combineArrayData(modifyValue, value, _uniqueKey);
+              combineArrayData(newArray, value, _uniqueKey);
             } else if (isKeyMap(value)) {
               const valueAsRecord = {};
               for (const [k, v] of Object.entries(value)) {
@@ -805,8 +847,9 @@ var updateState = ({
                   valueAsRecord[k] = v;
                 }
               }
-              combineArrayData(modifyValue, valueAsRecord, _uniqueKey);
+              combineArrayData(newArray, valueAsRecord, _uniqueKey);
             }
+            modifyValue = newArray;
           }
           break;
         default: