feat: migrate multi-provider into js-sdk with normalized imports and event typings

Author: jonathannorris

packages/server/src/provider/multi-provider/errors.ts

@@ -1,5 +1,5 @@
-import type { ErrorCode } from '@openfeature/server-sdk';
-import { GeneralError, OpenFeatureError } from '@openfeature/server-sdk';
+import type { ErrorCode } from '@openfeature/core';
+import { GeneralError, OpenFeatureError } from '@openfeature/core';
 import type { RegisteredProvider } from './types';
 
 export class ErrorWithCode extends OpenFeatureError {

packages/server/src/provider/multi-provider/hook-executor.ts

@@ -1,4 +1,5 @@
-import type { EvaluationDetails, FlagValue, Hook, HookContext, HookHints, Logger } from '@openfeature/server-sdk';
+import type { EvaluationDetails, FlagValue, HookContext, HookHints, Logger } from '@openfeature/core';
+import type { Hook } from '../../hooks';
 
 /**
  * Utility for executing a set of hooks of each type. Implementation is largely copied from the main OpenFeature SDK.

packages/server/src/provider/multi-provider/multi-provider.ts

@@ -5,24 +5,19 @@ import type {
   FlagMetadata,
   FlagValue,
   FlagValueType,
-  Hook,
   HookContext,
   HookHints,
   JsonValue,
   Logger,
   OpenFeatureError,
-  Provider,
   ProviderMetadata,
   ResolutionDetails,
   TrackingEventDetails,
-} from '@openfeature/server-sdk';
-import {
-  DefaultLogger,
-  ErrorCode,
-  GeneralError,
-  OpenFeatureEventEmitter,
-  StandardResolutionReasons,
-} from '@openfeature/server-sdk';
+} from '@openfeature/core';
+import { DefaultLogger, ErrorCode, GeneralError, StandardResolutionReasons } from '@openfeature/core';
+import type { Provider } from '../provider';
+import type { Hook } from '../../hooks';
+import { OpenFeatureEventEmitter } from '../../events/open-feature-event-emitter';
 import { constructAggregateError, throwAggregateErrorFromPromiseResults } from './errors';
 import { HookExecutor } from './hook-executor';
 import { StatusTracker } from './status-tracker';
@@ -177,7 +172,7 @@ export class MultiProvider implements Provider {
 
     const results = await Promise.all(tasks);
     const resolutions = results
-      .map(([_, resolution]) => resolution)
+      .map(([, resolution]) => resolution)
       .filter((r): r is ProviderResolutionResult<T> => Boolean(r));
 
     const finalResult = this.evaluationStrategy.determineFinalResult({ flagKey, flagType }, context, resolutions);
@@ -201,7 +196,7 @@ export class MultiProvider implements Provider {
     hookContext: HookContext,
     hookHints: HookHints,
     context: EvaluationContext,
-  ): Promise<[shouldEvaluateNext: boolean, ProviderResolutionResult<T> | null]> {
+  ): Promise<[boolean, ProviderResolutionResult<T> | null]> {
     let evaluationResult: ResolutionDetails<T> | undefined = undefined;
     const provider = providerEntry.provider;
     const strategyContext = {
@@ -262,7 +257,7 @@ export class MultiProvider implements Provider {
         provider,
         flagKey,
         defaultValue,
-        providerContext,
+        providerContext || {},
       )) as ResolutionDetails<T>;
 
       evaluationDetails = {

packages/server/src/provider/multi-provider/status-tracker.ts

@@ -1,5 +1,7 @@
-import type { EventDetails, OpenFeatureEventEmitter } from '@openfeature/server-sdk';
-import { ProviderEvents, ProviderStatus } from '@openfeature/server-sdk';
+import type { EventDetails } from '@openfeature/core';
+import type { OpenFeatureEventEmitter } from '../../events';
+import { ProviderEvents } from '../../events';
+import { ProviderStatus } from '../provider';
 import type { RegisteredProvider } from './types';
 
 /**
@@ -13,19 +15,19 @@ export class StatusTracker {
 
   wrapEventHandler(providerEntry: RegisteredProvider) {
     const provider = providerEntry.provider;
-    provider.events?.addHandler(ProviderEvents.Error, (details) => {
+    provider.events?.addHandler(ProviderEvents.Error, (details?: EventDetails) => {
       this.changeProviderStatus(providerEntry.name, ProviderStatus.ERROR, details);
     });
 
-    provider.events?.addHandler(ProviderEvents.Stale, (details) => {
+    provider.events?.addHandler(ProviderEvents.Stale, (details?: EventDetails) => {
       this.changeProviderStatus(providerEntry.name, ProviderStatus.STALE, details);
     });
 
-    provider.events?.addHandler(ProviderEvents.ConfigurationChanged, (details) => {
+    provider.events?.addHandler(ProviderEvents.ConfigurationChanged, (details?: EventDetails) => {
       this.events.emit(ProviderEvents.ConfigurationChanged, details);
     });
 
-    provider.events?.addHandler(ProviderEvents.Ready, (details) => {
+    provider.events?.addHandler(ProviderEvents.Ready, (details?: EventDetails) => {
       this.changeProviderStatus(providerEntry.name, ProviderStatus.READY, details);
     });
   }

packages/web/src/provider/multi-provider/strategies/BaseEvaluationStrategy.ts renamed to packages/server/src/provider/multi-provider/strategies/base-evaluation-strategy.ts

@@ -4,11 +4,11 @@ import type {
   FlagValue,
   FlagValueType,
   OpenFeatureError,
-  Provider,
   ResolutionDetails,
   TrackingEventDetails,
-} from '@openfeature/web-sdk';
-import { ProviderStatus } from '@openfeature/web-sdk';
+} from '@openfeature/core';
+import type { Provider } from '../../provider';
+import { ProviderStatus } from '../../provider';
 import { ErrorWithCode } from '../errors';
 
 export type StrategyEvaluationContext = {
@@ -54,7 +54,10 @@ export type FinalResult<T extends FlagValue> = {
  * Contains default implementations for `shouldEvaluateThisProvider` and `shouldEvaluateNextProvider`
  */
 export abstract class BaseEvaluationStrategy {
-  shouldEvaluateThisProvider(strategyContext: StrategyPerProviderContext, evalContext: EvaluationContext): boolean {
+  public runMode: 'parallel' | 'sequential' = 'sequential';
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  shouldEvaluateThisProvider(strategyContext: StrategyPerProviderContext, _evalContext?: EvaluationContext): boolean {
     if (
       strategyContext.providerStatus === ProviderStatus.NOT_READY ||
       strategyContext.providerStatus === ProviderStatus.FATAL
@@ -64,19 +67,21 @@ export abstract class BaseEvaluationStrategy {
     return true;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   shouldEvaluateNextProvider<T extends FlagValue>(
-    strategyContext: StrategyPerProviderContext,
-    context: EvaluationContext,
-    result: ProviderResolutionResult<T>,
+    _strategyContext?: StrategyPerProviderContext,
+    _context?: EvaluationContext,
+    _result?: ProviderResolutionResult<T>,
   ): boolean {
     return true;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   shouldTrackWithThisProvider(
     strategyContext: StrategyProviderContext,
-    context: EvaluationContext,
-    trackingEventName: string,
-    trackingEventDetails: TrackingEventDetails,
+    _context?: EvaluationContext,
+    _trackingEventName?: string,
+    _trackingEventDetails?: TrackingEventDetails,
   ): boolean {
     if (
       strategyContext.providerStatus === ProviderStatus.NOT_READY ||

packages/server/src/provider/multi-provider/strategies/ComparisonStrategy.ts renamed to packages/server/src/provider/multi-provider/strategies/comparison-strategy.ts

@@ -3,10 +3,11 @@ import type {
   ProviderResolutionResult,
   ProviderResolutionSuccessResult,
   StrategyPerProviderContext,
-} from './BaseEvaluationStrategy';
-import { BaseEvaluationStrategy } from './BaseEvaluationStrategy';
-import type { EvaluationContext, FlagValue, Provider } from '@openfeature/server-sdk';
-import { GeneralError } from '@openfeature/server-sdk';
+} from './base-evaluation-strategy';
+import { BaseEvaluationStrategy } from './base-evaluation-strategy';
+import type { EvaluationContext, FlagValue } from '@openfeature/core';
+import type { Provider } from '../../provider';
+import { GeneralError } from '@openfeature/core';
 
 /**
  * Evaluate all providers in parallel and compare the results.

packages/server/src/provider/multi-provider/strategies/FirstMatchStrategy.ts renamed to packages/server/src/provider/multi-provider/strategies/first-match-strategy.ts

@@ -1,7 +1,7 @@
-import type { FinalResult, ProviderResolutionResult, StrategyPerProviderContext } from './BaseEvaluationStrategy';
-import { BaseEvaluationStrategy } from './BaseEvaluationStrategy';
-import type { EvaluationContext, FlagValue } from '@openfeature/server-sdk';
-import { ErrorCode, OpenFeatureError, ResolutionDetails } from '@openfeature/server-sdk';
+import type { FinalResult, ProviderResolutionResult, StrategyPerProviderContext } from './base-evaluation-strategy';
+import { BaseEvaluationStrategy } from './base-evaluation-strategy';
+import type { EvaluationContext, FlagValue } from '@openfeature/core';
+import { ErrorCode } from '@openfeature/core';
 
 /**
  * Return the first result that did not indicate "flag not found".

packages/server/src/provider/multi-provider/strategies/FirstSuccessfulStrategy.ts renamed to packages/server/src/provider/multi-provider/strategies/first-successful-strategy.ts

@@ -1,7 +1,6 @@
-import type { FinalResult, ProviderResolutionResult, StrategyPerProviderContext } from './BaseEvaluationStrategy';
-import { BaseEvaluationStrategy } from './BaseEvaluationStrategy';
-import type { EvaluationContext, FlagValue } from '@openfeature/server-sdk';
-import { ResolutionDetails } from '@openfeature/server-sdk';
+import type { FinalResult, ProviderResolutionResult, StrategyPerProviderContext } from './base-evaluation-strategy';
+import { BaseEvaluationStrategy } from './base-evaluation-strategy';
+import type { EvaluationContext, FlagValue } from '@openfeature/core';
 
 /**
  * Return the first result that did result in an error

packages/server/src/provider/multi-provider/strategies/index.ts

@@ -1,4 +1,4 @@
-export * from './BaseEvaluationStrategy';
-export * from './FirstMatchStrategy';
-export * from './FirstSuccessfulStrategy';
-export * from './ComparisonStrategy';
+export * from './base-evaluation-strategy';
+export * from './first-match-strategy';
+export * from './first-successful-strategy';
+export * from './comparison-strategy';

packages/server/src/provider/multi-provider/types.ts

@@ -1,5 +1,5 @@
 // Represents an entry in the constructor's provider array which may or may not have a name set
-import type { Provider } from '@openfeature/server-sdk';
+import type { Provider } from '../provider';
 
 export type ProviderEntryInput = {
   provider: Provider;