fix import bug (#1124)

Author: feich-ms

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

@@ -392,6 +392,8 @@ const buildLuJsonObject = async function(luObjArray, log, luis_culture, luSearch
             continue
         }
 
+        // Set includeInCollate in addtionalFilesToParse to be false if current parsedContent's includeInCollate is false
+        parsedContent.additionalFilesToParse.forEach(addtionFileToParse => addtionFileToParse.includeInCollate = luOb.includeInCollate ? addtionFileToParse.includeInCollate : luOb.includeInCollate)
         let foundLuFiles = await luSearchFn(luOb.id, parsedContent.additionalFilesToParse)    
         for( let i = 0; i < foundLuFiles.length; i++){ 
             if (parsedFiles.includes(foundLuFiles[i].id)) {

packages/lu/test/fixtures/testcases/common.en-us.lu

@@ -0,0 +1,3 @@
+# greeting
+- hi
+- hello

packages/lu/test/fixtures/testcases/root.en-us.lu

@@ -0,0 +1,5 @@
+[common](./common.en-us.lu)
+
+# MyIntent
+- test 1
+- test 2

packages/lu/test/parser/luis/luisBuilder.test.js

@@ -96,4 +96,18 @@ assert.isTrue(luisObject.validate())
         assert.equal(luisObject.settings[1].name, 'UseAllTrainingData');
         assert.equal(luisObject.settings[1].value, true);
     });
+
+    it('Intent import can work correctly when imported lu files also have further imports', async () => {
+        let luFile = `
+        # Test
+        - [MyIntent](./test/fixtures/testcases/root.en-us.lu#MyIntent)`;
+
+        const luisObject = await LUISBuilder.fromLUAsync(luFile)
+
+        assert.equal(luisObject.intents.length, 1);
+        assert.equal(luisObject.intents[0].name, 'Test');
+        assert.equal(luisObject.utterances.length, 2);
+        assert.equal(luisObject.utterances[0].text, 'test 1');
+        assert.equal(luisObject.utterances[1].text, 'test 2');
+    });
 });