fix(state): improve options check on getInjectorFromOptions

michaelbe812 · michaelbe812 · commit 4fb30a39875d · 2025-01-29T07:30:35.000+01:00
diff --git a/libs/state/effects/src/lib/rx-effects.ts b/libs/state/effects/src/lib/rx-effects.ts
@@ -31,7 +31,7 @@ function getInjectorFromOptions<
   SetupFn extends Function,
   Options extends { injector?: Injector },
 >(setupFnOrOptions?: SetupFn | Options, options?: Options) {
-  if (options) {
+  if (options?.injector) {
     return options.injector;
   }
   if (setupFnOrOptions && typeof setupFnOrOptions !== 'function') {
diff --git a/libs/state/src/lib/rx-state.ts b/libs/state/src/lib/rx-state.ts
@@ -35,7 +35,7 @@ function getInjectorFromOptions<
   SetupFn extends Function,
   Options extends { injector?: Injector },
 >(setupFnOrOptions?: SetupFn | Options, options?: Options) {
-  if (options) {
+  if (options?.injector) {
     return options.injector;
   }
   if (setupFnOrOptions && typeof setupFnOrOptions !== 'function') {
@@ -107,7 +107,7 @@ export function rxState<State extends object>(
     };
 
     if (setupFnOrOptions && typeof setupFnOrOptions === 'function') {
-      setupFnOrOptions?.(state);
+      setupFnOrOptions(state);
     }
 
     return state;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function getInjectorFromOptions<`
`31`	`31`	`SetupFn extends Function,`
`32`	`32`	`Options extends { injector?: Injector },`
`33`	`33`	`>(setupFnOrOptions?: SetupFn \| Options, options?: Options) {`
`34`		`- if (options) {`
	`34`	`+ if (options?.injector) {`
`35`	`35`	`return options.injector;`
`36`	`36`	`}`
`37`	`37`	`if (setupFnOrOptions && typeof setupFnOrOptions !== 'function') {`