@perplexdotgg/mecs 0.3.1 → 0.4.0

package/build/index.d.ts

@@ -2,6 +2,7 @@ import { InputType } from 'monomorph';
 import { MonomorphClass } from 'monomorph';
 import { MonomorphInstance } from 'monomorph';
 import { NumberArray } from 'monomorph';
+import { PartialRecursive } from 'monomorph';
 import { WithPool } from 'monomorph';
 
 export declare type ComponentConfig<ComponentType, ComponentInputType extends any = InputType<ComponentType> extends never ? ComponentType : InputType<ComponentType>> = {
@@ -47,26 +48,27 @@ export declare type ComponentMapInput<CM extends ComponentMap> = Partial<{
     [K in keyof CM as LowercaseFirstLetter<K>]: ComponentInput<ExtractMonomorphClass<CM[K]>>;
 }>;
 
-export declare function createEntityClass<C>(options?: EntityCodeGenerationOptions): <CM extends ComponentMap, QM extends QueryMap<C, CM>, I extends EntityInput<CM> = EntityInput<CM>>(componentMap: CM, queries?: QM) => EntityClassWithStatics<C, CM, QM, I>;
+export declare function createEntityClass<C>(options?: EntityCodeGenerationOptions): <CM extends ComponentMap, QM extends QueryMap<C, CM>, I extends ComponentMapInput<CM> = ComponentMapInput<CM>>(componentMap: CM, queries?: QM) => EntityClassWithStatics<C, CM, QM, I>;
 
-export declare type CreateEntityFunction<C, CM extends ComponentMap, I extends EntityInput<CM>> = (data?: I, pool?: EntityPoolClass<C>) => EntityInstanceWithPool<CM, I, C>;
+export declare type CreateEntityFunction<C, CM extends ComponentMap, I extends ComponentMapInput<CM>> = (data?: I, updateQueryMemberships?: boolean, pool?: EntityPoolClass<C>) => EntityInstanceWithPool<CM, I, C>;
 
 declare type ElementOfArray<T> = T extends (infer E)[] ? E : never;
 
-declare interface EntityBaseProperties<CM extends ComponentMap, I extends any = EntityInput<CM>> {
+declare interface EntityBaseProperties<CM extends ComponentMap, I extends any = ComponentMapInput<CM>> {
     componentMap: CM;
     __typescriptOnlyInputType: I;
-    addComponent: <CCK extends LowercaseFirstLetter<keyof CM>, CC extends CM[OriginalComponentKey<CCK, CM>] = CM[OriginalComponentKey<CCK, CM>]>(...a: (undefined extends ComponentInput<ExtractMonomorphClass<CC>> ? [key: CCK, data?: ComponentInput<ExtractMonomorphClass<CC>>] : [key: CCK, data: ComponentInput<ExtractMonomorphClass<CC>>])) => void;
-    removeComponent: <CCK extends LowercaseFirstLetter<keyof CM>>(key: CCK) => void;
+    addComponent: <CCK extends LowercaseFirstLetter<keyof CM>, CC extends CM[OriginalComponentKey<CCK, CM>] = CM[OriginalComponentKey<CCK, CM>]>(...a: (undefined extends ComponentInput<ExtractMonomorphClass<CC>> ? [key: CCK, data?: ComponentInput<ExtractMonomorphClass<CC>>, updateQueryMemberships?: boolean] : [key: CCK, data: ComponentInput<ExtractMonomorphClass<CC>>, updateQueryMemberships?: boolean])) => void;
+    removeComponent: <CCK extends LowercaseFirstLetter<keyof CM>>(key: CCK, updateQueryMemberships?: boolean) => void;
     hasComponent: <CCK extends LowercaseFirstLetter<keyof CM>>(key: CCK) => boolean;
     clone(): this;
-    destroy(): void;
+    reset(data?: PartialRecursive<I>, updateQueryMemberships?: boolean, pool?: EntityPoolClass<this>): void;
+    destroy(updateQueryMemberships?: boolean): void;
     isDestroyed(): boolean;
 }
 
-export declare type EntityClass<CM extends ComponentMap, I extends EntityInput<CM> = EntityInput<CM>, QM extends QueryMap<any, CM> = QueryMap<any, CM>, E extends EntityInstance<CM, I> = EntityInstance<CM, I>> = EntityConstructor<QM, E, I, CM>;
+export declare type EntityClass<CM extends ComponentMap, I extends ComponentMapInput<CM> = ComponentMapInput<CM>, QM extends QueryMap<any, CM> = QueryMap<any, CM>, E extends EntityInstance<CM, I> = EntityInstance<CM, I>> = EntityConstructor<QM, E, I, CM>;
 
-export declare type EntityClassWithStatics<C, CM extends ComponentMap, QM extends QueryMap<C, CM>, I extends EntityInput<CM> = EntityInput<CM>> = EntityClass<CM, I, QM> & {
+export declare type EntityClassWithStatics<C, CM extends ComponentMap, QM extends QueryMap<C, CM>, I extends ComponentMapInput<CM> = ComponentMapInput<CM>> = EntityClass<CM, I, QM> & {
     create: CreateEntityFunction<C, CM, I>;
     Pool: NoInfer<EntityPoolClass<C>>;
 };
@@ -93,7 +95,7 @@ declare type EntityCodeGenerationOptions = {
 };
 
 export declare interface EntityConstructor<QM extends QueryMap<any, CM>, E extends EntityInstance<CM, I>, I extends any, CM extends ComponentMap> {
-    new (data: I): E;
+    new (data: I, index?: number, pool?: EntityPoolClass<E>, updateQueryMemberships?: boolean): E;
     componentMap: CM;
     __typescriptOnlyInputType: I;
     pool: EntityPoolClass<E>;
@@ -124,9 +126,9 @@ export declare interface EntityConstructor<QM extends QueryMap<any, CM>, E exten
 
 export declare type EntityInput<X extends ComponentMap | EntityClass<any, any, any, any> | EntityInstanceWithPool<any, any, any> | EntityInstance<any, any>> = X extends ComponentMap ? ComponentMapInput<X> : X extends EntityConstructor<infer QM, infer E, infer I, infer CM> ? I : X extends EntityInstanceWithPool<infer CM, infer I, infer E> ? I : X extends EntityInstance<infer CM, infer I> ? I : never;
 
-export declare type EntityInstance<CM extends ComponentMap, I extends any = EntityInput<CM>> = ComponentMapClassProperties<CM> & EntityBaseProperties<CM, I>;
+export declare type EntityInstance<CM extends ComponentMap, I extends any = ComponentMapInput<CM>> = ComponentMapClassProperties<CM> & EntityBaseProperties<CM, I>;
 
-export declare type EntityInstanceWithPool<CM extends ComponentMap, I extends EntityInput<CM>, E> = NoInfer<E & {
+export declare type EntityInstanceWithPool<CM extends ComponentMap, I extends ComponentMapInput<CM>, E> = NoInfer<E & {
     pool: EntityPoolClass<E> | null;
     createInPool(data?: I): EntityInstanceWithPool<CM, I, E>;
 }>;
@@ -150,7 +152,7 @@ export declare interface EntityPoolClass<M> {
     /** how many non-destroyed objects are in this pool, i.e. how many would be iterated on */
     length: number;
     [Symbol.iterator](): IterableIterator<WithPool<M>>;
-    create(data?: M extends EntityInstance<infer CM, infer I> ? EntityInput<CM> : undefined): M extends EntityInstanceWithPool<infer CM, infer I, any> ? EntityInstanceWithPool<CM, I, M> : never;
+    create(data?: M extends EntityInstance<infer CM, infer I> ? ComponentMapInput<CM> : undefined): M extends EntityInstanceWithPool<infer CM, infer I, any> ? EntityInstanceWithPool<CM, I, M> : never;
     toArray(array: NumberArray, startOffset?: number): number;
     fromArray(array: NumberArray, startOffset?: number, classConstructor?: new (...args: any[]) => M): number;
     fromArrayNoReferences(array: NumberArray, startOffset?: number, classConstructor?: new (...args: any[]) => M): number;

package/build/mecs.js

@@ -553,10 +553,10 @@ function getEntityClassCode(componentMap, queries, options) {
     }
 
     const theClass = class {
-      constructor(data, index = 0, updateQueryMemberships = true) {
+      constructor(data, index = 0, updateQueryMemberships = true, pool = this.constructor.pool) {
         this.index = index;
         this.version = 0; ${""}
-        this.pool = this.constructor.pool;
+        this.pool = pool;
         this.queryIndices = new Array(${queryIndex}).fill(-1);
         this.componentFlags = 0n; ${""}
         if (data) {
@@ -569,9 +569,10 @@ function getEntityClassCode(componentMap, queries, options) {
         }
       }
 
-      fullSet(data, updateQueryMemberships = true) {
+      reset(data, updateQueryMemberships = true, pool = this.pool) {
         this.queryIndices.fill(-1);
         this.componentFlags = 0n;
+        this.pool = pool;
         if (data) {
           ${createFromDataCode}
         } else {
@@ -782,7 +783,7 @@ function getEntityClassCode(componentMap, queries, options) {
             }
 
             create(data, updateQueryMemberships = true) {
-              return this.classConstructor.create(data, this, updateQueryMemberships);
+              return this.classConstructor.create(data, updateQueryMemberships, this);
             }
 
             toArray(array, startOffset = 0, skipPoolReferences = false) {
@@ -952,17 +953,16 @@ function getEntityClassCode(componentMap, queries, options) {
       ${componentWithEntityIteratorFunctionsCode}
     };
 
-    theClass.create = function(data, updateQueryMemberships = true) {
-      const pool = this.pool;
+    theClass.create = function(data, updateQueryMemberships = true, pool = this.pool) {
       if (pool.freeIndices.length) {
         const index = pool.freeIndices.pop();
         pool.length++;
         const instance = pool.array[index];
         instance.version++; ${""}
-        instance.fullSet(data, updateQueryMemberships);
+        instance.reset(data, updateQueryMemberships, pool);
         return instance;
       } else {
-        const instance = new this(data, pool.length, updateQueryMemberships);
+        const instance = new this(data, pool.length, updateQueryMemberships, pool);
         pool.array[pool.length] = instance;
         pool.length++;
         return instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perplexdotgg/mecs",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "MECS - Monomorph ECS - A high-performance Entity Component System for TypeScript and JavaScript projects, designed for games and simulations.",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "bench": "vitest bench"
   },
   "peerDependencies": {
-    "monomorph": "^1.5.5"
+    "monomorph": "^1.5.6"
   },
   "peerDependenciesMeta": {
     "monomorph": {
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@types/node": "^25.0.1",
-    "monomorph": "^1.5.5",
+    "monomorph": "^1.5.6",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",