@automattic/vip 2.30.0 → 2.31.0-dev1

package/dist/lib/api.js

@@ -15,11 +15,9 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _token = _interopRequireDefault(require("./token"));
 var _env = _interopRequireDefault(require("./env"));
 var _proxyAgent = require("../lib/http/proxy-agent");
+var _http = _interopRequireDefault(require("./api/http"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -31,8 +29,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // Config
 const PRODUCTION_API_HOST = 'https://api.wpvip.com';
+// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 exports.PRODUCTION_API_HOST = PRODUCTION_API_HOST;
-const API_HOST = process.env.API_HOST || PRODUCTION_API_HOST;
+const API_HOST = process.env.API_HOST || PRODUCTION_API_HOST; // NOSONAR
 exports.API_HOST = API_HOST;
 const API_URL = `${API_HOST}/graphql`;
 exports.API_URL = API_URL;
@@ -49,17 +48,17 @@ async function API({
   const authToken = await _token.default.get();
   const headers = {
     'User-Agent': _env.default.userAgent,
-    Authorization: authToken ? `Bearer ${authToken.raw}` : null
+    Authorization: `Bearer ${authToken.raw}`
   };
   const errorLink = (0, _error.onError)(({
     networkError,
     graphQLErrors
   }) => {
-    if (networkError && networkError.statusCode === 401) {
+    if (networkError && 'statusCode' in networkError && networkError.statusCode === 401) {
       console.error(_chalk.default.red('Unauthorized:'), 'You are unauthorized to perform this request, please logout with `vip logout` then try again.');
       process.exit(1);
     }
-    if (graphQLErrors && graphQLErrors.length && globalGraphQLErrorHandlingEnabled) {
+    if (graphQLErrors !== null && graphQLErrors !== void 0 && graphQLErrors.length && globalGraphQLErrorHandlingEnabled) {
       graphQLErrors.forEach(error => {
         console.error(_chalk.default.red('Error:'), error.message);
       });
@@ -75,22 +74,20 @@ async function API({
     };
   });
   const authLink = new _core2.ApolloLink((operation, forward) => {
-    const {
-      token
-    } = operation.getContext();
+    const ctx = operation.getContext();
+    const token = ctx.token;
     operation.setContext({
       headers: {
-        Authorization: token ? `Bearer ${token.raw}` : null
+        Authorization: `Bearer ${token.raw}`
       }
     });
     return forward(operation);
   });
   const proxyAgent = (0, _proxyAgent.createProxyAgent)(API_URL);
-  const http = require("./api/http").default;
   const httpLink = new _core.HttpLink({
     uri: API_URL,
     headers,
-    fetch: http,
+    fetch: _http.default,
     fetchOptions: {
       agent: proxyAgent
     }

package/dist/lib/app-logs/app-logs.js

@@ -8,10 +8,7 @@ exports.getRecentLogs = getRecentLogs;
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../../lib/api"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -41,7 +38,7 @@ const QUERY_ENVIRONMENT_LOGS = (0, _graphqlTag.default)`
 	}
 `;
 async function getRecentLogs(appId, envId, type, limit, after) {
-  var _response$data, _response$data$app, _response$data$app$en;
+  var _response$data$app, _response$data$app$en, _response$data$app$en2;
   const api = await (0, _api.default)({
     exitOnError: false
   });
@@ -55,7 +52,7 @@ async function getRecentLogs(appId, envId, type, limit, after) {
       after
     }
   });
-  const logs = response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$app = _response$data.app) === null || _response$data$app === void 0 ? void 0 : (_response$data$app$en = _response$data$app.environments[0]) === null || _response$data$app$en === void 0 ? void 0 : _response$data$app$en.logs;
+  const logs = (_response$data$app = response.data.app) === null || _response$data$app === void 0 ? void 0 : (_response$data$app$en = _response$data$app.environments) === null || _response$data$app$en === void 0 ? void 0 : (_response$data$app$en2 = _response$data$app$en[0]) === null || _response$data$app$en2 === void 0 ? void 0 : _response$data$app$en2.logs;
   if (!(logs !== null && logs !== void 0 && logs.nodes)) {
     throw new Error('Unable to query logs');
   }

package/dist/lib/cli/apiConfig.js

@@ -14,12 +14,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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
+
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 async function checkFeatureEnabled(featureName, exitOnFalse = false) {
   // TODO: eventually let's look at more feature flags coming from the public api,
   // for now, let's see if the user of the CLI is VIP
@@ -29,9 +32,9 @@ async function checkFeatureEnabled(featureName, exitOnFalse = false) {
   });
   let isVIP;
   try {
-    var _res$data, _res$data$me;
+    var _res$data$me;
     const res = await featureFlags.get();
-    if ((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$me = _res$data.me) === null || _res$data$me === void 0 ? void 0 : _res$data$me.isVIP) !== undefined) {
+    if ((res === null || res === void 0 ? void 0 : (_res$data$me = res.data.me) === null || _res$data$me === void 0 ? void 0 : _res$data$me.isVIP) !== undefined) {
       isVIP = res.data.me.isVIP;
     } else {
       isVIP = false;
@@ -43,9 +46,9 @@ async function checkFeatureEnabled(featureName, exitOnFalse = false) {
       exitOnFalse,
       error: message
     });
-    exit.withError('Failed to determine if feature is enabled' + message);
+    exit.withError(`Failed to determine if feature is enabled: ${message}`);
   }
-  if (exitOnFalse === true && isVIP === false) {
+  if (exitOnFalse && isVIP === false) {
     exit.withError('The feature you are attempting to use is not currently enabled.');
   }
   return isVIP === true;
@@ -56,10 +59,10 @@ async function checkFeatureEnabled(featureName, exitOnFalse = false) {
 // - It is mocked globally in jest.setupMocks.js.
 async function checkIfUserIsVip() {
   const token = await _token.default.get();
-  if (token && token.valid()) {
-    var _res$data2, _res$data2$me;
+  if (token.valid()) {
+    var _res$data$me2;
     const res = await featureFlags.get();
-    return !!(res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && (_res$data2$me = _res$data2.me) !== null && _res$data2$me !== void 0 && _res$data2$me.isVIP);
+    return !!(res !== null && res !== void 0 && (_res$data$me2 = res.data.me) !== null && _res$data$me2 !== void 0 && _res$data$me2.isVIP);
   }
   return false;
 }

package/dist/lib/cli/config.js

@@ -11,7 +11,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const debug = (0, _debug.default)('@automattic/vip:lib:cli:config');
-let configFromFile = {};
+let configFromFile;
 try {
   // Get `local` config first; this will only exist in dev as it's npmignore-d.
   configFromFile = require("../../../config/config.local.json");
@@ -21,6 +21,5 @@ try {
   configFromFile = require("../../../config/config.publish.json");
   debug('Loaded config data from config.publish.json');
 }
-const config = Object.assign({}, configFromFile);
-var _default = config;
+var _default = configFromFile;
 exports.default = _default;

package/dist/lib/cli/envAlias.js

@@ -1,8 +1,15 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isAlias = isAlias;
+exports.parseEnvAlias = parseEnvAlias;
+exports.parseEnvAliasFromArgv = parseEnvAliasFromArgv;
 /**
  * External dependencies
  */
+
 function isAlias(alias) {
   return /^@[A-Za-z0-9.-]+$/.test(alias);
 }
@@ -12,7 +19,7 @@ function parseEnvAlias(alias) {
   }
 
   // Remove the '@'
-  const stripped = alias.substr(1).toLowerCase();
+  const stripped = alias.slice(1).toLowerCase();
 
   // in JS, .split() with a limit discards the extra ones, so can't use it
   // Also convert to lowercase because mixed case environment names would cause problems
@@ -20,7 +27,7 @@ function parseEnvAlias(alias) {
   let env;
 
   // Rejoin the env on '.' (if present), to handle instance names (env.instance-01)
-  if (rest && rest.length) {
+  if (rest.length) {
     env = rest.join('.');
   }
   return {
@@ -47,7 +54,7 @@ function parseEnvAliasFromArgv(processArgv) {
   }
 
   // If we did have an alias, split it up into app/env
-  const parsedAlias = module.exports.parseEnvAlias(alias);
+  const parsedAlias = parseEnvAlias(alias);
 
   // Splice out the alias
   argv.splice(argv.indexOf(alias), 1);
@@ -55,9 +62,4 @@ function parseEnvAliasFromArgv(processArgv) {
     argv,
     ...parsedAlias
   };
-}
-module.exports = {
-  isAlias,
-  parseEnvAlias,
-  parseEnvAliasFromArgv
-};
+}

package/dist/lib/cli/exit.js

@@ -4,13 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withError = withError;
-var _chalk = _interopRequireDefault(require("chalk"));
+var _chalk = require("chalk");
 var _env = _interopRequireDefault(require("../../lib/env"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -21,11 +18,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 function withError(message) {
-  console.error(`${_chalk.default.red('Error: ')} ${message.toString().replace(/^Error:\s*/, '')}`);
+  console.error(`${(0, _chalk.red)('Error: ')} ${message.toString().replace(/^Error:\s*/, '')}`);
 
   // Debug ouput is printed below error output both for information
   // hierarchy and to make it more likely that the user copies it to their
   // clipboard when dragging across output.
-  console.log(`${_chalk.default.yellow('Debug: ')} VIP-CLI v${_env.default.app.version}, Node ${_env.default.node.version}, ${_env.default.os.name} ${_env.default.os.version}`);
+  console.log(`${(0, _chalk.yellow)('Debug: ')} VIP-CLI v${_env.default.app.version}, Node ${_env.default.node.version}, ${_env.default.os.name} ${_env.default.os.version}`);
   process.exit(1);
 }

package/dist/lib/cli/format.js

@@ -8,7 +8,7 @@ exports.capitalize = capitalize;
 exports.formatBytes = void 0;
 exports.formatData = formatData;
 exports.formatEnvironment = formatEnvironment;
-exports.formatSearchReplaceValues = void 0;
+exports.formatSearchReplaceValues = formatSearchReplaceValues;
 exports.getGlyphForStatus = getGlyphForStatus;
 exports.isJson = isJson;
 exports.isJsonObject = isJsonObject;
@@ -16,13 +16,17 @@ exports.keyValue = keyValue;
 exports.requoteArgs = requoteArgs;
 exports.table = table;
 var _chalk = _interopRequireDefault(require("chalk"));
+var _json2csv = require("json2csv");
+var _cliTable = _interopRequireDefault(require("cli-table"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/** @format */
+// @format
+
 /**
  * External dependencies
  */
+
 function formatData(data, format) {
-  if (!data || !data.length) {
+  if (!data.length) {
     return '';
   }
   switch (format) {
@@ -50,32 +54,26 @@ function ids(data) {
   if (0 > fields.indexOf('id')) {
     return 'No ID field found';
   }
-  const id = [];
-  data.forEach(datum => id.push(datum.id));
+  const id = data.map(datum => datum.id);
   return id.join(' ');
 }
 function csv(data) {
-  const {
-    Parser
-  } = require('json2csv');
   const fields = Object.keys(data[0]);
-  const parser = new Parser({
+  const parser = new _json2csv.Parser({
     fields: formatFields(fields)
   });
   return parser.parse(data);
 }
 function table(data) {
-  const Table = require('cli-table');
   const fields = Object.keys(data[0]);
-  const dataTable = new Table({
+  const dataTable = new _cliTable.default({
     head: formatFields(fields),
     style: {
       head: ['blueBright']
     }
   });
   data.forEach(datum => {
-    const row = [];
-    fields.forEach(field => row.push(datum[field]));
+    const row = fields.map(field => datum[field].toString());
     dataTable.push(row);
   });
   return dataTable.toString();
@@ -95,11 +93,15 @@ function keyValue(values) {
     key,
     value
   } of values) {
-    let formattedValue = value;
+    let formattedValue;
     switch (key.toLowerCase()) {
+      // NOSONAR
       case 'environment':
         formattedValue = formatEnvironment(value);
         break;
+      default:
+        formattedValue = value;
+        break;
     }
     lines.push(`+ ${key}: ${formattedValue}`);
   }
@@ -109,7 +111,7 @@ function keyValue(values) {
 function requoteArgs(args) {
   return args.map(arg => {
     if (arg.includes('--') && arg.includes('=') && arg.includes(' ')) {
-      return arg.replace(/^--(.*)=(.*)$/, '--$1="$2"');
+      return arg.replace(/^--([^=]*)=(.*)$/, '--$1="$2"');
     }
     if (arg.includes(' ') && !isJsonObject(arg)) {
       return `"${arg}"`;
@@ -123,10 +125,10 @@ function isJsonObject(str) {
 function isJson(str) {
   try {
     JSON.parse(str);
+    return true;
   } catch (error) {
     return false;
   }
-  return true;
 }
 function capitalize(str) {
   if (typeof str !== 'string' || !str.length) {
@@ -154,8 +156,6 @@ class RunningSprite {
 exports.RunningSprite = RunningSprite;
 function getGlyphForStatus(status, runningSprite) {
   switch (status) {
-    default:
-      return '';
     case 'pending':
       return '○';
     case 'running':
@@ -168,24 +168,23 @@ function getGlyphForStatus(status, runningSprite) {
       return _chalk.default.yellow('✕');
     case 'skipped':
       return _chalk.default.green('-');
+    default:
+      return '';
   }
 }
 
 // Format Search and Replace values to output
-const formatSearchReplaceValues = (values, message) => {
+function formatSearchReplaceValues(values, message) {
   // Convert single pair S-R values to arrays
   const searchReplaceValues = typeof values === 'string' ? [values] : values;
-  const formattedOutput = searchReplaceValues.map(pairs => {
+  return searchReplaceValues.map(pairs => {
     // Turn each S-R pair into its own array, then trim away whitespace
     const [from, to] = pairs.split(',').map(pair => pair.trim());
-    const output = message(from, to);
-    return output;
+    return message(from, to);
   });
-  return formattedOutput;
-};
+}
 
 // Format bytes into kilobytes, megabytes, etc based on the size
-exports.formatSearchReplaceValues = formatSearchReplaceValues;
 const formatBytes = (bytes, decimals = 2) => {
   if (0 === bytes) {
     return '0 Bytes';
@@ -194,6 +193,6 @@ const formatBytes = (bytes, decimals = 2) => {
   const dm = decimals < 0 ? 0 : decimals;
   const sizes = ['bytes', 'KB', 'MB', 'GB', 'TB'];
   const idx = Math.floor(Math.log(bytes) / Math.log(bytesMultiplier));
-  return parseFloat((bytes / Math.pow(bytesMultiplier, idx)).toFixed(dm)) + ' ' + sizes[idx];
+  return `${parseFloat((bytes / Math.pow(bytesMultiplier, idx)).toFixed(dm))} ${sizes[idx]}`;
 };
 exports.formatBytes = formatBytes;

package/dist/lib/cli/progress.js

@@ -6,13 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.ProgressTracker = void 0;
 var _singleLineLog = require("single-line-log");
 var _format = require("../../lib/cli/format");
-/** @format */
+// @format
+
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 const PRINT_INTERVAL = process.env.DEBUG ? 5000 : 200; // How often the report is printed. Mainly affects the "spinner" animation.
 const COMPLETED_STEP_SLUGS = ['success', 'skipped'];
 class ProgressTracker {
@@ -27,6 +30,7 @@ class ProgressTracker {
   constructor(steps) {
     this.runningSprite = new _format.RunningSprite();
     this.hasFailure = false;
+    this.hasPrinted = false;
     this.stepsFromCaller = this.mapSteps(steps);
     this.stepsFromServer = new Map();
     this.prefix = '';
@@ -127,9 +131,9 @@ class ProgressTracker {
     }
   }
   allStepsSucceeded() {
-    return ![...this.getSteps().values()].some(({
+    return [...this.getSteps().values()].every(({
       status
-    }) => status !== 'success');
+    }) => status === 'success');
   }
   setStatusForStepId(stepId, status) {
     const step = this.stepsFromCaller.get(stepId);

package/dist/lib/cli/prompt.js

@@ -9,17 +9,18 @@ var _format = require("./format");
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 async function confirm(values, message, skipPrompt = false) {
   console.log((0, _format.keyValue)(values));
   if (!skipPrompt) {
     const answer = await (0, _enquirer.prompt)({
       type: 'confirm',
       name: 'confirm',
-      message,
-      default: false
+      message
     });
     return answer.confirm;
   }