Merge pull request #31 from simpleanalytics/add-sa-settings

Add sa_settings to overwriteOptions and fix callback with metadata

Author: adriaandotcom

compile.js

@@ -8,7 +8,7 @@ const GREEN = "\x1b[32m%s\x1b[0m";
 const YELLOW = "\x1b[33m%s\x1b[0m";
 const RED = "\x1b[31m%s\x1b[0m";
 
-const VERSION = 9;
+const VERSION = 10;
 
 Handlebars.registerHelper("or", function (param1, param2) {
   return param1 || param2;

dist/latest/auto-events.js

@@ -1,4 +1,4 @@
-/* Simple Analytics - Privacy friendly analytics (docs.simpleanalytics.com/script; 2022-07-26; 2f79; v9) */
+/* Simple Analytics - Privacy friendly analytics (docs.simpleanalytics.com/script; 2022-09-05; 9974; v10) */
 /* eslint-env browser */
 
 (function (
@@ -113,6 +113,29 @@
         : [];
     };
 
+    var isObject = function (object) {
+      return object && object.constructor === Object;
+    };
+
+    var assign = function () {
+      var to = {};
+      var arg = arguments;
+      for (var index = 0; index < arg.length; index++) {
+        var nextSource = arg[index];
+        if (isObject(nextSource)) {
+          for (var nextKey in nextSource) {
+            if (hasProp(nextSource, nextKey)) {
+              to[nextKey] = nextSource[nextKey];
+            }
+          }
+        }
+      }
+      return to;
+    };
+
+    // Merge overwriteOptions with sa_settings
+    overwriteOptions = assign(overwriteOptions, window.sa_settings);
+
     // Customers can skip data points
     var ignoreMetrics = convertCommaSeparatedToArray(
       overwriteOptions.ignoreMetrics || attr(scriptElement, "ignore-metrics")
@@ -155,26 +178,6 @@
       return typeof func == "function";
     };
 
-    var isObject = function (object) {
-      return object && object.constructor === Object;
-    };
-
-    var assign = function () {
-      var to = {};
-      var arg = arguments;
-      for (var index = 0; index < arg.length; index++) {
-        var nextSource = arg[index];
-        if (isObject(nextSource)) {
-          for (var nextKey in nextSource) {
-            if (hasProp(nextSource, nextKey)) {
-              to[nextKey] = nextSource[nextKey];
-            }
-          }
-        }
-      }
-      return to;
-    };
-
     // Define namespace for the library
     var namespaceText = "namespace";
     var namespace =
@@ -873,8 +876,8 @@
       }
     };
 
-    var defaultEventFunc = function (event, callback) {
-      sendEvent(event, callback);
+    var defaultEventFunc = function (event, metadata, callback) {
+      sendEvent(event, metadata, callback);
     };
 
     // Set default function if user didn't define a function
@@ -905,6 +908,6 @@
   {"saGlobal":INSTALL_OPTIONS.sa_global,"mode":INSTALL_OPTIONS.hash_mode ? 'hash' : null,"collectDnt":INSTALL_OPTIONS.collect_dnt},
   INSTALL_OPTIONS.custom_domain || "queue.simpleanalyticscdn.com",
   "",
-  "cloudflare_9",
+  "cloudflare_10",
   "sa"
 );