wip

Author: silesky

packages/signals/signals-runtime/src/runtime-helpers.ts

@@ -1,13 +1,4 @@
-interface BaseSignal {
-  index?: number
-  type: string
-  time: number
-}
-
-export type SignalOfType<
-  AllSignals extends BaseSignal,
-  SignalType extends AllSignals['type']
-> = AllSignals & { type: SignalType }
+import { BaseSignal, SignalOfType } from './types/shared'
 
 /**
  * SignalsRuntime class to manage signals

packages/signals/signals-runtime/src/types/shared.ts

@@ -0,0 +1,8 @@
+export interface BaseSignal {
+  type: string
+}
+
+export type SignalOfType<
+  AllSignals extends BaseSignal,
+  SignalType extends AllSignals['type']
+> = AllSignals & { type: SignalType }

packages/signals/signals-runtime/src/types/web/signals.ts

@@ -1,3 +1,5 @@
+import type { BaseSignal, SignalOfType } from '../shared'
+
 export type JSONPrimitive = string | number | boolean | null
 export type JSONValue = JSONPrimitive | JSONObject | JSONArray
 export type JSONObject = { [member: string]: JSONValue }
@@ -97,8 +99,6 @@ export interface UserDefinedSignalData {
 
 export type UserDefinedSignal = AppSignal<'userDefined', UserDefinedSignalData>
 
-export type SignalOfType<T extends SignalTypes> = Signal & { type: T }
-
 export type Signal =
   | InteractionSignal
   | NavigationSignal
@@ -111,10 +111,10 @@ export interface SegmentEvent {
   [key: string]: any
 }
 
-export interface SignalsRuntimeAPI {
-  find: <T extends SignalTypes>(
+export interface ISignalsRuntime<Signal extends BaseSignal> {
+  find: <SignalType extends Signal['type']>(
     fromSignal: Signal,
-    signalType: T,
-    predicate?: (signal: SignalOfType<T>) => boolean
-  ) => SignalOfType<T> | undefined
+    signalType: SignalType,
+    predicate?: (signal: SignalOfType<Signal, SignalType>) => boolean
+  ) => SignalOfType<Signal, SignalType> | undefined
 }

packages/signals/signals-runtime/src/web-exports-globals.ts

@@ -1,8 +1,8 @@
 // all import directives will be removed in the final build
-import { SignalsRuntimeAPI } from './types/web/signals'
+import { ISignalsRuntime, Signal } from './web-exports'
 
 // This will be appended to the generated code - dts-bundle-generator will not write declare const for whatever reason.
-declare const signals: SignalsRuntimeAPI
+declare const signals: ISignalsRuntime<Signal>
 declare const SignalType: {
   Interaction: 'interaction'
   Navigation: 'navigation'