expensify-common 2.0.13 → 2.0.15

package/dist/API.js

@@ -1,18 +1,41 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * ----------------------------------------------------------------------------------------------
  * WIP, This is in the process of migration from web-e. Please add methods to this as is needed.|
  * ----------------------------------------------------------------------------------------------
  */
-const underscore_1 = __importDefault(require("underscore"));
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 // Use this deferred lib so we don't have a dependency on jQuery (so we can use this module in mobile)
 const simply_deferred_1 = require("simply-deferred");
+const lodash_1 = require("lodash");
 const APIDeferred_1 = __importDefault(require("./APIDeferred"));
-const utils_1 = require("./utils");
+const Utils = __importStar(require("./utils"));
 /**
  * @param {Network} network
  * @param {Object} [args]
@@ -40,14 +63,14 @@ function API(network, args) {
      * Returns a promise that is rejected if a change is detected
      * Otherwise, it is resolved successfully
      *
-     * @returns {Object} $.Deferred
+     * @returns {Object} Deferred
      */
     function isRunningLatestVersionOfCode() {
         const promise = new simply_deferred_1.Deferred();
         network
             .get('/revision.txt')
             .done((codeRevision) => {
-            if ((0, utils_1.isWindowAvailable)() && codeRevision.trim() === window.CODE_REVISION) {
+            if (Utils.isWindowAvailable() && codeRevision.trim() === window.CODE_REVISION) {
                 console.debug('Code revision is up to date');
                 promise.resolve();
             }
@@ -72,7 +95,7 @@ function API(network, args) {
      * @param {String} apiDeferred
      */
     function attachJSONCodeCallbacks(apiDeferred) {
-        (0, underscore_1.default)(defaultHandlers).each((callbacks, code) => {
+        Object.entries(defaultHandlers).forEach(([code, callbacks]) => {
             // The key, `code`, is returned as a string, so we must cast it to an Integer
             const jsonCode = parseInt(code, 10);
             callbacks.forEach((callback) => {
@@ -101,7 +124,7 @@ function API(network, args) {
     function performPOSTRequest(command, parameters, returnedPropertyName, keepalive, checkCodeRevision) {
         let newParameters = Object.assign(Object.assign({}, parameters), { command });
         // If there was an enhanceParameters() method supplied in our args, then we will call that here
-        if (args && underscore_1.default.isFunction(args.enhanceParameters)) {
+        if (args && Utils.isFunction(args.enhanceParameters)) {
             newParameters = args.enhanceParameters(newParameters);
         }
         // We need to setup multiple promises here depending on our arguments. If there is no argument, then we will just
@@ -142,17 +165,18 @@ function API(network, args) {
     function requireParameters(parameterNames, parameters, commandName) {
         // eslint-disable-next-line rulesdir/prefer-early-return
         parameterNames.forEach((parameterName) => {
-            if (!(0, underscore_1.default)(parameters).has(parameterName) || parameters[parameterName] === null || parameters[parameterName] === undefined) {
-                const parametersCopy = underscore_1.default.clone(parameters);
-                if ((0, underscore_1.default)(parametersCopy).has('authToken')) {
-                    parametersCopy.authToken = '<redacted>';
-                }
-                if ((0, underscore_1.default)(parametersCopy).has('password')) {
-                    parametersCopy.password = '<redacted>';
-                }
-                const keys = (0, underscore_1.default)(parametersCopy).keys().join(', ') || 'none';
-                throw new Error(`Parameter ${parameterName} is required for "${commandName}". Supplied parameters: ${keys}`);
+            if ((0, lodash_1.has)(parameters, parameterName) && parameters[parameterName] !== null && parameters[parameterName] !== undefined) {
+                return;
+            }
+            const parametersCopy = Object.assign({}, parameters);
+            if ((0, lodash_1.has)(parametersCopy, 'authToken')) {
+                parametersCopy.authToken = '<redacted>';
+            }
+            if ((0, lodash_1.has)(parametersCopy, 'password')) {
+                parametersCopy.password = '<redacted>';
             }
+            const keys = Object.keys(parametersCopy).join(', ') || 'none';
+            throw new Error(`Parameter ${parameterName} is required for "${commandName}". Supplied parameters: ${keys}`);
         });
     }
     return {
@@ -161,7 +185,7 @@ function API(network, args) {
          * @param  {Function} callback
          */
         registerDefaultHandler(jsonCodes, callback) {
-            if (!(0, underscore_1.default)(callback).isFunction()) {
+            if (!Utils.isFunction(callback)) {
                 return;
             }
             jsonCodes.forEach((jsonCode) => {
@@ -213,7 +237,7 @@ function API(network, args) {
             }
             return (parameters, keepalive = false) => {
                 // Optional validate function for required logic before making the call. e.g. validating params in the front-end etc.
-                if (underscore_1.default.isFunction(data.validate)) {
+                if (Utils.isFunction(data.validate)) {
                     data.validate(parameters);
                 }
                 requireParameters(data.requireParameters || [], parameters, data.commandName);
@@ -243,7 +267,7 @@ function API(network, args) {
             const commandName = 'GetAccountStatus';
             requireParameters(['email'], parameters, commandName);
             // Tell the API not to set cookies for this request
-            const newParameters = underscore_1.default.extend({ api_setCookie: false }, parameters);
+            const newParameters = Object.assign(Object.assign({}, parameters), { api_setCookie: false });
             return performPOSTRequest(commandName, newParameters);
         },
         /**
@@ -387,7 +411,7 @@ function API(network, args) {
         resetPassword(parameters) {
             const commandName = 'ResetPassword';
             requireParameters(['email'], parameters, commandName);
-            const newParameters = underscore_1.default.extend({ api_setCookie: false }, parameters);
+            const newParameters = Object.assign(Object.assign({}, parameters), { api_setCookie: false });
             return performPOSTRequest(commandName, newParameters);
         },
         /**

package/dist/APIDeferred.js

@@ -1,15 +1,36 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * ----------------------------------------------------------------------------------------------
  * WIP, This is in the process of migration from web-e. Please add methods to this as is needed.|
  * ----------------------------------------------------------------------------------------------
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const underscore_1 = __importDefault(require("underscore"));
-const Func_1 = require("./Func");
+const lodash_1 = require("lodash");
+const Utils = __importStar(require("./utils"));
+const Func = __importStar(require("./Func"));
 /**
  * @param {jquery.Deferred} promise
  * @param {String} [extractedProperty]
@@ -50,15 +71,15 @@ function APIDeferred(promise, extractedProperty) {
     function handleError(jsonCode, response) {
         // Look for handlers for this error code
         const handlers = errorHandlers[jsonCode];
-        if (!(0, underscore_1.default)(handlers).isEmpty()) {
-            (0, Func_1.bulkInvoke)(handlers, [jsonCode, response]);
+        if (handlers.length > 0) {
+            Func.bulkInvoke(handlers, [jsonCode, response]);
         }
         else {
             // No explicit handlers, call the unhandled callbacks
-            (0, Func_1.bulkInvoke)(unhandledCallbacks, [jsonCode, response]);
+            Func.bulkInvoke(unhandledCallbacks, [jsonCode, response]);
         }
         // Always run the "fail" callbacks in case of error
-        (0, Func_1.bulkInvoke)(failCallbacks, [jsonCode, response]);
+        Func.bulkInvoke(failCallbacks, [jsonCode, response]);
     }
     /**
      * Called when network call succeeds or when a callback is added via any of the following methods after the promise is resolved:
@@ -71,8 +92,8 @@ function APIDeferred(promise, extractedProperty) {
         let returnedData;
         // Figure out if we need to extract a property from the response, and if it is there.
         const jsonCode = extractJSONCode(response);
-        const propertyRequested = !underscore_1.default.isNull(extractedPropertyName);
-        const requestedPropertyPresent = propertyRequested && response && !underscore_1.default.isUndefined(response[extractedPropertyName]);
+        const propertyRequested = !Number.isNull(extractedPropertyName);
+        const requestedPropertyPresent = propertyRequested && response && response[extractedPropertyName] !== undefined;
         const propertyRequestedButMissing = propertyRequested && !requestedPropertyPresent;
         // Save the response for any callbacks that might run in the future
         cachedResponse = response;
@@ -81,9 +102,9 @@ function APIDeferred(promise, extractedProperty) {
             // Get the data that was requested
             returnedData = propertyRequested && requestedPropertyPresent ? response[extractedPropertyName] : response;
             // And then run the success callbacks
-            (0, Func_1.bulkInvoke)(doneCallbacks, [returnedData]);
+            Func.bulkInvoke(doneCallbacks, [returnedData]);
         }
-        else if (!(0, underscore_1.default)(jsonCode).isNull() && jsonCode !== 200) {
+        else if (jsonCode !== null && jsonCode !== 200) {
             // Exception thrown, handle it
             handleError(jsonCode, response);
         }
@@ -98,7 +119,7 @@ function APIDeferred(promise, extractedProperty) {
             }
         }
         // Always run the "always" callbacks
-        (0, Func_1.bulkInvoke)(alwaysCallbacks, [response]);
+        Func.bulkInvoke(alwaysCallbacks, [response]);
     }
     /**
      * Re-runs the "done" flow with a saved response to ensure that all callbacks are invoked,
@@ -125,8 +146,8 @@ function APIDeferred(promise, extractedProperty) {
          * @returns {APIDeferred} itself, for chaining
          */
         done(callback) {
-            if ((0, underscore_1.default)(callback).isFunction()) {
-                doneCallbacks.push((0, underscore_1.default)(callback).once());
+            if (Utils.isFunction(callback)) {
+                doneCallbacks.push((0, lodash_1.once)(callback));
                 ensureFutureCallbacksFire();
             }
             return this;
@@ -139,8 +160,8 @@ function APIDeferred(promise, extractedProperty) {
          * @returns {APIDeferred} itself, for chaining
          */
         always(callback) {
-            if ((0, underscore_1.default)(callback).isFunction()) {
-                alwaysCallbacks.push((0, underscore_1.default)(callback).once());
+            if (Utils.isFunction(callback)) {
+                alwaysCallbacks.push((0, lodash_1.once)(callback));
                 ensureFutureCallbacksFire();
             }
             return this;
@@ -155,7 +176,7 @@ function APIDeferred(promise, extractedProperty) {
          * @returns {APIDeferred} itself, for chaining
          */
         handle(jsonCodes, callback) {
-            if ((0, underscore_1.default)(callback).isFunction()) {
+            if (Utils.isFunction(callback)) {
                 jsonCodes.forEach((code) => {
                     if (code === 200) {
                         return;
@@ -163,7 +184,7 @@ function APIDeferred(promise, extractedProperty) {
                     if (!errorHandlers[code]) {
                         errorHandlers[code] = [];
                     }
-                    errorHandlers[code].push((0, underscore_1.default)(callback).once());
+                    errorHandlers[code].push((0, lodash_1.once)(callback));
                 });
                 ensureFutureCallbacksFire();
             }
@@ -177,8 +198,8 @@ function APIDeferred(promise, extractedProperty) {
          * @returns {APIDeferred} itself, for chaining
          */
         unhandled(callback) {
-            if ((0, underscore_1.default)(callback).isFunction()) {
-                unhandledCallbacks.push((0, underscore_1.default)(callback).once());
+            if (Utils.isFunction(callback)) {
+                unhandledCallbacks.push((0, lodash_1.once)(callback));
                 ensureFutureCallbacksFire();
             }
             return this;
@@ -192,8 +213,8 @@ function APIDeferred(promise, extractedProperty) {
          * @returns {APIDeferred} itself, for chaining
          */
         fail(callback) {
-            if ((0, underscore_1.default)(callback).isFunction()) {
-                failCallbacks.push((0, underscore_1.default)(callback).once());
+            if (Utils.isFunction(callback)) {
+                failCallbacks.push((0, lodash_1.once)(callback));
                 ensureFutureCallbacksFire();
             }
             return this;
@@ -208,10 +229,10 @@ function APIDeferred(promise, extractedProperty) {
         then(callback) {
             return promise.then((response) => {
                 const responseCode = extractJSONCode(response);
-                if (responseCode !== 200 || !(0, underscore_1.default)(callback).isFunction()) {
+                if (responseCode !== 200 || !Utils.isFunction(callback)) {
                     return;
                 }
-                (0, Func_1.invoke)(callback, [response]);
+                Func.invoke(callback, [response]);
                 return this;
             });
         },

package/dist/BrowserDetect.js

@@ -1,6 +1,29 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("./utils");
+const Utils = __importStar(require("./utils"));
 const BROWSERS = {
     EDGE: 'Edge',
     CHROME: 'Chrome',
@@ -14,7 +37,7 @@ const MOBILE_PLATFORMS = {
     android: 'android',
 };
 function searchString() {
-    if (!(0, utils_1.isWindowAvailable)() || !(0, utils_1.isNavigatorAvailable)()) {
+    if (!Utils.isWindowAvailable() || !Utils.isNavigatorAvailable()) {
         return '';
     }
     const data = [
@@ -75,7 +98,7 @@ function searchString() {
     return '';
 }
 function getMobileDevice() {
-    if (!(0, utils_1.isNavigatorAvailable)() || !navigator.userAgent) {
+    if (!Utils.isNavigatorAvailable() || !navigator.userAgent) {
         return '';
     }
     const data = [

package/dist/CONST.d.ts

@@ -756,22 +756,22 @@ declare const CONST: {
         readonly TOO_LIMITED: {
             readonly id: "tooLimited";
             readonly label: "Functionality needs improvement";
-            readonly prompt: "What software are you migrating to and what led to this decision?";
+            readonly prompt: "What software are you moving to and why?";
         };
         readonly TOO_EXPENSIVE: {
             readonly id: "tooExpensive";
             readonly label: "Too expensive";
-            readonly prompt: "What software are you migrating to and what led to this decision?";
+            readonly prompt: "What software are you moving to and why?";
         };
         readonly INADEQUATE_SUPPORT: {
             readonly id: "inadequateSupport";
             readonly label: "Inadequate customer support";
-            readonly prompt: "What software are you migrating to and what led to this decision?";
+            readonly prompt: "What software are you moving to and why?";
         };
         readonly BUSINESS_CLOSING: {
             readonly id: "businessClosing";
             readonly label: "Company closing, downsizing, or acquired";
-            readonly prompt: "What software are you migrating to and what led to this decision?";
+            readonly prompt: "What software are you moving to and why?";
         };
     };
 };

package/dist/CONST.js

@@ -799,22 +799,22 @@ const CONST = {
         TOO_LIMITED: {
             id: 'tooLimited',
             label: 'Functionality needs improvement',
-            prompt: 'What software are you migrating to and what led to this decision?',
+            prompt: 'What software are you moving to and why?',
         },
         TOO_EXPENSIVE: {
             id: 'tooExpensive',
             label: 'Too expensive',
-            prompt: 'What software are you migrating to and what led to this decision?',
+            prompt: 'What software are you moving to and why?',
         },
         INADEQUATE_SUPPORT: {
             id: 'inadequateSupport',
             label: 'Inadequate customer support',
-            prompt: 'What software are you migrating to and what led to this decision?',
+            prompt: 'What software are you moving to and why?',
         },
         BUSINESS_CLOSING: {
             id: 'businessClosing',
             label: 'Company closing, downsizing, or acquired',
-            prompt: 'What software are you migrating to and what led to this decision?',
+            prompt: 'What software are you moving to and why?',
         },
     },
 };

package/dist/ExpenseRule.js

@@ -1,9 +1,5 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const underscore_1 = __importDefault(require("underscore"));
 class ExpenseRule {
     /**
      * Creates a new instance of this class.
@@ -11,7 +7,7 @@ class ExpenseRule {
      * @param {Array} ruleArray
      */
     constructor(ruleArray) {
-        underscore_1.default.each(ruleArray, (value, key) => {
+        ruleArray.forEach((value, key) => {
             this[key] = value;
         });
     }
@@ -24,7 +20,7 @@ class ExpenseRule {
      * @return {Object}
      */
     getApplyWhenByField(field) {
-        return underscore_1.default.find(this.applyWhen, (conditions) => conditions.field === field) || {};
+        return this.applyWhen.find((conditions) => conditions.field === field) || {};
     }
     /**
      * Get the externalID saved deep in the tax field
@@ -42,7 +38,7 @@ class ExpenseRule {
      */
     isMatch(expense) {
         let isMatch = true;
-        underscore_1.default.each(this.applyWhen, (conditions) => {
+        this.applyWhen.forEach((conditions) => {
             switch (conditions.field) {
                 case 'category':
                     if (!this.checkCondition(conditions.condition, conditions.value, expense.getCategory())) {

package/dist/ExpensiMark.js

@@ -26,11 +26,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const _ = __importStar(require("underscore"));
 const str_1 = __importDefault(require("./str"));
 const Constants = __importStar(require("./CONST"));
 const UrlPatterns = __importStar(require("./Url"));
 const Logger_1 = __importDefault(require("./Logger"));
+const Utils = __importStar(require("./utils"));
 const MARKDOWN_LINK_REGEX = new RegExp(`\\[([^\\][]*(?:\\[[^\\][]*][^\\][]*)*)]\\(${UrlPatterns.MARKDOWN_URL_REGEX}\\)(?![^<]*(<\\/pre>|<\\/code>))`, 'gi');
 const MARKDOWN_IMAGE_REGEX = new RegExp(`\\!(?:\\[([^\\][]*(?:\\[[^\\][]*][^\\][]*)*)])?\\(${UrlPatterns.MARKDOWN_URL_REGEX}\\)(?![^<]*(<\\/pre>|<\\/code>))`, 'gi');
 const SLACK_SPAN_NEW_LINE_TAG = '<span class="c-mrkdwn__br" data-stringify-type="paragraph-break" style="box-sizing: inherit; display: block; height: unset;"></span>';
@@ -426,27 +426,21 @@ class ExpensiMark {
                         .trim()
                         .split('\n');
                     // Wrap each string in the array with <blockquote> and </blockquote>
-                    // Define a named function to wrap each line with blockquote
-                    function wrapWithBlockquote(line) {
+                    resultString = resultString.map((line) => {
                         return `<blockquote>${line}</blockquote>`;
-                    }
-                    // Use _.map with the named function
-                    resultString = _.map(resultString, wrapWithBlockquote);
-                    function processString(m) {
-                        // Recursive function to replace nested <blockquote> with ">"
-                        function replaceBlockquotes(text) {
-                            let modifiedText = text;
-                            let depth;
-                            do {
-                                depth = (modifiedText.match(/<blockquote>/gi) || []).length;
-                                modifiedText = modifiedText.replace(/<blockquote>/gi, '');
-                                modifiedText = modifiedText.replace(/<\/blockquote>/gi, '');
-                            } while (/<blockquote>/i.test(modifiedText));
-                            return `${'>'.repeat(depth)} ${modifiedText}`;
-                        }
-                        return replaceBlockquotes(m);
-                    }
-                    resultString = _.map(resultString, processString).join('\n');
+                    });
+                    resultString = resultString
+                        .map((text) => {
+                        let modifiedText = text;
+                        let depth;
+                        do {
+                            depth = (modifiedText.match(/<blockquote>/gi) || []).length;
+                            modifiedText = modifiedText.replace(/<blockquote>/gi, '');
+                            modifiedText = modifiedText.replace(/<\/blockquote>/gi, '');
+                        } while (/<blockquote>/i.test(modifiedText));
+                        return `${'>'.repeat(depth)} ${modifiedText}`;
+                    })
+                        .join('\n');
                     // We want to keep <blockquote> tag here and let method replaceBlockElementWithNewLine to handle the line break later
                     return `<blockquote>${resultString}</blockquote>`;
                 },
@@ -591,12 +585,12 @@ class ExpensiMark {
          * @param {Object} rule - The rule to check.
          * @returns {boolean} Returns true if the rule should be applied, otherwise false.
          */
-        this.filterRules = (rule) => !_.includes(this.whitespaceRulesToDisable, rule.name);
+        this.filterRules = (rule) => !this.whitespaceRulesToDisable.includes(rule.name);
         /**
          * Filters rules to determine which should keep whitespace.
          * @returns {Object[]} The filtered rules.
          */
-        this.shouldKeepWhitespaceRules = _.filter(this.rules, this.filterRules);
+        this.shouldKeepWhitespaceRules = this.rules.filter(this.filterRules);
         /**
          * maxQuoteDepth is the maximum depth of nested quotes that we want to support.
          * @type {Number}
@@ -610,16 +604,16 @@ class ExpensiMark {
     }
     getHtmlRuleset(filterRules, disabledRules, shouldKeepRawInput) {
         let rules = this.rules;
-        const hasRuleName = (rule) => _.contains(filterRules, rule.name);
-        const hasDisabledRuleName = (rule) => !_.contains(disabledRules, rule.name);
+        const hasRuleName = (rule) => filterRules.includes(rule.name);
+        const hasDisabledRuleName = (rule) => !disabledRules.includes(rule.name);
         if (shouldKeepRawInput) {
             rules = this.shouldKeepWhitespaceRules;
         }
-        if (!_.isEmpty(filterRules)) {
-            rules = _.filter(this.rules, hasRuleName);
+        if (filterRules.length > 0) {
+            rules = this.rules.filter(hasRuleName);
         }
-        if (!_.isEmpty(disabledRules)) {
-            rules = _.filter(rules, hasDisabledRuleName);
+        if (disabledRules.length > 0) {
+            rules = rules.filter(hasDisabledRuleName);
         }
         return rules;
     }
@@ -638,7 +632,7 @@ class ExpensiMark {
      */
     replace(text, { filterRules = [], shouldEscapeText = true, shouldKeepRawInput = false, disabledRules = [] } = {}) {
         // This ensures that any html the user puts into the comment field shows as raw html
-        let replacedText = shouldEscapeText ? _.escape(text) : text;
+        let replacedText = shouldEscapeText ? Utils.escape(text) : text;
         const rules = this.getHtmlRuleset(filterRules, disabledRules, shouldKeepRawInput);
         const processRule = (rule) => {
             // Pre-process text before applying regex
@@ -664,7 +658,7 @@ class ExpensiMark {
             // eslint-disable-next-line no-console
             console.warn('Error replacing text with html in ExpensiMark.replace', { error: e });
             // We want to return text without applying rules if exception occurs during replacing
-            return shouldEscapeText ? _.escape(text) : text;
+            return shouldEscapeText ? Utils.escape(text) : text;
         }
         return replacedText;
     }
@@ -817,7 +811,7 @@ class ExpensiMark {
         // eslint-disable-next-line max-len
         let splitText = htmlString.split(/<div.*?>|<\/div>|<comment.*?>|\n<\/comment>|<\/comment>|<h1>|<\/h1>|<h2>|<\/h2>|<h3>|<\/h3>|<h4>|<\/h4>|<h5>|<\/h5>|<h6>|<\/h6>|<p>|<\/p>|<li>|<\/li>|<blockquote>|<\/blockquote>/);
         const stripHTML = (text) => str_1.default.stripHTML(text);
-        splitText = _.map(splitText, stripHTML);
+        splitText = splitText.map(stripHTML);
         let joinedText = '';
         // Delete whitespace at the end
         while (splitText.length) {
@@ -863,7 +857,7 @@ class ExpensiMark {
                 generatedMarkdown = rule.pre(generatedMarkdown);
             }
             // if replacement is a function, we want to pass optional extras to it
-            const replacementFunction = typeof rule.replacement === 'function' ? (...args) => rule.replacement(...args, extras) : rule.replacement;
+            const replacementFunction = Utils.isFunction(rule.replacement) ? (...args) => rule.replacement(...args, extras) : rule.replacement;
             generatedMarkdown = generatedMarkdown.replace(rule.regex, replacementFunction);
         };
         this.htmlToMarkdownRules.forEach(processRule);
@@ -881,7 +875,7 @@ class ExpensiMark {
         let replacedText = htmlString;
         const processRule = (rule) => {
             // if replacement is a function, we want to pass optional extras to it
-            const replacementFunction = typeof rule.replacement === 'function' ? (...args) => rule.replacement(...args, extras) : rule.replacement;
+            const replacementFunction = Utils.isFunction(rule.replacement) ? (...args) => rule.replacement(...args, extras) : rule.replacement;
             replacedText = replacedText.replace(rule.regex, replacementFunction);
         };
         this.htmlToTextRules.forEach(processRule);
@@ -966,7 +960,7 @@ class ExpensiMark {
                 }
                 return quoteContent;
             };
-            let textToFormat = _.map(textToCheck.split('\n'), formatRow).join('\n');
+            let textToFormat = textToCheck.split('\n').map(formatRow).join('\n');
             // Remove leading and trailing line breaks
             textToFormat = textToFormat.replace(/^\n+|\n+$/g, '');
             return replacement(textToFormat);
@@ -1019,7 +1013,7 @@ class ExpensiMark {
             const matches = [...htmlString.matchAll(regex)];
             // Element 1 from match is the regex group if it exists which contains the link URLs
             const sanitizeMatch = (match) => str_1.default.sanitizeURL(match[1]);
-            const links = _.map(matches, sanitizeMatch);
+            const links = matches.map(sanitizeMatch);
             return links;
         }
         catch (e) {
@@ -1038,7 +1032,7 @@ class ExpensiMark {
     getRemovedMarkdownLinks(oldComment, newComment) {
         const linksInOld = this.extractLinksInMarkdownComment(oldComment);
         const linksInNew = this.extractLinksInMarkdownComment(newComment);
-        return linksInOld === undefined || linksInNew === undefined ? [] : _.difference(linksInOld, linksInNew);
+        return linksInOld === undefined || linksInNew === undefined ? [] : linksInOld.filter((link) => !linksInNew.includes(link));
     }
     /**
      * Escapes the content of an HTML attribute value
@@ -1053,11 +1047,11 @@ class ExpensiMark {
         // When the attribute contains HTML and is converted back to MD we need to re-escape it to avoid
         // illegal attribute value characters like `," or ' which might break the HTML
         originalContent = str_1.default.replaceAll(originalContent, '\n', '');
-        return _.escape(originalContent);
+        return Utils.escape(originalContent);
     }
 }
 ExpensiMark.Log = new Logger_1.default({
-    serverLoggingCallback: _.noop,
+    serverLoggingCallback: () => { },
     // eslint-disable-next-line no-console
     clientLoggingCallback: (message) => console.warn(message),
     isDebug: true,

package/dist/Func.d.ts

@@ -16,9 +16,9 @@ export function invoke(callback: Function, args?: any[] | undefined, scope?: Obj
  * @param {Array} [args]
  * @param {Object} [scope]
  *
- * @returns {$.Deferred}
+ * @returns {Promise}
  */
-export function invokeAsync(callback: Function, args?: any[] | undefined, scope?: Object | undefined): $.Deferred;
+export function invokeAsync(callback: Function, args?: any[] | undefined, scope?: Object | undefined): Promise<any>;
 /**
  * Invokes all the given callbacks with the given arguments
  *