Fix: added types

Author: DheerajGBhatt

bin/index.ts

@@ -19,7 +19,12 @@ import {
 } from "../src/rover.types"
 import * as child from "child_process"
 const exec = child.execSync
-
+const test = {
+  app_name: "dgbcom",
+  language: "node",
+  file_name: "dgbcom/template.yaml\n",
+  components: ["S3 Lambda", "CRUD API", "S3 Bucket", "Lambda", "DynamoDB"],
+}
 import { version } from "../package.json"
 
 async function run(argv: Array<string>) {
@@ -43,7 +48,8 @@ async function run(argv: Array<string>) {
 
             const template: IroverInput = await createModules(
               app_name,
-              language
+              language,
+              ""
             )
             await rover_generateSAM.generateSAM(
               <IroverInput>{ template }["template"]
@@ -82,17 +88,15 @@ async function run(argv: Array<string>) {
                 const componentChoice = cliConfig.customizable.components
                 const components = await util.multichoice(
                   "components",
-                  componentChoice
+                  componentChoice,
+                  ""
                 )
                 const path = CompStacks["compStacks"][selectedchoice[0]]
                 nestedComponents[selectedchoice[0]] = {
                   ...components,
                   path: path,
                 }
-                console.log(
-                  "nestedComponents",
-                  JSON.stringify(nestedComponents)
-                )
+
                 template = {
                   ...app_name,
                   language,
@@ -102,8 +106,9 @@ async function run(argv: Array<string>) {
                 }
               } else {
                 const choice = cliConfig.customizable.components
+                choiceLength = 0
                 const Compnents = <Array<string>>(
-                  await util.multichoice("components", choice)
+                  await util.multichoice("components", choice, "")
                 )
                 template = { ...app_name, language }
                 if (customStacks !== null)
@@ -117,27 +122,75 @@ async function run(argv: Array<string>) {
               moreStack = await util.moreStack(
                 "Do you want to add one more components to modules ?"
               )
-
+              console.log(moreStack)
               i = i + 1
-            } while (moreStack !== "No" || choiceLength === 0)
+            } while (moreStack !== "No" && choiceLength === 0)
+            console.log(JSON.stringify(template))
             await rover_addComponent.addComponents(
               <IroveraddComponentInput>template
             )
           } else if (editedSam === "add modules to existing SAM") {
             const res = await roverADD()
+            let template: IroveraddModule = <IroveraddModule>{}
             const app_name = res["appname"]
             const language = res["language"]
             const file_name = res["filename"]
-            const addToExisting = await util.inputString(
+            const addToExisting = await util.multichoice(
               "addToExisting",
-              "",
-              false,
-              "Add to Existing Module: "
-            )
-            console.log(addToExisting)
-            const template = <IroveraddModule>(
-              await createModules(app_name, language)
+              ["Yes", "No"],
+              "Do you want to Add a module to existing Module :"
             )
+            if (addToExisting.addToExisting[0] == "Yes") {
+              const CompStacks = await rover_helpers.checkNested(file_name)
+              const choice = Object.keys(CompStacks["compStacks"])
+              let choiceLength = 0
+              let i = 0
+              do {
+                const nested = CompStacks["checkNested"]
+                choiceLength = choice.length
+                if (nested) {
+                  const chooseStack = await util.inputType(
+                    "Select the stack to which you want to add the module ",
+                    choice
+                  )
+                  const selectedchoice = choice.filter((ele) =>
+                    Object.values(chooseStack).includes(ele)
+                  )
+                  const samResources = rover_helpers.listSAMResources(
+                    file_name,
+                    selectedchoice[0]
+                  )
+                  template = <IroveraddModule>(
+                    await createModules(app_name, language, "")
+                  )
+                  Object.keys(template.stackDetails).forEach((ele) => {
+                    template.stackDetails[ele].stackName = selectedchoice[0]
+                  })
+                } else {
+                  const choice = cliConfig.customizable.components
+                  const Compnents = <Array<string>>(
+                    await util.multichoice("components", choice, "")
+                  )
+                  template = { ...app_name, language }
+                  if (customStacks !== null)
+                    template = {
+                      ...template,
+                      file_name,
+                      ...Compnents,
+                    }
+                }
+
+                moreStack = await util.moreStack(
+                  "Do you want to add one more modules ?"
+                )
+
+                i = i + 1
+              } while (moreStack !== "No" || choiceLength === 0)
+            } else {
+              template = <IroveraddModule>(
+                await createModules(app_name, language, "")
+              )
+            }
             template["file_name"] = file_name
             await rover_addModules.addModules(<IroveraddModule>template)
           }

package.json

@@ -34,7 +34,7 @@
     "start": "tsc   bin/init.ts && tsc  bin/index.ts && npm install -g . ",
     "build": "tsc && npm run format:write && npm run lint:fix",
     "watch": "tsc --watch",
-    "localtest": "npm install /Users/dheerajbhatt/proj/rover-engine && npm run build && npm install /Users/dheerajbhatt/proj/rover-cli -g  ",
+    "localtest": "npm install rover-engine && npm run build && npm install rover-cli -g  ",
     "prepack": "npm run clean && npm run build ",
     "format:check": "prettier --check .",
     "format:write": "prettier --write .",

src/helper.ts

@@ -57,13 +57,14 @@ async function CustomObject(i: number) {
     false,
     `Stack ${i} Name: `
   )
-  const CustomStacks = await util.multichoice("app_type", choice)
+  const CustomStacks = await util.multichoice("app_type", choice, "")
   customStacks[customstack_name[`customStackName${i}`]] = CustomStacks.app_type
   return customStacks
 }
 export async function createModules(
   app_name: Record<string, string>,
-  language: string
+  language: string,
+  stackName: string
 ) {
   const stack_names: Record<string, string> = {}
   let customStacks: Record<string, Array<string>> = {}
@@ -77,7 +78,7 @@ export async function createModules(
   do {
     const AppType: string = <string>await util.appType("Module Type :")
     if (AppType !== "CustomizableModule") {
-      stackname[`stackName${i}`] = `${AppType}  ${rover_helpers.makeid(5)}`
+      stackname[`stackName${i}`] = `${AppType}${rover_helpers.makeid(5)}`
       const stack_name = stackname
       const stackName: string = stack_name[`stackName${i}`]
       if (AppType === "CRUDModule") {
@@ -101,21 +102,21 @@ export async function createModules(
       stackDetails[element] = <IstackDetailsObject>{}
       stackDetails[element]["type"] = stack_names[element]
       stackDetails[element]["params"] = StackParams[element]
-      stackDetails[element]["componentlist"] = []
+      stackDetails[element]["componentList"] = []
     })
   }
   if (customStacks !== null) {
     Object.keys(customStacks).forEach((element) => {
       stackDetails[element] = <IstackDetailsObject>{}
       stackDetails[element]["type"] = "Custom"
       stackDetails[element]["params"] = {}
-      stackDetails[element]["componentlist"] = customStacks[element]
+      stackDetails[element]["componentList"] = customStacks[element]
     })
   }
   const template: IroverInput = {
     app_name: app_name["app_name"],
     language,
-    stack_details: stackDetails,
+    stackDetails: stackDetails,
   }
   return template
 }

src/rover.types.ts

@@ -8,18 +8,19 @@ interface curdObject {
 export interface IstackDetailsObject {
   type: string
   params: curdObject | object
-  componentlist: Array<string>
+  componentList: Array<string>
+  stackName: string
 }
 export interface IstackDetails {
   [key: string]: IstackDetailsObject
 }
 export interface IroverInput {
   app_name: string
   language: string
-  stack_details: IstackDetails
+  stackDetails: IstackDetails
 }
 
-export interface IroverAppData extends Omit<IroverInput, "stack_details"> {
+export interface IroverAppData extends Omit<IroverInput, "stackDetails"> {
   dependency: string
   extension: string
   StackType: Array<string>
@@ -34,13 +35,13 @@ export interface IroverConfigTagArrayValue {
   Value: string
 }
 export interface IroveraddComponentInputNestedType
-  extends Omit<IroverInput, "stack_details"> {
+  extends Omit<IroverInput, "stackDetails"> {
   nested: boolean
   file_name: string
   nestedComponents: nestedComponentsObject
 }
 export interface IroveraddComponentInputType
-  extends Omit<IroverInput, "stack_details"> {
+  extends Omit<IroverInput, "stackDetails"> {
   nested: boolean
   file_name: string
   components: Array<string>

src/util.ts

@@ -14,11 +14,18 @@ const stringpattern = new RegExp(/^[A-Za-z]+$/g)
 
 export const multichoice = async function (
   name: string,
-  choice: Array<string>
+  choice: Array<string>,
+  message: string
 ) {
-  const messages = `Please select your  ${name
-    .charAt(0)
-    .toUpperCase()} ${name.slice(1)}  :`
+  let messages = ""
+  if (message == "") {
+    messages = `Please select your  ${name
+      .charAt(0)
+      .toUpperCase()} ${name.slice(1)}  :`
+  } else {
+    messages = message
+  }
+
   const r = await inquirer.prompt([
     {
       type: "checkbox",
@@ -225,8 +232,9 @@ export const samBuild = async function (lang: string) {
 
       const stepsChoice = choices.dev
       let step = await multichoice(
-        `steps required for ${envName}  environment `,
-        stepsChoice
+        `steps required for ${envName} environment `,
+        stepsChoice,
+        ""
       )
       const steps1: Record<string, Array<string>> = {}
       step = Object.keys(step).map((ele) => {
@@ -278,7 +286,8 @@ export const samBuild = async function (lang: string) {
     const deployment_choice = choices.deployment
     const deploymentEvent = await multichoice(
       `deploymentevents`,
-      deployment_choice
+      deployment_choice,
+      ""
     )
     const framework = { framework: "sam" }
     let result: IroverDeploymentObject = <IroverDeploymentObject>{}
@@ -354,7 +363,8 @@ export const params = async function (module: string) {
         } else if (modulesParams[i].value === "multichoice") {
           const r = await multichoice(
             modulesParams[i].key,
-            <Array<string>>choice.methods
+            <Array<string>>choice.methods,
+            ""
           )
           res = { ...res, ...r }
         } else {