Feat/ecs/strongly type ecs

packages/ecs/Makefile

@@ -1,8 +1,6 @@
 SRC = wasm/SparseArray.cpp\
 	wasm/Entity.cpp\
 	wasm/Utils.cpp\
-	wasm/Zipper.cpp\
-	wasm/IndexedZipper.cpp\
 	wasm/Registry.cpp
 
 NAME := libecs

packages/ecs/lib/libecs.d.ts

@@ -15,7 +15,6 @@ declare namespace RuntimeExports {
 interface WasmModule {
 }
 
-type EmbindString = ArrayBuffer|Uint8Array|Uint8ClampedArray|Int8Array|string;
 export interface ClassHandle {
   isAliasOf(other: ClassHandle): boolean;
   delete(): void;
@@ -51,50 +50,24 @@ export interface Entity extends ClassHandle {
   getId(): number;
 }
 
-export interface MapStringSparseArray extends ClassHandle {
-  keys(): VectorString;
-  size(): number;
-  get(_0: EmbindString): SparseArray | undefined;
-  set(_0: EmbindString, _1: SparseArray | null): void;
-}
-
-export interface VectorString extends ClassHandle {
-  size(): number;
-  get(_0: number): EmbindString | undefined;
-  push_back(_0: EmbindString): void;
-  resize(_0: number, _1: EmbindString): void;
-  set(_0: number, _1: EmbindString): boolean;
-}
-
-export interface Zipper extends ClassHandle {
-  next(): any;
-  getValue(): any;
-}
-
-export interface IndexedZipper extends ClassHandle {
-  next(): any;
-  getValue(): any;
-}
-
 export interface Registry extends ClassHandle {
+  registerComponent(_0: {name: string, [key: string]: any}): SparseArray;
+  getComponentsConst(_0: {name: string, [key: string]: any}): SparseArray;
+  getComponents(_0: {name: string, [key: string]: any}): SparseArray;
   spawnEntity(): Entity;
   killEntity(_0: Entity): void;
   clearEntities(): void;
+  removeComponent(_0: Entity, _1: {name: string, [key: string]: any}): void;
+  addSystem(_0: (registry: Registry) => void): void;
   runSystems(): void;
   clearSystems(): void;
   entityFromIndex(_0: number): Entity;
   removeSystem(_0: number): void;
   maxEntities(): number;
-  registerComponent(_0: any): SparseArray;
-  getComponentsConst(_0: any): SparseArray;
-  getComponents(_0: any): SparseArray;
-  getEntityComponentConst(_0: Entity, _1: any): any | undefined;
-  getEntityComponent(_0: Entity, _1: any): any | undefined;
-  addComponent(_0: Entity, _1: any): any | undefined;
-  removeComponent(_0: Entity, _1: any): void;
-  addSystem(_0: any): void;
-  getZipper(_0: any): Zipper;
-  getIndexedZipper(_0: any): IndexedZipper;
+  getEntityComponentConst(_0: Entity, _1: {name: string, [key: string]: any}): any | undefined;
+  getEntityComponent(_0: Entity, _1: {name: string, [key: string]: any}): any | undefined;
+  addComponent(_0: Entity, _1: {name: string, [key: string]: any}): any | undefined;
+  getZipper(_0: any): any;
 }
 
 interface EmbindModule {
@@ -107,18 +80,6 @@ interface EmbindModule {
   Entity: {
     new(_0: number): Entity;
   };
-  MapStringSparseArray: {
-    new(): MapStringSparseArray;
-  };
-  VectorString: {
-    new(): VectorString;
-  };
-  Zipper: {
-    new(_0: MapStringSparseArray): Zipper;
-  };
-  IndexedZipper: {
-    new(_0: MapStringSparseArray): IndexedZipper;
-  };
   Registry: {
     new(): Registry;
   };

packages/ecs/src/ecs-library.ts

@@ -1,9 +1,12 @@
 import { type AssetManagerLibrary } from "@nanoforge/asset-manager";
 import { BaseComponentSystemLibrary, type InitContext } from "@nanoforge/common";
 
-import type { Entity, MainModule, Registry, SparseArray, Zipper } from "../lib";
+import type { Entity, MainModule, Registry, SparseArray } from "../lib";
 import { Module } from "../lib";
 
+export type Component = { name: string; [key: string]: any };
+export type System = (registry: Registry) => void;
+
 export class ECSLibrary extends BaseComponentSystemLibrary {
   private module: MainModule;
   private registry: Registry;
@@ -29,27 +32,27 @@ export class ECSLibrary extends BaseComponentSystemLibrary {
     return Promise.resolve();
   }
 
-  addComponent(entity: Entity, component: any): void {
+  addComponent(entity: Entity, component: Component): void {
     this.registry.addComponent(entity, component);
   }
 
   createEntity(): Entity {
     return this.registry.spawnEntity();
   }
 
-  getComponents(component: any): SparseArray {
+  getComponents(component: Component): SparseArray {
     return this.registry.getComponents(component);
   }
 
-  removeComponent(entity: Entity, component: any): void {
+  removeComponent(entity: Entity, component: Component): void {
     this.registry.removeComponent(entity, component);
   }
 
-  getEntityComponent(entity: Entity, component: any): any | undefined {
+  getEntityComponent(entity: Entity, component: Component): Component | undefined {
     return this.registry.getEntityComponent(entity, component);
   }
 
-  getEntityComponentConst(entity: Entity, component: any): any | undefined {
+  getEntityComponentConst(entity: Entity, component: Component): Component | undefined {
     return this.registry.getEntityComponentConst(entity, component);
   }
 
@@ -85,15 +88,11 @@ export class ECSLibrary extends BaseComponentSystemLibrary {
     return this.registry.maxEntities();
   }
 
-  addSystem(system: any): void {
+  addSystem(system: System): void {
     this.registry.addSystem(system);
   }
 
-  getZipper(types: [any]): Zipper {
+  getZipper(types: [Component]): [any] {
     return this.registry.getZipper(types);
   }
-
-  getIndexedZipper(types: [any]): Zipper {
-    return this.registry.getIndexedZipper(types);
-  }
 }

packages/ecs/test/ecs-library.spec.ts

@@ -4,6 +4,7 @@ import { EditableLibraryManager } from "@nanoforge/core/src/common/library/manag
 import { ECSLibrary } from "@nanoforge/ecs/src/ecs-library";
 
 class Position {
+  name: string = "Position";
   constructor(
     public x: number,
     public y: number,

packages/ecs/test/wasm/Registry.spec.ts

@@ -1,6 +1,7 @@
 import Module from "../../lib/libecs.js";
 
 class Velocity {
+  name: string = "Velocity";
   x: number;
   y: number;
 
@@ -11,6 +12,7 @@ class Velocity {
 }
 
 class Position {
+  name: string = "Position";
   x: number;
   y: number;