Merge branch 'master' into vishwac/multi-utterance-feature

Author: munozemilio

packages/luis/parser/lufile/parseFileContents.js

@@ -421,7 +421,7 @@ const parseAndHandleEntity = function (parsedContent, luResource, log, locale) {
             let parsedRoleAndType = helpers.getRolesAndType(entityType);
             let entityRoles = parsedRoleAndType.roles;
             entityType = parsedRoleAndType.entityType;
-            let pEntityName = (entityName === 'PREBUILT') ? entityType : entityName;
+            let pEntityName = (entityName.toLowerCase() === 'prebuilt') ? entityType : entityName;
             // see if we already have this as Pattern.Any entity
             // see if we already have this in patternAny entity collection; if so, remove it but remember the roles (if any)
             for (let i in parsedContent.LUISJsonStructure.patternAnyEntities) {

packages/luis/parser/qnafile/parseQnAFile.js

@@ -1,4 +1,4 @@
-const exception = ('./../lufile/classes/exception')
+const exception = require('./../lufile/classes/exception')
 const retCode = require('./../lufile/enums/CLI-errors')
 
 module.exports = {

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

@@ -999,4 +999,38 @@ describe('parseFile correctly parses utterances', function () {
                         })
                         .catch(err => done('Fail!'))
         })
+
+        it ('patterns are handled correctly', function(done){
+                let testLU = `# intent1
+                - this is a {number}
+                
+                $ prebuilt : number`;
+
+                parseFile.parseFile(testLU)
+                        .then(res => {
+                                assert.equal(res.LUISJsonStructure.patternAnyEntities.length, 0);
+                                assert.equal(res.LUISJsonStructure.prebuiltEntities.length, 1);
+                                done();
+                        })
+                        .catch(err => done('Fail!'))
+        })
+
+        it ('patterns are handled correctly (with roles)', function(done){
+                let testLU = `# intent1
+                - this is a {number:one}
+                
+                $ prebuilt : number`;
+
+                parseFile.parseFile(testLU)
+                        .then(res => {
+                                assert.equal(res.LUISJsonStructure.patternAnyEntities.length, 0);
+                                assert.equal(res.LUISJsonStructure.prebuiltEntities.length, 1);
+                                assert.equal(res.LUISJsonStructure.prebuiltEntities[0].roles.length, 1);
+                                done();
+                        })
+                        .catch(err => done('Fail!'))
+
+        })
+
+
 })