onchain-utility 0.0.12 → 0.0.14

package/dist/OnchainUtility.js

@@ -1231,12 +1231,7 @@ function getSiblings({
       return item[signKey] === key;
     }
   });
-  let keys = [];
-  if (data.length === 1) {
-    keys = parent ? parent[childrenKey].map(item => item[signKey]) : [];
-  } else {
-    keys = (parent ? parent[childrenKey] : data).map(item => item[signKey]);
-  }
+  const keys = parent ? parent[childrenKey].map(item => item[signKey]) : [];
   return keys;
 }
 
@@ -1355,6 +1350,21 @@ function generatedAcrossHierarchySort({
     nodes
   };
 }
+function optimizeStructure({
+  data,
+  childrenKey = 'children',
+  signKey = 'id'
+}) {
+  if (data.length > 1) {
+    return [{
+      [childrenKey]: data,
+      isCustom: true,
+      [signKey]: 'custom-root'
+    }];
+  } else {
+    return data;
+  }
+}
 function _simpleGetRel({
   data,
   key,
@@ -1379,6 +1389,11 @@ function move({
   onMoved,
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,
@@ -1407,16 +1422,16 @@ function move({
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
-        anchorParent.children.splice(start.index, len);
+        anchorParent[childrenKey].splice(start.index, len);
         // 锚点
-        const anchorIndex = anchorParent?.children?.indexOf(changePosition);
+        const anchorIndex = anchorParent?.[childrenKey]?.indexOf(changePosition);
         const arr = [[selected], changePosition];
 
         // 向下移动时 需要调换位置
         if (!isMoveUp) {
           arr.reverse();
         }
-        anchorParent.children.splice(anchorIndex, 1, ...arr.flat(2));
+        anchorParent[childrenKey].splice(anchorIndex, 1, ...arr.flat(2));
         onMoved?.(selected);
       } else {
         if (onError?.({
@@ -1453,6 +1468,11 @@ async function upgrade({
   onUpgraded,
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,
@@ -1484,7 +1504,7 @@ async function upgrade({
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
-          key: parent.id,
+          key: parent[signKey],
           signKey
         });
         const {
@@ -1498,7 +1518,7 @@ async function upgrade({
         }))) {
           continue;
         }
-        // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
+        // const originalOldPrtCdr = parent[childrenKey]?.slice(0, Infinity) || [];
         let followChildren;
         /** 无法跟随的节点 */
         const unableToFollow = [];
@@ -1510,28 +1530,28 @@ async function upgrade({
           // 获取需要跟随 self 的节点所在的范围
           const startIndex = anchor.index + 1;
           /** 跟随节点 */
-          followChildren = parent.children.slice(startIndex);
+          followChildren = parent[childrenKey].slice(startIndex);
           /** 中断处的索引 */
           const breakOffIndex = followChildren.findIndex(i => {
-            const selected = selectKeys.includes(i.id);
+            const selected = selectKeys.includes(i[signKey]);
             // 后续被选中的 || 不满足被跟随节点需要的节点类型
             return selected || onStopFollow?.(i);
           });
           /** 跟随数量 */
-          const followCount = breakOffIndex >= 0 ? breakOffIndex : parent.children.length;
+          const followCount = breakOffIndex >= 0 ? breakOffIndex : parent[childrenKey].length;
           // 删除选中后的兄弟
-          followChildren = parent.children.splice(start.index + len, followCount);
+          followChildren = parent[childrenKey].splice(start.index + len, followCount);
           followChildren = onFilterFollow ? onFilterFollow(followChildren) : followChildren;
           // 删除选中节点
         } else {
           followChildren = [];
         }
         const self = anchor.self;
-        self.children = [...(self.children || []), ...followChildren];
-        parent.children.splice(start.index, len, ...unableToFollow);
+        self[childrenKey] = [...(self[childrenKey] || []), ...followChildren];
+        parent[childrenKey].splice(start.index, len, ...unableToFollow);
         const list = crossLayerSort({
           leader: start,
-          oldParentId: parent.id,
+          oldParentId: parent[signKey],
           selectSize: len
         });
         const insert = (data, index) => {
@@ -1543,7 +1563,7 @@ async function upgrade({
           list,
           oldParentIndex: parentIndex
         });
-        insert(grandpa.children, insertIndex);
+        insert(grandpa[childrenKey], insertIndex);
       }
     }
   }
@@ -1557,6 +1577,11 @@ async function downgrade({
   childrenKey = 'children',
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,

package/dist/OnchainUtility.mjs

@@ -1229,12 +1229,7 @@ function getSiblings({
       return item[signKey] === key;
     }
   });
-  let keys = [];
-  if (data.length === 1) {
-    keys = parent ? parent[childrenKey].map(item => item[signKey]) : [];
-  } else {
-    keys = (parent ? parent[childrenKey] : data).map(item => item[signKey]);
-  }
+  const keys = parent ? parent[childrenKey].map(item => item[signKey]) : [];
   return keys;
 }
 
@@ -1353,6 +1348,21 @@ function generatedAcrossHierarchySort({
     nodes
   };
 }
+function optimizeStructure({
+  data,
+  childrenKey = 'children',
+  signKey = 'id'
+}) {
+  if (data.length > 1) {
+    return [{
+      [childrenKey]: data,
+      isCustom: true,
+      [signKey]: 'custom-root'
+    }];
+  } else {
+    return data;
+  }
+}
 function _simpleGetRel({
   data,
   key,
@@ -1377,6 +1387,11 @@ function move({
   onMoved,
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,
@@ -1405,16 +1420,16 @@ function move({
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
-        anchorParent.children.splice(start.index, len);
+        anchorParent[childrenKey].splice(start.index, len);
         // 锚点
-        const anchorIndex = anchorParent?.children?.indexOf(changePosition);
+        const anchorIndex = anchorParent?.[childrenKey]?.indexOf(changePosition);
         const arr = [[selected], changePosition];
 
         // 向下移动时 需要调换位置
         if (!isMoveUp) {
           arr.reverse();
         }
-        anchorParent.children.splice(anchorIndex, 1, ...arr.flat(2));
+        anchorParent[childrenKey].splice(anchorIndex, 1, ...arr.flat(2));
         onMoved?.(selected);
       } else {
         if (onError?.({
@@ -1451,6 +1466,11 @@ async function upgrade({
   onUpgraded,
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,
@@ -1482,7 +1502,7 @@ async function upgrade({
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
-          key: parent.id,
+          key: parent[signKey],
           signKey
         });
         const {
@@ -1496,7 +1516,7 @@ async function upgrade({
         }))) {
           continue;
         }
-        // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
+        // const originalOldPrtCdr = parent[childrenKey]?.slice(0, Infinity) || [];
         let followChildren;
         /** 无法跟随的节点 */
         const unableToFollow = [];
@@ -1508,28 +1528,28 @@ async function upgrade({
           // 获取需要跟随 self 的节点所在的范围
           const startIndex = anchor.index + 1;
           /** 跟随节点 */
-          followChildren = parent.children.slice(startIndex);
+          followChildren = parent[childrenKey].slice(startIndex);
           /** 中断处的索引 */
           const breakOffIndex = followChildren.findIndex(i => {
-            const selected = selectKeys.includes(i.id);
+            const selected = selectKeys.includes(i[signKey]);
             // 后续被选中的 || 不满足被跟随节点需要的节点类型
             return selected || onStopFollow?.(i);
           });
           /** 跟随数量 */
-          const followCount = breakOffIndex >= 0 ? breakOffIndex : parent.children.length;
+          const followCount = breakOffIndex >= 0 ? breakOffIndex : parent[childrenKey].length;
           // 删除选中后的兄弟
-          followChildren = parent.children.splice(start.index + len, followCount);
+          followChildren = parent[childrenKey].splice(start.index + len, followCount);
           followChildren = onFilterFollow ? onFilterFollow(followChildren) : followChildren;
           // 删除选中节点
         } else {
           followChildren = [];
         }
         const self = anchor.self;
-        self.children = [...(self.children || []), ...followChildren];
-        parent.children.splice(start.index, len, ...unableToFollow);
+        self[childrenKey] = [...(self[childrenKey] || []), ...followChildren];
+        parent[childrenKey].splice(start.index, len, ...unableToFollow);
         const list = crossLayerSort({
           leader: start,
-          oldParentId: parent.id,
+          oldParentId: parent[signKey],
           selectSize: len
         });
         const insert = (data, index) => {
@@ -1541,7 +1561,7 @@ async function upgrade({
           list,
           oldParentIndex: parentIndex
         });
-        insert(grandpa.children, insertIndex);
+        insert(grandpa[childrenKey], insertIndex);
       }
     }
   }
@@ -1555,6 +1575,11 @@ async function downgrade({
   childrenKey = 'children',
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,

package/dist/Tree.js

@@ -210,12 +210,7 @@ function getSiblings({
       return item[signKey] === key;
     }
   });
-  let keys = [];
-  if (data.length === 1) {
-    keys = parent ? parent[childrenKey].map(item => item[signKey]) : [];
-  } else {
-    keys = (parent ? parent[childrenKey] : data).map(item => item[signKey]);
-  }
+  const keys = parent ? parent[childrenKey].map(item => item[signKey]) : [];
   return keys;
 }
 
@@ -334,6 +329,21 @@ function generatedAcrossHierarchySort({
     nodes
   };
 }
+function optimizeStructure({
+  data,
+  childrenKey = 'children',
+  signKey = 'id'
+}) {
+  if (data.length > 1) {
+    return [{
+      [childrenKey]: data,
+      isCustom: true,
+      [signKey]: 'custom-root'
+    }];
+  } else {
+    return data;
+  }
+}
 function _simpleGetRel({
   data,
   key,
@@ -358,6 +368,11 @@ function move({
   onMoved,
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,
@@ -386,16 +401,16 @@ function move({
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
-        anchorParent.children.splice(start.index, len);
+        anchorParent[childrenKey].splice(start.index, len);
         // 锚点
-        const anchorIndex = anchorParent?.children?.indexOf(changePosition);
+        const anchorIndex = anchorParent?.[childrenKey]?.indexOf(changePosition);
         const arr = [[selected], changePosition];
 
         // 向下移动时 需要调换位置
         if (!isMoveUp) {
           arr.reverse();
         }
-        anchorParent.children.splice(anchorIndex, 1, ...arr.flat(2));
+        anchorParent[childrenKey].splice(anchorIndex, 1, ...arr.flat(2));
         onMoved?.(selected);
       } else {
         if (onError?.({
@@ -432,6 +447,11 @@ async function upgrade({
   onUpgraded,
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,
@@ -463,7 +483,7 @@ async function upgrade({
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
-          key: parent.id,
+          key: parent[signKey],
           signKey
         });
         const {
@@ -477,7 +497,7 @@ async function upgrade({
         }))) {
           continue;
         }
-        // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
+        // const originalOldPrtCdr = parent[childrenKey]?.slice(0, Infinity) || [];
         let followChildren;
         /** 无法跟随的节点 */
         const unableToFollow = [];
@@ -489,28 +509,28 @@ async function upgrade({
           // 获取需要跟随 self 的节点所在的范围
           const startIndex = anchor.index + 1;
           /** 跟随节点 */
-          followChildren = parent.children.slice(startIndex);
+          followChildren = parent[childrenKey].slice(startIndex);
           /** 中断处的索引 */
           const breakOffIndex = followChildren.findIndex(i => {
-            const selected = selectKeys.includes(i.id);
+            const selected = selectKeys.includes(i[signKey]);
             // 后续被选中的 || 不满足被跟随节点需要的节点类型
             return selected || onStopFollow?.(i);
           });
           /** 跟随数量 */
-          const followCount = breakOffIndex >= 0 ? breakOffIndex : parent.children.length;
+          const followCount = breakOffIndex >= 0 ? breakOffIndex : parent[childrenKey].length;
           // 删除选中后的兄弟
-          followChildren = parent.children.splice(start.index + len, followCount);
+          followChildren = parent[childrenKey].splice(start.index + len, followCount);
           followChildren = onFilterFollow ? onFilterFollow(followChildren) : followChildren;
           // 删除选中节点
         } else {
           followChildren = [];
         }
         const self = anchor.self;
-        self.children = [...(self.children || []), ...followChildren];
-        parent.children.splice(start.index, len, ...unableToFollow);
+        self[childrenKey] = [...(self[childrenKey] || []), ...followChildren];
+        parent[childrenKey].splice(start.index, len, ...unableToFollow);
         const list = crossLayerSort({
           leader: start,
-          oldParentId: parent.id,
+          oldParentId: parent[signKey],
           selectSize: len
         });
         const insert = (data, index) => {
@@ -522,7 +542,7 @@ async function upgrade({
           list,
           oldParentIndex: parentIndex
         });
-        insert(grandpa.children, insertIndex);
+        insert(grandpa[childrenKey], insertIndex);
       }
     }
   }
@@ -536,6 +556,11 @@ async function downgrade({
   childrenKey = 'children',
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,

package/dist/Tree.mjs

@@ -208,12 +208,7 @@ function getSiblings({
       return item[signKey] === key;
     }
   });
-  let keys = [];
-  if (data.length === 1) {
-    keys = parent ? parent[childrenKey].map(item => item[signKey]) : [];
-  } else {
-    keys = (parent ? parent[childrenKey] : data).map(item => item[signKey]);
-  }
+  const keys = parent ? parent[childrenKey].map(item => item[signKey]) : [];
   return keys;
 }
 
@@ -332,6 +327,21 @@ function generatedAcrossHierarchySort({
     nodes
   };
 }
+function optimizeStructure({
+  data,
+  childrenKey = 'children',
+  signKey = 'id'
+}) {
+  if (data.length > 1) {
+    return [{
+      [childrenKey]: data,
+      isCustom: true,
+      [signKey]: 'custom-root'
+    }];
+  } else {
+    return data;
+  }
+}
 function _simpleGetRel({
   data,
   key,
@@ -356,6 +366,11 @@ function move({
   onMoved,
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,
@@ -384,16 +399,16 @@ function move({
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
-        anchorParent.children.splice(start.index, len);
+        anchorParent[childrenKey].splice(start.index, len);
         // 锚点
-        const anchorIndex = anchorParent?.children?.indexOf(changePosition);
+        const anchorIndex = anchorParent?.[childrenKey]?.indexOf(changePosition);
         const arr = [[selected], changePosition];
 
         // 向下移动时 需要调换位置
         if (!isMoveUp) {
           arr.reverse();
         }
-        anchorParent.children.splice(anchorIndex, 1, ...arr.flat(2));
+        anchorParent[childrenKey].splice(anchorIndex, 1, ...arr.flat(2));
         onMoved?.(selected);
       } else {
         if (onError?.({
@@ -430,6 +445,11 @@ async function upgrade({
   onUpgraded,
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,
@@ -461,7 +481,7 @@ async function upgrade({
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
-          key: parent.id,
+          key: parent[signKey],
           signKey
         });
         const {
@@ -475,7 +495,7 @@ async function upgrade({
         }))) {
           continue;
         }
-        // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
+        // const originalOldPrtCdr = parent[childrenKey]?.slice(0, Infinity) || [];
         let followChildren;
         /** 无法跟随的节点 */
         const unableToFollow = [];
@@ -487,28 +507,28 @@ async function upgrade({
           // 获取需要跟随 self 的节点所在的范围
           const startIndex = anchor.index + 1;
           /** 跟随节点 */
-          followChildren = parent.children.slice(startIndex);
+          followChildren = parent[childrenKey].slice(startIndex);
           /** 中断处的索引 */
           const breakOffIndex = followChildren.findIndex(i => {
-            const selected = selectKeys.includes(i.id);
+            const selected = selectKeys.includes(i[signKey]);
             // 后续被选中的 || 不满足被跟随节点需要的节点类型
             return selected || onStopFollow?.(i);
           });
           /** 跟随数量 */
-          const followCount = breakOffIndex >= 0 ? breakOffIndex : parent.children.length;
+          const followCount = breakOffIndex >= 0 ? breakOffIndex : parent[childrenKey].length;
           // 删除选中后的兄弟
-          followChildren = parent.children.splice(start.index + len, followCount);
+          followChildren = parent[childrenKey].splice(start.index + len, followCount);
           followChildren = onFilterFollow ? onFilterFollow(followChildren) : followChildren;
           // 删除选中节点
         } else {
           followChildren = [];
         }
         const self = anchor.self;
-        self.children = [...(self.children || []), ...followChildren];
-        parent.children.splice(start.index, len, ...unableToFollow);
+        self[childrenKey] = [...(self[childrenKey] || []), ...followChildren];
+        parent[childrenKey].splice(start.index, len, ...unableToFollow);
         const list = crossLayerSort({
           leader: start,
-          oldParentId: parent.id,
+          oldParentId: parent[signKey],
           selectSize: len
         });
         const insert = (data, index) => {
@@ -520,7 +540,7 @@ async function upgrade({
           list,
           oldParentIndex: parentIndex
         });
-        insert(grandpa.children, insertIndex);
+        insert(grandpa[childrenKey], insertIndex);
       }
     }
   }
@@ -534,6 +554,11 @@ async function downgrade({
   childrenKey = 'children',
   onError
 }) {
+  data = optimizeStructure({
+    childrenKey,
+    data,
+    signKey
+  });
   const layers = mergeAdjacent({
     childrenKey,
     data,

package/package.json

@@ -2,7 +2,7 @@
   "name": "onchain-utility",
   "description": "This package contains misc utilities for onchain.",
   "license": "MIT",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "files": [
     "dist",
     "src"

package/src/Tree/index.ts

@@ -258,16 +258,9 @@ export function getSiblings<T extends Item>({
       return item[signKey] === key;
     },
   });
-  let keys: string[] = [];
-  if (data.length === 1) {
-    keys = parent
-      ? (parent[childrenKey] as T[]).map((item) => item[signKey])
-      : [];
-  } else {
-    keys = (parent ? (parent[childrenKey] as T[]) : data).map(
-      (item) => item[signKey],
-    );
-  }
+  const keys: string[] = parent
+    ? (parent[childrenKey] as T[]).map((item) => item[signKey])
+    : [];
   return keys;
 }
 
@@ -402,6 +395,24 @@ export function generatedAcrossHierarchySort<T extends Item>({
   };
 }
 
+function optimizeStructure<T>({
+  data,
+  childrenKey = 'children',
+  signKey = 'id',
+}: Params<T>): T[] {
+  if (data.length > 1) {
+    return [
+      {
+        [childrenKey]: data,
+        isCustom: true,
+        [signKey]: 'custom-root',
+      } as T,
+    ];
+  } else {
+    return data;
+  }
+}
+
 function _simpleGetRel<T extends Item>({
   data,
   key,
@@ -438,6 +449,7 @@ export function move<T extends Item>({
 }: MoveParams<T> & {
   isMoveUp?: boolean;
 }) {
+  data = optimizeStructure({childrenKey, data, signKey});
   const layers = mergeAdjacent({childrenKey, data, selectKeys, signKey});
   for (const comb of layers) {
     for (const keys of comb) {
@@ -461,9 +473,10 @@ export function move<T extends Item>({
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
-        anchorParent!.children!.splice(start.index!, len);
+        anchorParent![childrenKey]!.splice(start.index!, len);
         // 锚点
-        const anchorIndex = anchorParent?.children?.indexOf(changePosition);
+        const anchorIndex =
+          anchorParent?.[childrenKey]?.indexOf(changePosition);
 
         const arr = [[selected]!, changePosition];
 
@@ -471,7 +484,7 @@ export function move<T extends Item>({
         if (!isMoveUp) {
           arr.reverse();
         }
-        anchorParent!.children!.splice(anchorIndex, 1, ...arr.flat(2));
+        anchorParent![childrenKey]!.splice(anchorIndex, 1, ...arr.flat(2));
         onMoved?.(selected);
       } else {
         if (onError?.({isMoveUp: Boolean(isMoveUp), selected}) === false) {
@@ -517,6 +530,7 @@ export async function upgrade<T extends Item>({
   }) => Promise<boolean> | boolean;
   onUpgraded?: (upgrades: T[]) => void;
 }) {
+  data = optimizeStructure({childrenKey, data, signKey});
   const layers = mergeAdjacent({childrenKey, data, selectKeys, signKey});
   const {crossLayerSort, getInsertIdx} = generatedAcrossHierarchySort({
     signKey,
@@ -535,14 +549,14 @@ export async function upgrade<T extends Item>({
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
-          key: parent!.id,
+          key: parent![signKey],
           signKey,
         });
         const {parent: grandpa, index: parentIndex} = parentRel;
         if (onUpgrade && !(await onUpgrade({grandpa, parent, selected}))) {
           continue;
         }
-        // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
+        // const originalOldPrtCdr = parent[childrenKey]?.slice(0, Infinity) || [];
         let followChildren: T[];
         /** 无法跟随的节点 */
         const unableToFollow: T[] = [];
@@ -554,18 +568,18 @@ export async function upgrade<T extends Item>({
           // 获取需要跟随 self 的节点所在的范围
           const startIndex = anchor.index! + 1;
           /** 跟随节点 */
-          followChildren = parent.children!.slice(startIndex);
+          followChildren = parent[childrenKey]!.slice(startIndex);
           /** 中断处的索引 */
           const breakOffIndex = followChildren.findIndex((i) => {
-            const selected = selectKeys.includes(i.id);
+            const selected = selectKeys.includes(i[signKey]);
             // 后续被选中的 || 不满足被跟随节点需要的节点类型
             return selected || onStopFollow?.(i);
           });
           /** 跟随数量 */
           const followCount =
-            breakOffIndex >= 0 ? breakOffIndex : parent.children!.length;
+            breakOffIndex >= 0 ? breakOffIndex : parent[childrenKey]!.length;
           // 删除选中后的兄弟
-          followChildren = parent.children!.splice(
+          followChildren = parent[childrenKey]!.splice(
             start.index! + len,
             followCount,
           );
@@ -578,12 +592,12 @@ export async function upgrade<T extends Item>({
           followChildren = [];
         }
         const self = anchor.self as Item;
-        self.children = [...(self.children || []), ...followChildren];
-        parent.children!.splice(start.index!, len, ...unableToFollow);
+        self[childrenKey] = [...(self[childrenKey] || []), ...followChildren];
+        parent[childrenKey]!.splice(start.index!, len, ...unableToFollow);
 
         const list = crossLayerSort({
           leader: start,
-          oldParentId: parent.id,
+          oldParentId: parent[signKey],
           selectSize: len,
         });
 
@@ -596,7 +610,7 @@ export async function upgrade<T extends Item>({
           list,
           oldParentIndex: parentIndex!,
         });
-        insert(grandpa!.children!, insertIndex);
+        insert(grandpa![childrenKey]!, insertIndex);
       }
     }
   }
@@ -618,6 +632,7 @@ export async function downgrade<T extends Item>({
   }) => Promise<boolean> | boolean;
   onDowngraded?: (downgrades: T[]) => void;
 }) {
+  data = optimizeStructure({childrenKey, data, signKey});
   const layers = mergeAdjacent({childrenKey, data, selectKeys, signKey});
   for (const comb of layers) {
     for (const keys of comb) {