🏷️ core: disallow object literals and arrays on schemas, simplify trait types

Author: krispya

packages/core/src/trait/trait.ts

@@ -17,9 +17,7 @@ import { createStore } from './utils/create-store';
 
 let traitId = 0;
 
-function defineTrait(): Trait<Schema>;
-function defineTrait<S extends Schema>(schema: S): Trait<Norm<S>>;
-function defineTrait<S extends Schema>(schema: S = {} as S): Trait<any> {
+function defineTrait<S extends Schema>(schema: S = {} as S): Trait<Norm<S>> {
 	const isAoS = typeof schema === 'function';
 	const traitType: TraitType = isAoS ? 'aos' : 'soa';
 

packages/core/src/trait/types.ts

@@ -69,11 +69,11 @@ export type TraitInstance<T extends Trait | Schema> = T extends Trait
 
 export type Schema =
 	| {
-			[key: string]: number | bigint | string | boolean | any[] | object | null | undefined;
+			[key: string]: number | bigint | string | boolean | null | undefined | (() => unknown);
 	  }
 	| AoSFactory;
 
-export type AoSFactory = () => Record<string, any>;
+export type AoSFactory = () => unknown;
 
 export type Store<T extends Schema = any> = T extends AoSFactory
 	? ReturnType<T>[]
@@ -83,8 +83,8 @@ export type Store<T extends Schema = any> = T extends AoSFactory
 
 // Type Utils
 
-// This type utility ensures that explicit values like true, false or "string literal" are normalized to their primitive types.
-// Mostly used for schema types.
+// This type utility ensures that explicit values like true, false or "string literal" are
+// normalized to their primitive types. Mostly used for schema types.
 export type Norm<T extends Schema> = T extends AoSFactory
 	? () => ReturnType<T> extends number
 			? number
@@ -93,6 +93,16 @@ export type Norm<T extends Schema> = T extends AoSFactory
 			: ReturnType<T> extends string
 			? string
 			: ReturnType<T>
+	: {
+			[K in keyof T]: T[K] extends object
+				? T[K] extends (...args: any[]) => any
+					? T[K]
+					: never
+				: T[K] extends boolean
+				? boolean
+				: T[K];
+	  }[keyof T] extends never
+	? never
 	: {
 			[K in keyof T]: T[K] extends boolean ? boolean : T[K];
 	  };

packages/core/tests/query-modifiers.test.ts

@@ -12,8 +12,8 @@ import {
 
 const Position = trait({ x: 0, y: 0 });
 const IsActive = trait();
-const Foo = trait({});
-const Bar = trait({});
+const Foo = trait();
+const Bar = trait();
 
 describe('Query modifiers', () => {
 	const world = createWorld();

packages/core/tests/query.test.ts

@@ -4,8 +4,8 @@ import { $internal, cacheQuery, createWorld, IsExcluded, Not, Or, trait } from '
 const Position = trait({ x: 0, y: 0 });
 const Name = trait({ name: 'name' });
 const IsActive = trait();
-const Foo = trait({});
-const Bar = trait({});
+const Foo = trait();
+const Bar = trait();
 
 describe('Query', () => {
 	const world = createWorld();