fix: update the client to conform to the provider interface (#187)

The resolve argument in the evaluation method was still using evaluation options. Signed-off-by: Michael Beemer <[email protected]>
open-feature · Aug 26, 2022 · f1edb29 · f1edb29
1 parent b66171f
commit f1edb29
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 31 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -145,12 +145,7 @@ export class OpenFeatureClient implements Client {
 
   private async evaluate<T extends FlagValue>(
     flagKey: string,
-    resolver: (
-      flagKey: string,
-      defaultValue: T,
-      context: EvaluationContext,
-      options: FlagEvaluationOptions | undefined
-    ) => Promise<ResolutionDetails<T>>,
+    resolver: (flagKey: string, defaultValue: T, context: EvaluationContext) => Promise<ResolutionDetails<T>>,
     defaultValue: T,
     flagType: FlagValueType,
     invocationContext: EvaluationContext = {},
@@ -183,7 +178,7 @@ export class OpenFeatureClient implements Client {
       const frozenContext = await this.beforeHooks(allHooks, hookContext, options);
 
       // run the referenced resolver, binding the provider.
-      const resolution = await resolver.call(this.provider, flagKey, defaultValue, frozenContext, options);
+      const resolution = await resolver.call(this.provider, flagKey, defaultValue, frozenContext);
 
       const evaluationDetails = {
         ...resolution,

diff --git a/test/client.spec.ts b/test/client.spec.ts
@@ -91,7 +91,7 @@ describe(OpenFeatureClient.name, () => {
           const value = await client.getBooleanValue(booleanFlag, defaultBooleanValue);
 
           expect(value).toEqual(BOOLEAN_VALUE);
-          expect(MOCK_PROVIDER.resolveBooleanEvaluation).toHaveBeenCalledWith(booleanFlag, defaultBooleanValue, {}, {});
+          expect(MOCK_PROVIDER.resolveBooleanEvaluation).toHaveBeenCalledWith(booleanFlag, defaultBooleanValue, {});
         });
       });
 
@@ -102,7 +102,7 @@ describe(OpenFeatureClient.name, () => {
           const value = await client.getStringValue(stringFlag, defaultStringValue);
 
           expect(value).toEqual(STRING_VALUE);
-          expect(MOCK_PROVIDER.resolveStringEvaluation).toHaveBeenCalledWith(stringFlag, defaultStringValue, {}, {});
+          expect(MOCK_PROVIDER.resolveStringEvaluation).toHaveBeenCalledWith(stringFlag, defaultStringValue, {});
         });
       });
 
@@ -113,7 +113,7 @@ describe(OpenFeatureClient.name, () => {
           const value = await client.getNumberValue(numberFlag, defaultNumberValue);
 
           expect(value).toEqual(NUMBER_VALUE);
-          expect(MOCK_PROVIDER.resolveNumberEvaluation).toHaveBeenCalledWith(numberFlag, defaultNumberValue, {}, {});
+          expect(MOCK_PROVIDER.resolveNumberEvaluation).toHaveBeenCalledWith(numberFlag, defaultNumberValue, {});
         });
       });
 
@@ -124,7 +124,7 @@ describe(OpenFeatureClient.name, () => {
           const value = await client.getObjectValue(objectFlag, {});
 
           expect(value).toEqual(OBJECT_VALUE);
-          expect(MOCK_PROVIDER.resolveObjectEvaluation).toHaveBeenCalledWith(objectFlag, defaultObjectFlag, {}, {});
+          expect(MOCK_PROVIDER.resolveObjectEvaluation).toHaveBeenCalledWith(objectFlag, defaultObjectFlag, {});
         });
       });
     });
@@ -146,7 +146,7 @@ describe(OpenFeatureClient.name, () => {
 
           expect(booleanDetails.value).toEqual(BOOLEAN_VALUE);
           expect(booleanDetails.variant).toEqual(BOOLEAN_VARIANT);
-          expect(MOCK_PROVIDER.resolveBooleanEvaluation).toHaveBeenCalledWith(booleanFlag, defaultBooleanValue, {}, {});
+          expect(MOCK_PROVIDER.resolveBooleanEvaluation).toHaveBeenCalledWith(booleanFlag, defaultBooleanValue, {});
         });
       });
 
@@ -158,7 +158,7 @@ describe(OpenFeatureClient.name, () => {
 
           expect(stringDetails.value).toEqual(STRING_VALUE);
           expect(stringDetails.variant).toEqual(STRING_VARIANT);
-          expect(MOCK_PROVIDER.resolveStringEvaluation).toHaveBeenCalledWith(stringFlag, defaultStringValue, {}, {});
+          expect(MOCK_PROVIDER.resolveStringEvaluation).toHaveBeenCalledWith(stringFlag, defaultStringValue, {});
         });
       });
 
@@ -170,7 +170,7 @@ describe(OpenFeatureClient.name, () => {
 
           expect(numberDetails.value).toEqual(NUMBER_VALUE);
           expect(numberDetails.variant).toEqual(NUMBER_VARIANT);
-          expect(MOCK_PROVIDER.resolveNumberEvaluation).toHaveBeenCalledWith(numberFlag, defaultNumberValue, {}, {});
+          expect(MOCK_PROVIDER.resolveNumberEvaluation).toHaveBeenCalledWith(numberFlag, defaultNumberValue, {});
         });
       });
 
@@ -182,7 +182,7 @@ describe(OpenFeatureClient.name, () => {
 
           expect(objectDetails.value).toEqual(OBJECT_VALUE);
           expect(objectDetails.variant).toEqual(OBJECT_VARIANT);
-          expect(MOCK_PROVIDER.resolveObjectEvaluation).toHaveBeenCalledWith(objectFlag, defaultObjectFlag, {}, {});
+          expect(MOCK_PROVIDER.resolveObjectEvaluation).toHaveBeenCalledWith(objectFlag, defaultObjectFlag, {});
         });
       });
     });
@@ -303,8 +303,7 @@ describe(OpenFeatureClient.name, () => {
         expect(nonTransformingProvider.resolveBooleanEvaluation).toHaveBeenCalledWith(
           flagKey,
           defaultValue,
-          expect.objectContaining({ transformed: false }),
-          expect.anything()
+          expect.objectContaining({ transformed: false })
         );
       });
     });
@@ -337,8 +336,7 @@ describe(OpenFeatureClient.name, () => {
           expect.anything(),
           expect.objectContaining({
             targetingKey: TARGETING_KEY,
-          }),
-          expect.anything()
+          })
         );
       });
     });
@@ -363,8 +361,7 @@ describe(OpenFeatureClient.name, () => {
           expect.anything(),
           expect.objectContaining({
             ...context,
-          }),
-          expect.anything()
+          })
         );
       });
     });
@@ -406,8 +403,7 @@ describe(OpenFeatureClient.name, () => {
             ...clientContext,
             ...invocationContext,
             ...beforeHookContext,
-          }),
-          expect.anything()
+          })
         );
       });
     });

diff --git a/test/hooks.spec.ts b/test/hooks.spec.ts
@@ -169,8 +169,7 @@ describe('Hooks', () => {
         // ensure property was added by the time the flag resolution occurred.
         expect.objectContaining({
           beforeRan: true,
-        }),
-        expect.anything()
+        })
       );
     });
   });
@@ -254,8 +253,7 @@ describe('Hooks', () => {
           [invocationProp434]: true,
           [invocationPropToOverwrite434]: true,
           [hookProp434]: true,
-        }),
-        expect.anything()
+        })
       );
     });
   });
@@ -939,7 +937,7 @@ describe('Hooks', () => {
       it('should be awaited, run in order', (done) => {
         OpenFeature.setProvider(MOCK_PROVIDER);
 
-        const asyncBeforeErroFinally = {
+        const asyncBeforeErrorFinally = {
           before: jest.fn(() => {
             return new Promise<EvaluationContext>((resolve, reject) =>
               setTimeout(() => {
@@ -949,15 +947,15 @@ describe('Hooks', () => {
           }),
           error: jest.fn(() => {
             try {
-              expect(asyncBeforeErroFinally.before).toHaveBeenCalled();
+              expect(asyncBeforeErrorFinally.before).toHaveBeenCalled();
             } catch (err) {
               done(err);
             }
             return Promise.resolve();
           }),
           finally: () => {
             try {
-              expect(asyncBeforeErroFinally.error).toHaveBeenCalled();
+              expect(asyncBeforeErrorFinally.error).toHaveBeenCalled();
               done();
             } catch (err) {
               done(err);
@@ -966,7 +964,7 @@ describe('Hooks', () => {
         };
 
         client.getBooleanValue(FLAG_KEY, false, undefined, {
-          hooks: [asyncBeforeErroFinally],
+          hooks: [asyncBeforeErrorFinally],
         });
       });
     });