, , and tag', () => {
const testString = '`code`test@gmail.com '
- + '```code block```test@gmail.com '
+ + '```\ncode block\n```test@gmail.com '
+ '[Google](https://google.com)test@gmail.com '
+ '_test@gmail.com_ '
+ '_test\n\ntest@gmail.com_ '
+ '`test@expensify.com` '
- + '```test@expensify.com``` '
+ + '```\ntest@expensify.com\n``` '
+ '@test@expensify.com '
+ '_@username@expensify.com_ '
+ '[https://staging.new.expensify.com/details/test@expensify.com](https://staging.new.expensify.com/details/test@expensify.com) '
+ '[test italic style wrap email _test@gmail.com_ inside a link](https://google.com) ';
const resultString = 'codetest@gmail.com '
- + 'code block
test@gmail.com '
+ + 'code block
test@gmail.com '
+ 'Googletest@gmail.com '
+ 'test@gmail.com '
+ 'test
test@gmail.com '
+ 'test@expensify.com '
- + 'test@expensify.com
'
+ + 'test@expensify.com
'
+ '@test@expensify.com '
+ '@username@expensify.com '
+ 'https://staging.new.expensify.com/details/test@expensify.com '
@@ -1798,14 +1799,14 @@ describe('when should keep raw input flag is enabled', () => {
test('quote with other markdowns', () => {
const quoteTestStartString = '> This is a *quote* that started on a new line.\nHere is a >quote that did not\n```\nhere is a codefenced quote\n>it should not be quoted\n```';
- const quoteTestReplacedString = ' This is a quote that started on a new line.
\nHere is a >quote that did not\nhere is a codefenced quote\n>it should not be quoted\n
';
+ const quoteTestReplacedString = ' This is a quote that started on a new line.
\nHere is a >quote that did not\nhere is a codefenced quote\n>it should not be quoted\n
';
expect(parser.replace(quoteTestStartString, {shouldKeepRawInput: true})).toBe(quoteTestReplacedString);
});
test('codeBlock with newlines', () => {
const quoteTestStartString = '```\nhello world\n```';
- const quoteTestReplacedString = 'hello world\n
';
+ const quoteTestReplacedString = 'hello world\n
';
expect(parser.replace(quoteTestStartString, {shouldKeepRawInput: true})).toBe(quoteTestReplacedString);
});
@@ -1843,29 +1844,35 @@ describe('when should keep raw input flag is enabled', () => {
expect(parser.replace(testString, {shouldKeepRawInput: true})).toBe(resultString);
});
- test('user mention from phone number', () => {
+ test('user mention from invalid phone number', () => {
const testString = '@+1234567890';
- const resultString = '@+1234567890 ';
+ const resultString = '@+1234567890';
+ expect(parser.replace(testString, {shouldKeepRawInput: true})).toBe(resultString);
+ });
+
+ test('user mention from valid phone number', () => {
+ const testString = '@+15005550006';
+ const resultString = '@+15005550006 ';
expect(parser.replace(testString, {shouldKeepRawInput: true})).toBe(resultString);
});
});
});
test('Test code fence within inline code', () => {
- let testString = 'Hello world `(```test```)` Hello world';
- expect(parser.replace(testString)).toBe('Hello world `(test
)` Hello world');
+ let testString = 'Hello world `(```\ntest\n```)` Hello world';
+ expect(parser.replace(testString)).toBe('Hello world `(test
)` Hello world');
- testString = 'Hello world `(```test\ntest```)` Hello world';
- expect(parser.replace(testString)).toBe('Hello world `(test
test
)` Hello world');
+ testString = 'Hello world `(```\ntest\ntest\n```)` Hello world';
+ expect(parser.replace(testString)).toBe('Hello world `(test
test
)` Hello world');
- testString = 'Hello world ```(`test`)``` Hello world';
- expect(parser.replace(testString)).toBe('Hello world (`test`)
Hello world');
+ testString = 'Hello world ```\n(`test`)\n``` Hello world';
+ expect(parser.replace(testString)).toBe('Hello world (`test`)
Hello world');
- testString = 'Hello world `test`space```block``` Hello world';
- expect(parser.replace(testString)).toBe('Hello world testspaceblock
Hello world');
+ testString = 'Hello world `test`space```\nblock\n``` Hello world';
+ expect(parser.replace(testString)).toBe('Hello world testspaceblock
Hello world');
- testString = 'Hello world ```block```space`test` Hello world';
- expect(parser.replace(testString)).toBe('Hello world block
spacetest Hello world');
+ testString = 'Hello world ```\nblock\n```space`test` Hello world';
+ expect(parser.replace(testString)).toBe('Hello world block
spacetest Hello world');
});
test('Test italic/bold/strikethrough markdown to keep consistency', () => {
@@ -1951,6 +1958,45 @@ describe('multi-level blockquote', () => {
});
});
+describe('Video markdown conversion to html tag', () => {
+ test('Single video with source', () => {
+ const testString = '';
+ const resultString = '';
+ expect(parser.replace(testString)).toBe(resultString);
+ });
+
+ test('Text containing videos', () => {
+ const testString = 'A video of a banana:  a video without name: !(https://example.com/developer.mp4)';
+ const resultString = 'A video of a banana: a video without name: ';
+ expect(parser.replace(testString)).toBe(resultString);
+ });
+
+ test('Video with raw data attributes', () => {
+ const testString = '';
+ const resultString = '';
+ expect(parser.replace(testString, {shouldKeepRawInput: true})).toBe(resultString);
+ })
+
+ test('Single video with extra cached attribues', () => {
+ const testString = '';
+ const resultString = '';
+ expect(parser.replace(testString, {
+ extras: {
+ videoAttributeCache: {
+ 'https://example.com/video.mp4': 'data-expensify-height="100" data-expensify-width="100"'
+ }
+ }
+ })).toBe(resultString);
+ })
+
+ test('Text containing image and video', () => {
+ const testString = 'An image of a banana:  and a video of a banana: ';
+ const resultString = 'An image of a banana: 
and a video of a banana: ';
+ expect(parser.replace(testString)).toBe(resultString);
+ });
+
+})
+
describe('Image markdown conversion to html tag', () => {
test('Single image with alt text', () => {
const testString = '';
diff --git a/__tests__/ExpensiMark-HTMLToText-test.js b/__tests__/ExpensiMark-HTMLToText-test.js
index 39f5bebc..6757803b 100644
--- a/__tests__/ExpensiMark-HTMLToText-test.js
+++ b/__tests__/ExpensiMark-HTMLToText-test.js
@@ -151,7 +151,7 @@ test('Mention user html to text', () => {
expect(parser.htmlToText(testString)).toBe('@Hidden');
const extras = {
- accountIdToName: {
+ accountIDToName: {
'1234': 'user@domain.com',
},
};
@@ -180,7 +180,7 @@ test('Mention report html to text', () => {
expect(parser.htmlToText(testString)).toBe('#Hidden');
const extras = {
- reportIdToName: {
+ reportIDToName: {
'1234': '#room-name',
},
};
diff --git a/__tests__/ExpensiMark-Markdown-test.js b/__tests__/ExpensiMark-Markdown-test.js
index 0f8e8831..bb1baf1f 100644
--- a/__tests__/ExpensiMark-Markdown-test.js
+++ b/__tests__/ExpensiMark-Markdown-test.js
@@ -497,6 +497,18 @@ test('map div with quotes', () => {
expect(parser.htmlToMarkdown(testString)).toBe(resultString);
});
+test('double quotes in same line', () => {
+ const testString = 'line 1
';
+ const resultString = '>> line 1';
+ expect(parser.htmlToMarkdown(testString)).toBe(resultString);
+});
+
+test('triple quotes in same line', () => {
+ const testString = 'line 1
';
+ const resultString = '>>> line 1';
+ expect(parser.htmlToMarkdown(testString)).toBe(resultString);
+});
+
test('map table to newline', () => {
const testString = 'line 1 line 2 ';
const resultString = 'line 1\nline 2';
@@ -756,12 +768,16 @@ test('Mention user html to markdown', () => {
testString = '@user@DOMAIN.com ';
expect(parser.htmlToMarkdown(testString)).toBe('@user@DOMAIN.com');
+ // When there is a phone number mention the sms domain `@expensify.sms`should be removed from returned string
+ testString = '@+311231231@expensify.sms ';
+ expect(parser.htmlToMarkdown(testString)).toBe('@+311231231');
+
// When there is `accountID` and no `extras`, `@Hidden` should be returned
testString = 'heading
asjjssjdjdjdjdjdjjeiwiwiwowkdjdjdieikdjfidekjcjdkekejdcjdkeekcjcdidjjcdkekdiccjdkejdjcjxisdjjdkedncicdjejejcckdsijcjdsodjcicdkejdicdjejajasjjssjdjdjdjdjdjjeiwiwiwowkdjdjdieikdjfisjksksjsjssskssjskskssksksksksskdkddkddkdksskskdkdkdksskskskdkdkdkdkekeekdkddenejeodxkdndekkdjddkeemdjxkdenendkdjddekjcjdkekejdcjdkeekcjcdidjjcdkekdiccjdkejdjcjxisdjjdkedncicdjejejcckdsijcjdsodjcicdkejdicdjejajasjjssjdjdjdjdjdjjeiwiwiwowkdjdjdieikdjfidekjcjdkekejdcjdkeekcjcdidjjcdkekdiccjdkejdjcjxisdjjdkedncicdjejejcckdsijcjdsodjcicdkejdi.cdjd';
- const parser = new ExpensiMark();
+ const testString =
+ 'heading
asjjssjdjdjdjdjdjjeiwiwiwowkdjdjdieikdjfidekjcjdkekejdcjdkeekcjcdidjjcdkekdiccjdkejdjcjxisdjjdkedncicdjejejcckdsijcjdsodjcicdkejdicdjejajasjjssjdjdjdjdjdjjeiwiwiwowkdjdjdieikdjfisjksksjsjssskssjskskssksksksksskdkddkddkdksskskdkdkdksskskskdkdkdkdkekeekdkddenejeodxkdndekkdjddkeemdjxkdenendkdjddekjcjdkekejdcjdkeekcjcdidjjcdkekdiccjdkejdjcjxisdjjdkedncicdjejejcckdsijcjdsodjcicdkejdicdjejajasjjssjdjdjdjdjdjjeiwiwiwowkdjdjdieikdjfidekjcjdkekejdcjdkeekcjcdidjjcdkekdiccjdkejdjcjxisdjjdkedncicdjejejcckdsijcjdsodjcicdkejdi.cdjd';
+ const expensiMarkParser = new ExpensiMark();
// Mock method modifyTextForUrlLinks to let it throw an error to test try/catch of method ExpensiMark.replace
- const modifyTextForUrlLinksMock = jest.fn((a, b, c) => {throw new Error('Maximum regex stack depth reached')});
- parser.modifyTextForUrlLinks = modifyTextForUrlLinksMock;
- expect(parser.replace(testString)).toBe(_.escape(testString));
+ const modifyTextForUrlLinksMock = jest.fn(() => {
+ throw new Error('Maximum regex stack depth reached');
+ });
+ expensiMarkParser.modifyTextForUrlLinks = modifyTextForUrlLinksMock;
+ expect(expensiMarkParser.replace(testString)).toBe(Utils.escape(testString));
expect(modifyTextForUrlLinksMock).toHaveBeenCalledTimes(1);
// Mock method extractLinksInMarkdownComment to let it return undefined to test try/catch of method ExpensiMark.extractLinksInMarkdownComment
- const extractLinksInMarkdownCommentMock = jest.fn((a) => undefined);
- parser.extractLinksInMarkdownComment = extractLinksInMarkdownCommentMock;
- expect(parser.extractLinksInMarkdownComment(testString)).toBe(undefined);
- expect(parser.getRemovedMarkdownLinks(testString, 'google.com')).toStrictEqual([]);
+ const extractLinksInMarkdownCommentMock = jest.fn(() => undefined);
+ expensiMarkParser.extractLinksInMarkdownComment = extractLinksInMarkdownCommentMock;
+ expect(expensiMarkParser.extractLinksInMarkdownComment(testString)).toBe(undefined);
+ expect(expensiMarkParser.getRemovedMarkdownLinks(testString, 'google.com')).toStrictEqual([]);
expect(extractLinksInMarkdownCommentMock).toHaveBeenCalledTimes(3);
});
test('Test extract link with ending parentheses', () => {
- const comment = '[Staging Detail](https://staging.new.expensify.com/details) [Staging Detail](https://staging.new.expensify.com/details)) [Staging Detail](https://staging.new.expensify.com/details)))';
+ const comment =
+ '[Staging Detail](https://staging.new.expensify.com/details) [Staging Detail](https://staging.new.expensify.com/details)) [Staging Detail](https://staging.new.expensify.com/details)))';
const links = ['https://staging.new.expensify.com/details', 'https://staging.new.expensify.com/details', 'https://staging.new.expensify.com/details'];
expect(parser.extractLinksInMarkdownComment(comment)).toStrictEqual(links);
});
diff --git a/babel.config.js b/babel.config.js
index d7c97f55..f792e8e1 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,12 +1,3 @@
module.exports = {
- presets: [
- [
- '@babel/preset-env',
- {
- targets: {
- node: 'current',
- },
- },
- ],
- ],
+ presets: [['@babel/preset-env', {targets: {node: 'current'}}], '@babel/preset-typescript'],
};
diff --git a/lib/API.jsx b/lib/API.jsx
index 6a6d0482..672eeb82 100644
--- a/lib/API.jsx
+++ b/lib/API.jsx
@@ -3,11 +3,12 @@
* WIP, This is in the process of migration from web-e. Please add methods to this as is needed.|
* ----------------------------------------------------------------------------------------------
*/
-import _ from 'underscore';
// Use this deferred lib so we don't have a dependency on jQuery (so we can use this module in mobile)
import {Deferred} from 'simply-deferred';
+import {has} from 'lodash';
import ExpensifyAPIDeferred from './APIDeferred';
+import * as Utils from './utils';
/**
* @param {Network} network
@@ -39,7 +40,7 @@ export default 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 Deferred();
@@ -47,7 +48,7 @@ export default function API(network, args) {
network
.get('/revision.txt')
.done((codeRevision) => {
- if (codeRevision.trim() === window.CODE_REVISION) {
+ if (Utils.isWindowAvailable() && codeRevision.trim() === window.CODE_REVISION) {
console.debug('Code revision is up to date');
promise.resolve();
} else {
@@ -74,7 +75,7 @@ export default function API(network, args) {
* @param {String} apiDeferred
*/
function attachJSONCodeCallbacks(apiDeferred) {
- _(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) => {
@@ -104,7 +105,7 @@ export default function API(network, args) {
let newParameters = {...parameters, command};
// If there was an enhanceParameters() method supplied in our args, then we will call that here
- if (args && _.isFunction(args.enhanceParameters)) {
+ if (args && Utils.isFunction(args.enhanceParameters)) {
newParameters = args.enhanceParameters(newParameters);
}
@@ -150,18 +151,21 @@ export default function API(network, args) {
* @param {String} commandName The name of the API command
*/
function requireParameters(parameterNames, parameters, commandName) {
+ // eslint-disable-next-line rulesdir/prefer-early-return
parameterNames.forEach((parameterName) => {
- if (!_(parameters).has(parameterName) || parameters[parameterName] === null || parameters[parameterName] === undefined) {
- const parametersCopy = _.clone(parameters);
- if (_(parametersCopy).has('authToken')) {
- parametersCopy.authToken = '';
- }
- if (_(parametersCopy).has('password')) {
- parametersCopy.password = '';
- }
- const keys = _(parametersCopy).keys().join(', ') || 'none';
- throw new Error(`Parameter ${parameterName} is required for "${commandName}". Supplied parameters: ${keys}`);
+ if (has(parameters, parameterName) && parameters[parameterName] !== null && parameters[parameterName] !== undefined) {
+ return;
+ }
+
+ const parametersCopy = {...parameters};
+ if (has(parametersCopy, 'authToken')) {
+ parametersCopy.authToken = '';
+ }
+ if (has(parametersCopy, 'password')) {
+ parametersCopy.password = '';
}
+ const keys = Object.keys(parametersCopy).join(', ') || 'none';
+ throw new Error(`Parameter ${parameterName} is required for "${commandName}". Supplied parameters: ${keys}`);
});
}
@@ -171,7 +175,7 @@ export default function API(network, args) {
* @param {Function} callback
*/
registerDefaultHandler(jsonCodes, callback) {
- if (!_(callback).isFunction()) {
+ if (!Utils.isFunction(callback)) {
return;
}
@@ -228,7 +232,7 @@ export default 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 (_.isFunction(data.validate)) {
+ if (Utils.isFunction(data.validate)) {
data.validate(parameters);
}
@@ -263,7 +267,7 @@ export default function API(network, args) {
requireParameters(['email'], parameters, commandName);
// Tell the API not to set cookies for this request
- const newParameters = _.extend({api_setCookie: false}, parameters);
+ const newParameters = {...parameters, api_setCookie: false};
return performPOSTRequest(commandName, newParameters);
},
@@ -424,7 +428,7 @@ export default function API(network, args) {
const commandName = 'ResetPassword';
requireParameters(['email'], parameters, commandName);
- const newParameters = _.extend({api_setCookie: false}, parameters);
+ const newParameters = {...parameters, api_setCookie: false};
return performPOSTRequest(commandName, newParameters);
},
@@ -823,7 +827,7 @@ export default function API(network, args) {
*
* @returns {APIDeferred}
*/
- createAdminIssuedVirtualCard: function (parameters) {
+ createAdminIssuedVirtualCard(parameters) {
const commandName = 'Card_CreateAdminIssuedVirtualCard';
requireParameters(['cardTitle', 'assigneeEmail', 'cardLimit', 'cardLimitType', 'domainName'], parameters, commandName);
return performPOSTRequest(commandName, parameters);
@@ -842,7 +846,7 @@ export default function API(network, args) {
*
* @returns {APIDeferred}
*/
- editAdminIssuedVirtualCard: function (parameters) {
+ editAdminIssuedVirtualCard(parameters) {
const commandName = 'Card_EditAdminIssuedVirtualCard';
requireParameters(['domainName', 'cardID', 'cardTitle', 'assigneeEmail', 'cardLimit', 'cardLimitType'], parameters, commandName);
return performPOSTRequest(commandName, parameters);
diff --git a/lib/APIDeferred.jsx b/lib/APIDeferred.jsx
index c64b17b8..b95b966c 100644
--- a/lib/APIDeferred.jsx
+++ b/lib/APIDeferred.jsx
@@ -3,9 +3,9 @@
* WIP, This is in the process of migration from web-e. Please add methods to this as is needed.|
* ----------------------------------------------------------------------------------------------
*/
-
-import _ from 'underscore';
-import {invoke, bulkInvoke} from './Func';
+import {once} from 'lodash';
+import * as Utils from './utils';
+import * as Func from './Func';
/**
* @param {jquery.Deferred} promise
@@ -50,15 +50,15 @@ export default function APIDeferred(promise, extractedProperty) {
function handleError(jsonCode, response) {
// Look for handlers for this error code
const handlers = errorHandlers[jsonCode];
- if (!_(handlers).isEmpty()) {
- bulkInvoke(handlers, [jsonCode, response]);
+ if (handlers.length > 0) {
+ Func.bulkInvoke(handlers, [jsonCode, response]);
} else {
// No explicit handlers, call the unhandled callbacks
- bulkInvoke(unhandledCallbacks, [jsonCode, response]);
+ Func.bulkInvoke(unhandledCallbacks, [jsonCode, response]);
}
// Always run the "fail" callbacks in case of error
- bulkInvoke(failCallbacks, [jsonCode, response]);
+ Func.bulkInvoke(failCallbacks, [jsonCode, response]);
}
/**
@@ -73,8 +73,8 @@ export default function APIDeferred(promise, extractedProperty) {
// Figure out if we need to extract a property from the response, and if it is there.
const jsonCode = extractJSONCode(response);
- const propertyRequested = !_.isNull(extractedPropertyName);
- const requestedPropertyPresent = propertyRequested && response && !_.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
@@ -86,8 +86,8 @@ export default function APIDeferred(promise, extractedProperty) {
returnedData = propertyRequested && requestedPropertyPresent ? response[extractedPropertyName] : response;
// And then run the success callbacks
- bulkInvoke(doneCallbacks, [returnedData]);
- } else if (!_(jsonCode).isNull() && jsonCode !== 200) {
+ Func.bulkInvoke(doneCallbacks, [returnedData]);
+ } else if (jsonCode !== null && jsonCode !== 200) {
// Exception thrown, handle it
handleError(jsonCode, response);
} else {
@@ -102,7 +102,7 @@ export default function APIDeferred(promise, extractedProperty) {
}
// Always run the "always" callbacks
- bulkInvoke(alwaysCallbacks, [response]);
+ Func.bulkInvoke(alwaysCallbacks, [response]);
}
/**
@@ -133,8 +133,8 @@ export default function APIDeferred(promise, extractedProperty) {
* @returns {APIDeferred} itself, for chaining
*/
done(callback) {
- if (_(callback).isFunction()) {
- doneCallbacks.push(_(callback).once());
+ if (Utils.isFunction(callback)) {
+ doneCallbacks.push(once(callback));
ensureFutureCallbacksFire();
}
return this;
@@ -148,8 +148,8 @@ export default function APIDeferred(promise, extractedProperty) {
* @returns {APIDeferred} itself, for chaining
*/
always(callback) {
- if (_(callback).isFunction()) {
- alwaysCallbacks.push(_(callback).once());
+ if (Utils.isFunction(callback)) {
+ alwaysCallbacks.push(once(callback));
ensureFutureCallbacksFire();
}
return this;
@@ -165,7 +165,7 @@ export default function APIDeferred(promise, extractedProperty) {
* @returns {APIDeferred} itself, for chaining
*/
handle(jsonCodes, callback) {
- if (_(callback).isFunction()) {
+ if (Utils.isFunction(callback)) {
jsonCodes.forEach((code) => {
if (code === 200) {
return;
@@ -174,7 +174,7 @@ export default function APIDeferred(promise, extractedProperty) {
if (!errorHandlers[code]) {
errorHandlers[code] = [];
}
- errorHandlers[code].push(_(callback).once());
+ errorHandlers[code].push(once(callback));
});
ensureFutureCallbacksFire();
@@ -191,8 +191,8 @@ export default function APIDeferred(promise, extractedProperty) {
* @returns {APIDeferred} itself, for chaining
*/
unhandled(callback) {
- if (_(callback).isFunction()) {
- unhandledCallbacks.push(_(callback).once());
+ if (Utils.isFunction(callback)) {
+ unhandledCallbacks.push(once(callback));
ensureFutureCallbacksFire();
}
return this;
@@ -207,8 +207,8 @@ export default function APIDeferred(promise, extractedProperty) {
* @returns {APIDeferred} itself, for chaining
*/
fail(callback) {
- if (_(callback).isFunction()) {
- failCallbacks.push(_(callback).once());
+ if (Utils.isFunction(callback)) {
+ failCallbacks.push(once(callback));
ensureFutureCallbacksFire();
}
return this;
@@ -225,11 +225,11 @@ export default function APIDeferred(promise, extractedProperty) {
return promise.then((response) => {
const responseCode = extractJSONCode(response);
- if (responseCode !== 200 || !_(callback).isFunction()) {
+ if (responseCode !== 200 || !Utils.isFunction(callback)) {
return;
}
- invoke(callback, [response]);
+ Func.invoke(callback, [response]);
return this;
});
diff --git a/lib/BrowserDetect.jsx b/lib/BrowserDetect.jsx
index 2f5bfb60..cb0731f8 100644
--- a/lib/BrowserDetect.jsx
+++ b/lib/BrowserDetect.jsx
@@ -1,3 +1,5 @@
+import * as Utils from './utils';
+
const BROWSERS = {
EDGE: 'Edge',
CHROME: 'Chrome',
@@ -13,6 +15,10 @@ const MOBILE_PLATFORMS = {
};
function searchString() {
+ if (!Utils.isWindowAvailable() || !Utils.isNavigatorAvailable()) {
+ return '';
+ }
+
const data = [
{
string: navigator.userAgent,
@@ -72,6 +78,10 @@ function searchString() {
}
function getMobileDevice() {
+ if (!Utils.isNavigatorAvailable() || !navigator.userAgent) {
+ return '';
+ }
+
const data = [
{
devices: ['iPhone', 'iPad', 'iPod'],
diff --git a/lib/CONST.d.ts b/lib/CONST.d.ts
deleted file mode 100644
index 77974b46..00000000
--- a/lib/CONST.d.ts
+++ /dev/null
@@ -1,852 +0,0 @@
-/**
- * URL of our CloudFront Instance
- */
-export declare const g_cloudFront: 'https://d2k5nsl2zxldvw.cloudfront.net';
-/**
- * URL of our image CDN
- */
-export declare const g_cloudFrontImg: 'https://d2k5nsl2zxldvw.cloudfront.net/images/';
-export declare const CONST: {
- readonly CORPAY_DIRECT_REIMBURSEMENT_CURRENCIES: readonly ['USD', 'GBP', 'EUR', 'AUD', 'CAD'];
- /**
- * Default max ACH limit. It can be overwritten by a private NVP
- */
- readonly ACH_DEFAULT_MAX_AMOUNT_LIMIT: 2000000;
- /**
- * IRS remimbursement rate for mileage
- * WARNING ! UPDATE THE PHP CONSTANT VERSION WHEN UPDATING THIS ONE
- */
- readonly MILEAGE_IRS_RATE: 0.545 | 0.58;
- readonly COUNTRY: {
- readonly US: 'US';
- readonly AU: 'AU';
- readonly UK: 'UK';
- readonly NZ: 'NZ';
- };
- readonly CURRENCIES: {
- readonly US: 'USD';
- readonly AU: 'AUD';
- readonly UK: 'GBP';
- readonly NZ: 'NZD';
- };
- readonly STATES: {
- readonly AK: {
- readonly stateISO: 'AK';
- readonly stateName: 'Alaska';
- };
- readonly AL: {
- readonly stateISO: 'AL';
- readonly stateName: 'Alabama';
- };
- readonly AR: {
- readonly stateISO: 'AR';
- readonly stateName: 'Arkansas';
- };
- readonly AZ: {
- readonly stateISO: 'AZ';
- readonly stateName: 'Arizona';
- };
- readonly CA: {
- readonly stateISO: 'CA';
- readonly stateName: 'California';
- };
- readonly CO: {
- readonly stateISO: 'CO';
- readonly stateName: 'Colorado';
- };
- readonly CT: {
- readonly stateISO: 'CT';
- readonly stateName: 'Connecticut';
- };
- readonly DE: {
- readonly stateISO: 'DE';
- readonly stateName: 'Delaware';
- };
- readonly FL: {
- readonly stateISO: 'FL';
- readonly stateName: 'Florida';
- };
- readonly GA: {
- readonly stateISO: 'GA';
- readonly stateName: 'Georgia';
- };
- readonly HI: {
- readonly stateISO: 'HI';
- readonly stateName: 'Hawaii';
- };
- readonly IA: {
- readonly stateISO: 'IA';
- readonly stateName: 'Iowa';
- };
- readonly ID: {
- readonly stateISO: 'ID';
- readonly stateName: 'Idaho';
- };
- readonly IL: {
- readonly stateISO: 'IL';
- readonly stateName: 'Illinois';
- };
- readonly IN: {
- readonly stateISO: 'IN';
- readonly stateName: 'Indiana';
- };
- readonly KS: {
- readonly stateISO: 'KS';
- readonly stateName: 'Kansas';
- };
- readonly KY: {
- readonly stateISO: 'KY';
- readonly stateName: 'Kentucky';
- };
- readonly LA: {
- readonly stateISO: 'LA';
- readonly stateName: 'Louisiana';
- };
- readonly MA: {
- readonly stateISO: 'MA';
- readonly stateName: 'Massachusetts';
- };
- readonly MD: {
- readonly stateISO: 'MD';
- readonly stateName: 'Maryland';
- };
- readonly ME: {
- readonly stateISO: 'ME';
- readonly stateName: 'Maine';
- };
- readonly MI: {
- readonly stateISO: 'MI';
- readonly stateName: 'Michigan';
- };
- readonly MN: {
- readonly stateISO: 'MN';
- readonly stateName: 'Minnesota';
- };
- readonly MO: {
- readonly stateISO: 'MO';
- readonly stateName: 'Missouri';
- };
- readonly MS: {
- readonly stateISO: 'MS';
- readonly stateName: 'Mississippi';
- };
- readonly MT: {
- readonly stateISO: 'MT';
- readonly stateName: 'Montana';
- };
- readonly NC: {
- readonly stateISO: 'NC';
- readonly stateName: 'North Carolina';
- };
- readonly ND: {
- readonly stateISO: 'ND';
- readonly stateName: 'North Dakota';
- };
- readonly NE: {
- readonly stateISO: 'NE';
- readonly stateName: 'Nebraska';
- };
- readonly NH: {
- readonly stateISO: 'NH';
- readonly stateName: 'New Hampshire';
- };
- readonly NJ: {
- readonly stateISO: 'NJ';
- readonly stateName: 'New Jersey';
- };
- readonly NM: {
- readonly stateISO: 'NM';
- readonly stateName: 'New Mexico';
- };
- readonly NV: {
- readonly stateISO: 'NV';
- readonly stateName: 'Nevada';
- };
- readonly NY: {
- readonly stateISO: 'NY';
- readonly stateName: 'New York';
- };
- readonly OH: {
- readonly stateISO: 'OH';
- readonly stateName: 'Ohio';
- };
- readonly OK: {
- readonly stateISO: 'OK';
- readonly stateName: 'Oklahoma';
- };
- readonly OR: {
- readonly stateISO: 'OR';
- readonly stateName: 'Oregon';
- };
- readonly PA: {
- readonly stateISO: 'PA';
- readonly stateName: 'Pennsylvania';
- };
- readonly PR: {
- readonly stateISO: 'PR';
- readonly stateName: 'Puerto Rico';
- };
- readonly RI: {
- readonly stateISO: 'RI';
- readonly stateName: 'Rhode Island';
- };
- readonly SC: {
- readonly stateISO: 'SC';
- readonly stateName: 'South Carolina';
- };
- readonly SD: {
- readonly stateISO: 'SD';
- readonly stateName: 'South Dakota';
- };
- readonly TN: {
- readonly stateISO: 'TN';
- readonly stateName: 'Tennessee';
- };
- readonly TX: {
- readonly stateISO: 'TX';
- readonly stateName: 'Texas';
- };
- readonly UT: {
- readonly stateISO: 'UT';
- readonly stateName: 'Utah';
- };
- readonly VA: {
- readonly stateISO: 'VA';
- readonly stateName: 'Virginia';
- };
- readonly VT: {
- readonly stateISO: 'VT';
- readonly stateName: 'Vermont';
- };
- readonly WA: {
- readonly stateISO: 'WA';
- readonly stateName: 'Washington';
- };
- readonly WI: {
- readonly stateISO: 'WI';
- readonly stateName: 'Wisconsin';
- };
- readonly WV: {
- readonly stateISO: 'WV';
- readonly stateName: 'West Virginia';
- };
- readonly WY: {
- readonly stateISO: 'WY';
- readonly stateName: 'Wyoming';
- };
- readonly DC: {
- readonly stateISO: 'DC';
- readonly stateName: 'District Of Columbia';
- };
- };
- /**
- * Store all the regular expression we are using for matching stuff
- */
- readonly REG_EXP: {
- /**
- * Regular expression to check that a domain is valid
- */
- readonly DOMAIN: RegExp;
- /**
- * Regex matching an text containing an email
- */
- readonly EMAIL_PART: "([\\w\\-\\+\\'#]+(?:\\.[\\w\\-\\'\\+]+)*@(?:[\\w\\-]+\\.)+[a-z]{2,})";
- /**
- * Regex matching a text containing general phone number
- */
- readonly GENERAL_PHONE_PART: RegExp;
- /**
- * Regex matching a text containing an E.164 format phone number
- */
- readonly PHONE_PART: '\\+[1-9]\\d{1,14}';
- /**
- * Regular expression to check that a basic name is valid
- */
- readonly FREE_NAME: RegExp;
- /**
- * Regular expression to check that a card is masked
- */
- readonly MASKED_CARD: RegExp;
- /**
- * Regular expression to check that an email is valid
- */
- readonly EMAIL: RegExp;
- /**
- * Regular expression to extract an email from a text
- */
- readonly EXTRACT_EMAIL: RegExp;
- /**
- * Regular expression to search for valid email addresses in a string
- */
- readonly EMAIL_SEARCH: RegExp;
- /**
- * Regular expression to detect if something is a hyperlink
- *
- * Adapted from: https://gist.github.com/dperini/729294
- */
- readonly HYPERLINK: RegExp;
- /**
- * Regex to match valid emails during markdown transformations
- */
- readonly MARKDOWN_EMAIL: "([a-zA-Z0-9.!#$%&'+/=?^`{|}-][a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]*@[a-zA-Z0-9-]+?(\\.[a-zA-Z]+)+)";
- /**
- * Regex matching an text containing an Emoji
- */
- readonly EMOJIS: RegExp;
- /**
- * Regex matching an text containing an Emoji that can be a single emoji or made up by some different emojis
- *
- * @type RegExp
- */
- readonly EMOJI_RULE: RegExp;
- };
- readonly REPORT: {
- /**
- * Limit when we decided to turn off print to pdf and use only the native feature
- */
- readonly LIMIT_PRINT_PDF: 250;
- readonly ACH_LIMIT: 2000000;
- readonly ACH_DEFAULT_DAYS: 4;
- /**
- * This is the string that a user can enter in a formula to refer to the report title field
- */
- readonly TITLE_FORMULA: '{report:title}';
- /**
- * The max time a comment can be made after another to be considered the same comment, in seconds
- */
- readonly MAX_AGE_SAME_COMMENT: 300;
- readonly SMARTREPORT_AGENT_EMAIL: 'smartreports@expensify.com';
- };
- /**
- * Root URLs
- */
- readonly URL: {
- readonly FORUM_ROOT: 'https://community.expensify.com/';
- readonly RECEIPTS: {
- readonly DEVELOPMENT: 'https://www.expensify.com.dev/receipts/';
- readonly STAGING: 'https://staging.expensify.com/receipts/';
- readonly PRODUCTION: 'https://www.expensify.com/receipts/';
- };
- readonly CLOUDFRONT: 'https://d2k5nsl2zxldvw.cloudfront.net';
- readonly CLOUDFRONT_IMG: 'https://d2k5nsl2zxldvw.cloudfront.net/images/';
- readonly CLOUDFRONT_FILES: 'https://d2k5nsl2zxldvw.cloudfront.net/files/';
- readonly EXPENSIFY_SYNC_MANAGER: 'quickbooksdesktop/Expensify_QuickBooksDesktop_Setup_2300802.exe';
- readonly USEDOT_ROOT: 'https://use.expensify.com/';
- readonly ITUNES_SUBSCRIPTION: 'https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/manageSubscriptions';
- };
- readonly DATE: {
- readonly FORMAT_STRING: 'yyyy-MM-dd';
- readonly FORMAT_STRING_PRETTY: 'MMM d, yyyy';
- /**
- * Expensify date format string for moment js
- * usage: moment().format( CONST.DATE.MOMENT_FORMAT_STRING )
- */
- readonly MOMENT_FORMAT_STRING: 'YYYY-MM-DD';
- /**
- * This is a typical format of the date plus the time
- */
- readonly MOMENT_DATE_TIME: 'YYYY-MM-DD HH:mm';
- /**
- * Pretty format used for report history items
- *
- * @example Jun 19, 2019 12:38 PM
- */
- readonly MOMENT_DATE_TIME_PRETTY: 'MMM DD YYYY h:mma';
- /**
- * Date-time format, including timezone information, eg "2015-10-14T19:44:35+07:00"
- */
- readonly MOMENT_DATE_TIME_TIMEZONE: 'YYYY-MM-DDTHH:mm:ssZ';
- /**
- * Moment formatting option for a date of this format "Jul 2, 2014"
- */
- readonly MOMENT_US_DATE: 'MMM D, YYYY';
- /**
- * Moment formatting option for a date of this format "July 2, 2014"
- * ie, full month name
- */
- readonly MOMENT_US_DATE_LONG: 'MMMM D, YYYY';
- /**
- * Moment formatting option for full month name and year as in "July 2015"
- */
- readonly MOMENT_US_MONTH_YEAR_LONG: 'MMMM YYYY';
- /**
- * Difference between the local time and UTC time in ms
- */
- readonly TIMEZONE_OFFSET_MS: number;
- readonly SHORT_MONTH_SHORT_DAY: 'MMM d';
- readonly LONG_YEAR_MONTH_DAY_24_TIME: 'yyyy-MM-dd HH:mm:ss';
- readonly SHORT_MONTH_DAY_LOCAL_TIME: 'MMM D [at] LT';
- readonly SHORT_MONTH_DAY_YEAR_LOCAL_TIME: 'MMM D, YYYY [at] LT';
- };
- /**
- * Message used by the Func.die() exception
- */
- readonly FUNC_DIE_MESSAGE: 'Aborting JavaScript execution';
- /**
- * Default for how long the email delivery failure NVP should be valid (in seconds)
- * Currently 14 days (14 * 24 * 60 * 60)
- *
- * WARNING ! UPDATE THE PHP CONSTANT VERSION WHEN UPDATING THIS ONE
- */
- readonly EMAIL_DELIVERY_FAILURE_VALIDITY: 1209600;
- /**
- * Bill Processing-related constants
- */
- readonly BILL_PROCESSING_PARTNER_NAME: 'expensify.cash';
- readonly BILL_PROCESSING_EMAIL_DOMAIN: 'expensify.cash';
- /**
- * Bank Import Logic Constants
- */
- readonly BANK_IMPORT: {
- readonly BANK_STATUS_BROKEN: 2;
- };
- /**
- * Bank Account Logic Constants
- */
- readonly BANK_ACCOUNT: {
- readonly VERIFICATION_MAX_ATTEMPTS: 7;
- };
- /**
- * Emails that the user shouldn't be interacting with from the front-end interface
- * Trying to add these emails as a delegate, onto a policy, or as an approver is considered invalid
- * Any changes here should be reflected in the PHP constant in web-expensify,
- * which is located in _constant.php and also named EXPENSIFY_EMAILS.
- * And should also be reflected in the constant in expensify/app,
- * which is located in src/CONST.js and also named EXPENSIFY_EMAILS.
- */
- readonly EXPENSIFY_EMAILS: readonly [
- 'concierge@expensify.com',
- 'help@expensify.com',
- 'receipts@expensify.com',
- 'chronos@expensify.com',
- 'qa@expensify.com',
- 'contributors@expensify.com',
- 'firstresponders@expensify.com',
- 'qa+travisreceipts@expensify.com',
- 'bills@expensify.com',
- 'studentambassadors@expensify.com',
- 'accounting@expensify.com',
- 'payroll@expensify.com',
- 'svfg@expensify.com',
- 'integrationtestingcreds@expensify.com',
- 'admin@expensify.com',
- 'notifications@expensify.com',
- ];
- /**
- * Emails that the user shouldn't submit reports to nor share reports with
- * Any changes here should be reflected in the PHP constant,
- * which is located in _constant.php and also named INVALID_APPROVER_AND_SHAREE_EMAILS
- */
- readonly INVALID_APPROVER_AND_SHAREE_EMAILS: readonly [
- 'concierge@expensify.com',
- 'help@expensify.com',
- 'receipts@expensify.com',
- 'chronos@expensify.com',
- 'qa@expensify.com',
- 'contributors@expensify.com',
- 'firstresponders@expensify.com',
- 'qa+travisreceipts@expensify.com',
- 'bills@expensify.com',
- 'admin@expensify.com',
- 'notifications@expensify.com',
- ];
- /**
- * Smart scan-related constants
- */
- readonly SMART_SCAN: {
- readonly COST: 20;
- readonly FREE_NUMBER: 25;
- };
- readonly SMS: {
- readonly DOMAIN: 'expensify.sms';
- readonly E164_REGEX: RegExp;
- };
- readonly PASSWORD_COMPLEXITY_REGEX_STRING: '^(?=.*[A-Z])(?=.*[0-9])(?=.*[a-z]).{8,}$';
- readonly INTEGRATIONS: {
- /**
- * Constants that specify how to map (import) Integrations data to Expensify
- * Parallel to IntegrationEntityMappingTypeEnum in the IS
- */
- readonly DATA_MAPPING: {
- readonly NONE: 'NONE';
- readonly TAG: 'TAG';
- readonly REPORT_FIELD: 'REPORT_FIELD';
- readonly DEFAULT: 'DEFAULT';
- };
- readonly EXPORT_DATE: {
- readonly LAST_EXPENSE: 'LAST_EXPENSE';
- readonly REPORT_EXPORTED: 'REPORT_EXPORTED';
- readonly REPORT_SUBMITTED: 'REPORT_SUBMITTED';
- };
- readonly XERO_HQ_CONNECTION_NAME: 'xerohq';
- readonly EXPENSIFY_SYNC_MANAGER_VERSION: '23.0.802.0';
- };
- readonly INTEGRATION_TYPES: {
- readonly ACCOUNTING: 'accounting';
- readonly HR: 'hr';
- };
- readonly DIRECT_INTEGRATIONS: {
- readonly zenefits: {
- readonly value: 'zenefits';
- readonly text: 'Zenefits';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/zenefit.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/zenefit_gray.svg';
- readonly alert_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/zenefit_alert.svg';
- readonly types: readonly ['hr'];
- readonly isCorporateOnly: false;
- };
- readonly gusto: {
- readonly value: 'gusto';
- readonly text: 'Gusto';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/gusto.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/gusto_gray.svg';
- readonly alert_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/gusto_alert.svg';
- readonly types: readonly ['hr'];
- readonly isCorporateOnly: false;
- };
- readonly quickbooksOnline: {
- readonly value: 'quickbooksOnline';
- readonly text: 'QuickBooks Online';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/quickbooks.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/quickbooks_gray.svg';
- readonly alert_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/quickbooks_alert.svg';
- readonly types: readonly ['hr', 'accounting'];
- readonly isCorporateOnly: false;
- };
- readonly xero: {
- readonly value: 'xero';
- readonly text: 'Xero';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/xero.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/xero_gray.svg';
- readonly alert_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/xero_alert.svg';
- readonly types: readonly ['accounting'];
- readonly isCorporateOnly: false;
- };
- readonly netsuite: {
- readonly value: 'netsuite';
- readonly text: 'NetSuite';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/netsuite.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/netsuite_gray.svg';
- readonly alert_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/netsuite_alert.svg';
- readonly types: readonly ['hr', 'accounting'];
- readonly isCorporateOnly: true;
- };
- readonly quickbooksDesktop: {
- readonly value: 'qbd';
- readonly text: 'QuickBooks Desktop';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/quickbooks.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/quickbooks_gray.svg';
- readonly alert_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/quickbooks_alert.svg';
- readonly types: readonly ['accounting'];
- readonly isCorporateOnly: false;
- };
- readonly intacct: {
- readonly value: 'intacct';
- readonly text: 'Sage Intacct';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/sage.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/sage_gray.svg';
- readonly alert_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/sage_alert.svg';
- readonly types: readonly ['hr', 'accounting'];
- readonly isCorporateOnly: true;
- };
- readonly financialforce: {
- readonly value: 'financialforce';
- readonly text: 'Certinia';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/certinia.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/certinia_gray.svg';
- readonly alert_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/certinia_alert.svg';
- readonly types: readonly ['accounting'];
- readonly isCorporateOnly: true;
- };
- };
- readonly INDIRECT_INTEGRATIONS: {
- readonly microsoft_dynamics: {
- readonly value: 'microsoft_dynamics';
- readonly text: 'Microsoft Dynamics';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/microsoft_dynamics.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/microsoft_dynamics_gray.svg';
- readonly types: readonly ['accounting'];
- readonly isCorporateOnly: true;
- };
- readonly oracle: {
- readonly value: 'oracle';
- readonly text: 'Oracle';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/oracle.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/oracle_gray.svg';
- readonly types: readonly ['hr', 'accounting'];
- readonly isCorporateOnly: true;
- };
- readonly sage: {
- readonly value: 'sage';
- readonly text: 'Sage';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/sage.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/sage_gray.svg';
- readonly types: readonly ['accounting'];
- readonly isCorporateOnly: true;
- };
- readonly sap: {
- readonly value: 'sap';
- readonly text: 'SAP';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/sap.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/sap_gray.svg';
- readonly types: readonly ['accounting'];
- readonly isCorporateOnly: true;
- };
- readonly myob: {
- readonly value: 'myob';
- readonly text: 'MYOB';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/myob.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/myob_gray.svg';
- readonly types: readonly ['accounting'];
- readonly isCorporateOnly: true;
- };
- readonly workday: {
- readonly value: 'workday';
- readonly text: 'Workday';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/workday.svg';
- readonly gray_image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/workday_gray.svg';
- readonly types: readonly ['hr'];
- readonly isCorporateOnly: true;
- };
- readonly adp: {
- readonly value: 'adp';
- readonly text: 'ADP';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/export-icons/adp.svg';
- readonly types: readonly ['hr'];
- readonly isCorporateOnly: true;
- };
- readonly generic_indirect_connection: {
- readonly value: 'generic_indirect_connection';
- readonly text: 'Other';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/accounting-other--blue.svg';
- readonly types: readonly ['hr', 'accounting'];
- };
- };
- readonly DEFAULT_IS_TEMPLATES: {
- readonly default: {
- readonly value: 'default_template';
- readonly text: 'Basic Export';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/accounting-other--blue.svg';
- };
- readonly tag: {
- readonly value: 'tag_template';
- readonly text: 'Tag Export';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/accounting-other--blue.svg';
- };
- readonly category: {
- readonly value: 'category_template';
- readonly text: 'Category Export';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/accounting-other--blue.svg';
- };
- readonly detailed: {
- readonly value: 'detailed_export';
- readonly text: 'All Data - Expense Level Export';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/accounting-other--blue.svg';
- };
- readonly report: {
- readonly value: 'report_level_export';
- readonly text: 'All Data - Report Level Export';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/accounting-other--blue.svg';
- };
- readonly tax: {
- readonly value: 'multiple_tax_export';
- readonly text: 'Canadian Multiple Tax Export';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/accounting-other--blue.svg';
- };
- readonly perdiem: {
- readonly value: 'per_diem_export';
- readonly text: 'Per Diem Export';
- readonly image: 'https://d2k5nsl2zxldvw.cloudfront.net/images/icons/accounting-other--blue.svg';
- };
- };
- readonly NVP: {
- readonly DISMISSED_VIOLATIONS: 'dismissedViolations';
- };
- readonly FILESIZE: {
- readonly BYTES_IN_MEGABYTE: 1000000;
- readonly MAX: 10000000;
- };
- readonly PARTNER_NAMES: {
- readonly IPHONE: 'iphone';
- readonly ANDROID: 'android';
- readonly CHAT: 'chat-expensify-com';
- };
- readonly LOGIN_TYPES: {
- readonly WEB: 'login';
- readonly MOBILE: 'device';
- };
- readonly EXPENSIFY_CARD: {
- readonly FEED_NAME: 'Expensify Card';
- readonly FRAUD_STATES: {
- readonly NONE: 0;
- readonly DOMAIN_CARDS_REIMBURSEMENTS_INVESTIGATION: 1;
- readonly DOMAIN_CARDS_RAPID_INCREASE_INVESTIGATION: 2;
- readonly DOMAIN_CARDS_RAPID_INCREASE_CLEARED: 3;
- readonly DOMAIN_CARDS_RAPID_INCREASE_CONFIRMED: 4;
- readonly INDIVIDUAL_CARD_RAPID_INCREASE_INVESTIGATION: 5;
- readonly INDIVIDUAL_CARD_RAPID_INCREASE_CLEARED: 6;
- readonly INDIVIDUAL_CARD_RAPID_INCREASE_CONFIRMED: 7;
- readonly SUSPICIOUS_PAN_ENTRY: 8;
- readonly SUSPICIOUS_PAN_ENTRY_CLEARED: 9;
- readonly SUSPICIOUS_PAN_ENTRY_CONFIRMED: 10;
- };
- };
- readonly TRAVEL_BOOKING: {
- readonly OPTIONS: {
- readonly shortFlightFare: {
- readonly economy: 'Economy';
- readonly premiumEconomy: 'Premium Economy';
- readonly business: 'Business';
- readonly first: 'First';
- };
- readonly longFlightFare: {
- readonly economy: 'Economy';
- readonly premiumEconomy: 'Premium Economy';
- readonly business: 'Business';
- readonly first: 'First';
- };
- readonly hotelStar: {
- readonly oneStar: '1';
- readonly twoStars: '2';
- readonly threeStars: '3';
- readonly fourStars: '4';
- readonly fiveStars: '5';
- };
- };
- readonly DEFAULT_OPTIONS: {
- readonly shortFlightFare: 'economy';
- readonly longFlightFare: 'economy';
- readonly hotelStar: 'fourStars';
- };
- };
- readonly EXPENSIFY_DOMAINS: readonly ['expensify.com', 'expensifail.com', 'expensicorp.com'];
- readonly SUBSCRIPTION_CHANGE_REASONS: {
- 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 TOO_EXPENSIVE: {
- readonly id: 'tooExpensive';
- readonly label: 'Too expensive';
- readonly prompt: 'What software are you migrating to and what led to this decision?';
- };
- 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 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?';
- };
- };
-};
-/**
- * UI Constants
- */
-export declare const UI: {
- readonly ICON: {
- readonly DELETE: 'trashcan';
- readonly CAR: 'car';
- readonly CASH: 'cash';
- readonly MANAGED_CARD: 'corporate-card';
- readonly CARD: 'credit-card';
- readonly CLOCK: 'time';
- readonly PER_DIEM: 'per-diem';
- readonly PENDING_CARD: 'card-transaction-pending';
- readonly CSV_UPLOAD: 'csv-upload';
- readonly PENDING_CREDIT_CARD: 'credit-card-pending';
- };
- readonly spinnerDIV: '';
- readonly spinnerSmallDIV: '';
- readonly spinnerLargeDIV: '';
- readonly spinnerClass: 'view_spinner';
- readonly SPINNER: 'spinner';
- readonly imageURLPrefix: 'https://d2k5nsl2zxldvw.cloudfront.net/images/';
- readonly ACTIVE: 'active';
- readonly ERROR: 'error';
- readonly HIDDEN: 'hidden';
- readonly INVISIBLE: 'invisible';
- readonly DEPRECIATED: 'depreciated';
- readonly DISABLED: 'disabled';
- readonly REQUIRED: 'required';
- readonly SELECT_DEFAULT: '###';
- readonly SELECTED: 'selected';
- readonly QR_CODE: 'js_qrCode';
- readonly DIALOG_Z_INDEX: 4000;
-};
-export declare const PUBLIC_DOMAINS: readonly [
- 'accountant.com',
- 'afis.ch',
- 'aol.com',
- 'artlover.com',
- 'asia.com',
- 'att.net',
- 'bellsouth.net',
- 'bills.expensify.com',
- 'btinternet.com',
- 'cheerful.com',
- 'chromeexpensify.com',
- 'comcast.net',
- 'consultant.com',
- 'contractor.com',
- 'cox.net',
- 'cpa.com',
- 'cryptohistoryprice.com',
- 'dr.com',
- 'email.com',
- 'engineer.com',
- 'europe.com',
- 'evernote.user',
- 'execs.com',
- 'expensify.cash',
- 'expensify.sms',
- 'gmail.com',
- 'gmail.con',
- 'googlemail.com',
- 'hey.com',
- 'hotmail.co.uk',
- 'hotmail.com',
- 'hotmail.fr',
- 'hotmail.it',
- 'icloud.com',
- 'iname.com',
- 'jeeviess.com',
- 'live.com',
- 'mac.com',
- 'mail.com',
- 'mail.ru',
- 'mailfence.com',
- 'me.com',
- 'msn.com',
- 'musician.org',
- 'myself.com',
- 'outlook.com',
- 'pm.me',
- 'post.com',
- 'privaterelay.appleid.com',
- 'proton.me',
- 'protonmail.ch',
- 'protonmail.com',
- 'qq.com',
- 'rigl.ch',
- 'sasktel.net',
- 'sbcglobal.net',
- 'spacehotline.com',
- 'tafmail.com',
- 'techie.com',
- 'usa.com',
- 'verizon.net',
- 'vomoto.com',
- 'wolfandcranebar.tech',
- 'workmail.com',
- 'writeme.com',
- 'yahoo.ca',
- 'yahoo.co.in',
- 'yahoo.co.uk',
- 'yahoo.com',
- 'yahoo.com.br',
- 'ymail.com',
-];
diff --git a/lib/CONST.jsx b/lib/CONST.ts
similarity index 97%
rename from lib/CONST.jsx
rename to lib/CONST.ts
index b68261b4..0d80b0b9 100644
--- a/lib/CONST.jsx
+++ b/lib/CONST.ts
@@ -8,14 +8,14 @@ const MOMENT_FORMAT_STRING = 'YYYY-MM-DD';
/**
* URL of our CloudFront Instance
*/
-export const g_cloudFront = 'https://d2k5nsl2zxldvw.cloudfront.net';
+const g_cloudFront = 'https://d2k5nsl2zxldvw.cloudfront.net';
/**
* URL of our image CDN
*/
-export const g_cloudFrontImg = `${g_cloudFront}/images/`;
+const g_cloudFrontImg = `${g_cloudFront}/images/`;
-export const CONST = {
+const CONST = {
CORPAY_DIRECT_REIMBURSEMENT_CURRENCIES: ['USD', 'GBP', 'EUR', 'AUD', 'CAD'],
/**
@@ -361,6 +361,7 @@ export const CONST = {
*
* @type RegExp
*/
+ // eslint-disable-next-line no-misleading-character-class
EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
/**
@@ -560,6 +561,7 @@ export const CONST = {
'qa+travisreceipts@expensify.com',
'bills@expensify.com',
'admin@expensify.com',
+ 'notifications@expensify.com',
],
/**
@@ -865,30 +867,31 @@ export 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?',
},
},
-};
+ VIDEO_EXTENSIONS: ['mp4', 'mov', 'avi', 'wmv', 'flv', 'mkv', 'webm', '3gp', 'm4v', 'mpg', 'mpeg', 'ogv'],
+} as const;
/**
* UI Constants
*/
-export const UI = {
+const UI = {
ICON: {
DELETE: 'trashcan',
CAR: 'car',
@@ -922,10 +925,10 @@ export const UI = {
// Base z-index for dialogs $zindex-dialog in _vars.scss should take it's value from here!
DIALOG_Z_INDEX: 4000,
-};
+} as const;
// List of most frequently used public domains
-export const PUBLIC_DOMAINS = [
+const PUBLIC_DOMAINS = [
'accountant.com',
'afis.ch',
'aol.com',
@@ -997,4 +1000,6 @@ export const PUBLIC_DOMAINS = [
'yahoo.com',
'yahoo.com.br',
'ymail.com',
-];
+] as const;
+
+export {g_cloudFront, g_cloudFrontImg, CONST, UI, PUBLIC_DOMAINS};
diff --git a/lib/Cookie.jsx b/lib/Cookie.jsx
index 8dad1345..d2ae6f3c 100644
--- a/lib/Cookie.jsx
+++ b/lib/Cookie.jsx
@@ -58,7 +58,7 @@ function set(name, value, expiredays) {
// Get expiry date, set
const exdate = new Date();
exdate.setDate(exdate.getDate() + expiredays);
- document.cookie = `${name}=${encodeURIComponent(value)}` + `${expiredays === null ? '' : `;expires=${exdate.toUTCString()}`}`;
+ document.cookie = `${name}=${encodeURIComponent(value)}${expiredays === null ? '' : `;expires=${exdate.toUTCString()}`}`;
}
/**
diff --git a/lib/CredentialsWrapper.jsx b/lib/CredentialsWrapper.jsx
index b6283c07..90fe7759 100644
--- a/lib/CredentialsWrapper.jsx
+++ b/lib/CredentialsWrapper.jsx
@@ -1,6 +1,6 @@
import localForage from 'localforage';
-export const LOGIN_PARTNER_DETAILS = {
+const LOGIN_PARTNER_DETAILS = {
CREDENTIALS_KEY: 'DEVICE_SESSION_CREDENTIALS',
EXPENSIFY_PARTNER_PREFIX: 'expensify.',
PARTNER_NAME: 'chat-expensify-com',
@@ -33,6 +33,7 @@ const CredentialWrapper = {
*/
setCredentials(credentials) {
if (!credentials.partnerUserID || !credentials.partnerUserSecret) {
+ // eslint-disable-next-line prefer-promise-reject-errors
return Promise.reject('Invalid credential pair');
}
@@ -48,3 +49,4 @@ const CredentialWrapper = {
};
export default CredentialWrapper;
+export {LOGIN_PARTNER_DETAILS};
diff --git a/lib/Device.d.ts b/lib/Device.d.ts
deleted file mode 100644
index 6cb8abd3..00000000
--- a/lib/Device.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare function getOSAndName(): {
- os: string | undefined;
- osVersion: string | undefined;
- deviceName: string | undefined;
- deviceVersion: string | undefined;
-};
-export {getOSAndName};
diff --git a/lib/Device.jsx b/lib/Device.ts
similarity index 65%
rename from lib/Device.jsx
rename to lib/Device.ts
index 43419dba..1100cb45 100644
--- a/lib/Device.jsx
+++ b/lib/Device.ts
@@ -1,6 +1,13 @@
import {UAParser} from 'ua-parser-js';
-function getOSAndName() {
+type DeviceInfo = {
+ os: string | undefined;
+ osVersion: string | undefined;
+ deviceName: string | undefined;
+ deviceVersion: string | undefined;
+};
+
+function getOSAndName(): DeviceInfo {
const parser = new UAParser();
const result = parser.getResult();
return {
diff --git a/lib/ExpenseRule.jsx b/lib/ExpenseRule.jsx
index 5d614932..f2e89dd8 100644
--- a/lib/ExpenseRule.jsx
+++ b/lib/ExpenseRule.jsx
@@ -1,5 +1,3 @@
-import _ from 'underscore';
-
export default class ExpenseRule {
/**
* Creates a new instance of this class.
@@ -7,7 +5,7 @@ export default class ExpenseRule {
* @param {Array} ruleArray
*/
constructor(ruleArray) {
- _.each(ruleArray, (value, key) => {
+ ruleArray.forEach((value, key) => {
this[key] = value;
});
}
@@ -21,11 +19,7 @@ export default class ExpenseRule {
* @return {Object}
*/
getApplyWhenByField(field) {
- return (
- _.find(this.applyWhen, (conditions) => {
- return conditions.field === field;
- }) || {}
- );
+ return this.applyWhen.find((conditions) => conditions.field === field) || {};
}
/**
@@ -45,7 +39,7 @@ export default class ExpenseRule {
*/
isMatch(expense) {
let isMatch = true;
- _.each(this.applyWhen, (conditions) => {
+ this.applyWhen.forEach((conditions) => {
switch (conditions.field) {
case 'category':
if (!this.checkCondition(conditions.condition, conditions.value, expense.getCategory())) {
diff --git a/lib/ExpensiMark.d.ts b/lib/ExpensiMark.d.ts
deleted file mode 100644
index f431df7e..00000000
--- a/lib/ExpensiMark.d.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-declare type Replacement = (...args: string[], extras?: ExtrasObject) => string;
-declare type Name =
- | 'codeFence'
- | 'inlineCodeBlock'
- | 'email'
- | 'link'
- | 'hereMentions'
- | 'userMentions'
- | 'reportMentions'
- | 'autoEmail'
- | 'autolink'
- | 'quote'
- | 'italic'
- | 'bold'
- | 'strikethrough'
- | 'heading1'
- | 'newline'
- | 'replacepre'
- | 'listItem'
- | 'exclude'
- | 'anchor'
- | 'breakline'
- | 'blockquoteWrapHeadingOpen'
- | 'blockquoteWrapHeadingClose'
- | 'blockElementOpen'
- | 'blockElementClose'
- | 'stripTag';
-declare type Rule = {
- name: Name;
- process?: (textToProcess: string, replacement: Replacement) => string;
- regex?: RegExp;
- replacement: Replacement | string;
- pre?: (input: string) => string;
- post?: (input: string) => string;
-};
-
-declare type ExtrasObject = {
- reportIdToName?: Record;
- accountIDToName?: Record;
-};
-export default class ExpensiMark {
- rules: Rule[];
- htmlToMarkdownRules: Rule[];
- htmlToTextRules: Rule[];
- constructor();
- /**
- * Replaces markdown with html elements
- *
- * @param text - Text to parse as markdown
- * @param options - Options to customize the markdown parser
- * @param options.filterRules=[] - An array of name of rules as defined in this class.
- * If not provided, all available rules will be applied. If provided, only the rules in the array will be applied.
- * @param options.disabledRules=[] - An array of name of rules as defined in this class.
- * If not provided, all available rules will be applied. If provided, the rules in the array will be skipped.
- * @param options.shouldEscapeText=true - Whether or not the text should be escaped
- * @param options.shouldKeepRawInput=false - Whether or not the raw input should be kept and returned
- */
- replace(
- text: string,
- {
- filterRules,
- shouldEscapeText,
- shouldKeepRawInput,
- }?: {
- filterRules?: Name[];
- disabledRules?: Name[];
- shouldEscapeText?: boolean;
- shouldKeepRawInput?: boolean;
- },
- ): string;
- /**
- * Checks matched URLs for validity and replace valid links with html elements
- *
- * @param regex
- * @param textToCheck
- * @param replacement
- */
- modifyTextForUrlLinks(regex: RegExp, textToCheck: string, replacement: Replacement): string;
- /**
- * Checks matched Emails for validity and replace valid links with html elements
- *
- * @param regex
- * @param textToCheck
- * @param replacement
- */
- modifyTextForEmailLinks(regex: RegExp, textToCheck: string, replacement: Replacement): string;
- /**
- * replace block element with '\n' if :
- * 1. We have text within the element.
- * 2. The text does not end with a new line.
- * 3. The text does not have quote mark '>' .
- * 4. It's not the last element in the string.
- *
- * @param htmlString
- */
- replaceBlockElementWithNewLine(htmlString: string): string;
- /**
- * Replaces HTML with markdown
- *
- * @param htmlString
- * @param extras
- */
- htmlToMarkdown(htmlString: string, extras?: ExtrasObject): string;
- /**
- * Convert HTML to text
- *
- * @param htmlString
- * @param extras
- */
- htmlToText(htmlString: string, extras?: ExtrasObject): string;
- /**
- * Modify text for Quotes replacing chevrons with html elements
- *
- * @param regex
- * @param textToCheck
- * @param replacement
- */
- modifyTextForQuote(regex: RegExp, textToCheck: string, replacement: Replacement): string;
- /**
- * Format the content of blockquote if the text matches the regex or else just return the original text
- *
- * @param regex
- * @param textToCheck
- * @param replacement
- */
- formatTextForQuote(regex: RegExp, textToCheck: string, replacement: Replacement): string;
- /**
- * Check if the input text includes only the open or the close tag of an element.
- *
- * @param textToCheck - Text to check
- */
- containsNonPairTag(textToCheck: string): boolean;
- extractLinksInMarkdownComment(comment: string): string[] | undefined;
- /**
- * Compares two markdown comments and returns a list of the links removed in a new comment.
- *
- * @param oldComment
- * @param newComment
- */
- getRemovedMarkdownLinks(oldComment: string, newComment: string): string[];
-}
-export {};
diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.ts
similarity index 66%
rename from lib/ExpensiMark.js
rename to lib/ExpensiMark.ts
index 21f7081b..222b0f7d 100644
--- a/lib/ExpensiMark.js
+++ b/lib/ExpensiMark.ts
@@ -1,28 +1,124 @@
-import * as _ from 'underscore';
import Str from './str';
import * as Constants from './CONST';
import * as UrlPatterns from './Url';
-import Log from './Log';
+import Logger from './Logger';
+import * as Utils from './utils';
+
+type Extras = {
+ reportIDToName?: Record;
+ accountIDToName?: Record;
+ cacheVideoAttributes?: (vidSource: string, attrs: string) => void;
+ videoAttributeCache?: Record;
+};
+const EXTRAS_DEFAULT = {};
+
+type ReplacementFn = (extras: Extras, ...matches: string[]) => string;
+type Replacement = ReplacementFn | string;
+type ProcessFn = (textToProcess: string, replacement: Replacement, shouldKeepRawInput: boolean) => string;
+
+type CommonRule = {
+ name: string;
+ replacement: Replacement;
+ rawInputReplacement?: Replacement;
+ pre?: (input: string) => string;
+ post?: (input: string) => string;
+};
+
+type RuleWithRegex = CommonRule & {
+ regex: RegExp;
+};
+
+type RuleWithProcess = CommonRule & {
+ process: ProcessFn;
+};
+
+type Rule = RuleWithRegex | RuleWithProcess;
+
+type ReplaceOptions = {
+ extras?: Extras;
+ filterRules?: string[];
+ disabledRules?: string[];
+ shouldEscapeText?: boolean;
+ shouldKeepRawInput?: boolean;
+};
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 MARKDOWN_VIDEO_REGEX = new RegExp(
+ `\\!(?:\\[([^\\][]*(?:\\[[^\\][]*][^\\][]*)*)])?\\(((${UrlPatterns.MARKDOWN_URL_REGEX})\\.(?:${Constants.CONST.VIDEO_EXTENSIONS.join('|')}))\\)(?![^<]*(<\\/pre>|<\\/code>))`,
+ 'gi',
+);
+
const SLACK_SPAN_NEW_LINE_TAG = '';
export default class ExpensiMark {
+ static Log = new Logger({
+ serverLoggingCallback: () => undefined,
+ // eslint-disable-next-line no-console
+ clientLoggingCallback: (message) => console.warn(message),
+ isDebug: true,
+ });
+
+ /**
+ * Set the logger to use for logging inside of the ExpensiMark class
+ * @param logger - The logger object to use
+ */
+ static setLogger(logger: Logger) {
+ ExpensiMark.Log = logger;
+ }
+
+ /** Rules to apply to the text */
+ rules: Rule[];
+
+ /**
+ * The list of regex replacements to do on a HTML comment for converting it to markdown.
+ * Order of rules is important
+ */
+ htmlToMarkdownRules: RuleWithRegex[];
+
+ /**
+ * The list of rules to covert the HTML to text.
+ * Order of rules is important
+ */
+ htmlToTextRules: RuleWithRegex[];
+
+ /**
+ * The list of rules that we have to exclude in shouldKeepWhitespaceRules list.
+ */
+ whitespaceRulesToDisable = ['newline', 'replacepre', 'replacebr', 'replaceh1br'];
+
+ /**
+ * The list of rules that have to be applied when shouldKeepWhitespace flag is true.
+ */
+ filterRules: (rule: Rule) => boolean;
+
+ /**
+ * Filters rules to determine which should keep whitespace.
+ */
+ shouldKeepWhitespaceRules: Rule[];
+
+ /**
+ * maxQuoteDepth is the maximum depth of nested quotes that we want to support.
+ */
+ maxQuoteDepth: number;
+
+ /**
+ * currentQuoteDepth is the current depth of nested quotes that we are processing.
+ */
+ currentQuoteDepth: number;
+
constructor() {
/**
* The list of regex replacements to do on a comment. Check the link regex is first so links are processed
* before other delimiters
- *
- * @type {Object[]}
*/
this.rules = [
// Apply the emoji first avoid applying any other formatting rules inside of it
{
name: 'emoji',
regex: Constants.CONST.REG_EXP.EMOJI_RULE,
- replacement: (match) => `${match} `,
+ replacement: (_extras, match) => `${match} `,
},
/**
@@ -33,7 +129,7 @@ export default class ExpensiMark {
name: 'codeFence',
// ` is a backtick symbol we are matching on three of them before then after a new line character
- regex: /(```(?:\r\n|\n)?)((?:\s*?(?!(?:\r\n|\n)?```(?!`))[\S])+\s*?)((?=(?:\r\n|\n)?)```)/g,
+ regex: /(```(?:\r\n|\n))((?:\s*?(?!(?:\r\n|\n)?```(?!`))[\S])+\s*?(?:\r\n|\n))(```)/g,
// We're using a function here to perform an additional replace on the content
// inside the backticks because Android is not able to use tags and does
@@ -41,14 +137,13 @@ export default class ExpensiMark {
// with the new lines here since they need to be converted into
. And we don't
// want to do this anywhere else since that would break HTML.
// will create styling issues so use
- replacement: (match, __, textWithinFences) => {
+ replacement: (_extras, _match, _g1, textWithinFences) => {
const group = textWithinFences.replace(/(?:(?![\n\r])\s)/g, ' ');
return `${group}`;
},
- rawInputReplacement: (match, __, textWithinFences) => {
- const withinFences = match.replace(/(?:```)([\s\S]*?)(?:```)/g, '$1');
- const group = textWithinFences.replace(/(?:(?![\n\r])\s)/g, ' ');
- return `${group}`;
+ rawInputReplacement: (_extras, _match, _g1, textWithinFences) => {
+ const group = textWithinFences.replace(/(?:(?![\n\r])\s)/g, ' ').replace(/|<\/emoji>/g, '');
+ return `${group}`;
},
},
@@ -62,16 +157,8 @@ export default class ExpensiMark {
// Use the url escaped version of a backtick (`) symbol. Mobile platforms do not support lookbehinds,
// so capture the first and third group and place them in the replacement.
// but we should not replace backtick symbols if they include tags between them.
- regex: /(\B|_|)`(?:(?!(?:(?!`).)*?))(.*?\S.*?)`(\B|_|)(?!`|[^<]*<\/pre>)/g,
- replacement: (match, g1, g2, g3) => {
- const regex = /^[`]+$/i;
-
- // if content of the inline code block is only backtick symbols, we should not replace them with tag
- if (regex.test(g2)) {
- return match;
- }
- return `${g1}${g2}${g3}`;
- },
+ regex: /(\B|_|)`(.*?(?![`])\S.*?)`(\B|_|)(?!`|[^<]*<\/pre>)/gm,
+ replacement: '$1$2$3',
},
/**
@@ -83,9 +170,9 @@ export default class ExpensiMark {
name: 'email',
process: (textToProcess, replacement, shouldKeepRawInput) => {
const regex = new RegExp(`(?!\\[\\s*\\])\\[([^[\\]]*)]\\((mailto:)?${Constants.CONST.REG_EXP.MARKDOWN_EMAIL}\\)`, 'gim');
- return this.modifyTextForEmailLinks(regex, textToProcess, replacement, shouldKeepRawInput);
+ return this.modifyTextForEmailLinks(regex, textToProcess, replacement as ReplacementFn, shouldKeepRawInput);
},
- replacement: (match, g1, g2) => {
+ replacement: (_extras, match, g1, g2) => {
if (g1.match(Constants.CONST.REG_EXP.EMOJIS) || !g1.trim()) {
return match;
}
@@ -94,7 +181,7 @@ export default class ExpensiMark {
const formattedLabel = label === href ? g2 : label;
return `${formattedLabel}`;
},
- rawInputReplacement: (match, g1, g2, g3) => {
+ rawInputReplacement: (_extras, match, g1, g2, g3) => {
if (g1.match(Constants.CONST.REG_EXP.EMOJIS) || !g1.trim()) {
return match;
}
@@ -109,13 +196,37 @@ export default class ExpensiMark {
name: 'heading1',
process: (textToProcess, replacement, shouldKeepRawInput = false) => {
const regexp = shouldKeepRawInput ? /^# ( *(?! )(?:(?!|\n|\r\n).)+)/gm : /^# +(?! )((?:(?!|\n|\r\n).)+)/gm;
- return textToProcess.replace(regexp, replacement);
+ return this.replaceTextWithExtras(textToProcess, regexp, EXTRAS_DEFAULT, replacement);
},
replacement: '$1
',
},
/**
- * Converts markdown style images to img tags e.g. 
+ * Converts markdown style video to video tags e.g. 
+ * We need to convert before image rules since they will not try to create a image tag from an existing video URL
+ * Extras arg could contain the attribute cache for the video tag which is cached during the html-to-markdown conversion
+ */
+ {
+ name: 'video',
+ regex: MARKDOWN_VIDEO_REGEX,
+ /**
+ * @param extras - The extras object
+ * @param videoName - The first capture group - video name
+ * @param videoSource - The second capture group - video URL
+ * @return Returns the HTML video tag
+ */
+ replacement: (extras, _match, videoName, videoSource) => {
+ const extraAttrs = extras && extras.videoAttributeCache && extras.videoAttributeCache[videoSource];
+ return ``;
+ },
+ rawInputReplacement: (extras, _match, videoName, videoSource) => {
+ const extraAttrs = extras && extras.videoAttributeCache && extras.videoAttributeCache[videoSource];
+ return ``;
+ },
+ },
+
+ /**
+ * Converts markdown style images to image tags e.g. 
* We need to convert before linking rules since they will not try to create a link from an existing img
* tag.
* Additional sanitization is done to the alt attribute to prevent parsing it further to html by later
@@ -124,8 +235,8 @@ export default class ExpensiMark {
{
name: 'image',
regex: MARKDOWN_IMAGE_REGEX,
- replacement: (match, g1, g2) => `})
`,
- rawInputReplacement: (match, g1, g2) =>
+ replacement: (_extras, _match, g1, g2) => ``,
+ rawInputReplacement: (_extras, _match, g1, g2) =>
``,
},
@@ -136,14 +247,14 @@ export default class ExpensiMark {
*/
{
name: 'link',
- process: (textToProcess, replacement) => this.modifyTextForUrlLinks(MARKDOWN_LINK_REGEX, textToProcess, replacement),
- replacement: (match, g1, g2) => {
+ process: (textToProcess, replacement) => this.modifyTextForUrlLinks(MARKDOWN_LINK_REGEX, textToProcess, replacement as ReplacementFn),
+ replacement: (_extras, match, g1, g2) => {
if (g1.match(Constants.CONST.REG_EXP.EMOJIS) || !g1.trim()) {
return match;
}
return `${g1.trim()}`;
},
- rawInputReplacement: (match, g1, g2) => {
+ rawInputReplacement: (_extras, match, g1, g2) => {
if (g1.match(Constants.CONST.REG_EXP.EMOJIS) || !g1.trim()) {
return match;
}
@@ -161,7 +272,7 @@ export default class ExpensiMark {
{
name: 'hereMentions',
regex: /([a-zA-Z0-9.!$%&+/=?^`{|}_-]?)(@here)([.!$%&+/=?^`{|}_-]?)(?=\b)(?!([\w'#%+-]*@(?:[a-z\d-]+\.)+[a-z]{2,}(?:\s|$|@here))|((?:(?!|[^<]*(<\/pre>|<\/code>))/gm,
- replacement: (match, g1, g2, g3) => {
+ replacement: (_extras, match, g1, g2, g3) => {
if (!Str.isValidMention(match)) {
return match;
}
@@ -178,7 +289,7 @@ export default class ExpensiMark {
{
name: 'reportMentions',
- regex: /(?|<\/code>))/gimu,
replacement: '$1 ',
},
@@ -197,15 +308,21 @@ export default class ExpensiMark {
`(@here|[a-zA-Z0-9.!$%&+=?^\`{|}-]?)(@${Constants.CONST.REG_EXP.EMAIL_PART}|@${Constants.CONST.REG_EXP.PHONE_PART})(?!((?:(?!|[^<]*(<\\/pre>|<\\/code>))`,
'gim',
),
- replacement: (match, g1, g2) => {
- if (!Str.isValidMention(match)) {
+ replacement: (_extras, match, g1, g2) => {
+ const phoneNumberRegex = new RegExp(`^${Constants.CONST.REG_EXP.PHONE_PART}$`);
+ const mention = g2.slice(1);
+ const mentionWithoutSMSDomain = Str.removeSMSDomain(mention);
+ if (!Str.isValidMention(match) || (phoneNumberRegex.test(mentionWithoutSMSDomain) && !Str.isValidPhoneNumber(mentionWithoutSMSDomain))) {
return match;
}
const phoneRegex = new RegExp(`^@${Constants.CONST.REG_EXP.PHONE_PART}$`);
return `${g1}${g2}${phoneRegex.test(g2) ? `@${Constants.CONST.SMS.DOMAIN}` : ''} `;
},
- rawInputReplacement: (match, g1, g2) => {
- if (!Str.isValidMention(match)) {
+ rawInputReplacement: (_extras, match, g1, g2) => {
+ const phoneNumberRegex = new RegExp(`^${Constants.CONST.REG_EXP.PHONE_PART}$`);
+ const mention = g2.slice(1);
+ const mentionWithoutSMSDomain = Str.removeSMSDomain(mention);
+ if (!Str.isValidMention(match) || (phoneNumberRegex.test(mentionWithoutSMSDomain) && !Str.isValidPhoneNumber(mentionWithoutSMSDomain))) {
return match;
}
return `${g1}${g2} `;
@@ -227,14 +344,14 @@ export default class ExpensiMark {
process: (textToProcess, replacement) => {
const regex = new RegExp(`(?![^<]*>|[^<>]*<\\/(?!h1>))([_*~]*?)${UrlPatterns.MARKDOWN_URL_REGEX}\\1(?!((?:(?!|[^<]*(<\\/pre>|<\\/code>|.+\\/>))`, 'gi');
- return this.modifyTextForUrlLinks(regex, textToProcess, replacement);
+ return this.modifyTextForUrlLinks(regex, textToProcess, replacement as ReplacementFn);
},
- replacement: (match, g1, g2) => {
+ replacement: (_extras, _match, g1, g2) => {
const href = Str.sanitizeURL(g2);
return `${g1}${g2}${g1}`;
},
- rawInputReplacement: (_match, g1, g2) => {
+ rawInputReplacement: (_extras, _match, g1, g2) => {
const href = Str.sanitizeURL(g2);
return `${g1}${g2}${g1}`;
},
@@ -248,22 +365,40 @@ export default class ExpensiMark {
// inline code blocks. A single prepending space should be stripped if it exists
process: (textToProcess, replacement, shouldKeepRawInput = false) => {
const regex = /^(?:>)+ +(?! )(?![^<]*(?:<\/pre>|<\/code>))([^\v\n\r]+)/gm;
- const replaceFunction = (g1) => replacement(g1, shouldKeepRawInput);
if (shouldKeepRawInput) {
- return textToProcess.replace(regex, replaceFunction);
+ const rawInputRegex = /^(?:>)+ +(?! )(?![^<]*(?:<\/pre>|<\/code>))([^\v\n\r]*)/gm;
+ return this.replaceTextWithExtras(textToProcess, rawInputRegex, EXTRAS_DEFAULT, replacement);
}
- return this.modifyTextForQuote(regex, textToProcess, replacement);
+ return this.modifyTextForQuote(regex, textToProcess, replacement as ReplacementFn);
},
- replacement: (g1, shouldKeepRawInput = false) => {
+ replacement: (_extras, g1) => {
+ // We want to enable 2 options of nested heading inside the blockquote: "># heading" and "> # heading".
+ // To do this we need to parse body of the quote without first space
+ const handleMatch = (match: string) => match;
+ const textToReplace = g1.replace(/^>( )?/gm, handleMatch);
+ const filterRules = ['heading1'];
+
+ // if we don't reach the max quote depth we allow the recursive call to process possible quote
+ if (this.currentQuoteDepth < this.maxQuoteDepth - 1) {
+ filterRules.push('quote');
+ this.currentQuoteDepth++;
+ }
+
+ const replacedText = this.replace(textToReplace, {
+ filterRules,
+ shouldEscapeText: false,
+ shouldKeepRawInput: false,
+ });
+ this.currentQuoteDepth = 0;
+ return `${replacedText}
`;
+ },
+ rawInputReplacement: (_extras, g1) => {
// We want to enable 2 options of nested heading inside the blockquote: "># heading" and "> # heading".
// To do this we need to parse body of the quote without first space
let isStartingWithSpace = false;
- const handleMatch = (match, g2) => {
- if (shouldKeepRawInput) {
- isStartingWithSpace = !!g2;
- return '';
- }
- return match;
+ const handleMatch = (_match: string, g2: string) => {
+ isStartingWithSpace = !!g2;
+ return '';
};
const textToReplace = g1.replace(/^>( )?/gm, handleMatch);
const filterRules = ['heading1'];
@@ -277,30 +412,31 @@ export default class ExpensiMark {
const replacedText = this.replace(textToReplace, {
filterRules,
shouldEscapeText: false,
- shouldKeepRawInput,
+ shouldKeepRawInput: true,
});
this.currentQuoteDepth = 0;
return `${isStartingWithSpace ? ' ' : ''}${replacedText}
`;
},
},
+ /**
+ * Use \b in this case because it will match on words, letters,
+ * and _: https://www.rexegg.com/regex-boundaries.html#wordboundary
+ * Use [\s\S]* instead of .* to match newline
+ */
{
- /**
- * Use \b in this case because it will match on words, letters,
- * and _: https://www.rexegg.com/regex-boundaries.html#wordboundary
- * The !_blank is to prevent the `target="_blank">` section of the
- * link replacement from being captured Additionally, something like
- * `\b\_([^<>]*?)\_\b` doesn't work because it won't replace
- * `_https://www.test.com_`
- * Use [\s\S]* instead of .* to match newline
- */
name: 'italic',
- regex: /(?]*)(\b_+|\b)(?!_blank")_((?![\s_])[\s\S]*?[^\s_](?)(?![^<]*(<\/pre>|<\/code>|<\/a>|<\/mention-user>|_blank))/g,
+ regex: /(<(pre|code|a|mention-user)[^>]*>(.*?)<\/\2>)|((\b_+|\b)_((?![\s_])[\s\S]*?[^\s_](?)(?![^<]*(<\/pre>|<\/code>|<\/a>|<\/mention-user>)))/g,
+ replacement: (_extras, match, html, tag, content, text, extraLeadingUnderscores, textWithinUnderscores) => {
+ // Skip any , , , tag contents
+ if (html) {
+ return html;
+ }
- // We want to add extraLeadingUnderscores back before the tag unless textWithinUnderscores starts with valid email
- replacement: (match, extraLeadingUnderscores, textWithinUnderscores) => {
+ // If any tags are included inside underscores, ignore it. ie. _abc pre tag
abc_
if (textWithinUnderscores.includes('
') || this.containsNonPairTag(textWithinUnderscores)) {
return match;
}
+
if (String(textWithinUnderscores).match(`^${Constants.CONST.REG_EXP.MARKDOWN_EMAIL}`)) {
return `${extraLeadingUnderscores}${textWithinUnderscores}`;
}
@@ -326,12 +462,12 @@ export default class ExpensiMark {
// for * and ~: https://www.rexegg.com/regex-boundaries.html#notb
name: 'bold',
regex: /(?]*)\B\*(?![^<]*(?:<\/pre>|<\/code>|<\/a>))((?![\s*])[\s\S]*?[^\s*](?)(?![^<]*(<\/pre>|<\/code>|<\/a>))/g,
- replacement: (match, g1) => (g1.includes(' ') || this.containsNonPairTag(g1) ? match : `${g1}`),
+ replacement: (_extras, match, g1) => (g1.includes('
') || this.containsNonPairTag(g1) ? match : `${g1}`),
},
{
name: 'strikethrough',
regex: /(?]*)\B~((?![\s~])[\s\S]*?[^\s~](?)(?![^<]*(<\/pre>|<\/code>|<\/a>))/g,
- replacement: (match, g1) => (g1.includes('') || this.containsNonPairTag(g1) ? match : `${g1}`),
+ replacement: (_extras, match, g1) => (g1.includes('
') || this.containsNonPairTag(g1) ? match : `${g1}`),
},
{
name: 'newline',
@@ -355,7 +491,6 @@ export default class ExpensiMark {
/**
* The list of regex replacements to do on a HTML comment for converting it to markdown.
* Order of rules is important
- * @type {Object[]}
*/
this.htmlToMarkdownRules = [
// Used to Exclude tags
@@ -422,16 +557,32 @@ export default class ExpensiMark {
{
name: 'quote',
regex: /<(blockquote|q)(?:"[^"]*"|'[^']*'|[^'">])*>([\s\S]*?)<\/\1>(?![^<]*(<\/pre>|<\/code>))/gi,
- replacement: (match, g1, g2) => {
+ replacement: (_extras, _match, _g1, g2) => {
// We remove the line break before heading inside quote to avoid adding extra line
- let resultString = g2
+ let resultString: string[] | string = g2
.replace(/\n?(# )/g, '$1')
.replace(/(|<\/h1>)+/g, '\n')
.trim()
.split('\n');
- const prependGreaterSign = (m) => `> ${m}`;
- resultString = _.map(resultString, prependGreaterSign).join('\n');
+ // Wrap each string in the array with and
+ resultString = resultString.map((line) => {
+ return `${line}
`;
+ });
+
+ resultString = resultString
+ .map((text) => {
+ let modifiedText = text;
+ let depth;
+ do {
+ depth = (modifiedText.match(//gi) || []).length;
+ modifiedText = modifiedText.replace(//gi, '');
+ modifiedText = modifiedText.replace(/<\/blockquote>/gi, '');
+ } while (//i.test(modifiedText));
+ return `${'>'.repeat(depth)} ${modifiedText}`;
+ })
+ .join('\n');
+
// We want to keep tag here and let method replaceBlockElementWithNewLine to handle the line break later
return `${resultString}
`;
},
@@ -444,12 +595,12 @@ export default class ExpensiMark {
{
name: 'codeFence',
regex: /<(pre)(?:"[^"]*"|'[^']*'|[^'">])*>([\s\S]*?)(\n?)<\/\1>(?![^<]*(<\/pre>|<\/code>))/gi,
- replacement: (match, g1, g2) => `\`\`\`\n${g2}\n\`\`\``,
+ replacement: (_extras, _match, _g1, g2) => `\`\`\`\n${g2}\n\`\`\``,
},
{
name: 'anchor',
regex: /<(a)[^><]*href\s*=\s*(['"])(.*?)\2(?:".*?"|'.*?'|[^'"><])*>([\s\S]*?)<\/\1>(?![^<]*(<\/pre>|<\/code>))/gi,
- replacement: (match, g1, g2, g3, g4) => {
+ replacement: (_extras, _match, _g1, _g2, g3, g4) => {
const email = g3.startsWith('mailto:') ? g3.slice(7) : '';
if (email === g4) {
return email;
@@ -457,10 +608,11 @@ export default class ExpensiMark {
return `[${g4}](${email || g3})`;
},
},
+
{
name: 'image',
regex: /<]*src\s*=\s*(['"])(.*?)\1(?:[^><]*alt\s*=\s*(['"])(.*?)\3)?[^><]*>*(?![^<][\s\S]*?(<\/pre>|<\/code>))/gi,
- replacement: (match, g1, g2, g3, g4) => {
+ replacement: (_extras, _match, _g1, g2, _g3, g4) => {
if (g4) {
return ``;
}
@@ -468,13 +620,38 @@ export default class ExpensiMark {
return `!(${g2})`;
},
},
+
+ {
+ name: 'video',
+ regex: /<]*data-expensify-source\s*=\s*(['"])(\S*?)\1(.*?)>([^><]*)<\/video>*(?![^<][\s\S]*?(<\/pre>|<\/code>))/gi,
+ /**
+ * @param extras - The extras object
+ * @param match The full match
+ * @param _g1 The first capture group
+ * @param videoSource - the second capture group - video source (video URL)
+ * @param videoAttrs - the third capture group - video attributes (data-expensify-width, data-expensify-height, etc...)
+ * @param videoName - the fourth capture group will be the video file name (the text between opening and closing video tags)
+ * @returns The markdown video tag
+ */
+ replacement: (extras, _match, _g1, videoSource, videoAttrs, videoName) => {
+ if (videoAttrs && extras && extras.cacheVideoAttributes && typeof extras.cacheVideoAttributes === 'function') {
+ extras.cacheVideoAttributes(videoSource, videoAttrs);
+ }
+ if (videoName) {
+ return ``;
+ }
+
+ return `!(${videoSource})`;
+ },
+ },
+
{
name: 'reportMentions',
regex: /(.*?)<\/mention-user>)/gi,
+ replacement: (extras, _match, g1, g2, _offset, _string) => {
+ if (g1) {
+ const accountToNameMap = extras.accountIDToName;
+ if (!accountToNameMap || !accountToNameMap[g1]) {
+ ExpensiMark.Log.alert('[ExpensiMark] Missing account name', {accountID: g1});
+ return '@Hidden';
+ }
- return `@${extras.accountIdToName[g1]}`;
+ return `@${extras.accountIDToName?.[g1]}`;
+ }
+ return Str.removeSMSDomain(g2);
},
},
];
@@ -499,7 +679,6 @@ export default class ExpensiMark {
/**
* The list of rules to covert the HTML to text.
* Order of rules is important
- * @type {Object[]}
*/
this.htmlToTextRules = [
{
@@ -540,10 +719,10 @@ export default class ExpensiMark {
{
name: 'reportMentions',
regex: /|<\/div>||\n<\/comment>|<\/comment>||<\/h1>||<\/h2>||<\/h3>||<\/h4>||<\/h5>||<\/h6>|
|<\/p>|
|<\/li>||<\/blockquote>/,
);
- const stripHTML = (text) => Str.stripHTML(text);
- splitText = _.map(splitText, stripHTML);
+ const stripHTML = (text: string) => Str.stripHTML(text);
+ splitText = splitText.map(stripHTML);
let joinedText = '';
// Delete whitespace at the end
@@ -841,7 +1003,7 @@ export default class ExpensiMark {
splitText.pop();
}
- const processText = (text, index) => {
+ const processText = (text: string, index: number) => {
if (text.trim().length === 0 && !text.match(/\n/)) {
return;
}
@@ -861,13 +1023,8 @@ export default class ExpensiMark {
/**
* Replaces HTML with markdown
- *
- * @param {String} htmlString
- * @param {Object} extras
- *
- * @returns {String}
*/
- htmlToMarkdown(htmlString, extras = {}) {
+ htmlToMarkdown(htmlString: string, extras: Extras = EXTRAS_DEFAULT): string {
let generatedMarkdown = htmlString;
const body = /<(body)(?:"[^"]*"|'[^']*'|[^'"><])*>(?:\n|\r\n)?([\s\S]*?)(?:\n|\r\n)?<\/\1>(?![^<]*(<\/pre>|<\/code>))/im;
const parseBodyTag = generatedMarkdown.match(body);
@@ -877,15 +1034,13 @@ export default class ExpensiMark {
generatedMarkdown = parseBodyTag[2];
}
- const processRule = (rule) => {
+ const processRule = (rule: RuleWithRegex) => {
// Pre-processes input HTML before applying regex
if (rule.pre) {
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;
- generatedMarkdown = generatedMarkdown.replace(rule.regex, replacementFunction);
+ generatedMarkdown = this.replaceTextWithExtras(generatedMarkdown, rule.regex, extras, rule.replacement);
};
this.htmlToMarkdownRules.forEach(processRule);
@@ -894,18 +1049,11 @@ export default class ExpensiMark {
/**
* Convert HTML to text
- *
- * @param {String} htmlString
- * @param {Object} extras
- *
- * @returns {String}
*/
- htmlToText(htmlString, extras = {}) {
+ htmlToText(htmlString: string, extras: Extras = EXTRAS_DEFAULT): string {
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;
- replacedText = replacedText.replace(rule.regex, replacementFunction);
+ const processRule = (rule: RuleWithRegex) => {
+ replacedText = this.replaceTextWithExtras(replacedText, rule.regex, extras, rule.replacement);
};
this.htmlToTextRules.forEach(processRule);
@@ -918,15 +1066,8 @@ export default class ExpensiMark {
/**
* Modify text for Quotes replacing chevrons with html elements
- *
- * @param {RegExp} regex
- * @param {String} textToCheck
- * @param {Function} replacement
- *
- * @returns {String}
*/
-
- modifyTextForQuote(regex, textToCheck, replacement) {
+ modifyTextForQuote(regex: RegExp, textToCheck: string, replacement: ReplacementFn): string {
let replacedText = '';
let textToFormat = '';
const match = textToCheck.match(regex);
@@ -981,40 +1122,30 @@ export default class ExpensiMark {
/**
* Format the content of blockquote if the text matches the regex or else just return the original text
- *
- * @param {RegExp} regex
- * @param {String} textToCheck
- * @param {Function} replacement
- *
- * @returns {String}
*/
- formatTextForQuote(regex, textToCheck, replacement) {
+ formatTextForQuote(regex: RegExp, textToCheck: string, replacement: ReplacementFn): string {
if (textToCheck.match(regex)) {
// Remove '>' and trim the spaces between nested quotes
- const formatRow = (row) => {
+ const formatRow = (row: string) => {
const quoteContent = row[4] === ' ' ? row.substr(5) : row.substr(4);
if (quoteContent.trimStart().startsWith('>')) {
return quoteContent.trimStart();
}
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);
+ return replacement(EXTRAS_DEFAULT, textToFormat);
}
return textToCheck;
}
/**
* Check if the input text includes only the open or the close tag of an element.
- *
- * @param {String} textToCheck - Text to check
- *
- * @returns {Boolean}
*/
- containsNonPairTag(textToCheck) {
+ containsNonPairTag(textToCheck: string): boolean {
// Create a regular expression to match HTML tags
const tagRegExp = /<([a-z][a-z0-9-]*)\b[^>]*>|<\/([a-z][a-z0-9-]*)\s*>/gi;
@@ -1047,10 +1178,9 @@ export default class ExpensiMark {
}
/**
- * @param {String} comment
- * @returns {Array} or undefined if exception occurs when executing regex matching
+ * @returns array or undefined if exception occurs when executing regex matching
*/
- extractLinksInMarkdownComment(comment) {
+ extractLinksInMarkdownComment(comment: string): string[] | undefined {
try {
const htmlString = this.replace(comment, {filterRules: ['link']});
// We use same anchor tag template as link and autolink rules to extract link
@@ -1058,35 +1188,30 @@ export default 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.sanitizeURL(match[1]);
- const links = _.map(matches, sanitizeMatch);
+ const sanitizeMatch = (match: RegExpExecArray) => Str.sanitizeURL(match[1]);
+ const links = matches.map(sanitizeMatch);
return links;
} catch (e) {
- // eslint-disable-next-line no-console
- console.warn('Error parsing url in ExpensiMark.extractLinksInMarkdownComment', {error: e});
+ ExpensiMark.Log.alert('Error parsing url in ExpensiMark.extractLinksInMarkdownComment', {error: e});
return undefined;
}
}
/**
* Compares two markdown comments and returns a list of the links removed in a new comment.
- *
- * @param {String} oldComment
- * @param {String} newComment
- * @returns {Array}
*/
- getRemovedMarkdownLinks(oldComment, newComment) {
+ getRemovedMarkdownLinks(oldComment: string, newComment: string): string[] {
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
- * @param {String} content - string content that possible contains HTML
- * @returns {String} - original MD content escaped for use in HTML attribute value
+ * @param content - string content that possible contains HTML
+ * @returns original MD content escaped for use in HTML attribute value
*/
- escapeAttributeContent(content) {
+ escapeAttributeContent(content: string): string {
let originalContent = this.htmlToMarkdown(content);
if (content === originalContent) {
return content;
@@ -1095,6 +1220,22 @@ export default 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.replaceAll(originalContent, '\n', '');
- return _.escape(originalContent);
+ return Utils.escape(originalContent);
+ }
+
+ /**
+ * Replaces text with a replacement based on a regex
+ * @param text - The text to replace
+ * @param regexp - The regex to match
+ * @param extras - The extras object
+ * @param replacement - The replacement string or function
+ * @returns The replaced text
+ */
+ replaceTextWithExtras(text: string, regexp: RegExp, extras: Extras, replacement: Replacement): string {
+ if (typeof replacement === 'function') {
+ // if the replacement is a function, we pass the extras object to it
+ return text.replace(regexp, (...args) => replacement(extras, ...args));
+ }
+ return text.replace(regexp, replacement);
}
}
diff --git a/lib/Func.jsx b/lib/Func.jsx
index 3a636b47..7d1ccefb 100644
--- a/lib/Func.jsx
+++ b/lib/Func.jsx
@@ -1,5 +1,4 @@
-import $ from 'jquery';
-import _ from 'underscore';
+import * as Utils from './utils';
/**
* Invokes the given callback with the given arguments
@@ -11,7 +10,7 @@ import _ from 'underscore';
* @returns {Mixed}
*/
function invoke(callback, args, scope) {
- if (!_(callback).isFunction()) {
+ if (!Utils.isFunction(callback)) {
return null;
}
@@ -26,18 +25,18 @@ function invoke(callback, args, scope) {
* @param {Array} [args]
* @param {Object} [scope]
*
- * @returns {$.Deferred}
+ * @returns {Promise}
*/
function invokeAsync(callback, args, scope) {
- if (!_(callback).isFunction()) {
- return new $.Deferred().resolve();
+ if (!Utils.isFunction(callback)) {
+ return Promise.resolve();
}
let promiseFromCallback = callback.apply(scope, args || []);
// If there was not a promise returned from the prefetch callback, then create a dummy promise and resolve it
if (!promiseFromCallback) {
- promiseFromCallback = new $.Deferred().resolve();
+ promiseFromCallback = Promise.resolve();
}
return promiseFromCallback;
@@ -68,7 +67,11 @@ function die() {
* @returns {Array}
*/
function mapByName(list, methodName) {
- return _.map(list, (item) => item[methodName].call(item));
+ let arr = list;
+ if (!Array.isArray(arr)) {
+ arr = Object.values(arr);
+ }
+ return arr.map((item) => item[methodName].call(item));
}
export {invoke, invokeAsync, bulkInvoke, die, mapByName};
diff --git a/lib/Log.jsx b/lib/Log.jsx
index ba0ca1b1..3c90d904 100644
--- a/lib/Log.jsx
+++ b/lib/Log.jsx
@@ -1,7 +1,8 @@
-import _ from 'underscore';
+/* eslint-disable no-console */
import API from './API';
import Network from './Network';
import Logger from './Logger';
+import * as Utils from './utils';
/**
* Network interface for logger.
@@ -22,11 +23,11 @@ function serverLoggingCallback(logger, params) {
* @param {String} message
*/
function clientLoggingCallback(message) {
- if (typeof window.g_printableReport !== 'undefined' && window.g_printableReport === true) {
+ if (Utils.isWindowAvailable() && typeof window.g_printableReport !== 'undefined' && window.g_printableReport === true) {
return;
}
- if (window.console && _.isFunction(console.log)) {
+ if (window.console && Utils.isFunction(console.log)) {
console.log(message);
}
}
@@ -34,5 +35,5 @@ function clientLoggingCallback(message) {
export default new Logger({
serverLoggingCallback,
clientLoggingCallback,
- isDebug: window.DEBUG,
+ isDebug: Utils.isWindowAvailable() ? window.DEBUG : false,
});
diff --git a/lib/Logger.d.ts b/lib/Logger.d.ts
deleted file mode 100644
index f2b6995e..00000000
--- a/lib/Logger.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-declare type Parameters = string | Record | Array>;
-declare type ServerLoggingCallbackOptions = {api_setCookie: boolean; logPacket: string};
-declare type ServerLoggingCallback = (logger: Logger, options: ServerLoggingCallbackOptions) => Promise<{requestID: string}> | undefined;
-declare type ClientLoggingCallBack = (message: string) => void;
-declare type LogLine = {message: string; parameters: Parameters; onlyFlushWithOthers: boolean; timestamp: Date};
-export default class Logger {
- logLines: LogLine[];
- serverLoggingCallback: ServerLoggingCallback;
- clientLoggingCallback: ClientLoggingCallBack;
- isDebug: boolean;
- constructor({serverLoggingCallback, isDebug, clientLoggingCallback}: {serverLoggingCallback: ServerLoggingCallback; isDebug: boolean; clientLoggingCallback: ClientLoggingCallBack});
- /**
- * Ask the server to write the log message
- */
- logToServer(): void;
- /**
- * Add a message to the list
- * @param message
- * @param parameters The parameters associated with the message
- * @param forceFlushToServer Should we force flushing all logs to server?
- * @param onlyFlushWithOthers A request will never be sent to the server if all loglines have this set to true
- */
- add(message: string, parameters: Parameters, forceFlushToServer: boolean, onlyFlushWithOthers?: boolean): void;
- /**
- * Caches an informational message locally, to be sent to the server if
- * needed later.
- *
- * @param message The message to log.
- * @param sendNow if true, the message will be sent right away.
- * @param parameters The parameters to send along with the message
- * @param onlyFlushWithOthers A request will never be sent to the server if all loglines have this set to true
- */
- info(message: string, sendNow?: boolean, parameters?: Parameters, onlyFlushWithOthers?: boolean): void;
- /**
- * Logs an alert.
- *
- * @param message The message to alert.
- * @param parameters The parameters to send along with the message
- * @param includeStackTrace Must be disabled for testing
- */
- alert(message: string, parameters?: Parameters, includeStackTrace?: boolean): void;
- /**
- * Logs a warn.
- *
- * @param message The message to warn.
- * @param parameters The parameters to send along with the message
- */
- warn(message: string, parameters?: Parameters): void;
- /**
- * Logs a hmmm.
- *
- * @param message The message to hmmm.
- * @param parameters The parameters to send along with the message
- */
- hmmm(message: string, parameters?: Parameters): void;
- /**
- * Logs a message in the browser console.
- *
- * @param message The message to log.
- */
- client(message: string): void;
-}
-export {};
diff --git a/lib/Logger.jsx b/lib/Logger.jsx
deleted file mode 100644
index d1e8180b..00000000
--- a/lib/Logger.jsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import _ from 'underscore';
-
-const MAX_LOG_LINES_BEFORE_FLUSH = 50;
-export default class Logger {
- constructor({serverLoggingCallback, isDebug, clientLoggingCallback}) {
- // An array of log lines that limits itself to a certain number of entries (deleting the oldest)
- this.logLines = [];
- this.serverLoggingCallback = serverLoggingCallback;
- this.clientLoggingCallback = clientLoggingCallback;
- this.isDebug = isDebug;
-
- // Public Methods
- return {
- info: this.info.bind(this),
- alert: this.alert.bind(this),
- warn: this.warn.bind(this),
- hmmm: this.hmmm.bind(this),
- client: this.client.bind(this),
- };
- }
-
- /**
- * Ask the server to write the log message
- */
- logToServer() {
- // We do not want to call the server with an empty list or if all the lines has onlyFlushWithOthers=true
- if (!this.logLines.length || _.all(this.logLines, (l) => l.onlyFlushWithOthers)) {
- return;
- }
-
- // We don't care about log setting web cookies so let's define it as false
- const linesToLog = _.map(this.logLines, (l) => {
- delete l.onlyFlushWithOthers;
- return l;
- });
- this.logLines = [];
- const promise = this.serverLoggingCallback(this, {api_setCookie: false, logPacket: JSON.stringify(linesToLog)});
- if (!promise) {
- return;
- }
- promise.then((response) => {
- if (response.requestID) {
- this.info('Previous log requestID', false, {requestID: response.requestID}, true);
- }
- });
- }
-
- /**
- * Add a message to the list
- * @param {String} message
- * @param {Object|String} parameters The parameters associated with the message
- * @param {Boolean} forceFlushToServer Should we force flushing all logs to server?
- * @param {Boolean} onlyFlushWithOthers A request will never be sent to the server if all loglines have this set to true
- */
- add(message, parameters, forceFlushToServer, onlyFlushWithOthers = false) {
- const length = this.logLines.push({
- message,
- parameters,
- onlyFlushWithOthers,
- timestamp: new Date(),
- });
-
- if (this.isDebug) {
- this.client(`${message} - ${JSON.stringify(parameters)}`);
- }
-
- // If we're over the limit, flush the logs
- if (length > MAX_LOG_LINES_BEFORE_FLUSH || forceFlushToServer) {
- this.logToServer();
- }
- }
-
- /**
- * Caches an informational message locally, to be sent to the server if
- * needed later.
- *
- * @param {String} message The message to log.
- * @param {Boolean} sendNow if true, the message will be sent right away.
- * @param {Object|String} parameters The parameters to send along with the message
- * @param {Boolean} onlyFlushWithOthers A request will never be sent to the server if all loglines have this set to true
- */
- info(message, sendNow = false, parameters = '', onlyFlushWithOthers = false) {
- const msg = `[info] ${message}`;
- this.add(msg, parameters, sendNow, onlyFlushWithOthers);
- }
-
- /**
- * Logs an alert.
- *
- * @param {String} message The message to alert.
- * @param {Object|String} parameters The parameters to send along with the message
- * @param {Boolean} includeStackTrace Must be disabled for testing
- */
- alert(message, parameters = {}, includeStackTrace = true) {
- const msg = `[alrt] ${message}`;
- const params = parameters;
-
- if (includeStackTrace) {
- params.stack = JSON.stringify(new Error().stack);
- }
-
- this.add(msg, params, true);
- }
-
- /**
- * Logs a warn.
- *
- * @param {String} message The message to warn.
- * @param {Object|String} parameters The parameters to send along with the message
- */
- warn(message, parameters = '') {
- const msg = `[warn] ${message}`;
- this.add(msg, parameters, true);
- }
-
- /**
- * Logs a hmmm.
- *
- * @param {String} message The message to hmmm.
- * @param {Object|String} parameters The parameters to send along with the message
- */
- hmmm(message, parameters = '') {
- const msg = `[hmmm] ${message}`;
- this.add(msg, parameters, false);
- }
-
- /**
- * Logs a message in the browser console.
- *
- * @param {String} message The message to log.
- */
- client(message) {
- if (!this.clientLoggingCallback) {
- return;
- }
-
- this.clientLoggingCallback(message);
- }
-}
diff --git a/lib/Logger.ts b/lib/Logger.ts
new file mode 100644
index 00000000..61756cf3
--- /dev/null
+++ b/lib/Logger.ts
@@ -0,0 +1,153 @@
+type Parameters = string | Record | Array> | Error;
+type ServerLoggingCallbackOptions = {api_setCookie: boolean; logPacket: string};
+type ServerLoggingCallback = (logger: Logger, options: ServerLoggingCallbackOptions) => Promise<{requestID: string}> | undefined;
+type ClientLoggingCallBack = (message: string) => void;
+type LogLine = {message: string; parameters: Parameters; onlyFlushWithOthers?: boolean; timestamp: Date};
+type LoggerOptions = {serverLoggingCallback: ServerLoggingCallback; isDebug: boolean; clientLoggingCallback: ClientLoggingCallBack};
+
+const MAX_LOG_LINES_BEFORE_FLUSH = 50;
+
+export default class Logger {
+ logLines: LogLine[];
+
+ serverLoggingCallback: ServerLoggingCallback;
+
+ clientLoggingCallback: ClientLoggingCallBack;
+
+ isDebug: boolean;
+
+ constructor({serverLoggingCallback, isDebug, clientLoggingCallback}: LoggerOptions) {
+ // An array of log lines that limits itself to a certain number of entries (deleting the oldest)
+ this.logLines = [];
+ this.serverLoggingCallback = serverLoggingCallback;
+ this.clientLoggingCallback = clientLoggingCallback;
+ this.isDebug = isDebug;
+
+ // Public Methods
+ this.info = this.info.bind(this);
+ this.alert = this.alert.bind(this);
+ this.warn = this.warn.bind(this);
+ this.hmmm = this.hmmm.bind(this);
+ this.client = this.client.bind(this);
+ }
+
+ /**
+ * Ask the server to write the log message
+ */
+ logToServer(): void {
+ // We do not want to call the server with an empty list or if all the lines has onlyFlushWithOthers=true
+ if (!this.logLines.length || this.logLines?.every((l) => l.onlyFlushWithOthers)) {
+ return;
+ }
+
+ // We don't care about log setting web cookies so let's define it as false
+ const linesToLog = this.logLines?.map((l) => {
+ // eslint-disable-next-line no-param-reassign
+ delete l.onlyFlushWithOthers;
+ return l;
+ });
+ this.logLines = [];
+ const promise = this.serverLoggingCallback(this, {api_setCookie: false, logPacket: JSON.stringify(linesToLog)});
+ if (!promise) {
+ return;
+ }
+ // eslint-disable-next-line rulesdir/prefer-early-return
+ promise.then((response) => {
+ if (!response.requestID) {
+ return;
+ }
+ this.info('Previous log requestID', false, {requestID: response.requestID}, true);
+ });
+ }
+
+ /**
+ * Add a message to the list
+ * @param parameters The parameters associated with the message
+ * @param forceFlushToServer Should we force flushing all logs to server?
+ * @param onlyFlushWithOthers A request will never be sent to the server if all loglines have this set to true
+ */
+ add(message: string, parameters: Parameters, forceFlushToServer: boolean, onlyFlushWithOthers = false) {
+ const length = this.logLines.push({
+ message,
+ parameters,
+ onlyFlushWithOthers,
+ timestamp: new Date(),
+ });
+
+ if (this.isDebug) {
+ this.client(`${message} - ${JSON.stringify(parameters)}`);
+ }
+
+ // If we're over the limit, flush the logs
+ if (length > MAX_LOG_LINES_BEFORE_FLUSH || forceFlushToServer) {
+ this.logToServer();
+ }
+ }
+
+ /**
+ * Caches an informational message locally, to be sent to the server if
+ * needed later.
+ *
+ * @param message The message to log.
+ * @param sendNow if true, the message will be sent right away.
+ * @param parameters The parameters to send along with the message
+ * @param onlyFlushWithOthers A request will never be sent to the server if all loglines have this set to true
+ */
+ info(message: string, sendNow = false, parameters: Parameters = '', onlyFlushWithOthers = false) {
+ const msg = `[info] ${message}`;
+ this.add(msg, parameters, sendNow, onlyFlushWithOthers);
+ }
+
+ /**
+ * Logs an alert.
+ *
+ * @param message The message to alert.
+ * @param parameters The parameters to send along with the message
+ * @param includeStackTrace Must be disabled for testing
+ */
+ alert(message: string, parameters: Parameters = {}, includeStackTrace = true) {
+ const msg = `[alrt] ${message}`;
+ const params = parameters;
+
+ if (includeStackTrace && typeof params === 'object' && !Array.isArray(params)) {
+ params.stack = JSON.stringify(new Error().stack);
+ }
+
+ this.add(msg, params, true);
+ }
+
+ /**
+ * Logs a warn.
+ *
+ * @param {String} message The message to warn.
+ * @param {Object|String} parameters The parameters to send along with the message
+ */
+ warn(message: string, parameters: Parameters = '') {
+ const msg = `[warn] ${message}`;
+ this.add(msg, parameters, true);
+ }
+
+ /**
+ * Logs a hmmm.
+ *
+ * @param message The message to hmmm.
+ * @param parameters The parameters to send along with the message
+ */
+ hmmm(message: string, parameters: Parameters = '') {
+ const msg = `[hmmm] ${message}`;
+ this.add(msg, parameters, false);
+ }
+
+ /**
+ * Logs a message in the browser console.
+ *
+ * @param message The message to log.
+ */
+ client(message: string) {
+ if (!this.clientLoggingCallback) {
+ return;
+ }
+
+ this.clientLoggingCallback(message);
+ }
+}
diff --git a/lib/Network.jsx b/lib/Network.jsx
index ee388da0..7d109a2f 100644
--- a/lib/Network.jsx
+++ b/lib/Network.jsx
@@ -1,5 +1,5 @@
import $ from 'jquery';
-import _ from 'underscore';
+import * as Utils from './utils';
/**
* Adds our API command to the URL so the API call is more easily identified in the
@@ -40,9 +40,11 @@ export default function Network(endpoint) {
}
// Attach a listener to the event indicating that we're leaving a page
- window.onbeforeunload = () => {
- isNavigatingAway = true;
- };
+ if (Utils.isWindowAvailable()) {
+ window.onbeforeunload = () => {
+ isNavigatingAway = true;
+ };
+ }
return {
/**
@@ -64,6 +66,7 @@ export default function Network(endpoint) {
if (isNewURLFormat) {
// Remove command from parameters and use it in the URL
const command = parameters.command;
+ // eslint-disable-next-line no-param-reassign
delete parameters.command;
newURL = `${endpoint}${command}`;
}
@@ -83,7 +86,7 @@ export default function Network(endpoint) {
// Check to see if parameters contains a File or Blob object
// If it does, we should use formData instead of parameters and update
// the ajax settings accordingly
- _(parameters).each((value, key) => {
+ Object.entries(parameters).forEach(([key, value]) => {
if (!value) {
return;
}
@@ -129,14 +132,14 @@ export default function Network(endpoint) {
// Add our data as form data
const formData = new FormData();
- _(parameters).each((value, key) => {
- if (_.isUndefined(value)) {
+ Object.entries(parameters).forEach(([key, value]) => {
+ if (value === undefined) {
return;
}
- if (_.isArray(value)) {
- _.each(value, (valueItem, i) => {
- if (_.isObject(valueItem)) {
- _.each(valueItem, (valueItemObjectValue, valueItemObjectKey) => {
+ if (Array.isArray(value)) {
+ value.forEach((valueItem, i) => {
+ if (Utils.isObject(valueItem)) {
+ Object.entries(valueItem).forEach(([valueItemObjectKey, valueItemObjectValue]) => {
formData.append(`${key}[${i}][${valueItemObjectKey}]`, valueItemObjectValue);
});
} else {
diff --git a/lib/Num.jsx b/lib/Num.jsx
index 82b864d9..80d83c1c 100644
--- a/lib/Num.jsx
+++ b/lib/Num.jsx
@@ -1,4 +1,3 @@
-import _ from 'underscore';
import Str from './str';
export default {
@@ -123,7 +122,7 @@ export default {
* @returns {Boolean} true if the number is finite and not NaN.
*/
isFiniteNumber(number) {
- return _.isNumber(number) && _.isFinite(number) && !_.isNaN(number);
+ return typeof number === 'number' && Number.isFinite(number) && !Number.isNaN(number);
},
/**
diff --git a/lib/PubSub.jsx b/lib/PubSub.jsx
index 31014c4a..aa0df607 100644
--- a/lib/PubSub.jsx
+++ b/lib/PubSub.jsx
@@ -1,6 +1,7 @@
-import _ from 'underscore';
import has from 'lodash/has';
+import {once} from 'lodash';
import Log from './Log';
+import * as Utils from './utils';
/**
* PubSub
@@ -45,14 +46,14 @@ const PubSubModule = {
return;
}
- const eventIDs = _.keys(eventMap[eventName]);
+ const eventIDs = eventMap[eventName].keys();
if (eventName === this.ERROR) {
// Doing the split slice 2 because the 1st element of the stacktrace will always be from here (PubSub.publish)
// When debugging, we just need to know who called PubSub.publish (so, all next elements in the stack)
Log.hmmm('Error published', 0, {tplt: param.tplt, stackTrace: new Error().stack.split(' at ').slice(2)});
}
- _.each(eventIDs, (eventID) => {
+ eventIDs.forEach((eventID) => {
const subscriber = eventMap[eventName][eventID];
if (subscriber) {
subscriber.callback.call(subscriber.scope, param);
@@ -71,8 +72,8 @@ const PubSubModule = {
* @returns {String}
*/
once(eventName, callback, optionalScope) {
- const scope = _.isObject(optionalScope) ? optionalScope : window;
- const functionToCallOnce = _.once((...args) => callback.apply(scope, args));
+ const scope = Utils.isObject(optionalScope) && optionalScope !== null ? optionalScope : window;
+ const functionToCallOnce = once((...args) => callback.apply(scope, args));
return this.subscribe(eventName, functionToCallOnce);
},
@@ -93,8 +94,8 @@ const PubSubModule = {
throw new Error('Attempted to subscribe to undefined event');
}
- const callback = _.isFunction(optionalCallback) ? optionalCallback : () => {};
- const scope = _.isObject(optionalScope) ? optionalScope : window;
+ const callback = Utils.isFunction(optionalCallback) ? optionalCallback : () => {};
+ const scope = Utils.isObject(optionalScope) && optionalScope !== null ? optionalScope : window;
const eventID = generateID(eventName);
if (eventMap[eventName] === undefined) {
@@ -115,8 +116,8 @@ const PubSubModule = {
* @param {String} bindID The id of the element to delete
*/
unsubscribe(bindID) {
- const IDs = _.isArray(bindID) ? bindID : [bindID];
- _.each(IDs, (id) => {
+ const IDs = Array.isArray(bindID) ? bindID : [bindID];
+ IDs.forEach((id) => {
const eventName = extractEventName(id);
if (has(eventMap, `${eventName}.${id}`)) {
delete eventMap[eventName][id];
@@ -125,4 +126,4 @@ const PubSubModule = {
},
};
-export default window !== undefined && window.PubSub ? window.PubSub : PubSubModule;
+export default Utils.isWindowAvailable() && window.PubSub ? window.PubSub : PubSubModule;
diff --git a/lib/ReportHistoryStore.jsx b/lib/ReportHistoryStore.jsx
index 6cabca88..b92f694b 100644
--- a/lib/ReportHistoryStore.jsx
+++ b/lib/ReportHistoryStore.jsx
@@ -1,4 +1,3 @@
-import _ from 'underscore';
import {Deferred} from 'simply-deferred';
export default class ReportHistoryStore {
@@ -31,11 +30,12 @@ export default class ReportHistoryStore {
*
* @returns {Object[]}
*/
- this.filterHiddenActions = (historyItems) => _.filter(historyItems, (historyItem) => historyItem.shouldShow);
+ this.filterHiddenActions = (historyItems) => historyItems.filter((historyItem) => historyItem.shouldShow);
/**
* Public Methods
*/
+
return {
/**
* Returns the history for a given report.
@@ -124,7 +124,7 @@ export default class ReportHistoryStore {
this.getFromCache(reportID)
.done((cachedHistory) => {
// Do we have the reportAction immediately before this one?
- if (_.some(cachedHistory, ({reportActionID}) => reportActionID === reportAction.reportActionID)) {
+ if (cachedHistory.some(({reportActionID}) => reportActionID === reportAction.reportActionID)) {
// If we have the previous one then we can assume we have an up to date history minus the most recent
// and must merge it into the cache
this.mergeHistoryByTimestamp(reportID, [reportAction]);
@@ -149,7 +149,7 @@ export default class ReportHistoryStore {
* @param {String[]} events
*/
bindCacheClearingEvents: (events) => {
- _.each(events, (event) => this.PubSub.subscribe(event, () => (this.cache = {})));
+ events.each((event) => this.PubSub.subscribe(event, () => (this.cache = {})));
},
// We need this to be publically available for cases where we get the report history
@@ -169,19 +169,15 @@ export default class ReportHistoryStore {
return;
}
- const newCache = _.reduce(
- newHistory.reverse(),
- (prev, curr) => {
- if (!_.findWhere(prev, {sequenceNumber: curr.sequenceNumber})) {
- prev.unshift(curr);
- }
- return prev;
- },
- this.cache[reportID] || [],
- );
+ const newCache = newHistory.reverse().reduce((prev, curr) => {
+ if (!prev.some((item) => item.sequenceNumber === curr.sequenceNumber)) {
+ prev.unshift(curr);
+ }
+ return prev;
+ }, this.cache[reportID] || []);
// Sort items in case they have become out of sync
- this.cache[reportID] = _.sortBy(newCache, 'sequenceNumber').reverse();
+ this.cache[reportID] = newCache.sort((a, b) => b.sequenceNumber - a.sequenceNumber);
}
/**
@@ -195,19 +191,15 @@ export default class ReportHistoryStore {
return;
}
- const newCache = _.reduce(
- newHistory.reverse(),
- (prev, curr) => {
- if (!_.findWhere(prev, {reportActionTimestamp: curr.reportActionTimestamp})) {
- prev.unshift(curr);
- }
- return prev;
- },
- this.cache[reportID] || [],
- );
+ const newCache = newHistory.reverse().reduce((prev, curr) => {
+ if (!prev.some((item) => item.reportActionTimestamp === curr.reportActionTimestamp)) {
+ prev.unshift(curr);
+ }
+ return prev;
+ }, this.cache[reportID] || []);
// Sort items in case they have become out of sync
- this.cache[reportID] = _.sortBy(newCache, 'reportActionTimestamp').reverse();
+ this.cache[reportID] = newCache.sort((a, b) => b.reportActionTimestamp - a.reportActionTimestamp);
}
/**
@@ -228,7 +220,7 @@ export default class ReportHistoryStore {
// We'll poll the API for the un-cached history
const cachedHistory = this.cache[reportID] || [];
- const firstHistoryItem = _.first(cachedHistory) || {};
+ const firstHistoryItem = cachedHistory[0] || {};
// Grab the most recent sequenceNumber we have and poll the API for fresh data
this.API.Report_GetHistory({
@@ -263,9 +255,6 @@ export default class ReportHistoryStore {
delete this.cache[reportID];
}
- // We'll poll the API for the un-cached history
- const cachedHistory = this.cache[reportID] || [];
-
this.API.Report_GetHistory({
reportID,
})
@@ -293,7 +282,7 @@ export default class ReportHistoryStore {
const cachedHistory = this.cache[reportID] || [];
// If comment is not in cache then fetch it
- if (_.isEmpty(cachedHistory)) {
+ if (cachedHistory.length === 0) {
return this.getFlatHistory(reportID);
}
diff --git a/lib/Templates.jsx b/lib/Templates.jsx
index 5f2c3878..17be9b2f 100644
--- a/lib/Templates.jsx
+++ b/lib/Templates.jsx
@@ -1,5 +1,6 @@
-import _ from 'underscore';
import $ from 'jquery';
+import {template as createTemplate} from 'lodash';
+import * as Utils from './utils';
/**
* JS Templating system, powered by underscore template
@@ -36,7 +37,7 @@ export default (function () {
*/
get(data = {}) {
if (!this.compiled) {
- this.compiled = _.template(this.templateValue);
+ this.compiled = createTemplate(this.templateValue);
this.templateValue = '';
}
return this.compiled(data);
@@ -67,9 +68,10 @@ export default (function () {
get(data = {}) {
// Add the "template" object to the parameter to allow nested templates
const dataToCompile = {...data};
+ // eslint-disable-next-line no-undef
dataToCompile.nestedTemplate = Templates.get;
if (!this.compiled) {
- this.compiled = _.template($(`#${this.id}`).html());
+ this.compiled = createTemplate($(`#${this.id}`).html());
}
return this.compiled(dataToCompile);
}
@@ -83,7 +85,7 @@ export default (function () {
*/
function getTemplate(templatePath) {
let template = templateStore;
- _.each(templatePath, (pathname) => {
+ templatePath.forEach((pathname) => {
template = template[pathname];
});
return template;
@@ -102,7 +104,7 @@ export default (function () {
for (let argumentNumber = 0; argumentNumber < wantedNamespace.length; argumentNumber++) {
currentArgument = wantedNamespace[argumentNumber];
- if (_.isUndefined(namespace[currentArgument])) {
+ if (namespace[currentArgument] === undefined) {
namespace[currentArgument] = {};
}
namespace = namespace[currentArgument];
@@ -119,22 +121,18 @@ export default (function () {
* @return {String}
*/
get(templatePath, data = {}) {
- try {
- const template = getTemplate(templatePath);
- if (_.isUndefined(template)) {
- throw Error(`Template '${templatePath}' is not defined`);
- }
-
- // Check for the absense of get which means someone is likely using
- // the templating engine wrong and trying to access a template namespace
- if (!{}.propertyIsEnumerable.call(template, 'get')) {
- throw Error(`'${templatePath}' is not a valid template path`);
- }
+ const template = getTemplate(templatePath);
+ if (template === undefined) {
+ throw Error(`Template '${templatePath}' is not defined`);
+ }
- return template.get(data);
- } catch (err) {
- throw err;
+ // Check for the absense of get which means someone is likely using
+ // the templating engine wrong and trying to access a template namespace
+ if (!{}.propertyIsEnumerable.call(template, 'get')) {
+ throw Error(`'${templatePath}' is not a valid template path`);
}
+
+ return template.get(data);
},
/**
@@ -143,7 +141,7 @@ export default (function () {
* @return {Boolean}
*/
has(templatePath) {
- return !_.isUndefined(getTemplate(templatePath));
+ return getTemplate(templatePath) !== undefined;
},
/**
@@ -151,6 +149,7 @@ export default (function () {
*/
init() {
// Read the DOM to find all the templates, and make them available to the code
+ // eslint-disable-next-line rulesdir/prefer-underscore-method
$('.js_template').each((__, $el) => {
const namespaceElements = $el.id.split('_');
const id = namespaceElements.pop();
@@ -170,13 +169,13 @@ export default (function () {
*/
register(wantedNamespace, templateData) {
const namespace = getTemplateNamespace(wantedNamespace);
- _.each(_.keys(templateData), (key) => {
+ Object.keys(templateData).forEach((key) => {
const template = templateData[key];
- if (_.isObject(template)) {
+ if (Utils.isObject(template)) {
// If the template is an object, add templates for all keys
namespace[key] = {};
- _.each(_.keys(template), (templateKey) => {
+ Object.keys(template).forEach((templateKey) => {
namespace[key][templateKey] = new InlineTemplate(template[templateKey]);
});
} else {
diff --git a/lib/components/StepProgressBar.js b/lib/components/StepProgressBar.js
index d682ef4a..f6564a88 100644
--- a/lib/components/StepProgressBar.js
+++ b/lib/components/StepProgressBar.js
@@ -1,5 +1,4 @@
import React from 'react';
-import _ from 'underscore';
import PropTypes from 'prop-types';
import cn from 'classnames';
import * as UIConstants from '../CONST';
@@ -24,7 +23,7 @@ const propTypes = {
*/
function StepProgressBar({steps, currentStep}) {
const isCurrentStep = (step) => step.id === currentStep;
- const currentStepIndex = Math.max(0, _.findIndex(steps, isCurrentStep));
+ const currentStepIndex = Math.max(0, steps.findIndex(isCurrentStep));
const renderStep = (step, i) => {
let status = currentStepIndex === i ? UIConstants.UI.ACTIVE : '';
@@ -52,7 +51,7 @@ function StepProgressBar({steps, currentStep}) {
id="js_steps_progress"
className="progress-wrapper"
>
- {_.map(steps, renderStep)}
+ {steps.map(renderStep)}
);
}
diff --git a/lib/components/form/element/combobox.js b/lib/components/form/element/combobox.js
index 6843cd51..53a6e10b 100644
--- a/lib/components/form/element/combobox.js
+++ b/lib/components/form/element/combobox.js
@@ -2,12 +2,10 @@ import React from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import cn from 'classnames';
-import _ from 'underscore';
-import get from 'lodash/get';
-import has from 'lodash/has';
-import uniqBy from 'lodash/uniqBy';
+import {defer, has, isEqual, template, uniqBy} from 'lodash';
import Str from '../../../str';
import DropDown from './dropdown';
+import * as Utils from '../../../utils';
const propTypes = {
// These are the elements to show in the dropdown
@@ -54,6 +52,7 @@ const propTypes = {
// that are already selected with the check mark.
alreadySelectedOptions: PropTypes.arrayOf(
PropTypes.shape({
+ id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
text: PropTypes.string,
}),
@@ -186,39 +185,39 @@ class Combobox extends React.Component {
}
// Our dropdown will be open, so we need to listen for our click away events
// and put focus on the input
- _.defer(this.resetClickAwayHandler);
+ defer(this.resetClickAwayHandler);
$(this.value).focus().select();
}
// eslint-disable-next-line react/no-unsafe
UNSAFE_componentWillReceiveProps(nextProps) {
- if (_.isUndefined(nextProps.value) || _.isEmpty(nextProps.value) || _.isEqual(nextProps.value, this.state.currentValue)) {
+ if (!nextProps.value || isEqual(nextProps.value, this.state.currentValue)) {
return;
}
this.setValue(nextProps.value);
- if (!_.isUndefined(nextProps.options)) {
+ if (nextProps.options !== undefined) {
// If the options have an id property, we use that to compare them and determine if they changed, if not
// we'll use the whole options array.
if (has(nextProps.options, '0.id')) {
if (
- !_.isEqual(_.pluck(nextProps.options, 'id'), _.pluck(this.props.options, 'id')) ||
- !_.isEqual(_.pluck(nextProps.alreadySelectedOptions, 'id'), _.pluck(this.props.alreadySelectedOptions, 'id'))
+ nextProps.options.some((option, index) => !isEqual(option.id, this.props.options[index].id)) ||
+ nextProps.alreadySelectedOptions.some((alreadySelectedOption, index) => !isEqual(alreadySelectedOption.id, this.props.alreadySelectedOptions[index].id))
) {
this.reset(false, nextProps.options, nextProps.alreadySelectedOptions);
}
- } else if (!_.isEqual(nextProps.options, this.props.options) || !_.isEqual(nextProps.alreadySelectedOptions, this.props.alreadySelectedOptions)) {
+ } else if (!isEqual(nextProps.options, this.props.options) || !isEqual(nextProps.alreadySelectedOptions, this.props.alreadySelectedOptions)) {
this.reset(false, nextProps.options, nextProps.alreadySelectedOptions);
}
}
- if (!_.isUndefined(nextProps.openOnInit) && !_.isEqual(nextProps.openOnInit, this.props.openOnInit)) {
+ if (nextProps.openOnInit !== undefined && !isEqual(nextProps.openOnInit, this.props.openOnInit)) {
this.setState({
isDropdownOpen: nextProps.openOnInit,
});
}
- if (!_.isUndefined(nextProps.isReadOnly) && !_.isEqual(nextProps.isReadOnly, this.props.isReadOnly)) {
+ if (nextProps.isReadOnly !== undefined && !isEqual(nextProps.isReadOnly, this.props.isReadOnly)) {
this.setState({
isDisabled: nextProps.isReadOnly,
});
@@ -249,8 +248,8 @@ class Combobox extends React.Component {
// Select the new item, set our new indexes, close the dropdown
// Unselect all other options
- let newSelectedIndex = _(this.options).findIndex({value: selectedValue});
- let currentlySelectedOption = _(this.options).findWhere({value: selectedValue});
+ let newSelectedIndex = this.options.findIndex({value: selectedValue});
+ let currentlySelectedOption = this.options.findWhere({value: selectedValue});
// If allowAnyValue is true and currentValue is absent then set it manually to what the user has entered.
if (newSelectedIndex === -1 && this.props.allowAnyValue && selectedValue) {
@@ -278,9 +277,9 @@ class Combobox extends React.Component {
selectedIndex: newSelectedIndex,
focusedIndex: newSelectedIndex,
currentValue: selectedValue,
- currentText: get(currentlySelectedOption, 'text', ''),
+ currentText: (currentlySelectedOption && currentlySelectedOption.text) || '',
isDropdownOpen: false,
- hasError: get(currentlySelectedOption, 'hasError', false),
+ hasError: (currentlySelectedOption && currentlySelectedOption.hasError) || false,
},
stateUpdateCallback,
);
@@ -448,7 +447,7 @@ class Combobox extends React.Component {
const matchingOptionWithoutSMSDomain = (o) => (Str.isString(o) ? Str.removeSMSDomain(o.value) : o.value) === currentValue && !o.isFake;
// We use removeSMSDomain here in case currentValue is a phone number
- let defaultSelectedOption = _(this.options).find(matchingOptionWithoutSMSDomain);
+ let defaultSelectedOption = this.options.find(matchingOptionWithoutSMSDomain);
// If no default was found and initialText was present then we can use initialText values
if (!defaultSelectedOption && this.initialText) {
@@ -480,13 +479,13 @@ class Combobox extends React.Component {
// Get the divider index if we have one
const findDivider = (option) => option.divider;
- const dividerIndex = _.findIndex(this.options, findDivider);
+ const dividerIndex = this.options.findIndex(findDivider);
// Split into two arrays everything before and after the divider (if the divider does not exist then we'll return a single array)
const splitOptions = dividerIndex ? [this.options.slice(0, dividerIndex + 1), this.options.slice(dividerIndex + 1)] : [this.options];
const formatOption = (option) => ({
focused: false,
- isSelected: option.selected && (_.isEqual(option.value, currentValue) || Boolean(_.findWhere(alreadySelected, {value: option.value}))),
+ isSelected: option.selected && (isEqual(option.value, currentValue) || Boolean(alreadySelected.find((item) => item.value === option.value))),
...option,
});
@@ -500,9 +499,13 @@ class Combobox extends React.Component {
};
// Take each array and format it, sort it, and move selected items to top (if applicable)
- const formatOptions = (array) => _.chain(array).map(formatOption).sortBy(sortByOption).first(this.props.maxItemsToShow).value();
+ const formatOptions = (array) =>
+ array
+ .map(formatOption)
+ .sort((a, b) => sortByOption(a) - sortByOption(b))
+ .slice(0, this.props.maxItemsToShow);
- const truncatedOptions = _.chain(splitOptions).map(formatOptions).flatten().value();
+ const truncatedOptions = splitOptions.map(formatOptions).flat();
if (!truncatedOptions.length) {
truncatedOptions.push({
@@ -542,18 +545,18 @@ class Combobox extends React.Component {
setValue(val) {
// We need to look in `this.options` for the matching option because `this.state.options` is a truncated list
// and might not have every option
- const optionMatchingVal = _.findWhere(this.options, {value: val});
- const currentText = get(optionMatchingVal, 'text', '');
+ const optionMatchingVal = this.options.find((option) => option.value === val);
+ const currentText = optionMatchingVal?.text || '';
const deselectOption = (initialOption) => {
const option = initialOption;
- const isSelected = _.isEqual(option.value, val);
- option.isSelected = isSelected || Boolean(_.findWhere(this.props.alreadySelectedOptions, {value: option.value}));
+ const isSelected = isEqual(option.value, val);
+ option.isSelected = isSelected || Boolean(this.props.alreadySelectedOptions.find((optionItem) => optionItem.value === option.value));
return option;
};
- const deselectOptions = (options) => _(options).map(deselectOption);
+ const deselectOptions = (options) => options.map(deselectOption);
const setValueState = (state) => ({
currentValue: val,
@@ -575,8 +578,8 @@ class Combobox extends React.Component {
// See if there is a value in the options that matches the text we want to set. If the option
// does exist, then use the text property of that option for the text to display. If the option
// does not exist, then just display whatever value was passed
- const optionMatchingVal = _.findWhere(this.options, {value: val});
- const currentText = get(optionMatchingVal, 'text', val);
+ const optionMatchingVal = this.options.find((option) => option.value === val);
+ const currentText = (optionMatchingVal && optionMatchingVal.text) || val;
this.initialValue = currentText;
this.initialText = currentText;
this.setState({currentText});
@@ -668,7 +671,7 @@ class Combobox extends React.Component {
};
const setValueState = (state) => ({
- options: _(state.options).map(resetFocusedProperty),
+ options: state.options.map(resetFocusedProperty),
});
this.setState(setValueState);
@@ -855,11 +858,13 @@ class Combobox extends React.Component {
const formatOption = (option) => ({
focused: false,
- isSelected: _.isEqual(option.value ? option.value.toUpperCase : '', value.toUpperCase()) || Boolean(_.findWhere(this.props.alreadySelectedOptions, {value: option.value})),
+ isSelected:
+ isEqual(option.value ? option.value.toUpperCase : '', value.toUpperCase()) ||
+ Boolean(this.props.alreadySelectedOptions.find((optionItem) => optionItem.value === option.value)),
...option,
});
- const options = _(matches).map(formatOption);
+ const options = matches.map(formatOption);
// Focus the first option if there is one and show a message dependent on what options are present
if (options.length) {
@@ -876,7 +881,7 @@ class Combobox extends React.Component {
}
} else {
options.push({
- text: this.props.allowAnyValue ? value : _.template(this.props.noResultsText)({value}),
+ text: this.props.allowAnyValue ? value : template(this.props.noResultsText)({value}),
value: this.props.allowAnyValue ? value : '',
isSelectable: this.props.allowAnyValue,
isFake: true,
@@ -933,7 +938,7 @@ class Combobox extends React.Component {
aria-label="..."
onChange={this.performSearch}
onKeyDown={this.closeDropdownOnTabOut}
- value={this.props.propertyToDisplay === 'value' ? _.unescape(this.state.currentValue) : _.unescape(this.state.currentText.replace(/ /g, ''))}
+ value={this.props.propertyToDisplay === 'value' ? Utils.unescape(this.state.currentValue) : Utils.unescape(this.state.currentText.replace(/ /g, ''))}
onFocus={this.openDropdown}
autoComplete="off"
placeholder={this.props.placeholder}
diff --git a/lib/components/form/element/dropdown.js b/lib/components/form/element/dropdown.js
index df78770e..2b1d7d45 100644
--- a/lib/components/form/element/dropdown.js
+++ b/lib/components/form/element/dropdown.js
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import cn from 'classnames';
-import _ from 'underscore';
+import {uniqueId} from 'lodash';
import DropDownItem from './dropdownItem';
const propTypes = {
@@ -65,7 +65,7 @@ class DropDown extends React.Component {
renderOption(option) {
return (
{_.map(options, this.renderOption)};
+ return {options.map(this.renderOption)}
;
}
}
diff --git a/lib/components/form/element/onOffSwitch.jsx b/lib/components/form/element/onOffSwitch.jsx
index b3a4da29..72780595 100644
--- a/lib/components/form/element/onOffSwitch.jsx
+++ b/lib/components/form/element/onOffSwitch.jsx
@@ -19,6 +19,7 @@ const propTypes = {
labelOnRight: PropTypes.bool,
// Classes of the label
+ // eslint-disable-next-line react/forbid-prop-types
labelClasses: PropTypes.any,
// True if the switch is on
@@ -176,6 +177,7 @@ class OnOffSwitch extends Component {
descriptionElm = (
);
diff --git a/lib/components/form/element/switch.js b/lib/components/form/element/switch.js
index 8ad6807b..96447352 100644
--- a/lib/components/form/element/switch.js
+++ b/lib/components/form/element/switch.js
@@ -3,7 +3,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import cn from 'classnames';
-import _ from 'underscore';
/**
* Form Element Switch - Displays an on/off switch
@@ -95,18 +94,14 @@ class Switch extends React.Component {
}
e.preventDefault();
- Modal.confirm(
- _.extend(
- {
- onYesCallback: () => {
- // Toggle the checked property and then fire our change handler
- this.checkbox.checked = !this.getValue();
- Func.invoke(this.props.onChange, [this.getValue()]);
- },
- },
- this.props.confirm,
- ),
- );
+ Modal.confirm({
+ ...(this.props.confirm ?? {}),
+ onYesCallback: () => {
+ // Toggle the checked property and then fire our change handler
+ this.checkbox.checked = !this.getValue();
+ Func.invoke(this.props.onChange, [this.getValue()]);
+ },
+ });
return false;
}
diff --git a/lib/fastMerge.d.ts b/lib/fastMerge.d.ts
deleted file mode 100644
index 4355619f..00000000
--- a/lib/fastMerge.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Merges two objects and removes null values if "shouldRemoveNullObjectValues" is set to true
- *
- * We generally want to remove null values from objects written to disk and cache, because it decreases the amount of data stored in memory and on disk.
- * On native, when merging an existing value with new changes, SQLite will use JSON_PATCH, which removes top-level nullish values.
- * To be consistent with the behaviour for merge, we'll also want to remove null values for "set" operations.
- */
-declare function fastMerge(target: T, source: T, shouldRemoveNullObjectValues: boolean): T;
-
-export default fastMerge;
diff --git a/lib/fastMerge.js b/lib/fastMerge.js
deleted file mode 100644
index 57352cff..00000000
--- a/lib/fastMerge.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import _ from 'underscore';
-
-// Mostly copied from https://medium.com/@lubaka.a/how-to-remove-lodash-performance-improvement-b306669ad0e1
-
-/**
- * @param {mixed} val
- * @returns {boolean}
- */
-function isMergeableObject(val) {
- const nonNullObject = val != null ? typeof val === 'object' : false;
- return nonNullObject && Object.prototype.toString.call(val) !== '[object RegExp]' && Object.prototype.toString.call(val) !== '[object Date]' && !_.isArray(val);
-}
-
-/**
- * @param {Object} target
- * @param {Object} source
- * @param {Boolean} shouldRemoveNullObjectValues
- * @returns {Object}
- */
-function mergeObject(target, source, shouldRemoveNullObjectValues = true) {
- const destination = {};
- if (isMergeableObject(target)) {
- // lodash adds a small overhead so we don't use it here
- const targetKeys = _.keys(target);
- for (let i = 0; i < targetKeys.length; ++i) {
- const key = targetKeys[i];
-
- // If shouldRemoveNullObjectValues is true, we want to remove null values from the merged object
- const isSourceOrTargetNull = target[key] === null || source[key] === null;
- const shouldOmitSourceKey = shouldRemoveNullObjectValues && isSourceOrTargetNull;
-
- if (!shouldOmitSourceKey) {
- destination[key] = target[key];
- }
- }
- }
-
- // lodash adds a small overhead so we don't use it here
- const sourceKeys = _.keys(source);
- for (let i = 0; i < sourceKeys.length; ++i) {
- const key = sourceKeys[i];
-
- // If shouldRemoveNullObjectValues is true, we want to remove null values from the merged object
- const shouldOmitSourceKey = shouldRemoveNullObjectValues && source[key] === null;
-
- // If we pass undefined as the updated value for a key, we want to generally ignore it
- const isSourceKeyUndefined = source[key] === undefined;
-
- if (!isSourceKeyUndefined && !shouldOmitSourceKey) {
- const isSourceKeyMergable = isMergeableObject(source[key]);
-
- if (isSourceKeyMergable && target[key]) {
- if (!shouldRemoveNullObjectValues || isSourceKeyMergable) {
- // eslint-disable-next-line no-use-before-define
- destination[key] = fastMerge(target[key], source[key], shouldRemoveNullObjectValues);
- }
- } else if (!shouldRemoveNullObjectValues || source[key] !== null) {
- destination[key] = source[key];
- }
- }
- }
-
- return destination;
-}
-
-/**
- * Merges two objects and removes null values if "shouldRemoveNullObjectValues" is set to true
- *
- * We generally want to remove null values from objects written to disk and cache, because it decreases the amount of data stored in memory and on disk.
- * On native, when merging an existing value with new changes, SQLite will use JSON_PATCH, which removes top-level nullish values.
- * To be consistent with the behaviour for merge, we'll also want to remove null values for "set" operations.
- *
- * @param {Object|Array} target
- * @param {Object|Array} source
- * @param {Boolean} shouldRemoveNullObjectValues
- * @returns {Object|Array}
- */
-function fastMerge(target, source, shouldRemoveNullObjectValues = true) {
- // We have to ignore arrays and nullish values here,
- // otherwise "mergeObject" will throw an error,
- // because it expects an object as "source"
- if (_.isArray(source) || source === null || source === undefined) {
- return source;
- }
- return mergeObject(target, source, shouldRemoveNullObjectValues);
-}
-
-export default fastMerge;
diff --git a/lib/fastMerge.ts b/lib/fastMerge.ts
new file mode 100644
index 00000000..a7ce03bd
--- /dev/null
+++ b/lib/fastMerge.ts
@@ -0,0 +1,88 @@
+/* eslint-disable @typescript-eslint/prefer-for-of */
+
+// Mostly copied from https://medium.com/@lubaka.a/how-to-remove-lodash-performance-improvement-b306669ad0e1
+
+/**
+ * Checks whether the given value can be merged. It has to be an object, but not an array, RegExp or Date.
+ */
+function isMergeableObject(value: unknown): value is Record {
+ const nonNullObject = value != null ? typeof value === 'object' : false;
+ return nonNullObject && Object.prototype.toString.call(value) !== '[object RegExp]' && Object.prototype.toString.call(value) !== '[object Date]' && !Array.isArray(value);
+}
+
+/**
+ * Merges the source object into the target object.
+ * @param target - The target object.
+ * @param source - The source object.
+ * @param shouldRemoveNestedNulls - If true, null object values will be removed.
+ * @returns - The merged object.
+ */
+function mergeObject>(target: TObject, source: TObject, shouldRemoveNullObjectValues = true): TObject {
+ const destination: Record = {};
+
+ if (isMergeableObject(target)) {
+ // lodash adds a small overhead so we don't use it here
+ const targetKeys = Object.keys(target);
+ for (let i = 0; i < targetKeys.length; ++i) {
+ const key = targetKeys[i];
+ const sourceValue = source?.[key];
+ const targetValue = target?.[key];
+
+ // If shouldRemoveNullObjectValues is true, we want to remove null values from the merged object
+ const isSourceOrTargetNull = targetValue === null || sourceValue === null;
+ const shouldOmitSourceKey = shouldRemoveNullObjectValues && isSourceOrTargetNull;
+
+ if (!shouldOmitSourceKey) {
+ destination[key] = targetValue;
+ }
+ }
+ }
+
+ // lodash adds a small overhead so we don't use it here
+ const sourceKeys = Object.keys(source);
+ for (let i = 0; i < sourceKeys.length; ++i) {
+ const key = sourceKeys[i];
+ const sourceValue = source?.[key];
+ const targetValue = target?.[key];
+
+ // If shouldRemoveNullObjectValues is true, we want to remove null values from the merged object
+ const shouldOmitSourceKey = shouldRemoveNullObjectValues && sourceValue === null;
+
+ // If we pass undefined as the updated value for a key, we want to generally ignore it
+ const isSourceKeyUndefined = sourceValue === undefined;
+
+ if (!isSourceKeyUndefined && !shouldOmitSourceKey) {
+ const isSourceKeyMergable = isMergeableObject(sourceValue);
+
+ if (isSourceKeyMergable && targetValue) {
+ if (!shouldRemoveNullObjectValues || isSourceKeyMergable) {
+ // eslint-disable-next-line no-use-before-define
+ destination[key] = fastMerge(targetValue as TObject, sourceValue, shouldRemoveNullObjectValues);
+ }
+ } else if (!shouldRemoveNullObjectValues || sourceValue !== null) {
+ destination[key] = sourceValue;
+ }
+ }
+ }
+
+ return destination as TObject;
+}
+
+/**
+ * Merges two objects and removes null values if "shouldRemoveNullObjectValues" is set to true
+ *
+ * We generally want to remove null values from objects written to disk and cache, because it decreases the amount of data stored in memory and on disk.
+ * On native, when merging an existing value with new changes, SQLite will use JSON_PATCH, which removes top-level nullish values.
+ * To be consistent with the behaviour for merge, we'll also want to remove null values for "set" operations.
+ */
+function fastMerge(target: TObject, source: TObject, shouldRemoveNullObjectValues = true): TObject {
+ // We have to ignore arrays and nullish values here,
+ // otherwise "mergeObject" will throw an error,
+ // because it expects an object as "source"
+ if (Array.isArray(source) || source === null || source === undefined) {
+ return source;
+ }
+ return mergeObject(target as Record, source as Record, shouldRemoveNullObjectValues) as TObject;
+}
+
+export default fastMerge;
diff --git a/lib/index.ts b/lib/index.ts
new file mode 100644
index 00000000..dc9c5b20
--- /dev/null
+++ b/lib/index.ts
@@ -0,0 +1,21 @@
+// eslint-disable-next-line rulesdir/no-api-in-views
+export {default as API} from './API';
+export {default as APIDeferred} from './APIDeferred';
+export {default as BrowserDetect} from './BrowserDetect';
+export {g_cloudFront, g_cloudFrontImg, CONST, UI, PUBLIC_DOMAINS} from './CONST';
+
+export {default as Cookie} from './Cookie';
+export {default as CredentialsWrapper, LOGIN_PARTNER_DETAILS} from './CredentialsWrapper';
+export * as Device from './Device';
+export {default as ExpensiMark} from './ExpensiMark';
+export {default as Logger} from './Logger';
+export {default as Network} from './Network';
+export {default as Num} from './Num';
+export {default as PageEvent} from './PageEvent';
+export {default as PubSub} from './PubSub';
+export {default as ReportHistoryStore} from './ReportHistoryStore';
+export {default as Templates} from './Templates';
+export * as Url from './Url';
+export {default as fastMerge} from './fastMerge';
+export {default as Str} from './str';
+export {default as TLD_REGEX} from './tlds';
diff --git a/lib/mixins/PubSub.jsx b/lib/mixins/PubSub.jsx
index 86855a5d..b5552759 100644
--- a/lib/mixins/PubSub.jsx
+++ b/lib/mixins/PubSub.jsx
@@ -1,7 +1,7 @@
-import _ from 'underscore';
import PubSubModule from '../PubSub';
+import * as Utils from '../utils';
-const PubSub = window.PubSub || PubSubModule;
+const PubSub = (Utils.isWindowAvailable() && window.PubSub) || PubSubModule;
/**
* This mixin sets up automatic PubSub bindings which will be removed when
@@ -17,7 +17,7 @@ const PubSub = window.PubSub || PubSubModule;
* }
* });
*/
-export default {
+const PubSubMixin = {
UNSAFE_componentWillMount() {
this.eventIds = [];
},
@@ -44,6 +44,10 @@ export default {
* When the component is unmounted, we want to subscribe from all of our event IDs
*/
componentWillUnmount() {
- _.each(this.eventIds, _.bind(PubSub.unsubscribe, PubSub));
+ this.eventIds.forEach((eventId) => {
+ PubSub.unsubscribe(eventId);
+ });
},
};
+
+export default PubSubMixin;
diff --git a/lib/mixins/extraClasses.js b/lib/mixins/extraClasses.js
index 5588bc6b..a0cf9b9e 100644
--- a/lib/mixins/extraClasses.js
+++ b/lib/mixins/extraClasses.js
@@ -22,9 +22,12 @@
* return ;
* }
*/
+
+import * as Utils from '../utils';
+
export default {
propTypes: {
- extraClasses: window.PropTypes.oneOfType([window.PropTypes.string, window.PropTypes.array, window.PropTypes.object]),
+ extraClasses: Utils.isWindowAvailable() && window.PropTypes.oneOfType([window.PropTypes.string, window.PropTypes.array, window.PropTypes.object]),
},
UNSAFE_componentWillReceiveProps(nextProps) {
diff --git a/lib/str.d.ts b/lib/str.d.ts
deleted file mode 100644
index d703d8bf..00000000
--- a/lib/str.d.ts
+++ /dev/null
@@ -1,613 +0,0 @@
-declare const Str: {
- /**
- * Return true if the string is ending with the provided suffix
- *
- * @param str String ot search in
- * @param suffix What to look for
- */
- endsWith(str: string, suffix: string): boolean;
- /**
- * Converts a USD string into th number of cents it represents.
- *
- * @param amountStr A string representing a USD value.
- * @param allowFraction Flag indicating if fractions of cents should be
- * allowed in the output.
- *
- * @returns The cent value of the @p amountStr.
- */
- fromUSDToNumber(amountStr: string, allowFraction: boolean): number;
- /**
- * Truncates the middle section of a string based on the max allowed length
- *
- * @param fullStr
- * @param maxLength
- */
- truncateInMiddle(fullStr: string, maxLength: number): string;
- /**
- * Convert new line to
- *
- * @param str
- */
- nl2br(str: string): string;
- /**
- * Decodes the given HTML encoded string.
- *
- * @param s The string to decode.
- * @returns The decoded string.
- */
- htmlDecode(s: string): string;
- /**
- * HTML encodes the given string.
- *
- * @param s The string to encode.
- * @returns @p s HTML encoded.
- */
- htmlEncode(s: string): string;
- /**
- * Escape text while preventing any sort of double escape, so 'X & Y' -> 'X & Y' and 'X & Y' -> 'X & Y'
- *
- * @param s the string to escape
- * @returns the escaped string
- */
- safeEscape(s: string): string;
- /**
- * HTML encoding insensitive equals.
- *
- * @param first string to compare
- * @param second string to compare
- * @returns true when first === second, ignoring HTML encoding
- */
- htmlEncodingInsensitiveEquals(first: string, second: string): boolean;
- /**
- * Creates an ID that can be used as an HTML attribute from @p str.
- *
- * @param str A string to create an ID from.
- * @returns The ID string made from @p str.
- */
- makeID(str: string): string;
- /**
- * Extracts an ID made with Str.makeID from a larger string.
- *
- * @param str A string containing an id made with Str.makeID
- * @returns The ID string.
- */
- extractID(str: string): string | null;
- /**
- * Modifies the string so the first letter of each word is capitalized and the
- * rest lowercased.
- *
- * @param val The string to modify
- */
- recapitalize(val: string): string;
- /**
- * Replace all the non alphanumerical character by _
- *
- * @param input
- */
- sanitizeToAlphaNumeric(input: string): string;
- /**
- * Strip out all the non numerical characters
- *
- * @param input
- */
- stripNonNumeric(input: string): string;
- /**
- * Strips all non ascii characters from a string
- * @param input
- * @returns The ascii version of the string.
- */
- stripNonASCIICharacters(input: string): string;
- /**
- * Shortens the @p text to @p length and appends an ellipses to it.
- *
- * The ellipses will only be appended if @p text is longer than the @p length
- * given.
- *
- * @param val The string to reduce in size.
- * @param length The maximal length desired.
- * @returns The shortened @p text.
- */
- shortenText(val: string, length: number): string;
- /**
- * Returns the byte size of a character
- * @param inputChar You can input more than one character, but it will only return the size of the first
- * one.
- * @returns Byte size of the character
- */
- getRawByteSize(inputChar: string): number;
- /**
- * Gets the length of a string in bytes, including non-ASCII characters
- * @param input
- * @returns The number of bytes used by string
- */
- getByteLength(input: string): number;
- /**
- * Shortens the input by max byte size instead of by character length
- * @param input
- * @param maxSize The max size in bytes, e.g. 256
- * @returns Returns a shorted input if the input size exceeds the max
- */
- shortenByByte(input: string, maxSize: number): string;
- /**
- * Returns true if the haystack begins with the needle
- *
- * @param haystack The full string to be searched
- * @param needle The case-sensitive string to search for
- * @returns Retruns true if the haystack starts with the needle.
- */
- startsWith(haystack: string, needle: string): boolean;
- /**
- * Gets the textual value of the given string.
- *
- * @param str The string to fetch the text value from.
- * @returns The text from within the HTML string.
- */
- stripHTML(str: string): string;
- /**
- * Modifies the string so the first letter of the string is capitalized
- *
- * @param str The string to modify.
- * @returns The recapitalized string.
- */
- UCFirst(str: string): string;
- /**
- * Returns a string containing all the characters str from the beginning
- * of str to the first occurrence of substr.
- * Example: Str.cutAfter( 'hello$%world', '$%' ) // returns 'hello'
- *
- * @param str The string to modify.
- * @param substr The substring to search for.
- * @returns The cut/trimmed string.
- */
- cutAfter(str: string, substr: string): string;
- /**
- * Returns a string containing all the characters str from after the first
- * occurrence of substr to the end of the string.
- * Example: Str.cutBefore( 'hello$%world', '$%' ) // returns 'world'
- *
- * @param str The string to modify.
- * @param substr The substring to search for.
- * @returns The cut/trimmed string.
- */
- cutBefore(str: string, substr: string): string;
- /**
- * Checks that the string is a domain name (e.g. example.com)
- *
- * @param string The string to check for domainnameness.
- *
- * @returns True iff the string is a domain name
- */
- isValidDomainName(string: string): boolean;
- /**
- * Checks that the string is a valid url
- *
- * @param string
- *
- * @returns True if the string is a valid hyperlink
- */
- isValidURL(string: string): boolean;
- /**
- * Checks that the string is an email address.
- * NOTE: TLDs are not just 2-4 characters. Keep this in sync with _inputrules.php
- *
- * @param string The string to check for email validity.
- *
- * @returns True iff the string is an email
- */
- isValidEmail(string: string): boolean;
- /**
- * Checks if the string is an valid email address formed during comment markdown formation.
- *
- * @param string The string to check for email validity.
- *
- * @returns True if the string is an valid email created by comment markdown.
- */
- isValidEmailMarkdown(string: string): boolean;
- /**
- * Remove trailing comma from a string.
- *
- * @param string The string with any trailing comma to be removed.
- *
- * @returns string with the trailing comma removed
- */
- removeTrailingComma(string: string): string;
- /**
- * Checks that the string is a list of coma separated email addresss.
- *
- * @param str The string to check for emails validity.
- *
- * @returns True if all emails are valid or if input is empty
- */
- areValidEmails(str: string): boolean;
- /**
- * Extract the email addresses from a string
- *
- * @param string
- */
- extractEmail(string: string): RegExpMatchArray | null;
- /**
- * Extracts the domain name from the given email address
- * (e.g. "domain.com" for "joe@domain.com").
- *
- * @param email The email address.
- *
- * @returns The domain name in the email address.
- */
- extractEmailDomain(email: string): string;
- /**
- * Tries to extract the company name from the given email address
- * (e.g. "yelp" for "joe@yelp.co.uk").
- *
- * @param email The email address.
- *
- * @returns The company name in the email address or null.
- */
- extractCompanyNameFromEmailDomain(email: string): string | null;
- /**
- * Extracts the local part from the given email address
- * (e.g. "joe" for "joe@domain.com").
- *
- * @param email The email address.
- *
- * @returns The local part in the email address.
- */
- extractEmailLocalPart(email: string): string;
- /**
- * Sanitize phone number to return only numbers. Return null if non valid phone number.
- *
- * @param str
- */
- sanitizePhoneNumber(str: string): string | null;
- /**
- * Sanitize email. Return null if non valid email.
- *
- * @param str
- */
- sanitizeEmail(str: string): string | null;
- /**
- * Escapes all special RegExp characters from a string
- *
- * @param string The subject
- *
- * @returns The escaped string
- */
- escapeForRegExp(string: string): string;
- /**
- * Escapes all special RegExp characters from a string except for the period
- *
- * @param string The subject
- * @returns The escaped string
- */
- escapeForExpenseRule(string: string): string;
- /**
- * Adds a backslash in front of each of colon
- * if they don't already have a backslash in front of them
- *
- * @param string The subject
- * @returns The escaped string
- */
- addBackslashBeforeColonsForTagNamesComingFromQBD(string: string): string;
- /**
- * Removes backslashes from string
- * eg: myString\[\]\* -> myString[]*
- *
- * @param string
- *
- */
- stripBackslashes(string: string): string;
- /**
- * Checks if a string's length is in the specified range
- *
- * @param string The subject
- * @param minimumLength
- * @param [maximumLength]
- *
- * @returns true if the length is in the range, false otherwise
- */
- isOfLength(string: string, minimumLength: number, maximumLength: number): boolean;
- /**
- * Count the number of occurences of needle in haystack.
- * This is faster than counting the results of haystack.match( /needle/g )
- * via http://stackoverflow.com/questions/4009756/how-to-count-string-occurrence-in-string
- *
- * @param haystack The string to look inside of
- * @param needle What we're looking for
- * @param allowOverlapping Defaults to false
- *
- * @returns The number of times needle is in haystack.
- */
- occurences(haystack: string, needle: string, allowOverlapping: boolean): number;
- /**
- * Uppercases the first letter of each word
- * via https://github.com/kvz/phpjs/blob/master/functions/strings/ucwords.js
- *
- * @param str to uppercase words
- * @returns Uppercase worded string
- */
- ucwords(str: string): string;
- /**
- * Returns true if the haystack contains the needle
- *
- * @param haystack The full string to be searched
- * @param needle The case-sensitive string to search for
- *
- * @returns Returns true if the haystack contains the needle
- */
- contains(haystack: string, needle: string): boolean;
- /**
- * Returns true if the haystack contains the needle, ignoring case
- *
- * @param haystack The full string to be searched
- * @param needle The case-insensitive string to search for
- *
- * @returns Returns true if the haystack contains the needle, ignoring case
- */
- caseInsensitiveContains(haystack: string, needle: string): boolean;
- /**
- * Case insensitive compare function
- *
- * @param string1 string to compare
- * @param string2 string to compare
- *
- * @returns -1 if first string < second string
- * 1 if first string > second string
- * 0 if first string = second string
- */
- caseInsensitiveCompare(string1: string, string2: string): 1 | 0 | -1;
- /**
- * Case insensitive equals
- *
- * @param first string to compare
- * @param second string to compare
- * @returns true when first == second except for case
- */
- caseInsensitiveEquals(first: string, second: string): boolean;
- /**
- * Compare function
- *
- * @param string1 string to compare
- * @param string2 string to compare
- *
- * @returns -1 if first string < second string
- * 1 if first string > second string
- * 0 if first string = second string
- */
- compare(string1: string, string2: string): 1 | 0 | -1;
- /**
- * Check if a file extension is supported by SmartReports
- * @param filename
- */
- isFileExtensionSmartReportsValid(filename: string): boolean;
- /**
- * Mask Permanent Account Number (PAN) the same way Auth does
- * @param number account number
- * @returns masked account number
- */
- maskPAN(number: number | string): string;
- /**
- * Checks if something is a string
- * Stolen from underscore
- * @param obj
- */
- isString(obj: unknown): boolean;
- /**
- * Checks if something is a number
- * Stolen from underscore
- * @param obj
- */
- isNumber(obj: unknown): boolean;
- /**
- * Checks if something is a certain type
- * Stolen from underscore
- * @param obj
- * @param type one of ['Arguments', 'Function', 'String', 'Number', 'Date',
- * 'RegExp', 'Error', 'Symbol', 'Map', 'WeakMap', 'Set', 'WeakSet']
- */
- isTypeOf(obj: unknown, type: 'Arguments' | 'Function' | 'String' | 'Number' | 'Date' | 'RegExp' | 'Error' | 'Symbol' | 'Map' | 'WeakMap' | 'Set' | 'WeakSet'): boolean;
- /**
- * Checks to see if something is undefined
- * Stolen from underscore
- * @param obj
- */
- isUndefined(obj: unknown): boolean;
- /**
- * Replace first N characters of the string with maskChar
- * eg: maskFirstNCharacters( '1234567890', 6, 'X' ) yields XXXXXX7890
- * @param str string to mask
- * @param n number of characters we want to mask from the string
- * @param mask string we want replace the first N chars with
- * @returns masked string
- */
- maskFirstNCharacters(str: string, n: number, mask: string): string;
- /**
- * Trim a string
- *
- * @param str
- */
- trim(str: string): string;
- /**
- * Convert a percentage string like '25%' to 25/
- * @param percentageString The percentage as a string
- */
- percentageStringToNumber(percentageString: string): number;
- /**
- * Remoce all the spaces from a string
- * @param input
- *
- */
- removeSpaces(input: string): string;
- /**
- * Returns the proper phrase depending on the count that is passed.
- * Example:
- * console.log(Str.pluralize('puppy', 'puppies', 1)); // puppy
- * console.log(Str.pluralize('puppy', 'puppies', 3)); // puppies
- *
- * @param singular form of the phrase
- * @param plural form of the phrase
- * @param n the count which determines the plurality
- */
- pluralize(singular: string, plural: string, n: number): string;
- /**
- * Returns whether or not a string is an encrypted number or not.
- *
- * @param number that we want to see if its encrypted or not
- *
- * @returns Whether or not this string is an encrpypted number
- */
- isEncryptedCardNumber(number: string): boolean;
- /**
- * Converts a value to boolean, case-insensitive.
- * @param value
- */
- toBool(value: unknown): boolean;
- /**
- * Checks if a string could be the masked version of another one.
- *
- * @param first string to compare
- * @param second string to compare
- * @param [mask] defaults to X
- * @returns true when first could be the masked version of second
- */
- maskedEquals(first: string, second: string, mask: string): boolean;
- /**
- * Bold any word matching the regexp in the text.
- * @param text, htmlEncoded
- * @param regexp
- */
- boldify(text: string, regexp: RegExp): string;
- /**
- * Check for whether a phone number is valid.
- * @param phone
- * @deprecated use isValidE164Phone to validate E.164 phone numbers or isValidPhoneFormat to validate phone numbers in general
- */
- isValidPhone(phone: string): boolean;
- /**
- * Check for whether a phone number is valid according to E.164 standard.
- * @param phone
- */
- isValidE164Phone(phone: string): boolean;
- /**
- * Check for whether a phone number is valid in different formats/standards. For example:
- * significant: 4404589784
- * international: +1 440-458-9784
- * e164: +14404589784
- * national: (440) 458-9784
- * 123.456.7890
- * @param phone
- */
- isValidPhoneFormat(phone: string): boolean;
- /**
- * We validate mentions by checking if it's first character is an allowed character.
- *
- * @param mention
- */
- isValidMention(mention: string): boolean;
- /**
- * Returns text without our SMS domain
- *
- * @param text
- */
- removeSMSDomain(text: string): string;
- /**
- * Returns true if the text is a valid E.164 phone number with our SMS domain removed
- *
- * @param text
- */
- isSMSLogin(text: string): boolean;
- /**
- * This method will return all matches of a single regex like preg_match_all() in PHP. This is not a common part of
- * JS yet, so this is a good way of doing it according to
- * https://github.com/airbnb/javascript/issues/1439#issuecomment-306297399 and doesn't get us in trouble with
- * linting rules.
- *
- * @param str
- * @param regex
- */
- matchAll(str: string, regex: RegExp): Array;
- /**
- * A simple GUID generator taken from https://stackoverflow.com/a/32760401/9114791
- *
- * @param [prefix] an optional prefix to put in front of the guid
- *
- */
- guid(prefix?: string): string;
- /**
- * Takes in a URL and returns it with a leading '/'
- *
- * @param url The URL to be formatted
- * @returns The formatted URL
- */
- normalizeUrl(url: string): string;
- /**
- * Formats a URL by converting the domain name to lowercase and adding the missing 'https://' protocol.
- *
- * @param url The URL to be formatted
- * @returns The formatted URL
- */
- sanitizeURL(url: string): string;
- /**
- * Checks if parameter is a string or function
- * if it is a function then we will call it with
- * any additional arguments.
- *
- * @param parameter
- */
- result: {
- (parameter: string): string;
- (parameter: (...args: A) => R, ...args: A): R;
- };
- /**
- * Get file extension for a given url with or
- * without query parameters
- *
- * @param url
- */
- getExtension(url: string): string | undefined;
- /**
- * Takes in a URL and checks if the file extension is PDF
- *
- * @param url The URL to be checked
- * @returns Whether file path is PDF or not
- */
- isPDF(url: string): boolean;
- /**
- * Takes in a URL and checks if the file extension is an image
- * that can be rendered by React Native. Do NOT add extensions
- * to this list unless they appear in this list and are
- * supported by all platforms.
- *
- * https://reactnative.dev/docs/image#source
- *
- * @param url
- */
- isImage(url: string): boolean;
- /**
- * Takes in a URL and checks if the file extension is a video
- * that can be rendered by React Native. Do NOT add extensions
- * to this list unless they are supported by all platforms.
- *
- * https://developer.android.com/media/platform/supported-formats#video-formats
- * https://developer.apple.com/documentation/coremedia/1564239-video_codec_constants
- * https://developer.mozilla.org/en-US/docs/Web/Media/Formats/Video_codecs
- *
- * @param url
- */
- isVideo(url: string): boolean;
- /**
- * Checks whether the given string is a +@ domain email account, such as
- * +@domain.com
- *
- * @param email
- * @returns True if is a domain account email, otherwise false.
- */
- isDomainEmail(email: string): boolean;
- /**
- * Polyfill for String.prototype.replaceAll
- *
- * @param text
- * @param searchValue
- * @param replaceValue
- */
- replaceAll(text: string, searchValue: string | RegExp, replaceValue: string | ((...args: unknown[]) => string)): string;
-};
-export default Str;
diff --git a/lib/str.js b/lib/str.ts
similarity index 56%
rename from lib/str.js
rename to lib/str.ts
index f9978b4e..210a72f5 100644
--- a/lib/str.js
+++ b/lib/str.ts
@@ -1,20 +1,35 @@
/* eslint-disable no-control-regex */
-import _ from 'underscore';
+import {parsePhoneNumber} from 'awesome-phonenumber';
import * as HtmlEntities from 'html-entities';
import * as Constants from './CONST';
import * as UrlPatterns from './Url';
+import * as Utils from './utils';
const REMOVE_SMS_DOMAIN_PATTERN = /@expensify\.sms/gi;
+/**
+ * Checks if parameter is a string or function
+ * if it is a function then we will call it with
+ * any additional arguments.
+ */
+function resultFn(parameter: string): string;
+function resultFn(parameter: (...args: A) => R, ...args: A): R;
+function resultFn(parameter: string | ((...a: A) => R), ...args: A): string | R {
+ if (typeof parameter === 'function') {
+ return parameter(...args);
+ }
+
+ return parameter;
+}
+
const Str = {
/**
* Return true if the string is ending with the provided suffix
*
- * @param {String} str String ot search in
- * @param {String} suffix What to look for
- * @return {Boolean}
+ * @param str String ot search in
+ * @param suffix What to look for
*/
- endsWith(str, suffix) {
+ endsWith(str: string, suffix: string): boolean {
if (!str || !suffix) {
return false;
}
@@ -24,37 +39,28 @@ const Str = {
/**
* Converts a USD string into th number of cents it represents.
*
- * @param {String} amountStr A string representing a USD value.
- * @param {Boolean} allowFraction Flag indicating if fractions of cents should be
+ * @param amountStr A string representing a USD value.
+ * @param allowFraction Flag indicating if fractions of cents should be
* allowed in the output.
*
- * @return {Number} The cent value of the @p amountStr.
+ * @returns The cent value of the @p amountStr.
*/
- fromUSDToNumber(amountStr, allowFraction) {
- let amount = String(amountStr).replace(/[^\d.\-()]+/g, '');
+ fromUSDToNumber(amountStr: string, allowFraction: boolean): number {
+ let amount: string | number = String(amountStr).replace(/[^\d.\-()]+/g, '');
if (amount.match(/\(.*\)/)) {
const modifiedAmount = amount.replace(/[()]/g, '');
amount = `-${modifiedAmount}`;
}
amount = Number(amount) * 100;
- // We round it here to a precision of 3 because some floating point numbers, when multiplied by 100
- // don't give us a very pretty result. Try this in the JS console:
- // 0.678 * 100
- // 67.80000000000001
- // 0.679 * 100
- // 67.9
amount = Math.round(amount * 1e3) / 1e3;
return allowFraction ? amount : Math.round(amount);
},
/**
* Truncates the middle section of a string based on the max allowed length
- * @param {string} fullStr
- * @param {int} maxLength
- * @returns {string}
*/
- truncateInMiddle(fullStr, maxLength) {
+ truncateInMiddle(fullStr: string, maxLength: number): string {
if (fullStr.length <= maxLength) {
return fullStr;
}
@@ -69,70 +75,59 @@ const Str = {
/**
* Convert new line to
- *
- * @param {String} str
- * @returns {string}
*/
- nl2br(str) {
+ nl2br(str: string): string {
return str.replace(/\n/g, '
');
},
/**
* Decodes the given HTML encoded string.
*
- * @param {String} s The string to decode.
- * @return {String} The decoded string.
+ * @param s The string to decode.
+ * @returns The decoded string.
*/
- htmlDecode(s) {
- // Use jQuery if it exists or else use html-entities
- if (typeof jQuery !== 'undefined') {
- return jQuery('').html(s).text();
- }
+ htmlDecode(s: string) {
return HtmlEntities.decode(s);
},
/**
* HTML encodes the given string.
*
- * @param {String} s The string to encode.
- * @return {String} @p s HTML encoded.
+ * @param s The string to encode.
+ * @return string @p s HTML encoded.
*/
- htmlEncode(s) {
- // Use jQuery if it exists or else use html-entities
- if (typeof jQuery !== 'undefined') {
- return jQuery('').text(s).html();
- }
+ htmlEncode(s: string) {
return HtmlEntities.encode(s);
},
/**
* Escape text while preventing any sort of double escape, so 'X & Y' -> 'X & Y' and 'X & Y' -> 'X & Y'
*
- * @param {String} s the string to escape
- * @return {String} the escaped string
+ * @param s The string to escape
+ * @returns The escaped string
*/
- safeEscape(s) {
- return _.escape(_.unescape(s));
+ safeEscape(s: string) {
+ return Utils.escape(Utils.unescape(s));
},
/**
* HTML encoding insensitive equals.
*
- * @param {String} first string to compare
- * @param {String} second string to compare
- * @return {Boolean} true when first === second, ignoring HTML encoding
+ * @param first string to compare
+ * @param second string to compare
+ * @returns True when first === second, ignoring HTML encoding
*/
- htmlEncodingInsensitiveEquals(first, second) {
+ htmlEncodingInsensitiveEquals(first: string, second: string): boolean {
return first === second || this.htmlDecode(first) === second || this.htmlEncode(first) === second;
},
/**
* Creates an ID that can be used as an HTML attribute from @p str.
*
- * @param {String} str A string to create an ID from.
- * @return {String} The ID string made from @p str.
+ * @param str A string to create an ID from.
+ * @returns The ID string made from @p str.
*/
- makeID(str) {
+ makeID(str: string): string {
const modifiedString = String(str)
.replace(/[^A-Za-z0-9]/g, '_')
.toUpperCase();
@@ -142,22 +137,21 @@ const Str = {
/**
* Extracts an ID made with Str.makeID from a larger string.
*
- * @param {String} str A string containing an id made with Str.makeID
- * @return {String|null} The ID string.
+ * @param str A string containing an id made with Str.makeID
+ * @returns The ID string.
*/
- extractID(str) {
+ extractID(str: string): string | null {
const matches = str.match(/id[A-Z0-9_]+/);
- return matches.length > 0 ? matches[0] : null;
+ return matches && matches.length > 0 ? matches[0] : null;
},
/**
* Modifies the string so the first letter of each word is capitalized and the
* rest lowercased.
*
- * @param {String} val The string to modify
- * @return {String}
+ * @param val The string to modify
*/
- recapitalize(val) {
+ recapitalize(val: string): string {
// First replace every letter with its lowercase equivalent
// Cast to string.
let str = String(val);
@@ -166,7 +160,7 @@ const Str = {
}
str = str.substr(0, 1).toUpperCase() + str.substr(1).toLowerCase();
- function recap_callback(t, a, b) {
+ function recap_callback(t: unknown, a: string, b: string) {
return a + b.toUpperCase();
}
return str.replace(
@@ -178,30 +172,23 @@ const Str = {
/**
* Replace all the non alphanumerical character by _
- *
- * @param {String} input
- * @returns {String}
*/
- sanitizeToAlphaNumeric(input) {
+ sanitizeToAlphaNumeric(input: string): string {
return String(input).replace(/[^\d\w]/g, '_');
},
/**
* Strip out all the non numerical characters
- *
- * @param {String} input
- * @returns {String}
*/
- stripNonNumeric(input) {
+ stripNonNumeric(input: string): string {
return String(input).replace(/[^\d]/g, '');
},
/**
* Strips all non ascii characters from a string
- * @param {String} input
- * @returns {String} The ascii version of the string.
+ * @returns The ascii version of the string.
*/
- stripNonASCIICharacters(input) {
+ stripNonASCIICharacters(input: string): string {
return String(input).replace(/[\u0000-\u0019\u0080-\uffff]/g, '');
},
@@ -211,11 +198,11 @@ const Str = {
* The ellipses will only be appended if @p text is longer than the @p length
* given.
*
- * @param {String} val The string to reduce in size.
- * @param {Number} length The maximal length desired.
- * @return {String} The shortened @p text.
+ * @param val The string to reduce in size.
+ * @param length The maximal length desired.
+ * @returns The shortened @p text.
*/
- shortenText(val, length) {
+ shortenText(val: string, length: number): string {
// Remove extra spaces because they don't show up in html anyway.
const text = String(val).replace(/\s+/g, ' ');
const truncatedText = text.substr(0, length - 3);
@@ -224,13 +211,13 @@ const Str = {
/**
* Returns the byte size of a character
- * @param {String} inputChar You can input more than one character, but it will only return the size of the first
+ * @param inputChar You can input more than one character, but it will only return the size of the first
* one.
- * @returns {Number} Byte size of the character
+ * @returns Byte size of the character
*/
- getRawByteSize(inputChar) {
+ getRawByteSize(inputChar: string): number {
const onlyChar = String(inputChar);
- const c = onlyChar.charCodeAt();
+ const c = onlyChar.charCodeAt(0);
// If we are grabbing the byte size, we need to temporarily diable no-bitwise for linting
/* eslint-disable no-bitwise */
@@ -258,26 +245,21 @@ const Str = {
/**
* Gets the length of a string in bytes, including non-ASCII characters
- * @param {String} input
- * @returns {Number} The number of bytes used by string
+ * @returns The number of bytes used by string
*/
- getByteLength(input) {
+ getByteLength(input: string): number {
// Force string type
const stringInput = String(input);
- let byteLength = 0;
- for (let i = 0; i < stringInput.length; i++) {
- byteLength += this.getRawByteSize(stringInput[i]);
- }
+ const byteLength = Array.from(stringInput).reduce((acc, char) => acc + this.getRawByteSize(char), 0);
return byteLength;
},
/**
* Shortens the input by max byte size instead of by character length
- * @param {String} input
- * @param {Number} maxSize The max size in bytes, e.g. 256
- * @returns {String} Returns a shorted input if the input size exceeds the max
+ * @param maxSize The max size in bytes, e.g. 256
+ * @returns Returns a shorted input if the input size exceeds the max
*/
- shortenByByte(input, maxSize) {
+ shortenByByte(input: string, maxSize: number): string {
const stringInput = String(input);
let totalByteLength = 0;
for (let i = 0; i < stringInput.length; i++) {
@@ -294,21 +276,21 @@ const Str = {
/**
* Returns true if the haystack begins with the needle
*
- * @param {String} haystack The full string to be searched
- * @param {String} needle The case-sensitive string to search for
- * @return {Boolean} Retruns true if the haystack starts with the needle.
+ * @param haystack The full string to be searched
+ * @param needle The case-sensitive string to search for
+ * @returns True if the haystack starts with the needle.
*/
- startsWith(haystack, needle) {
+ startsWith(haystack: string, needle: string): boolean {
return this.isString(haystack) && this.isString(needle) && haystack.substring(0, needle.length) === needle;
},
/**
* Gets the textual value of the given string.
*
- * @param {String} str The string to fetch the text value from.
- * @return {String} The text from within the HTML string.
+ * @param str The string to fetch the text value from.
+ * @returns The text from within the HTML string.
*/
- stripHTML(str) {
+ stripHTML(str: string): string {
if (!this.isString(str)) {
return '';
}
@@ -319,10 +301,10 @@ const Str = {
/**
* Modifies the string so the first letter of the string is capitalized
*
- * @param {String} str The string to modify.
- * @return {String} The recapitalized string.
+ * @param str The string to modify.
+ * @returns The recapitalized string.
*/
- UCFirst(str) {
+ UCFirst(str: string): string {
return str.substr(0, 1).toUpperCase() + str.substr(1);
},
@@ -331,11 +313,11 @@ const Str = {
* of str to the first occurrence of substr.
* Example: Str.cutAfter( 'hello$%world', '$%' ) // returns 'hello'
*
- * @param {String} str The string to modify.
- * @param {String} substr The substring to search for.
- * @return {String} The cut/trimmed string.
+ * @param str The string to modify.
+ * @param substr The substring to search for.
+ * @returns The cut/trimmed string.
*/
- cutAfter(str, substr) {
+ cutAfter(str: string, substr: string): string {
const index = str.indexOf(substr);
if (index !== -1) {
return str.substring(0, index);
@@ -348,11 +330,11 @@ const Str = {
* occurrence of substr to the end of the string.
* Example: Str.cutBefore( 'hello$%world', '$%' ) // returns 'world'
*
- * @param {String} str The string to modify.
- * @param {String} substr The substring to search for.
- * @return {String} The cut/trimmed string.
+ * @param str The string to modify.
+ * @param substr The substring to search for.
+ * @returns The cut/trimmed string.
*/
- cutBefore(str, substr) {
+ cutBefore(str: string, substr: string): string {
const index = str.indexOf(substr);
if (index !== -1) {
return str.substring(index + substr.length);
@@ -363,101 +345,91 @@ const Str = {
/**
* Checks that the string is a domain name (e.g. example.com)
*
- * @param {String} string The string to check for domainnameness.
+ * @param str The string to check for domainnameness.
*
- * @returns {Boolean} True iff the string is a domain name
+ * @returns True if the string is a domain name
*/
- isValidDomainName(string) {
- return Boolean(String(string).match(Constants.CONST.REG_EXP.DOMAIN));
+ isValidDomainName(str: string): boolean {
+ return Boolean(String(str).match(Constants.CONST.REG_EXP.DOMAIN));
},
/**
* Checks that the string is a valid url
*
- * @param {String} string
- *
- * @returns {Boolean} True if the string is a valid hyperlink
+ * @returns True if the string is a valid hyperlink
*/
- isValidURL(string) {
- return Boolean(String(string).match(Constants.CONST.REG_EXP.HYPERLINK));
+ isValidURL(str: string): boolean {
+ return Boolean(String(str).match(Constants.CONST.REG_EXP.HYPERLINK));
},
/**
* Checks that the string is an email address.
* NOTE: TLDs are not just 2-4 characters. Keep this in sync with _inputrules.php
*
- * @param {String} string The string to check for email validity.
+ * @param str The string to check for email validity.
*
- * @returns {Boolean} True iff the string is an email
+ * @returns True if the string is an email
*/
- isValidEmail(string) {
- return Boolean(String(string).match(Constants.CONST.REG_EXP.EMAIL));
+ isValidEmail(str: string): boolean {
+ return Boolean(String(str).match(Constants.CONST.REG_EXP.EMAIL));
},
/**
* Checks if the string is an valid email address formed during comment markdown formation.
*
- * @param {String} string The string to check for email validity.
+ * @param str The string to check for email validity.
*
- * @returns {Boolean} True if the string is an valid email created by comment markdown.
+ * @returns True if the string is an valid email created by comment markdown.
*/
- isValidEmailMarkdown(string) {
- return Boolean(String(string).match(`^${Constants.CONST.REG_EXP.MARKDOWN_EMAIL}$`));
+ isValidEmailMarkdown(str: string): boolean {
+ return Boolean(String(str).match(`^${Constants.CONST.REG_EXP.MARKDOWN_EMAIL}$`));
},
/**
* Remove trailing comma from a string.
*
- * @param {String} string The string with any trailing comma to be removed.
+ * @param str The string with any trailing comma to be removed.
*
- * @returns {String} string with the trailing comma removed
+ * @returns string with the trailing comma removed
*/
- removeTrailingComma(string) {
- return string.trim().replace(/(,$)/g, '');
+ removeTrailingComma(str: string): string {
+ return str.trim().replace(/(,$)/g, '');
},
/**
* Checks that the string is a list of coma separated email addresss.
*
- * @param {String} str The string to check for emails validity.
+ * @param str The string to check for emails validity.
*
- * @returns {Boolean} True if all emails are valid or if input is empty
+ * @returns True if all emails are valid or if input is empty
*/
- areValidEmails(str) {
+ areValidEmails(str: string): boolean {
const string = this.removeTrailingComma(str);
if (string === '') {
return true;
}
const emails = string.split(',');
- let result = true;
- for (let i = 0; i < emails.length; i += 1) {
- if (!this.isValidEmail(emails[i].trim())) {
- result = false;
- }
- }
+ const result = emails.every((email) => this.isValidEmail(email.trim()));
return result;
},
/**
* Extract the email addresses from a string
- *
- * @param {String} string
- * @returns {String[]|null}
*/
- extractEmail(string) {
- return String(string).match(Constants.CONST.REG_EXP.EMAIL_SEARCH);
+ extractEmail(str: string): RegExpMatchArray | null {
+ return String(str).match(Constants.CONST.REG_EXP.EMAIL_SEARCH);
},
/**
* Extracts the domain name from the given email address
* (e.g. "domain.com" for "joe@domain.com").
*
- * @param {String} email The email address.
+ * @param email The email address.
*
- * @returns {String} The domain name in the email address.
+ * @returns The domain name in the email address.
*/
- extractEmailDomain(email) {
+ extractEmailDomain(email: string): string {
return this.cutBefore(email, '@');
},
@@ -465,11 +437,11 @@ const Str = {
* Tries to extract the company name from the given email address
* (e.g. "yelp" for "joe@yelp.co.uk").
*
- * @param {String} email The email address.
+ * @param email The email address.
*
- * @returns {String|null} The company name in the email address or null.
+ * @returns The company name in the email address or null.
*/
- extractCompanyNameFromEmailDomain(email) {
+ extractCompanyNameFromEmailDomain(email: string): string | null {
const domain = this.extractEmailDomain(email);
if (!domain) {
return null;
@@ -487,32 +459,26 @@ const Str = {
* Extracts the local part from the given email address
* (e.g. "joe" for "joe@domain.com").
*
- * @param {String} email The email address.
+ * @param email The email address.
*
- * @returns {String} The local part in the email address.
+ * @returns The local part in the email address.
*/
- extractEmailLocalPart(email) {
+ extractEmailLocalPart(email: string): string {
return this.cutAfter(email, '@');
},
/**
* Sanitize phone number to return only numbers. Return null if non valid phone number.
- *
- * @param {String} str
- * @returns {String|null}
*/
- sanitizePhoneNumber(str) {
+ sanitizePhoneNumber(str: string): string | null {
const string = str.replace(/(?!^\+)\D/g, '');
return string.length <= 15 && string.length >= 10 ? string : null;
},
/**
* Sanitize email. Return null if non valid email.
- *
- * @param {String} str
- * @returns {String|null}
*/
- sanitizeEmail(str) {
+ sanitizeEmail(str: string): string | null {
const string = str.toLowerCase().trim();
return Constants.CONST.REG_EXP.EMAIL.test(string) ? string : null;
},
@@ -520,63 +486,56 @@ const Str = {
/**
* Escapes all special RegExp characters from a string
*
- * @param {String} string The subject
+ * @param str The subject
*
- * @returns {String} The escaped string
+ * @returns The escaped string
*/
- escapeForRegExp(string) {
- return string.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
+ escapeForRegExp(str: string): string {
+ return str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
},
/**
* Escapes all special RegExp characters from a string except for the period
*
- * @param {String} string The subject
- * @returns {String} The escaped string
+ * @param str The subject
+ * @returns The escaped string
*/
- escapeForExpenseRule(string) {
- return string.replace(/[-[\]/{}()*+?\\^$|]/g, '\\$&');
+ escapeForExpenseRule(str: string): string {
+ return str.replace(/[-[\]/{}()*+?\\^$|]/g, '\\$&');
},
/**
* Adds a backslash in front of each of colon
* if they don't already have a backslash in front of them
*
- * @param {String} string The subject
- * @returns {String} The escaped string
+ * @param str The subject
+ * @returns The escaped string
*/
- addBackslashBeforeColonsForTagNamesComingFromQBD(string) {
- return string.replace(/([^\\]):/g, '$1\\:');
+ addBackslashBeforeColonsForTagNamesComingFromQBD(str: string): string {
+ return str.replace(/([^\\]):/g, '$1\\:');
},
/**
* Removes backslashes from string
* eg: myString\[\]\* -> myString[]*
- *
- * @param {String} string
- * @returns {String}
*/
- stripBackslashes(string) {
- return string.replace(/\\/g, '');
+ stripBackslashes(str: string): string {
+ return str.replace(/\\/g, '');
},
/**
* Checks if a string's length is in the specified range
*
- * @param {String} string The subject
- * @param {Number} minimumLength
- * @param {Number} [maximumLength]
- *
- * @returns {Boolean} true if the length is in the range, false otherwise
+ * @returns true if the length is in the range, false otherwise
*/
- isOfLength(string, minimumLength, maximumLength) {
- if (!this.isString(string)) {
+ isOfLength(str: string, minimumLength: number, maximumLength: number): boolean {
+ if (!this.isString(str)) {
return false;
}
- if (string.length < minimumLength) {
+ if (str.length < minimumLength) {
return false;
}
- if (!this.isUndefined(maximumLength) && string.length > maximumLength) {
+ if (!this.isUndefined(maximumLength) && str.length > maximumLength) {
return false;
}
return true;
@@ -587,13 +546,13 @@ const Str = {
* This is faster than counting the results of haystack.match( /needle/g )
* via http://stackoverflow.com/questions/4009756/how-to-count-string-occurrence-in-string
*
- * @param {String} haystack The string to look inside of
- * @param {String} needle What we're looking for
- * @param {Boolean} allowOverlapping Defaults to false
+ * @param haystack The string to look inside of
+ * @param needle What we're looking for
+ * @param allowOverlapping Defaults to false
*
- * @returns {Integer} The number of times needle is in haystack.
+ * @returns The number of times needle is in haystack.
*/
- occurences(haystack, needle, allowOverlapping) {
+ occurences(haystack: string, needle: string, allowOverlapping: boolean): number {
let count = 0;
let pos = 0;
@@ -621,81 +580,81 @@ const Str = {
* Uppercases the first letter of each word
* via https://github.com/kvz/phpjs/blob/master/functions/strings/ucwords.js
*
- * @param {String} str to uppercase words
- * @returns {String} Uppercase worded string
+ * @param str to uppercase words
+ * @returns Uppercase worded string
*/
- ucwords(str) {
- const capitalize = ($1) => $1.toUpperCase();
+ ucwords(str: string): string {
+ const capitalize = ($1: string) => $1.toUpperCase();
return String(str).replace(/^([a-z\u00E0-\u00FC])|\s+([a-z\u00E0-\u00FC])/g, capitalize);
},
/**
* Returns true if the haystack contains the needle
*
- * @param {String} haystack The full string to be searched
- * @param {String} needle The case-sensitive string to search for
+ * @param haystack The full string to be searched
+ * @param needle The case-sensitive string to search for
*
- * @return {Boolean} Retruns true if the haystack contains the needle
+ * @returns Returns true if the haystack contains the needle
*/
- contains(haystack, needle) {
+ contains(haystack: string, needle: string): boolean {
return haystack.indexOf(needle) !== -1;
},
/**
* Returns true if the haystack contains the needle, ignoring case
*
- * @param {String} haystack The full string to be searched
- * @param {String} needle The case-insensitive string to search for
+ * @param haystack The full string to be searched
+ * @param needle The case-insensitive string to search for
*
- * @return {Boolean} Retruns true if the haystack contains the needle, ignoring case
+ * @returns Returns true if the haystack contains the needle, ignoring case
*/
- caseInsensitiveContains(haystack, needle) {
+ caseInsensitiveContains(haystack: string, needle: string): boolean {
return this.contains(haystack.toLowerCase(), needle.toLowerCase());
},
/**
* Case insensitive compare function
*
- * @param {String} string1 string to compare
- * @param {String} string2 string to compare
+ * @param strA string to compare
+ * @param strB string to compare
*
- * @return {Number} -1 if first string < second string
+ * @returns -1 if first string < second string
* 1 if first string > second string
* 0 if first string = second string
*/
- caseInsensitiveCompare(string1, string2) {
- const lowerCase1 = string1.toLocaleLowerCase();
- const lowerCase2 = string2.toLocaleLowerCase();
+ caseInsensitiveCompare(strA: string, strB: string): 1 | 0 | -1 {
+ const lowerCaseStrA = strA.toLocaleLowerCase();
+ const lowerCaseStrB = strB.toLocaleLowerCase();
- return this.compare(lowerCase1, lowerCase2);
+ return this.compare(lowerCaseStrA, lowerCaseStrB);
},
/**
* Case insensitive equals
*
- * @param {String} first string to compare
- * @param {String} second string to compare
- * @return {Boolean} true when first == second except for case
+ * @param strA string to compare
+ * @param strB string to compare
+ * @returns true when first == second except for case
*/
- caseInsensitiveEquals(first, second) {
- return this.caseInsensitiveCompare(first, second) === 0;
+ caseInsensitiveEquals(strA: string, strB: string): boolean {
+ return this.caseInsensitiveCompare(strA, strB) === 0;
},
/**
* Compare function
*
- * @param {String} string1 string to compare
- * @param {String} string2 string to compare
+ * @param strA string to compare
+ * @param strB string to compare
*
- * @return {Number} -1 if first string < second string
+ * @returns -1 if first string < second string
* 1 if first string > second string
* 0 if first string = second string
*/
- compare(string1, string2) {
- if (string1 < string2) {
+ compare(strA: string, strB: string): 1 | 0 | -1 {
+ if (strA < strB) {
return -1;
}
- if (string1 > string2) {
+ if (strA > strB) {
return 1;
}
return 0;
@@ -703,25 +662,23 @@ const Str = {
/**
* Check if a file extension is supported by SmartReports
- * @param {String} filename
- * @return {Boolean}
*/
- isFileExtensionSmartReportsValid(filename) {
+ isFileExtensionSmartReportsValid(filename: string): boolean {
// Allowed extensions. Make sure to keep them in sync with those defined
// in SmartReport_Utils::templateFileUploadCheck()
const allowedExtensions = ['xls', 'xlsx', 'xlsm', 'xltm'];
- const extension = filename.split('.').pop().toLowerCase();
- return allowedExtensions.indexOf(extension) > -1;
+ const extension = filename.split('.').pop()?.toLowerCase();
+ return !!extension && allowedExtensions.indexOf(extension) > -1;
},
/**
* Mask Permanent Account Number (PAN) the same way Auth does
- * @param {Number|String} number account number
- * @return {String} masked account number
+ * @param num account number
+ * @returns masked account number
*/
- maskPAN(number) {
+ maskPAN(num: number | string): string {
// cast to string
- const accountNumber = String(number);
+ const accountNumber = String(num);
const len = accountNumber.length;
// Hide these numbers completely
@@ -745,42 +702,33 @@ const Str = {
/**
* Checks if something is a string
* Stolen from underscore
- * @param {Mixed} obj
- * @return {Boolean}
*/
- isString(obj) {
+ isString(obj: unknown): obj is string {
return this.isTypeOf(obj, 'String');
},
/**
* Checks if something is a number
* Stolen from underscore
- * @param {Mixed} obj
- * @return {Boolean}
+ * @param obj
*/
- isNumber(obj) {
+ isNumber(obj: unknown): obj is number {
return this.isTypeOf(obj, 'Number');
},
/**
* Checks if something is a certain type
* Stolen from underscore
- * @param {Mixed} obj
- * @param {String} type one of ['Arguments', 'Function', 'String', 'Number', 'Date',
- * 'RegExp', 'Error', 'Symbol', 'Map', 'WeakMap', 'Set', 'WeakSet']
- * @return {Boolean}
*/
- isTypeOf(obj, type) {
+ isTypeOf(obj: unknown, type: 'Arguments' | 'Function' | 'String' | 'Number' | 'Date' | 'RegExp' | 'Error' | 'Symbol' | 'Map' | 'WeakMap' | 'Set' | 'WeakSet'): boolean {
return Object.prototype.toString.call(obj) === `[object ${type}]`;
},
/**
* Checks to see if something is undefined
* Stolen from underscore
- * @param {Mixed} obj
- * @return {Boolean}
*/
- isUndefined(obj) {
+ isUndefined(obj: unknown): boolean {
// eslint-disable-next-line no-void
return obj === void 0;
},
@@ -788,63 +736,55 @@ const Str = {
/**
* Replace first N characters of the string with maskChar
* eg: maskFirstNCharacters( '1234567890', 6, 'X' ) yields XXXXXX7890
- * @param {String} str string to mask
- * @param {Number} n number of characters we want to mask from the string
- * @param {String} mask string we want replace the first N chars with
- * @return {String} masked string
+ * @param str String to mask
+ * @param num Number of characters we want to mask from the string
+ * @param mask String we want replace the first N chars with
+ * @returns Masked string
*/
- maskFirstNCharacters(str, n, mask) {
+ maskFirstNCharacters(str: string, num: number, mask: string): string {
// if str is empty, str or mask aren't strings,
// or n is not a number, do nothing
- if (!this.isString(str) || !this.isString(mask) || str.length === 0 || !this.isNumber(n)) {
+ if (!this.isString(str) || !this.isString(mask) || str.length === 0 || !this.isNumber(num)) {
return str;
}
- return str.substring(0, n).replace(/./g, mask) + str.substring(n);
+ return str.substring(0, num).replace(/./g, mask) + str.substring(num);
},
/**
* Trim a string
- *
- * @param {String} str
- * @returns {string}
*/
- trim(str) {
- return $.trim(str);
+ trim(str: string) {
+ return str.trim();
},
/**
* Convert a percentage string like '25%' to 25/
- * @param {String} percentageString The percentage as a string
- * @returns {Number}
+ * @param percentageString The percentage as a string
*/
- percentageStringToNumber(percentageString) {
+ percentageStringToNumber(percentageString: string): number {
return Number(this.cutAfter(percentageString, '%'));
},
/**
- * Remoce all the spaces from a string
- * @param {string} input
- * @returns {string}
+ * Remove all the spaces from a string
*/
- removeSpaces(input) {
+ removeSpaces(input: string): string {
return String(input).replace(' ', '');
},
/**
* Returns the proper phrase depending on the count that is passed.
* Example:
- * console.log(Str.pluralize('puppy', 'puppies', 1)); // puppy
- * console.log(Str.pluralize('puppy', 'puppies', 3)); // puppies
+ * console.log(Str.pluralize('puppy', 'puppies', 1)) { // puppy
+ * console.log(Str.pluralize('puppy', 'puppies', 3)) { // puppies
*
- * @param {String} singular form of the phrase
- * @param {String} plural form of the phrase
- * @param {Number} n the count which determines the plurality
- *
- * @return {String}
+ * @param singular form of the phrase
+ * @param plural form of the phrase
+ * @param num the count which determines the plurality
*/
- pluralize(singular, plural, n) {
- if (!n || n > 1) {
+ pluralize(singular: string, plural: string, num: number): string {
+ if (!num || num > 1) {
return plural;
}
return singular;
@@ -853,19 +793,19 @@ const Str = {
/**
* Returns whether or not a string is an encrypted number or not.
*
- * @param {String} number that we want to see if its encrypted or not
+ * @param num that we want to see if its encrypted or not
*
- * @return {Boolean} Whether or not this string is an encrpypted number
+ * @returns Whether or not this string is an encrpypted number
*/
- isEncryptedCardNumber(number) {
+ isEncryptedCardNumber(num: string): boolean {
// Older encrypted versioning.
- if (/^[\da-fA-F]+$/.test(number)) {
- return number.length % 32 === 0;
+ if (/^[\da-fA-F]+$/.test(num)) {
+ return num.length % 32 === 0;
}
// Check with the new versioning.
- if (/^[vV][\d]+:[\da-fA-F]+$/.test(number)) {
- return number.split(':')[1].length % 32 === 0;
+ if (/^[vV][\d]+:[\da-fA-F]+$/.test(num)) {
+ return num.split(':')[1].length % 32 === 0;
}
return false;
@@ -873,10 +813,8 @@ const Str = {
/**
* Converts a value to boolean, case-insensitive.
- * @param {mixed} value
- * @return {Boolean}
*/
- toBool(value) {
+ toBool(value: unknown): boolean {
if (this.isString(value)) {
return value.toLowerCase() === 'true';
}
@@ -886,14 +824,14 @@ const Str = {
/**
* Checks if a string could be the masked version of another one.
*
- * @param {String} first string to compare
- * @param {String} second string to compare
- * @param {String} [mask] defaults to X
- * @return {Boolean} true when first could be the masked version of second
- */
- maskedEquals(first, second, mask) {
- const firsts = first.match(/.{1,1}/g);
- const seconds = second.match(/.{1,1}/g);
+ * @param strA String to compare
+ * @param strB String to compare
+ * @param [mask] Defaults to X
+ * @returns True when first could be the masked version of second
+ */
+ maskedEquals(strA: string, strB: string, mask: string): boolean {
+ const firsts = strA.match(/.{1,1}/g) ?? [];
+ const seconds = strB.match(/.{1,1}/g) ?? [];
const defaultMask = mask || 'X';
if (firsts.length !== seconds.length) {
@@ -911,32 +849,30 @@ const Str = {
/**
* Bold any word matching the regexp in the text.
- * @param {string} text, htmlEncoded
- * @param {RegExp} regexp
- * @return {string}
*/
- boldify(text, regexp) {
+ boldify(text: string, regexp: RegExp): string {
return text.replace(regexp, '$1');
},
/**
* Check for whether a phone number is valid.
- * @param {String} phone
- *
- * @return {bool}
* @deprecated use isValidE164Phone to validate E.164 phone numbers or isValidPhoneFormat to validate phone numbers in general
*/
- isValidPhone(phone) {
+ isValidPhone(phone: string): boolean {
return Constants.CONST.SMS.E164_REGEX.test(phone);
},
+ /**
+ * Check for whether a phone number is valid.
+ */
+ isValidPhoneNumber(phone: string): boolean {
+ return parsePhoneNumber(phone).possible;
+ },
+
/**
* Check for whether a phone number is valid according to E.164 standard.
- * @param {String} phone
- *
- * @return {bool}
*/
- isValidE164Phone(phone) {
+ isValidE164Phone(phone: string): boolean {
return Constants.CONST.SMS.E164_REGEX.test(phone);
},
@@ -947,21 +883,15 @@ const Str = {
* e164: +14404589784
* national: (440) 458-9784
* 123.456.7890
- * @param {String} phone
- *
- * @return {bool}
*/
- isValidPhoneFormat(phone) {
+ isValidPhoneFormat(phone: string): boolean {
return Constants.CONST.REG_EXP.GENERAL_PHONE_PART.test(phone);
},
/**
* We validate mentions by checking if it's first character is an allowed character.
- *
- * @param {String} mention
- * @returns {bool}
*/
- isValidMention(mention) {
+ isValidMention(mention: string): boolean {
// Mentions can start @ proceeded by a space, eg "ping @user@domain.tld"
if (/[\s@]/g.test(mention.charAt(0))) {
return true;
@@ -976,21 +906,15 @@ const Str = {
/**
* Returns text without our SMS domain
- *
- * @param {String} text
- * @return {String}
*/
- removeSMSDomain(text) {
+ removeSMSDomain(text: string): string {
return text.replace(REMOVE_SMS_DOMAIN_PATTERN, '');
},
/**
* Returns true if the text is a valid E.164 phone number with our SMS domain removed
- *
- * @param {String} text
- * @return {String}
*/
- isSMSLogin(text) {
+ isSMSLogin(text: string): boolean {
return this.isValidE164Phone(this.removeSMSDomain(text));
},
@@ -999,32 +923,29 @@ const Str = {
* JS yet, so this is a good way of doing it according to
* https://github.com/airbnb/javascript/issues/1439#issuecomment-306297399 and doesn't get us in trouble with
* linting rules.
- *
- * @param {String} str
- * @param {RegExp} regex
- *
- * @returns {Array}
*/
- matchAll(str, regex) {
- const matches = [];
- const collectMatches = (...args) => {
- const match = Array.prototype.slice.call(args, 0, -2);
+ matchAll(str: string, regex: RegExp): Array {
+ const matches: Array = [];
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const collectMatches = (...args: any[]) => {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const match: any = Array.prototype.slice.call(args, 0, -2);
match.input = args[args.length - 1];
match.index = args[args.length - 2];
matches.push(match);
};
- str.replace(regex, collectMatches);
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ str.replace(regex, collectMatches as any);
return matches;
},
/**
* A simple GUID generator taken from https://stackoverflow.com/a/32760401/9114791
*
- * @param {String} [prefix] an optional prefix to put in front of the guid
- * @returns {String}
+ * @param [prefix] an optional prefix to put in front of the guid
*/
- guid(prefix = '') {
+ guid(prefix = ''): string {
function s4() {
return Math.floor((1 + Math.random()) * 0x10000)
.toString(16)
@@ -1036,20 +957,20 @@ const Str = {
/**
* Takes in a URL and returns it with a leading '/'
*
- * @param {mixed} url The URL to be formatted
- * @returns {String} The formatted URL
+ * @param url The URL to be formatted
+ * @returns The formatted URL
*/
- normalizeUrl(url) {
+ normalizeUrl(url: string): string {
return typeof url === 'string' && url.startsWith('/') ? url : `/${url}`;
},
/**
* Formats a URL by converting the domain name to lowercase and adding the missing 'https://' protocol.
*
- * @param {url} url The URL to be formatted
- * @returns {String} The formatted URL
+ * @param url The URL to be formatted
+ * @returns The formatted URL
*/
- sanitizeURL(url) {
+ sanitizeURL(url: string): string {
const regex = new RegExp(`^${UrlPatterns.URL_REGEX}$`, 'i');
const match = regex.exec(url);
if (!match) {
@@ -1063,32 +984,24 @@ const Str = {
* Checks if parameter is a string or function
* if it is a function then we will call it with
* any additional arguments.
- *
- * @param {String|Function} parameter
- * @returns {String}
*/
- result(parameter, ...args) {
- return _.isFunction(parameter) ? parameter(...args) : parameter;
- },
+ result: resultFn,
/**
* Get file extension for a given url with or
* without query parameters
- *
- * @param {String} url
- * @returns {String|undefined}
*/
- getExtension(url) {
- return _.first(_.last(url.split('.')).split('?')).toLowerCase();
+ getExtension(url: string): string | undefined {
+ return url.split('.').pop()?.split('?')[0]?.toLowerCase();
},
/**
* Takes in a URL and checks if the file extension is PDF
*
- * @param {String} url The URL to be checked
- * @returns {Boolean} Whether file path is PDF or not
+ * @param url The URL to be checked
+ * @returns Whether file path is PDF or not
*/
- isPDF(url) {
+ isPDF(url: string): boolean {
return this.getExtension(url) === 'pdf';
},
@@ -1099,12 +1012,15 @@ const Str = {
* supported by all platforms.
*
* https://reactnative.dev/docs/image#source
- *
- * @param {String} url
- * @returns {Boolean}
*/
- isImage(url) {
- return _.contains(['jpeg', 'jpg', 'gif', 'png', 'bmp', 'webp'], this.getExtension(url));
+ isImage(url: string): boolean {
+ const extension = this.getExtension(url);
+
+ if (!extension) {
+ return false;
+ }
+
+ return ['jpeg', 'jpg', 'gif', 'png', 'bmp', 'webp'].includes(extension);
},
/**
@@ -1115,35 +1031,32 @@ const Str = {
* https://developer.android.com/media/platform/supported-formats#video-formats
* https://developer.apple.com/documentation/coremedia/1564239-video_codec_constants
* https://developer.mozilla.org/en-US/docs/Web/Media/Formats/Video_codecs
- *
- * @param {String} url
- * @returns {Boolean}
*/
- isVideo(url) {
- return _.contains(['mov', 'mp4', 'webm', 'mkv'], this.getExtension(url));
+ isVideo(url: string): boolean {
+ const extension = this.getExtension(url);
+
+ if (!extension) {
+ return false;
+ }
+
+ return ['mov', 'mp4', 'webm', 'mkv'].includes(extension);
},
/**
* Checks whether the given string is a +@ domain email account, such as
* +@domain.com
*
- * @param {String} email
- * @return {Boolean} True if is a domain account email, otherwise false.
+ * @returns True if is a domain account email, otherwise false.
*/
- isDomainEmail(email) {
+ isDomainEmail(email: string): boolean {
return this.startsWith(email, '+@');
},
/**
* Polyfill for String.prototype.replaceAll
- *
- * @param {String} text
- * @param {String|RegExp} searchValue
- * @param {String|Function} replaceValue
- * @returns {String}
*/
- replaceAll(text, searchValue, replaceValue) {
- return String.prototype.replaceAll.call(text, searchValue, replaceValue);
+ replaceAll(text: string, searchValue: string | RegExp, replaceValue: string | ((...args: unknown[]) => string)): string {
+ return String.prototype.replaceAll.call(text, searchValue, replaceValue as (...args: unknown[]) => string);
},
};
diff --git a/lib/utils.ts b/lib/utils.ts
new file mode 100644
index 00000000..d916a695
--- /dev/null
+++ b/lib/utils.ts
@@ -0,0 +1,73 @@
+/** Checks if the `window` global object is available. */
+function isWindowAvailable(): boolean {
+ return typeof window !== 'undefined';
+}
+
+/** Checks if the `navigator` global object is available. */
+function isNavigatorAvailable(): boolean {
+ return typeof navigator !== 'undefined';
+}
+
+const htmlEscapes = {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ "'": ''',
+ '`': '`',
+};
+const reUnescapedHtml = /[&<>"'`]/g;
+const reHasUnescapedHtml = RegExp(reUnescapedHtml.source);
+
+/**
+ * Converts the characters "&", "<", ">", '"', and "'" in `string` to their
+ * corresponding HTML entities.
+ * Source: https://github.com/lodash/lodash/blob/main/src/escape.ts
+ */
+function escape(string: string): string {
+ return string && reHasUnescapedHtml.test(string) ? string.replace(reUnescapedHtml, (chr) => htmlEscapes[chr as keyof typeof htmlEscapes]) : string || '';
+}
+
+const htmlUnescapes = {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ ''': "'",
+ '`': '`',
+ ' ': ' ',
+};
+
+const reEscapedHtml = /&(?:amp|lt|gt|quot|#(x27|x60|32));/g;
+const reHasEscapedHtml = RegExp(reEscapedHtml.source);
+
+/**
+ * The inverse of `escape`this method converts the HTML entities
+ * `&`, `<`, `>`, `"` and `'` in `string` to
+ * their corresponding characters.
+ * Source: https://github.com/lodash/lodash/blob/main/src/unescape.ts
+ * */
+function unescape(string: string): string {
+ return string && reHasEscapedHtml.test(string) ? string.replace(reEscapedHtml, (entity) => htmlUnescapes[entity as keyof typeof htmlUnescapes] || "'") : string || '';
+}
+
+/**
+ * Checks if the given variable is a function
+ * @param {*} variableToCheck
+ * @returns {boolean}
+ */
+function isFunction(variableToCheck: unknown): boolean {
+ return variableToCheck instanceof Function;
+}
+
+/**
+ * Checks if the given variable is an object
+ * @param {*} obj
+ * @returns {boolean}
+ */
+function isObject(obj: unknown): boolean {
+ const type = typeof obj;
+ return type === 'function' || (!!obj && type === 'object');
+}
+
+export {isWindowAvailable, isNavigatorAvailable, escape, unescape, isFunction, isObject};
diff --git a/package-lock.json b/package-lock.json
index 1bd9eeb1..906284f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,14 +1,15 @@
{
"name": "expensify-common",
- "version": "1.0.0",
+ "version": "2.0.19",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "expensify-common",
- "version": "1.0.0",
+ "version": "2.0.19",
"license": "MIT",
"dependencies": {
+ "awesome-phonenumber": "^5.4.0",
"classnames": "2.5.0",
"clipboard": "2.0.11",
"html-entities": "^2.5.2",
@@ -20,25 +21,37 @@
"react-dom": "16.12.0",
"semver": "^7.6.0",
"simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
- "ua-parser-js": "^1.0.37",
- "underscore": "1.13.6"
+ "ua-parser-js": "^1.0.37"
},
"devDependencies": {
- "@babel/preset-env": "^7.24.4",
+ "@babel/preset-env": "^7.24.5",
"@lwc/eslint-plugin-lwc": "^1.8.1",
+ "@babel/preset-env": "^7.24.5",
+ "@babel/preset-typescript": "^7.24.1",
+ "@lwc/eslint-plugin-lwc": "^1.8.0",
+ "@types/jest": "^29.5.12",
+ "@types/jquery": "^3.5.30",
+ "@types/lodash": "^4.17.4",
+ "@types/react-dom": "^18.3.0",
+ "@types/ua-parser-js": "^0.7.39",
+ "@typescript-eslint/eslint-plugin": "^7.10.0",
+ "@typescript-eslint/parser": "^7.10.0",
"babel-jest": "^29.0.0",
"babelify": "10.0.0",
- "eslint": "^7.15.0",
+ "eslint": "^8.57.0",
"eslint-config-expensify": "^2.0.48",
"eslint-config-prettier": "^8.10.0",
- "eslint-plugin-jest": "^24.7.0",
+ "eslint-plugin-jest": "^28.6.0",
+ "eslint-plugin-prettier": "^5.1.3",
+ "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
"grunt": "1.6.1",
"grunt-chokidar": "1.0.2",
"grunt-eslint": "25.0.0",
"jest": "^29.0.0",
"jest-environment-jsdom": "^29.7.0",
"jit-grunt": "^0.10.0",
- "prettier": "^3.2.5"
+ "prettier": "^3.2.5",
+ "typescript": "^5.4.5"
}
},
"node_modules/@aashutoshrathi/word-wrap": {
@@ -64,22 +77,22 @@
}
},
"node_modules/@babel/code-frame": {
- "version": "7.23.5",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
- "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+ "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
"dev": true,
"dependencies": {
- "@babel/highlight": "^7.23.4",
- "chalk": "^2.4.2"
+ "@babel/highlight": "^7.24.7",
+ "picocolors": "^1.0.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/compat-data": {
- "version": "7.24.4",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz",
- "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
+ "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
"dev": true,
"engines": {
"node": ">=6.9.0"
@@ -164,14 +177,14 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.23.6",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
- "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
+ "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.23.6",
- "@jridgewell/gen-mapping": "^0.3.2",
- "@jridgewell/trace-mapping": "^0.3.17",
+ "@babel/types": "^7.24.7",
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.25",
"jsesc": "^2.5.1"
},
"engines": {
@@ -179,37 +192,38 @@
}
},
"node_modules/@babel/helper-annotate-as-pure": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
- "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+ "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
- "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
+ "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.15"
+ "@babel/traverse": "^7.24.7",
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-compilation-targets": {
- "version": "7.23.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
- "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
+ "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
"dev": true,
"dependencies": {
- "@babel/compat-data": "^7.23.5",
- "@babel/helper-validator-option": "^7.23.5",
+ "@babel/compat-data": "^7.24.7",
+ "@babel/helper-validator-option": "^7.24.7",
"browserslist": "^4.22.2",
"lru-cache": "^5.1.1",
"semver": "^6.3.1"
@@ -243,19 +257,19 @@
"dev": true
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.24.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz",
- "integrity": "sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==",
- "dev": true,
- "dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-function-name": "^7.23.0",
- "@babel/helper-member-expression-to-functions": "^7.23.0",
- "@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/helper-replace-supers": "^7.24.1",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.6",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz",
+ "integrity": "sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-annotate-as-pure": "^7.24.7",
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-function-name": "^7.24.7",
+ "@babel/helper-member-expression-to-functions": "^7.24.7",
+ "@babel/helper-optimise-call-expression": "^7.24.7",
+ "@babel/helper-replace-supers": "^7.24.7",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+ "@babel/helper-split-export-declaration": "^7.24.7",
"semver": "^6.3.1"
},
"engines": {
@@ -275,12 +289,12 @@
}
},
"node_modules/@babel/helper-create-regexp-features-plugin": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
- "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
+ "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
"dev": true,
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
+ "@babel/helper-annotate-as-pure": "^7.24.7",
"regexpu-core": "^5.3.1",
"semver": "^6.3.1"
},
@@ -317,74 +331,79 @@
}
},
"node_modules/@babel/helper-environment-visitor": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
- "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+ "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
"dev": true,
+ "dependencies": {
+ "@babel/types": "^7.24.7"
+ },
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
- "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+ "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
"dev": true,
"dependencies": {
- "@babel/template": "^7.22.15",
- "@babel/types": "^7.23.0"
+ "@babel/template": "^7.24.7",
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-hoist-variables": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
- "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+ "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-member-expression-to-functions": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
- "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz",
+ "integrity": "sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.23.0"
+ "@babel/traverse": "^7.24.7",
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-imports": {
- "version": "7.24.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
- "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+ "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.24.0"
+ "@babel/traverse": "^7.24.7",
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.23.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
- "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
+ "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
"dev": true,
"dependencies": {
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-module-imports": "^7.22.15",
- "@babel/helper-simple-access": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.6",
- "@babel/helper-validator-identifier": "^7.22.20"
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-module-imports": "^7.24.7",
+ "@babel/helper-simple-access": "^7.24.7",
+ "@babel/helper-split-export-declaration": "^7.24.7",
+ "@babel/helper-validator-identifier": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -394,35 +413,35 @@
}
},
"node_modules/@babel/helper-optimise-call-expression": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
- "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
+ "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-plugin-utils": {
- "version": "7.24.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
- "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
+ "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
"dev": true,
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-remap-async-to-generator": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
- "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
+ "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
"dev": true,
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-wrap-function": "^7.22.20"
+ "@babel/helper-annotate-as-pure": "^7.24.7",
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-wrap-function": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -432,14 +451,14 @@
}
},
"node_modules/@babel/helper-replace-supers": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz",
- "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
+ "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
"dev": true,
"dependencies": {
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-member-expression-to-functions": "^7.23.0",
- "@babel/helper-optimise-call-expression": "^7.22.5"
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-member-expression-to-functions": "^7.24.7",
+ "@babel/helper-optimise-call-expression": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -449,77 +468,80 @@
}
},
"node_modules/@babel/helper-simple-access": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
- "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+ "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/traverse": "^7.24.7",
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
- "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
+ "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/traverse": "^7.24.7",
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-split-export-declaration": {
- "version": "7.22.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
- "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+ "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-string-parser": {
- "version": "7.23.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
- "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
+ "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
"dev": true,
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
- "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+ "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
"dev": true,
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-option": {
- "version": "7.23.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
- "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
+ "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
"dev": true,
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-wrap-function": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
- "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
+ "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
"dev": true,
"dependencies": {
- "@babel/helper-function-name": "^7.22.5",
- "@babel/template": "^7.22.15",
- "@babel/types": "^7.22.19"
+ "@babel/helper-function-name": "^7.24.7",
+ "@babel/template": "^7.24.7",
+ "@babel/traverse": "^7.24.7",
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -540,23 +562,24 @@
}
},
"node_modules/@babel/highlight": {
- "version": "7.23.4",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
- "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+ "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
"dev": true,
"dependencies": {
- "@babel/helper-validator-identifier": "^7.22.20",
+ "@babel/helper-validator-identifier": "^7.24.7",
"chalk": "^2.4.2",
- "js-tokens": "^4.0.0"
+ "js-tokens": "^4.0.0",
+ "picocolors": "^1.0.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/parser": {
- "version": "7.24.4",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
- "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
+ "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -566,13 +589,13 @@
}
},
"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
- "version": "7.24.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz",
- "integrity": "sha512-qpl6vOOEEzTLLcsuqYYo8yDtrTocmu2xkGvgNebvPjT9DTtfFYGmgDqY+rBYXNlqL4s9qLDn6xkrJv4RxAPiTA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz",
+ "integrity": "sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==",
"dev": true,
"dependencies": {
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -582,12 +605,12 @@
}
},
"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz",
- "integrity": "sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
+ "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -597,14 +620,14 @@
}
},
"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz",
- "integrity": "sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
+ "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/plugin-transform-optional-chaining": "^7.24.1"
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+ "@babel/plugin-transform-optional-chaining": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -614,13 +637,13 @@
}
},
"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz",
- "integrity": "sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz",
+ "integrity": "sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==",
"dev": true,
"dependencies": {
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -717,12 +740,12 @@
}
},
"node_modules/@babel/plugin-syntax-import-assertions": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz",
- "integrity": "sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
+ "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -732,12 +755,12 @@
}
},
"node_modules/@babel/plugin-syntax-import-attributes": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz",
- "integrity": "sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
+ "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -771,12 +794,12 @@
}
},
"node_modules/@babel/plugin-syntax-jsx": {
- "version": "7.23.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
- "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+ "version": "7.24.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
+ "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.24.0"
},
"engines": {
"node": ">=6.9.0"
@@ -888,12 +911,12 @@
}
},
"node_modules/@babel/plugin-syntax-typescript": {
- "version": "7.23.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
- "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+ "version": "7.24.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
+ "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.24.0"
},
"engines": {
"node": ">=6.9.0"
@@ -919,12 +942,12 @@
}
},
"node_modules/@babel/plugin-transform-arrow-functions": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz",
- "integrity": "sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
+ "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -934,14 +957,14 @@
}
},
"node_modules/@babel/plugin-transform-async-generator-functions": {
- "version": "7.24.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz",
- "integrity": "sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz",
+ "integrity": "sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g==",
"dev": true,
"dependencies": {
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-remap-async-to-generator": "^7.22.20",
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-remap-async-to-generator": "^7.24.7",
"@babel/plugin-syntax-async-generators": "^7.8.4"
},
"engines": {
@@ -952,14 +975,14 @@
}
},
"node_modules/@babel/plugin-transform-async-to-generator": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz",
- "integrity": "sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
+ "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
"dev": true,
"dependencies": {
- "@babel/helper-module-imports": "^7.24.1",
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-remap-async-to-generator": "^7.22.20"
+ "@babel/helper-module-imports": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-remap-async-to-generator": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -969,12 +992,12 @@
}
},
"node_modules/@babel/plugin-transform-block-scoped-functions": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz",
- "integrity": "sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
+ "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -984,12 +1007,12 @@
}
},
"node_modules/@babel/plugin-transform-block-scoping": {
- "version": "7.24.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz",
- "integrity": "sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
+ "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -999,13 +1022,13 @@
}
},
"node_modules/@babel/plugin-transform-class-properties": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz",
- "integrity": "sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
+ "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
"dev": true,
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.24.1",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-create-class-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1015,13 +1038,13 @@
}
},
"node_modules/@babel/plugin-transform-class-static-block": {
- "version": "7.24.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz",
- "integrity": "sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
+ "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
"dev": true,
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.24.4",
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-create-class-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-class-static-block": "^7.14.5"
},
"engines": {
@@ -1032,18 +1055,18 @@
}
},
"node_modules/@babel/plugin-transform-classes": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz",
- "integrity": "sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==",
- "dev": true,
- "dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.23.6",
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-function-name": "^7.23.0",
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-replace-supers": "^7.24.1",
- "@babel/helper-split-export-declaration": "^7.22.6",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz",
+ "integrity": "sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-annotate-as-pure": "^7.24.7",
+ "@babel/helper-compilation-targets": "^7.24.7",
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-function-name": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-replace-supers": "^7.24.7",
+ "@babel/helper-split-export-declaration": "^7.24.7",
"globals": "^11.1.0"
},
"engines": {
@@ -1054,13 +1077,13 @@
}
},
"node_modules/@babel/plugin-transform-computed-properties": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz",
- "integrity": "sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
+ "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/template": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/template": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1070,12 +1093,12 @@
}
},
"node_modules/@babel/plugin-transform-destructuring": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz",
- "integrity": "sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz",
+ "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1085,13 +1108,13 @@
}
},
"node_modules/@babel/plugin-transform-dotall-regex": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz",
- "integrity": "sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
+ "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
"dev": true,
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.15",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1101,12 +1124,12 @@
}
},
"node_modules/@babel/plugin-transform-duplicate-keys": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz",
- "integrity": "sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
+ "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1116,12 +1139,12 @@
}
},
"node_modules/@babel/plugin-transform-dynamic-import": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz",
- "integrity": "sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
+ "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-dynamic-import": "^7.8.3"
},
"engines": {
@@ -1132,13 +1155,13 @@
}
},
"node_modules/@babel/plugin-transform-exponentiation-operator": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz",
- "integrity": "sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
+ "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
"dev": true,
"dependencies": {
- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1148,12 +1171,12 @@
}
},
"node_modules/@babel/plugin-transform-export-namespace-from": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz",
- "integrity": "sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
+ "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
},
"engines": {
@@ -1164,13 +1187,13 @@
}
},
"node_modules/@babel/plugin-transform-for-of": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz",
- "integrity": "sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
+ "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1180,14 +1203,14 @@
}
},
"node_modules/@babel/plugin-transform-function-name": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz",
- "integrity": "sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
+ "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
"dev": true,
"dependencies": {
- "@babel/helper-compilation-targets": "^7.23.6",
- "@babel/helper-function-name": "^7.23.0",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-compilation-targets": "^7.24.7",
+ "@babel/helper-function-name": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1197,12 +1220,12 @@
}
},
"node_modules/@babel/plugin-transform-json-strings": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz",
- "integrity": "sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
+ "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-json-strings": "^7.8.3"
},
"engines": {
@@ -1213,12 +1236,12 @@
}
},
"node_modules/@babel/plugin-transform-literals": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz",
- "integrity": "sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
+ "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1228,12 +1251,12 @@
}
},
"node_modules/@babel/plugin-transform-logical-assignment-operators": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz",
- "integrity": "sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
+ "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
},
"engines": {
@@ -1244,12 +1267,12 @@
}
},
"node_modules/@babel/plugin-transform-member-expression-literals": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz",
- "integrity": "sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
+ "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1259,13 +1282,13 @@
}
},
"node_modules/@babel/plugin-transform-modules-amd": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz",
- "integrity": "sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
+ "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
"dev": true,
"dependencies": {
- "@babel/helper-module-transforms": "^7.23.3",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-module-transforms": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1275,14 +1298,14 @@
}
},
"node_modules/@babel/plugin-transform-modules-commonjs": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz",
- "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz",
+ "integrity": "sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==",
"dev": true,
"dependencies": {
- "@babel/helper-module-transforms": "^7.23.3",
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-simple-access": "^7.22.5"
+ "@babel/helper-module-transforms": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-simple-access": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1292,15 +1315,15 @@
}
},
"node_modules/@babel/plugin-transform-modules-systemjs": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz",
- "integrity": "sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
+ "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
"dev": true,
"dependencies": {
- "@babel/helper-hoist-variables": "^7.22.5",
- "@babel/helper-module-transforms": "^7.23.3",
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-validator-identifier": "^7.22.20"
+ "@babel/helper-hoist-variables": "^7.24.7",
+ "@babel/helper-module-transforms": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-validator-identifier": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1310,13 +1333,13 @@
}
},
"node_modules/@babel/plugin-transform-modules-umd": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz",
- "integrity": "sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
+ "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
"dev": true,
"dependencies": {
- "@babel/helper-module-transforms": "^7.23.3",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-module-transforms": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1326,13 +1349,13 @@
}
},
"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
- "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
+ "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
"dev": true,
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.5",
- "@babel/helper-plugin-utils": "^7.22.5"
+ "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1342,12 +1365,12 @@
}
},
"node_modules/@babel/plugin-transform-new-target": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz",
- "integrity": "sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
+ "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1357,12 +1380,12 @@
}
},
"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz",
- "integrity": "sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
+ "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
},
"engines": {
@@ -1373,12 +1396,12 @@
}
},
"node_modules/@babel/plugin-transform-numeric-separator": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz",
- "integrity": "sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
+ "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-numeric-separator": "^7.10.4"
},
"engines": {
@@ -1389,15 +1412,15 @@
}
},
"node_modules/@babel/plugin-transform-object-rest-spread": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz",
- "integrity": "sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
+ "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
"dev": true,
"dependencies": {
- "@babel/helper-compilation-targets": "^7.23.6",
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-compilation-targets": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-transform-parameters": "^7.24.1"
+ "@babel/plugin-transform-parameters": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1407,13 +1430,13 @@
}
},
"node_modules/@babel/plugin-transform-object-super": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz",
- "integrity": "sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
+ "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-replace-supers": "^7.24.1"
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-replace-supers": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1423,12 +1446,12 @@
}
},
"node_modules/@babel/plugin-transform-optional-catch-binding": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz",
- "integrity": "sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
+ "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
},
"engines": {
@@ -1439,13 +1462,13 @@
}
},
"node_modules/@babel/plugin-transform-optional-chaining": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz",
- "integrity": "sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz",
+ "integrity": "sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
"@babel/plugin-syntax-optional-chaining": "^7.8.3"
},
"engines": {
@@ -1456,12 +1479,12 @@
}
},
"node_modules/@babel/plugin-transform-parameters": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz",
- "integrity": "sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
+ "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1471,13 +1494,13 @@
}
},
"node_modules/@babel/plugin-transform-private-methods": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz",
- "integrity": "sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
+ "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
"dev": true,
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.24.1",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-create-class-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1487,14 +1510,14 @@
}
},
"node_modules/@babel/plugin-transform-private-property-in-object": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz",
- "integrity": "sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
+ "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
"dev": true,
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-create-class-features-plugin": "^7.24.1",
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-annotate-as-pure": "^7.24.7",
+ "@babel/helper-create-class-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
},
"engines": {
@@ -1505,12 +1528,12 @@
}
},
"node_modules/@babel/plugin-transform-property-literals": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz",
- "integrity": "sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
+ "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1520,12 +1543,12 @@
}
},
"node_modules/@babel/plugin-transform-regenerator": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz",
- "integrity": "sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
+ "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-plugin-utils": "^7.24.7",
"regenerator-transform": "^0.15.2"
},
"engines": {
@@ -1536,12 +1559,12 @@
}
},
"node_modules/@babel/plugin-transform-reserved-words": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz",
- "integrity": "sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
+ "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1551,12 +1574,12 @@
}
},
"node_modules/@babel/plugin-transform-shorthand-properties": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz",
- "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
+ "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1566,13 +1589,13 @@
}
},
"node_modules/@babel/plugin-transform-spread": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz",
- "integrity": "sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
+ "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1582,12 +1605,12 @@
}
},
"node_modules/@babel/plugin-transform-sticky-regex": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz",
- "integrity": "sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
+ "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1597,12 +1620,12 @@
}
},
"node_modules/@babel/plugin-transform-template-literals": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz",
- "integrity": "sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
+ "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1612,12 +1635,30 @@
}
},
"node_modules/@babel/plugin-transform-typeof-symbol": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz",
- "integrity": "sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz",
+ "integrity": "sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-transform-typescript": {
+ "version": "7.24.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.5.tgz",
+ "integrity": "sha512-E0VWu/hk83BIFUWnsKZ4D81KXjN5L3MobvevOHErASk9IPwKHOkTgvqzvNo1yP/ePJWqqK2SpUR5z+KQbl6NVw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-annotate-as-pure": "^7.22.5",
+ "@babel/helper-create-class-features-plugin": "^7.24.5",
+ "@babel/helper-plugin-utils": "^7.24.5",
+ "@babel/plugin-syntax-typescript": "^7.24.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1627,12 +1668,12 @@
}
},
"node_modules/@babel/plugin-transform-unicode-escapes": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz",
- "integrity": "sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
+ "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
"dev": true,
"dependencies": {
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1642,13 +1683,13 @@
}
},
"node_modules/@babel/plugin-transform-unicode-property-regex": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz",
- "integrity": "sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
+ "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
"dev": true,
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.15",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1658,13 +1699,13 @@
}
},
"node_modules/@babel/plugin-transform-unicode-regex": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz",
- "integrity": "sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
+ "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
"dev": true,
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.15",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1674,13 +1715,13 @@
}
},
"node_modules/@babel/plugin-transform-unicode-sets-regex": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz",
- "integrity": "sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
+ "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
"dev": true,
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.22.15",
- "@babel/helper-plugin-utils": "^7.24.0"
+ "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
@@ -1690,27 +1731,27 @@
}
},
"node_modules/@babel/preset-env": {
- "version": "7.24.4",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.4.tgz",
- "integrity": "sha512-7Kl6cSmYkak0FK/FXjSEnLJ1N9T/WA2RkMhu17gZ/dsxKJUuTYNIylahPTzqpLyJN4WhDif8X0XK1R8Wsguo/A==",
- "dev": true,
- "dependencies": {
- "@babel/compat-data": "^7.24.4",
- "@babel/helper-compilation-targets": "^7.23.6",
- "@babel/helper-plugin-utils": "^7.24.0",
- "@babel/helper-validator-option": "^7.23.5",
- "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.4",
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1",
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1",
- "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz",
+ "integrity": "sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/compat-data": "^7.24.7",
+ "@babel/helper-compilation-targets": "^7.24.7",
+ "@babel/helper-plugin-utils": "^7.24.7",
+ "@babel/helper-validator-option": "^7.24.7",
+ "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7",
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7",
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+ "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7",
"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
"@babel/plugin-syntax-async-generators": "^7.8.4",
"@babel/plugin-syntax-class-properties": "^7.12.13",
"@babel/plugin-syntax-class-static-block": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
- "@babel/plugin-syntax-import-assertions": "^7.24.1",
- "@babel/plugin-syntax-import-attributes": "^7.24.1",
+ "@babel/plugin-syntax-import-assertions": "^7.24.7",
+ "@babel/plugin-syntax-import-attributes": "^7.24.7",
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-syntax-json-strings": "^7.8.3",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -1722,54 +1763,54 @@
"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
"@babel/plugin-syntax-top-level-await": "^7.14.5",
"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
- "@babel/plugin-transform-arrow-functions": "^7.24.1",
- "@babel/plugin-transform-async-generator-functions": "^7.24.3",
- "@babel/plugin-transform-async-to-generator": "^7.24.1",
- "@babel/plugin-transform-block-scoped-functions": "^7.24.1",
- "@babel/plugin-transform-block-scoping": "^7.24.4",
- "@babel/plugin-transform-class-properties": "^7.24.1",
- "@babel/plugin-transform-class-static-block": "^7.24.4",
- "@babel/plugin-transform-classes": "^7.24.1",
- "@babel/plugin-transform-computed-properties": "^7.24.1",
- "@babel/plugin-transform-destructuring": "^7.24.1",
- "@babel/plugin-transform-dotall-regex": "^7.24.1",
- "@babel/plugin-transform-duplicate-keys": "^7.24.1",
- "@babel/plugin-transform-dynamic-import": "^7.24.1",
- "@babel/plugin-transform-exponentiation-operator": "^7.24.1",
- "@babel/plugin-transform-export-namespace-from": "^7.24.1",
- "@babel/plugin-transform-for-of": "^7.24.1",
- "@babel/plugin-transform-function-name": "^7.24.1",
- "@babel/plugin-transform-json-strings": "^7.24.1",
- "@babel/plugin-transform-literals": "^7.24.1",
- "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
- "@babel/plugin-transform-member-expression-literals": "^7.24.1",
- "@babel/plugin-transform-modules-amd": "^7.24.1",
- "@babel/plugin-transform-modules-commonjs": "^7.24.1",
- "@babel/plugin-transform-modules-systemjs": "^7.24.1",
- "@babel/plugin-transform-modules-umd": "^7.24.1",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
- "@babel/plugin-transform-new-target": "^7.24.1",
- "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
- "@babel/plugin-transform-numeric-separator": "^7.24.1",
- "@babel/plugin-transform-object-rest-spread": "^7.24.1",
- "@babel/plugin-transform-object-super": "^7.24.1",
- "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
- "@babel/plugin-transform-optional-chaining": "^7.24.1",
- "@babel/plugin-transform-parameters": "^7.24.1",
- "@babel/plugin-transform-private-methods": "^7.24.1",
- "@babel/plugin-transform-private-property-in-object": "^7.24.1",
- "@babel/plugin-transform-property-literals": "^7.24.1",
- "@babel/plugin-transform-regenerator": "^7.24.1",
- "@babel/plugin-transform-reserved-words": "^7.24.1",
- "@babel/plugin-transform-shorthand-properties": "^7.24.1",
- "@babel/plugin-transform-spread": "^7.24.1",
- "@babel/plugin-transform-sticky-regex": "^7.24.1",
- "@babel/plugin-transform-template-literals": "^7.24.1",
- "@babel/plugin-transform-typeof-symbol": "^7.24.1",
- "@babel/plugin-transform-unicode-escapes": "^7.24.1",
- "@babel/plugin-transform-unicode-property-regex": "^7.24.1",
- "@babel/plugin-transform-unicode-regex": "^7.24.1",
- "@babel/plugin-transform-unicode-sets-regex": "^7.24.1",
+ "@babel/plugin-transform-arrow-functions": "^7.24.7",
+ "@babel/plugin-transform-async-generator-functions": "^7.24.7",
+ "@babel/plugin-transform-async-to-generator": "^7.24.7",
+ "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+ "@babel/plugin-transform-block-scoping": "^7.24.7",
+ "@babel/plugin-transform-class-properties": "^7.24.7",
+ "@babel/plugin-transform-class-static-block": "^7.24.7",
+ "@babel/plugin-transform-classes": "^7.24.7",
+ "@babel/plugin-transform-computed-properties": "^7.24.7",
+ "@babel/plugin-transform-destructuring": "^7.24.7",
+ "@babel/plugin-transform-dotall-regex": "^7.24.7",
+ "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+ "@babel/plugin-transform-dynamic-import": "^7.24.7",
+ "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+ "@babel/plugin-transform-export-namespace-from": "^7.24.7",
+ "@babel/plugin-transform-for-of": "^7.24.7",
+ "@babel/plugin-transform-function-name": "^7.24.7",
+ "@babel/plugin-transform-json-strings": "^7.24.7",
+ "@babel/plugin-transform-literals": "^7.24.7",
+ "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+ "@babel/plugin-transform-member-expression-literals": "^7.24.7",
+ "@babel/plugin-transform-modules-amd": "^7.24.7",
+ "@babel/plugin-transform-modules-commonjs": "^7.24.7",
+ "@babel/plugin-transform-modules-systemjs": "^7.24.7",
+ "@babel/plugin-transform-modules-umd": "^7.24.7",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+ "@babel/plugin-transform-new-target": "^7.24.7",
+ "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+ "@babel/plugin-transform-numeric-separator": "^7.24.7",
+ "@babel/plugin-transform-object-rest-spread": "^7.24.7",
+ "@babel/plugin-transform-object-super": "^7.24.7",
+ "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+ "@babel/plugin-transform-optional-chaining": "^7.24.7",
+ "@babel/plugin-transform-parameters": "^7.24.7",
+ "@babel/plugin-transform-private-methods": "^7.24.7",
+ "@babel/plugin-transform-private-property-in-object": "^7.24.7",
+ "@babel/plugin-transform-property-literals": "^7.24.7",
+ "@babel/plugin-transform-regenerator": "^7.24.7",
+ "@babel/plugin-transform-reserved-words": "^7.24.7",
+ "@babel/plugin-transform-shorthand-properties": "^7.24.7",
+ "@babel/plugin-transform-spread": "^7.24.7",
+ "@babel/plugin-transform-sticky-regex": "^7.24.7",
+ "@babel/plugin-transform-template-literals": "^7.24.7",
+ "@babel/plugin-transform-typeof-symbol": "^7.24.7",
+ "@babel/plugin-transform-unicode-escapes": "^7.24.7",
+ "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+ "@babel/plugin-transform-unicode-regex": "^7.24.7",
+ "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
"@babel/preset-modules": "0.1.6-no-external-plugins",
"babel-plugin-polyfill-corejs2": "^0.4.10",
"babel-plugin-polyfill-corejs3": "^0.10.4",
@@ -1807,6 +1848,25 @@
"@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
}
},
+ "node_modules/@babel/preset-typescript": {
+ "version": "7.24.1",
+ "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz",
+ "integrity": "sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.24.0",
+ "@babel/helper-validator-option": "^7.23.5",
+ "@babel/plugin-syntax-jsx": "^7.24.1",
+ "@babel/plugin-transform-modules-commonjs": "^7.24.1",
+ "@babel/plugin-transform-typescript": "^7.24.1"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
"node_modules/@babel/regjsgen": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
@@ -1826,33 +1886,33 @@
}
},
"node_modules/@babel/template": {
- "version": "7.24.0",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
- "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+ "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
"dev": true,
"dependencies": {
- "@babel/code-frame": "^7.23.5",
- "@babel/parser": "^7.24.0",
- "@babel/types": "^7.24.0"
+ "@babel/code-frame": "^7.24.7",
+ "@babel/parser": "^7.24.7",
+ "@babel/types": "^7.24.7"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/traverse": {
- "version": "7.23.7",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
- "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
- "dev": true,
- "dependencies": {
- "@babel/code-frame": "^7.23.5",
- "@babel/generator": "^7.23.6",
- "@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-function-name": "^7.23.0",
- "@babel/helper-hoist-variables": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.6",
- "@babel/parser": "^7.23.6",
- "@babel/types": "^7.23.6",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
+ "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.24.7",
+ "@babel/generator": "^7.24.7",
+ "@babel/helper-environment-visitor": "^7.24.7",
+ "@babel/helper-function-name": "^7.24.7",
+ "@babel/helper-hoist-variables": "^7.24.7",
+ "@babel/helper-split-export-declaration": "^7.24.7",
+ "@babel/parser": "^7.24.7",
+ "@babel/types": "^7.24.7",
"debug": "^4.3.1",
"globals": "^11.1.0"
},
@@ -1861,13 +1921,13 @@
}
},
"node_modules/@babel/types": {
- "version": "7.24.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
- "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
+ "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
"dev": true,
"dependencies": {
- "@babel/helper-string-parser": "^7.23.4",
- "@babel/helper-validator-identifier": "^7.22.20",
+ "@babel/helper-string-parser": "^7.24.7",
+ "@babel/helper-validator-identifier": "^7.24.7",
"to-fast-properties": "^2.0.0"
},
"engines": {
@@ -1951,18 +2011,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/@eslint/eslintrc/node_modules/type-fest": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
- "dev": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/@eslint/js": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.0.0.tgz",
@@ -2699,14 +2747,14 @@
}
},
"node_modules/@jridgewell/gen-mapping": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
- "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+ "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
"dev": true,
"dependencies": {
- "@jridgewell/set-array": "^1.0.1",
+ "@jridgewell/set-array": "^1.2.1",
"@jridgewell/sourcemap-codec": "^1.4.10",
- "@jridgewell/trace-mapping": "^0.3.9"
+ "@jridgewell/trace-mapping": "^0.3.24"
},
"engines": {
"node": ">=6.0.0"
@@ -2722,9 +2770,9 @@
}
},
"node_modules/@jridgewell/set-array": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
- "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+ "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
"dev": true,
"engines": {
"node": ">=6.0.0"
@@ -2737,21 +2785,15 @@
"dev": true
},
"node_modules/@jridgewell/trace-mapping": {
- "version": "0.3.18",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
- "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+ "version": "0.3.25",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+ "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
"dev": true,
"dependencies": {
- "@jridgewell/resolve-uri": "3.1.0",
- "@jridgewell/sourcemap-codec": "1.4.14"
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
}
},
- "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.4.14",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
- "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
- "dev": true
- },
"node_modules/@lwc/eslint-plugin-lwc": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/@lwc/eslint-plugin-lwc/-/eslint-plugin-lwc-1.8.1.tgz",
@@ -2808,18 +2850,6 @@
"url": "https://github.com/sponsors/isaacs"
}
},
- "node_modules/@lwc/eslint-plugin-lwc/node_modules/type-fest": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
- "dev": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
"version": "5.1.1-v1",
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -2865,6 +2895,18 @@
"node": ">= 8"
}
},
+ "node_modules/@pkgr/core": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+ "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+ "dev": true,
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/unts"
+ }
+ },
"node_modules/@sinclair/typebox": {
"version": "0.27.8",
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -2972,6 +3014,25 @@
"@types/istanbul-lib-report": "*"
}
},
+ "node_modules/@types/jest": {
+ "version": "29.5.12",
+ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
+ "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+ "dev": true,
+ "dependencies": {
+ "expect": "^29.0.0",
+ "pretty-format": "^29.0.0"
+ }
+ },
+ "node_modules/@types/jquery": {
+ "version": "3.5.30",
+ "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.30.tgz",
+ "integrity": "sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==",
+ "dev": true,
+ "dependencies": {
+ "@types/sizzle": "*"
+ }
+ },
"node_modules/@types/jsdom": {
"version": "20.0.1",
"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
@@ -2983,18 +3044,18 @@
"parse5": "^7.0.0"
}
},
- "node_modules/@types/json-schema": {
- "version": "7.0.7",
- "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
- "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
- "dev": true
- },
"node_modules/@types/json5": {
"version": "0.0.29",
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
"dev": true
},
+ "node_modules/@types/lodash": {
+ "version": "4.17.4",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz",
+ "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==",
+ "dev": true
+ },
"node_modules/@types/node": {
"version": "20.10.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
@@ -3004,6 +3065,37 @@
"undici-types": "~5.26.4"
}
},
+ "node_modules/@types/prop-types": {
+ "version": "15.7.12",
+ "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
+ "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==",
+ "dev": true
+ },
+ "node_modules/@types/react": {
+ "version": "18.3.2",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.2.tgz",
+ "integrity": "sha512-Btgg89dAnqD4vV7R3hlwOxgqobUQKgx3MmrQRi0yYbs/P0ym8XozIAlkqVilPqHQwXs4e9Tf63rrCgl58BcO4w==",
+ "dev": true,
+ "dependencies": {
+ "@types/prop-types": "*",
+ "csstype": "^3.0.2"
+ }
+ },
+ "node_modules/@types/react-dom": {
+ "version": "18.3.0",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+ "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
+ "dev": true,
+ "dependencies": {
+ "@types/react": "*"
+ }
+ },
+ "node_modules/@types/sizzle": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+ "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+ "dev": true
+ },
"node_modules/@types/stack-utils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
@@ -3016,6 +3108,12 @@
"integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
"dev": true
},
+ "node_modules/@types/ua-parser-js": {
+ "version": "0.7.39",
+ "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz",
+ "integrity": "sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==",
+ "dev": true
+ },
"node_modules/@types/yargs": {
"version": "17.0.32",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
@@ -3031,54 +3129,132 @@
"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
"dev": true
},
- "node_modules/@typescript-eslint/experimental-utils": {
- "version": "4.16.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz",
- "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==",
+ "node_modules/@typescript-eslint/eslint-plugin": {
+ "version": "7.10.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.10.0.tgz",
+ "integrity": "sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@types/json-schema": "^7.0.3",
- "@typescript-eslint/scope-manager": "4.16.1",
- "@typescript-eslint/types": "4.16.1",
- "@typescript-eslint/typescript-estree": "4.16.1",
- "eslint-scope": "^5.0.0",
- "eslint-utils": "^2.0.0"
+ "@eslint-community/regexpp": "^4.10.0",
+ "@typescript-eslint/scope-manager": "7.10.0",
+ "@typescript-eslint/type-utils": "7.10.0",
+ "@typescript-eslint/utils": "7.10.0",
+ "@typescript-eslint/visitor-keys": "7.10.0",
+ "graphemer": "^1.4.0",
+ "ignore": "^5.3.1",
+ "natural-compare": "^1.4.0",
+ "ts-api-utils": "^1.3.0"
},
"engines": {
- "node": "^10.12.0 || >=12.0.0"
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/parser": "^7.0.0",
+ "eslint": "^8.56.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+ "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/@typescript-eslint/parser": {
+ "version": "7.10.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.10.0.tgz",
+ "integrity": "sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "@typescript-eslint/scope-manager": "7.10.0",
+ "@typescript-eslint/types": "7.10.0",
+ "@typescript-eslint/typescript-estree": "7.10.0",
+ "@typescript-eslint/visitor-keys": "7.10.0",
+ "debug": "^4.3.4"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "*"
+ "eslint": "^8.56.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "4.16.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz",
- "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==",
+ "version": "7.10.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.10.0.tgz",
+ "integrity": "sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "4.16.1",
- "@typescript-eslint/visitor-keys": "4.16.1"
+ "@typescript-eslint/types": "7.10.0",
+ "@typescript-eslint/visitor-keys": "7.10.0"
},
"engines": {
- "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+ "node": "^18.18.0 || >=20.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
}
},
+ "node_modules/@typescript-eslint/type-utils": {
+ "version": "7.10.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.10.0.tgz",
+ "integrity": "sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/typescript-estree": "7.10.0",
+ "@typescript-eslint/utils": "7.10.0",
+ "debug": "^4.3.4",
+ "ts-api-utils": "^1.3.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^8.56.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@typescript-eslint/types": {
- "version": "4.16.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz",
- "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==",
+ "version": "7.10.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.10.0.tgz",
+ "integrity": "sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+ "node": "^18.18.0 || >=20.0.0"
},
"funding": {
"type": "opencollective",
@@ -3086,21 +3262,23 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "4.16.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz",
- "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==",
+ "version": "7.10.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.10.0.tgz",
+ "integrity": "sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==",
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
- "@typescript-eslint/types": "4.16.1",
- "@typescript-eslint/visitor-keys": "4.16.1",
- "debug": "^4.1.1",
- "globby": "^11.0.1",
- "is-glob": "^4.0.1",
- "semver": "^7.3.2",
- "tsutils": "^3.17.1"
+ "@typescript-eslint/types": "7.10.0",
+ "@typescript-eslint/visitor-keys": "7.10.0",
+ "debug": "^4.3.4",
+ "globby": "^11.1.0",
+ "is-glob": "^4.0.3",
+ "minimatch": "^9.0.4",
+ "semver": "^7.6.0",
+ "ts-api-utils": "^1.3.0"
},
"engines": {
- "node": "^10.12.0 || >=12.0.0"
+ "node": "^18.18.0 || >=20.0.0"
},
"funding": {
"type": "opencollective",
@@ -3112,17 +3290,67 @@
}
}
},
+ "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+ "version": "9.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+ "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@typescript-eslint/utils": {
+ "version": "7.10.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.10.0.tgz",
+ "integrity": "sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.4.0",
+ "@typescript-eslint/scope-manager": "7.10.0",
+ "@typescript-eslint/types": "7.10.0",
+ "@typescript-eslint/typescript-estree": "7.10.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^8.56.0"
+ }
+ },
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "4.16.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz",
- "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==",
+ "version": "7.10.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.10.0.tgz",
+ "integrity": "sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "4.16.1",
- "eslint-visitor-keys": "^2.0.0"
+ "@typescript-eslint/types": "7.10.0",
+ "eslint-visitor-keys": "^3.4.3"
},
"engines": {
- "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+ "node": "^18.18.0 || >=20.0.0"
},
"funding": {
"type": "opencollective",
@@ -3130,14 +3358,24 @@
}
},
"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
- "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
"dev": true,
+ "license": "Apache-2.0",
"engines": {
- "node": ">=10"
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
}
},
+ "node_modules/@ungap/structured-clone": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+ "dev": true
+ },
"node_modules/abab": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@@ -3527,15 +3765,6 @@
"integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
"dev": true
},
- "node_modules/astral-regex": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
- "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/async": {
"version": "3.2.5",
"resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
@@ -3563,6 +3792,14 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/awesome-phonenumber": {
+ "version": "5.11.0",
+ "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-5.11.0.tgz",
+ "integrity": "sha512-25GfikMIo6CBQIqvjoewo4uiu5Ai7WqEC8gxesH3LDwCY43oEdkLaT15a+8adC7uWIJCGh+YQiBY5bjmDpoQcg==",
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/axe-core": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
@@ -3861,12 +4098,12 @@
}
},
"node_modules/braces": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
- "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
"dev": true,
"dependencies": {
- "fill-range": "^7.0.1"
+ "fill-range": "^7.1.1"
},
"engines": {
"node": ">=8"
@@ -4336,6 +4573,12 @@
"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
"dev": true
},
+ "node_modules/csstype": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+ "dev": true
+ },
"node_modules/damerau-levenshtein": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -4890,54 +5133,55 @@
}
},
"node_modules/eslint": {
- "version": "7.15.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.15.0.tgz",
- "integrity": "sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==",
+ "version": "8.57.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+ "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
"dev": true,
"dependencies": {
- "@babel/code-frame": "^7.0.0",
- "@eslint/eslintrc": "^0.2.2",
- "ajv": "^6.10.0",
+ "@eslint-community/eslint-utils": "^4.2.0",
+ "@eslint-community/regexpp": "^4.6.1",
+ "@eslint/eslintrc": "^2.1.4",
+ "@eslint/js": "8.57.0",
+ "@humanwhocodes/config-array": "^0.11.14",
+ "@humanwhocodes/module-importer": "^1.0.1",
+ "@nodelib/fs.walk": "^1.2.8",
+ "@ungap/structured-clone": "^1.2.0",
+ "ajv": "^6.12.4",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
- "debug": "^4.0.1",
+ "debug": "^4.3.2",
"doctrine": "^3.0.0",
- "enquirer": "^2.3.5",
- "eslint-scope": "^5.1.1",
- "eslint-utils": "^2.1.0",
- "eslint-visitor-keys": "^2.0.0",
- "espree": "^7.3.1",
- "esquery": "^1.2.0",
+ "escape-string-regexp": "^4.0.0",
+ "eslint-scope": "^7.2.2",
+ "eslint-visitor-keys": "^3.4.3",
+ "espree": "^9.6.1",
+ "esquery": "^1.4.2",
"esutils": "^2.0.2",
- "file-entry-cache": "^6.0.0",
- "functional-red-black-tree": "^1.0.1",
- "glob-parent": "^5.0.0",
- "globals": "^12.1.0",
- "ignore": "^4.0.6",
- "import-fresh": "^3.0.0",
+ "fast-deep-equal": "^3.1.3",
+ "file-entry-cache": "^6.0.1",
+ "find-up": "^5.0.0",
+ "glob-parent": "^6.0.2",
+ "globals": "^13.19.0",
+ "graphemer": "^1.4.0",
+ "ignore": "^5.2.0",
"imurmurhash": "^0.1.4",
"is-glob": "^4.0.0",
- "js-yaml": "^3.13.1",
+ "is-path-inside": "^3.0.3",
+ "js-yaml": "^4.1.0",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
- "lodash": "^4.17.19",
- "minimatch": "^3.0.4",
+ "lodash.merge": "^4.6.2",
+ "minimatch": "^3.1.2",
"natural-compare": "^1.4.0",
- "optionator": "^0.9.1",
- "progress": "^2.0.0",
- "regexpp": "^3.1.0",
- "semver": "^7.2.1",
- "strip-ansi": "^6.0.0",
- "strip-json-comments": "^3.1.0",
- "table": "^5.2.3",
- "text-table": "^0.2.0",
- "v8-compile-cache": "^2.0.3"
+ "optionator": "^0.9.3",
+ "strip-ansi": "^6.0.1",
+ "text-table": "^0.2.0"
},
"bin": {
"eslint": "bin/eslint.js"
},
"engines": {
- "node": "^10.12.0 || >=12.0.0"
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
"funding": {
"url": "https://opencollective.com/eslint"
@@ -5302,18 +5546,6 @@
"url": "https://github.com/sponsors/epoberezkin"
}
},
- "node_modules/eslint-config-expensify/node_modules/type-fest": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
- "dev": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/eslint-config-prettier": {
"version": "8.10.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
@@ -5465,23 +5697,27 @@
}
},
"node_modules/eslint-plugin-jest": {
- "version": "24.7.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz",
- "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==",
+ "version": "28.6.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.6.0.tgz",
+ "integrity": "sha512-YG28E1/MIKwnz+e2H7VwYPzHUYU4aMa19w0yGcwXnnmJH6EfgHahTJ2un3IyraUxNfnz/KUhJAFXNNwWPo12tg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/experimental-utils": "^4.0.1"
+ "@typescript-eslint/utils": "^6.0.0 || ^7.0.0"
},
"engines": {
- "node": ">=10"
+ "node": "^16.10.0 || ^18.12.0 || >=20.0.0"
},
"peerDependencies": {
- "@typescript-eslint/eslint-plugin": ">= 4",
- "eslint": ">=5"
+ "@typescript-eslint/eslint-plugin": "^6.0.0 || ^7.0.0",
+ "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0",
+ "jest": "*"
},
"peerDependenciesMeta": {
"@typescript-eslint/eslint-plugin": {
"optional": true
+ },
+ "jest": {
+ "optional": true
}
}
},
@@ -5533,6 +5769,36 @@
"node": "*"
}
},
+ "node_modules/eslint-plugin-prettier": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz",
+ "integrity": "sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==",
+ "dev": true,
+ "dependencies": {
+ "prettier-linter-helpers": "^1.0.0",
+ "synckit": "^0.8.6"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-plugin-prettier"
+ },
+ "peerDependencies": {
+ "@types/eslint": ">=8.0.0",
+ "eslint": ">=8.0.0",
+ "eslint-config-prettier": "*",
+ "prettier": ">=3.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/eslint": {
+ "optional": true
+ },
+ "eslint-config-prettier": {
+ "optional": true
+ }
+ }
+ },
"node_modules/eslint-plugin-react": {
"version": "7.34.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz",
@@ -5645,6 +5911,18 @@
"node": ">=4.0.0"
}
},
+ "node_modules/eslint-plugin-you-dont-need-lodash-underscore": {
+ "version": "6.14.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-you-dont-need-lodash-underscore/-/eslint-plugin-you-dont-need-lodash-underscore-6.14.0.tgz",
+ "integrity": "sha512-3zkkU/O1agczP7szJGHmisZJS/AknfVl6mb0Zqoc95dvFsdmfK+cbhrn+Ffy0UWB1pgDJwQr7kIO3rPstWs3Dw==",
+ "dev": true,
+ "dependencies": {
+ "kebab-case": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
"node_modules/eslint-scope": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -5683,24 +5961,67 @@
}
},
"node_modules/eslint/node_modules/@eslint/eslintrc": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz",
- "integrity": "sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==",
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+ "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
"dev": true,
"dependencies": {
"ajv": "^6.12.4",
- "debug": "^4.1.1",
- "espree": "^7.3.0",
- "globals": "^12.1.0",
- "ignore": "^4.0.6",
+ "debug": "^4.3.2",
+ "espree": "^9.6.0",
+ "globals": "^13.19.0",
+ "ignore": "^5.2.0",
"import-fresh": "^3.2.1",
- "js-yaml": "^3.13.1",
- "lodash": "^4.17.19",
- "minimatch": "^3.0.4",
+ "js-yaml": "^4.1.0",
+ "minimatch": "^3.1.2",
"strip-json-comments": "^3.1.1"
},
"engines": {
- "node": "^10.12.0 || >=12.0.0"
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/node_modules/@eslint/js": {
+ "version": "8.57.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+ "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
+ "node_modules/eslint/node_modules/@humanwhocodes/config-array": {
+ "version": "0.11.14",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+ "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+ "dev": true,
+ "dependencies": {
+ "@humanwhocodes/object-schema": "^2.0.2",
+ "debug": "^4.3.1",
+ "minimatch": "^3.0.5"
+ },
+ "engines": {
+ "node": ">=10.10.0"
+ }
+ },
+ "node_modules/eslint/node_modules/@humanwhocodes/object-schema": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+ "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+ "dev": true
+ },
+ "node_modules/eslint/node_modules/acorn": {
+ "version": "8.11.3",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+ "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+ "dev": true,
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
}
},
"node_modules/eslint/node_modules/ansi-styles": {
@@ -5718,6 +6039,12 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
+ "node_modules/eslint/node_modules/argparse": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+ "dev": true
+ },
"node_modules/eslint/node_modules/chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -5752,13 +6079,70 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
- "node_modules/eslint/node_modules/eslint-visitor-keys": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
- "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+ "node_modules/eslint/node_modules/escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
"dev": true,
"engines": {
"node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint/node_modules/eslint-scope": {
+ "version": "7.2.2",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+ "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+ "dev": true,
+ "dependencies": {
+ "esrecurse": "^4.3.0",
+ "estraverse": "^5.2.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/node_modules/eslint-visitor-keys": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/node_modules/espree": {
+ "version": "9.6.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+ "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+ "dev": true,
+ "dependencies": {
+ "acorn": "^8.9.0",
+ "acorn-jsx": "^5.3.2",
+ "eslint-visitor-keys": "^3.4.1"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
}
},
"node_modules/eslint/node_modules/file-entry-cache": {
@@ -5773,6 +6157,22 @@
"node": "^10.12.0 || >=12.0.0"
}
},
+ "node_modules/eslint/node_modules/find-up": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+ "dev": true,
+ "dependencies": {
+ "locate-path": "^6.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/eslint/node_modules/flat-cache": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
@@ -5787,13 +6187,25 @@
"node": "^10.12.0 || >=12.0.0"
}
},
+ "node_modules/eslint/node_modules/glob-parent": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^4.0.3"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
+ },
"node_modules/eslint/node_modules/globals": {
- "version": "12.4.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
- "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+ "version": "13.24.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+ "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dev": true,
"dependencies": {
- "type-fest": "^0.8.1"
+ "type-fest": "^0.20.2"
},
"engines": {
"node": ">=8"
@@ -5811,6 +6223,84 @@
"node": ">=8"
}
},
+ "node_modules/eslint/node_modules/ignore": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+ "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/eslint/node_modules/js-yaml": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+ "dev": true,
+ "dependencies": {
+ "argparse": "^2.0.1"
+ },
+ "bin": {
+ "js-yaml": "bin/js-yaml.js"
+ }
+ },
+ "node_modules/eslint/node_modules/locate-path": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+ "dev": true,
+ "dependencies": {
+ "p-locate": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint/node_modules/minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/eslint/node_modules/p-limit": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+ "dev": true,
+ "dependencies": {
+ "yocto-queue": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint/node_modules/p-locate": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+ "dev": true,
+ "dependencies": {
+ "p-limit": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/eslint/node_modules/rimraf": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -6015,21 +6505,26 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true
},
+ "node_modules/fast-diff": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+ "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+ "dev": true
+ },
"node_modules/fast-glob": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
- "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+ "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
"dev": true,
"dependencies": {
"@nodelib/fs.stat": "^2.0.2",
"@nodelib/fs.walk": "^1.2.3",
- "glob-parent": "^5.1.0",
+ "glob-parent": "^5.1.2",
"merge2": "^1.3.0",
- "micromatch": "^4.0.2",
- "picomatch": "^2.2.1"
+ "micromatch": "^4.0.4"
},
"engines": {
- "node": ">=8"
+ "node": ">=8.6.0"
}
},
"node_modules/fast-json-stable-stringify": {
@@ -6087,9 +6582,9 @@
}
},
"node_modules/fill-range": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
- "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
"dev": true,
"dependencies": {
"to-regex-range": "^5.0.1"
@@ -6447,16 +6942,16 @@
}
},
"node_modules/globby": {
- "version": "11.0.2",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz",
- "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==",
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+ "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
"dev": true,
"dependencies": {
"array-union": "^2.1.0",
"dir-glob": "^3.0.1",
- "fast-glob": "^3.1.1",
- "ignore": "^5.1.4",
- "merge2": "^1.3.0",
+ "fast-glob": "^3.2.9",
+ "ignore": "^5.2.0",
+ "merge2": "^1.4.1",
"slash": "^3.0.0"
},
"engines": {
@@ -6467,9 +6962,9 @@
}
},
"node_modules/globby/node_modules/ignore": {
- "version": "5.1.8",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
- "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+ "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
"dev": true,
"engines": {
"node": ">= 4"
@@ -9815,6 +10310,12 @@
"node": ">=4.0"
}
},
+ "node_modules/kebab-case": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.2.tgz",
+ "integrity": "sha512-7n6wXq4gNgBELfDCpzKc+mRrZFs7D+wgfF5WRFLNAr4DA/qtr9Js8uOAVAfHhuLMfAcQ0pRKqbpjx+TcJVdE1Q==",
+ "dev": true
+ },
"node_modules/keyv": {
"version": "4.5.4",
"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -10062,12 +10563,12 @@
}
},
"node_modules/micromatch": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
- "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
+ "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
"dev": true,
"dependencies": {
- "braces": "^3.0.2",
+ "braces": "^3.0.3",
"picomatch": "^2.3.1"
},
"engines": {
@@ -10612,6 +11113,18 @@
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
+ "node_modules/prettier-linter-helpers": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+ "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+ "dev": true,
+ "dependencies": {
+ "fast-diff": "^1.1.2"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
"node_modules/pretty-format": {
"version": "29.7.0",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -11246,29 +11759,6 @@
"node": ">=8"
}
},
- "node_modules/slice-ansi": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
- "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
- "dev": true,
- "dependencies": {
- "ansi-styles": "^3.2.0",
- "astral-regex": "^1.0.0",
- "is-fullwidth-code-point": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -11444,27 +11934,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "dependencies": {
- "ansi-regex": "^4.1.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/strip-ansi/node_modules/ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true,
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/strip-bom": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -11525,50 +11994,28 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
"dev": true
},
- "node_modules/table": {
- "version": "5.4.6",
- "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
- "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+ "node_modules/synckit": {
+ "version": "0.8.8",
+ "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz",
+ "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==",
"dev": true,
"dependencies": {
- "ajv": "^6.10.2",
- "lodash": "^4.17.14",
- "slice-ansi": "^2.1.0",
- "string-width": "^3.0.0"
+ "@pkgr/core": "^0.1.0",
+ "tslib": "^2.6.2"
},
"engines": {
- "node": ">=6.0.0"
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/unts"
}
},
- "node_modules/table/node_modules/emoji-regex": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+ "node_modules/synckit/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
"dev": true
},
- "node_modules/table/node_modules/is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/table/node_modules/string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
- "dependencies": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/test-exclude": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -11671,6 +12118,18 @@
"node": ">=12"
}
},
+ "node_modules/ts-api-utils": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+ "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=16"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.2.0"
+ }
+ },
"node_modules/tsconfig-paths": {
"version": "3.15.0",
"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -11695,27 +12154,6 @@
"json5": "lib/cli.js"
}
},
- "node_modules/tslib": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
- "dev": true
- },
- "node_modules/tsutils": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz",
- "integrity": "sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg==",
- "dev": true,
- "dependencies": {
- "tslib": "^1.8.1"
- },
- "engines": {
- "node": ">= 6"
- },
- "peerDependencies": {
- "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
- }
- },
"node_modules/type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -11738,12 +12176,15 @@
}
},
"node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"dev": true,
"engines": {
- "node": ">=8"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/typed-array-buffer": {
@@ -11820,11 +12261,10 @@
}
},
"node_modules/typescript": {
- "version": "5.3.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
- "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+ "version": "5.4.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+ "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
"dev": true,
- "peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -11882,7 +12322,8 @@
"node_modules/underscore": {
"version": "1.13.6",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
- "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
+ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+ "dev": true
},
"node_modules/underscore.string": {
"version": "3.3.6",
diff --git a/package.json b/package.json
index 0756cace..2d8213ce 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,22 @@
{
"name": "expensify-common",
- "version": "1.0.0",
+ "version": "2.0.19",
"author": "Expensify, Inc.",
"description": "Expensify libraries and components shared across different repos",
"homepage": "https://expensify.com",
- "main": "index.js",
"license": "MIT",
+ "main": "dist/index.js",
+ "types": "dist/index.d.ts",
+ "files": [
+ "dist/**/*",
+ "API.md",
+ "README.md",
+ "LICENSE.md"
+ ],
"scripts": {
"grunt": "grunt",
+ "typecheck": "tsc --noEmit",
+ "build": "tsc -p tsconfig.build.json && cp ./lib/*.d.ts ./dist",
"test": "jest",
"lint": "eslint lib/",
"prettier": "prettier --write lib/",
@@ -19,6 +28,7 @@
"url": "git+ssh://git@github.com/Expensify/JS-Libs.git"
},
"dependencies": {
+ "awesome-phonenumber": "^5.4.0",
"classnames": "2.5.0",
"clipboard": "2.0.11",
"html-entities": "^2.5.2",
@@ -30,25 +40,36 @@
"react-dom": "16.12.0",
"semver": "^7.6.0",
"simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
- "ua-parser-js": "^1.0.37",
- "underscore": "1.13.6"
+ "ua-parser-js": "^1.0.37"
},
"devDependencies": {
- "@babel/preset-env": "^7.24.4",
+ "@babel/preset-env": "^7.24.5",
"@lwc/eslint-plugin-lwc": "^1.8.1",
+ "@babel/preset-typescript": "^7.24.1",
+ "@lwc/eslint-plugin-lwc": "^1.8.0",
+ "@types/jest": "^29.5.12",
+ "@types/jquery": "^3.5.30",
+ "@types/lodash": "^4.17.4",
+ "@types/react-dom": "^18.3.0",
+ "@types/ua-parser-js": "^0.7.39",
+ "@typescript-eslint/eslint-plugin": "^7.10.0",
+ "@typescript-eslint/parser": "^7.10.0",
"babel-jest": "^29.0.0",
"babelify": "10.0.0",
- "eslint": "^7.15.0",
+ "eslint": "^8.57.0",
"eslint-config-expensify": "^2.0.48",
"eslint-config-prettier": "^8.10.0",
- "eslint-plugin-jest": "^24.7.0",
+ "eslint-plugin-jest": "^28.6.0",
+ "eslint-plugin-prettier": "^5.1.3",
+ "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
"grunt": "1.6.1",
"grunt-chokidar": "1.0.2",
"grunt-eslint": "25.0.0",
"jest": "^29.0.0",
"jest-environment-jsdom": "^29.7.0",
"jit-grunt": "^0.10.0",
- "prettier": "^3.2.5"
+ "prettier": "^3.2.5",
+ "typescript": "^5.4.5"
},
"browserify": {
"transform": [
diff --git a/tsconfig.build.json b/tsconfig.build.json
new file mode 100644
index 00000000..d04f033a
--- /dev/null
+++ b/tsconfig.build.json
@@ -0,0 +1,5 @@
+{
+ "$schema": "https://json.schemastore.org/tsconfig",
+ "extends": "./tsconfig.json",
+ "include": ["./lib"]
+}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..92431b67
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "$schema": "https://json.schemastore.org/tsconfig",
+ "compilerOptions": {
+ "target": "es2015",
+ "module": "commonjs",
+ "types": ["react", "jest", "node"],
+ "lib": ["esnext"],
+ "allowJs": true,
+ "checkJs": false,
+ "jsx": "react",
+ "isolatedModules": true,
+ "strict": true,
+ "moduleResolution": "node",
+ "resolveJsonModule": true,
+ "esModuleInterop": true,
+ "skipLibCheck": true,
+ "declaration": true,
+ "outDir": "./dist"
+ },
+ "exclude": ["**/node_modules/**/*", "**/dist/**/*"]
+}