[luis build] change string format in setting and luis recognizer (#718)

feich-ms · web-flow · commit 31488b4deb38 · 2020-04-17T18:17:00.000+08:00
* change setting and luis recognizer format

* fix test cases
diff --git a/packages/lu/src/parser/lubuild/builder.ts b/packages/lu/src/parser/lubuild/builder.ts
@@ -189,7 +189,7 @@ export class Builder {
         // update settings asset
         if (settings && settings.has(path.dirname(content.path))) {
           let setting = settings.get(path.dirname(content.path)) as Settings
-          setting.luis[content.name.split('.').join('_')] = recognizer.getAppId()
+          setting.luis[content.name.split('.').join('_').replace(/-/g, '_')] = recognizer.getAppId()
         }
       }))
     }
diff --git a/packages/lu/src/parser/lubuild/recognizer.ts b/packages/lu/src/parser/lubuild/recognizer.ts
@@ -33,7 +33,7 @@ export class Recognizer {
 
   constructor(private readonly luFile: string, targetFileName: string) {
     this.appId = ''
-    this.applicationId = `=settings.luis.${targetFileName.split('.').join('_')}`
+    this.applicationId = `=settings.luis.${targetFileName.split('.').join('_').replace(/-/g, '_')}`
     this.endpoint = '=settings.luis.endpoint'
     this.endpointKey = '=settings.luis.endpointKey'
     this.versionId = '0.1'
diff --git a/packages/lu/test/fixtures/testcases/lubuild/foo/config/luis.settings.development.westus.json b/packages/lu/test/fixtures/testcases/lubuild/foo/config/luis.settings.development.westus.json
@@ -1,7 +1,7 @@
 {
     "luis": {
-        "foo_fr-fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
-        "foo_en-us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
-        "foo_zh-cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"
+        "foo_fr_fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
+        "foo_en_us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
+        "foo_zh_cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/lu/test/fixtures/testcases/lubuild/foo/dialogs/foo.en-us.lu.dialog b/packages/lu/test/fixtures/testcases/lubuild/foo/dialogs/foo.en-us.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.foo_en-us_lu",
+    "applicationId": "=settings.luis.foo_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/lu/test/fixtures/testcases/lubuild/foo/dialogs/foo.fr-fr.lu.dialog b/packages/lu/test/fixtures/testcases/lubuild/foo/dialogs/foo.fr-fr.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.foo_fr-fr_lu",
+    "applicationId": "=settings.luis.foo_fr_fr_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/lu/test/fixtures/testcases/lubuild/foo/dialogs/foo.zh-cn.lu.dialog b/packages/lu/test/fixtures/testcases/lubuild/foo/dialogs/foo.zh-cn.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.foo_zh-cn_lu",
+    "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/lu/test/fixtures/testcases/lubuild/foo2/config/luis.settings.development.westus.json b/packages/lu/test/fixtures/testcases/lubuild/foo2/config/luis.settings.development.westus.json
@@ -1,7 +1,7 @@
 {
     "luis": {
-        "foo_en-us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
-        "foo_fr-fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
-        "foo_zh-cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"
+        "foo_en_us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
+        "foo_fr_fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
+        "foo_zh_cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/lu/test/fixtures/testcases/lubuild/foo2/dialogs/foo.zh-cn.lu.dialog b/packages/lu/test/fixtures/testcases/lubuild/foo2/dialogs/foo.zh-cn.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.foo_zh-cn_lu",
+    "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/lu/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/luis.settings.development.westus.json b/packages/lu/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/luis.settings.development.westus.json
@@ -1,6 +1,6 @@
 {
     "luis": {
-        "foo_en-us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
-        "foo_fr-fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5"
+        "foo_en_us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
+        "foo_fr_fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/lu/test/fixtures/testcases/lubuild/sandwich/config/luis.settings.development.westus.json b/packages/lu/test/fixtures/testcases/lubuild/sandwich/config/luis.settings.development.westus.json
@@ -1,5 +1,5 @@
 {
     "luis": {
-        "sandwich_en-us_lu": "f8c64e2a-8635-3a09-8f78-39d7adc76ec5"
+        "sandwich_en_us_lu": "f8c64e2a-8635-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/lu/test/fixtures/testcases/lubuild/sandwich/dialogs/sandwich.en-us.lu.dialog b/packages/lu/test/fixtures/testcases/lubuild/sandwich/dialogs/sandwich.en-us.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.sandwich_en-us_lu",
+    "applicationId": "=settings.luis.sandwich_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo/config/luis.settings.development.westus.json b/packages/luis/test/fixtures/testcases/lubuild/foo/config/luis.settings.development.westus.json
@@ -1,7 +1,7 @@
 {
     "luis": {
-        "foo_fr-fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
-        "foo_en-us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
-        "foo_zh-cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"
+        "foo_fr_fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
+        "foo_en_us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
+        "foo_zh_cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.en-us.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.foo_en-us_lu",
+    "applicationId": "=settings.luis.foo_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.fr-fr.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.fr-fr.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.foo_fr-fr_lu",
+    "applicationId": "=settings.luis.foo_fr_fr_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.zh-cn.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo/dialogs/foo.zh-cn.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.foo_zh-cn_lu",
+    "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/config/luis.settings.development.westus.json b/packages/luis/test/fixtures/testcases/lubuild/foo2/config/luis.settings.development.westus.json
@@ -1,7 +1,7 @@
 {
     "luis": {
-        "foo_en-us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
-        "foo_fr-fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
-        "foo_zh-cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"
+        "foo_en_us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
+        "foo_fr_fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",
+        "foo_zh_cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.zh-cn.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/foo2/dialogs/foo.zh-cn.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.foo_zh-cn_lu",
+    "applicationId": "=settings.luis.foo_zh_cn_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/luis.settings.development.westus.json b/packages/luis/test/fixtures/testcases/lubuild/foo2/lufiles-and-dialog-assets/luis.settings.development.westus.json
@@ -1,6 +1,6 @@
 {
     "luis": {
-        "foo_en-us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
-        "foo_fr-fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5"
+        "foo_en_us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",
+        "foo_fr_fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/luconfig/config/luis.settings.development.westus.json b/packages/luis/test/fixtures/testcases/lubuild/luconfig/config/luis.settings.development.westus.json
@@ -1,5 +1,5 @@
 {
     "luis": {
-        "test_en-us_lu": "f8c64e2a-8635-3a09-8f78-39d7adc76ec5"
+        "test_en_us_lu": "f8c64e2a-8635-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/luconfig/dialogs/test.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/luconfig/dialogs/test.en-us.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.test_en-us_lu",
+    "applicationId": "=settings.luis.test_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/sandwich/config/luis.settings.development.westus.json b/packages/luis/test/fixtures/testcases/lubuild/sandwich/config/luis.settings.development.westus.json
@@ -1,5 +1,5 @@
 {
     "luis": {
-        "sandwich_en-us_lu": "f8c64e2a-8635-3a09-8f78-39d7adc76ec5"
+        "sandwich_en_us_lu": "f8c64e2a-8635-3a09-8f78-39d7adc76ec5"
     }
 }
diff --git a/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs/sandwich.en-us.lu.dialog b/packages/luis/test/fixtures/testcases/lubuild/sandwich/dialogs/sandwich.en-us.lu.dialog
@@ -1,6 +1,6 @@
 {
     "$kind": "Microsoft.LuisRecognizer",
-    "applicationId": "=settings.luis.sandwich_en-us_lu",
+    "applicationId": "=settings.luis.sandwich_en_us_lu",
     "endpoint": "=settings.luis.endpoint",
     "endpointKey": "=settings.luis.endpointKey"
 }

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ export class Builder {`
`189`	`189`	`// update settings asset`
`190`	`190`	`if (settings && settings.has(path.dirname(content.path))) {`
`191`	`191`	`let setting = settings.get(path.dirname(content.path)) as Settings`
`192`		`- setting.luis[content.name.split('.').join('_')] = recognizer.getAppId()`
	`192`	`+ setting.luis[content.name.split('.').join('_').replace(/-/g, '_')] = recognizer.getAppId()`
`193`	`193`	`}`
`194`	`194`	`}))`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"luis": {`
`3`		`- "foo_fr-fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",`
`4`		`- "foo_en-us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",`
`5`		`- "foo_zh-cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"`
	`3`	`+ "foo_fr_fr_lu": "f8c64e2a-1111-3a09-8f78-39d7adc76ec5",`
	`4`	`+ "foo_en_us_lu": "f8c64e2a-2222-3a09-8f78-39d7adc76ec5",`
	`5`	`+ "foo_zh_cn_lu": "f8c64e2a-3333-3a09-8f78-39d7adc76ec5"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$kind": "Microsoft.LuisRecognizer",`
`3`		`- "applicationId": "=settings.luis.foo_en-us_lu",`
	`3`	`+ "applicationId": "=settings.luis.foo_en_us_lu",`
`4`	`4`	`"endpoint": "=settings.luis.endpoint",`
`5`	`5`	`"endpointKey": "=settings.luis.endpointKey"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"luis": {`
`3`		`- "sandwich_en-us_lu": "f8c64e2a-8635-3a09-8f78-39d7adc76ec5"`
	`3`	`+ "sandwich_en_us_lu": "f8c64e2a-8635-3a09-8f78-39d7adc76ec5"`
`4`	`4`	`}`
`5`	`5`	`}`