Handle error if invalid json, print in std if no --in (#278)

Author: axelsrz

packages/lu/package.json

@@ -67,7 +67,8 @@
   },
   "nyc": {
     "exclude": [
-      "**/lufile/generated/**"
+      "**/lufile/generated/**",
+      "test/**"
     ]
   }
 }

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

@@ -58,10 +58,10 @@ export default class LuisGenerateCs extends Command {
     this.reorderEntities(app, 'patternAnyEntities')
     this.reorderEntities(app, 'composites')
 
-    const outputPath = file.validatePath(flags.out, flags.className + '.cs', flags.force)
+    const outputPath = flags.out ? file.validatePath(flags.out, flags.className + '.cs', flags.force) : flags.out
 
     this.log(
-      `Generating file at ${outputPath || ''} that contains class ${space}.${flags.className}.`
+      `Generating file at ${outputPath || 'stdout'} that contains class ${space}.${flags.className}.`
     )
 
     await LuisToCsConverter.writeFromLuisJson(app, flags.className, space, outputPath)

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

@@ -51,10 +51,10 @@ export default class LuisGenerateTs extends Command {
     this.reorderEntities(app, 'patternAnyEntities')
     this.reorderEntities(app, 'composites')
 
-    const outputPath = file.validatePath(flags.out, kebabCase(flags.className) + '.ts', flags.force)
+    const outputPath = flags.out ? file.validatePath(flags.out, kebabCase(flags.className) + '.ts', flags.force) : flags.out
 
     this.log(
-      `Generating file at ${outputPath || ''} that contains class ${flags.className}.`
+      `Generating file at ${outputPath || 'stdout'} that contains class ${flags.className}.`
     )
 
     await LuisToTsConverter.writeFromLuisJson(app, flags.className, outputPath)

packages/lu/src/parser/luisfile/parseMultiPlatform.js

@@ -1,3 +1,5 @@
+const {CLIError} = require('@microsoft/bf-cli-command')
+
 module.exports = {
     Composite: class {
         constructor() {
@@ -38,6 +40,7 @@ module.exports = {
         }
     },
     fromLuisApp: function(luisApp) {
+        try {
         const classData = new this.MultiPlatformLuis();
         classData.intents = this.processIntents(luisApp.intents);
         classData.simpleEntities = this.extractEntities(luisApp.entities);
@@ -47,6 +50,9 @@ module.exports = {
         classData.patternEntities = this.extractEntities(luisApp.patternAnyEntities);
         classData.composites = this.extractComposites(luisApp.composites);
         return classData;
+        } catch (err) {
+            throw new CLIError("Invalid LUIS JSON file content.")
+        }
     },
     normalizeName: function(name) {
         return name.replace(/\./g, '_').replace(/ /g, '_');

packages/lu/test/commands/luis/generate/cs.test.ts

@@ -95,4 +95,25 @@ describe('luis:generate:cs', () => {
     .it('Generates prebuilt entities correctly', async () => {
       await compareSourceFiles('../../../fixtures/generate/PrebuiltEntities.cs', '../../../fixtures/generate/results/PrebuiltEntities.cs')
     })
+
+  test
+    .stderr()
+    .command(['luis:generate:cs',
+      '--in',
+      `${path.join(__dirname, '../../../fixtures/generate/invalid.json')}`,
+      '--out',
+      `${path.join(__dirname, '../../../fixtures/generate/results/invalid.cs')}`])
+    .it('Throws expected error if invalid JSON', async ctx => {
+      expect(ctx.stderr).to.include('Invalid LUIS JSON file content.')
+    })
+
+  test
+    .stdout()
+    .command(['luis:generate:cs',
+      '--in',
+      `${path.join(__dirname, '../../../fixtures/generate/Intents.json')}`])
+    .it('Prints to console if no --out', async ctx => {
+      expect(ctx.stdout).to.include('Generating file at stdout')
+      expect(ctx.stdout).to.include('// <auto-generated>')
+    })
 })

packages/lu/test/commands/luis/generate/ts.test.ts

@@ -19,7 +19,6 @@ describe('luis:generate:ts', () => {
     await fs.emptyDir(path.join(__dirname, '../../../fixtures/generate/results'))
   })
 
-
   test
     .stdout()
     .command(['luis:generate:ts',
@@ -97,4 +96,25 @@ describe('luis:generate:ts', () => {
       await compareSourceFiles('../../../fixtures/generate/prebuilt-entities.ts', '../../../fixtures/generate/results/prebuilt-entities.ts')
     })
 
+  test
+    .stderr()
+    .command(['luis:generate:ts',
+      '--in',
+      `${path.join(__dirname, '../../../fixtures/generate/invalid.json')}`,
+      '--out',
+      `${path.join(__dirname, '../../../fixtures/generate/results/invalid.ts')}`])
+    .it('Throws expected error if invalid JSON', async ctx => {
+      expect(ctx.stderr).to.include('Invalid LUIS JSON file content.')
+    })
+
+  test
+    .stdout()
+    .command(['luis:generate:ts',
+      '--in',
+      `${path.join(__dirname, '../../../fixtures/generate/Intents.json')}`])
+    .it('Prints to console if no --out', async ctx => {
+      expect(ctx.stdout).to.include('Generating file at stdout')
+      expect(ctx.stdout).to.include('* <auto-generated>')
+    })
+
 })

packages/lu/test/fixtures/generate/invalid.json

@@ -0,0 +1,3 @@
+{
+    "name": "invalid"
+}