@quake2ts/test-utils 0.0.828 → 0.0.830

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quake2ts/test-utils",
-  "version": "0.0.828",
+  "version": "0.0.830",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -55,10 +55,10 @@
     "serve-handler": "^6.1.6",
     "vitest": "^1.6.0",
     "webgpu": "^0.3.8",
-    "@quake2ts/server": "0.0.828",
-    "@quake2ts/engine": "^0.0.828",
-    "@quake2ts/shared": "0.0.828",
-    "@quake2ts/game": "0.0.828"
+    "@quake2ts/engine": "^0.0.830",
+    "@quake2ts/game": "0.0.830",
+    "@quake2ts/shared": "0.0.830",
+    "@quake2ts/server": "0.0.830"
   },
   "peerDependenciesMeta": {
     "@quake2ts/engine": {
@@ -114,10 +114,10 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.16",
     "webgpu": "^0.3.8",
-    "@quake2ts/engine": "^0.0.828",
-    "@quake2ts/game": "0.0.828",
-    "@quake2ts/shared": "0.0.828",
-    "@quake2ts/server": "0.0.828"
+    "@quake2ts/engine": "^0.0.830",
+    "@quake2ts/game": "0.0.830",
+    "@quake2ts/shared": "0.0.830",
+    "@quake2ts/server": "0.0.830"
   },
   "dependencies": {
     "upng-js": "^2.1.0"

package/src/game/helpers/spawn.ts

@@ -0,0 +1,68 @@
+import {
+  SpawnRegistry,
+  createDefaultSpawnRegistry,
+  type SpawnFunction,
+  type SpawnContext,
+  type SpawnOptions,
+  spawnEntityFromDictionary,
+  Entity
+} from '@quake2ts/game';
+import type { TestContext } from '../helpers.js';
+
+/**
+ * Creates a configured SpawnRegistry for testing.
+ * Uses the default spawn registry but handles the game dependency if not provided.
+ */
+export function createSpawnRegistry(game?: any): SpawnRegistry {
+  // If game is not provided, we can pass a mock or empty object
+  // The default registry primarily uses game for registering items
+  const gameMock = game || {};
+  return createDefaultSpawnRegistry(gameMock);
+}
+
+/**
+ * Registers a custom spawn function for testing.
+ */
+export function registerTestSpawn(
+  registry: SpawnRegistry,
+  classname: string,
+  spawnFunc: SpawnFunction
+): void {
+  registry.register(classname, spawnFunc);
+}
+
+export interface SpawnTestEntityOptions {
+  classname: string;
+  keyValues?: Record<string, string>;
+  registry?: SpawnRegistry;
+  onWarning?: (message: string) => void;
+}
+
+/**
+ * Convenience function to spawn an entity using the spawn system.
+ */
+export function spawnTestEntity(
+  context: TestContext,
+  options: SpawnTestEntityOptions
+): Entity | null {
+  const registry = options.registry || context.game?.entities?.spawnRegistry;
+
+  if (!registry) {
+    throw new Error('No spawn registry provided and none found on context.game.entities');
+  }
+
+  const keyValues = {
+    classname: options.classname,
+    ...(options.keyValues || {})
+  };
+
+  const spawnOptions: SpawnOptions = {
+    registry,
+    entities: context.entities,
+    onWarning: options.onWarning
+  };
+
+  // The type of spawnEntityFromDictionary might need validation based on exports
+  // but usually it accepts Record<string,string> which we provide.
+  return spawnEntityFromDictionary(keyValues, spawnOptions);
+}

package/src/game/helpers.ts

@@ -27,6 +27,7 @@ export interface MockGame {
   spawnWorld: LegacyMock<[], void>;
   clientBegin: LegacyMock<[any], void>;
   damage: LegacyMock<[number], void>;
+  entities: any;
 }
 
 export interface TestContext extends SpawnContext {
@@ -67,7 +68,10 @@ export const createMockGame = (seed: number = 12345): { game: MockGame, spawnReg
     }),
     damage: vi.fn((amount: number) => {
       hooks.onDamage({} as any, null, null, amount, 0, 0);
-    })
+    }),
+    entities: {
+      spawnRegistry
+    }
   };
 
   return { game, spawnRegistry };
@@ -91,7 +95,11 @@ export function createTestContext(options?: { seed?: number, initialEntities?: E
   const hooks = game.hooks;
 
   // We need to store the registry reference to implement registerEntityClass/getSpawnFunction
-  let currentSpawnRegistry: SpawnRegistry | undefined;
+  let currentSpawnRegistry: SpawnRegistry | undefined = spawnRegistry;
+
+  const findByTargetName = (targetname: string) => {
+      return entityList.filter(e => e.targetname === targetname && e.inUse);
+  };
 
   const entities = {
     spawn: vi.fn(() => {
@@ -147,9 +155,20 @@ export function createTestContext(options?: { seed?: number, initialEntities?: E
     }),
     soundIndex: vi.fn((sound: string) => engine.soundIndex(sound)),
     useTargets: vi.fn((entity: Entity, activator: Entity | null) => {
+        if (entity.target) {
+            const targets = findByTargetName(entity.target);
+            for (const t of targets) {
+                t.use?.(t, entity, activator);
+            }
+        }
+    }),
+    findByTargetName: vi.fn(findByTargetName),
+    pickTarget: vi.fn((targetname: string | undefined) => {
+        if (!targetname) return null;
+        const matches = findByTargetName(targetname);
+        if (matches.length === 0) return null;
+        return matches[0];
     }),
-    findByTargetName: vi.fn(() => []),
-    pickTarget: vi.fn(() => null),
     killBox: vi.fn(),
     rng: createRandomGenerator({ seed }),
     imports: {
@@ -171,7 +190,7 @@ export function createTestContext(options?: { seed?: number, initialEntities?: E
       return entityList.find(predicate);
     }),
     findByClassname: vi.fn((classname: string) => {
-      return entityList.find(e => e.classname === classname);
+      return entityList.filter(e => e.classname === classname);
     }),
     beginFrame: vi.fn((timeSeconds: number) => {
       (entities as any).timeSeconds = timeSeconds;
@@ -193,6 +212,9 @@ export function createTestContext(options?: { seed?: number, initialEntities?: E
     world: entityList.find(e => e.classname === 'worldspawn') || new Entity(0),
   } as unknown as EntitySystem;
 
+  // Fix circular reference
+  game.entities = entities;
+
   return {
     keyValues: {},
     entities,

package/src/index.ts

@@ -7,6 +7,7 @@ export * from './shared/collision.js';
 export * from './shared/factories.js';
 export * from './game/factories.js';
 export * from './game/helpers.js';
+export * from './game/helpers/spawn.js';
 export * from './game/helpers/physics.js';
 export * from './game/helpers/save.js';
 export * from './game/mocks/ai.js';