Update default lgOutFolder value and add --force to bf luis:generate command (#3373)

Author: David Favretto

tools/botskills/src/botskills-connect.ts

@@ -139,7 +139,7 @@ luisFolder = args.luisFolder ? sanitizePath(args.luisFolder) : join(outFolder, '
 dispatchFolder = args.dispatchFolder ? sanitizePath(args.dispatchFolder) : join(outFolder, 'Deployment', 'Resources', 'Dispatch');
 
 // lgOutFolder validation
-lgOutFolder = args.lgOutFolder ? sanitizePath(args.lgOutFolder) : join(outFolder, (args.ts ? join('src', 'Services') : 'Services'));
+lgOutFolder = args.lgOutFolder ? sanitizePath(args.lgOutFolder) : join(outFolder, (args.ts ? join('src', 'Services', 'DispatchLuis.ts') : join('Services', 'DispatchLuis.cs')));
 
 // Initialize an instance of IConnectConfiguration to send the needed arguments to the connectSkill function
 const configuration: IConnectConfiguration = {

tools/botskills/src/botskills-disconnect.ts

@@ -111,7 +111,7 @@ dispatchFolder = args.dispatchFolder ?
 
 // lgOutFolder validation
 lgOutFolder = args.lgOutFolder ?
-    sanitizePath(args.lgOutFolder) : join(outFolder, (args.ts ? join('src', 'Services') : 'Services'));
+    sanitizePath(args.lgOutFolder) : join(outFolder, (args.ts ? join('src', 'Services', 'DispatchLuis.ts') : join('Services', 'DispatchLuis.cs')));
 
 // End of arguments validation
 // Initialize an instance of IDisconnectConfiguration to send the needed arguments to the disconnectSkill function

tools/botskills/src/botskills-refresh.ts

@@ -76,7 +76,7 @@ cognitiveModelsFile = args.cognitiveModelsFile || join(outFolder, (args.ts ? joi
 dispatchFolder = args.dispatchFolder ? sanitizePath(args.dispatchFolder) : join(outFolder, 'Deployment', 'Resources', 'Dispatch');
 
 // lgOutFolder validation
-lgOutFolder = args.lgOutFolder ? sanitizePath(args.lgOutFolder) : join(outFolder, (args.ts ? join('src', 'Services') : 'Services'));
+lgOutFolder = args.lgOutFolder ? sanitizePath(args.lgOutFolder) : join(outFolder, (args.ts ? join('src', 'Services', 'DispatchLuis.ts') : join('Services', 'DispatchLuis.cs')));
 
 // End of arguments validation
 

tools/botskills/src/botskills-update.ts

@@ -139,7 +139,7 @@ luisFolder = args.luisFolder ? sanitizePath(args.luisFolder) : join(outFolder, '
 dispatchFolder = args.dispatchFolder ? sanitizePath(args.dispatchFolder) : join(outFolder, 'Deployment', 'Resources', 'Dispatch');
 
 // lgOutFolder validation
-lgOutFolder = args.lgOutFolder ? sanitizePath(args.lgOutFolder) : join(outFolder, (args.ts ? join('src', 'Services') : 'Services'));
+lgOutFolder = args.lgOutFolder ? sanitizePath(args.lgOutFolder) : join(outFolder, (args.ts ? join('src', 'Services', 'DispatchLuis.ts') : join('Services', 'DispatchLuis.cs')));
 
 // End of arguments validation
 

tools/botskills/src/functionality/refreshSkill.ts

@@ -70,6 +70,9 @@ export class RefreshSkill {
                 const argumentValue: string = executionModelByCulture.get(argument) as string;
                 luisGenerateCommand.push(...[argument, argumentValue]);
             });
+
+            // Force the bf luis:generate to overwrite the output file if it already exists
+            luisGenerateCommand.push('--force');
             await this.runCommand(luisGenerateCommand, `Executing luisgen for the ${ dispatchName } file`);
         } catch (err) {
             throw new Error(`There was an error in the bf luis:generate:${ this.configuration.lgLanguage } command:\nCommand: ${ luisGenerateCommand.join(' ') }\n${ err }`);

tools/botskills/test/refresh.test.js

@@ -144,7 +144,7 @@ Error: Mocked function throws an Error`);
 
             strictEqual(errorList[errorList.length - 1], `There was an error while refreshing any Skill from the Assistant:
 Error: There was an error in the bf luis:generate:${configuration.lgLanguage} command:
-Command: bf luis:generate:${configuration.lgLanguage} --in "${configuration.dispatchFolder}\\en-us\\filleden-usDispatch.json" --out "${configuration.lgOutFolder}"
+Command: bf luis:generate:${configuration.lgLanguage} --in "${configuration.dispatchFolder}\\en-us\\filleden-usDispatch.json" --out "${configuration.lgOutFolder}" --force
 Error: Mocked function throws an Error`);
         });
     });