updated imports

rudderlabs · Sep 30, 2019 · 2ca4bad · 2ca4bad
1 parent 071de37
commit 2ca4bad
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 13 deletions.
diff --git a/rudder-client-javascript/RudderClient.js b/rudder-client-javascript/RudderClient.js
@@ -21,9 +21,9 @@ var generateUUID = require("./utils/utils.js").generateUUID;
 var getCurrentTimeFormatted = require("./utils/utils.js")
   .getCurrentTimeFormatted;
 var getJSON = require("./utils/utils.js").getJSON;
-var RudderConfig = require("./utils/RudderConfig.js");
+var RudderConfig = require("./utils/RudderConfig.js").RudderConfig;
 var AnalyticsManager = require("./utils/AnalyticsManager.js");
-var EventRepository = require("./utils/EventRepository.js");
+var EventRepository = require("./utils/EventRepository.js").EventRepository;
 var RudderPayload = require("./utils/RudderPayload.js");
 var RudderElement = require("./utils/RudderElement.js");
 var RudderElementBuilder = require("./utils/RudderElementBuilder.js");
@@ -118,10 +118,12 @@ var RudderClient = (function() {
   return {
     // Get the Singleton instance if one exists
     // or create one if it doesn't
-    getInstance: function(writeKey, rudderConfig) {
+    getInstance: function(writeKey) {
       if (!instance) {
         //Check that valid input object instances have been provided for creating
         //RudderClient instance
+        console.log(RudderConfig);
+        var rudderConfig = new RudderConfig().getDefaultConfig().setFlushQueueSize(1)
 
         if (!writeKey || 0 === writeKey.length) {
           throw new Error("writeKey cannot be null or empty");
@@ -144,3 +146,4 @@ var RudderClient = (function() {
 
 window.RudderClient = RudderClient;
 window.RudderConfig = RudderConfig;
+window.RudderTraits = RudderTraits;
diff --git a/rudder-client-javascript/utils/EventRepository.js b/rudder-client-javascript/utils/EventRepository.js
@@ -1,6 +1,6 @@
 var getJSON = require("./utils.js").getJSON;
 var CONFIG_URL = require("./constants.js").CONFIG_URL;
-var AnalyticsManager = require("./AnalyticsManager.js");
+var AnalyticsManager = require("./AnalyticsManager.js").AnalyticsManager;
 var getCurrentTimeFormatted = require("./utils.js").getCurrentTimeFormatted;
 var replacer = require("./utils.js").replacer;
 var RudderPayload = require("./RudderPayload.js");

diff --git a/rudder-client-javascript/utils/RudderConfig.js b/rudder-client-javascript/utils/RudderConfig.js
@@ -1,6 +1,6 @@
 var RudderConstant = require("./constants.js");
 //Rudder configration class
-var RudderConfig = (function() {
+var RudderConfig = function() {
     var instance;
 
     function init() {
@@ -43,16 +43,67 @@ var RudderConfig = (function() {
         }
       };
     }
-
     return {
-      getDefaultConfig: function() {
-        if (!instance) {
-          instance = init();
+        getDefaultConfig: function() {
+            if (!instance) {
+                instance = init();
+            }
+            return instance;
         }
-        return instance;
-      }
-    };
-  })();
+    }
+  };
+
+/* class RudderConfig {
+    constructor(){
+        this.instance = null;
+    }
+    init() {
+      //Private variables
+      var endPointUri = RudderConstant.BASE_URL;
+      var flushQueueSize = RudderConstant.FLUSH_QUEUE_SIZE;
+      var integrations = [];
+  
+      //Public methods
+      return {
+        getDefaultIntegrations: function() {
+          return [];
+        },
+  
+        getEndPointUri: function() {
+          return endPointUri;
+        },
+  
+        getFlushQueueSize: function() {
+          return this.flushQueueSize;
+        },
+  
+        getIntegrations: function() {
+          return this.integrations;
+        },
+  
+        setIntegrations: function(integrations) {
+          this.integrations = integrations;
+          return this;
+        },
+  
+        setFlushQueueSize: function(flushQueueSize) {
+          this.flushQueueSize = flushQueueSize;
+          return this;
+        },
+  
+        setEndPointUri: function(endPointUri) {
+          this.endPointUri = endPointUri;
+          return this;
+        }
+      };
+    }
+    getDefaultConfig() {
+        if (!this.instance) {
+            this.instance = this.init();
+        }
+        return this.instance;
+    }
+  } */
 
   module.exports = {
     RudderConfig: RudderConfig