Merge pull request #1482 from contentstack/feat/DX-980

feat: added flag to support variable types & respective prompt

Author: aman19K

package-lock.json

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-launch
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-launch/1.0.19 darwin-arm64 node-v22.2.0
+@contentstack/cli-launch/1.1.0 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-launch/README.md

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-launch",
-  "version": "1.0.19",
+  "version": "1.1.0",
   "description": "Launch related operations",
   "author": "Contentstack CLI",
   "bin": {

packages/contentstack-launch/package.json

@@ -262,14 +262,19 @@ export default class BaseClass {
           this.log(error, 'error');
           this.exit(1);
         })) || [];
-    this.config.selectedStack = await ux
-      .inquire({
-        name: 'stack',
-        type: 'search-list',
-        choices: listOfStacks,
-        message: 'Stack',
-      })
-      .then((name) => find(listOfStacks, { name }));
+
+    if (this.config.selectedStack) {
+      this.config.selectedStack = find(listOfStacks, { api_key: this.config.selectedStack });
+    } else {
+      this.config.selectedStack = await ux
+        .inquire({
+          name: 'stack',
+          type: 'search-list',
+          choices: listOfStacks,
+          message: 'Stack',
+        })
+        .then((name) => find(listOfStacks, { name }));
+    }
   }
 
   /**
@@ -299,16 +304,19 @@ export default class BaseClass {
           this.exit(1);
         })) || [];
 
-    this.config.deliveryToken = await ux
-      .inquire({
-        type: 'search-list',
-        name: 'deliveryToken',
-        choices: listOfDeliveryTokens,
-        message: 'Delivery token',
-      })
-      .then((name) => find(listOfDeliveryTokens, { name }) as Record<string, any>);
-
-    this.config.environment = this.config.deliveryToken.scope[0]?.environments[0]?.name;
+    if (this.config.deliveryToken) {
+      this.config.deliveryToken = find(listOfDeliveryTokens, { token: this.config.deliveryToken });
+    } else {
+      this.config.deliveryToken = await ux
+        .inquire({
+          type: 'search-list',
+          name: 'deliveryToken',
+          choices: listOfDeliveryTokens,
+          message: 'Delivery token',
+        })
+        .then((name) => find(listOfDeliveryTokens, { name }) as Record<string, any>);
+    }
+    this.config.environment = this.config.deliveryToken?.scope[0]?.environments[0]?.name;
   }
 
   /**
@@ -321,38 +329,51 @@ export default class BaseClass {
     let addNew = true;
     const envVariables = [];
 
-    do {
-      const variable = await ux
-        .inquire({
-          type: 'input',
-          name: 'variable',
-          message:
-            'Enter key and value with a colon between them, and use a comma(,) for the key-value pair. Format: <key1>:<value1>, <key2>:<value2> Ex: APP_ENV:prod, TEST_ENV:testVal',
-        })
-        .then((variable) => {
-          return map(split(variable as string, ','), (variable) => {
-            let [key, value] = split(variable as string, ':');
-            value = (value || '').trim();
-            key = (key || '').trim();
-
-            return { key, value };
-          }).filter(({ key }) => key);
-        });
+    if (!this.config.envVariables) {
+      do {
+        const variable = await ux
+          .inquire({
+            type: 'input',
+            name: 'variable',
+            message:
+              'Enter key and value with a colon between them, and use a comma(,) for the key-value pair. Format: <key1>:<value1>, <key2>:<value2> Ex: APP_ENV:prod, TEST_ENV:testVal',
+          })
+          .then((variable) => {
+            return map(split(variable as string, ','), (variable) => {
+              let [key, value] = split(variable as string, ':');
+              value = (value || '').trim();
+              key = (key || '').trim();
+
+              return { key, value };
+            }).filter(({ key }) => key);
+          });
 
-      envVariables.push(...variable);
+        envVariables.push(...variable);
 
-      if (
-        !(await ux.inquire({
-          type: 'confirm',
-          name: 'canImportFromStack',
-          message: 'Would you like to add more variables?',
-        }))
-      ) {
-        addNew = false;
-      }
-    } while (addNew);
+        if (
+          !(await ux.inquire({
+            type: 'confirm',
+            name: 'canImportFromStack',
+            message: 'Would you like to add more variables?',
+          }))
+        ) {
+          addNew = false;
+        }
+      } while (addNew);
+
+      this.envVariables.push(...envVariables);
+    } else {
+      if (typeof this.config.envVariables === 'string') {
+        const variable = map(split(this.config.envVariables as string, ','), (variable) => {
+          let [key, value] = split(variable as string, ':');
+          value = (value || '').trim();
+          key = (key || '').trim();
 
-    this.envVariables.push(...envVariables);
+          return { key, value };
+        });
+        this.envVariables.push(...variable);
+      }
+    }
   }
 
   /**
@@ -492,19 +513,16 @@ export default class BaseClass {
    * @memberof BaseClass
    */
   async handleEnvImportFlow(): Promise<void> {
-    const variablePreparationTypeOptions = [
-      'Import variables from a stack',
-      'Manually add custom variables to the list',
-      'Import variables from the local env file',
-    ];
-    const variablePreparationType: Array<string> = await ux.inquire({
-      type: 'checkbox',
-      name: 'variablePreparationType',
-      default: this.config.framework,
-      choices: variablePreparationTypeOptions,
-      message: 'Import variables from a stack and/or manually add custom variables to the list',
-      // validate: this.inquireRequireValidation,
-    });
+    const variablePreparationType =
+      this.config.variableType ||
+      (await ux.inquire({
+        type: 'checkbox',
+        name: 'variablePreparationType',
+        default: this.config.framework,
+        choices: this.config.variablePreparationTypeOptions,
+        message: 'Import variables from a stack and/or manually add custom variables to the list',
+        // validate: this.inquireRequireValidation,
+      }));
 
     if (includes(variablePreparationType, 'Import variables from a stack')) {
       await this.importEnvFromStack();
@@ -519,8 +537,8 @@ export default class BaseClass {
     if (this.envVariables.length) {
       this.printAllVariables();
     } else {
-      this.log('Import variables from a stack and/or manually add custom variables to the list', 'warn');
-      // this.exit(1);
+      this.log('Please provide env file!', 'error');
+      this.exit(1);
     }
   }
 
@@ -533,10 +551,10 @@ export default class BaseClass {
   async importVariableFromLocalConfig(): Promise<void> {
     const localEnv =
       dotEnv.config({
-        path: this.config.projectBasePath,
+        path: `${this.config.projectBasePath}/.env.local`,
       }).parsed ||
       dotEnv.config({
-        path: `${this.config.projectBasePath}/.env.local`,
+        path: this.config.projectBasePath,
       }).parsed;
 
     if (!isEmpty(localEnv)) {

packages/contentstack-launch/src/adapters/base-class.ts

@@ -6,7 +6,7 @@ import FormData from 'form-data';
 import filter from 'lodash/filter';
 import includes from 'lodash/includes';
 import { basename, resolve } from 'path';
-import { cliux, ux } from '@contentstack/cli-utilities';
+import { cliux, configHandler, ux } from '@contentstack/cli-utilities';
 import { createReadStream, existsSync, PathLike, statSync } from 'fs';
 
 import { print } from '../util';
@@ -110,9 +110,14 @@ export default class FileUpload extends BaseClass {
       framework,
       environment,
       'build-command': buildCommand,
-      'output-directory': outputDirectory,
+      'out-dir': outputDirectory,
+      'variable-type': variableType,
+      'env-variables': envVariables,
+      alias,
     } = this.config.flags;
-
+    const { token, apiKey } = configHandler.get(`tokens.${alias}`) ?? {};
+    this.config.selectedStack = apiKey;
+    this.config.deliveryToken = token;
     // this.fileValidation();
     await this.selectOrg();
     await this.createSignedUploadUrl();
@@ -166,6 +171,8 @@ export default class FileUpload extends BaseClass {
         message: 'Output Directory',
         default: (this.config.outputDirectories as Record<string, string>)[this.config?.framework || 'OTHER'],
       }));
+    this.config.variableType = variableType as unknown as string;
+    this.config.envVariables = envVariables;
     await this.handleEnvImportFlow();
   }