machine-learned -> ml

Author: Vishwac Sena Kannan

packages/luis/src/parser/lufile/LUFileLexer.g4

@@ -100,7 +100,7 @@ HAS_FEATURES_LABEL
   ;
 
 NEW_ENTITY_TYPE_IDENTIFIER
-  : 'simple'|'list'|'regex'|'prebuilt'|'composite'|'machine-learned'|'patternany'|'phraselist'|'intent'
+  : 'simple'|'list'|'regex'|'prebuilt'|'composite'|'ml'|'patternany'|'phraselist'|'intent'
   ;
 
 NEW_ENTITY_IDENTIFIER

packages/luis/src/parser/lufile/enums/luisEntityTypeNameMap.js

@@ -8,7 +8,7 @@ module.exports = {
     'list': 'closedLists',
     'regex': 'regex_entities',
     'composite': 'composites',
-    'machine-learned': 'entities',
+    'ml': 'entities',
     'patternany':'patternAnyEntities',
     'phraselist': 'model_features'
 };

packages/luis/src/parser/lufile/enums/luisEntityTypes.js

@@ -8,7 +8,7 @@ module.exports = {
     REGEX: 'regex',
     PREBUILT: 'prebuilt',
     COMPOSITE: 'composite',
-    ML: 'machine-learned',
+    ML: 'ml',
     PATTERNANY:'patternany',
     PHRASELIST: 'phraselist'
 };

packages/luis/src/parser/lufile/enums/luisobjenum.js

@@ -12,5 +12,5 @@ module.exports = {
     PATTERNS: "patterns",
     REGEX: "regex_entities",
     COMPOSITES: "composites",
-    MACHINELEARNED: "machine-learned"
+    MACHINELEARNED: "ml"
 };

packages/luis/src/parser/lufile/generated/LUFileLexer.interp

@@ -26,7 +26,7 @@ const DiagnosticSeverity = require('./diagnostic').DiagnosticSeverity;
 const BuildDiagnostic = require('./diagnostic').BuildDiagnostic;
 const EntityTypeEnum = require('./enums/luisEntityTypes');
 const luisEntityTypeMap = require('./enums/luisEntityTypeNameMap');
-const plAllowedTypes = ["simple", "composite", "machine-learned"];
+const plAllowedTypes = ["composite", "ml"];
 const featureTypeEnum = {
     featureToModel: 'modelName',
     modelToFeature: 'featureName'
@@ -171,16 +171,12 @@ const validateNDepthEntities = function(collection, entitiesAndRoles, intentsCol
                 let errorMsg = `[Error] line ${child.context.line}: Invalid child entity definition found. No definition for "${child.instanceOf}" in child entity definition "${child.context.definition}".`;
                 throw (new exception(retCode.errorCode.INVALID_INPUT, errorMsg));
             }
-            // base type cannot be a phrase list
-            if (baseEntityFound.type === EntityTypeEnum.PHRASELIST) {
-                let errorMsg = `[Error] line ${child.context.line}: Invalid child entity definition found. "${child.instanceOf}" is of type "${EntityTypeEnum.PHRASELIST}" in child entity definition "${child.context.definition}". Child cannot be an instance of a "${EntityTypeEnum.PHRASELIST}".`;
-                throw (new exception(retCode.errorCode.INVALID_INPUT, errorMsg));
-            }
-            // base type cannot be pattern.any
-            if (baseEntityFound.type == EntityTypeEnum.PATTERNANY) {
-                let errorMsg = `[Error] line ${child.context.line}: Invalid child entity definition found. "${child.instanceOf}" is of type "${EntityTypeEnum.PATTERNANY}" in child entity definition "${child.context.definition}". Child cannot be an instance of a "${EntityTypeEnum.PATTERNANY}".`;
+            // base type can only be a list or regex or prebuilt.
+            if (![EntityTypeEnum.LIST, EntityTypeEnum.REGEX, EntityTypeEnum.PREBUILT].includes(baseEntityFound.type)) {
+                let errorMsg = `[Error] line ${child.context.line}: Invalid child entity definition found. "${child.instanceOf}" is of type "${baseEntityFound.type}" in child entity definition "${child.context.definition}". Child cannot be only be an instance of "${EntityTypeEnum.LIST}, ${EntityTypeEnum.REGEX} or ${EntityTypeEnum.PREBUILT}.`;
                 throw (new exception(retCode.errorCode.INVALID_INPUT, errorMsg));
             }
+
         }
 
         if (child.features) {

packages/luis/src/parser/lufile/generated/LUFileLexer.js

@@ -11,9 +11,9 @@
 
 > # Entity definitions
 
-@ machine-learned nDepth usesFeatures intent1,phraselist1
+@ ml nDepth usesFeatures intent1,phraselist1
     - @ age nDepth_child1
-    - @ machine-learned nDepth_child2 usesFeatures intent1,phraselist1
+    - @ ml nDepth_child2 usesFeatures intent1,phraselist1
         - @ simple nDepth_child2.1
 
 

packages/luis/src/parser/lufile/parseFileContents.js

@@ -13,9 +13,9 @@
 
 > # Entity definitions
 
-@ machine-learned nDepth
+@ ml nDepth
     - @ age nDepth_child1
-    - @ machine-learned nDepth_child2
+    - @ ml nDepth_child2
         - @ simple nDepth_child2.1