fix(soba): adjust injectGLTF generics

now you can pass in a type that extends GLTF from three-stdlib that is
your custom GLTF type

```ts
interface YourGLTF extends GLTF {
  nodes: { some: Mesh }
}

gltf = injectGLTF<YourGLTF>(() => './your-model.glb');
gltf().nodes.some; // should be strongly typed
```

Author: nartc

Diff for: libs/soba/loaders/src/lib/gltf-loader.ts

@@ -29,7 +29,25 @@ function _extensions(useDraco: boolean | string, useMeshOpt: boolean, extensions
 	};
 }
 
-function _injectGLTF<TUrl extends string | string[] | Record<string, string>>(
+type InjectGLTFUrl<TGltf extends GLTF | GLTF[] | Record<string, GLTF>> = TGltf extends GLTF
+	? string
+	: TGltf extends GLTF[]
+		? string[]
+		: TGltf extends Record<string, GLTF>
+			? Record<string, string>
+			: never;
+type InjectGLTFObjectMap<TGltf extends GLTF | GLTF[] | Record<string, GLTF>> = TGltf extends GLTF
+	? TGltf & NgtObjectMap
+	: TGltf extends Array<infer _GLTF extends GLTF>
+		? Array<_GLTF & NgtObjectMap>
+		: TGltf extends Record<string, infer _GLTF extends GLTF>
+			? Record<string, _GLTF & NgtObjectMap>
+			: never;
+
+function _injectGLTF<
+	TGltf extends GLTF | GLTF[] | Record<string, GLTF> = GLTF,
+	TUrl extends string | string[] | Record<string, string> = InjectGLTFUrl<TGltf>,
+>(
 	path: () => TUrl,
 	{
 		useDraco = true,
@@ -42,9 +60,9 @@ function _injectGLTF<TUrl extends string | string[] | Record<string, string>>(
 		useMeshOpt?: boolean;
 		injector?: Injector;
 		extensions?: (loader: GLTFLoader) => void;
-		onLoad?: (data: NgtLoaderResults<TUrl, GLTF & NgtObjectMap>) => void;
+		onLoad?: (data: InjectGLTFObjectMap<TGltf>) => void;
 	} = {},
-): Signal<NgtLoaderResults<TUrl, GLTF & NgtObjectMap> | null> & { scene: Signal<GLTF['scene'] | null> } {
+): Signal<InjectGLTFObjectMap<TGltf> | null> & { scene: Signal<GLTF['scene'] | null> } {
 	return assertInjector(_injectGLTF, injector, () => {
 		const result = injectLoader(() => GLTFLoader, path, {
 			extensions: _extensions(useDraco, useMeshOpt, extensions),
@@ -61,7 +79,7 @@ function _injectGLTF<TUrl extends string | string[] | Record<string, string>>(
 		});
 
 		return result;
-	}) as Signal<NgtLoaderResults<TUrl, GLTF & NgtObjectMap> | null> & { scene: Signal<GLTF['scene'] | null> };
+	}) as Signal<InjectGLTFObjectMap<TGltf> | null> & { scene: Signal<GLTF['scene'] | null> };
 }
 
 _injectGLTF.preload = <TUrl extends string | string[] | Record<string, string>>(

Diff for: libs/soba/src/abstractions/grid.stories.ts

@@ -6,7 +6,6 @@ import {
 	input,
 	output,
 	signal,
-	Signal,
 } from '@angular/core';
 import { Meta } from '@storybook/angular';
 import { NgtAnyRecord, NgtArgs } from 'angular-three';
@@ -42,9 +41,9 @@ type SuzanneGLTF = GLTF & {
 	changeDetection: ChangeDetectionStrategy.OnPush,
 })
 class Suzi {
-	gltf = injectGLTF(
+	gltf = injectGLTF<SuzanneGLTF>(
 		() => 'https://vazxmixjsiawhamofees.supabase.co/storage/v1/object/public/models/suzanne-high-poly/model.gltf',
-	) as Signal<SuzanneGLTF | null>;
+	);
 
 	rotation = input([0, 0, 0]);
 	scale = input(1);

Diff for: libs/soba/src/materials/mesh-portal-material.stories.ts

@@ -5,7 +5,6 @@ import {
 	CUSTOM_ELEMENTS_SCHEMA,
 	ElementRef,
 	input,
-	Signal,
 	viewChild,
 } from '@angular/core';
 import { Meta } from '@storybook/angular';
@@ -75,7 +74,7 @@ class Side {
 	index = input.required<number>();
 	attach = computed(() => ['material', this.index()]);
 
-	gltf = injectGLTF(() => './aobox-transformed.glb') as Signal<AOBoxGLTF | null>;
+	gltf = injectGLTF<AOBoxGLTF>(() => './aobox-transformed.glb');
 	shapeRef = viewChild<ElementRef<Mesh>>('shape');
 
 	constructor() {

Diff for: libs/soba/src/misc/animations.stories.ts

@@ -4,7 +4,6 @@ import {
 	Component,
 	Directive,
 	ElementRef,
-	Signal,
 	computed,
 	effect,
 	inject,
@@ -78,7 +77,7 @@ class DefaultAnimationsStory {
 
 	animation = input('Strut');
 
-	gltf = injectGLTF(() => './ybot.glb') as Signal<BotGLTF | null>;
+	gltf = injectGLTF<BotGLTF>(() => './ybot.glb');
 	matcapBody = injectMatcapTexture(() => '293534_B2BFC5_738289_8A9AA7');
 	matcapJoints = injectMatcapTexture(() => '3A2412_A78B5F_705434_836C47');
 

Diff for: libs/soba/src/performances/adaptive.stories.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, CUSTOM_ELEMENTS_SCHEMA, input, Signal } from '@angular/core';
+import { ChangeDetectionStrategy, Component, CUSTOM_ELEMENTS_SCHEMA, input } from '@angular/core';
 import { Meta } from '@storybook/angular';
 import { NgtArgs } from 'angular-three';
 import { NgtsOrbitControls } from 'angular-three-soba/controls';
@@ -49,7 +49,7 @@ interface ArcherGLTF extends GLTF {
 class Archer {
 	protected readonly Math = Math;
 
-	gltf = injectGLTF(() => './archer.glb') as Signal<ArcherGLTF | null>;
+	gltf = injectGLTF<ArcherGLTF>(() => './archer.glb');
 }
 
 @Component({

Diff for: libs/soba/src/performances/instances.stories.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, CUSTOM_ELEMENTS_SCHEMA, input, Signal, viewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, CUSTOM_ELEMENTS_SCHEMA, input, viewChild } from '@angular/core';
 import { Meta } from '@storybook/angular';
 import { injectBeforeRender, injectObjectEvents, omit, pick } from 'angular-three';
 import { NgtsOrbitControls } from 'angular-three-soba/controls';
@@ -119,7 +119,7 @@ class Shoes {
 	data = data;
 	range = input(100);
 
-	gltf = injectGLTF(() => './shoe.glb') as Signal<ShoeGLTF | null>;
+	gltf = injectGLTF<ShoeGLTF>(() => './shoe.glb');
 }
 
 @Component({

Diff for: libs/soba/src/staging/matcap-texture.stories.ts

@@ -1,4 +1,4 @@
-import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectionStrategy, Component, Signal, input } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { Meta } from '@storybook/angular';
 import { NgtArgs } from 'angular-three';
 import { injectGLTF } from 'angular-three-soba/loaders';
@@ -28,7 +28,7 @@ interface SuzyGLTF extends GLTF {
 })
 class DefaultMatcapTextureStory {
 	options = input<NgtsMatcapTextureOptions>();
-	gltf = injectGLTF(() => './suzanne.glb', { useDraco: true }) as Signal<SuzyGLTF | null>;
+	gltf = injectGLTF<SuzyGLTF>(() => './suzanne.glb', { useDraco: true });
 }
 
 export default {

Diff for: libs/soba/src/staging/normal-texture.stories.ts

@@ -1,4 +1,4 @@
-import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectionStrategy, Component, Signal, computed, input } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
 import { Meta } from '@storybook/angular';
 import { injectGLTF } from 'angular-three-soba/loaders';
 import { NgtsNormalTexture, NgtsNormalTextureOptions } from 'angular-three-soba/staging';
@@ -32,7 +32,7 @@ interface SuzyGLTF extends GLTF {
 })
 class DefaultNormalTextureStory {
 	options = input<NgtsNormalTextureOptions>();
-	gltf = injectGLTF(() => './suzanne.glb', { useDraco: true }) as Signal<SuzyGLTF | null>;
+	gltf = injectGLTF<SuzyGLTF>(() => './suzanne.glb', { useDraco: true });
 
 	normalScale = computed(() => {
 		const repeat = this.options()?.repeat;