fix(core): adjust assertInInjectionContext calls

Author: Chau Tran

libs/angular-three/src/lib/di/before-render.ts

@@ -4,14 +4,15 @@ import { NgtBeforeRenderRecord } from '../types';
 
 export function injectBeforeRender(
     cb: NgtBeforeRenderRecord['callback'],
-    {
-        priority = 0,
-        injector = inject(Injector, { optional: true }),
-    }: { priority?: number; injector?: Injector | null } = {}
+    { priority = 0, injector }: { priority?: number; injector?: Injector | null } = {}
 ) {
-    !injector && assertInInjectionContext(injectBeforeRender);
+    assertInInjectionContext(injectBeforeRender);
 
-    return runInInjectionContext(injector!, () => {
+    if (!injector) {
+        injector = inject(Injector);
+    }
+
+    return runInInjectionContext(injector, () => {
         const store = inject(NgtStore);
         const sub = store.get('internal').subscribe(cb, priority, store);
         inject(DestroyRef).onDestroy(() => void sub());

libs/angular-three/src/lib/di/ref.ts

@@ -23,11 +23,15 @@ export type NgtInjectedRef<TElement> = ElementRef<TElement> & {
 
 export function injectNgtRef<TElement>(
     initial: ElementRef<TElement> | TElement = null!,
-    injector = inject(Injector, { optional: true })
+    injector?: Injector
 ): NgtInjectedRef<TElement> {
-    !injector && assertInInjectionContext(injectNgtRef);
+    assertInInjectionContext(injectNgtRef);
 
-    return runInInjectionContext(injector!, () => {
+    if (!injector) {
+        injector = inject(Injector);
+    }
+
+    return runInInjectionContext(injector, () => {
         const cdr = inject(ChangeDetectorRef);
 
         const ref = is.ref(initial) ? initial : new ElementRef<TElement>(initial as TElement);

libs/angular-three/src/lib/loader.ts

@@ -94,16 +94,20 @@ export function injectNgtLoader<
     {
         extensions,
         onProgress,
-        injector = inject(Injector, { optional: true }),
+        injector,
     }: {
         extensions?: NgtLoaderExtensions<TLoaderConstructor>;
         onProgress?: (event: ProgressEvent) => void;
-        injector?: Injector | null;
+        injector?: Injector;
     } = {}
 ): Signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>>> {
-    !injector && assertInInjectionContext(injectNgtLoader);
+    assertInInjectionContext(injectNgtLoader);
 
-    return runInInjectionContext(injector!, () => {
+    if (!injector) {
+        injector = inject(Injector);
+    }
+
+    return runInInjectionContext(injector, () => {
         const cdr = inject(ChangeDetectorRef);
         const response = signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>>>(null!);
         const effector = load(loaderConstructorFactory, inputs, { extensions, onProgress });

libs/soba/abstractions/src/line/line.ts

@@ -55,7 +55,6 @@ export class NgtsLine extends NgtsLineInputs {
     readonly #resolution = computed(() => {
         const size = this.#store.select('size');
         const resolution = this.select('resolution');
-
         return resolution() ? resolution() : [size().width, size().height];
     });