fix(core): rename assertInjectionContext to assertInjector

nartc · nartc · commit 79c68aae3b96 · 2023-09-06T16:06:29.000-05:00
diff --git a/libs/cannon/services/src/lib/body.ts b/libs/cannon/services/src/lib/body.ts
@@ -25,7 +25,7 @@ import type {
 	Triplet,
 	VectorName,
 } from '@pmndrs/cannon-worker-api';
-import { assertInjectionContext, injectNgtRef, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
+import { assertInjector, injectNgtRef, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
 import { injectNgtcPhysicsApi, type NgtcCannonEvents } from 'angular-three-cannon';
 import { injectNgtcDebugApi } from 'angular-three-cannon/debug';
 import * as THREE from 'three';
@@ -233,7 +233,7 @@ function injectBody<TBodyProps extends BodyProps, TObject extends THREE.Object3D
 	argsFn: NgtcArgFn<TBodyProps['args']>,
 	{ ref, injector, deps = () => ({}) }: NgtcBodyOptions<TObject> = {},
 ): NgtcBodyReturn<TObject> {
-	injector = assertInjectionContext(injectBody, injector);
+	injector = assertInjector(injectBody, injector);
 	return runInInjectionContext(injector, () => {
 		const bodyRef = ref || injectNgtRef<TObject>();
 
diff --git a/libs/cannon/services/src/lib/constraints.ts b/libs/cannon/services/src/lib/constraints.ts
@@ -5,14 +5,7 @@ import type {
 	HingeConstraintOpts,
 	PointToPointConstraintOpts,
 } from '@pmndrs/cannon-worker-api';
-import {
-	assertInjectionContext,
-	injectNgtRef,
-	is,
-	makeId,
-	type NgtAnyRecord,
-	type NgtInjectedRef,
-} from 'angular-three';
+import { assertInjector, injectNgtRef, is, makeId, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
 import { injectNgtcPhysicsApi } from 'angular-three-cannon';
 import * as THREE from 'three';
 
@@ -103,7 +96,7 @@ function injectConstraint<
 		opts = () => ({}) as TOptions,
 	}: NgtcConstraintOptions<TConstraintType, TOptions> = {},
 ): NgtcConstraintReturn<TConstraintType, A, B> {
-	injector = assertInjectionContext(injectConstraint, injector);
+	injector = assertInjector(injectConstraint, injector);
 	return runInInjectionContext(injector, () => {
 		const physicsApi = injectNgtcPhysicsApi();
 		const worker = physicsApi.select('worker');
diff --git a/libs/cannon/services/src/lib/contact-material.ts b/libs/cannon/services/src/lib/contact-material.ts
@@ -1,6 +1,6 @@
 import { effect, runInInjectionContext, untracked, type Injector } from '@angular/core';
 import type { ContactMaterialOptions, MaterialOptions } from '@pmndrs/cannon-worker-api';
-import { assertInjectionContext, makeId, type NgtAnyRecord } from 'angular-three';
+import { assertInjector, makeId, type NgtAnyRecord } from 'angular-three';
 import { injectNgtcPhysicsApi } from 'angular-three-cannon';
 
 export function injectContactMaterial(
@@ -12,7 +12,7 @@ export function injectContactMaterial(
 		injector,
 	}: { opts: () => ContactMaterialOptions; deps?: () => NgtAnyRecord; injector?: Injector },
 ): void {
-	injector = assertInjectionContext(injectContactMaterial, injector);
+	injector = assertInjector(injectContactMaterial, injector);
 	return runInInjectionContext(injector, () => {
 		const physicsApi = injectNgtcPhysicsApi();
 		const worker = physicsApi.select('worker');
diff --git a/libs/cannon/services/src/lib/ray.ts b/libs/cannon/services/src/lib/ray.ts
@@ -1,6 +1,6 @@
 import { effect, runInInjectionContext, untracked, type Injector } from '@angular/core';
 import type { RayMode, RayOptions, RayhitEvent } from '@pmndrs/cannon-worker-api';
-import { assertInjectionContext, makeId, type NgtAnyRecord } from 'angular-three';
+import { assertInjector, makeId, type NgtAnyRecord } from 'angular-three';
 import { injectNgtcPhysicsApi } from 'angular-three-cannon';
 
 export type NgtcRayOptions = {
@@ -23,7 +23,7 @@ export function useRaycastAll(opts: NgtcRayOptions) {
 }
 
 function injectRay(mode: RayMode, { options, callback, deps = () => ({}), injector }: NgtcRayOptions) {
-	injector = assertInjectionContext(injectRay, injector);
+	injector = assertInjector(injectRay, injector);
 	return runInInjectionContext(injector, () => {
 		const physicsApi = injectNgtcPhysicsApi();
 		const [worker, events] = [physicsApi.select('worker'), physicsApi.get('events')];
diff --git a/libs/cannon/services/src/lib/raycast-vehicle.ts b/libs/cannon/services/src/lib/raycast-vehicle.ts
@@ -1,6 +1,6 @@
 import { effect, runInInjectionContext, untracked, type Injector } from '@angular/core';
 import type { WheelInfoOptions } from '@pmndrs/cannon-worker-api';
-import { assertInjectionContext, injectNgtRef, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
+import { assertInjector, injectNgtRef, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
 import { injectNgtcPhysicsApi } from 'angular-three-cannon';
 import * as THREE from 'three';
 import { getUUID, subscribe } from './body';
@@ -39,7 +39,7 @@ export function injectRaycastVehicle<TObject extends THREE.Object3D = THREE.Obje
 		deps = () => ({}),
 	}: { ref?: NgtInjectedRef<TObject>; injector?: Injector; deps?: () => NgtAnyRecord } = {},
 ): NgtcRaycastVehicleReturn<TObject> {
-	injector = assertInjectionContext(injectRaycastVehicle, injector);
+	injector = assertInjector(injectRaycastVehicle, injector);
 	return runInInjectionContext(injector, () => {
 		const physicsApi = injectNgtcPhysicsApi();
 		const [worker, subscriptions] = [physicsApi.select('worker'), physicsApi.get('subscriptions')];
diff --git a/libs/cannon/services/src/lib/spring.ts b/libs/cannon/services/src/lib/spring.ts
@@ -1,13 +1,6 @@
 import { effect, runInInjectionContext, untracked, type Injector } from '@angular/core';
 import type { SpringOptns } from '@pmndrs/cannon-worker-api';
-import {
-	assertInjectionContext,
-	injectNgtRef,
-	is,
-	makeId,
-	type NgtAnyRecord,
-	type NgtInjectedRef,
-} from 'angular-three';
+import { assertInjector, injectNgtRef, is, makeId, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
 import { injectNgtcPhysicsApi } from 'angular-three-cannon';
 
 export type NgtcSpringApi = {
@@ -35,7 +28,7 @@ export function injectSpring<A extends THREE.Object3D, B extends THREE.Object3D>
 		deps = () => ({}),
 	}: { injector?: Injector; deps?: () => NgtAnyRecord; opts?: () => SpringOptns } = {},
 ): NgtcSpringReturn<A, B> {
-	injector = assertInjectionContext(injectSpring, injector);
+	injector = assertInjector(injectSpring, injector);
 	return runInInjectionContext(injector, () => {
 		const physicsApi = injectNgtcPhysicsApi();
 		const worker = physicsApi.select('worker');
diff --git a/libs/core/src/index.ts b/libs/core/src/index.ts
@@ -16,7 +16,7 @@ export * from './lib/store';
 export * from './lib/three-types';
 export * from './lib/types';
 export * from './lib/utils/apply-props';
-export * from './lib/utils/assert-injection-context';
+export * from './lib/utils/assert-injector';
 export { createAttachFunction } from './lib/utils/attach';
 export * from './lib/utils/create-injection-token';
 export * from './lib/utils/is';
diff --git a/libs/core/src/lib/before-render.ts b/libs/core/src/lib/before-render.ts
@@ -1,12 +1,12 @@
 import { DestroyRef, Injector, inject, runInInjectionContext } from '@angular/core';
 import { injectNgtStore, type NgtBeforeRenderRecord } from './store';
-import { assertInjectionContext } from './utils/assert-injection-context';
+import { assertInjector } from './utils/assert-injector';
 
 export function injectBeforeRender(
 	cb: NgtBeforeRenderRecord['callback'],
 	{ priority = 0, injector }: { priority?: number; injector?: Injector } = {},
 ) {
-	injector = assertInjectionContext(injectBeforeRender, injector);
+	injector = assertInjector(injectBeforeRender, injector);
 	return runInInjectionContext(injector, () => {
 		const store = injectNgtStore();
 		const sub = store.get('internal').subscribe(cb, priority, store);
diff --git a/libs/core/src/lib/loader.ts b/libs/core/src/lib/loader.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Injector, effect, inject, runInInjectionContext, signal, type Signal } from '@angular/core';
 import type { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
 import type { NgtAnyRecord } from './types';
-import { assertInjectionContext } from './utils/assert-injection-context';
+import { assertInjector } from './utils/assert-injector';
 import { makeObjectGraph, type NgtObjectMap } from './utils/make';
 import { safeDetectChanges } from './utils/safe-detect-changes';
 
@@ -101,7 +101,7 @@ export function injectNgtLoader<
 		injector?: Injector;
 	} = {},
 ): Signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>> | null> {
-	injector = assertInjectionContext(injectNgtLoader, injector);
+	injector = assertInjector(injectNgtLoader, injector);
 	const response = signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>> | null>(
 		null,
 	);
diff --git a/libs/core/src/lib/ref.ts b/libs/core/src/lib/ref.ts
@@ -10,7 +10,7 @@ import {
 	type Signal,
 } from '@angular/core';
 import { getLocalState, type NgtInstanceNode } from './instance';
-import { assertInjectionContext } from './utils/assert-injection-context';
+import { assertInjector } from './utils/assert-injector';
 import { is } from './utils/is';
 
 export type NgtInjectedRef<TElement> = ElementRef<TElement> & {
@@ -26,7 +26,7 @@ export function injectNgtRef<TElement>(
 	initial: ElementRef<TElement> | TElement = null!,
 	injector?: Injector,
 ): NgtInjectedRef<TElement> {
-	injector = assertInjectionContext(injectNgtRef);
+	injector = assertInjector(injectNgtRef);
 	const ref = is.ref(initial) ? initial : new ElementRef(initial as TElement);
 	const signalRef = signal(ref.nativeElement);
 	const readonlySignal = signalRef.asReadonly();
diff --git a/libs/core/src/lib/roots.ts b/libs/core/src/lib/roots.ts
@@ -6,7 +6,7 @@ import { injectNgtLoop } from './loop';
 import { injectNgtStore, type NgtSize, type NgtState } from './store';
 import type { NgtAnyRecord, NgtEquConfig } from './types';
 import { applyProps } from './utils/apply-props';
-import { assertInjectionContext } from './utils/assert-injection-context';
+import { assertInjector } from './utils/assert-injector';
 import { is } from './utils/is';
 import { makeDefaultCamera, makeDefaultRenderer, makeDpr } from './utils/make';
 import type { NgtSignalStore } from './utils/signal-store';
@@ -17,7 +17,7 @@ const shallowLoose = { objects: 'shallow', strict: false } as NgtEquConfig;
 export const roots = new Map<HTMLCanvasElement, NgtSignalStore<NgtState>>();
 
 export function injectCanvasRootInitializer(injector?: Injector) {
-	injector = assertInjectionContext(injectCanvasRootInitializer, injector);
+	injector = assertInjector(injectCanvasRootInitializer, injector);
 
 	return runInInjectionContext(injector, () => {
 		const injectedStore = injectNgtStore();
diff --git a/libs/core/src/lib/utils/assert-injector.ts b/libs/core/src/lib/utils/assert-injector.ts
@@ -1,6 +1,6 @@
 import { Injector, assertInInjectionContext, inject } from '@angular/core';
 
-export function assertInjectionContext(fn: Function, injector?: Injector): Injector {
+export function assertInjector(fn: Function, injector?: Injector): Injector {
 	!injector && assertInInjectionContext(fn);
 	return injector ?? inject(Injector);
 }
diff --git a/libs/soba/cameras/src/cube-camera/cube-camera.ts b/libs/soba/cameras/src/cube-camera/cube-camera.ts
@@ -21,7 +21,7 @@ import {
 } from '@angular/core';
 import {
 	NgtArgs,
-	assertInjectionContext,
+	assertInjector,
 	extend,
 	injectBeforeRender,
 	injectNgtRef,
@@ -55,7 +55,7 @@ export function injectNgtsCubeCamera(
 	cubeCameraState: () => Partial<NgtsCubeCameraState>,
 	{ injector }: { injector?: Injector } = {},
 ) {
-	injector = assertInjectionContext(injectNgtsCubeCamera, injector);
+	injector = assertInjector(injectNgtsCubeCamera, injector);
 	return runInInjectionContext(injector, () => {
 		const state = computed(() => ({ ...defaultCubeCameraState, ...cubeCameraState() }));
 		const resolution = computed(() => state().resolution);
diff --git a/libs/soba/loaders/src/progress/progress.ts b/libs/soba/loaders/src/progress/progress.ts
@@ -1,9 +1,9 @@
 import { ChangeDetectorRef, inject, runInInjectionContext, signal, untracked, type Injector } from '@angular/core';
-import { assertInjectionContext, safeDetectChanges } from 'angular-three';
+import { assertInjector, safeDetectChanges } from 'angular-three';
 import * as THREE from 'three';
 
 export function injectNgtsProgress(injector?: Injector) {
-	injector = assertInjectionContext(injectNgtsProgress, injector);
+	injector = assertInjector(injectNgtsProgress, injector);
 	return runInInjectionContext(injector, () => {
 		const cdr = inject(ChangeDetectorRef);
 
diff --git a/libs/soba/loaders/src/texture-loader/texture-loader.ts b/libs/soba/loaders/src/texture-loader/texture-loader.ts
@@ -1,5 +1,5 @@
 import { effect, runInInjectionContext, type Injector, type Signal } from '@angular/core';
-import { assertInjectionContext, injectNgtLoader, injectNgtStore, type NgtLoaderResults } from 'angular-three';
+import { assertInjector, injectNgtLoader, injectNgtStore, type NgtLoaderResults } from 'angular-three';
 import * as THREE from 'three';
 
 export function injectNgtsTextureLoader<TInput extends string[] | string | Record<string, string>>(
@@ -12,7 +12,7 @@ export function injectNgtsTextureLoader<TInput extends string[] | string | Recor
 		injector?: Injector;
 	} = {},
 ): Signal<NgtLoaderResults<TInput, THREE.Texture> | null> {
-	injector = assertInjectionContext(injectNgtsTextureLoader, injector);
+	injector = assertInjector(injectNgtsTextureLoader, injector);
 	return runInInjectionContext(injector, () => {
 		const store = injectNgtStore();
 		const result = injectNgtLoader(() => THREE.TextureLoader, input, { injector });
diff --git a/libs/soba/misc/src/animations/animations.ts b/libs/soba/misc/src/animations/animations.ts
@@ -1,5 +1,5 @@
 import { Injector, computed, effect, runInInjectionContext } from '@angular/core';
-import { assertInjectionContext, injectBeforeRender, injectNgtRef, type NgtRef } from 'angular-three';
+import { assertInjector, injectBeforeRender, injectNgtRef, type NgtRef } from 'angular-three';
 import * as THREE from 'three';
 
 export function injectNgtsAnimations(
@@ -10,7 +10,7 @@ export function injectNgtsAnimations(
 		playFirstClip = true,
 	}: { ref?: NgtRef<THREE.Object3D>; playFirstClip?: boolean; injector?: Injector } = {},
 ) {
-	injector = assertInjectionContext(injectNgtsAnimations, injector);
+	injector = assertInjector(injectNgtsAnimations, injector);
 	return runInInjectionContext(injector, () => {
 		let actualRef = injectNgtRef<THREE.Object3D>();
 
diff --git a/libs/soba/misc/src/depth-buffer/depth-buffer.ts b/libs/soba/misc/src/depth-buffer/depth-buffer.ts
@@ -1,11 +1,5 @@
 import { ChangeDetectorRef, computed, effect, inject, runInInjectionContext, type Injector } from '@angular/core';
-import {
-	assertInjectionContext,
-	injectBeforeRender,
-	injectNgtRef,
-	injectNgtStore,
-	safeDetectChanges,
-} from 'angular-three';
+import { assertInjector, injectBeforeRender, injectNgtRef, injectNgtStore, safeDetectChanges } from 'angular-three';
 import * as THREE from 'three';
 import { injectNgtsFBO } from '../fbo/fbo';
 
@@ -18,7 +12,7 @@ export function injectNgtsDepthBuffer(
 	paramsFactory: () => Partial<NgtsDepthBufferParams> = () => ({}),
 	{ injector }: { injector?: Injector } = {},
 ) {
-	injector = assertInjectionContext(injectNgtsDepthBuffer, injector);
+	injector = assertInjector(injectNgtsDepthBuffer, injector);
 	return runInInjectionContext(injector, () => {
 		const depthBufferRef = injectNgtRef<THREE.DepthTexture | null>(null);
 		const store = injectNgtStore();
diff --git a/libs/soba/misc/src/fbo/fbo.ts b/libs/soba/misc/src/fbo/fbo.ts
@@ -7,7 +7,7 @@ import {
 	runInInjectionContext,
 	type Injector,
 } from '@angular/core';
-import { assertInjectionContext, injectNgtRef, injectNgtStore, safeDetectChanges } from 'angular-three';
+import { assertInjector, injectNgtRef, injectNgtStore, safeDetectChanges } from 'angular-three';
 import * as THREE from 'three';
 
 interface FBOSettings extends THREE.WebGLRenderTargetOptions {
@@ -24,7 +24,7 @@ export interface NgtsFBOParams {
 }
 
 export function injectNgtsFBO(fboParams: () => NgtsFBOParams, { injector }: { injector?: Injector } = {}) {
-	injector = assertInjectionContext(injectNgtsFBO, injector);
+	injector = assertInjector(injectNgtsFBO, injector);
 	return runInInjectionContext(injector, () => {
 		const store = injectNgtStore();
 		const cdr = inject(ChangeDetectorRef);
diff --git a/libs/soba/misc/src/sampler/sampler.ts b/libs/soba/misc/src/sampler/sampler.ts
@@ -11,7 +11,7 @@ import {
 	untracked,
 } from '@angular/core';
 import {
-	assertInjectionContext,
+	assertInjector,
 	checkUpdate,
 	extend,
 	injectNgtRef,
@@ -72,7 +72,7 @@ export function injectNgtsSurfaceSampler(
 	surfaceSamplerState: () => (Partial<Omit<NgtsSurfaceSamplerState, 'mesh'>> & { mesh: NgtRef<THREE.Mesh> }) | null,
 	{ injector }: { injector?: Injector } = {},
 ) {
-	injector = assertInjectionContext(injectNgtsSurfaceSampler, injector);
+	injector = assertInjector(injectNgtsSurfaceSampler, injector);
 	return runInInjectionContext(injector, () => {
 		const state = computed(() => {
 			const _state = surfaceSamplerState();
diff --git a/libs/soba/misc/src/trail-texture/inject-trail-texture.ts b/libs/soba/misc/src/trail-texture/inject-trail-texture.ts
@@ -1,12 +1,12 @@
 import { Injector, computed, runInInjectionContext } from '@angular/core';
-import { assertInjectionContext, injectBeforeRender, type NgtThreeEvent } from 'angular-three';
+import { assertInjector, injectBeforeRender, type NgtThreeEvent } from 'angular-three';
 import { TrailTexture, type TrailConfig } from './trail-texture';
 
 export function injectNgtsTrailTexture(
 	trailConfigFn: () => Partial<TrailConfig>,
 	{ injector }: { injector?: Injector } = {},
 ) {
-	injector = assertInjectionContext(injectNgtsTrailTexture, injector);
+	injector = assertInjector(injectNgtsTrailTexture, injector);
 	return runInInjectionContext(injector, () => {
 		const config = computed(() => trailConfigFn() || {});
 		const trail = computed(() => new TrailTexture(config()));
diff --git a/libs/soba/misc/src/trail/trail.ts b/libs/soba/misc/src/trail/trail.ts
@@ -10,7 +10,7 @@ import {
 import {
 	NgtPortal,
 	NgtPortalContent,
-	assertInjectionContext,
+	assertInjector,
 	extend,
 	injectBeforeRender,
 	injectNgtRef,
@@ -57,7 +57,7 @@ export function injectNgtsTrail(
 	settingsFactory: () => Partial<NgtsTrailSettings>,
 	{ injector }: { injector?: Injector } = {},
 ) {
-	injector = assertInjectionContext(injectNgtsTrail, injector);
+	injector = assertInjector(injectNgtsTrail, injector);
 	return runInInjectionContext(injector, () => {
 		const points = injectNgtRef<Float32Array>();
 		let frameCount = 0;
diff --git a/libs/soba/shaders/src/wireframe-material/wireframe-material.ts b/libs/soba/shaders/src/wireframe-material/wireframe-material.ts
@@ -1,5 +1,5 @@
 import { computed, effect, runInInjectionContext, type Injector } from '@angular/core';
-import { assertInjectionContext, type NgtShaderMaterial } from 'angular-three';
+import { assertInjector, type NgtShaderMaterial } from 'angular-three';
 import * as THREE from 'three';
 import { shaderMaterial } from '../shader-material/shader-material';
 
@@ -232,7 +232,7 @@ export function injectNgtsWireframeUniforms(
 	stateFactory: () => Partial<WireframeMaterialState>,
 	{ injector }: { injector?: Injector } = {},
 ) {
-	injector = assertInjectionContext(injectNgtsWireframeUniforms, injector);
+	injector = assertInjector(injectNgtsWireframeUniforms, injector);
 	return runInInjectionContext(injector, () => {
 		const uniforms = uniformsFactory();
 		const state = computed(() => stateFactory());
diff --git a/libs/soba/staging/src/bb-anchor/bb-anchor.ts b/libs/soba/staging/src/bb-anchor/bb-anchor.ts
@@ -64,16 +64,16 @@ export class NgtsBBAnchor {
 
 	private beforeRender() {
 		injectBeforeRender(() => {
-			const [parent, group, anchor] = [this.parentRef.nativeElement, this.groupRef.nativeElement, this.xyz()];
+			const [parent, group, [x, y, z]] = [this.parentRef.nativeElement, this.groupRef.nativeElement, this.xyz()];
 
 			if (parent) {
 				boundingBox.setFromObject(parent);
 				boundingBox.getSize(boundingBoxSize);
 
 				group.position.set(
-					parent.position.x + (boundingBoxSize.x * anchor[0]) / 2,
-					parent.position.y + (boundingBoxSize.y * anchor[1]) / 2,
-					parent.position.z + (boundingBoxSize.z * anchor[2]) / 2,
+					parent.position.x + (boundingBoxSize.x * x) / 2,
+					parent.position.y + (boundingBoxSize.y * y) / 2,
+					parent.position.z + (boundingBoxSize.z * z) / 2,
 				);
 			}
 		});
diff --git a/libs/soba/staging/src/environment/utils.ts b/libs/soba/staging/src/environment/utils.ts
diff --git a/libs/soba/staging/src/matcap-texture/matcap-texture.ts b/libs/soba/staging/src/matcap-texture/matcap-texture.ts
diff --git a/libs/soba/staging/src/normal-texture/normal-texture.ts b/libs/soba/staging/src/normal-texture/normal-texture.ts
diff --git a/libs/soba/staging/src/spot-light/shadow-mesh.ts b/libs/soba/staging/src/spot-light/shadow-mesh.ts
