Fix types for older versions of Angular

storybookjs · Mar 11, 2024 · fd040d1 · fd040d1
1 parent 8181266
commit fd040d1
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/code/frameworks/angular/src/client/public-types.ts b/code/frameworks/angular/src/client/public-types.ts
@@ -1,3 +1,5 @@
+/* eslint-disable prettier/prettier */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 import {
   AnnotatedStoryFn,
   Args,
@@ -54,18 +56,13 @@ export type Preview = ProjectAnnotations<AngularRenderer>;
 /**
  * Utility type that transforms InputSignal and EventEmitter types
  */
-type TransformComponentType<T> = TransformInputSignalType<TransformEventType<T>>;
+type TransformComponentType<T> = TransformInputSignalType<TransformEventType<T>> extends unknown
+  ? TransformEventType<T>
+  : TransformInputSignalType<TransformEventType<T>>;
 
 type TransformInputSignalType<T> = {
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore Angular < 17.2 doesn't have InputSignal
-  [K in keyof T]: T[K] extends AngularCore.InputSignal<infer E>
-    ? E
-    : // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore Angular < 17.2 doesn't have InputSignalWithTransform
-      T[K] extends AngularCore.InputSignalWithTransform<any, infer U>
-      ? U
-      : T[K];
+  /** @ts-ignore Angular < 17.2 doesn't have InputSignal */
+  [K in keyof T]: T[K] extends AngularCore.InputSignal<infer E> ? E : T[K] extends AngularCore.InputSignalWithTransform<any, infer U> ? U : T[K];
 };
 
 type TransformEventType<T> = {