diff --git a/lib/index.browser.tests.js b/lib/index.browser.tests.js index 3d38655ed..15145c7a6 100644 --- a/lib/index.browser.tests.js +++ b/lib/index.browser.tests.js @@ -26,11 +26,11 @@ import configValidator from './utils/config_validator'; import OptimizelyUserContext from './optimizely_user_context'; import { LOG_MESSAGES, ODP_EVENT_ACTION } from './utils/enums'; -import { BrowserOdpManager } from './plugins/odp_manager/index.browser'; -import { OdpConfig } from './core/odp/odp_config'; -import { BrowserOdpEventManager } from './plugins/odp/event_manager/index.browser'; -import { BrowserOdpEventApiManager } from './plugins/odp/event_api_manager/index.browser'; -import { OdpEvent } from './core/odp/odp_event'; +import { BrowserOdpManager } from './odp/odp_manager.browser'; +import { OdpConfig } from './odp/odp_config'; +import { BrowserOdpEventManager } from './odp/event_manager/event_manager.browser'; +import { BrowserOdpEventApiManager } from './odp/event_manager/event_api_manager.browser'; +import { OdpEvent } from './odp/event_manager/odp_event'; import { getMockProjectConfigManager } from './tests/mock/mock_project_config_manager'; import { createProjectConfig } from './project_config/project_config'; diff --git a/lib/index.browser.ts b/lib/index.browser.ts index 2a889c339..05cc88075 100644 --- a/lib/index.browser.ts +++ b/lib/index.browser.ts @@ -24,10 +24,10 @@ import * as enums from './utils/enums'; import * as loggerPlugin from './plugins/logger'; import { createNotificationCenter } from './notification_center'; import { OptimizelyDecideOption, Client, Config, OptimizelyOptions } from './shared_types'; -import { BrowserOdpManager } from './plugins/odp_manager/index.browser'; +import { BrowserOdpManager } from './odp/odp_manager.browser'; import Optimizely from './optimizely'; -import { IUserAgentParser } from './core/odp/user_agent_parser'; -import { getUserAgentParser } from './plugins/odp/user_agent_parser/index.browser'; +import { IUserAgentParser } from './odp/ua_parser/user_agent_parser'; +import { getUserAgentParser } from './odp/ua_parser/ua_parser.browser'; import * as commonExports from './common_exports'; import { PollingConfigManagerConfig } from './project_config/config_manager_factory'; import { createPollingProjectConfigManager } from './project_config/config_manager_factory.browser'; diff --git a/lib/index.node.ts b/lib/index.node.ts index 0904c0142..a5a3b2968 100644 --- a/lib/index.node.ts +++ b/lib/index.node.ts @@ -23,7 +23,7 @@ import defaultErrorHandler from './plugins/error_handler'; import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.node'; import { createNotificationCenter } from './notification_center'; import { OptimizelyDecideOption, Client, Config } from './shared_types'; -import { NodeOdpManager } from './plugins/odp_manager/index.node'; +import { NodeOdpManager } from './odp/odp_manager.node'; import * as commonExports from './common_exports'; import { createPollingProjectConfigManager } from './project_config/config_manager_factory.node'; import { createForwardingEventProcessor, createBatchEventProcessor } from './event_processor/event_processor_factory.node'; diff --git a/lib/index.react_native.ts b/lib/index.react_native.ts index 2736e40a8..c0417d588 100644 --- a/lib/index.react_native.ts +++ b/lib/index.react_native.ts @@ -23,7 +23,7 @@ import * as loggerPlugin from './plugins/logger/index.react_native'; import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser'; import { createNotificationCenter } from './notification_center'; import { OptimizelyDecideOption, Client, Config } from './shared_types'; -import { BrowserOdpManager } from './plugins/odp_manager/index.browser'; +import { BrowserOdpManager } from './odp/odp_manager.browser'; import * as commonExports from './common_exports'; import { createPollingProjectConfigManager } from './project_config/config_manager_factory.react_native'; import { createBatchEventProcessor, createForwardingEventProcessor } from './event_processor/event_processor_factory.react_native'; diff --git a/lib/plugins/odp/event_api_manager/index.browser.ts b/lib/odp/event_manager/event_api_manager.browser.ts similarity index 85% rename from lib/plugins/odp/event_api_manager/index.browser.ts rename to lib/odp/event_manager/event_api_manager.browser.ts index e8feb29ee..26ed98136 100644 --- a/lib/plugins/odp/event_api_manager/index.browser.ts +++ b/lib/odp/event_manager/event_api_manager.browser.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { OdpEvent } from '../../../core/odp/odp_event'; -import { OdpEventApiManager } from '../../../core/odp/odp_event_api_manager'; -import { LogLevel } from '../../../modules/logging'; -import { OdpConfig, OdpIntegrationConfig } from '../../../core/odp/odp_config'; -import { HttpMethod } from '../../../utils/http_request_handler/http'; +import { OdpEvent } from './odp_event'; +import { OdpEventApiManager } from './odp_event_api_manager'; +import { LogLevel } from '../../modules/logging'; +import { OdpConfig } from '../odp_config'; +import { HttpMethod } from '../../utils/http_request_handler/http'; const EVENT_SENDING_FAILURE_MESSAGE = 'ODP event send failed'; diff --git a/lib/plugins/odp/event_api_manager/index.node.ts b/lib/odp/event_manager/event_api_manager.node.ts similarity index 80% rename from lib/plugins/odp/event_api_manager/index.node.ts rename to lib/odp/event_manager/event_api_manager.node.ts index eea898787..3bf1f2ad4 100644 --- a/lib/plugins/odp/event_api_manager/index.node.ts +++ b/lib/odp/event_manager/event_api_manager.node.ts @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { OdpConfig } from '../odp_config'; +import { OdpEvent } from './odp_event' +import { OdpEventApiManager } from './odp_event_api_manager'; +import { HttpMethod } from '../../utils/http_request_handler/http'; -import { OdpConfig, OdpIntegrationConfig } from '../../../core/odp/odp_config'; -import { OdpEvent } from '../../../core/odp/odp_event'; -import { OdpEventApiManager } from '../../../core/odp/odp_event_api_manager'; -import { LogLevel } from '../../../modules/logging'; -import { HttpMethod } from '../../../utils/http_request_handler/http'; export class NodeOdpEventApiManager extends OdpEventApiManager { protected shouldSendEvents(events: OdpEvent[]): boolean { return true; diff --git a/lib/plugins/odp/event_manager/index.browser.ts b/lib/odp/event_manager/event_manager.browser.ts similarity index 89% rename from lib/plugins/odp/event_manager/index.browser.ts rename to lib/odp/event_manager/event_manager.browser.ts index 37fda62a3..4151c9b68 100644 --- a/lib/plugins/odp/event_manager/index.browser.ts +++ b/lib/odp/event_manager/event_manager.browser.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { IOdpEventManager, OdpEventManager } from '../../../core/odp/odp_event_manager'; -import { LogLevel } from '../../../modules/logging'; -import { OdpEvent } from "../../../core/odp/odp_event"; +import { IOdpEventManager, OdpEventManager } from './odp_event_manager'; +import { LogLevel } from '../../modules/logging'; +import { OdpEvent } from './odp_event'; const DEFAULT_BROWSER_QUEUE_SIZE = 100; diff --git a/lib/plugins/odp/event_manager/index.node.ts b/lib/odp/event_manager/event_manager.node.ts similarity index 89% rename from lib/plugins/odp/event_manager/index.node.ts rename to lib/odp/event_manager/event_manager.node.ts index f2cb3277d..e057755a9 100644 --- a/lib/plugins/odp/event_manager/index.node.ts +++ b/lib/odp/event_manager/event_manager.node.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { OdpEvent } from '../../../core/odp/odp_event'; -import { IOdpEventManager, OdpEventManager } from '../../../core/odp/odp_event_manager'; -import { LogLevel } from '../../../modules/logging'; +import { OdpEvent } from './odp_event'; +import { IOdpEventManager, OdpEventManager } from './odp_event_manager'; +import { LogLevel } from '../../modules/logging'; const DEFAULT_BATCH_SIZE = 10; const DEFAULT_FLUSH_INTERVAL_MSECS = 1000; diff --git a/lib/core/odp/odp_event.ts b/lib/odp/event_manager/odp_event.ts similarity index 100% rename from lib/core/odp/odp_event.ts rename to lib/odp/event_manager/odp_event.ts diff --git a/lib/core/odp/odp_event_api_manager.ts b/lib/odp/event_manager/odp_event_api_manager.ts similarity index 97% rename from lib/core/odp/odp_event_api_manager.ts rename to lib/odp/event_manager/odp_event_api_manager.ts index 6b3362f8c..2a5249a28 100644 --- a/lib/core/odp/odp_event_api_manager.ts +++ b/lib/odp/event_manager/odp_event_api_manager.ts @@ -17,8 +17,7 @@ import { LogHandler, LogLevel } from '../../modules/logging'; import { OdpEvent } from './odp_event'; import { HttpMethod, RequestHandler } from '../../utils/http_request_handler/http'; -import { OdpConfig } from './odp_config'; -import { ERROR_MESSAGES } from '../../utils/enums'; +import { OdpConfig } from '../odp_config'; const EVENT_SENDING_FAILURE_MESSAGE = 'ODP event send failed'; diff --git a/lib/core/odp/odp_event_manager.ts b/lib/odp/event_manager/odp_event_manager.ts similarity index 98% rename from lib/core/odp/odp_event_manager.ts rename to lib/odp/event_manager/odp_event_manager.ts index 2ffbbeaa3..2b4d69e57 100644 --- a/lib/core/odp/odp_event_manager.ts +++ b/lib/odp/event_manager/odp_event_manager.ts @@ -20,10 +20,10 @@ import { uuid } from '../../utils/fns'; import { ERROR_MESSAGES, ODP_USER_KEY, ODP_DEFAULT_EVENT_TYPE, ODP_EVENT_ACTION } from '../../utils/enums'; import { OdpEvent } from './odp_event'; -import { OdpConfig } from './odp_config'; +import { OdpConfig } from '../odp_config'; import { IOdpEventApiManager } from './odp_event_api_manager'; -import { invalidOdpDataFound } from './odp_utils'; -import { IUserAgentParser } from './user_agent_parser'; +import { invalidOdpDataFound } from '../odp_utils'; +import { IUserAgentParser } from '../ua_parser/user_agent_parser'; import { scheduleMicrotask } from '../../utils/microtask'; const MAX_RETRIES = 3; diff --git a/lib/core/odp/odp_config.ts b/lib/odp/odp_config.ts similarity index 97% rename from lib/core/odp/odp_config.ts rename to lib/odp/odp_config.ts index 4e4f41855..5003e1238 100644 --- a/lib/core/odp/odp_config.ts +++ b/lib/odp/odp_config.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { checkArrayEquality } from '../../utils/fns'; +import { checkArrayEquality } from '../utils/fns'; export class OdpConfig { /** diff --git a/lib/plugins/odp_manager/index.browser.ts b/lib/odp/odp_manager.browser.ts similarity index 83% rename from lib/plugins/odp_manager/index.browser.ts rename to lib/odp/odp_manager.browser.ts index 5001dc59f..7168b5822 100644 --- a/lib/plugins/odp_manager/index.browser.ts +++ b/lib/odp/odp_manager.browser.ts @@ -22,25 +22,24 @@ import { REQUEST_TIMEOUT_ODP_SEGMENTS_MS, REQUEST_TIMEOUT_ODP_EVENTS_MS, LOG_MESSAGES, -} from '../../utils/enums'; -import { getLogger, LogHandler, LogLevel } from '../../modules/logging'; +} from '../utils/enums'; +import { getLogger, LogHandler, LogLevel } from '../modules/logging'; -import { BrowserRequestHandler } from './../../utils/http_request_handler/browser_request_handler'; +import { BrowserRequestHandler } from '../utils/http_request_handler/browser_request_handler'; -import BrowserAsyncStorageCache from '../key_value_cache/browserAsyncStorageCache'; -import PersistentKeyValueCache from '../key_value_cache/persistentKeyValueCache'; -import { BrowserLRUCache } from '../../utils/lru_cache'; +import BrowserAsyncStorageCache from '../plugins/key_value_cache/browserAsyncStorageCache'; +import { BrowserLRUCache } from '../utils/lru_cache'; -import { VuidManager } from './../vuid_manager/index'; +import { VuidManager } from '../plugins/vuid_manager/index'; -import { OdpManager } from '../../core/odp/odp_manager'; -import { OdpEvent } from '../../core/odp/odp_event'; -import { IOdpEventManager, OdpOptions } from '../../shared_types'; -import { BrowserOdpEventApiManager } from '../odp/event_api_manager/index.browser'; -import { BrowserOdpEventManager } from '../odp/event_manager/index.browser'; -import { IOdpSegmentManager, OdpSegmentManager } from '../../core/odp/odp_segment_manager'; -import { OdpSegmentApiManager } from '../../core/odp/odp_segment_api_manager'; -import { OdpConfig, OdpIntegrationConfig } from '../../core/odp/odp_config'; +import { OdpManager } from './odp_manager'; +import { OdpEvent } from './event_manager/odp_event'; +import { IOdpEventManager, OdpOptions } from '../shared_types'; +import { BrowserOdpEventApiManager } from './event_manager/event_api_manager.browser'; +import { BrowserOdpEventManager } from './event_manager/event_manager.browser'; +import { IOdpSegmentManager, OdpSegmentManager } from './segment_manager/odp_segment_manager'; +import { OdpSegmentApiManager } from './segment_manager/odp_segment_api_manager'; +import { OdpConfig, OdpIntegrationConfig } from './odp_config'; interface BrowserOdpManagerConfig { clientEngine?: string, diff --git a/lib/plugins/odp_manager/index.node.ts b/lib/odp/odp_manager.node.ts similarity index 82% rename from lib/plugins/odp_manager/index.node.ts rename to lib/odp/odp_manager.node.ts index 9eebc71d1..648e27751 100644 --- a/lib/plugins/odp_manager/index.node.ts +++ b/lib/odp/odp_manager.node.ts @@ -14,25 +14,25 @@ * limitations under the License. */ -import { NodeRequestHandler } from '../../utils/http_request_handler/node_request_handler'; +import { NodeRequestHandler } from '../utils/http_request_handler/node_request_handler'; -import { ServerLRUCache } from './../../utils/lru_cache/server_lru_cache'; +import { ServerLRUCache } from '../utils/lru_cache/server_lru_cache'; -import { getLogger, LogHandler, LogLevel } from '../../modules/logging'; +import { getLogger, LogHandler, LogLevel } from '../modules/logging'; import { NODE_CLIENT_ENGINE, CLIENT_VERSION, REQUEST_TIMEOUT_ODP_EVENTS_MS, REQUEST_TIMEOUT_ODP_SEGMENTS_MS, -} from '../../utils/enums'; - -import { OdpManager } from '../../core/odp/odp_manager'; -import { IOdpEventManager, OdpOptions } from '../../shared_types'; -import { NodeOdpEventApiManager } from '../odp/event_api_manager/index.node'; -import { NodeOdpEventManager } from '../odp/event_manager/index.node'; -import { IOdpSegmentManager, OdpSegmentManager } from '../../core/odp/odp_segment_manager'; -import { OdpSegmentApiManager } from '../../core/odp/odp_segment_api_manager'; -import { OdpConfig, OdpIntegrationConfig } from '../../core/odp/odp_config'; +} from '../utils/enums'; + +import { OdpManager } from './odp_manager'; +import { IOdpEventManager, OdpOptions } from '../shared_types'; +import { NodeOdpEventApiManager } from './event_manager/event_api_manager.node'; +import { NodeOdpEventManager } from './event_manager/event_manager.node'; +import { IOdpSegmentManager, OdpSegmentManager } from './segment_manager/odp_segment_manager'; +import { OdpSegmentApiManager } from './segment_manager/odp_segment_api_manager'; +import { OdpConfig, OdpIntegrationConfig } from './odp_config'; interface NodeOdpManagerConfig { clientEngine?: string, diff --git a/lib/core/odp/odp_manager.ts b/lib/odp/odp_manager.ts similarity index 93% rename from lib/core/odp/odp_manager.ts rename to lib/odp/odp_manager.ts index 54278358d..df2bbc394 100644 --- a/lib/core/odp/odp_manager.ts +++ b/lib/odp/odp_manager.ts @@ -14,19 +14,18 @@ * limitations under the License. */ -import { LOG_MESSAGES } from './../../utils/enums/index'; -import { getLogger, LogHandler, LogLevel } from '../../modules/logging'; -import { ERROR_MESSAGES, ODP_USER_KEY } from '../../utils/enums'; +import { LogHandler, LogLevel } from '../modules/logging'; +import { ERROR_MESSAGES, ODP_USER_KEY } from '../utils/enums'; -import { VuidManager } from '../../plugins/vuid_manager'; +import { VuidManager } from '../plugins/vuid_manager'; -import { OdpConfig, OdpIntegrationConfig, odpIntegrationsAreEqual } from './odp_config'; -import { IOdpEventManager } from './odp_event_manager'; -import { IOdpSegmentManager } from './odp_segment_manager'; -import { OptimizelySegmentOption } from './optimizely_segment_option'; +import { OdpIntegrationConfig, odpIntegrationsAreEqual } from './odp_config'; +import { IOdpEventManager } from './event_manager/odp_event_manager'; +import { IOdpSegmentManager } from './segment_manager/odp_segment_manager'; +import { OptimizelySegmentOption } from './segment_manager/optimizely_segment_option'; import { invalidOdpDataFound } from './odp_utils'; -import { OdpEvent } from './odp_event'; -import { resolvablePromise, ResolvablePromise } from '../../utils/promise/resolvablePromise'; +import { OdpEvent } from './event_manager/odp_event'; +import { resolvablePromise, ResolvablePromise } from '../utils/promise/resolvablePromise'; /** * Manager for handling internal all business logic related to diff --git a/lib/core/odp/odp_response_schema.ts b/lib/odp/odp_response_schema.ts similarity index 100% rename from lib/core/odp/odp_response_schema.ts rename to lib/odp/odp_response_schema.ts diff --git a/lib/core/odp/odp_types.ts b/lib/odp/odp_types.ts similarity index 100% rename from lib/core/odp/odp_types.ts rename to lib/odp/odp_types.ts diff --git a/lib/core/odp/odp_utils.ts b/lib/odp/odp_utils.ts similarity index 100% rename from lib/core/odp/odp_utils.ts rename to lib/odp/odp_utils.ts diff --git a/lib/core/odp/odp_segment_api_manager.ts b/lib/odp/segment_manager/odp_segment_api_manager.ts similarity index 98% rename from lib/core/odp/odp_segment_api_manager.ts rename to lib/odp/segment_manager/odp_segment_api_manager.ts index 5978b3c6a..afe20ae2a 100644 --- a/lib/core/odp/odp_segment_api_manager.ts +++ b/lib/odp/segment_manager/odp_segment_api_manager.ts @@ -16,10 +16,10 @@ import { LogHandler, LogLevel } from '../../modules/logging'; import { validate } from '../../utils/json_schema_validator'; -import { OdpResponseSchema } from './odp_response_schema'; +import { OdpResponseSchema } from '../odp_response_schema'; import { ODP_USER_KEY } from '../../utils/enums'; import { RequestHandler, Response as HttpResponse } from '../../utils/http_request_handler/http'; -import { Response as GraphQLResponse } from './odp_types'; +import { Response as GraphQLResponse } from '../odp_types'; /** * Expected value for a qualified/valid segment diff --git a/lib/core/odp/odp_segment_manager.ts b/lib/odp/segment_manager/odp_segment_manager.ts similarity index 99% rename from lib/core/odp/odp_segment_manager.ts rename to lib/odp/segment_manager/odp_segment_manager.ts index ac92f5e33..4aaa47dc3 100644 --- a/lib/core/odp/odp_segment_manager.ts +++ b/lib/odp/segment_manager/odp_segment_manager.ts @@ -18,7 +18,7 @@ import { getLogger, LogHandler, LogLevel } from '../../modules/logging'; import { ERROR_MESSAGES, ODP_USER_KEY } from '../../utils/enums'; import { ICache } from '../../utils/lru_cache'; import { IOdpSegmentApiManager } from './odp_segment_api_manager'; -import { OdpConfig } from './odp_config'; +import { OdpConfig } from '../odp_config'; import { OptimizelySegmentOption } from './optimizely_segment_option'; export interface IOdpSegmentManager { diff --git a/lib/core/odp/optimizely_segment_option.ts b/lib/odp/segment_manager/optimizely_segment_option.ts similarity index 100% rename from lib/core/odp/optimizely_segment_option.ts rename to lib/odp/segment_manager/optimizely_segment_option.ts diff --git a/lib/plugins/odp/user_agent_parser/index.browser.ts b/lib/odp/ua_parser/ua_parser.browser.ts similarity index 87% rename from lib/plugins/odp/user_agent_parser/index.browser.ts rename to lib/odp/ua_parser/ua_parser.browser.ts index ad5d5f230..e6cc27dc8 100644 --- a/lib/plugins/odp/user_agent_parser/index.browser.ts +++ b/lib/odp/ua_parser/ua_parser.browser.ts @@ -15,8 +15,8 @@ */ import { UAParser } from 'ua-parser-js'; -import { UserAgentInfo } from "../../../core/odp/user_agent_info"; -import { IUserAgentParser } from '../../../core/odp/user_agent_parser'; +import { UserAgentInfo } from './user_agent_info'; +import { IUserAgentParser } from './user_agent_parser'; const userAgentParser: IUserAgentParser = { parseUserAgentInfo(): UserAgentInfo { diff --git a/lib/core/odp/user_agent_info.ts b/lib/odp/ua_parser/user_agent_info.ts similarity index 100% rename from lib/core/odp/user_agent_info.ts rename to lib/odp/ua_parser/user_agent_info.ts diff --git a/lib/core/odp/user_agent_parser.ts b/lib/odp/ua_parser/user_agent_parser.ts similarity index 100% rename from lib/core/odp/user_agent_parser.ts rename to lib/odp/ua_parser/user_agent_parser.ts diff --git a/lib/optimizely/index.ts b/lib/optimizely/index.ts index 8833c92b2..96ef632f3 100644 --- a/lib/optimizely/index.ts +++ b/lib/optimizely/index.ts @@ -19,9 +19,9 @@ import { sprintf, objectValues } from '../utils/fns'; import { NotificationCenter } from '../notification_center'; import { EventProcessor } from '../event_processor/event_processor'; -import { IOdpManager } from '../core/odp/odp_manager'; -import { OdpEvent } from '../core/odp/odp_event'; -import { OptimizelySegmentOption } from '../core/odp/optimizely_segment_option'; +import { IOdpManager } from '../odp/odp_manager'; +import { OdpEvent } from '../odp/event_manager/odp_event'; +import { OptimizelySegmentOption } from '../odp/segment_manager/optimizely_segment_option'; import { UserAttributes, diff --git a/lib/optimizely_user_context/index.ts b/lib/optimizely_user_context/index.ts index 92b307dbb..b2a524a5e 100644 --- a/lib/optimizely_user_context/index.ts +++ b/lib/optimizely_user_context/index.ts @@ -24,7 +24,7 @@ import { UserAttributes, } from '../shared_types'; import { CONTROL_ATTRIBUTES } from '../utils/enums'; -import { OptimizelySegmentOption } from '../core/odp/optimizely_segment_option'; +import { OptimizelySegmentOption } from '../odp/segment_manager/optimizely_segment_option'; interface OptimizelyUserContextConfig { optimizely: Optimizely; diff --git a/lib/project_config/project_config.ts b/lib/project_config/project_config.ts index 314372a87..2f9de78ff 100644 --- a/lib/project_config/project_config.ts +++ b/lib/project_config/project_config.ts @@ -34,7 +34,7 @@ import { Integration, FeatureVariableValue, } from '../shared_types'; -import { OdpConfig, OdpIntegrationConfig } from '../core/odp/odp_config'; +import { OdpConfig, OdpIntegrationConfig } from '../odp/odp_config'; import { Transformer } from '../utils/type'; interface TryCreatingProjectConfigConfig { diff --git a/lib/shared_types.ts b/lib/shared_types.ts index e8ed60e8b..f021124ab 100644 --- a/lib/shared_types.ts +++ b/lib/shared_types.ts @@ -28,13 +28,13 @@ import { IOptimizelyUserContext as OptimizelyUserContext } from './optimizely_us import { ICache } from './utils/lru_cache'; import { RequestHandler } from './utils/http_request_handler/http'; -import { OptimizelySegmentOption } from './core/odp/optimizely_segment_option'; -import { IOdpSegmentApiManager } from './core/odp/odp_segment_api_manager'; -import { IOdpSegmentManager } from './core/odp/odp_segment_manager'; -import { IOdpEventApiManager } from './core/odp/odp_event_api_manager'; -import { IOdpEventManager } from './core/odp/odp_event_manager'; -import { IOdpManager } from './core/odp/odp_manager'; -import { IUserAgentParser } from './core/odp/user_agent_parser'; +import { OptimizelySegmentOption } from './odp/segment_manager/optimizely_segment_option'; +import { IOdpSegmentApiManager } from './odp/segment_manager/odp_segment_api_manager'; +import { IOdpSegmentManager } from './odp/segment_manager/odp_segment_manager'; +import { IOdpEventApiManager } from './odp/event_manager/odp_event_api_manager'; +import { IOdpEventManager } from './odp/event_manager/odp_event_manager'; +import { IOdpManager } from './odp/odp_manager'; +import { IUserAgentParser } from './odp/ua_parser/user_agent_parser'; import PersistentCache from './plugins/key_value_cache/persistentKeyValueCache'; import { ProjectConfig } from './project_config/project_config'; import { ProjectConfigManager } from './project_config/project_config_manager'; diff --git a/tests/odpEventApiManager.spec.ts b/tests/odpEventApiManager.spec.ts index 518b1b07c..07632c72a 100644 --- a/tests/odpEventApiManager.spec.ts +++ b/tests/odpEventApiManager.spec.ts @@ -18,10 +18,10 @@ import { describe, beforeEach, beforeAll, it, expect } from 'vitest'; import { anyString, anything, capture, instance, mock, resetCalls, verify, when } from 'ts-mockito'; import { LogHandler, LogLevel } from '../lib/modules/logging'; -import { NodeOdpEventApiManager } from '../lib/plugins/odp/event_api_manager/index.node'; -import { OdpEvent } from '../lib/core/odp/odp_event'; +import { NodeOdpEventApiManager } from '../lib/odp/event_manager/event_api_manager.node'; +import { OdpEvent } from '../lib/odp/event_manager/odp_event'; import { RequestHandler } from '../lib/utils/http_request_handler/http'; -import { OdpConfig } from '../lib/core/odp/odp_config'; +import { OdpConfig } from '../lib/odp/odp_config'; const data1 = new Map(); data1.set('key11', 'value-1'); diff --git a/tests/odpEventManager.spec.ts b/tests/odpEventManager.spec.ts index ebd3b1838..38cf9d379 100644 --- a/tests/odpEventManager.spec.ts +++ b/tests/odpEventManager.spec.ts @@ -16,17 +16,17 @@ import { describe, beforeEach, afterEach, beforeAll, it, vi, expect } from 'vitest'; import { ODP_EVENT_ACTION, ODP_DEFAULT_EVENT_TYPE, ERROR_MESSAGES } from '../lib/utils/enums'; -import { OdpConfig } from '../lib/core/odp/odp_config'; -import { Status } from '../lib/core/odp/odp_event_manager'; -import { BrowserOdpEventManager } from "../lib/plugins/odp/event_manager/index.browser"; -import { NodeOdpEventManager } from '../lib/plugins/odp/event_manager/index.node'; -import { OdpEventManager } from '../lib/core/odp/odp_event_manager'; +import { OdpConfig } from '../lib/odp/odp_config'; +import { Status } from '../lib/odp/event_manager/odp_event_manager'; +import { BrowserOdpEventManager } from '../lib/odp/event_manager/event_manager.browser'; +import { NodeOdpEventManager } from '../lib/odp/event_manager/event_manager.node'; +import { OdpEventManager } from '../lib/odp/event_manager/odp_event_manager'; import { anything, capture, instance, mock, resetCalls, spy, verify, when } from 'ts-mockito'; -import { IOdpEventApiManager } from '../lib/core/odp/odp_event_api_manager'; +import { IOdpEventApiManager } from '../lib/odp/event_manager/odp_event_api_manager'; import { LogHandler, LogLevel } from '../lib/modules/logging'; -import { OdpEvent } from '../lib/core/odp/odp_event'; -import { IUserAgentParser } from '../lib/core/odp/user_agent_parser'; -import { UserAgentInfo } from '../lib/core/odp/user_agent_info'; +import { OdpEvent } from '../lib/odp/event_manager/odp_event'; +import { IUserAgentParser } from '../lib/odp/ua_parser/user_agent_parser'; +import { UserAgentInfo } from '../lib/odp/ua_parser/user_agent_info'; import { resolve } from 'path'; import { advanceTimersByTime } from './testUtils'; diff --git a/tests/odpManager.browser.spec.ts b/tests/odpManager.browser.spec.ts index 89ecc8030..ee9415a78 100644 --- a/tests/odpManager.browser.spec.ts +++ b/tests/odpManager.browser.spec.ts @@ -13,31 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { describe, beforeEach, beforeAll, it, vi, expect } from 'vitest'; +import { describe, beforeEach, beforeAll, it, expect } from 'vitest'; -import { anything, capture, instance, mock, resetCalls, verify, when } from 'ts-mockito'; - -import { LOG_MESSAGES, ODP_DEFAULT_EVENT_TYPE, ODP_EVENT_ACTION } from './../lib/utils/enums/index'; -import { ERROR_MESSAGES, ODP_USER_KEY } from './../lib/utils/enums/index'; +import { instance, mock, resetCalls } from 'ts-mockito'; import { LogHandler, LogLevel } from '../lib/modules/logging'; import { RequestHandler } from '../lib/utils/http_request_handler/http'; import { BrowserLRUCache } from './../lib/utils/lru_cache/browser_lru_cache'; -import { BrowserOdpManager } from './../lib/plugins/odp_manager/index.browser'; -import { IOdpEventManager, OdpOptions } from './../lib/shared_types'; -import { OdpConfig } from '../lib/core/odp/odp_config'; -import { BrowserOdpEventApiManager } from '../lib/plugins/odp/event_api_manager/index.browser'; -import { OdpSegmentManager } from './../lib/core/odp/odp_segment_manager'; -import { OdpSegmentApiManager } from '../lib/core/odp/odp_segment_api_manager'; +import { BrowserOdpManager } from './../lib/odp/odp_manager.browser'; + +import { OdpConfig } from '../lib/odp/odp_config'; +import { BrowserOdpEventApiManager } from '../lib/odp/event_manager/event_api_manager.browser'; +import { OdpSegmentManager } from './../lib/odp/segment_manager/odp_segment_manager'; +import { OdpSegmentApiManager } from '../lib/odp/segment_manager/odp_segment_api_manager'; import { VuidManager } from '../lib/plugins/vuid_manager'; import { BrowserRequestHandler } from '../lib/utils/http_request_handler/browser_request_handler'; -import { IUserAgentParser } from '../lib/core/odp/user_agent_parser'; -import { UserAgentInfo } from '../lib/core/odp/user_agent_info'; -import { OdpEvent } from '../lib/core/odp/odp_event'; -import { LRUCache } from '../lib/utils/lru_cache'; -import { BrowserOdpEventManager } from '../lib/plugins/odp/event_manager/index.browser'; -import { OdpManager } from '../lib/core/odp/odp_manager'; +import { BrowserOdpEventManager } from '../lib/odp/event_manager/event_manager.browser'; +import { OdpOptions } from '../lib/shared_types'; + const keyA = 'key-a'; const hostA = 'host-a'; diff --git a/tests/odpManager.spec.ts b/tests/odpManager.spec.ts index 009f9997b..96f69b353 100644 --- a/tests/odpManager.spec.ts +++ b/tests/odpManager.spec.ts @@ -21,18 +21,16 @@ import { ERROR_MESSAGES, ODP_USER_KEY } from './../lib/utils/enums/index'; import { LogHandler, LogLevel } from '../lib/modules/logging'; import { RequestHandler } from '../lib/utils/http_request_handler/http'; -import { BrowserLRUCache } from './../lib/utils/lru_cache/browser_lru_cache'; - -import { OdpManager, Status } from '../lib/core/odp/odp_manager'; -import { OdpConfig, OdpIntegratedConfig, OdpIntegrationConfig, OdpNotIntegratedConfig } from '../lib/core/odp/odp_config'; -import { NodeOdpEventApiManager as OdpEventApiManager } from '../lib/plugins/odp/event_api_manager/index.node'; -import { NodeOdpEventManager as OdpEventManager } from '../lib/plugins/odp/event_manager/index.node'; -import { IOdpSegmentManager, OdpSegmentManager } from './../lib/core/odp/odp_segment_manager'; -import { OdpSegmentApiManager } from '../lib/core/odp/odp_segment_api_manager'; + +import { OdpManager, Status } from '../lib/odp/odp_manager'; +import { OdpConfig, OdpIntegratedConfig, OdpIntegrationConfig, OdpNotIntegratedConfig } from '../lib/odp/odp_config'; +import { NodeOdpEventApiManager as OdpEventApiManager } from '../lib/odp/event_manager/event_api_manager.node'; +import { NodeOdpEventManager as OdpEventManager } from '../lib/odp/event_manager/event_manager.node'; +import { IOdpSegmentManager, OdpSegmentManager } from './../lib/odp/segment_manager/odp_segment_manager'; +import { OdpSegmentApiManager } from '../lib/odp/segment_manager/odp_segment_api_manager'; import { IOdpEventManager } from '../lib/shared_types'; import { wait } from './testUtils'; import { resolvablePromise } from '../lib/utils/promise/resolvablePromise'; -import exp from 'constants'; const keyA = 'key-a'; const hostA = 'host-a'; diff --git a/tests/odpSegmentApiManager.spec.ts b/tests/odpSegmentApiManager.spec.ts index bcc82f698..ee8ebc482 100644 --- a/tests/odpSegmentApiManager.spec.ts +++ b/tests/odpSegmentApiManager.spec.ts @@ -18,7 +18,7 @@ import { describe, beforeEach, beforeAll, it, expect } from 'vitest'; import { anyString, anything, instance, mock, resetCalls, verify, when } from 'ts-mockito'; import { LogHandler, LogLevel } from '../lib/modules/logging'; -import { OdpSegmentApiManager } from '../lib/core/odp/odp_segment_api_manager'; +import { OdpSegmentApiManager } from '../lib/odp/segment_manager/odp_segment_api_manager'; import { RequestHandler } from '../lib/utils/http_request_handler/http'; import { ODP_USER_KEY } from '../lib/utils/enums'; diff --git a/tests/odpSegmentManager.spec.ts b/tests/odpSegmentManager.spec.ts index 723b40cd7..f10dbc353 100644 --- a/tests/odpSegmentManager.spec.ts +++ b/tests/odpSegmentManager.spec.ts @@ -22,11 +22,11 @@ import { LogHandler } from '../lib/modules/logging'; import { ODP_USER_KEY } from '../lib/utils/enums'; import { RequestHandler } from '../lib/utils/http_request_handler/http'; -import { OdpSegmentManager } from '../lib/core/odp/odp_segment_manager'; -import { OdpConfig } from '../lib/core/odp/odp_config'; +import { OdpSegmentManager } from '../lib/odp/segment_manager/odp_segment_manager'; +import { OdpConfig } from '../lib/odp/odp_config'; import { LRUCache } from '../lib/utils/lru_cache'; -import { OptimizelySegmentOption } from './../lib/core/odp/optimizely_segment_option'; -import { OdpSegmentApiManager } from '../lib/core/odp/odp_segment_api_manager'; +import { OptimizelySegmentOption } from './../lib/odp/segment_manager/optimizely_segment_option'; +import { OdpSegmentApiManager } from '../lib/odp/segment_manager/odp_segment_api_manager'; describe('OdpSegmentManager', () => { class MockOdpSegmentApiManager extends OdpSegmentApiManager {