Finalizing

Vishwac Sena Kannan · Vishwac Sena Kannan · commit 760713e3a520 · 2019-10-10T20:05:41.000-07:00
diff --git a/packages/luis/src/parser/converters/luistoluconverter.js b/packages/luis/src/parser/converters/luistoluconverter.js
@@ -103,7 +103,7 @@ module.exports = {
                         }
                         fileContent += NEWLINE + NEWLINE;
                     }
-                    fileContent += `@ simple ${entity.name}`;
+                    fileContent += `@ ml ${entity.name}`;
                     fileContent += addRolesAndFeatures(entity);
                     fileContent += NEWLINE + NEWLINE;
                 } else {
@@ -187,6 +187,10 @@ module.exports = {
         return fileContent;
     }
 }
+/**
+ * Helper function to handle nDepth entity definition
+ * @param {Object} entity 
+ */
 const handleNDepthEntity = function(entity) {
     let fileContent = '';
     const BASE_TAB_STOP = 1;
@@ -196,6 +200,12 @@ const handleNDepthEntity = function(entity) {
     fileContent += addNDepthChildDefinitions(entity.children, BASE_TAB_STOP, fileContent) + NEWLINE + NEWLINE
     return fileContent;
 }
+/**
+ * Recursive helper function to add child definitions. 
+ * @param {Object[]} childCollection 
+ * @param {number} tabStop 
+ * @param {string} fileContent 
+ */
 const addNDepthChildDefinitions = function(childCollection, tabStop, fileContent) {
     let myFileContent = '';
     (childCollection || []).forEach(child => {
@@ -206,7 +216,7 @@ const addNDepthChildDefinitions = function(childCollection, tabStop, fileContent
         } else if (child.children && child.children.length !== 0){
             myFileContent += EntityTypeEnum.ML;
         } else {
-            myFileContent += EntityTypeEnum.SIMPLE;
+            myFileContent += EntityTypeEnum.ML;
         }
         myFileContent += ` ${child.name}`;
         myFileContent += addRolesAndFeatures(child);
diff --git a/packages/luis/src/parser/lufile/parseFileContents.js b/packages/luis/src/parser/lufile/parseFileContents.js
@@ -977,7 +977,7 @@ const handleNDepthEntity = function(parsedContent, entityName, entityRoles, enti
         let entityIsUnique = verifyUniqueEntityName(parsedContent, childEntityName, childEntityType, line, true);
         
         // Get current tab level
-        let tabLevel = Math.ceil(groupsFound.groups.leadingSpaces ? groupsFound.groups.leadingSpaces.length / SPACEASTABS : undefined) || (groupsFound.groups.leadingTabs ? groupsFound.groups.leadingTabs.length : undefined);
+        let tabLevel = Math.ceil(groupsFound.groups.leadingSpaces !== undefined ? groupsFound.groups.leadingSpaces.length / SPACEASTABS : 0) || (groupsFound.groups.leadingTabs !== undefined ? groupsFound.groups.leadingTabs.length : 0);
         if (defLine === line.start.line + 1) {
             // remember the tab level at the first line of child definition
             baseTabLevel = tabLevel;
@@ -986,6 +986,7 @@ const handleNDepthEntity = function(parsedContent, entityName, entityRoles, enti
         } 
         
         currentParentEntity = entityIdxByLevel.reverse().find(item => item.level == tabLevel - baseTabLevel);
+        entityIdxByLevel.reverse();
         if (!currentParentEntity) {
             let errorMsg = `[ERROR] line ${defLine}: Invalid definition found for child "${child.trim()}". Parent of each child entity must be of type "${EntityTypeEnum.ML}".`;
             throw (new exception(retCode.errorCode.INVALID_INPUT, errorMsg));
diff --git a/packages/luis/test/fixtures/verified/allGen.lu b/packages/luis/test/fixtures/verified/allGen.lu
@@ -53,7 +53,7 @@
 
 > # Entity definitions
 
-@ simple userName
+@ ml userName
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/fixtures/verified/luis_sorted.lu b/packages/luis/test/fixtures/verified/luis_sorted.lu
@@ -62,9 +62,9 @@
 
 > # Entity definitions
 
-@ simple customDevice
+@ ml customDevice
 
-@ simple userName
+@ ml userName
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/fixtures/verified/modelAsFeatureGen.lu b/packages/luis/test/fixtures/verified/modelAsFeatureGen.lu
@@ -21,7 +21,7 @@
 
 > # Entity definitions
 
-@ simple simple1 usesFeatures phraselist1,age
+@ ml simple1 usesFeatures phraselist1,age
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/fixtures/verified/modelAsFeatures.lu b/packages/luis/test/fixtures/verified/modelAsFeatures.lu
@@ -12,8 +12,8 @@
 @ intent test1 usesFeature test3
 @ intent test2 usesFeature simple1
 @ intent test3 usesFeature age
-@ simple simple1 usesFeature phraselist1
-@ simple1 usesFeature age
+@ ml simple1 usesFeature phraselist1
+@ ml usesFeature age
 
 @ list list1
 > pl as a feature to model
diff --git a/packages/luis/test/fixtures/verified/nDepthEntity.lu b/packages/luis/test/fixtures/verified/nDepthEntity.lu
@@ -14,10 +14,10 @@
 @ ml nDepth usesFeatures intent1,phraselist1
     - @ age nDepth_child1
     - @ ml nDepth_child2 usesFeatures intent1,phraselist1
-        - @ simple nDepth_child2.1
+        - @ ml nDepth_child2.1
 
 
-@ simple simple1
+@ ml simple1
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/fixtures/verified/nDepthEntityInUtterance.lu b/packages/luis/test/fixtures/verified/nDepthEntityInUtterance.lu
@@ -16,12 +16,12 @@
 @ ml nDepth
     - @ age nDepth_child1
     - @ ml nDepth_child2
-        - @ simple nDepth_child2.1
+        - @ ml nDepth_child2.1
 
 
-@ simple simple1
+@ ml simple1
 
-@ simple nDepth_child1
+@ ml nDepth_child1
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/fixtures/verified/newEntity1.lu b/packages/luis/test/fixtures/verified/newEntity1.lu
@@ -3,7 +3,7 @@
 
 > # Entity definitions
 
-@ simple s1 hasRoles sr1,sr2
+@ ml s1 hasRoles sr1,sr2
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/fixtures/verified/newEntity2.lu b/packages/luis/test/fixtures/verified/newEntity2.lu
@@ -3,7 +3,7 @@
 
 > # Entity definitions
 
-@ simple s1 hasRole sr1
+@ ml s1 hasRole sr1
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/fixtures/verified/plFeatures.lu b/packages/luis/test/fixtures/verified/plFeatures.lu
@@ -11,7 +11,7 @@
 
 > # Entity definitions
 
-@ simple simple1 usesFeature phraselist1
+@ ml simple1 usesFeature phraselist1
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/fixtures/verified/test269-d.lu b/packages/luis/test/fixtures/verified/test269-d.lu
@@ -10,9 +10,9 @@
 
 > # Entity definitions
 
-@ simple EntityOne
+@ ml EntityOne
 
-@ simple EntityTwo
+@ ml EntityTwo
 
 
 > # PREBUILT Entity definitions
diff --git a/packages/luis/test/parser/lufile/lutranslator.test.js b/packages/luis/test/parser/lufile/lutranslator.test.js
@@ -232,7 +232,7 @@ describe('With the parseAndTranslate method', function() {
             this.skip();
         }
         let luFile = `
-@ simple s1 sr1
+@ ml s1 sr1
 @ phraselist pl1 = 
     - cheese
     - tomato
@@ -247,7 +247,7 @@ describe('With the parseAndTranslate method', function() {
 `;
 
         let trRes = `
-@ simple s1 sr1
+@ ml s1 sr1
 @ phraselist pl1 =
         - fromage
         - tomate
diff --git a/packages/luis/test/parser/lufile/parseFileContents.@EntityDefinition.test.js b/packages/luis/test/parser/lufile/parseFileContents.@EntityDefinition.test.js
@@ -10,7 +10,7 @@ describe('V2 Entity definitions using @ notation', function () {
     describe('Simple entity definition', function(){
         it('Basic definition is handled correctly', function (done) {
             let luFile = `
-                @ simple fooBar
+                @ ml fooBar
             `;
             parseFile.parseFile(luFile)
                 .then(res => {
@@ -23,7 +23,7 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Basic definition (without space) is handled correctly', function (done) {
             let luFile = `
-                @simple fooBar
+                @ml fooBar
             `;
             parseFile.parseFile(luFile)
                 .then(res => {
@@ -36,8 +36,8 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Entity names can have spaces', function (done) {
             let luFile = `
-                @simple "foo bar"
-                @simple 'a b'
+                @ml "foo bar"
+                @ml 'a b'
             `;
             parseFile.parseFile(luFile)
                 .then(res => {
@@ -51,10 +51,10 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Entity with role definition', function(done){
             let luFile = `
-                @simple "foo bar" r1
-                @simple 'a b' r2, r3
-                @simple xyz hasRole r4
-                @simple 123 hasRoles r5,r6
+                @ml "foo bar" r1
+                @ml 'a b' r2, r3
+                @ml xyz hasRole r4
+                @ml 123 hasRoles r5,r6
             `;
             parseFile.parseFile(luFile)
                 .then(res => {
@@ -78,7 +78,7 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Role definitions are de-duped', function(done){
             let luFile = `
-                @simple s1 r1, r1
+                @ml s1 r1, r1
             `;
 
             parseFile.parseFile(luFile)
@@ -92,7 +92,7 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Duplicate entity definitions is not allowed', function(done) {
             let luFile = `
-                @simple a1 r1
+                @ml a1 r1
                 @regex a1 r2
             `;
             parseFile.parseFile(luFile)
@@ -102,7 +102,7 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Role names cannot be the same as entity name', function(done) {
             let luFile = `
-                @simple a1 r1
+                @ml a1 r1
                 @regex re1 a1
             `;
             parseFile.parseFile(luFile)
@@ -115,7 +115,7 @@ describe('V2 Entity definitions using @ notation', function () {
                 # test
                 - this is a {foodType:r2}
 
-                @ simple foodType r1
+                @ ml foodType r1
             `;
             parseFile.parseFile(luFile)
                 .then(res => {
@@ -130,7 +130,7 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Entity name cannot be the same as entity type', function(done){
             let luFile = `
-                @simple simple
+                @ml ml
             `;
             parseFile.parseFile(luFile)
                 .then(res => done(res))
@@ -139,16 +139,16 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Entity definition can be split across lines', function(done){
             let luFile = `
-                @simple entity1
+                @ml entity1
                 @entity1 r1
 
-                @simple entity2
+                @ml entity2
                 @entity2 hasRole r2
 
-                @simple entity3
+                @ml entity3
                 @entity3 hasRoles r3
 
-                @simple entity4
+                @ml entity4
                 @entity4 hasRoles r4,r5
                 @entity4 r6
             `;
@@ -184,8 +184,8 @@ describe('V2 Entity definitions using @ notation', function () {
 
         it('Roles are unique', function(done) {
             let luFile = `
-                @simple entity1 r1
-                @simple entity2 r1
+                @ml entity1 r1
+                @ml entity2 r1
             `;
 
             parseFile.parseFile(luFile)
@@ -198,7 +198,7 @@ describe('V2 Entity definitions using @ notation', function () {
                 # test
                 - this is a {value:r1 = test}
 
-                @simple value r2
+                @ml value r2
             `;
 
             parseFile.parseFile(luFile)
@@ -934,7 +934,7 @@ describe('V2 Entity definitions using @ notation', function () {
         it('Duplicate composite entity definition throws', function(done){
             let luFile = `
                 @composite x1 = [s1, number]
-                @simple s1
+                @ml s1
                 @prebuilt number
                 @composite x1 = [s1, age]
                 @prebuilt age
diff --git a/packages/luis/test/parser/lufile/parseFileContents.featureToModels.test.js b/packages/luis/test/parser/lufile/parseFileContents.featureToModels.test.js
diff --git a/packages/luis/test/parser/lufile/parseFileContents.modelAsFeature.test.js b/packages/luis/test/parser/lufile/parseFileContents.modelAsFeature.test.js
diff --git a/packages/luis/test/parser/lufile/parseFileContents.nDepthEntity.test.js b/packages/luis/test/parser/lufile/parseFileContents.nDepthEntity.test.js
diff --git a/packages/luis/test/parser/lufile/parseFileContents.newEntityInUtterance.test.js b/packages/luis/test/parser/lufile/parseFileContents.newEntityInUtterance.test.js
diff --git a/packages/luis/test/parser/lufile/parseFileContents.roleTest.test.js b/packages/luis/test/parser/lufile/parseFileContents.roleTest.test.js
