Fix lu parser to handle phrase lists with enabledForAllModels = false (#882)

* fix

* Fixing tests.

Co-authored-by: Vishwac Sena Kannan <[email protected]>
Co-authored-by: Vishwac Sena Kannan <[email protected]>

Author: 3 people

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

@@ -48,6 +48,7 @@ const INTENTTYPE = 'intent';
 const PLCONSTS = {
     DISABLED : 'disabled',
     ENABLEDFORALLMODELS: 'enabledforallmodels',
+    DISABLEDFORALLMODELS: 'disabledforallmodels',
     INTERCHANGEABLE: '(interchangeable)'
 };
 const parseFileContentsModule = {
@@ -1042,7 +1043,7 @@ const validateAndGetRoles = function(parsedContent, roles, line, entityName, ent
             let roleFound = parsedContent.LUISJsonStructure.flatListOfEntityAndRoles.find(item => item.roles.includes(role) || item.name === role);
             if (roleFound !== undefined) {
                 // PL entities use roles for things like interchangeable, disabled, enabled for all models. There are really not 'dupes'.
-                let hasBadNonPLRoles = (roleFound.roles || []).filter(item => item.toLowerCase() !== PLCONSTS.INTERCHANGEABLE && item.toLowerCase() !== PLCONSTS.ENABLEDFORALLMODELS && item.toLowerCase() !== PLCONSTS.DISABLED);
+                let hasBadNonPLRoles = (roleFound.roles || []).filter(item => item.toLowerCase() !== PLCONSTS.INTERCHANGEABLE && item.toLowerCase() !== PLCONSTS.ENABLEDFORALLMODELS && item.toLowerCase() !== PLCONSTS.DISABLED && item.toLowerCase() !== PLCONSTS.DISABLEDFORALLMODELS);
                 if (hasBadNonPLRoles.length !== 0) {
                     let errorMsg = `Roles must be unique across entity types. Invalid role definition found "${entityName}". Prior definition - '@ ${roleFound.type} ${roleFound.name}${roleFound.roles.length > 0 ? ` hasRoles ${roleFound.roles.join(',')}` : ``}'`;
                     let error = BuildDiagnostic({
@@ -1377,6 +1378,8 @@ const handlePhraseList = function(parsedContent, entityName, entityType, entityR
                 isPLEnabled = false;
             } else if (item.toLowerCase() === PLCONSTS.ENABLEDFORALLMODELS) {
                 isPLEnabledForAllModels = true;
+            } else if (item.toLowerCase() === PLCONSTS.DISABLEDFORALLMODELS) {
+                isPLEnabledForAllModels = false;
             } else if (item.toLowerCase() === PLCONSTS.INTERCHANGEABLE) {
                 entityName += item;
             } else {

packages/lu/src/parser/luis/luConverter.js

@@ -335,9 +335,13 @@ const handlePhraseLists = function(collection) {
         fileContent += entity.name.includes(' ') ? `"${entity.name}"` : `${entity.name}`;
         fileContent += `${(entity.mode ? `(interchangeable)` : ``)}`;
         if (entity.activated !== undefined && !entity.activated) flags += `disabled`;
-        if (entity.enabledForAllModels !== undefined && entity.enabledForAllModels) {
-            flags += (flags !== '') ? `, enabledForAllModels` : `enabledForAllModels`;
-        }
+        if (entity.enabledForAllModels !== undefined) {
+            if (entity.enabledForAllModels === true) {
+                flags += (flags !== '') ? `, enabledForAllModels` : `enabledForAllModels`;
+            } else {
+                flags += (flags !== '') ? `, disabledForAllModels` : `disabledForAllModels`;
+            }
+        } 
         if (flags !== '') fileContent += ` ${flags}`;
         if (entity.words && entity.words !== '') {
             fileContent += ` = ${NEWLINE}\t- ${entity.words}`;