fixup: pr feedback from lukas

Signed-off-by: Todd Baert <[email protected]>

Author: toddbaert

packages/server/src/client/internal/open-feature-client.ts

@@ -24,7 +24,6 @@ import type { FlagEvaluationOptions } from '../../evaluation';
 import type { ProviderEvents } from '../../events';
 import type { InternalEventEmitter } from '../../events/internal/internal-event-emitter';
 import type { Hook } from '../../hooks';
-import { OpenFeature } from '../../open-feature';
 import type { Provider} from '../../provider';
 import { ProviderStatus } from '../../provider';
 import type { Client } from './../client';
@@ -54,6 +53,9 @@ export class OpenFeatureClient implements Client {
     private readonly providerAccessor: () => Provider,
     private readonly providerStatusAccessor: () => ProviderStatus,
     private readonly emitterAccessor: () => InternalEventEmitter,
+    private readonly apiContextAccessor: () => EvaluationContext,
+    private readonly apiHooksAccessor: () => Hook[],
+    private readonly transactionContextAccessor: () => EvaluationContext,
     private readonly globalLogger: () => Logger,
     private readonly options: OpenFeatureClientOptions,
     context: EvaluationContext = {},
@@ -256,7 +258,7 @@ export class OpenFeatureClient implements Client {
     // merge global, client, and evaluation context
 
     const allHooks = [
-      ...OpenFeature.getHooks(),
+      ...this.apiHooksAccessor(),
       ...this.getHooks(),
       ...(options.hooks || []),
       ...(this._provider.hooks || []),
@@ -390,8 +392,8 @@ export class OpenFeatureClient implements Client {
   private mergeContexts(invocationContext: EvaluationContext) {
     // merge global and client contexts
     return {
-      ...OpenFeature.getContext(),
-      ...OpenFeature.getTransactionContext(),
+      ...this.apiContextAccessor(),
+      ...this.transactionContextAccessor(),
       ...this._context,
       ...invocationContext,
     };

packages/server/src/open-feature.ts

@@ -198,6 +198,9 @@ export class OpenFeatureAPI
       () => this.getProviderForClient(domain),
       () => this.getProviderStatus(domain),
       () => this.buildAndCacheEventEmitterForClient(domain),
+      () => this.getContext(),
+      () => this.getHooks(),
+      () => this.getTransactionContext(),
       () => this._logger,
       { domain, version },
       context,

packages/server/src/provider/provider.ts

@@ -3,7 +3,6 @@ import type {
   EvaluationContext,
   JsonValue,
   Logger,
-  TrackingEventDetails,
   ResolutionDetails} from '@openfeature/core';
 import {
   ServerProviderStatus,
@@ -66,12 +65,4 @@ export interface Provider extends CommonProvider<ServerProviderStatus> {
     context: EvaluationContext,
     logger: Logger,
   ): Promise<ResolutionDetails<T>>;
-
-  /**
-   * Track a user action or application state, usually representing a business objective or outcome.
-   * @param trackingEventName
-   * @param context
-   * @param trackingEventDetails
-   */
-  track?(trackingEventName: string, context?: EvaluationContext, trackingEventDetails?: TrackingEventDetails): void;
 }

packages/shared/src/provider/provider.ts

@@ -1,5 +1,6 @@
 import type { EvaluationContext } from '../evaluation';
 import type { AnyProviderEvent, ProviderEventEmitter } from '../events';
+import type { TrackingEventDetails } from '../tracking';
 import type { Metadata, Paradigm } from '../types';
 
 // TODO: with TypeScript 5+, we can use computed string properties,
@@ -125,4 +126,12 @@ export interface CommonProvider<S extends ClientProviderStatus | ServerProviderS
    * @param context
    */
   initialize?(context?: EvaluationContext): Promise<void>;
+
+  /**
+   * Track a user action or application state, usually representing a business objective or outcome.
+   * @param trackingEventName
+   * @param context
+   * @param trackingEventDetails
+   */
+  track?(trackingEventName: string, context?: EvaluationContext, trackingEventDetails?: TrackingEventDetails): void;
 }

packages/web/src/client/internal/open-feature-client.ts

@@ -24,7 +24,6 @@ import type { FlagEvaluationOptions } from '../../evaluation';
 import type { ProviderEvents } from '../../events';
 import type { InternalEventEmitter } from '../../events/internal/internal-event-emitter';
 import type { Hook } from '../../hooks';
-import { OpenFeature } from '../../open-feature';
 import type { Provider} from '../../provider';
 import { ProviderStatus } from '../../provider';
 import type { Client } from './../client';
@@ -53,6 +52,8 @@ export class OpenFeatureClient implements Client {
     private readonly providerAccessor: () => Provider,
     private readonly providerStatusAccessor: () => ProviderStatus,
     private readonly emitterAccessor: () => InternalEventEmitter,
+    private readonly apiContextAccessor: (domain?: string) => EvaluationContext,
+    private readonly apiHooksAccessor: () => Hook[],
     private readonly globalLogger: () => Logger,
     private readonly options: OpenFeatureClientOptions,
   ) {}
@@ -189,7 +190,7 @@ export class OpenFeatureClient implements Client {
       if (typeof this._provider.track === 'function') {
         // copy and freeze the context
         const frozenContext = Object.freeze({
-          ...OpenFeature.getContext(this?.options?.domain),
+          ...this.apiContextAccessor(this?.options?.domain),
         });
         return this._provider.track?.(occurrenceKey, frozenContext, occurrenceDetails);
       } else {
@@ -210,15 +211,15 @@ export class OpenFeatureClient implements Client {
     // merge global, client, and evaluation context
 
     const allHooks = [
-      ...OpenFeature.getHooks(),
+      ...this.apiHooksAccessor(),
       ...this.getHooks(),
       ...(options.hooks || []),
       ...(this._provider.hooks || []),
     ];
     const allHooksReversed = [...allHooks].reverse();
 
     const context = {
-      ...OpenFeature.getContext(this?.options?.domain),
+      ...this.apiContextAccessor(this?.options?.domain),
     };
 
     // this reference cannot change during the course of evaluation

packages/web/src/open-feature.ts

@@ -342,6 +342,8 @@ export class OpenFeatureAPI
       () => this.getProviderForClient(domain),
       () => this.getProviderStatus(domain),
       () => this.buildAndCacheEventEmitterForClient(domain),
+      (domain?: string) => this.getContext(domain),
+      () => this.getHooks(),
       () => this._logger,
       { domain, version },
     );

packages/web/src/provider/provider.ts

@@ -1,4 +1,10 @@
-import type { CommonProvider, EvaluationContext, JsonValue, Logger, TrackingEventDetails, ResolutionDetails } from '@openfeature/core';
+import type {
+  CommonProvider,
+  EvaluationContext,
+  JsonValue,
+  Logger,
+  ResolutionDetails,
+} from '@openfeature/core';
 import { ClientProviderStatus } from '@openfeature/core';
 import type { Hook } from '../hooks';
 
@@ -72,12 +78,4 @@ export interface Provider extends CommonProvider<ClientProviderStatus> {
     context: EvaluationContext,
     logger: Logger,
   ): ResolutionDetails<T>;
-
-  /**
-   * Track a user action or application state, usually representing a business objective or outcome.
-   * @param trackingEventName
-   * @param context
-   * @param trackingEventDetails
-   */
-  track?(trackingEventName: string, context?: EvaluationContext, trackingEventDetails?: TrackingEventDetails): void;
 }