Fix to LU cherry pick (#777)

* Fix lu converter to handle cases with space in child entity names (#775)

* changes to converter

* fix.

Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@ALLISONT6-PROBK.northamerica.corp.microsoft.com>
Co-authored-by: Vishwac Sena Kannan <[email protected]>

* Bump version to last RC

Co-authored-by: Vishwac Sena Kannan <[email protected]>
Co-authored-by: Vishwac Sena Kannan <vishwacsenakannan@ALLISONT6-PROBK.northamerica.corp.microsoft.com>
Co-authored-by: Vishwac Sena Kannan <[email protected]>

Author: 4 people

build/botframework-cli-mac.yml

@@ -28,7 +28,7 @@ pr:
 jobs:
   - job: CLI
     variables:
-      buildVersion: '4.9.0-RC6'
+      buildVersion: '4.9.0-RC42'
       _version: ${{coalesce(variables.version, variables.buildVersion)}}
 
     steps:

build/botframework-cli.yml

@@ -28,7 +28,7 @@ pr:
 jobs:
   - job: CLI
     variables:
-      buildVersion: '4.9.0-RC6'
+      buildVersion: '4.9.0-RC42'
       _version: ${{coalesce(variables.version, variables.buildVersion)}}
 
     steps:

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

@@ -191,8 +191,7 @@ const parseEntitiesToLu =  function(luisJson){
                 }
                 fileContent += NEWLINE + NEWLINE;
             }
-            fileContent += `@ ml `;
-            fileContent += entity.name.includes(' ') ? `"${entity.name}"` : `${entity.name}`;
+            fileContent += `@ ${getEntityType(entity.features)} ${writeEntityName(entity.name)}`;
             fileContent += addRolesAndFeatures(entity);
             fileContent += NEWLINE + NEWLINE;
         } else {
@@ -205,6 +204,10 @@ const parseEntitiesToLu =  function(luisJson){
     return fileContent
 }
 
+const writeEntityName = function(entityName) {
+    return entityName.includes(' ') ? `"${entityName}"` : `${entityName}`
+}
+
 const parseToLuPrebuiltEntities = function(luisJson){
     let fileContent = ''
     if(!luisJson.prebuiltEntities){
@@ -367,7 +370,7 @@ const addAppMetaData = function(LUISJSON) {
 const handleNDepthEntity = function(entity) {
     let fileContent = '';
     const BASE_TAB_STOP = 1;
-    fileContent += `@ ${EntityTypeEnum.ML} ${entity.name}`;
+    fileContent += `@ ${getEntityType(entity.features)} ${writeEntityName(entity.name)}`;
     fileContent += addRolesAndFeatures(entity);
     fileContent += NEWLINE;
     fileContent += addNDepthChildDefinitions(entity.children, BASE_TAB_STOP, fileContent) + NEWLINE + NEWLINE
@@ -383,15 +386,7 @@ const addNDepthChildDefinitions = function(childCollection, tabStop, fileContent
     let myFileContent = '';
     (childCollection || []).forEach(child => {
         myFileContent += "".padStart(tabStop * 4, ' ');
-        myFileContent += '- @ ';
-        // find constraint
-        let constraint = (child.features || []).find(feature => feature.isRequired == true);
-        if (constraint !== undefined) {
-            myFileContent += constraint.modelName;
-        } else {
-            myFileContent += EntityTypeEnum.ML;
-        }
-        myFileContent += ` ${child.name}`;
+        myFileContent += `- @ ${getEntityType(child.features)} ${writeEntityName(child.name)}`;
         myFileContent += addRolesAndFeatures(child);
         myFileContent += NEWLINE;
         if (child.children && child.children.length !== 0) {
@@ -400,6 +395,15 @@ const addNDepthChildDefinitions = function(childCollection, tabStop, fileContent
     });
     return myFileContent;
 }
+const getEntityType = function(features) {
+    // find constraint
+    let constraint = (features || []).find(feature => feature.isRequired == true);
+    if (constraint !== undefined) {
+        return constraint.modelName;
+    } else {
+        return EntityTypeEnum.ML;
+    }
+}
 /**
  * Helper to construt role and features list for an entity
  * @param {Object} entity 

packages/lu/test/commands/luis/convert.test.js

@@ -175,6 +175,10 @@ describe('luis:convert version 7 upgrade test', () => {
     it('luis:convert successfully converts LUIS JSON model with no phrase lists (output must have phraselists if any v6 concepts are present in the .lu file)', async () => {
         await assertToJSON('./../../fixtures/testcases/plWithFlags.lu', './../../fixtures/verified/plWithFlags.json')
     })
+
+    it('Child entities names with spaces in them parse correctly to .lu format', async () => {
+        await assertToLu('./../../fixtures/testcases/Child_Entity_With_Spaces.json', './../../fixtures/verified/Child_Entity_With_Spaces.lu')
+    })
   })
 
 describe('luis:convert negative tests', () => {