Add execution context in ecs systems

packages/common/src/context/contexts/executions/execution.context.ts

@@ -1,9 +1,15 @@
+import { type IRunnerLibrary } from "../../../library";
 import { BaseContext } from "./base.context";
 
-export class ExecutionContext extends BaseContext {
+export class ExecutionContext<T extends IRunnerLibrary> extends BaseContext {
   protected _isRunning: boolean = true;
+  protected _currentLibrary: T;
 
   get isRunning() {
     return this._isRunning;
   }
+
+  get lib(): T {
+    return this._currentLibrary;
+  }
 }

packages/common/src/library/libraries/abstracts/component-system.library.abstract.ts

@@ -6,5 +6,5 @@ export abstract class BaseComponentSystemLibrary
   extends Library
   implements IComponentSystemLibrary
 {
-  abstract run(context: ExecutionContext): Promise<void>;
+  abstract run(context: ExecutionContext<this>): Promise<void>;
 }

packages/common/src/library/libraries/abstracts/graphics.library.abstract.ts

@@ -3,5 +3,5 @@ import { type IGraphicsLibrary } from "../interfaces";
 import { Library } from "../library";
 
 export abstract class BaseGraphicsLibrary extends Library implements IGraphicsLibrary {
-  abstract run(context: ExecutionContext): Promise<void>;
+  abstract run(context: ExecutionContext<this>): Promise<void>;
 }

packages/common/src/library/libraries/interfaces/bases/runner.library.type.ts

@@ -2,5 +2,5 @@ import { type ExecutionContext } from "../../../../context";
 import { type ILibrary } from "../../library.type";
 
 export interface IRunnerLibrary extends ILibrary {
-  run(context: ExecutionContext): Promise<void>;
+  run(context: ExecutionContext<IRunnerLibrary>): Promise<void>;
 }

packages/core/src/common/context/contexts/executions/execution.editable-context.ts

@@ -1,7 +1,11 @@
-import { ExecutionContext } from "@nanoforge/common";
+import { ExecutionContext, type IRunnerLibrary } from "@nanoforge/common";
 
-export class EditableExecutionContext extends ExecutionContext {
+export class EditableExecutionContext<T extends IRunnerLibrary> extends ExecutionContext<T> {
   setIsRunning(isRunning: boolean) {
     this._isRunning = isRunning;
   }
+
+  setCurrentLibrary(library: T) {
+    this._currentLibrary = library;
+  }
 }

packages/core/src/core/core.ts

@@ -1,7 +1,6 @@
 import {
   type ApplicationContext,
   ClearContext,
-  ExecutionContext,
   type IRunOptions,
   type IRunnerLibrary,
   InitContext,
@@ -11,6 +10,7 @@ import {
 
 import { type ApplicationConfig } from "../application/application-config";
 import type { IApplicationOptions } from "../application/application-options.type";
+import { EditableExecutionContext } from "../common/context/contexts/executions/execution.editable-context";
 import { type EditableLibraryContext } from "../common/context/contexts/library.editable-context";
 
 export class Core {
@@ -63,8 +63,8 @@ export class Core {
     return new InitContext(this.context, this.config.libraryManager, options);
   }
 
-  private getExecutionContext(): ExecutionContext {
-    return new ExecutionContext(this.context, this.config.libraryManager);
+  private getExecutionContext<T extends IRunnerLibrary>(): EditableExecutionContext<T> {
+    return new EditableExecutionContext(this.context, this.config.libraryManager);
   }
 
   private getClearContext(): ClearContext {
@@ -78,8 +78,12 @@ export class Core {
     }
   }
 
-  private async runExecute(context: ExecutionContext, libraries: LibraryHandle<IRunnerLibrary>[]) {
+  private async runExecute(
+    context: EditableExecutionContext<IRunnerLibrary>,
+    libraries: LibraryHandle<IRunnerLibrary>[],
+  ) {
     for (const handle of libraries) {
+      context.setCurrentLibrary(handle.library);
       await handle.library.run(context);
     }
   }

packages/ecs/lib/libecs.d.ts

@@ -1,17 +1,4 @@
 // TypeScript bindings for emscripten-generated code.  Automatically generated at compile time.
-declare namespace RuntimeExports {
-    let HEAPF32: any;
-    let HEAPF64: any;
-    let HEAP_DATA_VIEW: any;
-    let HEAP8: any;
-    let HEAPU8: any;
-    let HEAP16: any;
-    let HEAPU16: any;
-    let HEAP32: any;
-    let HEAPU32: any;
-    let HEAP64: any;
-    let HEAPU64: any;
-}
 interface WasmModule {
 }
 
@@ -20,6 +7,8 @@ export interface ClassHandle {
   delete(): void;
   deleteLater(): this;
   isDeleted(): boolean;
+  // @ts-ignore - If targeting lower than ESNext, this symbol might not exist.
+  [Symbol.dispose](): void;
   clone(): this;
 }
 export interface container extends ClassHandle {
@@ -85,5 +74,5 @@ interface EmbindModule {
   };
 }
 
-export type MainModule = WasmModule & typeof RuntimeExports & EmbindModule;
+export type MainModule = WasmModule & EmbindModule;
 export default function MainModuleFactory (options?: unknown): Promise<MainModule>;

packages/ecs/src/ecs-context.type.ts

@@ -0,0 +1,5 @@
+import { type ExecutionContext } from "@nanoforge/common";
+
+import { type ECSLibrary } from "./ecs-library";
+
+export type ECSContext = ExecutionContext<ECSLibrary>;

packages/ecs/src/ecs-library.ts

@@ -100,7 +100,7 @@ export class ECSLibrary extends BaseComponentSystemLibrary {
     this.registry.addSystem(system);
   }
 
-  getZipper(types: [Component]): [any] {
+  getZipper(types: [Component, ...Component[]]): [any, ...any[]] {
     return this.registry.getZipper(types);
   }
 }

packages/ecs/src/index.ts

@@ -1,3 +1,4 @@
 import "../lib/libecs.wasm";
 
 export * from "./ecs-library";
+export type { ECSContext } from "./ecs-context.type";

packages/sound/src/sound.library.ts

@@ -1,5 +1,4 @@
-import { BaseSoundLibrary } from "@nanoforge/common";
-import { NfNotFound } from "@nanoforge/common/src/exceptions";
+import { BaseSoundLibrary, NfNotFound } from "@nanoforge/common";
 
 export class SoundLibrary extends BaseSoundLibrary {
   private muted: boolean;