Fixes #444 (#492)

Co-authored-by: Christopher Anderson <chrande@microsoft.com>

Author: vishwacsena

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

@@ -1267,7 +1267,7 @@ const RemoveDuplicatePatternAnyEntity = function(parsedContent, pEntityName, ent
             return false;
         }
     });
-    if (PAEntityFound !== undefined && PAIdx !== -1) {
+    if (PAEntityFound !== undefined && PAIdx !== -1 && entityType != EntityTypeEnum.PATTERNANY) {
         if (entityType.toLowerCase().trim().includes('phraselist')) {
             let errorMsg = `Phrase lists cannot be used as an entity in a pattern "${pEntityName}"`;
             let error = BuildDiagnostic({
@@ -1762,7 +1762,7 @@ const parseAndHandleModelInfoSection = function (parsedContent, luResource, log)
     if (modelInfos && modelInfos.length > 0) {
         for (const modelInfo of modelInfos) {
             let line = modelInfo.ModelInfo
-            let kvPair = line.split(/@(app|kb|intent|entity|enableMergeIntents).(.*)=/g).map(item => item.trim());
+            let kvPair = line.split(/@(app|kb|intent|entity|enableMergeIntents|patternAnyEntity).(.*)=/g).map(item => item.trim());
             if (kvPair.length === 4) {
                 if (kvPair[1] === 'enableMergeIntents' && kvPair[3] === 'false') {
                     enableMergeIntents = false;
@@ -1842,6 +1842,31 @@ const parseAndHandleModelInfoSection = function (parsedContent, luResource, log)
                             process.stdout.write(chalk.default.yellowBright('[WARN]: Invalid entity inherits information found. Skipping "' + line + '"\n'));
                         }
                     }
+                } else if (kvPair[1].toLowerCase() === 'patternanyentity') {
+                    if (kvPair[2].toLowerCase() === 'inherits') {
+                        let inheritsProperties = kvPair[3].split(/[:;]/g).map(item => item.trim());
+                        if (inheritsProperties.length !== 6) {
+                            process.stdout.write(chalk.default.yellowBright('[WARN]: Invalid Pattern.Any inherits information found. Skipping "' + line + '"\n'));
+                        } else {
+                            // find the intent
+                            let entity = parsedContent.LUISJsonStructure.patternAnyEntities.find(item => item.name == inheritsProperties[1]);
+                            if (entity === undefined) {
+                                let newEntity = new helperClass.patternAnyEntity(inheritsProperties[1]);
+                                newEntity.inherits = {};
+                                newEntity['inherits'][inheritsProperties[2]] = inheritsProperties[3];
+                                newEntity['inherits'][inheritsProperties[4]] = inheritsProperties[5];
+                                parsedContent.LUISJsonStructure.patternAnyEntities.push(newEntity);
+                            } else {
+                                if (entity['inherits'] === undefined) entity['inherits'] = {};
+                                entity['inherits'][inheritsProperties[2]] = inheritsProperties[3];
+                                entity['inherits'][inheritsProperties[4]] = inheritsProperties[5];
+                            }
+                        }
+                    } else {
+                        if (log) {
+                            process.stdout.write(chalk.default.yellowBright('[WARN]: Invalid entity inherits information found. Skipping "' + line + '"\n'));
+                        }
+                    }
                 }
             } else {
                 if (log) {

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

@@ -28,6 +28,7 @@ const luisToLuContent = function(luisJSON){
     fileContent += parseToLuClosedLists(luisJSON)
     fileContent += parseRegExEntitiesToLu(luisJSON)
     fileContent += parseCompositesToLu(luisJSON)
+    fileContent += parsePatternAnyEntitiesToLu(luisJSON)
     return fileContent
 }
 
@@ -213,6 +214,33 @@ const parseCompositesToLu = function(luisJson){
     return fileContent
 }
 
+const parsePatternAnyEntitiesToLu = function(luisJson){
+    let fileContent = ''
+    if(!luisJson.patternAnyEntities || luisJson.patternAnyEntities.length <= 0) {
+        return fileContent;
+    }
+    luisJson.patternAnyEntities.forEach(patternAnyEntity => {
+        // Add inherits information if any
+        if (patternAnyEntity.inherits !== undefined) {
+            fileContent += '> # Pattern.Any entities' + NEWLINE + NEWLINE;
+            // > !# @intent.inherits = {name = Web.WebSearch; domain_name = Web; model_name = WebSearch}
+            fileContent += '> !# @patternAnyEntity.inherits = name : ' + patternAnyEntity.name;
+            if (patternAnyEntity.inherits.domain_name !== undefined) {
+                fileContent += '; domain_name : ' + patternAnyEntity.inherits.domain_name;
+            }
+            if (patternAnyEntity.inherits.model_name !== undefined) {
+                fileContent += '; model_name : ' + patternAnyEntity.inherits.model_name;
+            }
+            fileContent += NEWLINE + NEWLINE;
+            // For back compat we will only write this if the pattern.any has inherits information.
+            fileContent += `@ patternany ${patternAnyEntity.name}`;
+            fileContent += addRolesAndFeatures(patternAnyEntity);
+            fileContent += NEWLINE;
+        }
+    })
+    return fileContent;
+}
+
 /**
  * Helper to handle phrase lists both in the new and old property.
  * @param {Object[]} collection 

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

@@ -615,6 +615,30 @@ describe('luis:convert new entity format', () => {
   })
 })
 
+describe('luis:convert with pattern.any inherits information', () => {
+  before(async function(){
+    await fs.mkdirp(path.join(__dirname, './../../../results/'))
+  })
+
+  after(async function(){
+    await fs.remove(path.join(__dirname, './../../../results/'))
+  })
+
+  test
+  .stdout()
+  .command(['luis:convert', '--in', `${path.join(__dirname, './../../fixtures/verified/LUISAppWithPAInherits.lu')}`, '--out', './results/LUISAppWithPAInherits.lu.json'])
+  .it('luis:convert with pattern.any inherits information correctly produces a LUIS app', async () => {
+    expect(await compareLuFiles('./../../../results/LUISAppWithPAInherits.lu.json', './../../fixtures/verified/LUISAppWithPAInherits.lu.json')).to.be.true
+  })
+
+  test
+    .stdout()
+    .command(['luis:convert', '--in', `${path.join(__dirname, './../../fixtures/testcases/LUISAppWithPAInherits.json')}`, '--out', './results/root2_a.lu'])
+    .it('luis:convert successfully reconstructs a markdown file from a LUIS input file with pattern.any inherits information', async () => {
+      expect(await compareLuFiles('./../../../results/root2_a.lu', './../../fixtures/verified/LUISAppWithPAInherits.lu')).to.be.true
+    })
+})
+
 describe('luis:convert file creation', () => {
   test
   .stderr()