fix(core): fix core type for loader

nartc · nartc · commit 9c741eaaad6b · 2023-09-27T10:00:44.000-04:00
diff --git a/libs/core/src/lib/loader.ts b/libs/core/src/lib/loader.ts
@@ -83,7 +83,7 @@ function load<
 	};
 }
 
-export function injectNgtLoader<
+function _injectNgtLoader<
 	TData,
 	TUrl extends string | string[] | Record<string, string>,
 	TLoaderConstructor extends NgtLoaderProto<TData>,
@@ -101,7 +101,7 @@ export function injectNgtLoader<
 		injector?: Injector;
 	} = {},
 ): Signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>> | null> {
-	injector = assertInjector(injectNgtLoader, injector);
+	injector = assertInjector(_injectNgtLoader, injector);
 	const response = signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>> | null>(
 		null,
 	);
@@ -132,7 +132,7 @@ export function injectNgtLoader<
 	});
 }
 
-injectNgtLoader['preload'] = <
+_injectNgtLoader.preload = <
 	TData,
 	TUrl extends string | string[] | Record<string, string>,
 	TLoaderConstructor extends NgtLoaderProto<TData>,
@@ -144,6 +144,9 @@ injectNgtLoader['preload'] = <
 	Promise.all(load(loaderConstructorFactory, inputs, { extensions })());
 };
 
-injectNgtLoader['destroy'] = () => {
+_injectNgtLoader.destroy = () => {
 	cached.clear();
 };
+
+export type NgtInjectedLoader = typeof _injectNgtLoader;
+export const injectNgtLoader: NgtInjectedLoader = _injectNgtLoader;
diff --git a/libs/soba/loaders/src/gltf-loader/gltf-loader.ts b/libs/soba/loaders/src/gltf-loader/gltf-loader.ts
@@ -1,5 +1,6 @@
 import type { Injector, Signal } from '@angular/core';
 import { injectNgtLoader, type NgtLoaderResults, type NgtObjectMap } from 'angular-three';
+import { assertInjector } from 'ngxtension/assert-injector';
 import { DRACOLoader, GLTFLoader, MeshoptDecoder, type GLTF } from 'three-stdlib';
 
 let dracoLoader: DRACOLoader | null = null;
@@ -29,7 +30,7 @@ function _extensions(useDraco: boolean | string, useMeshOpt: boolean, extensions
 
 export type NgtsGLTF<T extends Partial<NgtObjectMap>> = GLTF & NgtObjectMap & T;
 
-export function injectNgtsGLTFLoader<TUrl extends string | string[] | Record<string, string>>(
+function _injectNgtsGLTFLoader<TUrl extends string | string[] | Record<string, string>>(
 	path: () => TUrl,
 	{
 		useDraco = true,
@@ -43,14 +44,15 @@ export function injectNgtsGLTFLoader<TUrl extends string | string[] | Record<str
 		extensions?: (loader: GLTFLoader) => void;
 	} = {},
 ): Signal<NgtLoaderResults<TUrl, GLTF & NgtObjectMap> | null> {
+	injector = assertInjector(_injectNgtsGLTFLoader, injector);
 	return injectNgtLoader(() => GLTFLoader, path, {
 		// TODO: fix "as any" when three-stdlib is updated with THREE 0.156
 		extensions: _extensions(useDraco, useMeshOpt, extensions) as any,
 		injector,
 	});
 }
 
-injectNgtsGLTFLoader['preload'] = <TUrl extends string | string[] | Record<string, string>>(
+_injectNgtsGLTFLoader.preload = <TUrl extends string | string[] | Record<string, string>>(
 	path: () => TUrl,
 	{
 		useDraco = true,
@@ -62,8 +64,11 @@ injectNgtsGLTFLoader['preload'] = <TUrl extends string | string[] | Record<strin
 		extensions?: (loader: GLTFLoader) => void;
 	} = {},
 ) => {
-	(injectNgtLoader as any)['preload'](() => GLTFLoader, path, _extensions(useDraco, useMeshOpt, extensions));
+	injectNgtLoader.preload(() => GLTFLoader, path, _extensions(useDraco, useMeshOpt, extensions) as any);
 };
-injectNgtsGLTFLoader['setDecoderPath'] = (path: string) => {
+
+_injectNgtsGLTFLoader.setDecoderPath = (path: string) => {
 	decoderPath = path;
 };
+
+export const injectNgtsGLTFLoader = _injectNgtsGLTFLoader;
diff --git a/libs/soba/loaders/src/texture-loader/texture-loader.ts b/libs/soba/loaders/src/texture-loader/texture-loader.ts
@@ -3,7 +3,7 @@ import { injectNgtLoader, injectNgtStore, type NgtLoaderResults } from 'angular-
 import { assertInjector } from 'ngxtension/assert-injector';
 import * as THREE from 'three';
 
-export function injectNgtsTextureLoader<TInput extends string[] | string | Record<string, string>>(
+function _injectNgtsTextureLoader<TInput extends string[] | string | Record<string, string>>(
 	input: () => TInput,
 	{
 		onLoad,
@@ -13,7 +13,7 @@ export function injectNgtsTextureLoader<TInput extends string[] | string | Recor
 		injector?: Injector;
 	} = {},
 ): Signal<NgtLoaderResults<TInput, THREE.Texture> | null> {
-	injector = assertInjector(injectNgtsTextureLoader, injector);
+	injector = assertInjector(_injectNgtsTextureLoader, injector);
 	return runInInjectionContext(injector, () => {
 		const store = injectNgtStore();
 		const result = injectNgtLoader(() => THREE.TextureLoader, input, { injector });
@@ -37,8 +37,8 @@ export function injectNgtsTextureLoader<TInput extends string[] | string | Recor
 	});
 }
 
-injectNgtsTextureLoader['preload'] = <TInput extends string[] | string | Record<string, string>>(
-	input: () => TInput,
-) => {
-	(injectNgtLoader as any).preload(() => THREE.TextureLoader, input);
+_injectNgtsTextureLoader.preload = <TInput extends string[] | string | Record<string, string>>(input: () => TInput) => {
+	injectNgtLoader.preload(() => THREE.TextureLoader, input);
 };
+
+export const injectNgtsTextureLoader = _injectNgtsTextureLoader;
diff --git a/libs/soba/staging/src/cloud/cloud.ts b/libs/soba/staging/src/cloud/cloud.ts
@@ -6,7 +6,7 @@ import { injectNgtsTextureLoader } from 'angular-three-soba/loaders';
 import { Group, Mesh, MeshStandardMaterial, PlaneGeometry } from 'three';
 
 const CLOUD_URL = 'https://rawcdn.githack.com/pmndrs/drei-assets/9225a9f1fbd449d9411125c2f419b843d0308c9f/cloud.png';
-(injectNgtsTextureLoader as any).preload(() => CLOUD_URL);
+injectNgtsTextureLoader.preload(() => CLOUD_URL);
 
 extend({ Group, Mesh, PlaneGeometry, MeshStandardMaterial });
 
