[Part of #176153] Analytics client

afharo · afharo · commit b07ae8c3d3ee · 2024-03-26T18:26:06.000+01:00
diff --git a/packages/analytics/client/src/analytics_client/analytics_client.ts b/packages/analytics/client/src/analytics_client/analytics_client.ts
@@ -168,8 +168,9 @@ export class AnalyticsClient implements IAnalyticsClient {
     this.optInConfig$.next(optInConfigInstance);
   };
 
-  // @ts-expect-error upgrade typescript v4.9.5
-  public registerContextProvider = <Context>(contextProviderOpts: ContextProviderOpts<Context>) => {
+  public registerContextProvider = <Context extends Partial<EventContext>>(
+    contextProviderOpts: ContextProviderOpts<Context>
+  ) => {
     this.contextService.registerContextProvider(contextProviderOpts);
   };
 
diff --git a/packages/analytics/client/src/analytics_client/context_service.ts b/packages/analytics/client/src/analytics_client/context_service.ts
@@ -27,10 +27,10 @@ export class ContextService {
    * Registers a context provider, and subscribes to any updates from it.
    * @param contextProviderOpts The options to register the context provider {@link ContextProviderOpts}
    */
-  public registerContextProvider<Context>({
+  public registerContextProvider<Context extends Partial<EventContext>>({
     name,
     context$,
-    schema, // @ts-expect-error upgrade typescript v4.9.5
+    schema,
   }: ContextProviderOpts<Context>) {
     if (this.contextProvidersSubscriptions.has(name)) {
       throw new Error(`Context provider with name '${name}' already registered`);
@@ -58,9 +58,8 @@ export class ContextService {
         })
       )
       .subscribe((context) => {
-        // We store each context linked to the context provider so they can increase and reduce
+        // We store each context linked to the context provider, so they can increase and reduce
         // the number of fields they report without having left-overs in the global context.
-        // @ts-expect-error upgrade typescript v4.9.5
         this.contextProvidersRegistry.set(name, context);
 
         // For every context change, we rebuild the global context.
diff --git a/packages/analytics/client/src/analytics_client/types.ts b/packages/analytics/client/src/analytics_client/types.ts
@@ -205,8 +205,9 @@ export interface IAnalyticsClient {
    *
    * @track-adoption
    */
-  // @ts-expect-error upgrade typescript v4.9.5
-  registerContextProvider: <Context>(contextProviderOpts: ContextProviderOpts<Context>) => void;
+  registerContextProvider: <Context extends Partial<EventContext>>(
+    contextProviderOpts: ContextProviderOpts<Context>
+  ) => void;
   /**
    * Removes the context provider and stop enriching the events from its context.
    * @param contextProviderName The name of the context provider to remove.
