@automattic/vip 2.30.0 → 2.31.0

package/dist/lib/envvar/api-list.js

@@ -10,9 +10,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 const query = (0, _graphqlTag.default)`
 	query GetEnvironmentVariables(
 		$appId: Int!
@@ -39,6 +41,7 @@ const query = (0, _graphqlTag.default)`
 
 // List the names (but not values) of environment variables.
 async function listEnvVars(appId, envId) {
+  var _data$app$environment, _data$app, _data$app$environment2, _data$app$environment3, _data$app$environment4;
   const api = await (0, _api.default)();
   const variables = {
     appId,
@@ -50,7 +53,9 @@ async function listEnvVars(appId, envId) {
     query,
     variables
   });
-  return data.app.environments[0].environmentVariables.nodes.map(({
-    name
-  }) => name);
+  const nodes = (_data$app$environment = (_data$app = data.app) === null || _data$app === void 0 ? void 0 : (_data$app$environment2 = _data$app.environments) === null || _data$app$environment2 === void 0 ? void 0 : (_data$app$environment3 = _data$app$environment2[0]) === null || _data$app$environment3 === void 0 ? void 0 : (_data$app$environment4 = _data$app$environment3.environmentVariables) === null || _data$app$environment4 === void 0 ? void 0 : _data$app$environment4.nodes) !== null && _data$app$environment !== void 0 ? _data$app$environment : [];
+  return nodes.map(entry => {
+    var _entry$name;
+    return (_entry$name = entry === null || entry === void 0 ? void 0 : entry.name) !== null && _entry$name !== void 0 ? _entry$name : '';
+  });
 }

package/dist/lib/envvar/api-set.js

@@ -10,9 +10,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 const mutation = (0, _graphqlTag.default)`
 	mutation AddEnvironmentVariable(
 		$appId: Int!

package/dist/lib/envvar/api.js

@@ -44,10 +44,7 @@ var _apiGetAll = _interopRequireDefault(require("./api-get-all"));
 var _apiList = _interopRequireDefault(require("./api-list"));
 var _apiSet = _interopRequireDefault(require("./api-set"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -83,7 +80,7 @@ function validateName(name) {
   return name === sanitizedName && /^[A-Z]/.test(sanitizedName);
 }
 function validateNameWithMessage(name) {
-  (0, _logging.debug)(`Validating environment variable name ${JSON.stringify(name)}`);
+  (0, _logging.debug)(`Validating environment variable name "${name}"`);
   if (!validateName(name)) {
     const message = ['Environment variable name must consist of A-Z, 0-9, or _,', 'and must start with an uppercase letter.'].join('\n');
     console.log(_chalk.default.bold.red(message));

package/dist/lib/envvar/input.js

@@ -9,10 +9,7 @@ exports.promptForValue = promptForValue;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _enquirer = require("enquirer");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -27,13 +24,15 @@ function cancel() {
   process.exit();
 }
 function confirm(message) {
-  return new _enquirer.BooleanPrompt({
+  return new _enquirer.Confirm({
     message
   }).run().catch(() => false);
 }
 async function promptForValue(message, mustMatch) {
-  var _response$str;
-  const response = await (0, _enquirer.prompt)({
+  var _str$trim;
+  const {
+    str
+  } = await (0, _enquirer.prompt)({
     message,
     name: 'str',
     type: 'input',
@@ -44,5 +43,5 @@ async function promptForValue(message, mustMatch) {
       return true;
     }
   });
-  return ((_response$str = response.str) === null || _response$str === void 0 ? void 0 : _response$str.trim()) || '';
+  return (_str$trim = str === null || str === void 0 ? void 0 : str.trim()) !== null && _str$trim !== void 0 ? _str$trim : '';
 }

package/dist/lib/envvar/read-file.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.readVariableFromFile = readVariableFromFile;
 var _logging = require("../../lib/envvar/logging");
 var _readFile = require("../read-file");
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -19,7 +16,7 @@ var _readFile = require("../read-file");
  * Internal dependencies
  */
 
-async function readVariableFromFile(path) {
-  (0, _logging.debug)(`Loading variable value from file ${JSON.stringify(path)}`);
-  return await (0, _readFile.readFromFile)(path);
+function readVariableFromFile(path) {
+  (0, _logging.debug)(`Loading variable value from file "${path}"`);
+  return (0, _readFile.readFromFile)(path);
 }

package/dist/lib/http/proxy-agent.js

@@ -9,6 +9,7 @@ var _httpsProxyAgent = require("https-proxy-agent");
 var _proxyFromEnv = require("proxy-from-env");
 var _debug = _interopRequireDefault(require("debug"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /**
  * External dependencies
  */
@@ -31,10 +32,10 @@ const debug = (0, _debug.default)('vip:proxy-agent');
 // 5. NO_PROXY is set along with VIP_USE_SYSTEM_PROXY and any system proxy: null is returned if the no proxy applies, otherwise the first active proxy is used
 // This allows near full customization by the client of what proxy should be used, instead of making assumptions based on the URL string
 function createProxyAgent(url) {
-  const VIP_PROXY = process.env.VIP_PROXY || process.env.vip_proxy || null;
-  const SOCKS_PROXY = process.env.SOCKS_PROXY || process.env.socks_proxy || null;
-  const HTTPS_PROXY = process.env.HTTPS_PROXY || process.env.https_proxy || null;
-  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null;
+  const VIP_PROXY = process.env.VIP_PROXY || process.env.vip_proxy || null; // NOSONAR
+  const SOCKS_PROXY = process.env.SOCKS_PROXY || process.env.socks_proxy || null; // NOSONAR
+  const HTTPS_PROXY = process.env.HTTPS_PROXY || process.env.https_proxy || null; // NOSONAR
+  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null; // NOSONAR
 
   // VIP Socks Proxy should take precedence and should be fully backward compatible
   if (VIP_PROXY) {

package/dist/lib/read-file.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.readFromFile = readFromFile;
-var _fs = require("fs");
+var _promises = require("node:fs/promises");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -22,14 +19,16 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 
 async function readFromFile(path) {
-  const data = await _fs.promises.readFile(path, 'binary').catch(({
-    message
-  }) => {
-    // Provide friendly version of common error.
-    if (message.startsWith('ENOENT: no such file or directory')) {
-      exit.withError(`Could not load file ${JSON.stringify(path)}.`);
+  try {
+    const data = await (0, _promises.readFile)(path, 'utf-8');
+    return data.trim();
+  } catch (error) {
+    if (!(error instanceof Error)) {
+      exit.withError('Unknown error');
+    }
+    if ('code' in error && error.code === 'ENOENT') {
+      exit.withError(`Could not load file "${path}".`);
     }
-    exit.withError(message);
-  });
-  return Buffer.from(data).toString().trim();
+    exit.withError(error.message);
+  }
 }

package/dist/lib/search-and-replace.js

@@ -7,8 +7,9 @@ exports.getReadAndWriteStreams = getReadAndWriteStreams;
 exports.searchAndReplace = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-var _chalk = _interopRequireDefault(require("chalk"));
+var _chalk = require("chalk");
 var _debug = _interopRequireDefault(require("debug"));
+var _promises = require("node:stream/promises");
 var _vipSearchReplace = require("@automattic/vip-search-replace");
 var _tracker = require("../lib/tracker");
 var _prompt = require("../lib/cli/prompt");
@@ -18,10 +19,7 @@ var _utils = require("./utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -32,11 +30,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const debug = (0, _debug.default)('@automattic/vip:lib:search-and-replace');
-const flatten = arr => {
-  return arr.reduce((flat, toFlatten) => {
-    return flat.concat(Array.isArray(toFlatten) ? flatten(toFlatten) : toFlatten);
-  }, []);
-};
 function getReadAndWriteStreams({
   fileName,
   inPlace,
@@ -103,7 +96,7 @@ const searchAndReplace = async (fileName, pairs, {
   const fileSize = (0, _clientFileUploader.getFileSize)(fileName);
 
   // if we don't have any pairs to replace with, return the input file
-  if (!pairs || !pairs.length) {
+  if (!pairs.length) {
     throw new Error('No search and replace parameters provided.');
   }
 
@@ -113,8 +106,7 @@ const searchAndReplace = async (fileName, pairs, {
   }
 
   // determine all the replacements required
-  const replacementsArr = pairs.map(pair => pair.split(',').map(str => str.trim()));
-  const replacements = flatten(replacementsArr);
+  const replacements = pairs.flatMap(pair => pair.split(',').map(str => str.trim()));
   debug('Pairs: ', pairs, 'Replacements: ', replacements);
   if (inPlace) {
     const approved = await (0, _prompt.confirm)([], 'Are you sure you want to run search and replace on your input file? This operation is not reversible.');
@@ -142,20 +134,15 @@ const searchAndReplace = async (fileName, pairs, {
   try {
     replacedStream = await (0, _vipSearchReplace.replace)(readStream, replacements, binary);
   } catch (replaceError) {
+    // replace() throws strings... OMG
     exit.withError(replaceError);
   }
-  const result = await new Promise((resolve, reject) => {
-    replacedStream.pipe(writeStream).on('finish', () => {
-      resolve({
-        inputFileName: fileName,
-        outputFileName,
-        usingStdOut
-      });
-    }).on('error', () => {
-      console.log(_chalk.default.red("Oh no! We couldn't write to the output file.  Please check your available disk space and file/folder permissions."));
-      reject();
-    });
-  });
+  try {
+    await (0, _promises.pipeline)(replacedStream, writeStream);
+  } catch (error) {
+    console.log((0, _chalk.red)("Oh no! We couldn't write to the output file.  Please check your available disk space and file/folder permissions."));
+    throw error;
+  }
   const endTime = process.hrtime(startTime);
   const end = endTime[1] / 1000000; // time in ms
 
@@ -163,6 +150,10 @@ const searchAndReplace = async (fileName, pairs, {
     time_to_run: end,
     file_size: fileSize
   });
-  return result;
+  return {
+    inputFileName: fileName,
+    outputFileName,
+    usingStdOut
+  };
 };
 exports.searchAndReplace = searchAndReplace;

package/dist/lib/tracker.js

@@ -7,6 +7,7 @@ exports.aliasUser = aliasUser;
 exports.makeCommandTracker = makeCommandTracker;
 exports.trackEvent = trackEvent;
 exports.trackEventWithEnv = trackEventWithEnv;
+var _debug = _interopRequireDefault(require("debug"));
 var _index = _interopRequireDefault(require("./analytics/index"));
 var _tracks = _interopRequireDefault(require("./analytics/clients/tracks"));
 var _pendo = _interopRequireDefault(require("./analytics/clients/pendo"));
@@ -17,12 +18,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
-const debug = require('debug')('@automattic/vip:analytics');
 
 /**
  * Internal dependencies
  */
 
+const debug = (0, _debug.default)('@automattic/vip:analytics');
 let analytics = null;
 async function init() {
   const uuid = await _token.default.uuid();
@@ -37,9 +38,7 @@ async function init() {
       userId: uuid
     }));
   }
-  return new _index.default({
-    clients
-  });
+  return new _index.default(clients);
 }
 async function getInstance() {
   if (analytics) {
@@ -48,30 +47,31 @@ async function getInstance() {
   analytics = await init();
   return analytics;
 }
-async function trackEvent(...args) {
+async function trackEvent(name, props = {}) {
   try {
     await _token.default.uuid();
     const client = await getInstance();
-    return await client.trackEvent(...args);
+    return await client.trackEvent(name, props);
   } catch (err) {
     debug('trackEvent() failed', err);
+    return [];
   }
 }
 async function aliasUser(vipUserId) {
-  try {
-    if (vipUserId) {
+  if (vipUserId) {
+    try {
       await trackEvent('_alias_user', {
         ui: vipUserId,
         _ut: _config.default.tracksUserType,
         anonid: await _token.default.uuid()
       });
-      await _token.default.setUuid(vipUserId);
+      await _token.default.setUuid(`${vipUserId}`);
+    } catch (err) {
+      debug('aliasUser() failed', err);
     }
-  } catch (err) {
-    debug('aliasUser() failed', err);
   }
 }
-async function trackEventWithEnv(appId, envId, eventName, eventProps = {}) {
+function trackEventWithEnv(appId, envId, eventName, eventProps = {}) {
   return trackEvent(eventName, {
     ...eventProps,
     app_id: appId,

package/dist/lib/user-error.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function UserError(message) {
-  this.message = message;
+class UserError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'UserError';
+  }
 }
-UserError.prototype = new Error();
-var _default = UserError;
-exports.default = _default;
+exports.default = UserError;

package/dist/lib/utils.js

@@ -9,12 +9,10 @@ exports.pollUntil = pollUntil;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _os = _interopRequireDefault(require("os"));
+var _promises = require("node:timers/promises");
 var _debug = _interopRequireDefault(require("debug"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -23,7 +21,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-
 const debug = (0, _debug.default)('@automattic/vip:lib:utils');
 
 /**
@@ -32,20 +29,19 @@ const debug = (0, _debug.default)('@automattic/vip:lib:utils');
  * @param {Function} fn       A function to poll
  * @param {number}   interval Poll interval in milliseconds
  * @param {Function} isDone   A function that accepts the return of `fn`. Stops the polling if it returns true
- * @return {Promise} 					A promise which resolves when the polling is done
- * @throws {Error} 						If the fn throws an error
+ * @return {Promise}          A promise which resolves when the polling is done
+ * @throws {Error}            If the fn throws an error
  */
 async function pollUntil(fn, interval, isDone) {
-  // eslint-disable-next-line no-constant-condition
-  while (true) {
+  let done = false;
+  while (!done) {
     // eslint-disable-next-line no-await-in-loop
     const result = await fn();
-    if (isDone(result)) {
-      return;
+    done = isDone(result);
+    if (!done) {
+      // eslint-disable-next-line no-await-in-loop
+      await (0, _promises.setTimeout)(interval);
     }
-
-    // eslint-disable-next-line no-await-in-loop
-    await new Promise(res => setTimeout(res, interval));
   }
 }
 
@@ -53,8 +49,8 @@ async function pollUntil(fn, interval, isDone) {
  * Create a temporary directory in the system's temp directory
  *
  * @param {string} prefix Prefix for the directory name
- * @return {string}				Path to the temporary directory
- * @throws {Error} 				If the directory cannot be created
+ * @return {string}       Path to the temporary directory
+ * @throws {Error}        If the directory cannot be created
  */
 function makeTempDir(prefix = 'vip-cli') {
   const tempDir = _fs.default.mkdtempSync(_path.default.join(_os.default.tmpdir(), `${prefix}-`));
@@ -71,17 +67,17 @@ function makeTempDir(prefix = 'vip-cli') {
 
 /**
  * Get absolute path to a file
- * 
+ *
  * @param {string} filePath Path to the file
- * 
+ *
  * @return {string} Absolute path to the file
  */
 function getAbsolutePath(filePath) {
-  if (filePath.startsWith('/')) {
-    return filePath;
-  }
   if (filePath.startsWith('~')) {
     return filePath.replace('~', _os.default.homedir());
   }
-  return _path.default.join(process.cwd(), filePath);
+  if (!_path.default.isAbsolute(filePath)) {
+    return _path.default.resolve(process.cwd(), filePath);
+  }
+  return filePath;
 }

package/dist/lib/vip-import-validate-files.js

@@ -11,6 +11,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 // Accepted media file extensions
 const acceptedExtensions = ['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'svg', 'tiff', 'tif', 'ico', 'asf', 'asx', 'wmv', 'wmx', 'wm', 'avi', 'divx', 'mov', 'qt', 'mpeg', 'mpg', 'mpe', 'mp4', 'm4v', 'ogv', 'webm', 'mkv', '3gp', '3gpp', '3g2', '3gp2', 'txt', 'asc', 'c', 'cc', 'h', 'srt', 'csv', 'tsv', 'ics', 'rtx', 'css', 'vtt', 'dfxp', 'mp3', 'm4a', 'm4b', 'ra', 'ram', 'wav', 'ogg', 'oga', 'mid', 'midi', 'wma', 'wax', 'mka', 'rtf', 'js', 'pdf', 'class', 'psd', 'xcf', 'doc', 'pot', 'pps', 'ppt', 'wri', 'xla', 'xls', 'xlt', 'xlw', 'mdb', 'mpp', 'docx', 'docm', 'dotx', 'dotm', 'xlsx', 'xlsm', 'xlsb', 'xltx', 'xltm', 'xlam', 'pptx', 'pptm', 'ppsx', 'ppsm', 'potx', 'potm', 'ppam', 'sldx', 'sldm', 'onetoc', ' onetoc2', 'onetmp', 'onepkg', 'oxps', 'xps', 'odt', 'odp', 'ods', 'odg', 'odc', 'odb', 'odf', 'webp', 'wp', 'wpd', 'key', 'numbers', 'pages'];
 
@@ -45,13 +46,12 @@ const recommendedFileStructure = () => {
 
 // Recommend accepted file types
 const recommendAcceptableFileTypes = () => {
-  console.log('Accepted file types: \n\n' + _chalk.default.magenta(`${acceptedExtensions}`));
+  console.log('Accepted file types: \n\n' + _chalk.default.magenta(`${acceptedExtensions.join(', ')}`));
   console.log();
 };
 
 // Accepted file name characters
 const recommendAcceptableFileNames = () => {
-  // const acceptedCharacters = 'Non-English characters, spaces, ( ) [ ] ~';
   const allowedCharacters = [...acceptedCharactersSet].join(' ');
   const notAllowedCharacters = [...prohibitedCharactersSet].join(' ');
   console.log('The following characters are allowed in file names:\n' + _chalk.default.green(`All special characters, including: ${allowedCharacters}\n\n`) + 'The following characters are prohibited in file names:\n' + _chalk.default.red(`Encoded or alternate whitespace, such as ${notAllowedCharacters}, are converted to proper spaces\n`));
@@ -114,10 +114,10 @@ const findNestedDirectories = directory => {
  *
  * @param {string}  folderPath Path of the entire folder structure
  * @param {boolean} sites      Check if site is a multisite or single site
- *  @return {Object} indexes
+ * @return {Object} indexes
  */
 exports.findNestedDirectories = findNestedDirectories;
-const getIndexPositionOfFolders = (folderPath, sites) => {
+function getIndexPositionOfFolders(folderPath, sites = false) {
   let sitesIndex;
   let siteIDIndex;
   let yearIndex;
@@ -147,11 +147,11 @@ const getIndexPositionOfFolders = (folderPath, sites) => {
 
     if (siteID) {
       siteIDIndex = directories.indexOf(siteID[1]);
-    }
 
-    // Remove the multisite-specific path to avoid confusing a 2 digit site ID with the month
-    // e.g.- `uploads/sites/11/2020/06` -> `uploads/2020/06`
-    pathMutate = pathMutate.replace(siteID[0], '');
+      // Remove the multisite-specific path to avoid confusing a 2 digit site ID with the month
+      // e.g.- `uploads/sites/11/2020/06` -> `uploads/2020/06`
+      pathMutate = pathMutate.replace(siteID[0], '');
+    }
   }
 
   /**
@@ -197,7 +197,7 @@ const getIndexPositionOfFolders = (folderPath, sites) => {
     yearIndex,
     monthIndex
   };
-};
+}
 
 /**
  * Single site folder structure validation
@@ -419,8 +419,8 @@ const isFileSanitized = file => {
  */
 exports.isFileSanitized = isFileSanitized;
 const identifyIntermediateImage = filename => {
-  const regex = /(-|_)?(\d+x\d+)(@\d+\w)?(\.\w{3,4})$/;
-  return filename.match(regex);
+  const regex = /([_-])?(\d+x\d+)(@\d+\w)?(\.\w{3,4})$/;
+  return filename.match(regex); // NOSONAR
 };
 
 // Check if an intermediate image has an existing original (source) image
@@ -431,7 +431,7 @@ const doesImageHaveExistingSource = file => {
   const intermediateImage = identifyIntermediateImage(filename);
   if (null !== intermediateImage) {
     const imageSizing = intermediateImage[0]; // First capture group of the regex validation
-    const extension = _path.default.extname(filename).substr(1); // Extension of the path (e.g.- `.jpg`)
+    const extension = _path.default.extname(filename).slice(1); // Extension of the path (e.g.- `.jpg`)
 
     // Filename manipulation: if an image is an intermediate image, strip away the image sizing
     // e.g.- `panda4000x6000.png` -> `panda.png`
@@ -446,8 +446,8 @@ const doesImageHaveExistingSource = file => {
     if (_fs.default.existsSync(originalImage)) {
       return originalImage;
     }
-    return false;
   }
+  return false;
 };
 
 /**
@@ -497,26 +497,27 @@ const summaryLogs = ({
   totalFiles,
   totalFolders
 }) => {
+  const messages = [];
   if (folderErrorsLength > 0) {
-    folderErrorsLength = _chalk.default.bgYellow(' RECOMMENDED ') + _chalk.default.bold.yellow(` ${folderErrorsLength} folders, `) + `${totalFolders} folders total`;
+    messages.push(_chalk.default.bgYellow(' RECOMMENDED ') + _chalk.default.bold.yellow(` ${folderErrorsLength} folders, `) + `${totalFolders} folders total`);
   } else {
-    folderErrorsLength = _chalk.default.bgGreen('    PASS     ') + _chalk.default.bold.green(` ${totalFolders} folders, `) + `${totalFolders} folders total`;
+    messages.push(_chalk.default.bgGreen('    PASS     ') + _chalk.default.bold.green(` ${totalFolders} folders, `) + `${totalFolders} folders total`);
   }
   if (intImagesErrorsLength > 0) {
-    intImagesErrorsLength = _chalk.default.white.bgRed('   ERROR     ') + _chalk.default.red(` ${intImagesErrorsLength} intermediate images`) + `, ${totalFiles} files total`;
+    messages.push(_chalk.default.white.bgRed('   ERROR     ') + _chalk.default.red(` ${intImagesErrorsLength} intermediate images`) + `, ${totalFiles} files total`);
   } else {
-    intImagesErrorsLength = _chalk.default.white.bgGreen('    PASS     ') + _chalk.default.green(` ${intImagesErrorsLength} intermediate images`) + `, ${totalFiles} files total`;
+    messages.push(_chalk.default.white.bgGreen('    PASS     ') + _chalk.default.green(` ${intImagesErrorsLength} intermediate images`) + `, ${totalFiles} files total`);
   }
   if (fileTypeErrorsLength > 0) {
-    fileTypeErrorsLength = _chalk.default.white.bgRed('   ERROR     ') + _chalk.default.red(` ${fileTypeErrorsLength} invalid file extensions`) + `, ${totalFiles} files total`;
+    messages.push(_chalk.default.white.bgRed('   ERROR     ') + _chalk.default.red(` ${fileTypeErrorsLength} invalid file extensions`) + `, ${totalFiles} files total`);
   } else {
-    fileTypeErrorsLength = _chalk.default.white.bgGreen('    PASS     ') + _chalk.default.green(` ${fileTypeErrorsLength} invalid file extensions`) + `, ${totalFiles} files total`;
+    messages.push(_chalk.default.white.bgGreen('    PASS     ') + _chalk.default.green(` ${fileTypeErrorsLength} invalid file extensions`) + `, ${totalFiles} files total`);
   }
   if (filenameErrorsLength) {
-    filenameErrorsLength = _chalk.default.white.bgRed('   ERROR     ') + _chalk.default.red(` ${filenameErrorsLength} invalid filenames`) + `, ${totalFiles} files total`;
+    messages.push(_chalk.default.white.bgRed('   ERROR     ') + _chalk.default.red(` ${filenameErrorsLength} invalid filenames`) + `, ${totalFiles} files total`);
   } else {
-    filenameErrorsLength = _chalk.default.bgGreen('    PASS     ') + _chalk.default.green(` ${filenameErrorsLength} invalid filenames`) + `, ${totalFiles} files total`;
+    messages.push(_chalk.default.bgGreen('    PASS     ') + _chalk.default.green(` ${filenameErrorsLength} invalid filenames`) + `, ${totalFiles} files total`);
   }
-  console.log(`\n${folderErrorsLength}\n${intImagesErrorsLength}\n${fileTypeErrorsLength}\n${filenameErrorsLength}\n`);
+  console.log(`\n${messages.join('\n')}\n`);
 };
 exports.summaryLogs = summaryLogs;