clarity-js 0.7.5 → 0.7.7

package/build/clarity.module.js

@@ -78,6 +78,8 @@ function setup() {
     if (typeof w !== "undefined") {
         w[c] = function () {
             (w[c].q = w[c].q || []).push(arguments);
+            // if the start function was called, don't queue it and instead process the queue
+            arguments[0] === "start" && w[c].q.unshift(w[c].q.pop()) && process$7();
         };
     }
 }
@@ -143,11 +145,11 @@ function time(event) {
     var ts = event && event.timeStamp > 0 ? event.timeStamp : performance.now();
     return Math.max(Math.round(ts - startTime), 0);
 }
-function stop$C() {
+function stop$D() {
     startTime = 0;
 }
 
-var version$1 = "0.7.5";
+var version$1 = "0.7.7";
 
 // tslint:disable: no-bitwise
 function hash (input, precision) {
@@ -197,6 +199,7 @@ function text$1(value, hint, privacy, mangle) {
             case 3 /* Privacy.TextImage */:
                 switch (hint) {
                     case "*T" /* Layout.Constant.TextTag */:
+                    case "data-" /* Layout.Constant.DataAttribute */:
                         return mangle ? mangleText(value) : mask(value);
                     case "src":
                     case "srcset":
@@ -215,6 +218,7 @@ function text$1(value, hint, privacy, mangle) {
             case 4 /* Privacy.Exclude */:
                 switch (hint) {
                     case "*T" /* Layout.Constant.TextTag */:
+                    case "data-" /* Layout.Constant.DataAttribute */:
                         return mangle ? mangleText(value) : mask(value);
                     case "value":
                     case "input":
@@ -224,6 +228,25 @@ function text$1(value, hint, privacy, mangle) {
                     case "checksum":
                         return "" /* Data.Constant.Empty */;
                 }
+                break;
+            case 5 /* Privacy.Snapshot */:
+                switch (hint) {
+                    case "*T" /* Layout.Constant.TextTag */:
+                    case "data-" /* Layout.Constant.DataAttribute */:
+                        return scrub(value);
+                    case "value":
+                    case "input":
+                    case "click":
+                    case "change":
+                        return Array(5 /* Data.Setting.WordLength */).join("\u2022" /* Data.Constant.Mask */);
+                    case "checksum":
+                    case "src":
+                    case "srcset":
+                    case "alt":
+                    case "title":
+                        return "" /* Data.Constant.Empty */;
+                }
+                break;
         }
     }
     return value;
@@ -251,6 +274,10 @@ function mangleText(value) {
 function mask(value) {
     return value.replace(catchallRegex, "\u2022" /* Data.Constant.Mask */);
 }
+function scrub(value) {
+    regex(); // Initialize regular expressions
+    return value.replace(letterRegex, "\u25AA" /* Data.Constant.Letter */).replace(digitRegex, "\u25AB" /* Data.Constant.Digit */);
+}
 function mangleToken(value) {
     var length = ((Math.floor(value.length / 5 /* Data.Setting.WordLength */) + 1) * 5 /* Data.Setting.WordLength */);
     var output = "" /* Layout.Constant.Empty */;
@@ -259,13 +286,7 @@ function mangleToken(value) {
     }
     return output;
 }
-function redact(value) {
-    var spaceIndex = -1;
-    var gap = 0;
-    var hasDigit = false;
-    var hasEmail = false;
-    var hasWhitespace = false;
-    var array = null;
+function regex() {
     // Initialize unicode regex, if supported by the browser
     // Reference: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Unicode_Property_Escapes
     if (unicodeRegex && digitRegex === null) {
@@ -278,6 +299,15 @@ function redact(value) {
             unicodeRegex = false;
         }
     }
+}
+function redact(value) {
+    var spaceIndex = -1;
+    var gap = 0;
+    var hasDigit = false;
+    var hasEmail = false;
+    var hasWhitespace = false;
+    var array = null;
+    regex(); // Initialize regular expressions
     for (var i = 0; i < value.length; i++) {
         var c = value.charCodeAt(i);
         hasDigit = hasDigit || (c >= 48 /* Data.Character.Zero */ && c <= 57 /* Data.Character.Nine */); // Check for digits in the current word
@@ -389,7 +419,7 @@ function compute$c() {
         encode$1(4 /* Event.Baseline */);
     }
 }
-function stop$B() {
+function stop$C() {
     reset$q();
 }
 
@@ -400,7 +430,7 @@ var baseline = /*#__PURE__*/Object.freeze({
     reset: reset$q,
     start: start$F,
     get state () { return state$a; },
-    stop: stop$B,
+    stop: stop$C,
     track: track$7,
     visibility: visibility
 });
@@ -426,7 +456,7 @@ function start$E() {
     updates$3 = {};
     count$1(5 /* Metric.InvokeCount */);
 }
-function stop$A() {
+function stop$B() {
     data$i = {};
     updates$3 = {};
 }
@@ -504,7 +534,7 @@ function ping() {
         suspend();
     }
 }
-function stop$z() {
+function stop$A() {
     clearTimeout(timeout$6);
     last = 0;
     interval = 0;
@@ -515,14 +545,14 @@ var ping$1 = /*#__PURE__*/Object.freeze({
     get data () { return data$h; },
     reset: reset$o,
     start: start$D,
-    stop: stop$z
+    stop: stop$A
 });
 
 var data$g = null;
 function start$C() {
     data$g = {};
 }
-function stop$y() {
+function stop$z() {
     data$g = {};
 }
 function track$6(event, time) {
@@ -555,7 +585,7 @@ var summary = /*#__PURE__*/Object.freeze({
     get data () { return data$g; },
     reset: reset$n,
     start: start$C,
-    stop: stop$y,
+    stop: stop$z,
     track: track$6
 });
 
@@ -584,7 +614,7 @@ function upgrade(key) {
         encode$1(3 /* Event.Upgrade */);
     }
 }
-function stop$x() {
+function stop$y() {
     data$f = null;
 }
 
@@ -592,7 +622,7 @@ var upgrade$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     get data () { return data$f; },
     start: start$B,
-    stop: stop$x,
+    stop: stop$y,
     upgrade: upgrade
 });
 
@@ -632,7 +662,7 @@ function compute$9() {
 function reset$m() {
     data$e = {};
 }
-function stop$w() {
+function stop$x() {
     reset$m();
 }
 
@@ -644,7 +674,7 @@ var variable = /*#__PURE__*/Object.freeze({
     reset: reset$m,
     set: set,
     start: start$A,
-    stop: stop$w
+    stop: stop$x
 });
 
 /******************************************************************************
@@ -764,13 +794,13 @@ function start$z() {
     start$E();
     modules$1.forEach(function (x) { return measure(x.start)(); });
 }
-function stop$v() {
+function stop$w() {
     // Stop modules in the reverse order of their initialization
     // The ordering below should respect inter-module dependency.
     // E.g. if upgrade depends on upload, then upgrade needs to end before upload.
     // Similarly, if upload depends on metadata, upload needs to end before metadata.
     modules$1.slice().reverse().forEach(function (x) { return measure(x.stop)(); });
-    stop$A();
+    stop$B();
 }
 function compute$8() {
     compute$9();
@@ -920,7 +950,7 @@ function start$x() {
     reset$k();
     parse$1(document, true);
 }
-function stop$u() {
+function stop$v() {
     reset$k();
 }
 function reset$k() {
@@ -1267,7 +1297,7 @@ var dom = /*#__PURE__*/Object.freeze({
     parse: parse$1,
     sameorigin: sameorigin,
     start: start$x,
-    stop: stop$u,
+    stop: stop$v,
     update: update$1,
     updates: updates$2
 });
@@ -1378,7 +1408,7 @@ function restart$2(timer) {
         tracker[id].yield = y;
     }
 }
-function stop$t(timer) {
+function stop$u(timer) {
     var end = performance.now();
     var id = key(timer);
     var duration = end - tracker[id].start;
@@ -1398,7 +1428,7 @@ function suspend$1(timer) {
                 case 0:
                     id = key(timer);
                     if (!(id in tracker)) return [3 /*break*/, 2];
-                    stop$t(timer);
+                    stop$u(timer);
                     _a = tracker[id];
                     return [4 /*yield*/, wait()];
                 case 1:
@@ -1541,7 +1571,7 @@ function compute$7() {
         encode$4(8 /* Event.Document */);
     }
 }
-function end() {
+function stop$t() {
     reset$i();
 }
 
@@ -1676,7 +1706,7 @@ function str$1(input) {
     return input.toString(36);
 }
 function attribute(key, value, privacy) {
-    return "".concat(key, "=").concat(text$1(value, key, privacy));
+    return "".concat(key, "=").concat(text$1(value, key.indexOf("data-" /* Constant.DataAttribute */) === 0 ? "data-" /* Constant.DataAttribute */ : key, privacy));
 }
 
 var state$8 = [];
@@ -1849,7 +1879,7 @@ function stop$r() {
     reset$g();
 }
 
-function offset (element) {
+function offset(element) {
     var output = { x: 0, y: 0 };
     // Walk up the chain to ensure we compute offset distance correctly
     // In case where we may have nested IFRAMEs, we keep walking up until we get to the top most parent page
@@ -1922,6 +1952,18 @@ function handler$2(event, root, evt) {
         schedule$1(encode$3.bind(this, event));
     }
 }
+function link(node) {
+    while (node && node !== document) {
+        if (node.nodeType === Node.ELEMENT_NODE) {
+            var element = node;
+            if (element.tagName === "A") {
+                return element;
+            }
+        }
+        node = node.parentNode;
+    }
+    return null;
+}
 function text(element) {
     var output = null;
     if (element) {
@@ -2659,7 +2701,7 @@ function getAttributes(element) {
 
 function traverse (root, timer, source) {
     return __awaiter(this, void 0, void 0, function () {
-        var queue, node, next, state, subnode;
+        var queue, entry, next, state, subnode;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -2667,8 +2709,8 @@ function traverse (root, timer, source) {
                     _a.label = 1;
                 case 1:
                     if (!(queue.length > 0)) return [3 /*break*/, 4];
-                    node = queue.shift();
-                    next = node.firstChild;
+                    entry = queue.shift();
+                    next = entry.firstChild;
                     while (next) {
                         queue.push(next);
                         next = next.nextSibling;
@@ -2683,7 +2725,7 @@ function traverse (root, timer, source) {
                     if (state === 2 /* Task.Stop */) {
                         return [3 /*break*/, 4];
                     }
-                    subnode = processNode(node, source);
+                    subnode = processNode(entry, source);
                     if (subnode) {
                         queue.push(subnode);
                     }
@@ -2866,7 +2908,7 @@ function process$1() {
                     _b.sent();
                     return [3 /*break*/, 1];
                 case 8:
-                    stop$t(timer);
+                    stop$u(timer);
                     return [2 /*return*/];
             }
         });
@@ -2998,18 +3040,6 @@ function target(evt) {
     active$2(); // Mark active periods of time so mutations can continue uninterrupted
     return node.nodeType === Node.DOCUMENT_NODE ? node.documentElement : node;
 }
-function link(node) {
-    while (node && node !== document) {
-        if (node.nodeType === Node.ELEMENT_NODE) {
-            var element = node;
-            if (element.tagName === "A") {
-                return element;
-            }
-        }
-        node = node.parentNode;
-    }
-    return null;
-}
 function metadata$2(node, event, text) {
     if (text === void 0) { text = null; }
     // If the node is null, we return a reserved value for id: 0. Valid assignment of id begins from 1+.
@@ -3068,7 +3098,7 @@ function encode$3 (type, ts) {
                         entry = _c[_b];
                         cTarget = metadata$2(entry.data.target, entry.event, entry.data.text);
                         tokens = [entry.time, entry.event];
-                        cHash = cTarget.hash.join("." /* Constant.Dot */);
+                        cHash = cTarget.hash ? cTarget.hash.join("." /* Constant.Dot */) : "" /* Constant.Empty */;
                         tokens.push(cTarget.id);
                         tokens.push(entry.data.x);
                         tokens.push(entry.data.y);
@@ -3288,6 +3318,7 @@ function queue(tokens, transmit) {
                 discoverBytes += event_1.length;
             case 37 /* Event.Box */:
             case 6 /* Event.Mutation */:
+            case 43 /* Event.Snapshot */:
                 playbackBytes += event_1.length;
                 playback.push(event_1);
                 break;
@@ -3628,12 +3659,18 @@ function stop$c() {
 }
 
 var data$5 = {};
-var keys = [];
+var keys = new Set();
 var variables = {};
 var selectors = {};
+var hashes = {};
 function start$c() {
     reset$4();
 }
+// Input string is of the following form:
+// EXTRACT 101 { "1": ".class1", "2": "~window.a.b", "3": "!abc"}
+// Which will set up event 101 to grab the contents of the class1 selector into component 1,
+// the javascript evaluated contents of window.a.b into component 2,
+// and the contents of Clarity's hash abc into component 3
 function trigger$1(input) {
     try {
         var parts = input && input.length > 0 ? input.split(/ (.*)/) : ["" /* Constant.Empty */];
@@ -3641,10 +3678,19 @@ function trigger$1(input) {
         var values = parts.length > 1 ? JSON.parse(parts[1]) : {};
         variables[key] = {};
         selectors[key] = {};
+        hashes[key] = {};
         for (var v in values) {
+            // values is a set of strings for proper JSON parsing, but it's more efficient 
+            // to interact with them as numbers
             var id = parseInt(v);
             var value = values[v];
-            var source = value.startsWith("~" /* Constant.Tilde */) ? 0 /* ExtractSource.Javascript */ : 2 /* ExtractSource.Text */;
+            var source = 2 /* ExtractSource.Text */;
+            if (value.startsWith("~" /* Constant.Tilde */)) {
+                source = 0 /* ExtractSource.Javascript */;
+            }
+            else if (value.startsWith("!" /* Constant.Bang */)) {
+                source = 4 /* ExtractSource.Hash */;
+            }
             switch (source) {
                 case 0 /* ExtractSource.Javascript */:
                     var variable = value.substring(1, value.length);
@@ -3653,6 +3699,10 @@ function trigger$1(input) {
                 case 2 /* ExtractSource.Text */:
                     selectors[key][id] = value;
                     break;
+                case 4 /* ExtractSource.Hash */:
+                    var hash = value.substring(1, value.length);
+                    hashes[key][id] = hash;
+                    break;
             }
         }
     }
@@ -3667,44 +3717,56 @@ function compute$4() {
     try {
         for (var v in variables) {
             var key = parseInt(v);
-            if (!(key in keys)) {
-                var variableData = variables[key];
-                for (var v_1 in variableData) {
-                    var variableKey = parseInt(v_1);
-                    var value = str(evaluate(clone(variableData[variableKey])));
-                    if (value) {
-                        update(key, variableKey, value);
-                    }
+            var variableData = variables[key];
+            for (var v_1 in variableData) {
+                var variableKey = parseInt(v_1);
+                var value = str(evaluate(clone(variableData[variableKey])));
+                if (value) {
+                    update(key, variableKey, value);
                 }
-                var selectorData = selectors[key];
-                for (var s in selectorData) {
-                    var selectorKey = parseInt(s);
-                    var nodes = document.querySelectorAll(selectorData[selectorKey]);
-                    if (nodes) {
-                        var text = Array.from(nodes).map(function (e) { return e.innerText; });
-                        update(key, selectorKey, text.join("<SEP>" /* Constant.Seperator */).substring(0, 10000 /* Setting.ExtractLimit */));
-                    }
+            }
+            var selectorData = selectors[key];
+            for (var s in selectorData) {
+                var selectorKey = parseInt(s);
+                var nodes = document.querySelectorAll(selectorData[selectorKey]);
+                if (nodes) {
+                    var text = Array.from(nodes).map(function (e) { return e.innerText; });
+                    update(key, selectorKey, text.join("<SEP>" /* Constant.Seperator */).substring(0, 10000 /* Setting.ExtractLimit */));
                 }
             }
+            var hashData = hashes[key];
+            for (var h in hashData) {
+                var hashKey = parseInt(h);
+                var content = hashText(hashData[hashKey]).trim().substring(0, 10000 /* Setting.ExtractLimit */);
+                update(key, hashKey, content);
+            }
+        }
+        if (keys.size > 0) {
+            encode$1(40 /* Event.Extract */);
         }
     }
     catch (e) {
         log$1(5 /* Code.Selector */, 1 /* Severity.Warning */, e ? e.name : null);
     }
-    encode$1(40 /* Event.Extract */);
 }
 function reset$4() {
-    data$5 = {};
-    keys = [];
-    variables = {};
-    selectors = {};
+    keys.clear();
 }
 function update(key, subkey, value) {
+    var update = false;
     if (!(key in data$5)) {
-        data$5[key] = [];
-        keys.push(key);
+        data$5[key] = {};
+        update = true;
     }
-    data$5[key].push([subkey, value]);
+    if (!isEmpty(hashes[key])
+        && (!(subkey in data$5[key]) || data$5[key][subkey] != value)) {
+        update = true;
+    }
+    data$5[key][subkey] = value;
+    if (update) {
+        keys.add(key);
+    }
+    return;
 }
 function stop$b() {
     reset$4();
@@ -3767,6 +3829,9 @@ function match(base, condition) {
         return prop.length > 1 ? base[prop[0]] == prop[1] : base[prop[0]];
     }
     return true;
+}
+function isEmpty(obj) {
+    return Object.keys(obj).length == 0;
 }
 
 function encode$1 (event) {
@@ -3869,11 +3934,16 @@ function encode$1 (event) {
             break;
         case 40 /* Event.Extract */:
             var extractKeys = keys;
-            for (var _d = 0, extractKeys_1 = extractKeys; _d < extractKeys_1.length; _d++) {
-                var e = extractKeys_1[_d];
+            extractKeys.forEach((function (e) {
                 tokens.push(e);
-                tokens.push([].concat.apply([], data$5[e]));
-            }
+                var token = [];
+                for (var d in data$5[e]) {
+                    var key = parseInt(d, 10);
+                    token.push(key);
+                    token.push(data$5[e][d]);
+                }
+                tokens.push(token);
+            }));
             reset$4();
             queue(tokens, false);
     }
@@ -4021,11 +4091,17 @@ function stop$8() {
 }
 function metadata(cb, wait) {
     if (wait === void 0) { wait = true; }
-    if (data$2 && wait === false) {
+    var upgraded = config$1.lean ? 0 /* BooleanFlag.False */ : 1 /* BooleanFlag.True */;
+    // if caller hasn't specified that they want to skip waiting for upgrade but we've already upgraded, we need to
+    // directly execute the callback rather than adding to our list as we only process callbacks at the moment
+    // we go through the upgrading flow.
+    if (data$2 && (upgraded || wait === false)) {
         // Immediately invoke the callback if the caller explicitly doesn't want to wait for the upgrade confirmation
         cb(data$2, !config$1.lean);
     }
-    callbacks.push({ callback: cb, wait: wait });
+    else {
+        callbacks.push({ callback: cb, wait: wait });
+    }
 }
 function id() {
     return data$2 ? [data$2.userId, data$2.sessionId, data$2.pageNum].join("." /* Constant.Dot */) : "" /* Constant.Empty */;
@@ -4383,7 +4459,7 @@ function stop$5() {
     reset$2();
     reset$1();
     reset$j();
-    stop$C();
+    stop$D();
     status = false;
 }
 function active() {
@@ -4472,7 +4548,7 @@ function discover() {
                     return [4 /*yield*/, encode$4(5 /* Event.Discover */, timer, ts)];
                 case 2:
                     _a.sent();
-                    stop$t(timer);
+                    stop$u(timer);
                     return [2 /*return*/];
             }
         });
@@ -4490,9 +4566,9 @@ function start$3() {
 }
 function stop$3() {
     stop$s();
-    stop$u();
+    stop$v();
     stop$f();
-    end();
+    stop$t();
 }
 
 var layout = /*#__PURE__*/Object.freeze({
@@ -4717,7 +4793,7 @@ function stop() {
     if (active()) {
         // Stop modules in the reverse order of their initialization and start queuing up items again
         modules.slice().reverse().forEach(function (x) { return measure(x.stop)(); });
-        stop$v();
+        stop$w();
         stop$5();
         setup();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-js",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "An analytics library that uses web page interactions to generate aggregated insights",
   "author": "Microsoft Corp.",
   "license": "MIT",

package/rollup.config.ts

@@ -46,11 +46,11 @@ export default [
     plugins: [
       alias({
         entries: [
-          { find: '@src/interaction/change', replacement: '@src/core/blank' },
-          { find: '@src/interaction/clipboard', replacement: '@src/core/blank' },
-          { find: '@src/interaction/input', replacement: '@src/core/blank' },
-          { find: '@src/interaction/pointer', replacement: '@src/core/blank' },
-          { find: '@src/interaction/selection', replacement: '@src/core/blank' }          
+          { find: '@src/layout/document', replacement: '@src/layout/document' },
+          { find: '@src/layout/encode', replacement: '@src/insight/encode' },
+          { find: /@src\/interaction\/(change|clipboard|input|pointer|selection)/, replacement: '@src/insight/blank' },
+          { find: /@src\/layout.*/, replacement: '@src/insight/snapshot' },
+          { find: /@src\/performance.*/, replacement: '@src/insight/blank' }
         ]
       }),
       resolve(),