added optional field in string iput

Author: DheerajGBhatt

bin/index.ts

@@ -1,5 +1,6 @@
 const rover_utilities=  require("@rover-tools/engine").rover_utilities;
-
+const rover_config=  require("@rover-tools/engine").rover_config;
+let fs = require("fs");
 import * as cliConfig from "../cli-main/cliConfig";
 import * as util from "../cli-main/util";
 const deployment= require("@rover-tools/engine").rover_deployment;
@@ -19,7 +20,7 @@ async function run(argv:AnyObject) {
   if (argv[0] === "init") {
     let editedSam = await util.confirmation();
     if (editedSam === "create new SAM project") {
-      let app_name:object = await util.inputString("app_name","", "App Name:");
+      let app_name:object = await util.inputString("app_name","",false, "App Name:");
       await rover_utilities.checkFile(app_name["app_name"],"no")
       let language = await util.languageChoice();
       let stack_names: any = {};
@@ -36,11 +37,11 @@ async function run(argv:AnyObject) {
         let app_Types: any = [];
         let AppType:string = await util.appType("Module Type :");
 
-       
         if (AppType !== "Customizable") {
-          stackname[`stackName${i}`]=await util.makeid()
+          stackname[`stackName${i}`]=await "rover"+rover_utilities.NumtoAlpabet(i)
           let stack_name = stackname
           let stackName:string = stack_name[`stackName${i}`];
+         
           if (AppType === "CRUD") {
             let crud:AnyObject={} ;
             let tempObj = {};
@@ -70,7 +71,7 @@ async function run(argv:AnyObject) {
           let choice = cliConfig.customizable.choice;
           let customstack_name = await util.inputString(
             `customStackName${i}`,
-            "",
+            "",false,
             `Stack ${i} Name: `
           );
           let CustomStacks = await util.multichoice("app_type", choice);
@@ -88,7 +89,7 @@ async function run(argv:AnyObject) {
 
     } else if (editedSam === "add components to existing SAM") {
 
-      let app_name = await util.inputString("app_name","", "App Name");
+      let app_name = await util.inputString("app_name","",false, "App Name");
       await rover_utilities.checkFile(app_name["app_name"],"yes")
 
       let language = await util.languageChoice();
@@ -103,12 +104,10 @@ async function run(argv:AnyObject) {
         if (nested) {
           let chooseStack = await util.inputType("Select the module to which you want to add the components ", choice);
           let selectedchoice = choice.filter((ele) => Object.values(chooseStack).includes(ele));
-          choice = choice.filter((ele) => ele !== selectedchoice[0]);
           let componentChoice = cliConfig.customizable.choice;
           let components = await util.multichoice("type", componentChoice);
           let path = CompStacks["CompStacks"][selectedchoice[0]];
           nestedComponents[selectedchoice[0]] = { ...components, path: path };
-
           template = {
             ...app_name,
             language,
@@ -127,12 +126,10 @@ async function run(argv:AnyObject) {
               ...Compnents
             };
         }
-        if(choiceLength===1 || !nested){
-          break;
-        }else{
+        
           moreStack = await util.moreStack("Do you want to add one more components to modules ?")
+          console.log(moreStack)
         i++;
-        }
 
       } while (moreStack !== "No"|| choiceLength===0)
 
@@ -159,10 +156,15 @@ async function run(argv:AnyObject) {
       }
       else {
         await util.samValidate()
+        let pwd =(process.cwd()+"/").trim()
+        if(fs.existsSync("samconfig.toml")) {
+          exec("rm -rf samconfig.toml")
+          
+        }
         let filenamearray=(exec("pwd").toString()).split("/")
         let file_name = filenamearray[filenamearray.length-1].replace("\n","");
-        let stack_name = await util.inputString("stack_name","","Stack Name(optional) :")
-        let bucketName = await util.inputString("name","","Bucket Name(optional) :");
+        let stack_name = await util.inputString("stack_name","",true,"Stack Name(optional) :")
+        let bucketName = await util.inputString("name","",true,"Bucket Name(optional) :");
         let choice = buildConfig.samConfig.choices.deploymentregion;
         let deploymentregion = await util.inputType("Deployment region",choice);
         if (bucketName["name"]=="") {
@@ -173,7 +175,7 @@ async function run(argv:AnyObject) {
         if (stack_name["stack_name"]=="") {stack_name=file_name+"roverTest"}else{stack_name=stack_name["stack_name"]}
         let region=deploymentregion["Deployment region"]
 
-        exec("sh " + rover_utilities.npmroot +"/@rover-tools/cli/cli-main/exec.sh "+file_name+" "+stack_name+" "+region+" "+bucketName);
+        exec("sh " + rover_config.npmroot +"/@rover-tools/cli/cli-main/exec.sh "+file_name+" "+stack_name+" "+region+" "+bucketName);
 
       }
     } else {

cli-main/util.ts

@@ -8,13 +8,18 @@ let Yaml = require("js-yaml");
 const exec = require("child_process").execSync;
 const moduleParams = require("@rover-tools/engine").rover_modules;
 const Stack = require("@rover-tools/engine").rover_modules;
+const rover_config = require("@rover-tools/engine").rover_config;
 import { AnyArray, AnyObject } from "immer/dist/internal";
 const rover_utilities=  require("@rover-tools/engine").rover_utilities;
 const TOML = require('@iarna/toml')
 let pythonpattern=new RegExp(/python[1-9]*\.[1-9]*/g)
 let jspattern=new RegExp(/nodejs[1-9]*\.[a-zA-Z]*/g)
 let yamlpattern=new RegExp(/(\.yaml$)/g)
+let envpattern =new RegExp(/^env[0-9][0-9]+$/g)
 let apipathpattern=new RegExp(/^\/[a-zA-Z]*(\/[a-zA-Z]*-*)*/g)
+let stringpattern=new RegExp(/^[A-Za-z]+$/g)
+
+const crypto = require('crypto');
 
 export let s3Choice:any = [];
 export let accesskey:any,secretkey:any;
@@ -48,23 +53,38 @@ export let jsonCreation = async function (obj:any) {
   }
 };
 
-export let inputString = async function (userName: string,defaults:string, message = "") {
+export let inputString = async function (userName: string,defaults:string,optional:boolean, message = "") {
   let takeInput = await inquirer.prompt([
     {
       type: "input",
       name: userName,
       message: message,
       validate: function (value) {
+        let pass=true
+        let message=""
         if (userName=="path"){
-        let pass = apipathpattern.test(value)
-        if (pass) {
-          return true
+          let passtest = apipathpattern.test(value)
+          if (passtest) {
+            pass=true
+          }else{
+            message="Please enter a valid path"
+          }      
+        }else  {
+          let passtest
+          if (!optional) {
+            if (stringpattern.test(value))passtest=true
+            else message=`${userName} should have only alphanumeric values`
+            
+          }
+          
         }
-        return "Please enter a valid path"
-        }else{
-          return true
+        if(envpattern.test(userName)){
+          let passtest
+          if(value!==""&&value!==undefined)passtest=true
+          else message="environment values cannot be empty"
         }
-      
+        if(message!=="") return message
+        else return true      
     },
   },
   ]);
@@ -130,11 +150,11 @@ export let inputNumber = async function (userName: string,message:string) {
       message: `Please enter the required number of ${displayname} you want ?`,
       name: `${userName}`,
       validate: function (value) {
-        let pass = !isNaN(value)
+        let pass = !isNaN(value) && value>0
         if (pass) {
           return true
         }
-        return 'Please enter a valid number'
+        return 'Please enter a valid number greater than 0'
 
       },
     },
@@ -271,7 +291,7 @@ export let inputCli = async function (
           .map(({ key, value }) => key);
         res[sobj.key] = choiceNames[0];
       } else {
-        let name = await inputString("name","", `${sobj.message}-->Name`);
+        let name = await inputString("name","",false, `${sobj.message}-->Name`);
 
         let temp = name;
 
@@ -355,7 +375,7 @@ Object.assign(temp,ele)
   let deploymentparameters: any = {};
   let depBucketNames: any = {};
   for (let i = 1; i <= no_of_env; i++) {
-    let env = await inputString(`env${i}`,"",`Envrionment ${i} :`);
+    let env = await inputString(`env${i}`,"",false,`Envrionment ${i} :`);
     let envName = env[`env${i}`];
     envs.push(envName);
     let stepsChoice = buildConfig.samConfig.choices.dev;
@@ -369,19 +389,20 @@ Object.assign(temp,ele)
 
     let stackname = await inputString(
       `${envName}`,
-      "",
+      "",true,
+      
       `Stack Name(optional) --> ${envName} :`
     );
     let deploymentbucket = await inputString(
       `${envName}`,
-      "",
+      "",true,
       `Deployment Bucket(optional) --> ${envName} :`
     );
     let regionChoice = buildConfig.samConfig.choices.deploymentregion;
     let deployment_region = await inputType(`${envName}`, regionChoice,"Deployment Region");
     let deployment_parameter = await inputString(
       `${envName}`,
-      "",
+      "",true,
       `Deployment Parameter(optional) --> ${envName} :`
     );
     steps = { ...steps,...steps1 };
@@ -537,11 +558,11 @@ export let samValidate=async function(){
       throw new Error("SAM Template error \n")
     }
   } catch (error) {
-    throw new Error("Not a SAM file  or "+error.message)
+    throw new Error("Not a SAM file or "+error.message)
   }
 
 }
 export let makeid =async function () {
-  const crypto = require('crypto');
+  
   return (crypto.randomBytes(1).toString("base64url").replace(/\d/g, 'd')).toLowerCase();
 }

package-lock.json

@@ -0,0 +1,25 @@
+name: Publish Package to NPM 
+on:
+  release:
+    types: [created]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      # Setup .npmrc file to publish to npm
+
+      - name:  Setup Node.js environment
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Build
+        run: npm run build
+
+      - name: Publish
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}