fix(tree): 修复类型错误

src/tree/fromPidTree.ts

@@ -24,7 +24,7 @@ import { omit } from "../object/omit"
 
  export function fromPidTree<
     FromNode extends PidTreeNode = PidTreeNode,
-    ToNode extends TreeNode = TreeNode<Omit<FromNode,'pid'>>,
+    ToNode extends TreeNodeBase = TreeNode<Omit<FromNode,'pid'>>,
     IdKey extends string = 'id',
     ChildrenKey extends string = 'children'
     >(pidNodes:FromNode[],options?:FromPidTreeOptions<FromNode,ToNode,IdKey,ChildrenKey>):ToNode[]{

src/tree/getById.ts

@@ -10,12 +10,12 @@
 import { ABORT } from "../object";
 import { DefaultTreeOptions } from "./consts";
 import { forEachTreeByDfs } from "./forEachTreeByDfs";
-import { TreeNode, TreeNodeOptions } from "./types";
+import { TreeNode, TreeNodeBase, TreeNodeOptions } from "./types";
 
 
 export interface GetByIdOptions extends TreeNodeOptions{}
 
-export function getById<Node extends TreeNode = TreeNode,IdKey extends string = "id">(treeObj:Node | Node[],nodeId:Node[IdKey],options?:GetByIdOptions):Node | null {
+export function getById<Node extends TreeNodeBase = TreeNode,IdKey extends string = "id">(treeObj:Node | Node[],nodeId:Node[IdKey],options?:GetByIdOptions):Node | null {
     let result:Node | null = null;
     const opts = Object.assign({}, DefaultTreeOptions ,options || {}) as Required<GetByIdOptions>     
     const { idKey } = opts

src/tree/getByPath.ts

@@ -10,14 +10,14 @@
 import { ABORT } from "../object";
 import { DefaultTreeOptions } from "./consts";
 import { forEachTreeByDfs } from "./forEachTreeByDfs";
-import { TreeNode, TreeNodeOptions } from "./types";
+import { TreeNode, TreeNodeBase, TreeNodeOptions } from "./types";
 
 
 export interface GetByPathOptions extends TreeNodeOptions{
 
 }
 
-export function getByPath<Node extends TreeNode = TreeNode>(treeObj:Node | Node[],fullpath: string,options?:GetByPathOptions):Node | undefined {
+export function getByPath<Node extends TreeNodeBase = TreeNode>(treeObj:Node | Node[],fullpath: string,options?:GetByPathOptions):Node | undefined {
     let result:Node | undefined;
     let opts = Object.assign({}, DefaultTreeOptions ,options || {}) as Required<GetByPathOptions>     
     forEachTreeByDfs<Node>(treeObj,({node,path})=>{

src/tree/getRelatedTreeNode.ts

@@ -2,7 +2,7 @@
  * 获取指定的节点的关联节点
  */
 
-import { TreeNode, TreeNodeOptions } from "./types";
+import { TreeNode, TreeNodeBase, TreeNodeOptions } from "./types";
 import { ABORT } from '../object/forEachObject';
 import { getTreeNodeInfo, TreeNodeInfo } from "./getTreeNodeInfo";
 import { forEachTreeByDfs } from "./forEachTreeByDfs";
@@ -17,9 +17,7 @@ export enum RelatedTreeNode{
     Previous = 3 
 }
 
-export function getRelatedTreeNode<Node extends TreeNode = TreeNode,
-    IdKey extends string = 'id' 
->(treeObj: Node | Node[],nodeId:Node[IdKey],pos:RelatedTreeNode , options?:GetRelatedTreeNodeOptions):Node | null {
+export function getRelatedTreeNode<Node extends TreeNodeBase = TreeNode,IdKey extends string = 'id'>(treeObj: Node | Node[],nodeId:Node[IdKey],pos:RelatedTreeNode , options?:GetRelatedTreeNodeOptions):Node | null {
     const opts = Object.assign({},options) as Required<GetRelatedTreeNodeOptions>
     const { idKey } = opts
     let result:Node | null | undefined = null

src/tree/getTreeNode.ts

@@ -6,14 +6,14 @@
 import { ABORT } from "../object";
 import { DefaultTreeOptions } from "./consts";
 import { forEachTreeByDfs } from "./forEachTreeByDfs";
-import { TreeNode, TreeNodeOptions } from "./types";
+import { TreeNode, TreeNodeBase,TreeNodeOptions } from "./types";
 
 
  export interface GetTreeNodeOptions extends TreeNodeOptions{
      includeParent?:boolean         // 当指定时返回[Node,ParantNode]
  }  
 
- export function getTreeNode<Node extends TreeNode = TreeNode,IdKey extends string = 'id'>(treeObj:Node | Node[],nodeId: Node[IdKey],options?:GetTreeNodeOptions):Node | undefined {
+ export function getTreeNode<Node extends TreeNodeBase = TreeNode,IdKey extends string = 'id'>(treeObj:Node | Node[],nodeId: Node[IdKey],options?:GetTreeNodeOptions):Node | undefined {
      let result:Node | undefined;
      const opts = Object.assign({}, DefaultTreeOptions ,options || {}) as Required<GetTreeNodeOptions>     
      const { idKey } = opts

src/tree/getTreeNodeInfo.ts

@@ -6,7 +6,7 @@
 import { ABORT } from "../object";
 import { DefaultTreeOptions } from "./consts";
 import { forEachTreeByDfs } from "./forEachTreeByDfs";
-import { TreeNode, TreeNodeOptions } from "./types";
+import { TreeNode, TreeNodeBase, TreeNodeOptions } from "./types";
 
 
  export interface GetTreeNodeInfoOptions extends TreeNodeOptions{
@@ -21,7 +21,7 @@ export interface TreeNodeInfo<Node>{
     index:number
 }
 
-export function getTreeNodeInfo<Node extends TreeNode = TreeNode,IdKey extends string = 'id'>(treeObj:Node | Node[],nodeId: Node[IdKey],options?:GetTreeNodeInfoOptions):TreeNodeInfo<Node> | undefined {
+export function getTreeNodeInfo<Node extends TreeNodeBase = TreeNode,IdKey extends string = 'id'>(treeObj:Node | Node[],nodeId: Node[IdKey],options?:GetTreeNodeInfoOptions):TreeNodeInfo<Node> | undefined {
      let result:TreeNodeInfo<Node> | undefined;     
      const opts =  Object.assign({}, DefaultTreeOptions ,options || {}) as Required<GetTreeNodeInfoOptions>     
      let { idKey } = opts

src/tree/getTreeNodeRelation.ts

@@ -5,7 +5,7 @@
  */
 
 import { DefaultTreeOptions } from "./consts";
-import { TreeNode, TreeNodeOptions } from "./types";
+import { TreeNode, TreeNodeBase, TreeNodeOptions } from "./types";
 import { ABORT } from '../object/forEachObject';
 import { forEachTreeByDfs } from "./forEachTreeByDfs";
 
@@ -24,7 +24,7 @@ export enum TreeNodeRelation{
     Unknown = 9                             // 未知
 }
 
-export function getTreeNodeRelation<Node extends TreeNode = TreeNode,IdKey extends string = 'id'>(treeObj:Node | Node[],nodeId:Node[IdKey],refNodeId:Node[IdKey],options?:GetTreeNodeRelationOptions):TreeNodeRelation{
+export function getTreeNodeRelation<Node extends TreeNodeBase = TreeNode,IdKey extends string = 'id'>(treeObj:Node | Node[],nodeId:Node[IdKey],refNodeId:Node[IdKey],options?:GetTreeNodeRelationOptions):TreeNodeRelation{
     let relation:any = 9;
 
     const opts= Object.assign({}, DefaultTreeOptions ,options || {}) as Required<GetTreeNodeRelationOptions>     

src/tree/moveTreeNode.ts

@@ -9,7 +9,7 @@
 import { DefaultTreeOptions } from "./consts";
 import { getTreeNodeInfo } from "./getTreeNodeInfo";
 import { getTreeNodeRelation, TreeNodeRelation } from "./getTreeNodeRelation";
-import { TreeNode, TreeNodeOptions } from "./types";
+import { TreeNode,TreeNodeBase, TreeNodeOptions } from "./types";
 
 
 export interface MoveTreeNodeOptions extends TreeNodeOptions{ 
@@ -22,7 +22,7 @@ export enum MoveTreeNodePosition{
     Previous = 3                             // 上一个兄弟
 }
 
-export function moveTreeNode<Node extends TreeNode = TreeNode,IdKey extends string = 'id'>(treeObj:Node | Node[],fromNodeId: Node[IdKey],toNodeId:Node[IdKey],pos:MoveTreeNodePosition=MoveTreeNodePosition.LastChild, options?:MoveTreeNodeOptions):void {
+export function moveTreeNode<Node extends TreeNodeBase = TreeNode,IdKey extends string = 'id'>(treeObj:Node | Node[],fromNodeId: Node[IdKey],toNodeId:Node[IdKey],pos:MoveTreeNodePosition=MoveTreeNodePosition.LastChild, options?:MoveTreeNodeOptions):void {
     const opts = Object.assign({}, DefaultTreeOptions ,options || {}) as Required<MoveTreeNodeOptions>     
     const  { childrenKey } = opts
     // 先检查是否允许移动
@@ -31,8 +31,8 @@ export function moveTreeNode<Node extends TreeNode = TreeNode,IdKey extends stri
         throw new Error("Move here is not allowed")
     }
 
-    let fromNode = getTreeNodeInfo<Node>(treeObj,fromNodeId)
-    let toNode = getTreeNodeInfo<Node>(treeObj,toNodeId)
+    let fromNode = getTreeNodeInfo<Node,IdKey>(treeObj,fromNodeId)
+    let toNode = getTreeNodeInfo<Node,IdKey>(treeObj,toNodeId)
 
     if(!(fromNode && toNode)) {
         throw new Error("Unable to read node data")

src/tree/removeTreeNodes.ts

@@ -11,7 +11,7 @@
  * 
  */
 
-import type { TreeNode, TreeNodeOptions } from "./types";
+import type { TreeNodeBase, TreeNode,TreeNodeOptions } from "./types";
 import { DefaultTreeOptions } from "./consts";
 import { forEachTree, IForEachTreeCallback } from "./forEachTree";
 import { ABORT } from "../object";
@@ -20,7 +20,7 @@ export interface RemoveTreeNodesOptions extends TreeNodeOptions {
     onlyRemoveOne?: boolean;                    // 只删除一个
 }
 
-export function removeTreeNodes<Node extends TreeNode>(treeObj:Node | Node[],matcher:IForEachTreeCallback<Node>,options?:RemoveTreeNodesOptions):void{
+export function removeTreeNodes<Node extends TreeNodeBase = TreeNode>(treeObj:Node | Node[],matcher:IForEachTreeCallback<Node>,options?:RemoveTreeNodesOptions):void{
     const opts= Object.assign({onlyRemoveOne:false}, DefaultTreeOptions ,options || {}) as Required<RemoveTreeNodesOptions>   
     const {childrenKey='children', idKey='id'} = opts
     forEachTree<Node>(treeObj,({node,level,parent,path,index})=>{

src/tree/searchTree.ts

@@ -1,6 +1,6 @@
 import { ABORT } from "../object/forEachObject"
 import type { ForEachTreeOptions, IForEachTreeCallback  } from "./forEachTree"
-import { TreeNode,TreeNodeOptions } from "./types"
+import { TreeNode,TreeNodeBase,TreeNodeOptions } from "./types"
 import { forEachTreeByDfs } from "./forEachTreeByDfs";
 
 export interface SerachTreeOptions extends TreeNodeOptions,ForEachTreeOptions {
@@ -24,7 +24,7 @@ export interface SerachTreeOptions extends TreeNodeOptions,ForEachTreeOptions {
   * @param matchOne 只匹配一个就退出,匹配所有,默认只匹配一个
   * 
   */
-export function searchTree<Node extends TreeNode=TreeNode,Returns=Node[]>(treeData:Node[] | Node,matcher:IForEachTreeCallback<Node>,picker?:IForEachTreeCallback<Node>,options?:SerachTreeOptions):Returns[]{
+export function searchTree<Node extends TreeNodeBase=TreeNode,Returns=Node[]>(treeData:Node[] | Node,matcher:IForEachTreeCallback<Node>,picker?:IForEachTreeCallback<Node>,options?:SerachTreeOptions):Returns[]{
     let result:Returns[] = []
     const pickerFunc = picker || (({node})=>node) as IForEachTreeCallback<Node>
     const opts = Object.assign({matchOne:true},options || {})   
@@ -36,3 +36,5 @@ export function searchTree<Node extends TreeNode=TreeNode,Returns=Node[]>(treeDa
     },opts)
     return result as  Returns[]
 }
+
+

src/tree/tree.ts

@@ -6,19 +6,19 @@ import { getTreeNodeInfo } from "./getTreeNodeInfo";
 import { moveTreeNode, MoveTreeNodePosition } from "./moveTreeNode";
 import { removeTreeNodes } from "./removeTreeNodes";
 import { searchTree, SerachTreeOptions } from "./searchTree";
-import { TreeNode, TreeNodeOptions } from "./types";
+import { TreeNode, TreeNodeBase, TreeNodeOptions } from "./types";
 import { forEachTreeByDfs } from "./forEachTreeByDfs";
 
-export interface FlexTreeOptions<Node extends TreeNode = TreeNode,IdKey extends string = "id"> extends TreeNodeOptions {
+export interface FlexTreeOptions<Node extends TreeNodeBase = TreeNode,IdKey extends string = "id"> extends TreeNodeOptions {
     idGenerator(node:Partial<Node>):Node[IdKey]
 }
 
-export class FlexTree<Node extends TreeNode = TreeNode,IdKey extends string = "id",ChildrenKey extends string = "children">{
+export class FlexTree<Node extends TreeNodeBase = TreeNode,IdKey extends string = "id",ChildrenKey extends string = "children">{
     #treeObj:Node[] | Node
     #options:FlexTreeOptions<Node,IdKey>
     constructor(nodes:Node[] | Node,options?:FlexTreeOptions<Node,IdKey>){
         this.#treeObj = nodes
-        this.#options = Object.assign({},options) as Required<FlexTreeOptions>
+        this.#options = Object.assign({},options) as Required<FlexTreeOptions<Node,IdKey>>
     }
     get root(): Node | undefined {
         return Array.isArray(this.#treeObj) ? undefined : this.#treeObj

src/tree/types.ts

@@ -73,7 +73,7 @@ export interface TreeNodeOptions{
 //     y:"a"
 // }
 
-// function test<T extends TreeNode = TreeNode>(node:T):T {  
+// function test<T extends TreeNodeBase = TreeNode>(node:T):T {  
 //     node["x"]=1
 //     node["children"]=[]
 //     node["id"]="2"
@@ -93,3 +93,6 @@ export interface TreeNodeOptions{
 // test<TreeNode<{id:'a' | 'b'}>>({id:'a'})
 // test<TreeNode<{id:'a' | 'b'}>>({id:'b'})
 // test<TreeNode<{id:'a' | 'b'}>>({id:'c'})
+// test<TreeNode<{key?:string}>>({id:'c'})
+// test<TreeNode<{key:string}>>({id:'c',key:"xxxx"})
+// test<TreeNode<{key:string},'key'>>({key:'c'})