regex_entities alternative format fix

packages/luis/src/commands/luis/generate/cs.ts

@@ -24,6 +24,17 @@ export default class LuisGenerateCs extends Command {
 
   }
 
+  renameProp(
+    oldProp: string,
+    newProp: string,
+    {[oldProp]: old, ...others}
+  ): any {
+    return {
+      [newProp]: old,
+      ...others
+    }
+  }
+
   reorderEntities(app: any, name: string): void {
     if (app[name] !== null && app[name] !== undefined) {
       app[name].sort((a: any, b: any) => (a.name > b.name ? 1 : -1))
@@ -57,6 +68,10 @@ export default class LuisGenerateCs extends Command {
       flags.className = upperFirst(camelCase(flags.className))
     }
 
+    if ('regexEntities' in app) {
+      app = this.renameProp('regexEntities', 'regex_entities', app)
+    }
+
     this.reorderEntities(app, 'entities')
     this.reorderEntities(app, 'prebuiltEntities')
     this.reorderEntities(app, 'closedLists')

packages/luis/src/commands/luis/generate/ts.ts

@@ -22,6 +22,17 @@ export default class LuisGenerateTs extends Command {
     help: flags.help({char: 'h', description: 'luis:generate:ts help'}),
   }
 
+  renameProp(
+    oldProp: string,
+    newProp: string,
+    {[oldProp]: old, ...others}
+  ): any {
+    return {
+      [newProp]: old,
+      ...others
+    }
+  }
+
   reorderEntities(app: any, name: string): void {
     if (app[name] !== null && app[name] !== undefined) {
       app[name].sort((a: any, b: any) => (a.name > b.name ? 1 : -1))
@@ -48,6 +59,10 @@ export default class LuisGenerateTs extends Command {
       flags.className = flags.className || app.name
       flags.className = upperFirst(camelCase(flags.className))
 
+      if ('regexEntities' in app) {
+        app = this.renameProp('regexEntities', 'regex_entities', app)
+      }
+
       this.reorderEntities(app, 'entities')
       this.reorderEntities(app, 'prebuiltEntities')
       this.reorderEntities(app, 'closedLists')

packages/luis/test/commands/luis/generate/cs.test.ts

@@ -84,6 +84,17 @@ describe('luis:generate:cs', () => {
     .it('Generates regex entities correctly', async () => {
       await compareSourceFiles('../../../fixtures/generate/RegexEntities.cs', '../../../fixtures/generate/results/RegexEntities.cs')
     })
+
+  test
+    .stdout()
+    .command(['luis:generate:cs',
+      '--in',
+      `${path.join(__dirname, '../../../fixtures/generate/RegexEntities2.json')}`,
+      '--out',
+      `${path.join(__dirname, '../../../fixtures/generate/results/RegexEntities2.cs')}`])
+    .it('Generates regex entities with alternative format correctly', async () => {
+      await compareSourceFiles('../../../fixtures/generate/RegexEntities.cs', '../../../fixtures/generate/results/RegexEntities2.cs')
+    })
 
   test
     .stdout()

packages/luis/test/commands/luis/generate/ts.test.ts

@@ -96,6 +96,17 @@ describe('luis:generate:ts', () => {
     .it('Generates regex entities correctly', async () => {
       await compareSourceFiles('../../../fixtures/generate/regex-entities.ts', '../../../fixtures/generate/results/regex-entities.ts')
     })
+
+  test
+    .stdout()
+    .command(['luis:generate:ts',
+      '--in',
+      `${path.join(__dirname, '../../../fixtures/generate/RegexEntities2.json')}`,
+      '--out',
+      `${path.join(__dirname, '../../../fixtures/generate/results/regex-entities2.ts')}`])
+    .it('Generates regex entities with alternative format correctly', async () => {
+      await compareSourceFiles('../../../fixtures/generate/regex-entities.ts', '../../../fixtures/generate/results/regex-entities2.ts')
+    })
 
   test
     .stdout()

packages/luis/test/fixtures/generate/RegexEntities.cs

@@ -27,10 +27,18 @@ public enum Intent {
 
         public class _Entities
         {
+            // Regex entities
+            public string[] Part;
+            public string[] buy;
+            public string[] sell;
+
 
             // Instance
             public class _Instance
             {
+                public InstanceData[] Part;
+                public InstanceData[] buy;
+                public InstanceData[] sell;
             }
             [JsonProperty("$instance")]
             public _Instance _instance;

packages/luis/test/fixtures/generate/RegexEntities.json

@@ -10,10 +10,7 @@
   "composites": [],
   "closedLists": [],
   "patternAnyEntities": [],
-  "regex_entities": [],
-  "prebuiltEntities": [],
-  "model_features": [],
-  "regex_features": [
+  "regex_entities": [
     {
       "name": "Part",
       "regexPattern": "kb[0-9]+",
@@ -23,6 +20,9 @@
       ]
     }
   ],
+  "prebuiltEntities": [],
+  "model_features": [],
+  "regex_features": [],
   "patterns": [],
   "utterances": [],
   "settings": []

packages/luis/test/fixtures/generate/RegexEntities2.json

@@ -0,0 +1,29 @@
+{
+  "luis_schema_version": "3.2.0",
+  "versionId": "GeoPeople",
+  "name": "Contoso App",
+  "desc": "Default Intents for Azure Bot Service V2",
+  "culture": "en-us",
+  "tokenizerVersion": "1.0.0",
+  "intents": [],
+  "entities": [],
+  "composites": [],
+  "closedLists": [],
+  "patternAnyEntities": [],
+  "regexEntities": [
+    {
+      "name": "Part",
+      "regexPattern": "kb[0-9]+",
+      "roles": [
+        "buy",
+        "sell"
+      ]
+    }
+  ],
+  "prebuiltEntities": [],
+  "model_features": [],
+  "regexFeatures": [],
+  "patterns": [],
+  "utterances": [],
+  "settings": []
+}

packages/luis/test/fixtures/generate/regex-entities.ts

@@ -12,6 +12,9 @@ export interface GeneratedIntents {
 }
 
 export interface GeneratedInstance {
+  Part?: InstanceData[]
+  buy?: InstanceData[]
+  sell?: InstanceData[]
 }
 
 export interface GeneratedEntities {
@@ -22,6 +25,9 @@ export interface GeneratedEntities {
   // Lists
 
   // Regex entities
+  Part?: string[]
+  buy?: string[]
+  sell?: string[]
 
   // Pattern.any