optimize error msg text when error comes from imported files (#659)

* export lu content id when throw errors in luMerge.js

* optimize

Author: feich-ms

packages/lu/src/parser/lu/luMerger.js

@@ -517,6 +517,7 @@ const parseLuFile = async function(luOb, log, luis_culture) {
     try {
         parsedContent = await parseFileContents.parseFile(luOb.content, log, luis_culture);
     } catch (err) {
+        err.source = luOb.id;
         throw(err);
     }
     if (!parsedContent) {

packages/lu/src/parser/lubuild/builder.ts

@@ -47,7 +47,11 @@ export class Builder {
         result = await LuisBuilderVerbose.build(luFiles, true, culture)
         fileContent = result.parseToLuContent()
       } catch (err) {
-        err.text = `Invalid LU file ${file}: ${err.text}`
+        if (err.source) {
+          err.text = `Invalid LU file ${err.source}: ${err.text}`
+        } else {
+          err.text = `Invalid LU file ${file}: ${err.text}`
+        }
         throw(new exception(retCode.errorCode.INVALID_INPUT_FILE, err.text))
       }
 

packages/luis/test/commands/luis/build.test.ts

@@ -56,9 +56,10 @@ describe('luis:build cli parameters test', () => {
   test
     .stdout()
     .stderr()
-    .command(['luis:build', '--authoringKey', uuidv1(), '--in', `${path.join(__dirname, './../../fixtures/testcases/bad3.lu')}`, '--botName', 'Contoso'])
+    .command(['luis:build', '--authoringKey', uuidv1(), '--in', `${path.join(__dirname, './../../fixtures/testcases/invalid_import_file.lu')}`, '--botName', 'Contoso'])
     .it('displays an error if error occurs in parsing lu content', ctx => {
       expect(ctx.stderr).to.contain('Invalid LU file')
+      expect(ctx.stderr).to.contain('bad3.lu')
       expect(ctx.stderr).to.contain('[ERROR] line 4:0 - line 4:16: Invalid intent body line, did you miss \'-\' at line begin')
     })
 })

packages/luis/test/fixtures/testcases/invalid_import_file.lu

@@ -0,0 +1,5 @@
+# greeting
+- hi
+- hello
+
+[import lu file with error](bad3.lu)