merge clean

Author: typotter

src/client/eppo-client-with-bandits.spec.ts

@@ -1,14 +1,14 @@
 import * as base64 from 'js-base64';
 
 import {
-  readMockUFCResponse,
+  BANDIT_TEST_DATA_DIR,
+  BANDITS_WIRE_FILE,
+  BanditTestCase,
   MOCK_BANDIT_MODELS_RESPONSE_FILE,
   MOCK_FLAGS_WITH_BANDITS_RESPONSE_FILE,
-  testCasesByFileName,
-  BanditTestCase,
-  BANDIT_TEST_DATA_DIR,
   readMockConfigurationWireResponse,
-  BANDITS_WIRE_FILE,
+  readMockUFCResponse,
+  testCasesByFileName,
 } from '../../test/testHelpers';
 import ApiEndpoints from '../api-endpoints';
 import { IAssignmentEvent, IAssignmentLogger } from '../assignment-logger';
@@ -18,18 +18,18 @@ import ConfigurationRequestor from '../configuration-requestor';
 import { ConfigurationManager } from '../configuration-store/configuration-manager';
 import { MemoryOnlyConfigurationStore } from '../configuration-store/memory.store';
 import {
+  ConfigurationWireV1,
   IConfigurationWire,
-  IPrecomputedConfiguration,
   IObfuscatedPrecomputedConfigurationResponse,
-  configurationFromString,
+  IPrecomputedConfiguration,
 } from '../configuration-wire/configuration-wire-types';
 import { Evaluator, FlagEvaluation } from '../evaluator';
 import {
   AllocationEvaluationCode,
   IFlagEvaluationDetails,
 } from '../flag-evaluation-details-builder';
 import FetchHttpClient from '../http-client';
-import { BanditVariation, BanditParameters, Flag } from '../interfaces';
+import { BanditParameters, BanditVariation, Flag } from '../interfaces';
 import { attributeEncodeBase64 } from '../obfuscation';
 import { Attributes, BanditActions, ContextAttributes } from '../types';
 
@@ -137,7 +137,7 @@ describe('EppoClient Bandits E2E test', () => {
     }
 
     describe('bootstrapped client', () => {
-      const banditFlagsConfig = configurationFromString(
+      const banditFlagsConfig = ConfigurationWireV1.fromString(
         readMockConfigurationWireResponse(BANDITS_WIRE_FILE),
       );
 

src/client/eppo-client.spec.ts

@@ -21,7 +21,7 @@ import { AssignmentCache } from '../cache/abstract-assignment-cache';
 import { IConfigurationStore } from '../configuration-store/configuration-store';
 import { MemoryOnlyConfigurationStore } from '../configuration-store/memory.store';
 import {
-  configurationFromString,
+  ConfigurationWireV1,
   IConfigurationWire,
   IObfuscatedPrecomputedConfigurationResponse,
   ObfuscatedPrecomputedConfigurationResponse,
@@ -356,10 +356,10 @@ describe('EppoClient E2E test', () => {
     const testCases = testCasesByFileName<IAssignmentTestCase>(ASSIGNMENT_TEST_DATA_DIR);
 
     describe('boostrapped client', () => {
-      const bootstrapFlagsConfig = configurationFromString(
+      const bootstrapFlagsConfig = ConfigurationWireV1.fromString(
         readMockConfigurationWireResponse(FLAGS_WIRE_FILE),
       );
-      const bootstrapFlagsObfuscatedConfig = configurationFromString(
+      const bootstrapFlagsObfuscatedConfig = ConfigurationWireV1.fromString(
         readMockConfigurationWireResponse(OBFUSCATED_FLAGS_WIRE_FILE),
       );
 

src/configuration-wire/configuration-wire-types.ts

@@ -11,18 +11,6 @@ import { ContextAttributes, FlagKey, HashedFlagKey } from '../types';
 
 import { deflateJsonObject, inflateJsonObject, JsonString } from './json-util';
 
-/**
- * Builds an `IConfigurationWire` instance from the payload string.
- * To generate the payload string, see `ConfigurationWireHelper.fetchBootstrapConfiguration`.
- *
- * @param payloadString
- */
-export function configurationFromString(
-  payloadString: string | JsonString<IConfigurationWire>,
-): IConfigurationWire {
-  return inflateJsonObject(payloadString as JsonString<IConfigurationWire>);
-}
-
 // Base interface for all configuration responses
 interface IBasePrecomputedConfigurationResponse {
   readonly format: FormatEnum.PRECOMPUTED;
@@ -203,6 +191,18 @@ export class ConfigurationWireV1 implements IConfigurationWire {
     readonly bandits?: IConfigResponse<IBanditParametersResponse>,
   ) {}
 
+  /**
+   * Builds an `IConfigurationWire` instance from the payload string.
+   * To generate the payload string, see `ConfigurationWireHelper.fetchBootstrapConfiguration`.
+   *
+   * @param payloadString
+   */
+  public static fromString(
+    payloadString: string | JsonString<IConfigurationWire>,
+  ): IConfigurationWire {
+    return inflateJsonObject(payloadString as JsonString<IConfigurationWire>);
+  }
+
   public static fromResponses(
     flagConfig: IUniversalFlagConfigResponse,
     banditConfig?: IBanditParametersResponse,

src/index.ts

@@ -26,13 +26,13 @@ import EppoPrecomputedClient, {
   Subject,
 } from './client/eppo-precomputed-client';
 import FlagConfigRequestor from './configuration-requestor';
+import { ConfigurationStoreBundle } from './configuration-store/configuration-manager';
 import {
   IConfigurationStore,
   IAsyncStore,
   ISyncStore,
 } from './configuration-store/configuration-store';
 import { HybridConfigurationStore } from './configuration-store/hybrid.store';
-import { ConfigurationStoreBundle } from './configuration-store/i-configuration-manager';
 import { MemoryStore, MemoryOnlyConfigurationStore } from './configuration-store/memory.store';
 import { ConfigurationWireHelper } from './configuration-wire/configuration-wire-helper';
 import {