Merge pull request #5 from retejs/fix/three-dep

fix: three dependency typing

package.json

@@ -26,19 +26,19 @@
     "rete": "^2.0.1",
     "rete-area-plugin": "^2.0.0",
     "rete-render-utils": "^2.0.0",
-    "three": ">= 0.152.2 < 0.158.0"
+    "three": ">= 0.152.2 < 0.157.0"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-commonjs": "^25.0.0",
-    "@types/three": "^0.152.0",
+    "@types/three": "^0.156.0",
     "parse-svg-path": "^0.1.2",
     "rete": "^2.0.1",
     "rete-area-plugin": "^2.0.0",
     "rete-cli": "^1.0.1",
     "rete-render-utils": "^2.0.0",
     "svg-path-contours": "^2.0.0",
-    "three": "^0.152.2"
+    "three": "^0.156.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.21.0"

src/area.ts

@@ -1,3 +1,4 @@
+import { Object3D } from 'three'
 import { Content } from './content'
 import { HybridScene } from './scene'
 import { orbitControlsRestrictor } from './scene/OrbitControls'
@@ -49,7 +50,7 @@ export class Area<Scope> {
   /**
    * Get the canvas in form of Object3D for the current scope
    */
-  public getCanvas() {
+  public getCanvas(): Object3D | undefined {
     return this.scene.canvases.get(this.scope)
   }
 

src/extensions/forms/connection/geometry.ts

@@ -13,7 +13,7 @@ import { BufferGeometry, PlaneGeometry, Vector2 } from 'three'
  * @returns Connection geometry
  */
 // eslint-disable-next-line max-statements
-export function createClassicConnectionGeometry(path: string, width: number) {
+export function createClassicConnectionGeometry(path: string, width: number): BufferGeometry {
   const segments = contours(parse(path)) as [number, number][][]
   const points = segments.map(segment => segment.map(([x, y]) => ({ x, y }))).flat()
   const geometry: BufferGeometry = new PlaneGeometry(100, 10, points.length - 1, 1)

src/extensions/forms/node/geometry.ts

@@ -27,7 +27,7 @@ export type Params = {
  * @returns Node geometry
  */
 // eslint-disable-next-line max-statements
-export function createClassicNodeGeometry(size: Size, params?: Params) {
+export function createClassicNodeGeometry(size: Size, params?: Params): BufferGeometry {
   const {
     borderRadius = 10,
     inputsOffset = 15.5,

src/scene/Drag/DragControls.ts

@@ -5,14 +5,16 @@ import {
 
 import { findTop, ObjectHTML } from '../ObjectHTML'
 
+type DefaultObject3D = Object3D
+
 const raycaster = new Raycaster()
 
-class DragControls extends EventDispatcher {
+class DragControls extends EventDispatcher<any> {
   enabled = true
   intersections: Intersection<ObjectHTML>[] = []
   selected: Object3D | null = null
   hovered: Object3D | null = null
-  objects = new Set<Object3D>()
+  objects = new Set<DefaultObject3D>()
 
   private pointer = new Vector2()
   private offset = new Vector3()

src/scene/index.ts

@@ -9,6 +9,8 @@ import { OrbitControls } from './OrbitControls'
 
 export { DraggableObject3D }
 
+type DefaultObject3D = Object3D
+
 /**
  * HybridScene is a wrapper for Three.js Scene with some additional features such as:
  * - drag controls
@@ -20,7 +22,7 @@ export class HybridScene<Scope> {
   camera: PerspectiveCamera
   renderer: HybridRenderer
   root = new Scene()
-  canvases = new Map<Scope, Object3D>()
+  canvases = new Map<Scope, DefaultObject3D>()
   controls: DragControls
   orbit: OrbitControls