@automattic/vip 4.0.0 → 4.0.1

package/dist/lib/cli/command.js

@@ -107,6 +107,9 @@ function createOptionDefinition(name, description, defaultValue, parseFn, usedSh
     parser
   };
 }
+function isOptionToken(arg) {
+  return arg !== '-' && arg.startsWith('-');
+}
 class CommanderArgsCompat {
   constructor(opts) {
     this.details = {
@@ -197,16 +200,37 @@ class CommanderArgsCompat {
     this.sub = this.program.args.slice();
     return this.program.opts();
   }
+  findSubcommand(argv) {
+    const dashDashIndex = argv.indexOf('--', 2);
+    const searchEnd = dashDashIndex === -1 ? argv.length : dashDashIndex;
+    for (let index = 2; index < searchEnd; index++) {
+      const arg = argv[index];
+      if (this.isDefined(arg, 'commands')) {
+        return {
+          index,
+          name: arg
+        };
+      }
+      if (!isOptionToken(arg)) {
+        return null;
+      }
+      const nextArg = argv[index + 1];
+      const optionHasInlineValue = arg.includes('=');
+      const nextArgCouldBeOptionValue = nextArg && !isOptionToken(nextArg) && !this.isDefined(nextArg, 'commands');
+      if (!optionHasInlineValue && nextArgCouldBeOptionValue) {
+        index++;
+      }
+    }
+    return null;
+  }
   async executeSubcommand(argv, parsedAlias, subcommand) {
     const currentScript = argv[1];
+    const subcommandName = subcommand.name;
     const extension = _nodePath.default.extname(currentScript);
     const baseScriptPath = extension ? currentScript.slice(0, -extension.length) : currentScript;
-    const childScriptPath = extension ? `${baseScriptPath}-${subcommand}${extension}` : `${baseScriptPath}-${subcommand}`;
+    const childScriptPath = extension ? `${baseScriptPath}-${subcommandName}${extension}` : `${baseScriptPath}-${subcommandName}`;
     const aliasFromRawArgv = argv.slice(2).find(arg => (0, _envAlias.isAlias)(arg));
-    const subcommandIndex = parsedAlias.argv.findIndex((arg, index) => {
-      return index > 1 && arg === subcommand;
-    });
-    let childArgs = subcommandIndex > -1 ? parsedAlias.argv.slice(subcommandIndex + 1) : [];
+    let childArgs = [...parsedAlias.argv.slice(2, subcommand.index), ...parsedAlias.argv.slice(subcommand.index + 1)];
     if (aliasFromRawArgv) {
       childArgs = [aliasFromRawArgv, ...childArgs];
     }
@@ -217,7 +241,7 @@ class CommanderArgsCompat {
         env: process.env
       });
     } else {
-      const fallbackCommand = `${_nodePath.default.basename(baseScriptPath)}-${subcommand}`;
+      const fallbackCommand = `${_nodePath.default.basename(baseScriptPath)}-${subcommandName}`;
       if (process.env.VIP_CLI_SEA_MODE === '1' && (0, _internalBinLoader.hasInternalBin)(fallbackCommand)) {
         process.argv = [process.argv[0], process.argv[1], ...childArgs];
         const loaded = await (0, _internalBinLoader.loadInternalBin)(fallbackCommand);
@@ -256,8 +280,9 @@ CommanderArgsCompat.prototype.argv = async function (argv, cb) {
   const options = this.parse(parsedAlias.argv);
 
   // If there's a sub-command, run that instead
-  if (this.isDefined(this.sub[0], 'commands')) {
-    await this.executeSubcommand(argv, parsedAlias, this.sub[0]);
+  const dispatchSubcommand = this.findSubcommand(parsedAlias.argv);
+  if (dispatchSubcommand) {
+    await this.executeSubcommand(argv, parsedAlias, dispatchSubcommand);
     return {};
   }
   if (_opts.format && !options.format) {

package/dist/lib/dev-environment/dev-environment-core.js

@@ -267,11 +267,12 @@ function parseComponentForInfo(component) {
 async function showLogs(lando, slug, options = {}) {
   debug('Will display logs command on env', slug, 'with options', options);
   const instancePath = getEnvironmentPath(slug);
-  debug('Instance path for', slug, 'is:', instancePath);
+  debug('Instance path for %s is %s', slug, instancePath);
   if (options.service) {
-    const appInfo = await (0, _devEnvironmentLando.landoInfo)(lando, instancePath);
-    if (!appInfo.services.includes(options.service)) {
-      throw new _userError.default(`Service '${options.service}' not found. Please choose from one: ${appInfo.services.toString()}`);
+    const application = await (0, _devEnvironmentLando.getLandoApplication)(lando, instancePath);
+    const services = application.info.map(service => service.service);
+    if (!services.includes(options.service)) {
+      throw new _userError.default(`Service '${options.service}' not found. Please choose from: ${services.join(', ')}`);
     }
   }
   return (0, _devEnvironmentLando.landoLogs)(lando, instancePath, options);

package/dist/lib/dev-environment/dev-environment-lando.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.bootstrapLando = bootstrapLando;
 exports.checkEnvHealth = checkEnvHealth;
+exports.getLandoApplication = getLandoApplication;
 exports.getProxyContainer = getProxyContainer;
 exports.isContainerRunning = isContainerRunning;
 exports.isEnvUp = isEnvUp;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "4.0.0",
+      "version": "4.0.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -212,9 +212,9 @@
       }
     },
     "node_modules/@automattic/vip-search-replace": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@automattic/vip-search-replace/-/vip-search-replace-2.0.0.tgz",
-      "integrity": "sha512-i1d3/KCK0sVgNjsJAV4UlMnC51AypLDfX8iEWTDLBiSR3wEvSWMSftF3f7yK46VdbBXB5zDvnVM48kFvASW9Ig==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@automattic/vip-search-replace/-/vip-search-replace-2.0.1.tgz",
+      "integrity": "sha512-awcVa6V9RDc2vCd2UpqNDtmgJb51U3788A9QgLoiFahhztgR8ngV11e9gqhYOG5CtI/CGSv7X9KIrr6hazzCjg==",
       "cpu": [
         "ia32",
         "x64",
@@ -14329,9 +14329,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.5.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz",
-      "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==",
+      "version": "7.5.15",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.15.tgz",
+      "integrity": "sha512-dzGK0boVlC4W5QFuQN1EFSl3bIDYsk7Tj40U6eIBnK2k/8ml7TZ5agbI5j5+qnoVcAA+rNtBml8SEiLxZpNqRQ==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {