clarity-js 0.6.37 → 0.6.40

package/build/clarity.module.js

@@ -111,7 +111,7 @@ function stop$B() {
     startTime = 0;
 }
 
-var version$1 = "0.6.37";
+var version$1 = "0.6.40";
 
 // tslint:disable: no-bitwise
 function hash (input) {
@@ -138,9 +138,9 @@ var buffer = null;
 var update$2 = false;
 function start$E() {
     update$2 = false;
-    reset$o();
+    reset$p();
 }
-function reset$o() {
+function reset$p() {
     // Baseline state holds the previous values - if it is updated in the current payload,
     // reset the state to current value after sending the previous state
     if (update$2) {
@@ -208,14 +208,14 @@ function compute$c() {
     }
 }
 function stop$A() {
-    reset$o();
+    reset$p();
 }
 
 var baseline = /*#__PURE__*/Object.freeze({
     __proto__: null,
     get state () { return state$9; },
     start: start$E,
-    reset: reset$o,
+    reset: reset$p,
     track: track$7,
     activity: activity,
     visibility: visibility,
@@ -285,7 +285,7 @@ function max(metric, value) {
 function compute$b() {
     encode$1(0 /* Event.Metric */);
 }
-function reset$n() {
+function reset$o() {
     updates$3 = {};
 }
 
@@ -304,7 +304,7 @@ function start$C() {
     interval = 60000 /* Setting.PingInterval */;
     last = 0;
 }
-function reset$m() {
+function reset$n() {
     if (timeout$6) {
         clearTimeout(timeout$6);
     }
@@ -332,7 +332,7 @@ var ping$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     get data () { return data$h; },
     start: start$C,
-    reset: reset$m,
+    reset: reset$n,
     stop: stop$y
 });
 
@@ -363,7 +363,7 @@ function track$6(event, time) {
 function compute$a() {
     encode$1(36 /* Event.Summary */);
 }
-function reset$l() {
+function reset$m() {
     data$g = {};
 }
 
@@ -374,7 +374,7 @@ var summary = /*#__PURE__*/Object.freeze({
     stop: stop$x,
     track: track$6,
     compute: compute$a,
-    reset: reset$l
+    reset: reset$m
 });
 
 var data$f = null;
@@ -416,7 +416,7 @@ var upgrade$1 = /*#__PURE__*/Object.freeze({
 
 var data$e = null;
 function start$z() {
-    reset$k();
+    reset$l();
 }
 function set(variable, value) {
     var values = typeof value === "string" /* Constant.String */ ? [value] : value;
@@ -447,11 +447,11 @@ function log$2(variable, value) {
 function compute$9() {
     encode$1(34 /* Event.Variable */);
 }
-function reset$k() {
+function reset$l() {
     data$e = {};
 }
 function stop$v() {
-    reset$k();
+    reset$l();
 }
 
 var variable = /*#__PURE__*/Object.freeze({
@@ -461,7 +461,7 @@ var variable = /*#__PURE__*/Object.freeze({
     set: set,
     identify: identify,
     compute: compute$9,
-    reset: reset$k,
+    reset: reset$l,
     stop: stop$v
 });
 
@@ -600,6 +600,11 @@ function compute$8() {
     compute$4();
 }
 
+var catchallRegex = /\S/gi;
+var unicodeRegex = true;
+var digitRegex = null;
+var letterRegex = null;
+var currencyRegex = null;
 function scrub (value, hint, privacy, mangle) {
     if (mangle === void 0) { mangle = false; }
     if (value) {
@@ -611,9 +616,9 @@ function scrub (value, hint, privacy, mangle) {
                     case "*T" /* Layout.Constant.TextTag */:
                     case "value":
                     case "placeholder":
-                        return redact(value);
+                    case "click":
                     case "input":
-                        return mangleToken(value);
+                        return redact(value);
                 }
                 return value;
             case 2 /* Privacy.Text */:
@@ -650,7 +655,7 @@ function mangleText(value) {
     return value;
 }
 function mask(value) {
-    return value.replace(/\S/gi, "\u2022" /* Data.Constant.Mask */);
+    return value.replace(catchallRegex, "\u2022" /* Data.Constant.Mask */);
 }
 function mangleToken(value) {
     var length = ((Math.floor(value.length / 5 /* Data.Setting.WordLength */) + 1) * 5 /* Data.Setting.WordLength */);
@@ -662,10 +667,23 @@ function mangleToken(value) {
 }
 function redact(value) {
     var spaceIndex = -1;
+    var gap = 0;
     var hasDigit = false;
     var hasEmail = false;
     var hasWhitespace = false;
     var array = null;
+    // 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) {
+        try {
+            digitRegex = new RegExp("\\p{N}", "gu");
+            letterRegex = new RegExp("\\p{L}", "gu");
+            currencyRegex = new RegExp("\\p{Sc}", "gu");
+        }
+        catch (_a) {
+            unicodeRegex = false;
+        }
+    }
     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
@@ -678,7 +696,19 @@ function redact(value) {
                 if (array === null) {
                     array = value.split("" /* Data.Constant.Empty */);
                 }
-                mutate(array, spaceIndex, hasWhitespace ? i : i + 1);
+                // Work on a token at a time so we don't have to apply regex to a larger string
+                var token = value.substring(spaceIndex + 1, hasWhitespace ? i : i + 1);
+                // Check if unicode regex is supported, otherwise fallback to calling mask function on this token
+                if (unicodeRegex && currencyRegex !== null) {
+                    // Do not redact information if the token contains a currency symbol
+                    token = token.match(currencyRegex) ? token : token.replace(letterRegex, "\u2022" /* Data.Constant.Letter */).replace(digitRegex, "\u2022" /* Data.Constant.Digit */);
+                }
+                else {
+                    token = mask(token);
+                }
+                // Merge token back into array at the right place
+                array.splice(spaceIndex + 1 - gap, token.length, token);
+                gap += token.length - 1;
             }
             // Reset digit and email flags after every word boundary, except the beginning of string
             if (hasWhitespace) {
@@ -689,11 +719,6 @@ function redact(value) {
         }
     }
     return array ? array.join("" /* Data.Constant.Empty */) : value;
-}
-function mutate(array, start, end) {
-    for (var i = start + 1; i < end; i++) {
-        array[i] = "\u2022" /* Data.Constant.Mask */;
-    }
 }
 
 var history$5 = [];
@@ -714,12 +739,15 @@ function check$4(id, target, input) {
     }
 }
 
-var TAGS = ["DIV", "TR", "P", "LI", "UL", "A", "BUTTON"];
-function selector (input, beta) {
-    if (beta === void 0) { beta = false; }
+var excludeClassNames = "load,active,fixed,visible,focus,show,collaps,animat" /* Constant.ExcludeClassNames */.split("," /* Constant.Comma */);
+var selectorMap = {};
+function reset$k() {
+    selectorMap = {};
+}
+function get$1(input, type) {
     var a = input.attributes;
-    var prefix = input.prefix ? input.prefix[beta ? 1 /* Selector.Beta */ : 0 /* Selector.Stable */] : null;
-    var suffix = beta || ((a && !("class" /* Constant.Class */ in a)) || TAGS.indexOf(input.tag) >= 0) ? ":nth-of-type(".concat(input.position, ")") : "" /* Constant.Empty */;
+    var prefix = input.prefix ? input.prefix[type] : null;
+    var suffix = type === 0 /* Selector.Alpha */ ? "".concat("~" /* Constant.Tilde */).concat(input.position - 1) : ":nth-of-type(".concat(input.position, ")");
     switch (input.tag) {
         case "STYLE":
         case "TITLE":
@@ -734,23 +762,33 @@ function selector (input, beta) {
             if (prefix === null) {
                 return "" /* Constant.Empty */;
             }
-            prefix = "".concat(prefix, ">");
+            prefix = "".concat(prefix).concat(">" /* Constant.Separator */);
             input.tag = input.tag.indexOf("svg:" /* Constant.SvgPrefix */) === 0 ? input.tag.substr("svg:" /* Constant.SvgPrefix */.length) : input.tag;
             var selector = "".concat(prefix).concat(input.tag).concat(suffix);
-            var classes = "class" /* Constant.Class */ in a && a["class" /* Constant.Class */].length > 0 ? a["class" /* Constant.Class */].trim().split(/\s+/) : null;
-            if (beta) {
-                // In beta mode, update selector to use "id" field when available. There are two exceptions:
-                // (1) if "id" appears to be an auto generated string token, e.g. guid or a random id containing digits
-                // (2) if "id" appears inside a shadow DOM, in which case we continue to prefix up to shadow DOM to prevent conflicts
-                var id = "id" /* Constant.Id */ in a && a["id" /* Constant.Id */].length > 0 ? a["id" /* Constant.Id */] : null;
-                classes = input.tag !== "BODY" /* Constant.BodyTag */ && classes ? classes.filter(function (c) { return !hasDigits(c); }) : [];
-                selector = classes.length > 0 ? "".concat(prefix).concat(input.tag, ".").concat(classes.join(".")).concat(suffix) : selector;
-                selector = id && hasDigits(id) === false ? "".concat(getDomPrefix(prefix), "#").concat(id) : selector;
-            }
-            else {
-                // Otherwise, fallback to stable mode, where we include class names as part of the selector
-                selector = classes ? "".concat(prefix).concat(input.tag, ".").concat(classes.join(".")).concat(suffix) : selector;
+            var id = "id" /* Constant.Id */ in a && a["id" /* Constant.Id */].length > 0 ? a["id" /* Constant.Id */] : null;
+            var classes = input.tag !== "BODY" /* Constant.BodyTag */ && "class" /* Constant.Class */ in a && a["class" /* Constant.Class */].length > 0 ? a["class" /* Constant.Class */].trim().split(/\s+/).filter(function (c) { return filter(c); }).join("." /* Constant.Period */) : null;
+            if (classes && classes.length > 0) {
+                if (type === 0 /* Selector.Alpha */) {
+                    // In Alpha mode, update selector to use class names, with relative positioning within the parent id container.
+                    // If the node has valid class name(s) then drop relative positioning within the parent path to keep things simple.
+                    var key = "".concat(getDomPath(prefix)).concat(input.tag).concat("." /* Constant.Dot */).concat(classes);
+                    if (!(key in selectorMap)) {
+                        selectorMap[key] = [];
+                    }
+                    if (selectorMap[key].indexOf(input.id) < 0) {
+                        selectorMap[key].push(input.id);
+                    }
+                    selector = "".concat(key).concat("~" /* Constant.Tilde */).concat(selectorMap[key].indexOf(input.id));
+                }
+                else {
+                    // In Beta mode, we continue to look at query selectors in context of the full page
+                    selector = "".concat(prefix).concat(input.tag, ".").concat(classes).concat(suffix);
+                }
             }
+            // Update selector to use "id" field when available. There are two exceptions:
+            // (1) if "id" appears to be an auto generated string token, e.g. guid or a random id containing digits
+            // (2) if "id" appears inside a shadow DOM, in which case we continue to prefix up to shadow DOM to prevent conflicts
+            selector = id && filter(id) ? "".concat(getDomPrefix(prefix)).concat("#" /* Constant.Hash */).concat(id) : selector;
             return selector;
     }
 }
@@ -759,22 +797,42 @@ function getDomPrefix(prefix) {
     var iframeDomStart = prefix.lastIndexOf("".concat("iframe:" /* Constant.IFramePrefix */).concat("HTML" /* Constant.HTML */));
     var domStart = Math.max(shadowDomStart, iframeDomStart);
     if (domStart < 0) {
-        return "";
+        return "" /* Constant.Empty */;
+    }
+    return prefix.substring(0, prefix.indexOf(">" /* Constant.Separator */, domStart) + 1);
+}
+function getDomPath(input) {
+    var parts = input.split(">" /* Constant.Separator */);
+    for (var i = 0; i < parts.length; i++) {
+        var tIndex = parts[i].indexOf("~" /* Constant.Tilde */);
+        var dIndex = parts[i].indexOf("." /* Constant.Dot */);
+        parts[i] = parts[i].substring(0, dIndex > 0 ? dIndex : (tIndex > 0 ? tIndex : parts[i].length));
     }
-    var domEnd = prefix.indexOf(">", domStart) + 1;
-    return prefix.substr(0, domEnd);
+    return parts.join(">" /* Constant.Separator */);
 }
-// Check if the given input string has digits or not
-function hasDigits(value) {
+// Check if the given input string has digits or excluded class names
+function filter(value) {
+    if (!value) {
+        return false;
+    } // Do not process empty strings
+    if (excludeClassNames.some(function (x) { return value.toLowerCase().indexOf(x) >= 0; })) {
+        return false;
+    }
     for (var i = 0; i < value.length; i++) {
         var c = value.charCodeAt(i);
         if (c >= 48 /* Character.Zero */ && c <= 57 /* Character.Nine */) {
-            return true;
+            return false;
         }
     }
-    return false;
+    return true;
 }
 
+var selector = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    reset: reset$k,
+    get: get$1
+});
+
 // Track the start time to be able to compute duration at the end of the task
 var idleTimeout = 5000;
 var tracker = {};
@@ -1094,7 +1152,7 @@ function encode$4 (type, timer, ts) {
                                     }
                                     tokens.push(suspend ? "*M" /* Constant.SuspendMutationTag */ : data[key]);
                                     if (box && box.length === 2) {
-                                        tokens.push("".concat("#" /* Constant.Box */).concat(str$1(box[0]), ".").concat(str$1(box[1])));
+                                        tokens.push("".concat("#" /* Constant.Hash */).concat(str$1(box[0]), ".").concat(str$1(box[1])));
                                     }
                                     break;
                                 case "attributes":
@@ -1385,7 +1443,7 @@ function observe$8(root) {
     bind(root, "mousedown", mouse.bind(this, 13 /* Event.MouseDown */, root), true);
     bind(root, "mouseup", mouse.bind(this, 14 /* Event.MouseUp */, root), true);
     bind(root, "mousemove", mouse.bind(this, 12 /* Event.MouseMove */, root), true);
-    bind(root, "mousewheel", mouse.bind(this, 15 /* Event.MouseWheel */, root), true);
+    bind(root, "wheel", mouse.bind(this, 15 /* Event.MouseWheel */, root), true);
     bind(root, "dblclick", mouse.bind(this, 16 /* Event.DoubleClick */, root), true);
     bind(root, "touchstart", touch.bind(this, 17 /* Event.TouchStart */, root), true);
     bind(root, "touchend", touch.bind(this, 18 /* Event.TouchEnd */, root), true);
@@ -2319,6 +2377,7 @@ var override = [];
 var unmask = [];
 var updatedFragments = {};
 var maskText = [];
+var maskInput = [];
 var maskDisable = [];
 // The WeakMap object is a collection of key/value pairs in which the keys are weakly referenced
 var idMap = null; // Maps node => id.
@@ -2340,12 +2399,14 @@ function reset$7() {
     hashMap = {};
     override = [];
     unmask = [];
-    maskText = "password,secret,pass,social,ssn,name,code,dob,cell,mob,contact,hidden,account,cvv,ccv,email,tel,phone,address,addr,card,zip" /* Mask.Text */.split("," /* Constant.Comma */);
+    maskText = "address,password,contact" /* Mask.Text */.split("," /* Constant.Comma */);
+    maskInput = "password,secret,pass,social,ssn,name,code,dob,cell,mob,contact,hidden,account,cvv,ccv,email,tel,phone,address,addr,card,zip" /* Mask.Input */.split("," /* Constant.Comma */);
     maskDisable = "radio,checkbox,range,button,reset,submit" /* Mask.Disable */.split("," /* Constant.Comma */);
     idMap = new WeakMap();
     iframeMap = new WeakMap();
     privacyMap = new WeakMap();
     fraudMap = new WeakMap();
+    reset$k();
 }
 // We parse new root nodes for any regions or masked nodes in the beginning (document) and
 // later whenever there are new additions or modifications to DOM (mutations)
@@ -2522,36 +2583,36 @@ function privacy(node, value, parent) {
             metadata.privacy = 2 /* Privacy.Text */;
             break;
         case tag === "*T" /* Constant.TextTag */:
-            // If it's a text node belonging to a STYLE or TITLE tag or one of SCRUB_EXCEPTIONS, then capture content
+            // If it's a text node belonging to a STYLE or TITLE tag or one of scrub exceptions, then capture content
             var pTag = parent && parent.data ? parent.data.tag : "" /* Constant.Empty */;
-            var pSelector_1 = parent && parent.selector ? parent.selector[0 /* Selector.Stable */] : "" /* Constant.Empty */;
-            metadata.privacy = pTag === "STYLE" /* Constant.StyleTag */ || pTag === "TITLE" /* Constant.TitleTag */ || override.some(function (x) { return pSelector_1.indexOf(x) >= 0; }) ? 0 /* Privacy.None */ : current;
+            var pSelector_1 = parent && parent.selector ? parent.selector[1 /* Selector.Default */] : "" /* Constant.Empty */;
+            var tags = ["STYLE" /* Constant.StyleTag */, "TITLE" /* Constant.TitleTag */, "svg:style" /* Constant.SvgStyle */];
+            metadata.privacy = tags.includes(pTag) || override.some(function (x) { return pSelector_1.indexOf(x) >= 0; }) ? 0 /* Privacy.None */ : current;
             break;
         case "type" /* Constant.Type */ in attributes:
             // If this node has an explicit type assigned to it, go through masking rules to determine right privacy setting
-            metadata.privacy = inspect(attributes["type" /* Constant.Type */], metadata);
+            metadata.privacy = inspect(attributes["type" /* Constant.Type */], maskInput, metadata);
             break;
         case tag === "INPUT" /* Constant.InputTag */ && current === 0 /* Privacy.None */:
             // If even default privacy setting is to not mask, we still scan through input fields for any sensitive information
             var field_1 = "" /* Constant.Empty */;
             Object.keys(attributes).forEach(function (x) { return field_1 += attributes[x].toLowerCase(); });
-            metadata.privacy = inspect(field_1, metadata);
+            metadata.privacy = inspect(field_1, maskInput, metadata);
             break;
         case current === 1 /* Privacy.Sensitive */ && tag === "INPUT" /* Constant.InputTag */:
+            // Look through class names to aggressively mask content
+            metadata.privacy = inspect(attributes["class" /* Constant.Class */], maskText, metadata);
             // If it's a button or an input option, make an exception to disable masking
             metadata.privacy = maskDisable.indexOf(attributes["type" /* Constant.Type */]) >= 0 ? 0 /* Privacy.None */ : current;
             break;
         case current === 1 /* Privacy.Sensitive */:
             // In a mode where we mask sensitive information by default, look through class names to aggressively mask content
-            metadata.privacy = inspect(attributes["class" /* Constant.Class */], metadata);
-            break;
-        default:
-            metadata.privacy = parent ? parent.metadata.privacy : metadata.privacy;
+            metadata.privacy = inspect(attributes["class" /* Constant.Class */], maskText, metadata);
             break;
     }
 }
-function inspect(input, metadata) {
-    if (input && maskText.some(function (x) { return input.indexOf(x) >= 0; })) {
+function inspect(input, lookup, metadata) {
+    if (input && lookup.some(function (x) { return input.indexOf(x) >= 0; })) {
         return 2 /* Privacy.Text */;
     }
     return metadata.privacy;
@@ -2589,10 +2650,11 @@ function updateSelector(value) {
     var prefix = parent ? parent.selector : null;
     var d = value.data;
     var p = position(parent, value);
-    var s = { tag: d.tag, prefix: prefix, position: p, attributes: d.attributes };
-    value.selector = [selector(s), selector(s, true)];
+    var s = { id: value.id, tag: d.tag, prefix: prefix, position: p, attributes: d.attributes };
+    value.selector = [get$1(s, 0 /* Selector.Alpha */), get$1(s, 1 /* Selector.Beta */)];
     value.hash = value.selector.map(function (x) { return x ? hash(x) : null; });
     value.hash.forEach(function (h) { return hashMap[h] = value.id; });
+    // Match fragment configuration against both alpha and beta hash
     if (value.hash.some(function (h) { return fragments.indexOf(h) !== -1; })) {
         value.fragment = value.id;
     }
@@ -3136,7 +3198,7 @@ function queue(tokens, transmit) {
         // We enrich the data going out with the existing upload. In these cases, call to upload comes with 'transmit' set to false.
         if (transmit && timeout === null) {
             if (type !== 25 /* Event.Ping */) {
-                reset$m();
+                reset$n();
             }
             timeout = setTimeout(upload, gap);
             queuedTime = now;
@@ -3591,7 +3653,7 @@ function encode$1 (event) {
                 tokens.push(b.data.activityTime);
                 queue(tokens, false);
             }
-            reset$o();
+            reset$p();
             break;
         case 25 /* Event.Ping */:
             tokens.push(data$h.gap);
@@ -3624,7 +3686,7 @@ function encode$1 (event) {
                     tokens.push(v);
                     tokens.push(data$e[v]);
                 }
-                reset$k();
+                reset$l();
                 queue(tokens, false);
             }
             break;
@@ -3639,7 +3701,7 @@ function encode$1 (event) {
                     // However, for data over the wire, we round it off to milliseconds precision.
                     tokens.push(Math.round(updates$3[m]));
                 }
-                reset$n();
+                reset$o();
                 queue(tokens, false);
             }
             break;
@@ -3665,7 +3727,7 @@ function encode$1 (event) {
                     tokens.push(key);
                     tokens.push([].concat.apply([], data$g[e]));
                 }
-                reset$l();
+                reset$m();
                 queue(tokens, false);
             }
             break;

package/package.json

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

package/src/core/scrub.ts

@@ -2,6 +2,12 @@ import { Privacy } from "@clarity-types/core";
 import * as Data from "@clarity-types/data";
 import * as Layout from "@clarity-types/layout";
 
+const catchallRegex = /\S/gi;
+let unicodeRegex = true;
+let digitRegex = null;
+let letterRegex = null;
+let currencyRegex = null;
+
 export default function(value: string, hint: string, privacy: Privacy, mangle: boolean = false): string {
     if (value) {
         switch (privacy) {
@@ -12,9 +18,9 @@ export default function(value: string, hint: string, privacy: Privacy, mangle: b
                     case Layout.Constant.TextTag:
                     case "value":
                     case "placeholder":
-                        return redact(value);
+                    case "click":
                     case "input":
-                        return mangleToken(value);
+                        return redact(value);
                 }
                 return value;
             case Privacy.Text:
@@ -53,7 +59,7 @@ function mangleText(value: string): string {
 }
 
 function mask(value: string): string {
-    return value.replace(/\S/gi, Data.Constant.Mask);
+    return value.replace(catchallRegex, Data.Constant.Mask);
 }
 
 function mangleToken(value: string): string {
@@ -67,10 +73,22 @@ function mangleToken(value: string): string {
 
 function redact(value: string): string {
     let spaceIndex = -1;
+    let gap = 0;
     let hasDigit = false;
     let hasEmail = false;
     let hasWhitespace = false;
     let array = null;
+
+    // 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) {
+        try {
+            digitRegex = new RegExp("\\p{N}", "gu");
+            letterRegex = new RegExp("\\p{L}", "gu");
+            currencyRegex = new RegExp("\\p{Sc}", "gu");
+        } catch { unicodeRegex = false; }
+    }
+
     for (let i = 0; i < value.length; i++) {
         let c = value.charCodeAt(i);
         hasDigit = hasDigit || (c >= Data.Character.Zero && c <= Data.Character.Nine); // Check for digits in the current word
@@ -82,7 +100,18 @@ function redact(value: string): string {
             // Performance optimization: Lazy load string -> array conversion only when required
             if (hasDigit || hasEmail) {
                 if (array === null) { array = value.split(Data.Constant.Empty); }
-                mutate(array, spaceIndex, hasWhitespace ? i : i + 1);
+                // Work on a token at a time so we don't have to apply regex to a larger string
+                let token = value.substring(spaceIndex + 1, hasWhitespace ? i : i + 1);
+                // Check if unicode regex is supported, otherwise fallback to calling mask function on this token
+                if (unicodeRegex && currencyRegex !== null) {
+                    // Do not redact information if the token contains a currency symbol
+                    token = token.match(currencyRegex) ? token : token.replace(letterRegex, Data.Constant.Letter).replace(digitRegex, Data.Constant.Digit);
+                } else {
+                    token = mask(token);
+                }
+                // Merge token back into array at the right place
+                array.splice(spaceIndex + 1 - gap, token.length, token);
+                gap += token.length - 1;
             }
             // Reset digit and email flags after every word boundary, except the beginning of string
             if (hasWhitespace) {
@@ -94,9 +123,3 @@ function redact(value: string): string {
     }
     return array ? array.join(Data.Constant.Empty) : value;
 }
-
-function mutate(array: string[], start: number, end: number): void {
-    for (let i = start + 1; i < end; i++) {
-        array[i] = Data.Constant.Mask;
-    }
-}

package/src/core/version.ts

@@ -1,2 +1,2 @@
-let version = "0.6.37";
+let version = "0.6.40";
 export default version;

package/src/index.ts

@@ -1,6 +1,6 @@
 import * as clarity from "./clarity";
 import hash from "./core/hash";
-import selector from "./layout/selector";
+import * as selector from "./layout/selector";
 import { get, getNode, lookup } from "./layout/dom";
 
 const helper = { hash, selector, get, getNode, lookup }

package/src/interaction/pointer.ts

@@ -20,7 +20,7 @@ export function observe(root: Node): void {
     bind(root, "mousedown", mouse.bind(this, Event.MouseDown, root), true);
     bind(root, "mouseup", mouse.bind(this, Event.MouseUp, root), true);
     bind(root, "mousemove", mouse.bind(this, Event.MouseMove, root), true);
-    bind(root, "mousewheel", mouse.bind(this, Event.MouseWheel, root), true);
+    bind(root, "wheel", mouse.bind(this, Event.MouseWheel, root), true);
     bind(root, "dblclick", mouse.bind(this, Event.DoubleClick, root), true);
     bind(root, "touchstart", touch.bind(this, Event.TouchStart, root), true);
     bind(root, "touchend", touch.bind(this, Event.TouchEnd, root), true);