Merge branch 'master' of https://github.com/microsoft/botframework-cli into vishwac/newEntityAndFeatures

Author: Vishwac Sena Kannan

packages/luis/src/commands/luis/generate/cs.ts

@@ -1,4 +1,4 @@
-import {Command, flags} from '@microsoft/bf-cli-command'
+import {CLIError, Command, flags} from '@microsoft/bf-cli-command'
 import {camelCase, upperFirst} from 'lodash'
 import * as path from 'path'
 
@@ -14,6 +14,7 @@ export default class LuisGenerateCs extends Command {
     in: flags.string({description: 'Source .lu file(s) or LUIS application JSON model'}),
     out: flags.string({description: 'Output file or folder name. If not specified stdout will be used as output', default: ''}),
     className: flags.string({description: 'Name of the class'}),
+    force: flags.boolean({description: 'If --in flag provided with the path to an existing file, overwrites it', default: false}),
   }
 
   reorderEntities(app: any, name: string): void {
@@ -28,7 +29,12 @@ export default class LuisGenerateCs extends Command {
     let stdInput = await this.readStdin()
 
     const pathPrefix = path.isAbsolute(flags.in) ? '' : process.cwd()
-    const app = stdInput ? JSON.parse(stdInput as string) : await fs.readJSON(path.join(pathPrefix, flags.in))
+    let app: any
+    try {
+      app = stdInput ? JSON.parse(stdInput as string) : await fs.readJSON(path.join(pathPrefix, flags.in))
+    } catch (err) {
+      throw new CLIError(err)
+    }
 
     flags.className = flags.className || app.name
     flags.className = upperFirst(camelCase(flags.className))
@@ -46,7 +52,7 @@ export default class LuisGenerateCs extends Command {
     this.reorderEntities(app, 'patternAnyEntities')
     this.reorderEntities(app, 'composites')
 
-    const outputPath = Utils.validatePath(flags.out, process.cwd(), flags.className + '.cs')
+    const outputPath = Utils.validatePath(flags.out, process.cwd(), flags.className + '.cs', flags.force)
 
     this.log(
       `Generating file at ${outputPath || ''} that contains class ${space}.${flags.className}.`

packages/luis/src/commands/luis/generate/ts.ts

@@ -1,4 +1,4 @@
-import {Command, flags} from '@microsoft/bf-cli-command'
+import {CLIError, Command, flags} from '@microsoft/bf-cli-command'
 import {camelCase, kebabCase, upperFirst} from 'lodash'
 import * as path from 'path'
 
@@ -14,6 +14,7 @@ export default class LuisGenerateTs extends Command {
     in: flags.string({description: 'Source .lu file(s) or LUIS application JSON model'}),
     out: flags.string({description: 'Output file or folder name. If not specified stdout will be used as output', default: ''}),
     className: flags.string({description: 'Name of the class'}),
+    force: flags.boolean({description: 'If --in flag provided with the path to an existing file, overwrites it', default: false}),
   }
 
   reorderEntities(app: any, name: string): void {
@@ -27,7 +28,12 @@ export default class LuisGenerateTs extends Command {
     let stdInput = await this.readStdin()
 
     const pathPrefix = path.isAbsolute(flags.in) ? '' : process.cwd()
-    const app = stdInput ? JSON.parse(stdInput as string) : await fs.readJSON(path.join(pathPrefix, flags.in))
+    let app: any
+    try {
+      app = stdInput ? JSON.parse(stdInput as string) : await fs.readJSON(path.join(pathPrefix, flags.in))
+    } catch (err) {
+      throw new CLIError(err)
+    }
 
     flags.className = flags.className || app.name
     flags.className = upperFirst(camelCase(flags.className))
@@ -39,7 +45,7 @@ export default class LuisGenerateTs extends Command {
     this.reorderEntities(app, 'patternAnyEntities')
     this.reorderEntities(app, 'composites')
 
-    const outputPath = Utils.validatePath(flags.out, process.cwd(), kebabCase(flags.className) + '.ts')
+    const outputPath = Utils.validatePath(flags.out, process.cwd(), kebabCase(flags.className) + '.ts', flags.force)
 
     this.log(
       `Generating file at ${outputPath || ''} that contains class ${flags.className}.`

packages/luis/src/utils.ts

@@ -3,7 +3,7 @@ import {existsSync} from 'fs'
 import {basename, dirname, extname, isAbsolute, join} from 'path'
 
 export namespace Utils {
-  export function validatePath(outputPath: string, workingDirectory: string, defaultFileName: string): string {
+  export function validatePath(outputPath: string, workingDirectory: string, defaultFileName: string, forceWrite = false): string {
     let completePath = isAbsolute(outputPath) ? outputPath : join(workingDirectory, outputPath)
     const containingDir = dirname(completePath)
 
@@ -15,13 +15,13 @@ export namespace Utils {
 
     // If the last element in the path is a file
     if (baseElement.includes('.')) {
-      return pathAlreadyExist ? enumerateFileName(completePath) : completePath
+      return pathAlreadyExist && !forceWrite ? enumerateFileName(completePath) : completePath
     }
 
     // If the last element in the path is a folder
     if (!pathAlreadyExist) throw new CLIError(`Target directory path doesn't exist: ${completePath}`)
     completePath = join(completePath, defaultFileName)
-    return existsSync(completePath) ? enumerateFileName(completePath) : completePath
+    return existsSync(completePath) && !forceWrite ? enumerateFileName(completePath) : completePath
   }
 
   function enumerateFileName(filePath: string): string {