Update syncContext type to EvaluationContext

Signed-off-by: marcozabel <[email protected]>

Author: marcozabel

libs/providers/flagd/src/lib/configuration.spec.ts

@@ -66,8 +66,8 @@ describe('Configuration', () => {
   });
 
   it('should override context enricher', () => {
-    const contextEnricher = (syncContext: { [key: string]: string } | null) => {
-      return { ...syncContext, extraKey: 'extraValue' } as EvaluationContext;
+    const contextEnricher = (syncContext: EvaluationContext | null): EvaluationContext => {
+      return { ...syncContext, extraKey: 'extraValue' };
     };
 
     expect(getConfig({ contextEnricher }).contextEnricher({})).toEqual({ extraKey: 'extraValue' });
@@ -78,8 +78,8 @@ describe('Configuration', () => {
   });
 
   it('should use incoming options over defaults and environment variable', () => {
-    const contextEnricher = (syncContext: { [key: string]: string } | null) => {
-      return { ...syncContext, extraKey: 'extraValue' } as EvaluationContext;
+    const contextEnricher = (syncContext: EvaluationContext | null): EvaluationContext => {
+      return { ...syncContext, extraKey: 'extraValue' };
     };
     const options: FlagdProviderOptions = {
       host: 'test',

libs/providers/flagd/src/lib/configuration.ts

@@ -94,7 +94,7 @@ interface FlagdConfig extends Config {
    * This function runs every time the provider (re)connects, and its result is cached and used in every evaluation.
    * By default, the entire sync response (as a JSON Object) is used.
    */
-  contextEnricher: (syncContext: { [key: string]: string } | null) => EvaluationContext;
+  contextEnricher: (syncContext: EvaluationContext | null) => EvaluationContext;
 }
 
 export type FlagdProviderOptions = Partial<FlagdConfig>;
@@ -106,7 +106,7 @@ const DEFAULT_CONFIG: Omit<FlagdConfig, 'port' | 'resolverType'> = {
   selector: '',
   cache: 'lru',
   maxCacheSize: DEFAULT_MAX_CACHE_SIZE,
-  contextEnricher: (syncContext: { [key: string]: string } | null) => syncContext ?? {},
+  contextEnricher: (syncContext: EvaluationContext | null) => syncContext ?? {},
 };
 
 const DEFAULT_RPC_CONFIG: FlagdConfig = { ...DEFAULT_CONFIG, resolverType: 'rpc', port: 8013 };

libs/providers/flagd/src/lib/flagd-provider.ts

@@ -16,7 +16,7 @@ export class FlagdProvider implements Provider {
   readonly hooks?: Hook[];
   readonly runsOn = 'server';
   readonly events = new OpenFeatureEventEmitter();
-  private syncContext: { [key: string]: string } | null = null;
+  private syncContext: EvaluationContext | null = null;
 
   private readonly _service: Service;
 
@@ -49,11 +49,11 @@ export class FlagdProvider implements Provider {
     }
   }
 
-  setSyncContext(context: { [key: string]: string }) {
+  setSyncContext(context: EvaluationContext) {
     this.syncContext = context;
   }
 
-  getSyncContext(): { [key: string]: string } | null {
+  getSyncContext(): EvaluationContext | null {
     return this.syncContext;
   }
 

libs/providers/flagd/src/lib/service/in-process/grpc/grpc-fetch.ts

@@ -1,6 +1,6 @@
 import type { ClientReadableStream, ServiceError, ClientOptions } from '@grpc/grpc-js';
 import { credentials } from '@grpc/grpc-js';
-import type { Logger } from '@openfeature/server-sdk';
+import type { EvaluationContext, Logger } from '@openfeature/server-sdk';
 import { GeneralError } from '@openfeature/server-sdk';
 import type { SyncFlagsRequest, SyncFlagsResponse } from '../../../../proto/ts/flagd/sync/v1/sync';
 import { FlagSyncServiceClient } from '../../../../proto/ts/flagd/sync/v1/sync';
@@ -15,7 +15,7 @@ export class GrpcFetch implements DataFetch {
   private readonly _syncClient: FlagSyncServiceClient;
   private readonly _request: SyncFlagsRequest;
   private _syncStream: ClientReadableStream<SyncFlagsResponse> | undefined;
-  private readonly _setSyncContext: (syncContext: { [key: string]: string }) => void;
+  private readonly _setSyncContext: (syncContext: EvaluationContext) => void;
   private _logger: Logger | undefined;
   /**
    * Initialized will be set to true once the initial connection is successful
@@ -32,7 +32,7 @@ export class GrpcFetch implements DataFetch {
 
   constructor(
     config: Config,
-    setSyncContext: (syncContext: { [key: string]: string }) => void,
+    setSyncContext: (syncContext: EvaluationContext) => void,
     syncServiceClient?: FlagSyncServiceClient,
     logger?: Logger,
   ) {
@@ -92,7 +92,7 @@ export class GrpcFetch implements DataFetch {
 
         try {
           if (data.syncContext) {
-            this._setSyncContext(data.syncContext as { [key: string]: string });
+            this._setSyncContext(data.syncContext);
           }
           const changes = dataCallback(data.flagConfiguration);
           if (this._initialized && changes.length > 0) {

libs/providers/flagd/src/lib/service/in-process/in-process-service.ts

@@ -19,7 +19,7 @@ export class InProcessService implements Service {
 
   constructor(
     private readonly config: Config,
-    setSyncContext: (syncContext: { [key: string]: string }) => void,
+    setSyncContext: (syncContext: EvaluationContext) => void,
     dataFetcher?: DataFetch,
     logger?: Logger,
   ) {