expensify-common 2.0.6 → 2.0.8

package/dist/ExpensiMark.d.ts

@@ -1,3 +1,5 @@
+import type Logger from './Logger';
+
 declare type Replacement = (...args: string[], extras?: ExtrasObject) => string;
 declare type Name =
     | 'codeFence'
@@ -39,6 +41,9 @@ declare type ExtrasObject = {
     accountIDToName?: Record<string, string>;
 };
 export default class ExpensiMark {
+    static Log: Logger;
+    static setLogger(logger: Logger): void;
+
     rules: Rule[];
     htmlToMarkdownRules: Rule[];
     htmlToTextRules: Rule[];

package/dist/ExpensiMark.js

@@ -30,11 +30,18 @@ const _ = __importStar(require("underscore"));
 const str_1 = __importDefault(require("./str"));
 const Constants = __importStar(require("./CONST"));
 const UrlPatterns = __importStar(require("./Url"));
-const Log_1 = __importDefault(require("./Log"));
+const Logger_1 = __importDefault(require("./Logger"));
 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>';
 class ExpensiMark {
+    /**
+     * Set the logger to use for logging inside of the ExpensiMark class
+     * @param {Object} logger - The logger object to use
+     */
+    static setLogger(logger) {
+        ExpensiMark.Log = logger;
+    }
     constructor() {
         /**
          * The list of regex replacements to do on a comment. Check the link regex is first so links are processed
@@ -246,7 +253,8 @@ class ExpensiMark {
                     const regex = /^(?:&gt;)+ +(?! )(?![^<]*(?:<\/pre>|<\/code>))([^\v\n\r]+)/gm;
                     const replaceFunction = (g1) => replacement(g1, shouldKeepRawInput);
                     if (shouldKeepRawInput) {
-                        return textToProcess.replace(regex, replaceFunction);
+                        const rawInputRegex = /^(?:&gt;)+ +(?! )(?![^<]*(?:<\/pre>|<\/code>))([^\v\n\r]*)/gm;
+                        return textToProcess.replace(rawInputRegex, replaceFunction);
                     }
                     return this.modifyTextForQuote(regex, textToProcess, replacement);
                 },
@@ -478,7 +486,7 @@ class ExpensiMark {
                 replacement: (match, g1, offset, string, extras) => {
                     const reportToNameMap = extras.reportIDToName;
                     if (!reportToNameMap || !reportToNameMap[g1]) {
-                        Log_1.default.alert('[ExpensiMark] Missing report name', { reportID: g1 });
+                        ExpensiMark.Log.alert('[ExpensiMark] Missing report name', { reportID: g1 });
                         return '#Hidden';
                     }
                     return reportToNameMap[g1];
@@ -491,7 +499,7 @@ class ExpensiMark {
                     if (g1) {
                         const accountToNameMap = extras.accountIDToName;
                         if (!accountToNameMap || !accountToNameMap[g1]) {
-                            Log_1.default.alert('[ExpensiMark] Missing account name', { accountID: g1 });
+                            ExpensiMark.Log.alert('[ExpensiMark] Missing account name', { accountID: g1 });
                             return '@Hidden';
                         }
                         return `@${extras.accountIDToName[g1]}`;
@@ -547,7 +555,7 @@ class ExpensiMark {
                 replacement: (match, g1, offset, string, extras) => {
                     const reportToNameMap = extras.reportIDToName;
                     if (!reportToNameMap || !reportToNameMap[g1]) {
-                        Log_1.default.alert('[ExpensiMark] Missing report name', { reportID: g1 });
+                        ExpensiMark.Log.alert('[ExpensiMark] Missing report name', { reportID: g1 });
                         return '#Hidden';
                     }
                     return reportToNameMap[g1];
@@ -559,7 +567,7 @@ class ExpensiMark {
                 replacement: (match, g1, offset, string, extras) => {
                     const accountToNameMap = extras.accountIDToName;
                     if (!accountToNameMap || !accountToNameMap[g1]) {
-                        Log_1.default.alert('[ExpensiMark] Missing account name', { accountID: g1 });
+                        ExpensiMark.Log.alert('[ExpensiMark] Missing account name', { accountID: g1 });
                         return '@Hidden';
                     }
                     return `@${extras.accountIDToName[g1]}`;
@@ -1046,4 +1054,10 @@ class ExpensiMark {
         return _.escape(originalContent);
     }
 }
+ExpensiMark.Log = new Logger_1.default({
+    serverLoggingCallback: _.noop,
+    // eslint-disable-next-line no-console
+    clientLoggingCallback: (message) => console.warn(message),
+    isDebug: true,
+});
 exports.default = ExpensiMark;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify-common",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "author": "Expensify, Inc.",
   "description": "Expensify libraries and components shared across different repos",
   "homepage": "https://expensify.com",