@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.8d048e1f1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (226) hide show
  1. package/build/common/constants.d.ts +1 -1
  2. package/build/common/constants.d.ts.map +1 -1
  3. package/build/common/constants.js +1 -1
  4. package/build/common/constants.js.map +1 -1
  5. package/build/common/projectSettingsHelper.d.ts.map +1 -1
  6. package/build/common/projectSettingsHelper.js +1 -1
  7. package/build/common/projectSettingsHelper.js.map +1 -1
  8. package/build/common/telemetry.d.ts +9 -0
  9. package/build/common/telemetry.d.ts.map +1 -1
  10. package/build/common/telemetry.js +9 -0
  11. package/build/common/telemetry.js.map +1 -1
  12. package/build/common/templates-config.json +2 -2
  13. package/build/common/tools.d.ts +1 -1
  14. package/build/common/tools.d.ts.map +1 -1
  15. package/build/common/tools.js +6 -5
  16. package/build/common/tools.js.map +1 -1
  17. package/build/core/FxCore.d.ts +2 -2
  18. package/build/core/FxCore.d.ts.map +1 -1
  19. package/build/core/FxCore.js +49 -11
  20. package/build/core/FxCore.js.map +1 -1
  21. package/build/core/environment.d.ts +1 -1
  22. package/build/core/environment.d.ts.map +1 -1
  23. package/build/core/environment.js +6 -1
  24. package/build/core/environment.js.map +1 -1
  25. package/build/core/error.d.ts +1 -0
  26. package/build/core/error.d.ts.map +1 -1
  27. package/build/core/error.js +5 -1
  28. package/build/core/error.js.map +1 -1
  29. package/build/core/middleware/aadManifestMigration.d.ts +3 -0
  30. package/build/core/middleware/aadManifestMigration.d.ts.map +1 -0
  31. package/build/core/middleware/aadManifestMigration.js +211 -0
  32. package/build/core/middleware/aadManifestMigration.js.map +1 -0
  33. package/build/core/middleware/consolidateLocalRemote.d.ts +2 -0
  34. package/build/core/middleware/consolidateLocalRemote.d.ts.map +1 -1
  35. package/build/core/middleware/consolidateLocalRemote.js +80 -51
  36. package/build/core/middleware/consolidateLocalRemote.js.map +1 -1
  37. package/build/core/middleware/questionModel.d.ts.map +1 -1
  38. package/build/core/middleware/questionModel.js +11 -2
  39. package/build/core/middleware/questionModel.js.map +1 -1
  40. package/build/core/question.d.ts +3 -1
  41. package/build/core/question.d.ts.map +1 -1
  42. package/build/core/question.js +22 -2
  43. package/build/core/question.js.map +1 -1
  44. package/build/plugins/resource/aad/plugin.d.ts +1 -0
  45. package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
  46. package/build/plugins/resource/aad/plugin.js +54 -1
  47. package/build/plugins/resource/aad/plugin.js.map +1 -1
  48. package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
  49. package/build/plugins/resource/aad/utils/configs.js +4 -1
  50. package/build/plugins/resource/aad/utils/configs.js.map +1 -1
  51. package/build/plugins/resource/apiconnector/checker.d.ts +2 -0
  52. package/build/plugins/resource/apiconnector/checker.d.ts.map +1 -0
  53. package/build/plugins/resource/apiconnector/checker.js +22 -0
  54. package/build/plugins/resource/apiconnector/checker.js.map +1 -0
  55. package/build/plugins/resource/apiconnector/config.d.ts +20 -0
  56. package/build/plugins/resource/apiconnector/config.d.ts.map +1 -0
  57. package/build/plugins/resource/apiconnector/config.js +5 -0
  58. package/build/plugins/resource/apiconnector/config.js.map +1 -0
  59. package/build/plugins/resource/apiconnector/constants.d.ts +15 -0
  60. package/build/plugins/resource/apiconnector/constants.d.ts.map +1 -1
  61. package/build/plugins/resource/apiconnector/constants.js +17 -1
  62. package/build/plugins/resource/apiconnector/constants.js.map +1 -1
  63. package/build/plugins/resource/apiconnector/depsHandler.d.ts +12 -0
  64. package/build/plugins/resource/apiconnector/depsHandler.d.ts.map +1 -0
  65. package/build/plugins/resource/apiconnector/depsHandler.js +66 -0
  66. package/build/plugins/resource/apiconnector/depsHandler.js.map +1 -0
  67. package/build/plugins/resource/apiconnector/envHandler.d.ts +2 -2
  68. package/build/plugins/resource/apiconnector/envHandler.d.ts.map +1 -1
  69. package/build/plugins/resource/apiconnector/envHandler.js +18 -24
  70. package/build/plugins/resource/apiconnector/envHandler.js.map +1 -1
  71. package/build/plugins/resource/apiconnector/errors.d.ts +13 -1
  72. package/build/plugins/resource/apiconnector/errors.d.ts.map +1 -1
  73. package/build/plugins/resource/apiconnector/errors.js +19 -7
  74. package/build/plugins/resource/apiconnector/errors.js.map +1 -1
  75. package/build/plugins/resource/apiconnector/index.d.ts.map +1 -1
  76. package/build/plugins/resource/apiconnector/index.js +1 -8
  77. package/build/plugins/resource/apiconnector/index.js.map +1 -1
  78. package/build/plugins/resource/apiconnector/plugin.d.ts +11 -2
  79. package/build/plugins/resource/apiconnector/plugin.d.ts.map +1 -1
  80. package/build/plugins/resource/apiconnector/plugin.js +179 -17
  81. package/build/plugins/resource/apiconnector/plugin.js.map +1 -1
  82. package/build/plugins/resource/apiconnector/questions.d.ts +23 -3
  83. package/build/plugins/resource/apiconnector/questions.d.ts.map +1 -1
  84. package/build/plugins/resource/apiconnector/questions.js +69 -22
  85. package/build/plugins/resource/apiconnector/questions.js.map +1 -1
  86. package/build/plugins/resource/apiconnector/result.d.ts +2 -1
  87. package/build/plugins/resource/apiconnector/result.d.ts.map +1 -1
  88. package/build/plugins/resource/apiconnector/result.js.map +1 -1
  89. package/build/plugins/resource/apiconnector/sampleHandler.d.ts +1 -1
  90. package/build/plugins/resource/apiconnector/sampleHandler.d.ts.map +1 -1
  91. package/build/plugins/resource/apiconnector/utils.d.ts +16 -20
  92. package/build/plugins/resource/apiconnector/utils.d.ts.map +1 -1
  93. package/build/plugins/resource/apiconnector/utils.js +72 -16
  94. package/build/plugins/resource/apiconnector/utils.js.map +1 -1
  95. package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
  96. package/build/plugins/resource/appstudio/appStudio.js +6 -5
  97. package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
  98. package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
  99. package/build/plugins/resource/appstudio/manifestTemplate.js +3 -3
  100. package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
  101. package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
  102. package/build/plugins/resource/appstudio/plugin.js.map +1 -1
  103. package/build/plugins/resource/appstudio/v3/plugin.d.ts.map +1 -1
  104. package/build/plugins/resource/appstudio/v3/plugin.js +5 -0
  105. package/build/plugins/resource/appstudio/v3/plugin.js.map +1 -1
  106. package/build/plugins/resource/bot/azureOps.d.ts +0 -1
  107. package/build/plugins/resource/bot/azureOps.d.ts.map +1 -1
  108. package/build/plugins/resource/bot/azureOps.js +0 -28
  109. package/build/plugins/resource/bot/azureOps.js.map +1 -1
  110. package/build/plugins/resource/bot/clientFactory.d.ts +0 -5
  111. package/build/plugins/resource/bot/clientFactory.d.ts.map +1 -1
  112. package/build/plugins/resource/bot/clientFactory.js +1 -29
  113. package/build/plugins/resource/bot/clientFactory.js.map +1 -1
  114. package/build/plugins/resource/bot/constants.d.ts +0 -8
  115. package/build/plugins/resource/bot/constants.d.ts.map +1 -1
  116. package/build/plugins/resource/bot/constants.js +0 -8
  117. package/build/plugins/resource/bot/constants.js.map +1 -1
  118. package/build/plugins/resource/bot/errors.d.ts +0 -18
  119. package/build/plugins/resource/bot/errors.d.ts.map +1 -1
  120. package/build/plugins/resource/bot/errors.js +1 -38
  121. package/build/plugins/resource/bot/errors.js.map +1 -1
  122. package/build/plugins/resource/bot/functionsHostedBot/deployMgr.d.ts +1 -1
  123. package/build/plugins/resource/bot/functionsHostedBot/deployMgr.d.ts.map +1 -1
  124. package/build/plugins/resource/bot/functionsHostedBot/deployMgr.js +10 -4
  125. package/build/plugins/resource/bot/functionsHostedBot/deployMgr.js.map +1 -1
  126. package/build/plugins/resource/bot/functionsHostedBot/plugin.d.ts.map +1 -1
  127. package/build/plugins/resource/bot/functionsHostedBot/plugin.js +2 -6
  128. package/build/plugins/resource/bot/functionsHostedBot/plugin.js.map +1 -1
  129. package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
  130. package/build/plugins/resource/bot/plugin.js +4 -1
  131. package/build/plugins/resource/bot/plugin.js.map +1 -1
  132. package/build/plugins/resource/frontend/resources/templateInfo.js +1 -1
  133. package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
  134. package/build/plugins/resource/sql/errors.d.ts.map +1 -1
  135. package/build/plugins/resource/sql/errors.js +29 -29
  136. package/build/plugins/resource/sql/errors.js.map +1 -1
  137. package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
  138. package/build/plugins/resource/sql/sqlClient.js +2 -8
  139. package/build/plugins/resource/sql/sqlClient.js.map +1 -1
  140. package/build/plugins/solution/fx-solution/constants.d.ts +16 -2
  141. package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
  142. package/build/plugins/solution/fx-solution/constants.js +19 -1
  143. package/build/plugins/solution/fx-solution/constants.js.map +1 -1
  144. package/build/plugins/solution/fx-solution/debug/util/launchNext.d.ts.map +1 -1
  145. package/build/plugins/solution/fx-solution/debug/util/launchNext.js +0 -26
  146. package/build/plugins/solution/fx-solution/debug/util/launchNext.js.map +1 -1
  147. package/build/plugins/solution/fx-solution/question.d.ts +3 -1
  148. package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
  149. package/build/plugins/solution/fx-solution/question.js +21 -7
  150. package/build/plugins/solution/fx-solution/question.js.map +1 -1
  151. package/build/plugins/solution/fx-solution/v2/deploy.d.ts.map +1 -1
  152. package/build/plugins/solution/fx-solution/v2/deploy.js +14 -5
  153. package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
  154. package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +2 -1
  155. package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
  156. package/build/plugins/solution/fx-solution/v2/executeUserTask.js +121 -82
  157. package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
  158. package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
  159. package/build/plugins/solution/fx-solution/v2/getQuestions.js +31 -22
  160. package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
  161. package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
  162. package/build/plugins/solution/fx-solution/v2/provision.js +17 -6
  163. package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
  164. package/build/plugins/solution/fx-solution/v2/utils.js +1 -1
  165. package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
  166. package/package.json +3 -3
  167. package/resource/package.nls.json +91 -39
  168. package/resource/unify-config-change-logs.md +15 -0
  169. package/templates/core/README.md +1 -0
  170. package/templates/fallback/blazor-base.csharp.default.zip +0 -0
  171. package/templates/fallback/bot.csharp.default.zip +0 -0
  172. package/templates/fallback/bot.js.command-and-response.zip +0 -0
  173. package/templates/fallback/bot.js.default.zip +0 -0
  174. package/templates/fallback/bot.js.notification-function-base.zip +0 -0
  175. package/templates/fallback/bot.js.notification-restify.zip +0 -0
  176. package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
  177. package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
  178. package/templates/fallback/bot.ts.command-and-response.zip +0 -0
  179. package/templates/fallback/bot.ts.default.zip +0 -0
  180. package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
  181. package/templates/fallback/bot.ts.notification-restify.zip +0 -0
  182. package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
  183. package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
  184. package/templates/fallback/bot.ts.notification.zip +0 -0
  185. package/templates/fallback/function-base.js.default.zip +0 -0
  186. package/templates/fallback/function-base.ts.default.zip +0 -0
  187. package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
  188. package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
  189. package/templates/fallback/tab.csharp.default.zip +0 -0
  190. package/templates/fallback/tab.js.default.zip +0 -0
  191. package/templates/fallback/tab.js.m365.zip +0 -0
  192. package/templates/fallback/tab.js.non-sso.zip +0 -0
  193. package/templates/fallback/tab.ts.default.zip +0 -0
  194. package/templates/fallback/tab.ts.m365.zip +0 -0
  195. package/templates/fallback/tab.ts.non-sso.zip +0 -0
  196. package/templates/plugins/resource/aad/auth/bot/README.md +63 -0
  197. package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +65 -0
  198. package/templates/plugins/resource/aad/auth/bot/js/public/auth-start.html +177 -0
  199. package/templates/plugins/resource/aad/auth/bot/js/sso/showUserInfo.js +19 -0
  200. package/templates/plugins/resource/aad/auth/bot/js/sso/ssoDialog.js +173 -0
  201. package/templates/plugins/resource/aad/auth/bot/js/sso/teamsSsoBot.js +55 -0
  202. package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +65 -0
  203. package/templates/plugins/resource/aad/auth/bot/ts/public/auth-start.html +177 -0
  204. package/templates/plugins/resource/aad/auth/bot/ts/sso/showUserInfo.ts +24 -0
  205. package/templates/plugins/resource/aad/auth/bot/ts/sso/ssoDialog.ts +182 -0
  206. package/templates/plugins/resource/aad/auth/bot/ts/sso/teamsSsoBot.ts +69 -0
  207. package/templates/plugins/resource/aad/auth/tab/README.md +49 -0
  208. package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +58 -0
  209. package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +57 -0
  210. package/templates/plugins/resource/aad/auth/tab/js/sso/GetUserProfile.jsx +34 -0
  211. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +58 -0
  212. package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +57 -0
  213. package/templates/plugins/resource/aad/auth/tab/ts/sso/GetUserProfile.tsx +34 -0
  214. package/templates/plugins/resource/aad/manifest/aad.template.json +1 -14
  215. package/templates/plugins/resource/apiconnector/package.json +6 -0
  216. package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +9 -0
  217. package/templates/plugins/resource/bot/bicep/funcHostedBotProvision.template.bicep +2 -0
  218. package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +2 -0
  219. package/templates/plugins/resource/simpleauth/bicep/simpleAuthProvision.template.bicep +4 -0
  220. package/templates/plugins/resource/webapp/bicep/webappProvision.template.bicep +2 -0
  221. package/templates/core/README-auto-generated.md +0 -31
  222. package/templates/fallback/bot-msgext.csharp.default.zip +0 -0
  223. package/templates/fallback/bot-msgext.js.default.zip +0 -0
  224. package/templates/fallback/bot-msgext.ts.default.zip +0 -0
  225. package/templates/fallback/msgext.js.default.zip +0 -0
  226. package/templates/fallback/msgext.ts.default.zip +0 -0
@@ -15,10 +15,12 @@ class ApiDataManager {
15
15
  this.apiConnector = {};
16
16
  }
17
17
  updateLocalApiEnvs(localEnvs) {
18
- let customEnvs = localEnvs.customizedLocalEnvs;
18
+ const customEnvs = localEnvs.customizedLocalEnvs;
19
19
  for (const item in this.apiConnector) {
20
20
  const apis = this.apiConnector[item];
21
- customEnvs = Object.assign(Object.assign({}, customEnvs), apis);
21
+ for (const [key, value] of Array.from(apis)) {
22
+ customEnvs[key] = value;
23
+ }
22
24
  }
23
25
  localEnvs.customizedLocalEnvs = customEnvs;
24
26
  return localEnvs;
@@ -26,22 +28,24 @@ class ApiDataManager {
26
28
  addApiEnvs(config) {
27
29
  const apiName = config.APIName.toUpperCase();
28
30
  if (!this.apiConnector[apiName]) {
29
- this.apiConnector[apiName] = {};
31
+ this.apiConnector[apiName] = new Map();
32
+ }
33
+ if (config.AuthConfig.AuthType === constants_1.AuthType.BASIC) {
34
+ this.addBasicEnvs(config);
30
35
  }
36
+ }
37
+ addBasicEnvs(config) {
38
+ const apiName = config.APIName.toUpperCase();
39
+ const apiConfig = this.apiConnector[apiName];
31
40
  const endPoint = "API_" + apiName + "_ENDPOINT";
32
41
  const authName = "API_" + apiName + "_AUTHENTICATION_TYPE";
33
42
  const userName = "API_" + apiName + "_USERNAME";
34
43
  const passWd = "API_" + apiName + "_PASSWORD";
35
- if (config.ApiUserName) {
36
- this.apiConnector[apiName][userName] = config.ApiUserName;
37
- }
38
- if (config.ApiAuthType) {
39
- this.apiConnector[apiName][authName] = config.ApiAuthType;
40
- }
41
- if (config.EndPoint) {
42
- this.apiConnector[apiName][endPoint] = config.EndPoint;
43
- }
44
- this.apiConnector[apiName][passWd] = "";
44
+ const authConfig = config.AuthConfig;
45
+ apiConfig.set(userName, authConfig.UserName);
46
+ apiConfig.set(authName, authConfig.AuthType);
47
+ apiConfig.set(endPoint, config.EndPoint);
48
+ apiConfig.set(passWd, "");
45
49
  }
46
50
  }
47
51
  exports.ApiDataManager = ApiDataManager;
@@ -55,15 +59,10 @@ class EnvHandler {
55
59
  this.apiDataManager.addApiEnvs(config);
56
60
  }
57
61
  async saveLocalEnvFile() {
58
- // backup .env.teamsfx.local file with timestamp
59
- const timestamp = Date.now();
60
- const backupFileName = EnvHandler.LocalEnvFileName + "." + timestamp;
61
- const srcFile = path.join(this.projectRoot, this.componentType, EnvHandler.LocalEnvFileName);
62
- const tmpFile = path.join(this.projectRoot, this.componentType, backupFileName);
62
+ const srcFile = path.join(this.projectRoot, this.componentType, constants_1.Constants.envFileName);
63
63
  if (!(await fs.pathExists(srcFile))) {
64
64
  await fs.createFile(srcFile);
65
65
  }
66
- await fs.move(srcFile, tmpFile);
67
66
  // update localEnvs
68
67
  try {
69
68
  const provider = new localEnvProvider_1.LocalEnvProvider(this.projectRoot);
@@ -79,12 +78,8 @@ class EnvHandler {
79
78
  }
80
79
  }
81
80
  catch (err) {
82
- await fs.move(tmpFile, srcFile);
83
81
  throw result_1.ResultFactory.SystemError(errors_1.ErrorMessage.ApiConnectorFileCreateFailError.name, errors_1.ErrorMessage.ApiConnectorFileCreateFailError.message(srcFile));
84
82
  }
85
- finally {
86
- await fs.remove(tmpFile);
87
- }
88
83
  return result_1.ResultFactory.Success();
89
84
  }
90
85
  updateLocalApiEnvs(localEnvs) {
@@ -93,5 +88,4 @@ class EnvHandler {
93
88
  }
94
89
  }
95
90
  exports.EnvHandler = EnvHandler;
96
- EnvHandler.LocalEnvFileName = ".env.teamsfx.local";
97
91
  //# sourceMappingURL=envHandler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"envHandler.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/envHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"envHandler.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/envHandler.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ export declare class ErrorMessage {
5
5
  };
6
6
  static readonly ApiConnectorInputError: {
7
7
  name: string;
8
- message: () => string;
8
+ message: (key: string) => string;
9
9
  };
10
10
  static readonly ApiConnectorPathError: {
11
11
  name: string;
@@ -31,5 +31,17 @@ export declare class ErrorMessage {
31
31
  name: string;
32
32
  message: () => string;
33
33
  };
34
+ static readonly generateApiConFilesError: {
35
+ name: string;
36
+ message: (reason: string) => string;
37
+ };
38
+ static readonly sdkVersionImcompatibleError: {
39
+ name: string;
40
+ message: (component: string, localVersion: string, targetVersion: string) => string;
41
+ };
42
+ static readonly localPkgFileNotExistError: {
43
+ name: string;
44
+ message: (component: string) => string;
45
+ };
34
46
  }
35
47
  //# sourceMappingURL=errors.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAKA,qBAAa,YAAY;IACvB,gBAAuB,mBAAmB;;;MAMxC;IACF,gBAAuB,sBAAsB;;;MAM3C;IAEF,gBAAuB,qBAAqB;;4BAEtB,MAAM;MAK1B;IAEF,gBAAuB,+BAA+B;;4BAEhC,MAAM;MAK1B;IAEF,gBAAuB,sBAAsB;;4BAEvB,MAAM;MAK1B;IAEF,gBAAuB,yBAAyB;;4BAE1B,MAAM,UAAU,MAAM;MAM1C;IAEF,gBAAuB,yBAAyB;;;MAM9C;IAEF,gBAAuB,yBAAyB;;;MAM9C;CACH"}
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAIA,qBAAa,YAAY;IACvB,gBAAuB,mBAAmB;;;MAIxC;IACF,gBAAuB,sBAAsB;;uBAE5B,MAAM;MAErB;IAEF,gBAAuB,qBAAqB;;4BAEtB,MAAM;MAE1B;IAEF,gBAAuB,+BAA+B;;4BAEhC,MAAM;MAK1B;IAEF,gBAAuB,sBAAsB;;4BAEvB,MAAM;MAK1B;IAEF,gBAAuB,yBAAyB;;4BAE1B,MAAM,UAAU,MAAM;MAM1C;IAEF,gBAAuB,yBAAyB;;;MAI9C;IAEF,gBAAuB,yBAAyB;;;MAI9C;IAEF,gBAAuB,wBAAwB;;0BAE3B,MAAM;MAKxB;IAEF,gBAAuB,2BAA2B;;6BAE3B,MAAM,gBAAgB,MAAM,iBAAiB,MAAM;MAOxE;IAEF,gBAAuB,yBAAyB;;6BAEzB,MAAM;MAK3B;CACH"}
@@ -9,23 +9,23 @@ class ErrorMessage {
9
9
  exports.ErrorMessage = ErrorMessage;
10
10
  ErrorMessage.InvalidProjectError = {
11
11
  name: "InvalidProjectError",
12
- message: () => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.InvalidProjectError.name}`),
12
+ message: () => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.InvalidProjectError.name}`),
13
13
  };
14
14
  ErrorMessage.ApiConnectorInputError = {
15
15
  name: "ApiConnectorInputError",
16
- message: () => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.ApiConnectorInputError.name}`),
16
+ message: (key) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.ApiConnectorInputError.name}`, key),
17
17
  };
18
18
  ErrorMessage.ApiConnectorPathError = {
19
19
  name: "ApiConnectorPathNotExistError",
20
- message: (pathName) => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.ApiConnectorPathError.name}`, pathName),
20
+ message: (pathName) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.ApiConnectorPathError.name}`, pathName),
21
21
  };
22
22
  ErrorMessage.ApiConnectorFileCreateFailError = {
23
23
  name: "ApiConnectorCreateFileFail",
24
- message: (pathName) => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.ApiConnectorFileCreateFailError.name}`, pathName),
24
+ message: (pathName) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.ApiConnectorFileCreateFailError.name}`, pathName),
25
25
  };
26
26
  ErrorMessage.ApiConnectorRouteError = {
27
27
  name: "ApiConnectorFunctionRouteError",
28
- message: (funcName) => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.ApiConnectorRouteError.name}`, funcName),
28
+ message: (funcName) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.ApiConnectorRouteError.name}`, funcName),
29
29
  };
30
30
  ErrorMessage.SampleCodeCreateFailError = {
31
31
  name: "SampleCodeCreateFailError",
@@ -33,10 +33,22 @@ ErrorMessage.SampleCodeCreateFailError = {
33
33
  };
34
34
  ErrorMessage.NoValidCompoentExistError = {
35
35
  name: "NoValidCompoentExistError",
36
- message: () => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.NoValidCompoentExistError.name}`),
36
+ message: () => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.NoValidCompoentExistError.name}`),
37
37
  };
38
38
  ErrorMessage.NoActivePluginsExistError = {
39
39
  name: "NoActivePluginsExistError",
40
- message: () => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.NoActivePluginsExistError.name}`),
40
+ message: () => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.NoActivePluginsExistError.name}`),
41
+ };
42
+ ErrorMessage.generateApiConFilesError = {
43
+ name: "ScaffoldApiFilesError",
44
+ message: (reason) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.generateApiConFilesError.name}`, reason),
45
+ };
46
+ ErrorMessage.sdkVersionImcompatibleError = {
47
+ name: "SDKVersionImcompatibleError",
48
+ message: (component, localVersion, targetVersion) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.sdkVersionImcompatibleError.name}`, component, localVersion, targetVersion),
49
+ };
50
+ ErrorMessage.localPkgFileNotExistError = {
51
+ name: "pkgFileNotExistError",
52
+ message: (component) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.localPkgFileNotExistError.name}`, component),
41
53
  };
42
54
  //# sourceMappingURL=errors.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AACb,iEAAmE;AAEnE,MAAa,YAAY;;AAAzB,oCAoEC;AAnEwB,gCAAmB,GAAG;IAC3C,IAAI,EAAE,qBAAqB;IAC3B,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAC7E;CACJ,CAAC;AACqB,mCAAsB,GAAG;IAC9C,IAAI,EAAE,wBAAwB;IAC9B,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAChF;CACJ,CAAC;AAEqB,kCAAqB,GAAG;IAC7C,IAAI,EAAE,+BAA+B;IACrC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,qBAAqB,CAAC,IAAI,EAAE,EAC9E,QAAQ,CACT;CACJ,CAAC;AAEqB,4CAA+B,GAAG;IACvD,IAAI,EAAE,4BAA4B;IAClC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,+BAA+B,CAAC,IAAI,EAAE,EACxF,QAAQ,CACT;CACJ,CAAC;AAEqB,mCAAsB,GAAG;IAC9C,IAAI,EAAE,gCAAgC;IACtC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAC/E,QAAQ,CACT;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,CAAC,QAAgB,EAAE,MAAc,EAAE,EAAE,CAC5C,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,EACnE,QAAQ,EACR,MAAM,CACP;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,CACnF;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,CACnF;CACJ,CAAC"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AACb,iEAAmE;AACnE,MAAa,YAAY;;AAAzB,oCAsFC;AArFwB,gCAAmB,GAAG;IAC3C,IAAI,EAAE,qBAAqB;IAC3B,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;CACpF,CAAC;AACqB,mCAAsB,GAAG;IAC9C,IAAI,EAAE,wBAAwB;IAC9B,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CACvB,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC;CAC5F,CAAC;AAEqB,kCAAqB,GAAG;IAC7C,IAAI,EAAE,+BAA+B;IACrC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,qBAAqB,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC;CAChG,CAAC;AAEqB,4CAA+B,GAAG;IACvD,IAAI,EAAE,4BAA4B;IAClC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,+BAA+B,CAAC,IAAI,EAAE,EACzE,QAAQ,CACT;CACJ,CAAC;AAEqB,mCAAsB,GAAG;IAC9C,IAAI,EAAE,gCAAgC;IACtC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAChE,QAAQ,CACT;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,CAAC,QAAgB,EAAE,MAAc,EAAE,EAAE,CAC5C,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,EACnE,QAAQ,EACR,MAAM,CACP;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;CAC1F,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAAC,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;CAC1F,CAAC;AAEqB,qCAAwB,GAAG;IAChD,IAAI,EAAE,uBAAuB;IAC7B,OAAO,EAAE,CAAC,MAAc,EAAE,EAAE,CAC1B,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,wBAAwB,CAAC,IAAI,EAAE,EAClE,MAAM,CACP;CACJ,CAAC;AAEqB,wCAA2B,GAAG;IACnD,IAAI,EAAE,6BAA6B;IACnC,OAAO,EAAE,CAAC,SAAiB,EAAE,YAAoB,EAAE,aAAqB,EAAE,EAAE,CAC1E,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,2BAA2B,CAAC,IAAI,EAAE,EACrE,SAAS,EACT,YAAY,EACZ,aAAa,CACd;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,sBAAsB;IAC5B,OAAO,EAAE,CAAC,SAAiB,EAAE,EAAE,CAC7B,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,EACnE,SAAS,CACV;CACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,MAAM,EACN,IAAI,EACJ,eAAe,EAEf,EAAE,EAEF,IAAI,EAEJ,aAAa,EAEd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAG7D,qBACa,oBAAqB,YAAW,cAAc;IACzD,IAAI,SAA+B;IACnC,WAAW,SAA6B;IACxC,gBAAgB,EAAE,gBAAgB,CAA0B;IAE5D,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAItC,uBAAuB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;IAaxB,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;CAU/B"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,MAAM,EACN,IAAI,EACJ,eAAe,EAEf,EAAE,EAEF,IAAI,EAEJ,aAAa,EAEd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAG7D,qBACa,oBAAqB,YAAW,cAAc;IACzD,IAAI,SAA+B;IACnC,WAAW,SAA6B;IACxC,gBAAgB,EAAE,gBAAgB,CAA0B;IAE5D,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAItC,uBAAuB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;IAIxB,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;CAU/B"}
@@ -4,7 +4,6 @@
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.ApiConnectorPluginV2 = void 0;
6
6
  const tslib_1 = require("tslib");
7
- const teamsfx_api_1 = require("@microsoft/teamsfx-api");
8
7
  const typedi_1 = require("typedi");
9
8
  const ResourcePluginContainer_1 = require("../../solution/fx-solution/ResourcePluginContainer");
10
9
  const plugin_1 = require("./plugin");
@@ -20,13 +19,7 @@ let ApiConnectorPluginV2 = class ApiConnectorPluginV2 {
20
19
  return true;
21
20
  }
22
21
  async getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider) {
23
- var _a;
24
- const activeResourcePlugins = (_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
25
- if (!activeResourcePlugins) {
26
- throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.NoActivePluginsExistError.name, errors_1.ErrorMessage.NoActivePluginsExistError.message());
27
- }
28
- const res = this.apiConnectorImpl.generateQuestion(activeResourcePlugins);
29
- return teamsfx_api_1.ok(res);
22
+ return await this.apiConnectorImpl.generateQuestion(ctx);
30
23
  }
31
24
  async executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
32
25
  if (func.method != "connectExistingApi") {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AACb,wDAYgC;AAEhC,mCAAiC;AACjC,gGAAuF;AACvF,qCAA4C;AAG5C,qCAA6D;AAC7D,qCAAwC;AAGxC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QACE,SAAI,GAAG,2BAA2B,CAAC;QACnC,gBAAW,GAAG,yBAAyB,CAAC;QACxC,qBAAgB,GAAqB,IAAI,yBAAgB,EAAE,CAAC;IA0C9D,CAAC;IAxCC,QAAQ,CAAC,eAAgC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAClC,GAAY,EACZ,MAAc,EACd,IAAU,EACV,OAAmC,EACnC,aAA4B;;QAE5B,MAAM,qBAAqB,GAAG,MAAC,GAAG,CAAC,cAAc,CAAC,gBAA0C,0CACxF,qBAAqB,CAAC;QAC1B,IAAI,CAAC,qBAAqB,EAAE;YAC1B,MAAM,sBAAa,CAAC,SAAS,CAC3B,qBAAY,CAAC,yBAAyB,CAAC,IAAI,EAC3C,qBAAY,CAAC,yBAAyB,CAAC,OAAO,EAAE,CACjD,CAAC;SACH;QACD,MAAM,GAAG,GAAc,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACrF,OAAO,gBAAE,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAAY,EACZ,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAqB,EACrB,aAA4B;QAE5B,IAAI,IAAI,CAAC,MAAM,IAAI,oBAAoB,EAAE;YACvC,MAAM,sBAAa,CAAC,WAAW,CAC7B,qBAAY,CAAC,sBAAsB,CAAC,IAAI,EACxC,qBAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CACzD,CAAC;SACH;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;CACF,CAAA;AA7CY,oBAAoB;IADhC,gBAAO,CAAC,2CAAiB,CAAC,kBAAkB,CAAC;GACjC,oBAAoB,CA6ChC;AA7CY,oDAAoB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAeb,mCAAiC;AACjC,gGAAuF;AACvF,qCAA4C;AAG5C,qCAA6D;AAC7D,qCAAwC;AAGxC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QACE,SAAI,GAAG,2BAA2B,CAAC;QACnC,gBAAW,GAAG,yBAAyB,CAAC;QACxC,qBAAgB,GAAqB,IAAI,yBAAgB,EAAE,CAAC;IAiC9D,CAAC;IA/BC,QAAQ,CAAC,eAAgC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAClC,GAAY,EACZ,MAAc,EACd,IAAU,EACV,OAAmC,EACnC,aAA4B;QAE5B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAAY,EACZ,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAqB,EACrB,aAA4B;QAE5B,IAAI,IAAI,CAAC,MAAM,IAAI,oBAAoB,EAAE;YACvC,MAAM,sBAAa,CAAC,WAAW,CAC7B,qBAAY,CAAC,sBAAsB,CAAC,IAAI,EACxC,qBAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CACzD,CAAC;SACH;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;CACF,CAAA;AApCY,oBAAoB;IADhC,gBAAO,CAAC,2CAAiB,CAAC,kBAAkB,CAAC;GACjC,oBAAoB,CAoChC;AApCY,oDAAoB"}
@@ -1,11 +1,20 @@
1
1
  import { Inputs, QTreeNode } from "@microsoft/teamsfx-api";
2
2
  import { Context } from "@microsoft/teamsfx-api/build/v2";
3
- import { ApiConnectorResult } from "./result";
3
+ import { ApiConnectorResult, QesutionResult } from "./result";
4
4
  export declare class ApiConnectorImpl {
5
5
  scaffold(ctx: Context, inputs: Inputs): Promise<ApiConnectorResult>;
6
+ private scaffoldInComponent;
7
+ private backupExistingFiles;
8
+ private removeSampleFilesWhenRestore;
9
+ private getAuthConfigFromInputs;
6
10
  private getUserDataFromInputs;
7
11
  private scaffoldEnvFileToComponent;
8
12
  private scaffoldSampleCodeToComponent;
9
- generateQuestion(activePlugins: string[]): QTreeNode;
13
+ private addSDKDependency;
14
+ private getNotificationMsg;
15
+ generateQuestion(ctx: Context): Promise<QesutionResult>;
16
+ buildAuthTypeQuestion(ctx: Context): QTreeNode;
17
+ buildBasicAuthQuestion(): QTreeNode;
18
+ buildAADAuthQuestion(ctx: Context): QTreeNode;
10
19
  }
11
20
  //# sourceMappingURL=plugin.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAG1D,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAkB7D,qBAAa,gBAAgB;IACd,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAmBhF,OAAO,CAAC,qBAAqB;YAWf,0BAA0B;YAW1B,6BAA6B;IAWpC,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,SAAS;CAsD5D"}
1
+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,MAAM,EACN,SAAS,EAIV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAU1D,OAAO,EAAE,kBAAkB,EAAiB,cAAc,EAAE,MAAM,UAAU,CAAC;AA0B7E,qBAAa,gBAAgB;IACd,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAmElE,mBAAmB;YAWnB,mBAAmB;YAgBnB,4BAA4B;IAW1C,OAAO,CAAC,uBAAuB;IAkC/B,OAAO,CAAC,qBAAqB;YAiBf,0BAA0B;YAW1B,6BAA6B;YAW7B,gBAAgB;IAQ9B,OAAO,CAAC,kBAAkB;IAiCb,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;IAqD7D,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS;IAmB9C,sBAAsB,IAAI,SAAS;IAMnC,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS;CAsBrD"}
@@ -3,37 +3,121 @@
3
3
  "use strict";
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.ApiConnectorImpl = void 0;
6
+ const tslib_1 = require("tslib");
7
+ const path = tslib_1.__importStar(require("path"));
8
+ const fs = tslib_1.__importStar(require("fs-extra"));
6
9
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
7
- const constants_1 = require("./constants");
10
+ const utils_1 = require("./utils");
8
11
  const result_1 = require("./result");
12
+ const constants_1 = require("./constants");
9
13
  const envHandler_1 = require("./envHandler");
10
14
  const errors_1 = require("./errors");
11
15
  const constants_2 = require("../../../common/constants");
12
16
  const questions_1 = require("./questions");
13
17
  const localizeUtils_1 = require("../../../common/localizeUtils");
14
18
  const sampleHandler_1 = require("./sampleHandler");
19
+ const common_1 = require("../../../common");
20
+ const utils_2 = require("../../solution/fx-solution/v2/utils");
21
+ const depsHandler_1 = require("./depsHandler");
15
22
  class ApiConnectorImpl {
16
23
  async scaffold(ctx, inputs) {
24
+ var _a;
17
25
  if (!inputs.projectPath) {
18
26
  throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.InvalidProjectError.name, errors_1.ErrorMessage.InvalidProjectError.message());
19
27
  }
20
28
  const projectPath = inputs.projectPath;
21
29
  const languageType = ctx.projectSetting.programmingLanguage;
22
30
  const config = this.getUserDataFromInputs(inputs);
23
- for (const componentItem of config.ComponentPath) {
24
- await this.scaffoldEnvFileToComponent(projectPath, config, componentItem);
25
- await this.scaffoldSampleCodeToComponent(projectPath, config, componentItem, languageType);
26
- // await this.addSDKDependency(ComponentPath);
31
+ // backup relative files.
32
+ const backupFolderName = utils_1.generateTempFolder();
33
+ await Promise.all(config.ComponentPath.map(async (component) => {
34
+ await this.backupExistingFiles(path.join(projectPath, component), backupFolderName);
35
+ }));
36
+ try {
37
+ await Promise.all(config.ComponentPath.map(async (component) => {
38
+ await this.scaffoldInComponent(projectPath, component, config, languageType);
39
+ }));
40
+ const msg = this.getNotificationMsg(config, languageType);
41
+ (_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.showMessage("info", msg, false, "OK", utils_1.Notification.READ_MORE).then((result) => {
42
+ var _a;
43
+ const userSelected = result.isOk() ? result.value : undefined;
44
+ if (userSelected === utils_1.Notification.READ_MORE) {
45
+ (_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.openUrl(utils_1.Notification.READ_MORE_URL);
46
+ }
47
+ });
48
+ }
49
+ catch (err) {
50
+ await Promise.all(config.ComponentPath.map(async (component) => {
51
+ await fs.copy(path.join(projectPath, component, backupFolderName), path.join(projectPath, component), { overwrite: true });
52
+ await this.removeSampleFilesWhenRestore(projectPath, component, config.APIName, languageType);
53
+ }));
54
+ if (err instanceof teamsfx_api_1.SystemError || err instanceof teamsfx_api_1.UserError) {
55
+ throw err;
56
+ }
57
+ else {
58
+ throw result_1.ResultFactory.SystemError(errors_1.ErrorMessage.generateApiConFilesError.name, errors_1.ErrorMessage.generateApiConFilesError.message(err.message));
59
+ }
60
+ }
61
+ finally {
62
+ await Promise.all(config.ComponentPath.map(async (component) => {
63
+ await utils_1.removeFileIfExist(path.join(projectPath, component, backupFolderName));
64
+ }));
27
65
  }
28
66
  return result_1.ResultFactory.Success();
29
67
  }
68
+ async scaffoldInComponent(projectPath, componentItem, config, languageType) {
69
+ await this.scaffoldEnvFileToComponent(projectPath, config, componentItem);
70
+ await this.scaffoldSampleCodeToComponent(projectPath, config, componentItem, languageType);
71
+ await this.addSDKDependency(projectPath, componentItem);
72
+ }
73
+ async backupExistingFiles(folderPath, backupFolder) {
74
+ await fs.ensureDir(path.join(folderPath, backupFolder));
75
+ await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.envFileName), path.join(folderPath, backupFolder, constants_1.Constants.envFileName));
76
+ await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.pkgJsonFile), path.join(folderPath, backupFolder, constants_1.Constants.pkgJsonFile));
77
+ await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.pkgLockFile), path.join(folderPath, backupFolder, constants_1.Constants.pkgLockFile));
78
+ }
79
+ async removeSampleFilesWhenRestore(projectPath, component, apiName, languageType) {
80
+ const apiFileName = utils_1.getSampleFileName(apiName, languageType);
81
+ const sampleFilePath = path.join(projectPath, component, apiFileName);
82
+ await utils_1.removeFileIfExist(sampleFilePath);
83
+ }
84
+ getAuthConfigFromInputs(inputs) {
85
+ let config;
86
+ if (inputs[constants_1.Constants.questionKey.apiType] === constants_1.AuthType.BASIC) {
87
+ utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.apiUserName);
88
+ config = {
89
+ AuthType: constants_1.AuthType.BASIC,
90
+ UserName: inputs[constants_1.Constants.questionKey.apiUserName],
91
+ };
92
+ }
93
+ else if (inputs[constants_1.Constants.questionKey.apiType] === constants_1.AuthType.AAD) {
94
+ const AADConfig = {
95
+ AuthType: constants_1.AuthType.AAD,
96
+ };
97
+ if (inputs[constants_1.Constants.questionKey.apiAppType] === questions_1.reuseAppOption.id) {
98
+ AADConfig.ReuseTeamsApp = true;
99
+ }
100
+ else {
101
+ AADConfig.ReuseTeamsApp = false;
102
+ utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.apiAppTenentId, constants_1.Constants.questionKey.apiAppTenentId);
103
+ AADConfig.TenantId = inputs[constants_1.Constants.questionKey.apiAppTenentId];
104
+ AADConfig.AppId = inputs[constants_1.Constants.questionKey.apiAppId];
105
+ }
106
+ config = AADConfig;
107
+ }
108
+ else {
109
+ throw result_1.ResultFactory.SystemError(errors_1.ErrorMessage.ApiConnectorInputError.name, errors_1.ErrorMessage.ApiConnectorInputError.message(inputs[constants_1.Constants.questionKey.apiAppType]));
110
+ }
111
+ return config;
112
+ }
30
113
  getUserDataFromInputs(inputs) {
114
+ utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.componentsSelect, constants_1.Constants.questionKey.apiName, constants_1.Constants.questionKey.endpoint);
115
+ const authConfig = this.getAuthConfigFromInputs(inputs);
31
116
  const config = {
32
117
  ComponentPath: inputs[constants_1.Constants.questionKey.componentsSelect],
33
118
  APIName: inputs[constants_1.Constants.questionKey.apiName],
34
- ApiAuthType: inputs[constants_1.Constants.questionKey.apiType],
119
+ AuthConfig: authConfig,
35
120
  EndPoint: inputs[constants_1.Constants.questionKey.endpoint],
36
- ApiUserName: inputs[constants_1.Constants.questionKey.apiUserName],
37
121
  };
38
122
  return config;
39
123
  }
@@ -48,7 +132,49 @@ class ApiConnectorImpl {
48
132
  await sampleHandler.generateSampleCode(config);
49
133
  return result_1.ResultFactory.Success();
50
134
  }
51
- generateQuestion(activePlugins) {
135
+ async addSDKDependency(projectPath, component) {
136
+ const depsHandler = new depsHandler_1.DepsHandler(projectPath, component);
137
+ return await depsHandler.addPkgDeps();
138
+ }
139
+ getNotificationMsg(config, languageType) {
140
+ const authType = config.AuthConfig.AuthType;
141
+ const apiName = config.APIName;
142
+ let retMsg = utils_1.Notification.GetBasiString(apiName, config.ComponentPath, languageType);
143
+ switch (authType) {
144
+ case constants_1.AuthType.BASIC: {
145
+ retMsg += utils_1.Notification.GetBasicAuthString(apiName, config.ComponentPath);
146
+ break;
147
+ }
148
+ case constants_1.AuthType.APIKEY: {
149
+ retMsg += utils_1.Notification.GetApiKeyAuthString(apiName, config.ComponentPath);
150
+ break;
151
+ }
152
+ case constants_1.AuthType.AAD: {
153
+ if (config.ReuseTeamsApp) {
154
+ retMsg += utils_1.Notification.GetReuseAADAuthString(apiName);
155
+ }
156
+ else {
157
+ retMsg += utils_1.Notification.GetGenAADAuthString(apiName, config.ComponentPath);
158
+ }
159
+ break;
160
+ }
161
+ case constants_1.AuthType.CERT: {
162
+ retMsg += utils_1.Notification.GetCertAuthString(apiName, config.ComponentPath);
163
+ break;
164
+ }
165
+ case constants_1.AuthType.CUSTOM: {
166
+ retMsg = utils_1.Notification.GetCustomAuthString(apiName, config.ComponentPath, languageType);
167
+ break;
168
+ }
169
+ }
170
+ return retMsg;
171
+ }
172
+ async generateQuestion(ctx) {
173
+ var _a;
174
+ const activePlugins = (_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
175
+ if (!activePlugins) {
176
+ throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.NoActivePluginsExistError.name, errors_1.ErrorMessage.NoActivePluginsExistError.message());
177
+ }
52
178
  const options = [];
53
179
  if (activePlugins.includes(constants_2.ResourcePlugins.Bot)) {
54
180
  options.push(questions_1.botOption);
@@ -73,7 +199,20 @@ class ApiConnectorImpl {
73
199
  return undefined;
74
200
  },
75
201
  },
202
+ placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichService.placeholder"), // Use the placeholder to display some description
76
203
  });
204
+ const apiNameQuestion = new questions_1.ApiNameQuestion(ctx);
205
+ const whichAuthType = this.buildAuthTypeQuestion(ctx);
206
+ const question = new teamsfx_api_1.QTreeNode({
207
+ type: "group",
208
+ });
209
+ question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiEndpointQuestion));
210
+ question.addChild(whichComponent);
211
+ question.addChild(new teamsfx_api_1.QTreeNode(apiNameQuestion.getQuestion()));
212
+ question.addChild(whichAuthType);
213
+ return teamsfx_api_1.ok(question);
214
+ }
215
+ buildAuthTypeQuestion(ctx) {
77
216
  const whichAuthType = new teamsfx_api_1.QTreeNode({
78
217
  name: constants_1.Constants.questionKey.apiType,
79
218
  type: "singleSelect",
@@ -85,16 +224,39 @@ class ApiConnectorImpl {
85
224
  questions_1.ImplementMyselfOption,
86
225
  ],
87
226
  title: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichAuthType.title"),
227
+ placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichAuthType.placeholder"), // Use the placeholder to display some description
88
228
  });
89
- const question = new teamsfx_api_1.QTreeNode({
90
- type: "group",
91
- });
92
- question.addChild(whichComponent);
93
- question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiNameQuestion));
94
- question.addChild(whichAuthType);
95
- question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiEndpointQuestion));
96
- question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiLoginUserNameQuestion));
97
- return question;
229
+ whichAuthType.addChild(this.buildAADAuthQuestion(ctx));
230
+ whichAuthType.addChild(this.buildBasicAuthQuestion());
231
+ return whichAuthType;
232
+ }
233
+ buildBasicAuthQuestion() {
234
+ const node = new teamsfx_api_1.QTreeNode(questions_1.basicAuthUsernameQuestion);
235
+ node.condition = { equals: questions_1.BasicAuthOption.id };
236
+ return node;
237
+ }
238
+ buildAADAuthQuestion(ctx) {
239
+ let node;
240
+ const solutionSettings = utils_2.getAzureSolutionSettings(ctx);
241
+ if (common_1.isAADEnabled(solutionSettings)) {
242
+ node = new teamsfx_api_1.QTreeNode({
243
+ name: constants_1.Constants.questionKey.apiAppType,
244
+ type: "singleSelect",
245
+ staticOptions: [questions_1.reuseAppOption, questions_1.anotherAppOption],
246
+ title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestion.appType.title"),
247
+ });
248
+ node.condition = { equals: questions_1.AADAuthOption.id };
249
+ const tenentQuestionNode = new teamsfx_api_1.QTreeNode(questions_1.appTenantIdQuestion);
250
+ tenentQuestionNode.condition = { equals: questions_1.anotherAppOption.id };
251
+ tenentQuestionNode.addChild(new teamsfx_api_1.QTreeNode(questions_1.appIdQuestion));
252
+ node.addChild(tenentQuestionNode);
253
+ }
254
+ else {
255
+ node = new teamsfx_api_1.QTreeNode(questions_1.appTenantIdQuestion);
256
+ node.condition = { equals: questions_1.AADAuthOption.id };
257
+ node.addChild(new teamsfx_api_1.QTreeNode(questions_1.appIdQuestion));
258
+ }
259
+ return node;
98
260
  }
99
261
  }
100
262
  exports.ApiConnectorImpl = ApiConnectorImpl;
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,28 @@
1
- import { TextInputQuestion, OptionItem } from "@microsoft/teamsfx-api";
2
- export declare const apiNameQuestion: TextInputQuestion;
1
+ import { LogProvider, OptionItem, PluginContext, TelemetryReporter, Question, ValidationSchema, TextInputQuestion } from "@microsoft/teamsfx-api";
2
+ import { Context } from "@microsoft/teamsfx-api/build/v2";
3
+ export interface IQuestionService {
4
+ condition?(parentAnswerPath: string): {
5
+ target?: string;
6
+ } & ValidationSchema;
7
+ getQuestion(ctx: PluginContext): Question;
8
+ }
9
+ export declare class BaseQuestionService {
10
+ protected readonly logger: LogProvider | undefined;
11
+ protected readonly telemetryReporter: TelemetryReporter | undefined;
12
+ constructor(telemetryReporter?: TelemetryReporter, logger?: LogProvider);
13
+ }
14
+ export declare class ApiNameQuestion extends BaseQuestionService implements IQuestionService {
15
+ protected readonly ctx: Context | undefined;
16
+ constructor(ctx?: Context, telemetryReporter?: TelemetryReporter, logger?: LogProvider);
17
+ getQuestion(): TextInputQuestion;
18
+ }
3
19
  export declare const apiEndpointQuestion: TextInputQuestion;
4
20
  export declare const apiTypeQuestion: TextInputQuestion;
5
- export declare const apiLoginUserNameQuestion: TextInputQuestion;
21
+ export declare const basicAuthUsernameQuestion: TextInputQuestion;
22
+ export declare const appTenantIdQuestion: TextInputQuestion;
23
+ export declare const appIdQuestion: TextInputQuestion;
24
+ export declare const reuseAppOption: OptionItem;
25
+ export declare const anotherAppOption: OptionItem;
6
26
  export declare const botOption: OptionItem;
7
27
  export declare const functionOption: OptionItem;
8
28
  export declare const BasicAuthOption: OptionItem;
@@ -1 +1 @@
1
- {"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/questions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIvE,eAAO,MAAM,eAAe,EAAE,iBAI7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,iBAIjC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,iBAI7B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAItC,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,UAIvB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAI5B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAI7B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAI5B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAI3B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAInC,CAAC"}
1
+ {"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/questions.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,WAAW,EACX,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAI1D,MAAM,WAAW,gBAAgB;IAE/B,SAAS,CAAC,CAAC,gBAAgB,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,gBAAgB,CAAC;IAE7E,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,QAAQ,CAAC;CAC3C;AAED,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;gBAExD,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;CAIxE;AACD,qBAAa,eAAgB,SAAQ,mBAAoB,YAAW,gBAAgB;IAClF,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,CAAC;gBAChC,GAAG,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;IAK/E,WAAW,IAAI,iBAAiB;CAqBxC;AAED,eAAO,MAAM,mBAAmB,EAAE,iBAKjC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,iBAI7B,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,iBAOvC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,iBAKjC,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,iBAK3B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAG5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAG9B,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,UAIvB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAI5B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAI7B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UAI5B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAI3B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAInC,CAAC"}