@shapediver/viewer.shared.node-tree 2.12.7 → 3.0.0

package/dist/interfaces/ITreeNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ITreeNode.d.ts","sourceRoot":"","sources":["../../src/interfaces/ITreeNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ITreeNode.d.ts","sourceRoot":"","sources":["../../src/interfaces/ITreeNode.ts"],"names":[],"mappings":"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"}

package/dist/interfaces/ITreeNode.js

@@ -1,3 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// #endregion Interfaces (2)
 //# sourceMappingURL=ITreeNode.js.map

package/dist/interfaces/ITreeNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"ITreeNode.js","sourceRoot":"","sources":["../../src/interfaces/ITreeNode.ts"],"names":[],"mappings":""}
+{"version":3,"file":"ITreeNode.js","sourceRoot":"","sources":["../../src/interfaces/ITreeNode.ts"],"names":[],"mappings":";;AAoOA,4BAA4B"}

package/dist/interfaces/ITreeNodeData.d.ts

@@ -1,21 +1,31 @@
-export interface ITreeNodeData<T extends ITreeNodeData<any>> {
+export interface ITreeNodeData {
     /**
-     * The ID of the tree node data.
+     * The converted object of the tree node.
      */
+    convertedObject: {
+        [key: string]: unknown;
+    };
+    /**
+   * The ID of the tree node data.
+   */
     id: string;
     /**
-     * The version of the tree node data.
-     * If the version changes, the node data will be marked for an update.
-     * A version change can be triggered via {@link updateVersion}.
+     * The update callback for the converted object of the tree node.
      */
+    updateCallbackConvertedObject: ((newObj: unknown, oldObj: unknown, viewport: string) => void) | null;
+    /**
+   * The version of the tree node data.
+   * If the version changes, the node data will be marked for an update.
+   * A version change can be triggered via {@link updateVersion}.
+   */
     version: string;
     /**
-     * Clones this node tree data.
-     */
-    clone(): T;
+   * Clones this node tree data.
+   */
+    clone(): ITreeNodeData;
     /**
-     * Update the version.
-     */
+   * Update the version.
+   */
     updateVersion(): void;
 }
 //# sourceMappingURL=ITreeNodeData.d.ts.map

package/dist/interfaces/ITreeNodeData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ITreeNodeData.d.ts","sourceRoot":"","sources":["../../src/interfaces/ITreeNodeData.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC;IAGzD;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAMhB;;OAEG;IACH,KAAK,IAAI,CAAC,CAAC;IACX;;OAEG;IACH,aAAa,IAAI,IAAI,CAAC;CAGvB"}
+{"version":3,"file":"ITreeNodeData.d.ts","sourceRoot":"","sources":["../../src/interfaces/ITreeNodeData.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAG5B;;OAEG;IACH,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC5C;;KAEC;IACD,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,6BAA6B,EAAE,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;IACrG;;;;KAIC;IACD,OAAO,EAAE,MAAM,CAAC;IAMhB;;KAEC;IACD,KAAK,IAAI,aAAa,CAAC;IACvB;;KAEC;IACD,aAAa,IAAI,IAAI,CAAC;CAGvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapediver/viewer.shared.node-tree",
-  "version": "2.12.7",
+  "version": "3.0.0",
   "description": "",
   "keywords": [],
   "author": "Michael Oppitz <michael@shapediver.com>",
@@ -39,11 +39,9 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@shapediver/viewer.shared.math": "2.12.7",
-    "@shapediver/viewer.shared.services": "2.12.7",
-    "@types/three": "0.152.0",
-    "gl-matrix": "3.3.0",
-    "three": "0.152.2"
+    "@shapediver/viewer.shared.math": "3.0.0",
+    "@shapediver/viewer.shared.services": "3.0.0",
+    "gl-matrix": "3.3.0"
   },
-  "gitHead": "60997db1d77ac9e274e53da1caa25a190f6405b6"
+  "gitHead": "b6b0010bf5d5652aa338df8016405d97f33fcabb"
 }

package/src/implementation/AbstractTreeNodeData.ts

@@ -1,17 +1,17 @@
-import { UuidGenerator, EventEngine, EVENTTYPE } from '@shapediver/viewer.shared.services'
+import { ITreeNodeData } from '../interfaces/ITreeNodeData';
+import { UuidGenerator } from '@shapediver/viewer.shared.services';
 
-import { ITreeNodeData } from '../interfaces/ITreeNodeData'
-
-export abstract class AbstractTreeNodeData<T extends ITreeNodeData<any>> implements ITreeNodeData<T> {
-  // #region Properties (3)
-
-  #version: string;
+export abstract class AbstractTreeNodeData implements ITreeNodeData {
+  // #region Properties (5)
 
   readonly #id: string;
   readonly #uuidGenerator: UuidGenerator = UuidGenerator.instance;
-  readonly #eventEngine: EventEngine = EventEngine.instance;
 
-  // #endregion Properties (3)
+  #convertedObject: { [key: string]: unknown } = {};
+  #updateCallbackConvertedObject: ((newObj: unknown, oldObj: unknown, viewport: string) => void) | null = null;
+  #version: string;
+
+  // #endregion Properties (5)
 
   // #region Constructors (1)
 
@@ -27,38 +27,50 @@ export abstract class AbstractTreeNodeData<T extends ITreeNodeData<any>> impleme
 
   // #endregion Constructors (1)
 
-  // #region Public Accessors (2)
+  // #region Public Getters And Setters (6)
+
+  public get convertedObject(): { [key: string]: unknown } {
+    return this.#convertedObject;
+  }
+
+  public set convertedObject(value: { [key: string]: unknown }) {
+    this.#convertedObject = value;
+  }
 
   public get id(): string {
     return this.#id;
   }
 
-  public get version(): string {
-    return this.#version;
+  public get updateCallbackConvertedObject(): ((newObj: unknown, oldObj: unknown, viewport: string) => void) | null {
+    return this.#updateCallbackConvertedObject;
   }
-  
-  // #endregion Public Accessors (2)
 
-  // #region Public Methods (1)
+  public set updateCallbackConvertedObject(value: ((newObj: unknown, oldObj: unknown, viewport: string) => void) | null) {
+    this.#updateCallbackConvertedObject = value;
+  }
 
-  /**
-   * Update the version
-   */
-  public updateVersion(): void {
-    this.#version = this.#uuidGenerator.create();
+  public get version(): string {
+    return this.#version;
   }
 
-  // #endregion Public Methods (1)
+  // #endregion Public Getters And Setters (6)
 
-  // #region Public Abstract Methods (1)
+  // #region Public Methods (2)
 
   /**
    * Clones the tree node data.
    */
-  public clone(): T {
-    const clone = new (<any>this.constructor);
+  public clone(): ITreeNodeData {
+    const clone = new (this.constructor as new () => ITreeNodeData)();
     return clone;
-  };
+  }
+
+  /**
+   * Update the version
+   */
+  public updateVersion(): void {
+    this.#version = this.#uuidGenerator.create();
+  }
 
-  // #endregion Public Abstract Methods (1)
+  // #endregion Public Methods (2)
 }

package/src/implementation/{AbstractTree.ts → Tree.ts}

@@ -1,33 +1,43 @@
 import { ITree } from '../interfaces/ITree';
 import { ITreeNode } from '../interfaces/ITreeNode';
-import { ITreeNodeData } from '../interfaces/ITreeNodeData';
+import { TreeNode } from './TreeNode';
 
-export abstract class AbstractTree<T extends ITreeNode<any, ITreeNodeData<any>>> implements ITree<T> {
-  // #region Properties (1)
+export class Tree implements ITree {
+  // #region Properties (2)
 
-  readonly #root: T;
+  readonly #root: ITreeNode;
 
-  // #endregion Properties (1)
+  private static _instance: Tree;
+
+  // #endregion Properties (2)
 
   // #region Constructors (1)
 
-  constructor(root: T) {
-    this.#root = root;
+  private constructor() {
+    this.#root = new TreeNode('root');
   }
 
   // #endregion Constructors (1)
 
-  // #region Public Accessors (1)
+  // #region Public Static Getters And Setters (1)
+
+  public static get instance() {
+    return this._instance || (this._instance = new this());
+  }
+
+  // #endregion Public Static Getters And Setters (1)
+
+  // #region Public Getters And Setters (1)
 
-  public get root(): T {
+  public get root(): ITreeNode {
     return this.#root;
   }
 
-  // #endregion Public Accessors (1)
+  // #endregion Public Getters And Setters (1)
 
-  // #region Public Methods (6)
+  // #region Public Methods (5)
 
-  public addNode(node: T, parent: T = this.#root, root: T = this.#root): boolean {
+  public addNode(node: ITreeNode, parent: ITreeNode = this.#root, root: ITreeNode = this.#root): boolean {
     if (root === parent) {
       root.addChild(node);
       return true;
@@ -42,7 +52,7 @@ export abstract class AbstractTree<T extends ITreeNode<any, ITreeNodeData<any>>>
     return false;
   }
 
-  public addNodeAtPath(node: T, path: string = this.root.getPath(), root: T = this.#root): boolean {
+  public addNodeAtPath(node: ITreeNode, path: string = this.root.getPath(), root: ITreeNode = this.#root): boolean {
     if (root.name === path) {
       root.addChild(node);
       return true;
@@ -62,8 +72,8 @@ export abstract class AbstractTree<T extends ITreeNode<any, ITreeNodeData<any>>>
     return false;
   }
 
-  public getNodeAtPath(path: string = this.root.getPath(), root: T = this.#root): T | null {
-    if (root.name === path) 
+  public getNodeAtPath(path: string = this.root.getPath(), root: ITreeNode = this.#root): ITreeNode | null {
+    if (root.name === path)
       return root;
 
     const pathStart = path.substr(0, path.indexOf('.'));
@@ -73,13 +83,13 @@ export abstract class AbstractTree<T extends ITreeNode<any, ITreeNodeData<any>>>
       for (let i = 0; i < root.children.length; i++) {
         const child = root.children[i];
         const res = this.getNodeAtPath(shortenedPath, child);
-        if(res) return res;
+        if (res) return res;
       }
     }
     return null;
   }
 
-  public removeNode(node: T, root: T = this.#root): boolean {
+  public removeNode(node: ITreeNode, root: ITreeNode = this.#root): boolean {
     if (root.hasChild(node)) {
       root.removeChild(node);
       return true;
@@ -95,7 +105,7 @@ export abstract class AbstractTree<T extends ITreeNode<any, ITreeNodeData<any>>>
     return false;
   }
 
-  public removeNodeAtPath(path: string, root: T = this.#root): boolean {
+  public removeNodeAtPath(path: string, root: ITreeNode = this.#root): boolean {
     if (root.name === path) {
       root.parent?.removeChild(root);
       return true;
@@ -115,5 +125,5 @@ export abstract class AbstractTree<T extends ITreeNode<any, ITreeNodeData<any>>>
     return false;
   }
 
-  // #endregion Public Methods (6)
+  // #endregion Public Methods (5)
 }