comments addressed

Author: ozayr-zaviar

packages/optimizely-sdk/lib/core/project_config/index.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2021, Optimizely
+ * Copyright 2016-2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packages/optimizely-sdk/lib/core/project_config/project_config_manager.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2021, Optimizely
+ * Copyright 2019-2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packages/optimizely-sdk/lib/export_types.ts

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2022, Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 export {
   UserAttributes,
   OptimizelyConfig,

packages/optimizely-sdk/lib/index.browser.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017, 2019-2020 Optimizely
+ * Copyright 2016-2017, 2019-2022 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,8 @@ let hasRetriedEvents = false;
 const createInstance = function(config: Config): Client | null {
   try {
     // TODO warn about setting per instance errorHandler / logger / logLevel
+    let isValidInstance = false
+
     if (config.errorHandler) {
       setErrorHandler(config.errorHandler);
     }
@@ -68,10 +70,9 @@ const createInstance = function(config: Config): Client | null {
 
     try {
       configValidator.validate(config);
-      config.isValidInstance = true;
+      isValidInstance = true;
     } catch (ex) {
       logger.error(ex);
-      config.isValidInstance = false;
     }
 
     let eventDispatcher;
@@ -125,7 +126,7 @@ const createInstance = function(config: Config): Client | null {
       errorHandler,
       datafileManager: config.sdkKey ? createHttpPollingDatafileManager(config.sdkKey, logger, config.datafile, config.datafileOptions) : undefined,
       notificationCenter,
-      isValidInstance: config.isValidInstance
+      isValidInstance: isValidInstance
     };
 
     const optimizely = new Optimizely(optimizelyOptions);

packages/optimizely-sdk/lib/index.lite.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021, Optimizely
+ * Copyright 2021-2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,8 @@ setLogLevel(LogLevel.ERROR);
   try {
 
     // TODO warn about setting per instance errorHandler / logger / logLevel
+    let isValidInstance = false;
+
     if (config.errorHandler) {
       setErrorHandler(config.errorHandler);
     }
@@ -60,10 +62,9 @@ setLogLevel(LogLevel.ERROR);
 
     try {
       configValidator.validate(config);
-      config.isValidInstance = true;
+      isValidInstance = true;
     } catch (ex) {
       logger.error(ex);
-      config.isValidInstance = false;
     }
 
     const errorHandler = getErrorHandler();
@@ -79,7 +80,7 @@ setLogLevel(LogLevel.ERROR);
       datafileManager: createNoOpDatafileManager(),
       eventProcessor,
       notificationCenter,
-      isValidInstance: config.isValidInstance,
+      isValidInstance: isValidInstance,
     };
 
     const optimizely = new Optimizely(optimizelyOptions);

packages/optimizely-sdk/lib/index.node.ts

@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016-2017, 2019-2021 Optimizely, Inc. and contributors        *
+ * Copyright 2016-2017, 2019-2022 Optimizely, Inc. and contributors        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -49,6 +49,7 @@ const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
  const createInstance = function(config: Config): Client | null {
   try {
     let hasLogger = false;
+    let isValidInstance = false;
 
     // TODO warn about setting per instance errorHandler / logger / logLevel
     if (config.errorHandler) {
@@ -66,14 +67,13 @@ const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
     }
     try {
       configValidator.validate(config);
-      config.isValidInstance = true;
+      isValidInstance = true;
     } catch (ex) {
       if (hasLogger) {
         logger.error(ex);
       } else {
         console.error(ex.message);
       }
-      config.isValidInstance = false;
     }
 
     let eventBatchSize = config.eventBatchSize;
@@ -113,7 +113,7 @@ const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
       errorHandler,
       datafileManager: config.sdkKey ? createHttpPollingDatafileManager(config.sdkKey, logger, config.datafile, config.datafileOptions) : undefined,
       notificationCenter,
-      isValidInstance: config.isValidInstance,
+      isValidInstance: isValidInstance,
     };
 
     return new Optimizely(optimizelyOptions);

packages/optimizely-sdk/lib/index.react_native.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2021 Optimizely
+ * Copyright 2019-2022 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,8 @@ const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
  const createInstance = function(config: Config): Client | null {
   try {
     // TODO warn about setting per instance errorHandler / logger / logLevel
+    let isValidInstance = false;
+
     if (config.errorHandler) {
       setErrorHandler(config.errorHandler);
     }
@@ -64,10 +66,9 @@ const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
 
     try {
       configValidator.validate(config);
-      config.isValidInstance = true;
+      isValidInstance = true;
     } catch (ex) {
       logger.error(ex);
-      config.isValidInstance = false;
     }
 
     let eventBatchSize = config.eventBatchSize;
@@ -107,7 +108,7 @@ const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
       errorHandler,
       datafileManager:  config.sdkKey ? createHttpPollingDatafileManager(config.sdkKey, logger, config.datafile, config.datafileOptions) : undefined,
       notificationCenter,
-      isValidInstance: config.isValidInstance,
+      isValidInstance: isValidInstance,
     };
 
     // If client engine is react, convert it to react native.

packages/optimizely-sdk/lib/plugins/datafile_manager/http_polling_datafile_manager.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021, Optimizely
+ * Copyright 2021-2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packages/optimizely-sdk/lib/plugins/event_dispatcher/index.browser.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017, 2020-2021, Optimizely
+ * Copyright 2016-2017, 2020-2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packages/optimizely-sdk/lib/shared_types.ts

@@ -398,8 +398,10 @@ export interface TrackListenerPayload extends ListenerPayload {
   errorHandler?: ErrorHandler;
   // event dispatcher function
   eventDispatcher?: EventDispatcher;
-  // flag to validate if this instance is valid
-  isValidInstance?: boolean;
+  // The object to validate against the schema
+  jsonSchemaValidator?: {
+    validate(jsonObject: unknown): boolean,
+  };
   // level of logging i.e debug, info, error, warning etc
   logLevel?: LogLevel | string;
   // LogHandler object for logging