Merge pull request #148 from microsoft/vishwac/multi-utterance-feature

luis:convert - add support for multiple definitions for the same utterance

Author: munozemilio

packages/luis/parser/lufile/parseFileContents.js

@@ -364,7 +364,8 @@ const parseAndHandleIntent = function (parsedContent, luResource) {
                         });
 
                         // add utterance
-                        let utteranceObject = new helperClass.uttereances(utterance, intentName, []);
+                        let utteranceExists = parsedContent.LUISJsonStructure.utterances.find(item => item.text == utterance && item.intent == intentName);
+                        let utteranceObject = utteranceExists || new helperClass.uttereances(utterance, intentName, []);
                         entitiesFound.forEach(item => {
                             if (item.startPos > item.endPos) {
                                 let errorMsg = `No labelled value found for entity: "${item.entity}" in utterance: "${utteranceAndEntities.context.getText()}"`;
@@ -382,7 +383,7 @@ const parseAndHandleIntent = function (parsedContent, luResource) {
                             }
                             utteranceObject.entities.push(utteranceEntity)
                         });
-                        parsedContent.LUISJsonStructure.utterances.push(utteranceObject);
+                        if (utteranceExists === undefined) parsedContent.LUISJsonStructure.utterances.push(utteranceObject);
                     }
 
                 } else {
@@ -391,8 +392,10 @@ const parseAndHandleIntent = function (parsedContent, luResource) {
                         let patternObject = new helperClass.pattern(utterance, intentName);
                         parsedContent.LUISJsonStructure.patterns.push(patternObject);
                     } else {
-                        let utteranceObject = new helperClass.uttereances(utterance, intentName, []);
-                        parsedContent.LUISJsonStructure.utterances.push(utteranceObject);    
+                        if(parsedContent.LUISJsonStructure.utterances.find(item => item.text == utterance && item.intent == intentName) === undefined) {
+                            let utteranceObject = new helperClass.uttereances(utterance, intentName, []);
+                            parsedContent.LUISJsonStructure.utterances.push(utteranceObject);    
+                        }
                     }
                 }
             }

packages/luis/test/parser/lufile/parseFileContents.parseFile.test.js

@@ -980,7 +980,24 @@ describe('parseFile correctly parses utterances', function () {
                                 assert.equal(res.LUISJsonStructure.patterns[0].pattern, '[[this]is] a new form (a | b)');
                                 done();
                         })
-                        .catch(err => done('Fail! Did not throw when expected'))
+                        .catch(err => done('Fail!'))
+        });
+
+        it ('Multiple utterance sections with individual label definitions are handled correctly', function(done) {
+                let testLU = `# test
+                - one {protein = cheese} sandwich
+                    - one cheese sandwich
+                - tomato orange 
+                - one cheese {foodType = sandwich}
+                `;
+
+                parseFile.parseFile(testLU)
+                        .then(res => {
+                                assert.equal(res.LUISJsonStructure.utterances.length, 2);
+                                assert.equal(res.LUISJsonStructure.utterances[0].entities.length, 2);
+                                done();
+                        })
+                        .catch(err => done('Fail!'))
         })
 
         it ('patterns are handled correctly', function(done){