feat(core): adjust internal types

nartc · nartc · commit dae630fa0696 · 2024-10-29T22:55:07.000-05:00
diff --git a/libs/core/src/lib/three-types.ts b/libs/core/src/lib/three-types.ts
@@ -196,9 +196,11 @@ export type NgtNodeElement<TOriginal, TConstructor> = {
 	__ngt_args__: NgtArguments<TConstructor>;
 };
 
-export type NgtNode<TOriginal, TConstructor, TNoEvent = NoEvent<TOriginal>> = Expand<
-	NgtExtendedColors<NgtOverwrite<Partial<TNoEvent>, NgtNodeElement<TOriginal, TConstructor>>>
->;
+export type NgtNode<TOriginal, TConstructor, TNoEvent = NoEvent<TOriginal>> = [TNoEvent] extends [
+	{ thisShouldNeverHappen: 'unless the object is of type any' },
+]
+	? NgtExtendedColors<NgtOverwrite<Partial<{}>, NgtNodeElement<{}, {}>>>
+	: NgtExtendedColors<NgtOverwrite<Partial<TNoEvent>, NgtNodeElement<TOriginal, TConstructor>>>;
 
 export type NgtObject3DEventsMap = {
 	[TEvent in keyof NgtEventHandlers]-?: Parameters<NonNullable<NgtEventHandlers[TEvent]>>[0];
diff --git a/libs/core/src/lib/types.ts b/libs/core/src/lib/types.ts
@@ -20,7 +20,7 @@ import {
 import { NgtObject3DNode } from './three-types';
 import { NgtSignalStore } from './utils/signal-store';
 
-export type NgtProperties<T> = Pick<T, { [K in keyof T]: T[K] extends (_: any) => any ? never : K }[keyof T]>;
+export type NgtProperties<T> = { [K in keyof T as T[K] extends (...args: Array<any>) => any ? never : K]: T[K] };
 export type NgtAnyRecord = Record<string, any>;
 
 export type NgtEquConfig = {
