Merge branch 'main' into pr/r04423/144

krispya · krispya · commit 2b28b0dd82f2 · 2025-08-01T19:52:21.000-04:00
diff --git a/benches/apps/boids/package.json b/benches/apps/boids/package.json
@@ -24,8 +24,8 @@
 		"@types/react": "catalog:",
 		"@types/react-dom": "catalog:",
 		"@types/three": "catalog:",
-		"@vitejs/plugin-react": "^4.2.1",
-		"@vitejs/plugin-react-swc": "^3.5.0",
+		"@vitejs/plugin-react": "^4.7.0",
+		"@vitejs/plugin-react-swc": "^3.11.0",
 		"vite": "catalog:"
 	}
 }
diff --git a/benches/apps/n-body-react/package.json b/benches/apps/n-body-react/package.json
@@ -24,8 +24,8 @@
 		"@types/react": "catalog:",
 		"@types/react-dom": "catalog:",
 		"@types/three": "catalog:",
-		"@vitejs/plugin-react": "^4.2.1",
-		"@vitejs/plugin-react-swc": "^3.5.0",
+		"@vitejs/plugin-react": "^4.7.0",
+		"@vitejs/plugin-react-swc": "^3.11.0",
 		"vite": "catalog:"
 	}
 }
diff --git a/benches/apps/n-body/src/main.ts b/benches/apps/n-body/src/main.ts
@@ -61,7 +61,7 @@ schedule.add(init, { tag: 'init' });
 schedule.build();
 
 // Add Three resources to the world
-export const Three = trait({ renderer, camera, scene });
+export const Three = trait(() => ({ renderer, camera, scene }));
 world.add(Three);
 
 // Init stats
diff --git a/benches/apps/n-body/src/systems/cleanupRepulsors.ts b/benches/apps/n-body/src/systems/cleanupRepulsors.ts
@@ -10,7 +10,7 @@ export function cleanupBodies({ world }: { world: World }) {
 	const instanceEntity = world.queryFirst(InstancedMesh);
 	if (instanceEntity === undefined) return;
 
-	const instancedMesh = instanceEntity.get(InstancedMesh)!.object;
+	const instancedMesh = instanceEntity.get(InstancedMesh)!;
 
 	world.query(Removed(Repulse, Position)).forEach((e) => {
 		instancedMesh.setMatrixAt(e.id(), zeroScaleMatrix);
diff --git a/benches/apps/n-body/src/systems/init.ts b/benches/apps/n-body/src/systems/init.ts
@@ -21,7 +21,7 @@ export function init({ world }: { world: World }) {
 	for (let i = 0; i < instancedMesh.count; i++) instancedMesh.setMatrixAt(i, zeroScaleMatrix);
 
 	scene.add(instancedMesh);
-	world.spawn(InstancedMesh({ object: instancedMesh }));
+	world.spawn(InstancedMesh(instancedMesh));
 
 	// Compile Three shaders.
 	renderer.compile(scene, camera);
diff --git a/benches/apps/n-body/src/systems/syncThreeObjects.ts b/benches/apps/n-body/src/systems/syncThreeObjects.ts
@@ -12,7 +12,7 @@ export const syncThreeObjects = ({ world }: { world: World }) => {
 	const instanceEnt = world.queryFirst(InstancedMesh);
 	if (instanceEnt === undefined) return;
 
-	const instancedMesh = instanceEnt.get(InstancedMesh)!.object;
+	const instancedMesh = instanceEnt.get(InstancedMesh)!;
 
 	world.query(Position, Circle, Color).updateEach(([position, circle, color], entity) => {
 		dummy.position.set(position.x, position.y, 0);
diff --git a/benches/apps/n-body/src/traits/InstancedMesh.ts b/benches/apps/n-body/src/traits/InstancedMesh.ts
@@ -1,4 +1,4 @@
 import { trait } from 'koota';
 import type * as THREE from 'three';
 
-export const InstancedMesh = trait({ object: null! as THREE.InstancedMesh });
+export const InstancedMesh = trait(() => null! as THREE.InstancedMesh);
diff --git a/benches/apps/revade/package.json b/benches/apps/revade/package.json
@@ -24,8 +24,8 @@
 		"@types/react": "catalog:",
 		"@types/react-dom": "catalog:",
 		"@types/three": "catalog:",
-		"@vitejs/plugin-react": "^4.2.1",
-		"@vitejs/plugin-react-swc": "^3.5.0",
+		"@vitejs/plugin-react": "^4.7.0",
+		"@vitejs/plugin-react-swc": "^3.11.0",
 		"vite": "catalog:"
 	}
 }
diff --git a/benches/sims/bench-tools/package.json b/benches/sims/bench-tools/package.json
@@ -6,7 +6,7 @@
 	"type": "module",
 	"main": "./src/index.ts",
 	"dependencies": {
-		"web-worker": "^1.3.0"
+		"web-worker": "^1.5.0"
 	},
 	"devDependencies": {
 		"@config/typescript": "workspace:*"
diff --git a/package.json b/package.json
@@ -12,10 +12,10 @@
 		"lint": "pnpm -r lint"
 	},
 	"devDependencies": {
-		"@types/node": ">=24.0.1",
-		"oxlint": "^1.0.0",
-		"typescript": "latest",
-		"tsx": "latest"
+		"@types/node": "^24.1.0",
+		"oxlint": "^1.8.0",
+		"tsx": "latest",
+		"typescript": "latest"
 	},
 	"engines": {
 		"node": ">=24.2.0",
diff --git a/packages/core/src/entity/entity.ts b/packages/core/src/entity/entity.ts
@@ -110,5 +110,5 @@ export function destroyEntity(world: World, entity: Entity) {
 
 /* @inline @pure */ export function getEntityWorld(entity: Entity) {
 	const worldId = getEntityWorldId(entity);
-	return universe.worlds[worldId]!.deref()!;
+	return universe.worlds[worldId]!;
 }
diff --git a/packages/core/src/query/modifier.ts b/packages/core/src/query/modifier.ts
@@ -1,14 +1,23 @@
 import { $internal } from '../common';
-import type { Trait } from '../trait/types';
+import { Trait } from '../trait/types';
+import { ModifierData, QueryParameter } from './types';
 
-export class ModifierData<TTrait extends Trait[] = Trait[], TType extends string = string> {
-	traitIds: number[];
+export const $modifier = Symbol('modifier');
 
-	constructor(
-		public type: TType,
-		public id: number,
-		public traits: TTrait
-	) {
-		this.traitIds = traits.map((trait) => trait[$internal].id);
-	}
+export function createModifier<TTrait extends Trait[] = Trait[], TType extends string = string>(
+	type: TType,
+	id: number,
+	traits: TTrait
+): ModifierData<TTrait, TType> {
+	return {
+		[$modifier]: true,
+		type,
+		id,
+		traits,
+		traitIds: traits.map((trait) => trait[$internal].id),
+	} as const;
+}
+
+export function isModifier(param: QueryParameter): param is ModifierData {
+	return $modifier in param;
 }
diff --git a/packages/core/src/query/modifiers/added.ts b/packages/core/src/query/modifiers/added.ts
@@ -1,16 +1,17 @@
 import type { Trait } from '../../trait/types';
 import { universe } from '../../universe/universe';
-import { ModifierData } from '../modifier';
+import { createModifier } from '../modifier';
 import { createTrackingId, setTrackingMasks } from '../utils/tracking-cursor';
 
 export function createAdded() {
 	const id = createTrackingId();
 
 	for (const world of universe.worlds) {
 		if (!world) continue;
-		setTrackingMasks(world.deref()!, id);
+		setTrackingMasks(world, id);
 	}
 
-	return <T extends Trait[] = Trait[]>(...traits: T) =>
-		new ModifierData<T>(`added-${id}`, id, traits);
+	return <T extends Trait[] = Trait[]>(...traits: T) => {
+		return createModifier(`added-${id}`, id, traits);
+	};
 }
diff --git a/packages/core/src/query/modifiers/changed.ts b/packages/core/src/query/modifiers/changed.ts
@@ -5,19 +5,20 @@ import { hasTrait, registerTrait } from '../../trait/trait';
 import type { Trait } from '../../trait/types';
 import { universe } from '../../universe/universe';
 import type { World } from '../../world/world';
-import { ModifierData } from '../modifier';
+import { createModifier } from '../modifier';
 import { createTrackingId, setTrackingMasks } from '../utils/tracking-cursor';
 
 export function createChanged() {
 	const id = createTrackingId();
 
 	for (const world of universe.worlds) {
 		if (!world) continue;
-		setTrackingMasks(world.deref()!, id);
+		setTrackingMasks(world, id);
 	}
 
-	return <T extends Trait[] = Trait[]>(...traits: T) =>
-		new ModifierData<T>(`changed-${id}`, id, traits);
+	return <T extends Trait[] = Trait[]>(...traits: T) => {
+		return createModifier(`changed-${id}`, id, traits);
+	};
 }
 
 export function setChanged(world: World, entity: Entity, trait: Trait) {
diff --git a/packages/core/src/query/modifiers/not.ts b/packages/core/src/query/modifiers/not.ts
@@ -1,4 +1,6 @@
 import type { Trait } from '../../trait/types';
-import { ModifierData } from '../modifier';
+import { createModifier } from '../modifier';
 
-export const Not = <T extends Trait[] = Trait[]>(...traits: T) => new ModifierData('not', 1, traits);
+export const Not = <T extends Trait[] = Trait[]>(...traits: T) => {
+	return createModifier('not', 1, traits);
+};
diff --git a/packages/core/src/query/modifiers/or.ts b/packages/core/src/query/modifiers/or.ts
@@ -1,4 +1,6 @@
 import type { Trait } from '../../trait/types';
-import { ModifierData } from '../modifier';
+import { createModifier } from '../modifier';
 
-export const Or = <T extends Trait[] = Trait[]>(...traits: T) => new ModifierData('or', 2, traits);
+export const Or = <T extends Trait[] = Trait[]>(...traits: T) => {
+	return createModifier('or', 2, traits);
+};
diff --git a/packages/core/src/query/modifiers/removed.ts b/packages/core/src/query/modifiers/removed.ts
@@ -1,16 +1,17 @@
 import type { Trait } from '../../trait/types';
 import { universe } from '../../universe/universe';
-import { ModifierData } from '../modifier';
+import { createModifier } from '../modifier';
 import { createTrackingId, setTrackingMasks } from '../utils/tracking-cursor';
 
 export function createRemoved() {
 	const id = createTrackingId();
 
 	for (const world of universe.worlds) {
 		if (!world) continue;
-		setTrackingMasks(world.deref()!, id);
+		setTrackingMasks(world, id);
 	}
 
-	return <T extends Trait[] = Trait[]>(...traits: T) =>
-		new ModifierData<T>(`removed-${id}`, id, traits);
+	return <T extends Trait[] = Trait[]>(...traits: T) => {
+		return createModifier(`removed-${id}`, id, traits);
+	};
 }
diff --git a/packages/core/src/query/query-result.ts b/packages/core/src/query/query-result.ts
@@ -5,7 +5,7 @@ import { getStore } from '../trait/trait';
 import type { Store, Trait } from '../trait/types';
 import { shallowEqual } from '../utils/shallow-equal';
 import type { World } from '../world/world';
-import { ModifierData } from './modifier';
+import { isModifier } from './modifier';
 import { setChanged } from './modifiers/changed';
 import type { Query } from './query';
 import type {
@@ -245,7 +245,7 @@ export function createQueryResult<T extends QueryParameter[]>(
 	for (let i = 0; i < params.length; i++) {
 		const param = params[i];
 
-		if (param instanceof ModifierData) {
+		if (isModifier(param)) {
 			// Skip not modifier.
 			if (param.type === 'not') continue;
 
diff --git a/packages/core/src/query/query.ts b/packages/core/src/query/query.ts
@@ -2,11 +2,10 @@ import { $internal } from '../common';
 import type { Entity } from '../entity/types';
 import { getEntityId } from '../entity/utils/pack-entity';
 import { registerTrait, trait } from '../trait/trait';
-import type { TraitData } from '../trait/trait-data';
-import type { Trait } from '../trait/types';
+import type { Trait, TraitData } from '../trait/types';
 import { SparseSet } from '../utils/sparse-set';
 import type { World } from '../world/world';
-import { ModifierData } from './modifier';
+import { isModifier } from './modifier';
 import type { QueryParameter, QuerySubscriber } from './types';
 import { createQueryHash } from './utils/create-query-hash';
 
@@ -64,7 +63,7 @@ export class Query {
 		for (let i = 0; i < parameters.length; i++) {
 			const parameter = parameters[i];
 
-			if (parameter instanceof ModifierData) {
+			if (isModifier(parameter)) {
 				const traits = parameter.traits;
 
 				// Register traits if they don't exist.
diff --git a/packages/core/src/query/types.ts b/packages/core/src/query/types.ts
@@ -7,7 +7,7 @@ import type {
 	Trait,
 	TraitInstance,
 } from '../trait/types';
-import type { ModifierData } from './modifier';
+import { $modifier } from './modifier';
 
 export type QueryModifier = (...components: Trait[]) => ModifierData;
 export type QueryParameter = Trait | ReturnType<QueryModifier>;
@@ -37,15 +37,15 @@ export type StoresFromParameters<T extends QueryParameter[]> = T extends [infer
 			...(First extends Trait
 				? [ExtractStore<First>]
 				: First extends ModifierData
-					? StoresFromParameters<UnwrapModifierData<First>>
-					: []),
-			...(Rest extends QueryParameter[] ? StoresFromParameters<Rest> : []),
-		]
+				? StoresFromParameters<UnwrapModifierData<First>>
+				: []),
+			...(Rest extends QueryParameter[] ? StoresFromParameters<Rest> : [])
+	  ]
 	: [];
 
 export type InstancesFromParameters<T extends QueryParameter[]> = T extends [
 	infer First,
-	...infer Rest,
+	...infer Rest
 ]
 	? [
 			...(First extends Trait
@@ -55,12 +55,12 @@ export type InstancesFromParameters<T extends QueryParameter[]> = T extends [
 						: [TraitInstance<First>]
 					: []
 				: First extends ModifierData
-					? IsNotModifier<First> extends true
-						? []
-						: InstancesFromParameters<UnwrapModifierData<First>>
-					: []),
-			...(Rest extends QueryParameter[] ? InstancesFromParameters<Rest> : []),
-		]
+				? IsNotModifier<First> extends true
+					? []
+					: InstancesFromParameters<UnwrapModifierData<First>>
+				: []),
+			...(Rest extends QueryParameter[] ? InstancesFromParameters<Rest> : [])
+	  ]
 	: [];
 
 export type IsNotModifier<T> = T extends ModifierData<Trait[], infer TType>
@@ -73,3 +73,11 @@ const $parameters = Symbol();
 export type QueryHash<T extends QueryParameter[]> = string & {
 	readonly [$parameters]: T;
 };
+
+export type ModifierData<TTrait extends Trait[] = Trait[], TType extends string = string> = {
+	[$modifier]: true;
+	type: TType;
+	id: number;
+	traits: TTrait;
+	traitIds: number[];
+};
diff --git a/packages/core/src/query/utils/cache-query.ts b/packages/core/src/query/utils/cache-query.ts
@@ -7,10 +7,9 @@ import { createQueryHash } from './create-query-hash';
 export function cacheQuery<T extends QueryParameter[]>(...parameters: T): QueryHash<T> {
 	const hash = createQueryHash(parameters);
 
-	for (const worldRef of universe.worlds) {
-		if (!worldRef) continue;
+	for (const world of universe.worlds) {
+		if (!world) continue;
 
-		const world = worldRef.deref()!;
 		const ctx = world[$internal];
 
 		if (!ctx.queriesHashMap.has(hash)) {
diff --git a/packages/core/src/query/utils/create-query-hash.ts b/packages/core/src/query/utils/create-query-hash.ts
@@ -1,5 +1,5 @@
 import { $internal } from '../../';
-import { ModifierData } from '../modifier';
+import { isModifier } from '../modifier';
 import type { QueryParameter } from '../types';
 
 const sortedIDs = new Float32Array(1024);
@@ -10,7 +10,7 @@ export const createQueryHash = (parameters: QueryParameter[]) => {
 
 	for (let i = 0; i < parameters.length; i++) {
 		const param = parameters[i];
-		if (param instanceof ModifierData) {
+		if (isModifier(param)) {
 			const modifierId = param.id;
 			const traitIds = param.traitIds;
 
diff --git a/packages/core/src/trait/trait-data.ts b/packages/core/src/trait/trait-data.ts
diff --git a/packages/core/src/trait/trait.ts b/packages/core/src/trait/trait.ts
diff --git a/packages/core/src/trait/types.ts b/packages/core/src/trait/types.ts
diff --git a/packages/core/src/universe/universe.ts b/packages/core/src/universe/universe.ts
diff --git a/packages/core/src/world/world.ts b/packages/core/src/world/world.ts
diff --git a/packages/core/tests/world.test.ts b/packages/core/tests/world.test.ts
diff --git a/packages/publish/package.json b/packages/publish/package.json
diff --git a/packages/react/package.json b/packages/react/package.json
diff --git a/packages/react/tests/world.test.tsx b/packages/react/tests/world.test.tsx
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`"@types/react": "catalog:",`
`25`	`25`	`"@types/react-dom": "catalog:",`
`26`	`26`	`"@types/three": "catalog:",`
`27`		`- "@vitejs/plugin-react": "^4.2.1",`
`28`		`- "@vitejs/plugin-react-swc": "^3.5.0",`
	`27`	`+ "@vitejs/plugin-react": "^4.7.0",`
	`28`	`+ "@vitejs/plugin-react-swc": "^3.11.0",`
`29`	`29`	`"vite": "catalog:"`
`30`	`30`	`}`
`31`	`31`	`}`