@microsoft/teamsfx-core 1.1.2 → 1.1.3-alpha.12edbb86.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 (775) hide show
  1. package/build/common/armInterface.d.ts +1 -1
  2. package/build/common/armInterface.d.ts.map +1 -1
  3. package/build/common/constants.d.ts +3 -2
  4. package/build/common/constants.d.ts.map +1 -1
  5. package/build/common/constants.js +3 -2
  6. package/build/common/constants.js.map +1 -1
  7. package/build/common/deps-checker/checkerFactory.d.ts +8 -0
  8. package/build/common/deps-checker/checkerFactory.d.ts.map +1 -0
  9. package/build/common/deps-checker/checkerFactory.js +32 -0
  10. package/build/common/deps-checker/checkerFactory.js.map +1 -0
  11. package/build/common/deps-checker/constant/helpLink.d.ts +11 -0
  12. package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -0
  13. package/build/common/deps-checker/constant/helpLink.js +16 -0
  14. package/build/common/deps-checker/constant/helpLink.js.map +1 -0
  15. package/build/common/deps-checker/constant/index.d.ts +4 -0
  16. package/build/common/deps-checker/constant/index.d.ts.map +1 -0
  17. package/build/common/deps-checker/constant/index.js +9 -0
  18. package/build/common/deps-checker/constant/index.js.map +1 -0
  19. package/build/common/deps-checker/constant/message.d.ts +29 -0
  20. package/build/common/deps-checker/constant/message.d.ts.map +1 -0
  21. package/build/common/deps-checker/constant/message.js +57 -0
  22. package/build/common/deps-checker/constant/message.js.map +1 -0
  23. package/build/common/deps-checker/constant/telemetry.d.ts +43 -0
  24. package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -0
  25. package/build/common/deps-checker/constant/telemetry.js +51 -0
  26. package/build/common/deps-checker/constant/telemetry.js.map +1 -0
  27. package/build/common/deps-checker/depsChecker.d.ts +25 -0
  28. package/build/common/deps-checker/depsChecker.d.ts.map +1 -0
  29. package/build/common/deps-checker/depsChecker.js +13 -0
  30. package/build/common/deps-checker/depsChecker.js.map +1 -0
  31. package/build/common/deps-checker/depsError.d.ts +17 -0
  32. package/build/common/deps-checker/depsError.d.ts.map +1 -0
  33. package/build/common/deps-checker/depsError.js +42 -0
  34. package/build/common/deps-checker/depsError.js.map +1 -0
  35. package/build/common/deps-checker/depsLogger.d.ts +11 -0
  36. package/build/common/deps-checker/depsLogger.d.ts.map +1 -0
  37. package/build/common/deps-checker/depsLogger.js +5 -0
  38. package/build/common/deps-checker/depsLogger.js.map +1 -0
  39. package/build/common/deps-checker/depsManager.d.ts +36 -0
  40. package/build/common/deps-checker/depsManager.d.ts.map +1 -0
  41. package/build/common/deps-checker/depsManager.js +80 -0
  42. package/build/common/deps-checker/depsManager.js.map +1 -0
  43. package/build/common/deps-checker/depsTelemetry.d.ts +10 -0
  44. package/build/common/deps-checker/depsTelemetry.d.ts.map +1 -0
  45. package/build/common/deps-checker/depsTelemetry.js +5 -0
  46. package/build/common/deps-checker/depsTelemetry.js.map +1 -0
  47. package/build/common/deps-checker/index.d.ts +9 -0
  48. package/build/common/deps-checker/index.d.ts.map +1 -0
  49. package/build/common/deps-checker/index.js +14 -0
  50. package/build/common/deps-checker/index.js.map +1 -0
  51. package/build/common/deps-checker/internal/dotnetChecker.d.ts +50 -0
  52. package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -0
  53. package/build/common/deps-checker/internal/dotnetChecker.js +406 -0
  54. package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -0
  55. package/build/common/deps-checker/internal/funcToolChecker.d.ts +40 -0
  56. package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -0
  57. package/build/common/deps-checker/internal/funcToolChecker.js +280 -0
  58. package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -0
  59. package/build/common/deps-checker/internal/ngrokChecker.d.ts +28 -0
  60. package/build/common/deps-checker/internal/ngrokChecker.d.ts.map +1 -0
  61. package/build/common/deps-checker/internal/ngrokChecker.js +181 -0
  62. package/build/common/deps-checker/internal/ngrokChecker.js.map +1 -0
  63. package/build/common/deps-checker/internal/nodeChecker.d.ts +40 -0
  64. package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -0
  65. package/build/common/deps-checker/internal/nodeChecker.js +144 -0
  66. package/build/common/deps-checker/internal/nodeChecker.js.map +1 -0
  67. package/build/common/deps-checker/util/cpUtils.d.ts +24 -0
  68. package/build/common/deps-checker/util/cpUtils.d.ts.map +1 -0
  69. package/build/common/deps-checker/util/cpUtils.js +99 -0
  70. package/build/common/deps-checker/util/cpUtils.js.map +1 -0
  71. package/build/common/deps-checker/util/extensionInstaller.d.ts +3 -0
  72. package/build/common/deps-checker/util/extensionInstaller.d.ts.map +1 -0
  73. package/build/common/deps-checker/util/extensionInstaller.js +47 -0
  74. package/build/common/deps-checker/util/extensionInstaller.js.map +1 -0
  75. package/build/common/deps-checker/util/index.d.ts +5 -0
  76. package/build/common/deps-checker/util/index.d.ts.map +1 -0
  77. package/build/common/deps-checker/util/index.js +10 -0
  78. package/build/common/deps-checker/util/index.js.map +1 -0
  79. package/build/common/deps-checker/util/progressIndicator.d.ts +3 -0
  80. package/build/common/deps-checker/util/progressIndicator.d.ts.map +1 -0
  81. package/build/common/deps-checker/util/progressIndicator.js +18 -0
  82. package/build/common/deps-checker/util/progressIndicator.js.map +1 -0
  83. package/build/common/deps-checker/util/system.d.ts +5 -0
  84. package/build/common/deps-checker/util/system.d.ts.map +1 -0
  85. package/build/common/deps-checker/util/system.js +24 -0
  86. package/build/common/deps-checker/util/system.js.map +1 -0
  87. package/build/common/index.d.ts +4 -0
  88. package/build/common/index.d.ts.map +1 -1
  89. package/build/common/index.js +4 -0
  90. package/build/common/index.js.map +1 -1
  91. package/build/common/local/constants.d.ts +115 -0
  92. package/build/common/local/constants.d.ts.map +1 -0
  93. package/build/common/local/constants.js +122 -0
  94. package/build/common/local/constants.js.map +1 -0
  95. package/build/common/local/depsAdapter.d.ts +27 -0
  96. package/build/common/local/depsAdapter.d.ts.map +1 -0
  97. package/build/common/local/depsAdapter.js +86 -0
  98. package/build/common/local/depsAdapter.js.map +1 -0
  99. package/build/common/local/localEnvManager.d.ts +24 -0
  100. package/build/common/local/localEnvManager.d.ts.map +1 -0
  101. package/build/common/local/localEnvManager.js +113 -0
  102. package/build/common/local/localEnvManager.js.map +1 -0
  103. package/build/{plugins/resource/localdebug/localEnvMulti.d.ts → common/local/localEnvProvider.d.ts} +5 -4
  104. package/build/common/local/localEnvProvider.d.ts.map +1 -0
  105. package/build/{plugins/resource/localdebug/localEnvMulti.js → common/local/localEnvProvider.js} +19 -15
  106. package/build/common/local/localEnvProvider.js.map +1 -0
  107. package/build/common/local/localSettingsHelper.d.ts +3 -0
  108. package/build/common/local/localSettingsHelper.d.ts.map +1 -0
  109. package/build/common/local/localSettingsHelper.js +133 -0
  110. package/build/common/local/localSettingsHelper.js.map +1 -0
  111. package/build/common/local/npmLogHelper.d.ts +11 -0
  112. package/build/common/local/npmLogHelper.d.ts.map +1 -0
  113. package/build/common/local/npmLogHelper.js +82 -0
  114. package/build/common/local/npmLogHelper.js.map +1 -0
  115. package/build/common/local/packageJsonHelper.d.ts +4 -0
  116. package/build/common/local/packageJsonHelper.d.ts.map +1 -0
  117. package/build/common/local/packageJsonHelper.js +36 -0
  118. package/build/common/local/packageJsonHelper.js.map +1 -0
  119. package/build/common/local/portChecker.d.ts +3 -0
  120. package/build/common/local/portChecker.d.ts.map +1 -0
  121. package/build/common/local/portChecker.js +104 -0
  122. package/build/common/local/portChecker.js.map +1 -0
  123. package/build/common/local/projectSettingsHelper.d.ts +11 -0
  124. package/build/common/local/projectSettingsHelper.d.ts.map +1 -0
  125. package/build/common/local/projectSettingsHelper.js +37 -0
  126. package/build/common/local/projectSettingsHelper.js.map +1 -0
  127. package/build/common/local/taskDefinition.d.ts +37 -0
  128. package/build/common/local/taskDefinition.d.ts.map +1 -0
  129. package/build/common/local/taskDefinition.js +231 -0
  130. package/build/common/local/taskDefinition.js.map +1 -0
  131. package/build/common/localSettingsProvider.d.ts +3 -3
  132. package/build/common/localSettingsProvider.d.ts.map +1 -1
  133. package/build/common/localSettingsProvider.js +12 -10
  134. package/build/common/localSettingsProvider.js.map +1 -1
  135. package/build/common/samples-config.json +14 -0
  136. package/build/common/templatesActions.d.ts +2 -0
  137. package/build/common/templatesActions.d.ts.map +1 -1
  138. package/build/common/templatesActions.js +33 -1
  139. package/build/common/templatesActions.js.map +1 -1
  140. package/build/common/tools.d.ts +11 -5
  141. package/build/common/tools.d.ts.map +1 -1
  142. package/build/common/tools.js +35 -85
  143. package/build/common/tools.js.map +1 -1
  144. package/build/core/SolutionPluginContainer.d.ts +2 -1
  145. package/build/core/SolutionPluginContainer.d.ts.map +1 -1
  146. package/build/core/SolutionPluginContainer.js +9 -1
  147. package/build/core/SolutionPluginContainer.js.map +1 -1
  148. package/build/core/dependencyChecker.d.ts +1 -0
  149. package/build/core/dependencyChecker.d.ts.map +1 -0
  150. package/build/core/dependencyChecker.js +2 -0
  151. package/build/core/dependencyChecker.js.map +1 -0
  152. package/build/core/downloadSample.d.ts +9 -0
  153. package/build/core/downloadSample.d.ts.map +1 -0
  154. package/build/core/downloadSample.js +150 -0
  155. package/build/core/downloadSample.js.map +1 -0
  156. package/build/core/environment.d.ts +5 -5
  157. package/build/core/environment.d.ts.map +1 -1
  158. package/build/core/environment.js +40 -25
  159. package/build/core/environment.js.map +1 -1
  160. package/build/core/error.d.ts +2 -1
  161. package/build/core/error.d.ts.map +1 -1
  162. package/build/core/error.js +7 -3
  163. package/build/core/error.js.map +1 -1
  164. package/build/core/index.d.ts +54 -15
  165. package/build/core/index.d.ts.map +1 -1
  166. package/build/core/index.js +693 -575
  167. package/build/core/index.js.map +1 -1
  168. package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
  169. package/build/core/middleware/concurrentLocker.js +23 -12
  170. package/build/core/middleware/concurrentLocker.js.map +1 -1
  171. package/build/core/middleware/envInfoLoader.d.ts +5 -1
  172. package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
  173. package/build/core/middleware/envInfoLoader.js +52 -46
  174. package/build/core/middleware/envInfoLoader.js.map +1 -1
  175. package/build/core/middleware/envInfoLoaderV3.d.ts +3 -0
  176. package/build/core/middleware/envInfoLoaderV3.d.ts.map +1 -0
  177. package/build/core/middleware/envInfoLoaderV3.js +64 -0
  178. package/build/core/middleware/envInfoLoaderV3.js.map +1 -0
  179. package/build/core/middleware/envInfoWriter.js +14 -31
  180. package/build/core/middleware/envInfoWriter.js.map +1 -1
  181. package/build/core/middleware/envInfoWriterV3.d.ts +6 -0
  182. package/build/core/middleware/envInfoWriterV3.d.ts.map +1 -0
  183. package/build/core/middleware/envInfoWriterV3.js +63 -0
  184. package/build/core/middleware/envInfoWriterV3.js.map +1 -0
  185. package/build/core/middleware/errorHandler.d.ts.map +1 -1
  186. package/build/core/middleware/errorHandler.js +3 -5
  187. package/build/core/middleware/errorHandler.js.map +1 -1
  188. package/build/core/middleware/localSettingsLoader.d.ts.map +1 -1
  189. package/build/core/middleware/localSettingsLoader.js +1 -2
  190. package/build/core/middleware/localSettingsLoader.js.map +1 -1
  191. package/build/core/middleware/localSettingsWriter.d.ts.map +1 -1
  192. package/build/core/middleware/localSettingsWriter.js +7 -18
  193. package/build/core/middleware/localSettingsWriter.js.map +1 -1
  194. package/build/core/middleware/projectMigrator.d.ts.map +1 -1
  195. package/build/core/middleware/projectMigrator.js +25 -57
  196. package/build/core/middleware/projectMigrator.js.map +1 -1
  197. package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
  198. package/build/core/middleware/projectSettingsLoader.js +3 -6
  199. package/build/core/middleware/projectSettingsLoader.js.map +1 -1
  200. package/build/core/middleware/projectSettingsLoaderV3.d.ts +4 -0
  201. package/build/core/middleware/projectSettingsLoaderV3.d.ts.map +1 -0
  202. package/build/core/middleware/projectSettingsLoaderV3.js +49 -0
  203. package/build/core/middleware/projectSettingsLoaderV3.js.map +1 -0
  204. package/build/core/middleware/projectSettingsWriter.d.ts.map +1 -1
  205. package/build/core/middleware/projectSettingsWriter.js +5 -12
  206. package/build/core/middleware/projectSettingsWriter.js.map +1 -1
  207. package/build/core/middleware/projectUpgrader.d.ts.map +1 -1
  208. package/build/core/middleware/projectUpgrader.js +7 -15
  209. package/build/core/middleware/projectUpgrader.js.map +1 -1
  210. package/build/core/middleware/questionModel.d.ts +14 -1
  211. package/build/core/middleware/questionModel.d.ts.map +1 -1
  212. package/build/core/middleware/questionModel.js +319 -23
  213. package/build/core/middleware/questionModel.js.map +1 -1
  214. package/build/core/middleware/solutionLoader.d.ts +3 -2
  215. package/build/core/middleware/solutionLoader.d.ts.map +1 -1
  216. package/build/core/middleware/solutionLoader.js +21 -23
  217. package/build/core/middleware/solutionLoader.js.map +1 -1
  218. package/build/core/middleware/solutionLoaderV3.d.ts +4 -0
  219. package/build/core/middleware/solutionLoaderV3.d.ts.map +1 -0
  220. package/build/core/middleware/solutionLoaderV3.js +19 -0
  221. package/build/core/middleware/solutionLoaderV3.js.map +1 -0
  222. package/build/core/question.d.ts +9 -1
  223. package/build/core/question.d.ts.map +1 -1
  224. package/build/core/question.js +113 -3
  225. package/build/core/question.js.map +1 -1
  226. package/build/core/tools.d.ts +2 -1
  227. package/build/core/tools.d.ts.map +1 -1
  228. package/build/core/tools.js +19 -10
  229. package/build/core/tools.js.map +1 -1
  230. package/build/plugins/resource/aad/aadAppClient.d.ts +2 -2
  231. package/build/plugins/resource/aad/aadAppClient.d.ts.map +1 -1
  232. package/build/plugins/resource/aad/aadAppClient.js +3 -4
  233. package/build/plugins/resource/aad/aadAppClient.js.map +1 -1
  234. package/build/plugins/resource/aad/interfaces/IAADDefinition.d.ts +4 -0
  235. package/build/plugins/resource/aad/interfaces/IAADDefinition.d.ts.map +1 -1
  236. package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
  237. package/build/plugins/resource/aad/plugin.js +18 -17
  238. package/build/plugins/resource/aad/plugin.js.map +1 -1
  239. package/build/plugins/resource/aad/utils/common.d.ts +2 -0
  240. package/build/plugins/resource/aad/utils/common.d.ts.map +1 -1
  241. package/build/plugins/resource/aad/utils/common.js +10 -0
  242. package/build/plugins/resource/aad/utils/common.js.map +1 -1
  243. package/build/plugins/resource/aad/utils/configs.d.ts +1 -0
  244. package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
  245. package/build/plugins/resource/aad/utils/configs.js +7 -0
  246. package/build/plugins/resource/aad/utils/configs.js.map +1 -1
  247. package/build/plugins/resource/apim/config.d.ts +2 -1
  248. package/build/plugins/resource/apim/config.d.ts.map +1 -1
  249. package/build/plugins/resource/apim/config.js +5 -0
  250. package/build/plugins/resource/apim/config.js.map +1 -1
  251. package/build/plugins/resource/apim/constants.d.ts +1 -0
  252. package/build/plugins/resource/apim/constants.d.ts.map +1 -1
  253. package/build/plugins/resource/apim/constants.js +1 -0
  254. package/build/plugins/resource/apim/constants.js.map +1 -1
  255. package/build/plugins/resource/apim/index.js +2 -2
  256. package/build/plugins/resource/apim/index.js.map +1 -1
  257. package/build/plugins/resource/apim/managers/apimManager.d.ts +2 -2
  258. package/build/plugins/resource/apim/managers/apimManager.d.ts.map +1 -1
  259. package/build/plugins/resource/apim/managers/apimManager.js +26 -20
  260. package/build/plugins/resource/apim/managers/apimManager.js.map +1 -1
  261. package/build/plugins/resource/appstudio/appStudio.d.ts +1 -1
  262. package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
  263. package/build/plugins/resource/appstudio/appStudio.js +106 -85
  264. package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
  265. package/build/plugins/resource/appstudio/constants.d.ts +7 -6
  266. package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
  267. package/build/plugins/resource/appstudio/constants.js +8 -152
  268. package/build/plugins/resource/appstudio/constants.js.map +1 -1
  269. package/build/plugins/resource/appstudio/errors.d.ts +9 -5
  270. package/build/plugins/resource/appstudio/errors.d.ts.map +1 -1
  271. package/build/plugins/resource/appstudio/errors.js +10 -5
  272. package/build/plugins/resource/appstudio/errors.js.map +1 -1
  273. package/build/plugins/resource/appstudio/index.d.ts +37 -1
  274. package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
  275. package/build/plugins/resource/appstudio/index.js +58 -21
  276. package/build/plugins/resource/appstudio/index.js.map +1 -1
  277. package/build/plugins/resource/appstudio/manifestTemplate.d.ts +32 -0
  278. package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -0
  279. package/build/plugins/resource/appstudio/manifestTemplate.js +190 -0
  280. package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -0
  281. package/build/plugins/resource/appstudio/plugin.d.ts +2 -4
  282. package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
  283. package/build/plugins/resource/appstudio/plugin.js +256 -465
  284. package/build/plugins/resource/appstudio/plugin.js.map +1 -1
  285. package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
  286. package/build/plugins/resource/appstudio/utils/telemetry.js +12 -16
  287. package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
  288. package/build/plugins/resource/appstudio/v3/index.d.ts +73 -0
  289. package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -0
  290. package/build/plugins/resource/appstudio/v3/index.js +87 -0
  291. package/build/plugins/resource/appstudio/v3/index.js.map +1 -0
  292. package/build/plugins/resource/bot/index.d.ts.map +1 -1
  293. package/build/plugins/resource/bot/index.js +5 -1
  294. package/build/plugins/resource/bot/index.js.map +1 -1
  295. package/build/plugins/resource/bot/plugin.d.ts +2 -2
  296. package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
  297. package/build/plugins/resource/bot/plugin.js +40 -37
  298. package/build/plugins/resource/bot/plugin.js.map +1 -1
  299. package/build/plugins/resource/frontend/configs.d.ts.map +1 -1
  300. package/build/plugins/resource/frontend/configs.js +3 -9
  301. package/build/plugins/resource/frontend/configs.js.map +1 -1
  302. package/build/plugins/resource/frontend/constants.d.ts +2 -15
  303. package/build/plugins/resource/frontend/constants.d.ts.map +1 -1
  304. package/build/plugins/resource/frontend/constants.js +3 -19
  305. package/build/plugins/resource/frontend/constants.js.map +1 -1
  306. package/build/plugins/resource/frontend/{blazor → dotnet}/constants.d.ts +7 -24
  307. package/build/plugins/resource/frontend/{blazor → dotnet}/constants.d.ts.map +1 -1
  308. package/build/plugins/resource/frontend/dotnet/constants.js +81 -0
  309. package/build/plugins/resource/frontend/{blazor → dotnet}/constants.js.map +1 -1
  310. package/build/plugins/resource/frontend/{blazor → dotnet}/enum.d.ts +1 -1
  311. package/build/plugins/resource/frontend/{blazor → dotnet}/enum.d.ts.map +1 -1
  312. package/build/plugins/resource/frontend/dotnet/enum.js +39 -0
  313. package/build/plugins/resource/frontend/{blazor → dotnet}/enum.js.map +1 -1
  314. package/build/plugins/resource/frontend/{blazor → dotnet}/error-factory.d.ts +0 -0
  315. package/build/plugins/resource/frontend/{blazor → dotnet}/error-factory.d.ts.map +1 -1
  316. package/build/plugins/resource/frontend/{blazor → dotnet}/error-factory.js +3 -3
  317. package/build/plugins/resource/frontend/{blazor → dotnet}/error-factory.js.map +1 -1
  318. package/build/plugins/resource/frontend/{blazor → dotnet}/ops/deploy.d.ts +0 -0
  319. package/build/plugins/resource/frontend/{blazor → dotnet}/ops/deploy.d.ts.map +1 -1
  320. package/build/plugins/resource/frontend/{blazor → dotnet}/ops/deploy.js +2 -2
  321. package/build/plugins/resource/frontend/{blazor → dotnet}/ops/deploy.js.map +1 -1
  322. package/build/plugins/resource/frontend/dotnet/plugin.d.ts +26 -0
  323. package/build/plugins/resource/frontend/dotnet/plugin.d.ts.map +1 -0
  324. package/build/plugins/resource/frontend/dotnet/plugin.js +69 -0
  325. package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -0
  326. package/build/plugins/resource/frontend/dotnet/resources/errors.d.ts +35 -0
  327. package/build/plugins/resource/frontend/dotnet/resources/errors.d.ts.map +1 -0
  328. package/build/plugins/resource/frontend/{blazor → dotnet}/resources/errors.js +10 -22
  329. package/build/plugins/resource/frontend/dotnet/resources/errors.js.map +1 -0
  330. package/build/plugins/resource/frontend/{blazor → dotnet}/resources/messages.d.ts +0 -4
  331. package/build/plugins/resource/frontend/dotnet/resources/messages.d.ts.map +1 -0
  332. package/build/plugins/resource/frontend/{blazor → dotnet}/resources/messages.js +0 -4
  333. package/build/plugins/resource/frontend/dotnet/resources/messages.js.map +1 -0
  334. package/build/plugins/resource/frontend/dotnet/utils/azure-client.d.ts +6 -0
  335. package/build/plugins/resource/frontend/dotnet/utils/azure-client.d.ts.map +1 -0
  336. package/build/plugins/resource/frontend/dotnet/utils/azure-client.js +11 -0
  337. package/build/plugins/resource/frontend/dotnet/utils/azure-client.js.map +1 -0
  338. package/build/plugins/resource/frontend/env.d.ts +22 -0
  339. package/build/plugins/resource/frontend/env.d.ts.map +1 -0
  340. package/build/plugins/resource/frontend/env.js +103 -0
  341. package/build/plugins/resource/frontend/env.js.map +1 -0
  342. package/build/plugins/resource/frontend/index.d.ts +2 -2
  343. package/build/plugins/resource/frontend/index.d.ts.map +1 -1
  344. package/build/plugins/resource/frontend/index.js +8 -20
  345. package/build/plugins/resource/frontend/index.js.map +1 -1
  346. package/build/plugins/resource/frontend/ops/deploy.d.ts +5 -4
  347. package/build/plugins/resource/frontend/ops/deploy.d.ts.map +1 -1
  348. package/build/plugins/resource/frontend/ops/deploy.js +35 -29
  349. package/build/plugins/resource/frontend/ops/deploy.js.map +1 -1
  350. package/build/plugins/resource/frontend/plugin.d.ts +2 -3
  351. package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
  352. package/build/plugins/resource/frontend/plugin.js +50 -75
  353. package/build/plugins/resource/frontend/plugin.js.map +1 -1
  354. package/build/plugins/resource/frontend/resources/errors.d.ts +3 -18
  355. package/build/plugins/resource/frontend/resources/errors.d.ts.map +1 -1
  356. package/build/plugins/resource/frontend/resources/errors.js +7 -39
  357. package/build/plugins/resource/frontend/resources/errors.js.map +1 -1
  358. package/build/plugins/resource/frontend/resources/messages.d.ts +2 -0
  359. package/build/plugins/resource/frontend/resources/messages.d.ts.map +1 -1
  360. package/build/plugins/resource/frontend/resources/messages.js +2 -0
  361. package/build/plugins/resource/frontend/resources/messages.js.map +1 -1
  362. package/build/plugins/resource/frontend/utils/progress-helper.d.ts +0 -8
  363. package/build/plugins/resource/frontend/utils/progress-helper.d.ts.map +1 -1
  364. package/build/plugins/resource/frontend/utils/progress-helper.js +1 -19
  365. package/build/plugins/resource/frontend/utils/progress-helper.js.map +1 -1
  366. package/build/plugins/resource/frontend/utils/telemetry-helper.d.ts +1 -1
  367. package/build/plugins/resource/frontend/utils/telemetry-helper.d.ts.map +1 -1
  368. package/build/plugins/resource/frontend/utils/telemetry-helper.js +8 -2
  369. package/build/plugins/resource/frontend/utils/telemetry-helper.js.map +1 -1
  370. package/build/plugins/resource/frontend/utils.d.ts +6 -1
  371. package/build/plugins/resource/frontend/utils.d.ts.map +1 -1
  372. package/build/plugins/resource/frontend/utils.js +17 -6
  373. package/build/plugins/resource/frontend/utils.js.map +1 -1
  374. package/build/plugins/resource/function/index.d.ts +1 -1
  375. package/build/plugins/resource/function/index.d.ts.map +1 -1
  376. package/build/plugins/resource/function/index.js +8 -12
  377. package/build/plugins/resource/function/index.js.map +1 -1
  378. package/build/plugins/resource/function/plugin.d.ts.map +1 -1
  379. package/build/plugins/resource/function/plugin.js +26 -21
  380. package/build/plugins/resource/function/plugin.js.map +1 -1
  381. package/build/plugins/resource/function/utils/depsChecker/checker.d.ts +0 -1
  382. package/build/plugins/resource/function/utils/depsChecker/checker.d.ts.map +1 -1
  383. package/build/plugins/resource/function/utils/depsChecker/checker.js +2 -2
  384. package/build/plugins/resource/function/utils/depsChecker/checker.js.map +1 -1
  385. package/build/plugins/resource/function/utils/depsChecker/common.d.ts +2 -2
  386. package/build/plugins/resource/function/utils/depsChecker/common.d.ts.map +1 -1
  387. package/build/plugins/resource/function/utils/depsChecker/common.js +6 -6
  388. package/build/plugins/resource/function/utils/depsChecker/common.js.map +1 -1
  389. package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.d.ts +3 -2
  390. package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.d.ts.map +1 -1
  391. package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.js +3 -2
  392. package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.js.map +1 -1
  393. package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.d.ts +0 -1
  394. package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.d.ts.map +1 -1
  395. package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.js +1 -23
  396. package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.js.map +1 -1
  397. package/build/plugins/resource/identity/index.d.ts.map +1 -1
  398. package/build/plugins/resource/identity/index.js +21 -17
  399. package/build/plugins/resource/identity/index.js.map +1 -1
  400. package/build/plugins/resource/keyvault/plugin.d.ts.map +1 -1
  401. package/build/plugins/resource/keyvault/plugin.js +17 -14
  402. package/build/plugins/resource/keyvault/plugin.js.map +1 -1
  403. package/build/plugins/resource/localdebug/index.d.ts +0 -7
  404. package/build/plugins/resource/localdebug/index.d.ts.map +1 -1
  405. package/build/plugins/resource/localdebug/index.js +3 -501
  406. package/build/plugins/resource/localdebug/index.js.map +1 -1
  407. package/build/plugins/resource/localdebug/util/error.d.ts.map +1 -1
  408. package/build/plugins/resource/localdebug/util/error.js +1 -1
  409. package/build/plugins/resource/localdebug/util/error.js.map +1 -1
  410. package/build/plugins/resource/localdebug/util/localService.d.ts +0 -1
  411. package/build/plugins/resource/localdebug/util/localService.d.ts.map +1 -1
  412. package/build/plugins/resource/localdebug/util/localService.js +1 -40
  413. package/build/plugins/resource/localdebug/util/localService.js.map +1 -1
  414. package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
  415. package/build/plugins/resource/localdebug/v2/index.js +41 -1
  416. package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
  417. package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
  418. package/build/plugins/resource/simpleauth/plugin.js +26 -21
  419. package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
  420. package/build/plugins/resource/simpleauth/utils/common.d.ts.map +1 -1
  421. package/build/plugins/resource/simpleauth/utils/common.js +3 -1
  422. package/build/plugins/resource/simpleauth/utils/common.js.map +1 -1
  423. package/build/plugins/resource/spfx/plugin.d.ts.map +1 -1
  424. package/build/plugins/resource/spfx/plugin.js +14 -9
  425. package/build/plugins/resource/spfx/plugin.js.map +1 -1
  426. package/build/plugins/resource/spfx/utils/constants.d.ts +5 -4
  427. package/build/plugins/resource/spfx/utils/constants.d.ts.map +1 -1
  428. package/build/plugins/resource/spfx/utils/constants.js +5 -4
  429. package/build/plugins/resource/spfx/utils/constants.js.map +1 -1
  430. package/build/plugins/resource/spfx/utils/progress-helper.d.ts.map +1 -1
  431. package/build/plugins/resource/spfx/utils/progress-helper.js +1 -1
  432. package/build/plugins/resource/spfx/utils/progress-helper.js.map +1 -1
  433. package/build/plugins/resource/sql/config.d.ts +0 -1
  434. package/build/plugins/resource/sql/config.d.ts.map +1 -1
  435. package/build/plugins/resource/sql/config.js +0 -1
  436. package/build/plugins/resource/sql/config.js.map +1 -1
  437. package/build/plugins/resource/sql/constants.d.ts +1 -0
  438. package/build/plugins/resource/sql/constants.d.ts.map +1 -1
  439. package/build/plugins/resource/sql/constants.js +2 -1
  440. package/build/plugins/resource/sql/constants.js.map +1 -1
  441. package/build/plugins/resource/sql/errors.d.ts +3 -1
  442. package/build/plugins/resource/sql/errors.d.ts.map +1 -1
  443. package/build/plugins/resource/sql/errors.js +3 -1
  444. package/build/plugins/resource/sql/errors.js.map +1 -1
  445. package/build/plugins/resource/sql/managementClient.d.ts +3 -1
  446. package/build/plugins/resource/sql/managementClient.d.ts.map +1 -1
  447. package/build/plugins/resource/sql/managementClient.js +11 -20
  448. package/build/plugins/resource/sql/managementClient.js.map +1 -1
  449. package/build/plugins/resource/sql/plugin.d.ts +3 -0
  450. package/build/plugins/resource/sql/plugin.d.ts.map +1 -1
  451. package/build/plugins/resource/sql/plugin.js +51 -40
  452. package/build/plugins/resource/sql/plugin.js.map +1 -1
  453. package/build/plugins/resource/sql/results.d.ts +2 -2
  454. package/build/plugins/resource/sql/results.d.ts.map +1 -1
  455. package/build/plugins/resource/sql/results.js +4 -4
  456. package/build/plugins/resource/sql/results.js.map +1 -1
  457. package/build/plugins/resource/sql/sqlClient.d.ts +1 -1
  458. package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
  459. package/build/plugins/resource/sql/sqlClient.js +33 -46
  460. package/build/plugins/resource/sql/sqlClient.js.map +1 -1
  461. package/build/plugins/resource/sql/utils/checkInput.js +2 -2
  462. package/build/plugins/resource/sql/utils/checkInput.js.map +1 -1
  463. package/build/plugins/resource/sql/utils/message.d.ts +0 -1
  464. package/build/plugins/resource/sql/utils/message.d.ts.map +1 -1
  465. package/build/plugins/resource/sql/utils/message.js +0 -1
  466. package/build/plugins/resource/sql/utils/message.js.map +1 -1
  467. package/build/plugins/resource/utils4v2.d.ts.map +1 -1
  468. package/build/plugins/resource/utils4v2.js +0 -4
  469. package/build/plugins/resource/utils4v2.js.map +1 -1
  470. package/build/plugins/solution/fx-solution/arm.d.ts +26 -10
  471. package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
  472. package/build/plugins/solution/fx-solution/arm.js +429 -146
  473. package/build/plugins/solution/fx-solution/arm.js.map +1 -1
  474. package/build/plugins/solution/fx-solution/commonQuestions.d.ts +13 -2
  475. package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
  476. package/build/plugins/solution/fx-solution/commonQuestions.js +24 -26
  477. package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
  478. package/build/plugins/solution/fx-solution/constants.d.ts +2 -0
  479. package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
  480. package/build/plugins/solution/fx-solution/constants.js +2 -0
  481. package/build/plugins/solution/fx-solution/constants.js.map +1 -1
  482. package/build/plugins/solution/fx-solution/debug/constants.d.ts +10 -0
  483. package/build/plugins/solution/fx-solution/debug/constants.d.ts.map +1 -0
  484. package/build/plugins/solution/fx-solution/debug/constants.js +17 -0
  485. package/build/plugins/solution/fx-solution/debug/constants.js.map +1 -0
  486. package/build/plugins/solution/fx-solution/debug/error.d.ts +9 -0
  487. package/build/plugins/solution/fx-solution/debug/error.d.ts.map +1 -0
  488. package/build/plugins/solution/fx-solution/debug/error.js +36 -0
  489. package/build/plugins/solution/fx-solution/debug/error.js.map +1 -0
  490. package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts +4 -0
  491. package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -0
  492. package/build/plugins/solution/fx-solution/debug/provisionLocal.js +237 -0
  493. package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -0
  494. package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts +5 -0
  495. package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts.map +1 -0
  496. package/build/plugins/solution/fx-solution/debug/scaffolding.js +165 -0
  497. package/build/plugins/solution/fx-solution/debug/scaffolding.js.map +1 -0
  498. package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/certificate.d.ts +2 -2
  499. package/build/plugins/solution/fx-solution/debug/util/certificate.d.ts.map +1 -0
  500. package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/certificate.js +8 -9
  501. package/build/plugins/solution/fx-solution/debug/util/certificate.js.map +1 -0
  502. package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/codespace.d.ts +0 -0
  503. package/build/plugins/solution/fx-solution/debug/util/codespace.d.ts.map +1 -0
  504. package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/codespace.js +0 -0
  505. package/build/plugins/solution/fx-solution/debug/util/codespace.js.map +1 -0
  506. package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/launch.d.ts +0 -0
  507. package/build/plugins/solution/fx-solution/debug/util/launch.d.ts.map +1 -0
  508. package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/launch.js +1 -1
  509. package/build/plugins/solution/fx-solution/debug/util/launch.js.map +1 -0
  510. package/build/plugins/solution/fx-solution/debug/util/localService.d.ts +3 -0
  511. package/build/plugins/solution/fx-solution/debug/util/localService.d.ts.map +1 -0
  512. package/build/plugins/solution/fx-solution/debug/util/localService.js +52 -0
  513. package/build/plugins/solution/fx-solution/debug/util/localService.js.map +1 -0
  514. package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/ngrok.d.ts +0 -0
  515. package/build/plugins/solution/fx-solution/debug/util/ngrok.d.ts.map +1 -0
  516. package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/ngrok.js +2 -2
  517. package/build/plugins/solution/fx-solution/debug/util/ngrok.js.map +1 -0
  518. package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/process.d.ts +0 -0
  519. package/build/plugins/solution/fx-solution/debug/util/process.d.ts.map +1 -0
  520. package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/process.js +0 -0
  521. package/build/plugins/solution/fx-solution/debug/util/process.js.map +1 -0
  522. package/build/plugins/solution/fx-solution/debug/util/settings.d.ts +2 -0
  523. package/build/plugins/solution/fx-solution/debug/util/settings.d.ts.map +1 -0
  524. package/build/plugins/solution/fx-solution/debug/util/settings.js +22 -0
  525. package/build/plugins/solution/fx-solution/debug/util/settings.js.map +1 -0
  526. package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/tasks.d.ts +0 -0
  527. package/build/plugins/solution/fx-solution/debug/util/tasks.d.ts.map +1 -0
  528. package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/tasks.js +11 -11
  529. package/build/plugins/solution/fx-solution/debug/util/tasks.js.map +1 -0
  530. package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/telemetry.d.ts +7 -6
  531. package/build/plugins/solution/fx-solution/debug/util/telemetry.d.ts.map +1 -0
  532. package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/telemetry.js +16 -19
  533. package/build/plugins/solution/fx-solution/debug/util/telemetry.js.map +1 -0
  534. package/build/plugins/solution/fx-solution/index.d.ts +1 -0
  535. package/build/plugins/solution/fx-solution/index.d.ts.map +1 -1
  536. package/build/plugins/solution/fx-solution/index.js +1 -0
  537. package/build/plugins/solution/fx-solution/index.js.map +1 -1
  538. package/build/plugins/solution/fx-solution/question.d.ts +3 -3
  539. package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
  540. package/build/plugins/solution/fx-solution/question.js +4 -36
  541. package/build/plugins/solution/fx-solution/question.js.map +1 -1
  542. package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
  543. package/build/plugins/solution/fx-solution/solution.js +19 -10
  544. package/build/plugins/solution/fx-solution/solution.js.map +1 -1
  545. package/build/plugins/solution/fx-solution/utils/depsChecker/bicepChecker.d.ts +2 -2
  546. package/build/plugins/solution/fx-solution/utils/depsChecker/bicepChecker.d.ts.map +1 -1
  547. package/build/plugins/solution/fx-solution/utils/depsChecker/bicepChecker.js +13 -14
  548. package/build/plugins/solution/fx-solution/utils/depsChecker/bicepChecker.js.map +1 -1
  549. package/build/plugins/solution/fx-solution/utils/progressHelper.d.ts +2 -2
  550. package/build/plugins/solution/fx-solution/utils/progressHelper.d.ts.map +1 -1
  551. package/build/plugins/solution/fx-solution/utils/progressHelper.js +4 -4
  552. package/build/plugins/solution/fx-solution/utils/progressHelper.js.map +1 -1
  553. package/build/plugins/solution/fx-solution/v2/adaptor.js +1 -1
  554. package/build/plugins/solution/fx-solution/v2/adaptor.js.map +1 -1
  555. package/build/plugins/solution/fx-solution/v2/constants.d.ts +2 -0
  556. package/build/plugins/solution/fx-solution/v2/constants.d.ts.map +1 -0
  557. package/build/plugins/solution/fx-solution/v2/constants.js +7 -0
  558. package/build/plugins/solution/fx-solution/v2/constants.js.map +1 -0
  559. package/build/plugins/solution/fx-solution/v2/createEnv.d.ts.map +1 -1
  560. package/build/plugins/solution/fx-solution/v2/createEnv.js +1 -1
  561. package/build/plugins/solution/fx-solution/v2/createEnv.js.map +1 -1
  562. package/build/plugins/solution/fx-solution/v2/deploy.d.ts.map +1 -1
  563. package/build/plugins/solution/fx-solution/v2/deploy.js +3 -0
  564. package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
  565. package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +2 -2
  566. package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
  567. package/build/plugins/solution/fx-solution/v2/executeUserTask.js +199 -124
  568. package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
  569. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts +3 -1
  570. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map +1 -1
  571. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js +9 -14
  572. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map +1 -1
  573. package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
  574. package/build/plugins/solution/fx-solution/v2/getQuestions.js +142 -120
  575. package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
  576. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js.map +1 -1
  577. package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
  578. package/build/plugins/solution/fx-solution/v2/provision.js +13 -3
  579. package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
  580. package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
  581. package/build/plugins/solution/fx-solution/v2/provisionLocal.js +12 -1
  582. package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
  583. package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map +1 -1
  584. package/build/plugins/solution/fx-solution/v2/scaffolding.js +11 -0
  585. package/build/plugins/solution/fx-solution/v2/scaffolding.js.map +1 -1
  586. package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
  587. package/build/plugins/solution/fx-solution/v2/solution.js +2 -1
  588. package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
  589. package/build/plugins/solution/fx-solution/v3/addModule.d.ts +6 -0
  590. package/build/plugins/solution/fx-solution/v3/addModule.d.ts.map +1 -0
  591. package/build/plugins/solution/fx-solution/v3/addModule.js +35 -0
  592. package/build/plugins/solution/fx-solution/v3/addModule.js.map +1 -0
  593. package/build/plugins/solution/fx-solution/v3/addResource.d.ts +37 -0
  594. package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map +1 -0
  595. package/build/plugins/solution/fx-solution/v3/addResource.js +264 -0
  596. package/build/plugins/solution/fx-solution/v3/addResource.js.map +1 -0
  597. package/build/plugins/solution/fx-solution/v3/constants.d.ts +20 -0
  598. package/build/plugins/solution/fx-solution/v3/constants.d.ts.map +1 -0
  599. package/build/plugins/solution/fx-solution/v3/constants.js +25 -0
  600. package/build/plugins/solution/fx-solution/v3/constants.js.map +1 -0
  601. package/build/plugins/solution/fx-solution/v3/deploy.d.ts +6 -0
  602. package/build/plugins/solution/fx-solution/v3/deploy.d.ts.map +1 -0
  603. package/build/plugins/solution/fx-solution/v3/deploy.js +78 -0
  604. package/build/plugins/solution/fx-solution/v3/deploy.js.map +1 -0
  605. package/build/plugins/solution/fx-solution/v3/error.d.ts +8 -0
  606. package/build/plugins/solution/fx-solution/v3/error.d.ts.map +1 -0
  607. package/build/plugins/solution/fx-solution/v3/error.js +17 -0
  608. package/build/plugins/solution/fx-solution/v3/error.js.map +1 -0
  609. package/build/plugins/solution/fx-solution/v3/init.d.ts +4 -0
  610. package/build/plugins/solution/fx-solution/v3/init.d.ts.map +1 -0
  611. package/build/plugins/solution/fx-solution/v3/init.js +35 -0
  612. package/build/plugins/solution/fx-solution/v3/init.js.map +1 -0
  613. package/build/plugins/solution/fx-solution/v3/provision.d.ts +4 -0
  614. package/build/plugins/solution/fx-solution/v3/provision.d.ts.map +1 -0
  615. package/build/plugins/solution/fx-solution/v3/provision.js +124 -0
  616. package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -0
  617. package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts +4 -0
  618. package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts.map +1 -0
  619. package/build/plugins/solution/fx-solution/v3/provisionLocal.js +13 -0
  620. package/build/plugins/solution/fx-solution/v3/provisionLocal.js.map +1 -0
  621. package/build/plugins/solution/fx-solution/v3/publish.d.ts +4 -0
  622. package/build/plugins/solution/fx-solution/v3/publish.d.ts.map +1 -0
  623. package/build/plugins/solution/fx-solution/v3/publish.js +15 -0
  624. package/build/plugins/solution/fx-solution/v3/publish.js.map +1 -0
  625. package/build/plugins/solution/fx-solution/v3/scaffold.d.ts +27 -0
  626. package/build/plugins/solution/fx-solution/v3/scaffold.d.ts.map +1 -0
  627. package/build/plugins/solution/fx-solution/v3/scaffold.js +241 -0
  628. package/build/plugins/solution/fx-solution/v3/scaffold.js.map +1 -0
  629. package/build/plugins/solution/fx-solution/v3/solution.d.ts +32 -0
  630. package/build/plugins/solution/fx-solution/v3/solution.d.ts.map +1 -0
  631. package/build/plugins/solution/fx-solution/v3/solution.js +45 -0
  632. package/build/plugins/solution/fx-solution/v3/solution.js.map +1 -0
  633. package/build/plugins/solution/fx-solution/v3/userTask.d.ts +4 -0
  634. package/build/plugins/solution/fx-solution/v3/userTask.d.ts.map +1 -0
  635. package/build/plugins/solution/fx-solution/v3/userTask.js +15 -0
  636. package/build/plugins/solution/fx-solution/v3/userTask.js.map +1 -0
  637. package/build/plugins/solution/fx-solution/v3/utils.d.ts +3 -0
  638. package/build/plugins/solution/fx-solution/v3/utils.d.ts.map +1 -0
  639. package/build/plugins/solution/fx-solution/v3/utils.js +16 -0
  640. package/build/plugins/solution/fx-solution/v3/utils.js.map +1 -0
  641. package/build/plugins/solution/index.d.ts +1 -0
  642. package/build/plugins/solution/index.d.ts.map +1 -1
  643. package/build/plugins/solution/index.js +1 -0
  644. package/build/plugins/solution/index.js.map +1 -1
  645. package/build/plugins/solution/spfx-solution/addModule.d.ts +5 -0
  646. package/build/plugins/solution/spfx-solution/addModule.d.ts.map +1 -0
  647. package/build/plugins/solution/spfx-solution/addModule.js +29 -0
  648. package/build/plugins/solution/spfx-solution/addModule.js.map +1 -0
  649. package/build/plugins/solution/spfx-solution/constants.d.ts +2 -0
  650. package/build/plugins/solution/spfx-solution/constants.d.ts.map +1 -0
  651. package/build/plugins/solution/spfx-solution/constants.js +7 -0
  652. package/build/plugins/solution/spfx-solution/constants.js.map +1 -0
  653. package/build/plugins/solution/spfx-solution/error.d.ts +5 -0
  654. package/build/plugins/solution/spfx-solution/error.d.ts.map +1 -0
  655. package/build/plugins/solution/spfx-solution/error.js +13 -0
  656. package/build/plugins/solution/spfx-solution/error.js.map +1 -0
  657. package/build/plugins/solution/spfx-solution/index.d.ts +2 -0
  658. package/build/plugins/solution/spfx-solution/index.d.ts.map +1 -0
  659. package/build/plugins/solution/spfx-solution/index.js +7 -0
  660. package/build/plugins/solution/spfx-solution/index.js.map +1 -0
  661. package/build/plugins/solution/spfx-solution/init.d.ts +4 -0
  662. package/build/plugins/solution/spfx-solution/init.d.ts.map +1 -0
  663. package/build/plugins/solution/spfx-solution/init.js +52 -0
  664. package/build/plugins/solution/spfx-solution/init.js.map +1 -0
  665. package/build/plugins/solution/spfx-solution/questions.d.ts +4 -0
  666. package/build/plugins/solution/spfx-solution/questions.d.ts.map +1 -0
  667. package/build/plugins/solution/spfx-solution/questions.js +10 -0
  668. package/build/plugins/solution/spfx-solution/questions.js.map +1 -0
  669. package/build/plugins/solution/spfx-solution/scaffold.d.ts +13 -0
  670. package/build/plugins/solution/spfx-solution/scaffold.d.ts.map +1 -0
  671. package/build/plugins/solution/spfx-solution/scaffold.js +105 -0
  672. package/build/plugins/solution/spfx-solution/scaffold.js.map +1 -0
  673. package/build/plugins/solution/spfx-solution/solution.d.ts +22 -0
  674. package/build/plugins/solution/spfx-solution/solution.d.ts.map +1 -0
  675. package/build/plugins/solution/spfx-solution/solution.js +31 -0
  676. package/build/plugins/solution/spfx-solution/solution.js.map +1 -0
  677. package/build/plugins/solution/utils/error.d.ts +5 -0
  678. package/build/plugins/solution/utils/error.d.ts.map +1 -0
  679. package/build/plugins/solution/utils/error.js +13 -0
  680. package/build/plugins/solution/utils/error.js.map +1 -0
  681. package/build/plugins/solution/utils/questions.d.ts +16 -0
  682. package/build/plugins/solution/utils/questions.d.ts.map +1 -0
  683. package/build/plugins/solution/utils/questions.js +86 -0
  684. package/build/plugins/solution/utils/questions.js.map +1 -0
  685. package/package.json +21 -6
  686. package/resource/deps-checker/dotnet-install.ps1 +1095 -0
  687. package/resource/deps-checker/dotnet-install.sh +1222 -0
  688. package/resource/strings.json +18 -9
  689. package/templates/plugins/resource/apim/bicep/apimConfiguration.bicep +16 -16
  690. package/templates/plugins/resource/apim/bicep/config.template.bicep +1 -1
  691. package/templates/plugins/resource/apim/bicep/provision.template.bicep +1 -1
  692. package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +33 -38
  693. package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +15 -11
  694. package/templates/plugins/resource/bot/bicep/config.template.bicep +3 -1
  695. package/templates/plugins/resource/bot/bicep/provision.template.bicep +2 -2
  696. package/templates/plugins/resource/frontend/bicep/frontendHostingProvision.bicep +3 -2
  697. package/templates/plugins/resource/frontend/bicep/provision.template.bicep +1 -1
  698. package/templates/plugins/resource/function/bicep/config.template.bicep +3 -1
  699. package/templates/plugins/resource/function/bicep/functionConfiguration.template.bicep +44 -42
  700. package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +17 -14
  701. package/templates/plugins/resource/function/bicep/provision.template.bicep +2 -2
  702. package/templates/plugins/resource/identity/bicep/identityProvision.template.bicep +2 -1
  703. package/templates/plugins/resource/identity/bicep/provision.template.bicep +1 -1
  704. package/templates/plugins/resource/keyvault/bicep/keyVaultProvision.template.bicep +10 -7
  705. package/templates/plugins/resource/keyvault/bicep/provision.template.bicep +4 -2
  706. package/templates/plugins/resource/simpleauth/bicep/config.template.bicep +3 -1
  707. package/templates/plugins/resource/simpleauth/bicep/provision.template.bicep +2 -2
  708. package/templates/plugins/resource/simpleauth/bicep/simpleAuthConfiguration.template.bicep +27 -31
  709. package/templates/plugins/resource/simpleauth/bicep/simpleAuthProvision.template.bicep +9 -6
  710. package/templates/plugins/resource/simpleauth/version.txt +2 -1
  711. package/templates/plugins/resource/sql/bicep/provision.template.bicep +1 -1
  712. package/templates/plugins/resource/sql/bicep/sqlProvision.template.bicep +8 -5
  713. package/build/plugins/resource/frontend/blazor/constants.js +0 -98
  714. package/build/plugins/resource/frontend/blazor/enum.js +0 -39
  715. package/build/plugins/resource/frontend/blazor/ops/provision.d.ts +0 -8
  716. package/build/plugins/resource/frontend/blazor/ops/provision.d.ts.map +0 -1
  717. package/build/plugins/resource/frontend/blazor/ops/provision.js +0 -42
  718. package/build/plugins/resource/frontend/blazor/ops/provision.js.map +0 -1
  719. package/build/plugins/resource/frontend/blazor/plugin.d.ts +0 -35
  720. package/build/plugins/resource/frontend/blazor/plugin.d.ts.map +0 -1
  721. package/build/plugins/resource/frontend/blazor/plugin.js +0 -190
  722. package/build/plugins/resource/frontend/blazor/plugin.js.map +0 -1
  723. package/build/plugins/resource/frontend/blazor/resources/errors.d.ts +0 -41
  724. package/build/plugins/resource/frontend/blazor/resources/errors.d.ts.map +0 -1
  725. package/build/plugins/resource/frontend/blazor/resources/errors.js.map +0 -1
  726. package/build/plugins/resource/frontend/blazor/resources/messages.d.ts.map +0 -1
  727. package/build/plugins/resource/frontend/blazor/resources/messages.js.map +0 -1
  728. package/build/plugins/resource/frontend/blazor/utils/azure-client.d.ts +0 -21
  729. package/build/plugins/resource/frontend/blazor/utils/azure-client.d.ts.map +0 -1
  730. package/build/plugins/resource/frontend/blazor/utils/azure-client.js +0 -47
  731. package/build/plugins/resource/frontend/blazor/utils/azure-client.js.map +0 -1
  732. package/build/plugins/resource/frontend/utils/azure-client.d.ts +0 -12
  733. package/build/plugins/resource/frontend/utils/azure-client.d.ts.map +0 -1
  734. package/build/plugins/resource/frontend/utils/azure-client.js +0 -29
  735. package/build/plugins/resource/frontend/utils/azure-client.js.map +0 -1
  736. package/build/plugins/resource/frontend/utils/environment-utils.d.ts +0 -9
  737. package/build/plugins/resource/frontend/utils/environment-utils.d.ts.map +0 -1
  738. package/build/plugins/resource/frontend/utils/environment-utils.js +0 -36
  739. package/build/plugins/resource/frontend/utils/environment-utils.js.map +0 -1
  740. package/build/plugins/resource/localdebug/certificate.d.ts.map +0 -1
  741. package/build/plugins/resource/localdebug/certificate.js.map +0 -1
  742. package/build/plugins/resource/localdebug/launch.d.ts.map +0 -1
  743. package/build/plugins/resource/localdebug/launch.js.map +0 -1
  744. package/build/plugins/resource/localdebug/legacyPlugin.d.ts +0 -6
  745. package/build/plugins/resource/localdebug/legacyPlugin.d.ts.map +0 -1
  746. package/build/plugins/resource/localdebug/legacyPlugin.js +0 -208
  747. package/build/plugins/resource/localdebug/legacyPlugin.js.map +0 -1
  748. package/build/plugins/resource/localdebug/localEnvMulti.d.ts.map +0 -1
  749. package/build/plugins/resource/localdebug/localEnvMulti.js.map +0 -1
  750. package/build/plugins/resource/localdebug/settings.d.ts +0 -2
  751. package/build/plugins/resource/localdebug/settings.d.ts.map +0 -1
  752. package/build/plugins/resource/localdebug/settings.js +0 -18
  753. package/build/plugins/resource/localdebug/settings.js.map +0 -1
  754. package/build/plugins/resource/localdebug/tasks.d.ts.map +0 -1
  755. package/build/plugins/resource/localdebug/tasks.js.map +0 -1
  756. package/build/plugins/resource/localdebug/util/codespace.d.ts.map +0 -1
  757. package/build/plugins/resource/localdebug/util/codespace.js.map +0 -1
  758. package/build/plugins/resource/localdebug/util/ngrok.d.ts.map +0 -1
  759. package/build/plugins/resource/localdebug/util/ngrok.js.map +0 -1
  760. package/build/plugins/resource/localdebug/util/process.d.ts.map +0 -1
  761. package/build/plugins/resource/localdebug/util/process.js.map +0 -1
  762. package/build/plugins/resource/localdebug/util/telemetry.d.ts.map +0 -1
  763. package/build/plugins/resource/localdebug/util/telemetry.js.map +0 -1
  764. package/templates/azure/config.bicep +0 -25
  765. package/templates/azure/main.bicep +0 -20
  766. package/templates/azure/provision/azureSql.bicep +0 -39
  767. package/templates/azure/provision/frontendHosting.bicep +0 -23
  768. package/templates/azure/provision/function.bicep +0 -79
  769. package/templates/azure/provision/simpleAuth.bicep +0 -44
  770. package/templates/azure/provision.bicep +0 -58
  771. package/templates/azure/teamsFx/bot.bicep +0 -34
  772. package/templates/azure/teamsFx/function.bicep +0 -71
  773. package/templates/azure/teamsFx/simpleAuth.bicep +0 -40
  774. package/templates/plugins/resource/aad/bicep/param.template.bicep +0 -6
  775. package/templates/plugins/resource/aad/bicep/variables.template.bicep +0 -13
@@ -0,0 +1 @@
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,sBAAsB,GAAG,mBAAmB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"createEnv.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA2B/F"}
1
+ {"version":3,"file":"createEnv.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgC/F"}
@@ -22,7 +22,7 @@ async function createEnv(ctx, inputs) {
22
22
  };
23
23
  try {
24
24
  if (inputs.copy === true) {
25
- await arm_1.copyParameterJson(solutionContext, inputs.targetEnvName, inputs.sourceEnvName);
25
+ await arm_1.copyParameterJson(inputs.projectPath, ctx.projectSetting.appName, inputs.targetEnvName, inputs.sourceEnvName);
26
26
  }
27
27
  else {
28
28
  await arm_1.getParameterJson(solutionContext);
@@ -1 +1 @@
1
- {"version":3,"file":"createEnv.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,oDAA+D;AAC/D,2CAA6D;AAC7D,gCAA6D;AAC7D,mCAAyC;AAElC,KAAK,UAAU,SAAS,CAAC,GAAe,EAAE,MAAc;IAC7D,IACE,2BAAmB,EAAE;QACrB,sBAAc,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC,EAC5E;QACA,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YAC9B,OAAO,EAAE,iBAAU,CAAC,MAAM,CAAC,aAAa,CAAC;YACzC,eAAe,EAAE,GAAG,CAAC,cAAc;YACnC,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,EAAE,EAAE,GAAG,CAAC,eAAe;SACxB,CAAC;QACF,IAAI;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,MAAM,uBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC,aAAc,EAAE,MAAM,CAAC,aAAc,CAAC,CAAC;aACxF;iBAAM;gBACL,MAAM,sBAAgB,CAAC,eAAe,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,oBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA3BD,8BA2BC"}
1
+ {"version":3,"file":"createEnv.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,oDAA+D;AAC/D,2CAA6D;AAC7D,gCAA6D;AAC7D,mCAAyC;AAElC,KAAK,UAAU,SAAS,CAAC,GAAe,EAAE,MAAc;IAC7D,IACE,2BAAmB,EAAE;QACrB,sBAAc,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC,EAC5E;QACA,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YAC9B,OAAO,EAAE,iBAAU,CAAC,MAAM,CAAC,aAAa,CAAC;YACzC,eAAe,EAAE,GAAG,CAAC,cAAc;YACnC,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,EAAE,EAAE,GAAG,CAAC,eAAe;SACxB,CAAC;QACF,IAAI;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,MAAM,uBAAiB,CACrB,MAAM,CAAC,WAAY,EACnB,GAAG,CAAC,cAAc,CAAC,OAAO,EAC1B,MAAM,CAAC,aAAc,EACrB,MAAM,CAAC,aAAc,CACtB,CAAC;aACH;iBAAM;gBACL,MAAM,sBAAgB,CAAC,eAAe,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,oBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAhCD,8BAgCC"}
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,OAAO,EACP,MAAM,EAGN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAoBhC,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+EhC"}
1
+ {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,OAAO,EACP,MAAM,EAGN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAoBhC,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAyFhC"}
@@ -34,6 +34,9 @@ async function deploy(ctx, inputs, envInfo, tokenProvider) {
34
34
  plugin.deploy(ctx, Object.assign(Object.assign(Object.assign({}, inputs), utils_1.extractSolutionInputs(provisionOutputs[constants_2.GLOBAL_CONFIG]["output"])), { projectPath: inputs.projectPath }), envInfo, tokenProvider),
35
35
  };
36
36
  });
37
+ if (thunks.length === 0) {
38
+ return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`invalid options: [${optionsToDeploy.join(", ")}]`), constants_2.SolutionSource, constants_2.SolutionError.NoResourcePluginSelected));
39
+ }
37
40
  ctx.logProvider.info(util.format(tools_1.getStrings().solution.SelectedPluginsToDeployNotice, constants_1.PluginDisplayName.Solution, JSON.stringify(thunks.map((p) => p.pluginName))));
38
41
  ctx.logProvider.info(util.format(tools_1.getStrings().solution.DeployStartNotice, constants_1.PluginDisplayName.Solution));
39
42
  const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/deploy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/deploy.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
- import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider, Json } from "@microsoft/teamsfx-api";
1
+ import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider, Json, ProjectSettings } from "@microsoft/teamsfx-api";
2
2
  export declare function executeUserTask(ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<unknown, FxError>>;
3
3
  export declare function canAddCapability(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
4
- export declare function canAddResource(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
4
+ export declare function canAddResource(projectSetting: ProjectSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
5
5
  export declare function addCapability(ctx: v2.Context, inputs: Inputs, localSettings: Json): Promise<Result<{
6
6
  solutionSettings?: SolutionSettings;
7
7
  solutionConfig?: Record<string, unknown>;
@@ -1 +1 @@
1
- {"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAiChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAmBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA4HA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AAwBD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAoKnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
1
+ {"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EAMJ,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAiChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,eAAe,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAwBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CAyMA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AA4BD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+JnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
@@ -14,6 +14,9 @@ const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
14
14
  const typedi_1 = require("typedi");
15
15
  const scaffolding_1 = require("./scaffolding");
16
16
  const generateResourceTemplate_1 = require("./generateResourceTemplate");
17
+ const scaffolding_2 = require("../debug/scaffolding");
18
+ const constants_2 = require("../v3/constants");
19
+ const core_1 = require("../../../../core");
17
20
  async function executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
18
21
  const namespace = func.namespace;
19
22
  const method = func.method;
@@ -73,33 +76,40 @@ async function executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenP
73
76
  exports.executeUserTask = executeUserTask;
74
77
  function canAddCapability(settings, telemetryReporter) {
75
78
  if (!(settings.hostType === question_1.HostTypeOptionAzure.id)) {
76
- const e = teamsfx_api_1.returnUserError(new Error("Add capability is not supported for SPFx project"), constants_1.SolutionSource, constants_1.SolutionError.FailedToAddCapability);
79
+ const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddCapabilityNotSupport, tools_1.getStrings().solution.addCapability.OnlySupportAzure, constants_1.SolutionSource);
77
80
  return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, e, telemetryReporter));
78
81
  }
79
82
  return teamsfx_api_1.ok(teamsfx_api_1.Void);
80
83
  }
81
84
  exports.canAddCapability = canAddCapability;
82
- function canAddResource(settings, telemetryReporter) {
83
- if (!(settings.hostType === question_1.HostTypeOptionAzure.id &&
84
- settings.capabilities &&
85
- settings.capabilities.includes(question_1.TabOptionItem.id))) {
86
- const e = teamsfx_api_1.returnUserError(new Error("Add resource is only supported for Tab app hosted in Azure."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
85
+ function canAddResource(projectSetting, telemetryReporter) {
86
+ const isVS = core_1.isVSProject(projectSetting);
87
+ if (isVS) {
88
+ const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddResourceNotSupport, tools_1.getStrings().solution.addResource.NotSupportForVSProject, constants_1.SolutionSource);
89
+ return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, telemetryReporter));
90
+ }
91
+ const solutionSettings = projectSetting.solutionSettings;
92
+ if (!(solutionSettings.hostType === question_1.HostTypeOptionAzure.id)) {
93
+ const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddResourceNotSupport, tools_1.getStrings().solution.addResource.OnlySupportAzure, constants_1.SolutionSource);
87
94
  return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, telemetryReporter));
88
95
  }
89
96
  return teamsfx_api_1.ok(teamsfx_api_1.Void);
90
97
  }
91
98
  exports.canAddResource = canAddResource;
92
99
  async function addCapability(ctx, inputs, localSettings) {
93
- var _a, _b, _c, _d, _e, _f, _g, _h;
100
+ var _a, _b;
94
101
  ctx.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapabilityStart, {
95
102
  [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
96
103
  });
97
- const settings = utils_1.getAzureSolutionSettings(ctx);
98
- const originalSettings = lodash_1.cloneDeep(settings);
99
- const canProceed = canAddCapability(settings, ctx.telemetryReporter);
104
+ // 1. checking addable
105
+ const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
106
+ const originalSettings = lodash_1.cloneDeep(solutionSettings);
107
+ const inputsNew = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, existingResources: originalSettings.activeResourcePlugins });
108
+ const canProceed = canAddCapability(solutionSettings, ctx.telemetryReporter);
100
109
  if (canProceed.isErr()) {
101
110
  return teamsfx_api_1.err(canProceed.error);
102
111
  }
112
+ // 2. check answer
103
113
  const capabilitiesAnswer = inputs[question_1.AzureSolutionQuestionNames.Capabilities];
104
114
  if (!capabilitiesAnswer || capabilitiesAnswer.length === 0) {
105
115
  (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
@@ -109,78 +119,130 @@ async function addCapability(ctx, inputs, localSettings) {
109
119
  });
110
120
  return teamsfx_api_1.ok({});
111
121
  }
112
- const alreadyHaveBotAndAddBot = (((_b = settings.capabilities) === null || _b === void 0 ? void 0 : _b.includes(question_1.BotOptionItem.id)) ||
113
- ((_c = settings.capabilities) === null || _c === void 0 ? void 0 : _c.includes(question_1.MessageExtensionItem.id))) &&
114
- (capabilitiesAnswer.includes(question_1.BotOptionItem.id) ||
115
- capabilitiesAnswer.includes(question_1.MessageExtensionItem.id));
116
- const alreadyHaveTabAndAddTab = ((_d = settings.capabilities) === null || _d === void 0 ? void 0 : _d.includes(question_1.TabOptionItem.id)) &&
117
- capabilitiesAnswer.includes(question_1.TabOptionItem.id);
118
- if (alreadyHaveBotAndAddBot || alreadyHaveTabAndAddTab) {
119
- const e = teamsfx_api_1.returnUserError(new Error("There are no additional capabilities you can add to your project."), constants_1.SolutionSource, constants_1.SolutionError.FailedToAddCapability);
120
- return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, e, ctx.telemetryReporter));
122
+ // 3. check capability limit
123
+ const alreadyHasTab = solutionSettings.capabilities.includes(question_1.TabOptionItem.id);
124
+ const alreadyHasBot = solutionSettings.capabilities.includes(question_1.BotOptionItem.id);
125
+ const alreadyHasME = solutionSettings.capabilities.includes(question_1.MessageExtensionItem.id);
126
+ const toAddTab = capabilitiesAnswer.includes(question_1.TabOptionItem.id);
127
+ const toAddBot = capabilitiesAnswer.includes(question_1.BotOptionItem.id);
128
+ const toAddME = capabilitiesAnswer.includes(question_1.MessageExtensionItem.id);
129
+ const appStudioPlugin = typedi_1.Container.get(constants_2.BuiltInResourcePluginNames.appStudio);
130
+ const inputsWithProjectPath = inputs;
131
+ const tabExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "staticTab");
132
+ if (tabExceedRes.isErr()) {
133
+ return teamsfx_api_1.err(tabExceedRes.error);
134
+ }
135
+ const isTabAddable = !tabExceedRes.value;
136
+ const botExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "Bot");
137
+ if (botExceedRes.isErr()) {
138
+ return teamsfx_api_1.err(botExceedRes.error);
139
+ }
140
+ const isBotAddable = !botExceedRes.value;
141
+ const meExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "MessageExtension");
142
+ if (meExceedRes.isErr()) {
143
+ return teamsfx_api_1.err(meExceedRes.error);
144
+ }
145
+ const isMEAddable = !meExceedRes.value;
146
+ if ((toAddTab && !isTabAddable) || (toAddBot && !isBotAddable) || (toAddME && !isMEAddable)) {
147
+ const error = new teamsfx_api_1.UserError(constants_1.SolutionError.FailedToAddCapability, tools_1.getStrings().solution.addCapability.ExceedMaxLimit, constants_1.SolutionSource);
148
+ return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, error, ctx.telemetryReporter));
121
149
  }
122
- let change = false;
123
- const localDebugPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.LocalDebugPlugin);
124
- const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
125
- const frontendPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
126
- const botPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
127
- const pluginsToScaffold = [localDebugPlugin, appStudioPlugin];
128
- const capabilities = Array.from(settings.capabilities);
129
- for (const cap of capabilitiesAnswer) {
130
- if (!capabilities.includes(cap)) {
131
- capabilities.push(cap);
132
- change = true;
133
- if (cap === question_1.TabOptionItem.id) {
134
- pluginsToScaffold.push(frontendPlugin);
135
- pluginsToScaffold.push(typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SimpleAuthPlugin));
150
+ const capabilitiesToAddManifest = [];
151
+ const pluginNamesToScaffold = new Set();
152
+ const pluginNamesToArm = new Set();
153
+ const newCapabilitySet = new Set();
154
+ solutionSettings.capabilities.forEach((c) => newCapabilitySet.add(c));
155
+ const vsProject = core_1.isVSProject(ctx.projectSetting);
156
+ // 4. check Tab
157
+ if (capabilitiesAnswer.includes(question_1.TabOptionItem.id)) {
158
+ if (vsProject) {
159
+ pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
160
+ if (!alreadyHasTab) {
161
+ pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
136
162
  }
137
- else if ((cap === question_1.BotOptionItem.id || cap === question_1.MessageExtensionItem.id) &&
138
- !pluginsToScaffold.includes(botPlugin)) {
139
- pluginsToScaffold.push(botPlugin);
163
+ }
164
+ else {
165
+ if (!alreadyHasTab) {
166
+ pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
167
+ pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
140
168
  }
141
169
  }
170
+ capabilitiesToAddManifest.push({ name: "staticTab" });
171
+ newCapabilitySet.add(question_1.TabOptionItem.id);
142
172
  }
143
- if (change) {
144
- if (tools_1.isArmSupportEnabled()) {
145
- showUpdateArmTemplateNotice(ctx.userInteraction);
173
+ // 5. check Bot
174
+ if (capabilitiesAnswer.includes(question_1.BotOptionItem.id)) {
175
+ if (vsProject) {
176
+ pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
177
+ if (!alreadyHasBot && !alreadyHasME) {
178
+ pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
179
+ }
180
+ }
181
+ else {
182
+ if (!alreadyHasBot && !alreadyHasME) {
183
+ pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
184
+ pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
185
+ }
146
186
  }
147
- settings.capabilities = capabilities;
148
- utils_1.reloadV2Plugins(settings);
149
- const pluginNames = pluginsToScaffold.map((p) => p.name).join(",");
150
- (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(`start scaffolding ${pluginNames}.....`);
151
- const scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, true);
187
+ capabilitiesToAddManifest.push({ name: "Bot" });
188
+ newCapabilitySet.add(question_1.BotOptionItem.id);
189
+ }
190
+ // 6. check MessageExtension
191
+ if (capabilitiesAnswer.includes(question_1.MessageExtensionItem.id)) {
192
+ if (vsProject) {
193
+ pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
194
+ if (!alreadyHasBot && !alreadyHasME) {
195
+ pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
196
+ }
197
+ }
198
+ else {
199
+ if (!alreadyHasBot && !alreadyHasME) {
200
+ pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
201
+ pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
202
+ }
203
+ }
204
+ capabilitiesToAddManifest.push({ name: "MessageExtension" });
205
+ newCapabilitySet.add(question_1.MessageExtensionItem.id);
206
+ }
207
+ // 7. update solution settings
208
+ solutionSettings.capabilities = Array.from(newCapabilitySet);
209
+ utils_1.reloadV2Plugins(solutionSettings);
210
+ // 8. scaffold and update arm
211
+ const pluginsToScaffold = Array.from(pluginNamesToScaffold).map((name) => typedi_1.Container.get(name));
212
+ const pluginsToArm = Array.from(pluginNamesToArm).map((name) => typedi_1.Container.get(name));
213
+ if (pluginsToScaffold.length > 0) {
214
+ const scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputsNew, localSettings, pluginsToScaffold, pluginsToArm);
152
215
  if (scaffoldRes.isErr()) {
153
- (_f = ctx.logProvider) === null || _f === void 0 ? void 0 : _f.info(`failed to scaffold ${pluginNames}!`);
154
216
  ctx.projectSetting.solutionSettings = originalSettings;
155
217
  return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, scaffoldRes.error, ctx.telemetryReporter));
156
218
  }
157
- (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(`finish scaffolding ${pluginNames}!`);
219
+ }
220
+ // 4. update manifest
221
+ if (capabilitiesToAddManifest.length > 0 || pluginsToScaffold.length > 0) {
222
+ await appStudioPlugin.addCapabilities(ctx, inputsWithProjectPath, capabilitiesToAddManifest);
223
+ }
224
+ if (capabilitiesAnswer.length > 0) {
158
225
  const addNames = capabilitiesAnswer.map((c) => `'${c}'`).join(" and ");
159
226
  const single = capabilitiesAnswer.length === 1;
160
227
  const template = inputs.platform === teamsfx_api_1.Platform.CLI
161
228
  ? single
162
- ? tools_1.getStrings().solution.AddCapabilityNoticeForCli
163
- : tools_1.getStrings().solution.AddCapabilitiesNoticeForCli
229
+ ? tools_1.getStrings().solution.addCapability.AddCapabilityNoticeForCli
230
+ : tools_1.getStrings().solution.addCapability.AddCapabilitiesNoticeForCli
164
231
  : single
165
- ? tools_1.getStrings().solution.AddCapabilityNotice
166
- : tools_1.getStrings().solution.AddCapabilitiesNotice;
232
+ ? tools_1.getStrings().solution.addCapability.AddCapabilityNotice
233
+ : tools_1.getStrings().solution.addCapability.AddCapabilitiesNotice;
167
234
  const msg = util.format(template, addNames);
168
235
  ctx.userInteraction.showMessage("info", msg, false);
169
- (_h = ctx.telemetryReporter) === null || _h === void 0 ? void 0 : _h.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
236
+ (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
170
237
  [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
171
238
  [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
172
239
  [constants_1.SolutionTelemetryProperty.Capabilities]: capabilitiesAnswer.join(";"),
173
240
  });
174
- return teamsfx_api_1.ok({ solutionSettings: settings, solutionConfig: { provisionSucceeded: false } });
175
241
  }
176
- const cannotAddCapWarnMsg = "Add nothing";
177
- ctx.userInteraction.showMessage("warn", cannotAddCapWarnMsg, false);
178
- ctx.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
179
- [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
180
- [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
181
- [constants_1.SolutionTelemetryProperty.Capabilities]: [].join(";"),
242
+ return teamsfx_api_1.ok({
243
+ solutionSettings: solutionSettings,
244
+ solutionConfig: { provisionSucceeded: false },
182
245
  });
183
- return teamsfx_api_1.ok({});
184
246
  }
185
247
  exports.addCapability = addCapability;
186
248
  function showUpdateArmTemplateNotice(ui) {
@@ -188,98 +250,105 @@ function showUpdateArmTemplateNotice(ui) {
188
250
  ui === null || ui === void 0 ? void 0 : ui.showMessage("info", msg, false);
189
251
  }
190
252
  exports.showUpdateArmTemplateNotice = showUpdateArmTemplateNotice;
191
- async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, generateTemplate, pluginsToDoArm) {
253
+ async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, pluginsToDoArm) {
192
254
  const result = await scaffolding_1.scaffoldByPlugins(ctx, inputs, localSettings, pluginsToScaffold);
193
255
  if (result.isErr()) {
194
256
  return result;
195
257
  }
196
- if (!generateTemplate || !tools_1.isArmSupportEnabled()) {
197
- return result;
258
+ const scaffoldLocalDebugSettingsResult = await scaffolding_2.scaffoldLocalDebugSettings(ctx, inputs, localSettings);
259
+ if (scaffoldLocalDebugSettingsResult.isErr()) {
260
+ return scaffoldLocalDebugSettingsResult;
198
261
  }
199
- return generateResourceTemplate_1.generateResourceTemplateForPlugins(ctx, inputs, pluginsToDoArm ? pluginsToDoArm : pluginsToScaffold);
262
+ const pluginsToUpdateArm = pluginsToDoArm ? pluginsToDoArm : pluginsToScaffold;
263
+ if (pluginsToUpdateArm.length > 0) {
264
+ return generateResourceTemplate_1.generateResourceTemplateForPlugins(ctx, inputs, pluginsToUpdateArm);
265
+ }
266
+ return teamsfx_api_1.ok(undefined);
200
267
  }
201
268
  async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvider) {
202
- var _a, _b, _c, _d, _e;
269
+ var _a, _b, _c;
203
270
  (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResourceStart, {
204
271
  [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
205
272
  });
206
- const settings = utils_1.getAzureSolutionSettings(ctx);
207
- const canProceed = canAddResource(settings, ctx.telemetryReporter);
273
+ // 1. checking addable
274
+ const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
275
+ const originalSettings = lodash_1.cloneDeep(solutionSettings);
276
+ const inputsNew = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, existingResources: originalSettings.activeResourcePlugins });
277
+ const canProceed = canAddResource(ctx.projectSetting, ctx.telemetryReporter);
208
278
  if (canProceed.isErr()) {
209
- return canProceed;
279
+ return teamsfx_api_1.err(canProceed.error);
210
280
  }
211
- const selectedPlugins = settings.activeResourcePlugins;
212
- const functionPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin);
213
- const sqlPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin);
214
- const apimPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin);
215
- const keyVaultPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin);
216
- const localDebugPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.LocalDebugPlugin);
217
- const alreadyHaveFunction = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(functionPlugin.name);
218
- const alreadyHaveSql = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(sqlPlugin.name);
219
- const alreadyHaveApim = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(apimPlugin.name);
220
- const alreadyHaveKeyVault = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(keyVaultPlugin.name);
281
+ // 2. check answer
221
282
  const addResourcesAnswer = inputs[question_1.AzureSolutionQuestionNames.AddResources];
222
- if (!addResourcesAnswer) {
223
- return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer of ${question_1.AzureSolutionQuestionNames.AddResources} is empty!`), constants_1.SolutionSource, constants_1.SolutionError.InvalidInput));
283
+ if (!addResourcesAnswer || addResourcesAnswer.length === 0) {
284
+ (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
285
+ [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
286
+ [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
287
+ [constants_1.SolutionTelemetryProperty.Resources]: [].join(";"),
288
+ });
289
+ return teamsfx_api_1.ok({});
224
290
  }
291
+ const alreadyHaveFunction = solutionSettings.azureResources.includes(question_1.AzureResourceFunction.id);
292
+ const alreadyHaveApim = solutionSettings.azureResources.includes(question_1.AzureResourceApim.id);
293
+ const alreadyHaveKeyVault = solutionSettings.azureResources.includes(question_1.AzureResourceKeyVault.id);
225
294
  const addSQL = addResourcesAnswer.includes(question_1.AzureResourceSQL.id);
226
- const addFunc = addResourcesAnswer.includes(question_1.AzureResourceFunction.id);
227
295
  const addApim = addResourcesAnswer.includes(question_1.AzureResourceApim.id);
228
296
  const addKeyVault = addResourcesAnswer.includes(question_1.AzureResourceKeyVault.id);
229
- if ((alreadyHaveSql && addSQL) ||
230
- (alreadyHaveApim && addApim) ||
231
- (alreadyHaveKeyVault && addKeyVault)) {
232
- const e = teamsfx_api_1.returnUserError(new Error("SQL/APIM/KeyVault is already added."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
297
+ const addFunc = addResourcesAnswer.includes(question_1.AzureResourceFunction.id) || (addApim && !alreadyHaveFunction);
298
+ // 3. check APIM and KeyVault addable
299
+ if ((alreadyHaveApim && addApim) || (alreadyHaveKeyVault && addKeyVault)) {
300
+ const e = new teamsfx_api_1.UserError(new Error("APIM/KeyVault is already added."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
233
301
  return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, ctx.telemetryReporter));
234
302
  }
235
- let addNewResourceToProvision = false;
236
- const notifications = [];
237
- const pluginsToScaffold = [localDebugPlugin];
303
+ const newResourceSet = new Set();
304
+ solutionSettings.azureResources.forEach((r) => newResourceSet.add(r));
305
+ const addedResources = [];
306
+ const pluginsToScaffold = [];
238
307
  const pluginsToDoArm = [];
239
- const azureResource = Array.from(settings.azureResources || []);
240
308
  let scaffoldApim = false;
241
- if (addFunc || ((addSQL || addApim) && !alreadyHaveFunction)) {
309
+ // 4. check Function
310
+ if (addFunc) {
311
+ const functionPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin);
242
312
  pluginsToScaffold.push(functionPlugin);
243
- if (!azureResource.includes(question_1.AzureResourceFunction.id)) {
244
- azureResource.push(question_1.AzureResourceFunction.id);
245
- addNewResourceToProvision = true;
313
+ if (!alreadyHaveFunction) {
246
314
  pluginsToDoArm.push(functionPlugin);
247
315
  }
248
- notifications.push(question_1.AzureResourceFunction.label);
316
+ addedResources.push(question_1.AzureResourceFunction.id);
249
317
  }
250
- if (addSQL && !alreadyHaveSql) {
251
- pluginsToScaffold.push(sqlPlugin);
318
+ // 5. check SQL
319
+ if (addSQL) {
320
+ const sqlPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin);
321
+ const identityPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.IdentityPlugin);
252
322
  pluginsToDoArm.push(sqlPlugin);
253
- azureResource.push(question_1.AzureResourceSQL.id);
254
- notifications.push(question_1.AzureResourceSQL.label);
255
- addNewResourceToProvision = true;
323
+ if (!solutionSettings.activeResourcePlugins.includes(identityPlugin.name)) {
324
+ // add identity for first time
325
+ pluginsToDoArm.push(identityPlugin);
326
+ }
327
+ addedResources.push(question_1.AzureResourceSQL.id);
256
328
  }
257
- if (addApim && !alreadyHaveApim) {
329
+ // 6. check APIM
330
+ const apimPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin);
331
+ if (addApim) {
258
332
  // We don't add apimPlugin into pluginsToScaffold because
259
333
  // apim plugin needs to modify config output during scaffolding,
260
334
  // which is not supported by the scaffoldSourceCode API.
261
- // The scaffolding will run later as a usertask as a work around.
262
- azureResource.push(question_1.AzureResourceApim.id);
263
- notifications.push(question_1.AzureResourceApim.label);
264
- addNewResourceToProvision = true;
335
+ // The scaffolding will run later as a userTask as a work around.
336
+ addedResources.push(question_1.AzureResourceApim.id);
265
337
  pluginsToDoArm.push(apimPlugin);
266
338
  scaffoldApim = true;
267
339
  }
268
- if (addKeyVault && !alreadyHaveKeyVault) {
269
- pluginsToScaffold.push(keyVaultPlugin);
340
+ if (addKeyVault) {
341
+ const keyVaultPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin);
270
342
  pluginsToDoArm.push(keyVaultPlugin);
271
- azureResource.push(question_1.AzureResourceKeyVault.id);
272
- notifications.push(question_1.AzureResourceKeyVault.label);
273
- addNewResourceToProvision = true;
343
+ addedResources.push(question_1.AzureResourceKeyVault.id);
274
344
  }
275
- if (notifications.length > 0) {
276
- if (tools_1.isArmSupportEnabled() && addNewResourceToProvision) {
277
- showUpdateArmTemplateNotice(ctx.userInteraction);
278
- }
279
- settings.azureResources = azureResource;
280
- utils_1.reloadV2Plugins(settings);
281
- (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`start scaffolding ${notifications.join(",")}.....`);
282
- let scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, addNewResourceToProvision, pluginsToDoArm);
345
+ // 7. update solution settings
346
+ addedResources.forEach((r) => newResourceSet.add(r));
347
+ solutionSettings.azureResources = Array.from(newResourceSet);
348
+ utils_1.reloadV2Plugins(solutionSettings);
349
+ // 8. scaffold and update arm
350
+ if (pluginsToScaffold.length > 0 || pluginsToDoArm.length > 0) {
351
+ let scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputsNew, localSettings, pluginsToScaffold, pluginsToDoArm);
283
352
  if (scaffoldApim) {
284
353
  if (apimPlugin && apimPlugin.executeUserTask) {
285
354
  const result = await apimPlugin.executeUserTask(ctx, inputs, func, {}, envInfo, tokenProvider);
@@ -289,21 +358,27 @@ async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvi
289
358
  }
290
359
  }
291
360
  if (scaffoldRes.isErr()) {
292
- (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(`failed to scaffold ${notifications.join(",")}!`);
361
+ ctx.projectSetting.solutionSettings = originalSettings;
293
362
  return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, scaffoldRes.error, ctx.telemetryReporter));
294
363
  }
295
- (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(`finish scaffolding ${notifications.join(",")}!`);
296
- ctx.userInteraction.showMessage("info", util.format(inputs.platform === teamsfx_api_1.Platform.CLI
297
- ? tools_1.getStrings().solution.AddResourceNoticeForCli
298
- : tools_1.getStrings().solution.AddResourceNotice, notifications.join(",")), false);
364
+ const addNames = addedResources.map((c) => `'${c}'`).join(" and ");
365
+ const single = addedResources.length === 1;
366
+ const template = inputs.platform === teamsfx_api_1.Platform.CLI
367
+ ? single
368
+ ? tools_1.getStrings().solution.addResource.AddResourceNoticeForCli
369
+ : tools_1.getStrings().solution.addResource.AddResourcesNoticeForCli
370
+ : single
371
+ ? tools_1.getStrings().solution.addResource.AddResourceNotice
372
+ : tools_1.getStrings().solution.addResource.AddResourcesNotice;
373
+ ctx.userInteraction.showMessage("info", util.format(template, addNames), false);
299
374
  }
300
- (_e = ctx.telemetryReporter) === null || _e === void 0 ? void 0 : _e.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
375
+ (_c = ctx.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
301
376
  [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
302
377
  [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
303
378
  [constants_1.SolutionTelemetryProperty.Resources]: addResourcesAnswer.join(";"),
304
379
  });
305
- return teamsfx_api_1.ok(addNewResourceToProvision
306
- ? { solutionSettings: settings, solutionConfig: { provisionSucceeded: false } }
380
+ return teamsfx_api_1.ok(pluginsToDoArm.length > 0
381
+ ? { solutionSettings: solutionSettings, solutionConfig: { provisionSucceeded: false } }
307
382
  : teamsfx_api_1.Void);
308
383
  }
309
384
  exports.addResource = addResource;
@@ -1 +1 @@
1
- {"version":3,"file":"executeUserTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"executeUserTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":";;;;AAAA,wDAyBgC;AAChC,oDAAsD;AACtD,mCAAoE;AACpE,4CAOsB;AACtB,mDAA6B;AAC7B,0CAUqB;AACrB,mCAAmC;AACnC,wCAAkE;AAClE,wEAA0F;AAC1F,mCAAmC;AACnC,+CAAkD;AAClD,yEAAgF;AAChF,sDAAkE;AAElE,+CAA6D;AAC7D,2CAA+C;AACxC,KAAK,UAAU,eAAe,CACnC,GAAe,EACf,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAqB,EACrB,aAA4B;IAE5B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,MAAM,KAAK,eAAe,EAAE;QAC9B,OAAO,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;KAClD;IACD,IAAI,MAAM,KAAK,aAAa,EAAE;QAC5B,OAAO,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;KAC9E;IACD,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAClC,IAAI,MAAM,KAAK,wBAAwB,EAAE;YACvC,0BAA0B;YAC1B,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAC5B,0BAAc,EACd,yBAAa,CAAC,mBAAmB,CAClC,CACF,CAAC;SACH;aAAM,IAAI,MAAM,KAAK,WAAW,EAAE;YACjC,0FAA0F;YAC1F,4EAA4E;YAC5E,gEAAgE;YAChE,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE;gBAC5B,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,iDAAiD,MAAM,CAAC,QAAQ,EAAE,CAAC,EAC7E,0BAAc,EACd,yBAAa,CAAC,mBAAmB,CAClC,CACF,CAAC;aACH;YACD,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;YAC5F,IAAI,eAAe,CAAC,kBAAkB,EAAE;gBACtC,OAAO,eAAe,CAAC,kBAAkB,CACvC,GAAG,EACH,MAAM,EACN,OAAO,EACP,aAAa,CAAC,cAAc,CAC7B,CAAC;aACH;SACF;aAAM,IAAI,MAAM,KAAK,kBAAkB,EAAE;YACxC,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;YAC5F,IAAI,eAAe,CAAC,eAAe,EAAE;gBACnC,OAAO,MAAM,eAAe,CAAC,eAAe,CAC1C,GAAG,EACH,MAAM,EACN,IAAI,EACJ,aAAa,EACb,OAAO,EACP,aAAa,CACd,CAAC;aACH;SACF;aAAM,IAAI,MAAM,KAAK,cAAc,EAAE;YACpC,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;YAC5F,IAAI,eAAe,CAAC,eAAe,EAAE;gBACnC,OAAO,MAAM,eAAe,CAAC,eAAe,CAC1C,GAAG,EACH,MAAM,EACN,IAAI,EACJ,aAAa,EACb,OAAO,EACP,aAAa,CACd,CAAC;aACH;SACF;aAAM,IAAI,MAAM,KAAK,kBAAkB,EAAE;YACxC,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;YAC5F,IAAI,eAAe,CAAC,eAAe,EAAE;gBACnC,OAAO,eAAe,CAAC,eAAe,CACpC,GAAG,EACH,MAAM,EACN,IAAI,EACJ,aAAa,EACb,OAAO,EACP,aAAa,CACd,CAAC;aACH;SACF;aAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;YAC5B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,SAAS,GAAG,mDAAyB,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,MAAM,IAAI,MAAM,CAAC,eAAe,EAAE;gBACpC,OAAO,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;aACzF;SACF;KACF;IAED,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAC/D,0BAAc,EACd,4BAA4B,CAC7B,CACF,CAAC;AACJ,CAAC;AAtGD,0CAsGC;AAED,SAAgB,gBAAgB,CAC9B,QAA+B,EAC/B,iBAAoC;IAEpC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,KAAK,8BAAmB,CAAC,EAAE,CAAC,EAAE;QACnD,MAAM,CAAC,GAAG,IAAI,uBAAS,CACrB,yBAAa,CAAC,uBAAuB,EACrC,kBAAU,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,gBAAgB,EACpD,0BAAc,CACf,CAAC;QACF,OAAO,iBAAG,CACR,wCAAiC,CAAC,kCAAsB,CAAC,aAAa,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC9F,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAfD,4CAeC;AAED,SAAgB,cAAc,CAC5B,cAA+B,EAC/B,iBAAoC;IAEpC,MAAM,IAAI,GAAG,kBAAW,CAAC,cAAc,CAAC,CAAC;IACzC,IAAI,IAAI,EAAE;QACR,MAAM,CAAC,GAAG,IAAI,uBAAS,CACrB,yBAAa,CAAC,qBAAqB,EACnC,kBAAU,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,sBAAsB,EACxD,0BAAc,CACf,CAAC;QACF,OAAO,iBAAG,CACR,wCAAiC,CAAC,kCAAsB,CAAC,WAAW,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC5F,CAAC;KACH;IACD,MAAM,gBAAgB,GAAG,cAAc,CAAC,gBAAyC,CAAC;IAClF,IAAI,CAAC,CAAC,gBAAgB,CAAC,QAAQ,KAAK,8BAAmB,CAAC,EAAE,CAAC,EAAE;QAC3D,MAAM,CAAC,GAAG,IAAI,uBAAS,CACrB,yBAAa,CAAC,qBAAqB,EACnC,kBAAU,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAClD,0BAAc,CACf,CAAC;QACF,OAAO,iBAAG,CACR,wCAAiC,CAAC,kCAAsB,CAAC,WAAW,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAC5F,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA3BD,wCA2BC;AAEM,KAAK,UAAU,aAAa,CACjC,GAAe,EACf,MAAc,EACd,aAAmB;;IAInB,GAAG,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,kCAAsB,CAAC,kBAAkB,EAAE;QAClF,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;KACtE,CAAC,CAAC;IAEH,sBAAsB;IACtB,MAAM,gBAAgB,GAA0B,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,kBAAS,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,SAAS,mCACV,MAAM,KACT,WAAW,EAAE,MAAM,CAAC,WAAY,EAChC,iBAAiB,EAAE,gBAAgB,CAAC,qBAAqB,GAC1D,CAAC;IACF,MAAM,UAAU,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC7E,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;QACtB,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KAC9B;IAED,kBAAkB;IAClB,MAAM,kBAAkB,GAAG,MAAM,CAAC,qCAA0B,CAAC,YAAY,CAAa,CAAC;IACvF,IAAI,CAAC,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1D,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,aAAa,EAAE;YAC9E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;YACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;YACjE,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;SACvD,CAAC,CAAC;QACH,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;KACf;IAED,4BAA4B;IAC5B,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IAC/E,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IAC/E,MAAM,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACrF,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,SAAS,CAAC,CAAC;IAC/F,MAAM,qBAAqB,GAAG,MAAkC,CAAC;IACjE,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,qBAAqB,CAC9D,GAAG,EACH,MAAkC,EAClC,WAAW,CACZ,CAAC;IACF,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE;QACxB,OAAO,iBAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;KAChC;IACD,MAAM,YAAY,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;IACzC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,qBAAqB,CAC9D,GAAG,EACH,MAAkC,EAClC,KAAK,CACN,CAAC;IACF,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE;QACxB,OAAO,iBAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;KAChC;IACD,MAAM,YAAY,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;IACzC,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,qBAAqB,CAC7D,GAAG,EACH,MAAkC,EAClC,kBAAkB,CACnB,CAAC;IACF,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;QACvB,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;KAC/B;IACD,MAAM,WAAW,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC;IACvC,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE;QAC3F,MAAM,KAAK,GAAG,IAAI,uBAAS,CACzB,yBAAa,CAAC,qBAAqB,EACnC,kBAAU,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,cAAc,EAClD,0BAAc,CACf,CAAC;QACF,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,aAAa,EACpC,KAAK,EACL,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;KACH;IAED,MAAM,yBAAyB,GAQzB,EAAE,CAAC;IACT,MAAM,qBAAqB,GAAgB,IAAI,GAAG,EAAU,CAAC;IAC7D,MAAM,gBAAgB,GAAgB,IAAI,GAAG,EAAU,CAAC;IACxD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,SAAS,GAAG,kBAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAElD,eAAe;IACf,IAAI,kBAAkB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EAAE;QACjD,IAAI,SAAS,EAAE;YACb,qBAAqB,CAAC,GAAG,CAAC,2CAAiB,CAAC,cAAc,CAAC,CAAC;YAC5D,IAAI,CAAC,aAAa,EAAE;gBAClB,gBAAgB,CAAC,GAAG,CAAC,2CAAiB,CAAC,cAAc,CAAC,CAAC;aACxD;SACF;aAAM;YACL,IAAI,CAAC,aAAa,EAAE;gBAClB,qBAAqB,CAAC,GAAG,CAAC,2CAAiB,CAAC,cAAc,CAAC,CAAC;gBAC5D,gBAAgB,CAAC,GAAG,CAAC,2CAAiB,CAAC,cAAc,CAAC,CAAC;aACxD;SACF;QACD,yBAAyB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACtD,gBAAgB,CAAC,GAAG,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;KACxC;IACD,eAAe;IACf,IAAI,kBAAkB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EAAE;QACjD,IAAI,SAAS,EAAE;YACb,qBAAqB,CAAC,GAAG,CAAC,2CAAiB,CAAC,cAAc,CAAC,CAAC;YAC5D,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY,EAAE;gBACnC,gBAAgB,CAAC,GAAG,CAAC,2CAAiB,CAAC,SAAS,CAAC,CAAC;aACnD;SACF;aAAM;YACL,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY,EAAE;gBACnC,qBAAqB,CAAC,GAAG,CAAC,2CAAiB,CAAC,SAAS,CAAC,CAAC;gBACvD,gBAAgB,CAAC,GAAG,CAAC,2CAAiB,CAAC,SAAS,CAAC,CAAC;aACnD;SACF;QACD,yBAAyB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAChD,gBAAgB,CAAC,GAAG,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;KACxC;IACD,4BAA4B;IAC5B,IAAI,kBAAkB,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE;QACxD,IAAI,SAAS,EAAE;YACb,qBAAqB,CAAC,GAAG,CAAC,2CAAiB,CAAC,cAAc,CAAC,CAAC;YAC5D,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY,EAAE;gBACnC,gBAAgB,CAAC,GAAG,CAAC,2CAAiB,CAAC,SAAS,CAAC,CAAC;aACnD;SACF;aAAM;YACL,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY,EAAE;gBACnC,qBAAqB,CAAC,GAAG,CAAC,2CAAiB,CAAC,SAAS,CAAC,CAAC;gBACvD,gBAAgB,CAAC,GAAG,CAAC,2CAAiB,CAAC,SAAS,CAAC,CAAC;aACnD;SACF;QACD,yBAAyB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAC7D,gBAAgB,CAAC,GAAG,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;KAC/C;IAED,8BAA8B;IAC9B,gBAAgB,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC7D,uBAAe,CAAC,gBAAgB,CAAC,CAAC;IAElC,6BAA6B;IAC7B,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvE,kBAAS,CAAC,GAAG,CAAoB,IAAI,CAAC,CACvC,CAAC;IACF,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7D,kBAAS,CAAC,GAAG,CAAoB,IAAI,CAAC,CACvC,CAAC;IACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,WAAW,GAAG,MAAM,+BAA+B,CACvD,GAAG,EACH,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,YAAY,CACb,CAAC;QACF,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;YACvB,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACvD,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,aAAa,EACpC,WAAW,CAAC,KAAK,EACjB,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;SACH;KACF;IACD,qBAAqB;IACrB,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QACxE,MAAM,eAAe,CAAC,eAAe,CAAC,GAAG,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC;KAC9F;IACD,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC;QAC/C,MAAM,QAAQ,GACZ,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG;YAC9B,CAAC,CAAC,MAAM;gBACN,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,yBAAyB;gBAC/D,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,2BAA2B;YACnE,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,mBAAmB;gBACzD,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,qBAAqB,CAAC;QAChE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC5C,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACpD,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,aAAa,EAAE;YAC9E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;YACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;YACjE,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;SACvE,CAAC,CAAC;KACJ;IACD,OAAO,gBAAE,CAAC;QACR,gBAAgB,EAAE,gBAAgB;QAClC,cAAc,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE;KAC9C,CAAC,CAAC;AACL,CAAC;AA/MD,sCA+MC;AAED,SAAgB,2BAA2B,CAAC,EAAoB;IAC9D,MAAM,GAAG,GAAW,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IAC/E,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AACtC,CAAC;AAHD,kEAGC;AAED,KAAK,UAAU,+BAA+B,CAC5C,GAAe,EACf,MAAkE,EAClE,aAAmB,EACnB,iBAAsC,EACtC,cAAoC;IAEpC,MAAM,MAAM,GAAG,MAAM,+BAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IACtF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;QAClB,OAAO,MAAM,CAAC;KACf;IACD,MAAM,gCAAgC,GAAG,MAAM,wCAA0B,CACvE,GAAG,EACH,MAAM,EACN,aAAa,CACd,CAAC;IACF,IAAI,gCAAgC,CAAC,KAAK,EAAE,EAAE;QAC5C,OAAO,gCAAgC,CAAC;KACzC;IACD,MAAM,kBAAkB,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAC/E,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,OAAO,6DAAkC,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;KAC5E;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,IAAU,EACV,OAAqB,EACrB,aAA4B;;IAE5B,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,gBAAgB,EAAE;QACjF,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;KACtE,CAAC,CAAC;IAEH,sBAAsB;IACtB,MAAM,gBAAgB,GAA0B,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,kBAAS,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,SAAS,mCACV,MAAM,KACT,WAAW,EAAE,MAAM,CAAC,WAAY,EAChC,iBAAiB,EAAE,gBAAgB,CAAC,qBAAqB,GAC1D,CAAC;IACF,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC7E,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;QACtB,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KAC9B;IAED,kBAAkB;IAClB,MAAM,kBAAkB,GAAG,MAAM,CAAC,qCAA0B,CAAC,YAAY,CAAa,CAAC;IACvF,IAAI,CAAC,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1D,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,WAAW,EAAE;YAC5E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;YACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;YACjE,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;SACpD,CAAC,CAAC;QACH,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;KACf;IAED,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;IAC/F,MAAM,eAAe,GAAG,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,4BAAiB,CAAC,EAAE,CAAC,CAAC;IACvF,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;IAC/F,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,2BAAgB,CAAC,EAAE,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,4BAAiB,CAAC,EAAE,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,kBAAkB,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;IAC1E,MAAM,OAAO,GACX,kBAAkB,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE7F,qCAAqC;IACrC,IAAI,CAAC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,mBAAmB,IAAI,WAAW,CAAC,EAAE;QACxE,MAAM,CAAC,GAAG,IAAI,uBAAS,CACrB,IAAI,KAAK,CAAC,iCAAiC,CAAC,EAC5C,0BAAc,EACd,yBAAa,CAAC,qBAAqB,CACpC,CAAC;QACF,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,WAAW,EAClC,CAAC,EACD,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;KACH;IAED,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,gBAAgB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,MAAM,iBAAiB,GAAwB,EAAE,CAAC;IAClD,MAAM,cAAc,GAAwB,EAAE,CAAC;IAC/C,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,oBAAoB;IACpB,IAAI,OAAO,EAAE;QACX,MAAM,cAAc,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,cAAc,CAAC,CAAC;QAC1F,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvC,IAAI,CAAC,mBAAmB,EAAE;YACxB,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACrC;QACD,cAAc,CAAC,IAAI,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;KAC/C;IACD,eAAe;IACf,IAAI,MAAM,EAAE;QACV,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,SAAS,CAAC,CAAC;QAChF,MAAM,cAAc,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,cAAc,CAAC,CAAC;QAC1F,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YACzE,8BAA8B;YAC9B,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACrC;QACD,cAAc,CAAC,IAAI,CAAC,2BAAgB,CAAC,EAAE,CAAC,CAAC;KAC1C;IACD,gBAAgB;IAChB,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,UAAU,CAAC,CAAC;IAClF,IAAI,OAAO,EAAE;QACX,yDAAyD;QACzD,gEAAgE;QAChE,wDAAwD;QACxD,iEAAiE;QACjE,cAAc,CAAC,IAAI,CAAC,4BAAiB,CAAC,EAAE,CAAC,CAAC;QAC1C,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChC,YAAY,GAAG,IAAI,CAAC;KACrB;IACD,IAAI,WAAW,EAAE;QACf,MAAM,cAAc,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,cAAc,CAAC,CAAC;QAC1F,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACpC,cAAc,CAAC,IAAI,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;KAC/C;IAED,8BAA8B;IAC9B,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,gBAAgB,CAAC,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC7D,uBAAe,CAAC,gBAAgB,CAAC,CAAC;IAElC,6BAA6B;IAC7B,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7D,IAAI,WAAW,GAAG,MAAM,+BAA+B,CACrD,GAAG,EACH,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,cAAc,CACf,CAAC;QACF,IAAI,YAAY,EAAE;YAChB,IAAI,UAAU,IAAI,UAAU,CAAC,eAAe,EAAE;gBAC5C,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,eAAe,CAC7C,GAAG,EACH,MAAM,EACN,IAAI,EACJ,EAAE,EACF,OAAO,EACP,aAAa,CACd,CAAC;gBACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;oBAClB,WAAW,GAAG,qBAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;iBAC9C;aACF;SACF;QACD,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;YACvB,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACvD,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,WAAW,EAClC,WAAW,CAAC,KAAK,EACjB,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;SACH;QACD,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC;QAC3C,MAAM,QAAQ,GACZ,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG;YAC9B,CAAC,CAAC,MAAM;gBACN,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,uBAAuB;gBAC3D,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,wBAAwB;YAC9D,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,iBAAiB;gBACrD,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC;QAC3D,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;KACjF;IAED,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,WAAW,EAAE;QAC5E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;QACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;QACjE,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;KACpE,CAAC,CAAC;IACH,OAAO,gBAAE,CACP,cAAc,CAAC,MAAM,GAAG,CAAC;QACvB,CAAC,CAAC,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,EAAE;QACvF,CAAC,CAAC,kBAAI,CACT,CAAC;AACJ,CAAC;AAtKD,kCAsKC;AAED,SAAgB,qCAAqC,CACnD,OAAgB;IAEhB,IAAI,OAAO,IAAI,SAAS,EAAE;QACxB,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,oBAAoB,CAAC,EAC/B,0BAAc,EACd,yBAAa,CAAC,yCAAyC,CACxD,CACF,CAAC;KACH;IAED,MAAM,KAAK,GAAmC;QAC5C,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACpC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,KAAK,IAAI,SAAS,EAAE;YACtB,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,GAAG,GAAG,YAAY,CAAC,EAC7B,0BAAc,EACd,yBAAa,CAAC,yCAAyC,CACxD,CACF,CAAC;SACH;QACA,KAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;KAC7B;IAED,OAAO,gBAAE,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC;AAlCD,sFAkCC"}