feat(ecs): add prepending of import to lib ecs

Author: MartinFillon

packages/ecs/.gitignore

@@ -88,8 +88,9 @@
 # .idea/modules
 # *.iml
 # *.ipr
+!build/
 
-# CMake
+# CMakeg
 cmake-build-*/
 
 # Mongo Explorer plugin

packages/ecs/.prettierignore

@@ -6,3 +6,4 @@ bun.lock
 
 *.js
 *.d.ts
+build

packages/ecs/Makefile

@@ -46,7 +46,10 @@ $(HTML_NAME): $(OBJ)
 $(TS_NAME): LDFLAGS += -s MODULARIZE=1 -s EXPORT_ES6=1 -s ENVIRONMENT=web
 $(TS_NAME): $(OBJ)
 	@mkdir -p $(OUT_DIR)
-	$(CC) $(OBJ) $(LDFLAGS) --emit-tsd $(TS_NAME) -o $(JS_NAME)
+	$(CC) $(OBJ) $(LDFLAGS) --emit-tsd libecs-tmp.d.ts -o $(JS_NAME)
+	cat build/pre.ts > $(OUT_DIR)/$(TS_NAME)
+	cat lib/libecs-tmp.d.ts >> $(OUT_DIR)/$(TS_NAME)
+	$(RM) lib/libecs-tmp.d.ts
 
 clean:
 	$(RM) $(OBJ)

packages/ecs/build/pre.ts

@@ -0,0 +1 @@
+import { Context } from "@nanoforge/common"

packages/ecs/eslint.config.js

@@ -1,3 +1,3 @@
 import config from "@nanoforge/utils-eslint-config";
 
-export default config;
+export default [...config, { ignores: ["build"] }];

packages/ecs/lib/libecs.d.ts

@@ -1,6 +1,7 @@
+import { Context } from "@nanoforge/common";
+
 // TypeScript bindings for emscripten-generated code.  Automatically generated at compile time.
-interface WasmModule {
-}
+interface WasmModule {}
 
 export interface ClassHandle {
   isAliasOf(other: ClassHandle): boolean;
@@ -39,15 +40,16 @@ export interface Entity extends ClassHandle {
   getId(): number;
 }
 
-type Component = {name: string, [key: string]: any};
+type Component = { name: string; [key: string]: any };
 
-type System = (registry: Registry, ctx: any) => void;
+type System = (registry: Registry, ctx: Context) => void;
 
 export interface Registry extends ClassHandle {
   registerComponent(_0: Component): SparseArray;
   getComponentsConst(_0: Component): SparseArray;
   getComponents(_0: Component): SparseArray;
   spawnEntity(): Entity;
+  getZipper(_0: Component[]): any[];
   killEntity(_0: Entity): void;
   clearEntities(): void;
   removeComponent(_0: Entity, _1: Component): void;
@@ -60,23 +62,22 @@ export interface Registry extends ClassHandle {
   getEntityComponent(_0: Entity, _1: Component): any | undefined;
   addComponent(_0: Entity, _1: Component): any | undefined;
   runSystems(_0: any): void;
-  getZipper(_0: Component[]): any;
 }
 
 interface EmbindModule {
   container: {
-    new(): container;
+    new (): container;
   };
   SparseArray: {
-    new(): SparseArray;
+    new (): SparseArray;
   };
   Entity: {
-    new(_0: number): Entity;
+    new (_0: number): Entity;
   };
   Registry: {
-    new(): Registry;
+    new (): Registry;
   };
 }
 
 export type MainModule = WasmModule & EmbindModule;
-export default function MainModuleFactory (options?: unknown): Promise<MainModule>;
+export default function MainModuleFactory(options?: unknown): Promise<MainModule>;

packages/ecs/tsconfig.build.json

@@ -9,7 +9,7 @@
       "@nanoforge/asset-manager": ["../asset-manager"]
     }
   },
-  "exclude": ["node_modules", "dist", "test/**/*", "*.spec.ts"],
+  "exclude": ["node_modules", "dist", "test/**/*", "*.spec.ts", "build"],
   "references": [
     {
       "path": "../common/tsconfig.build.json"

packages/ecs/wasm/Registry.cpp

@@ -23,7 +23,7 @@ namespace nfo {
     EMSCRIPTEN_BINDINGS(Registry)
     {
         emscripten::register_type<Component>("Component", "{name: string, [key: string]: any}");
-        emscripten::register_type<System>("System", "(registry: Registry, ctx: any) => void");
+        emscripten::register_type<System>("System", "(registry: Registry, ctx: Context) => void");
         emscripten::register_type<ZipperInput>("Component[]");
         emscripten::register_type<ZipperOutput>("any[]");