@microsoft/teamsfx-core 3.0.5-alpha.52018e56e.0 → 3.0.5-alpha.70577dbcc.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 (147) hide show
  1. package/build/client/graphClient.js +1 -1
  2. package/build/client/graphClient.js.map +1 -1
  3. package/build/common/constants.d.ts +0 -1
  4. package/build/common/constants.d.ts.map +1 -1
  5. package/build/common/constants.js +1 -2
  6. package/build/common/constants.js.map +1 -1
  7. package/build/common/featureFlags.d.ts +5 -5
  8. package/build/common/featureFlags.d.ts.map +1 -1
  9. package/build/common/featureFlags.js +9 -9
  10. package/build/common/featureFlags.js.map +1 -1
  11. package/build/common/templates-config.json +1 -1
  12. package/build/component/configManager/validator.d.ts.map +1 -1
  13. package/build/component/configManager/validator.js +1 -0
  14. package/build/component/configManager/validator.js.map +1 -1
  15. package/build/component/coordinator/index.d.ts.map +1 -1
  16. package/build/component/coordinator/index.js +0 -1
  17. package/build/component/coordinator/index.js.map +1 -1
  18. package/build/component/deps-checker/constant/helpLink.d.ts +2 -0
  19. package/build/component/deps-checker/constant/helpLink.d.ts.map +1 -1
  20. package/build/component/deps-checker/constant/helpLink.js +3 -1
  21. package/build/component/deps-checker/constant/helpLink.js.map +1 -1
  22. package/build/component/deps-checker/internal/funcToolChecker.js +4 -4
  23. package/build/component/deps-checker/internal/funcToolChecker.js.map +1 -1
  24. package/build/component/deps-checker/internal/testToolChecker.js +4 -4
  25. package/build/component/deps-checker/internal/testToolChecker.js.map +1 -1
  26. package/build/component/driver/index.d.ts +19 -20
  27. package/build/component/driver/index.d.ts.map +1 -1
  28. package/build/component/driver/index.js +19 -20
  29. package/build/component/driver/index.js.map +1 -1
  30. package/build/component/driver/m365/acquire.d.ts +3 -0
  31. package/build/component/driver/m365/acquire.d.ts.map +1 -1
  32. package/build/component/driver/m365/acquire.js +29 -19
  33. package/build/component/driver/m365/acquire.js.map +1 -1
  34. package/build/component/driver/share/utils.d.ts.map +1 -1
  35. package/build/component/driver/share/utils.js +12 -10
  36. package/build/component/driver/share/utils.js.map +1 -1
  37. package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +1 -1
  38. package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
  39. package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +5 -2
  40. package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
  41. package/build/component/driver/teamsApp/utils/utils.d.ts +1 -0
  42. package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
  43. package/build/component/driver/teamsApp/utils/utils.js +8 -4
  44. package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
  45. package/build/component/driver/util/utils.d.ts.map +1 -1
  46. package/build/component/driver/util/utils.js +6 -4
  47. package/build/component/driver/util/utils.js.map +1 -1
  48. package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
  49. package/build/component/generator/officeAddin/generator.js +1 -0
  50. package/build/component/generator/officeAddin/generator.js.map +1 -1
  51. package/build/component/generator/openApiSpec/helper.d.ts.map +1 -1
  52. package/build/component/generator/openApiSpec/helper.js +132 -98
  53. package/build/component/generator/openApiSpec/helper.js.map +1 -1
  54. package/build/component/generator/templates/metadata/agentForTeams.js +30 -30
  55. package/build/component/generator/templates/metadata/agentForTeams.js.map +1 -1
  56. package/build/component/generator/templates/metadata/index.d.ts.map +1 -1
  57. package/build/component/generator/templates/metadata/index.js +0 -3
  58. package/build/component/generator/templates/metadata/index.js.map +1 -1
  59. package/build/component/generator/templates/metadata/me.d.ts.map +1 -1
  60. package/build/component/generator/templates/metadata/me.js +6 -0
  61. package/build/component/generator/templates/metadata/me.js.map +1 -1
  62. package/build/component/generator/templates/metadata/special.js +6 -6
  63. package/build/component/generator/templates/metadata/special.js.map +1 -1
  64. package/build/component/generator/templates/metadata/tab.js +7 -7
  65. package/build/component/generator/templates/metadata/tab.js.map +1 -1
  66. package/build/component/generator/templates/metadata/wxp.d.ts.map +1 -1
  67. package/build/component/generator/templates/metadata/wxp.js +6 -0
  68. package/build/component/generator/templates/metadata/wxp.js.map +1 -1
  69. package/build/component/generator/templates/templateNames.d.ts +2 -3
  70. package/build/component/generator/templates/templateNames.d.ts.map +1 -1
  71. package/build/component/generator/templates/templateNames.js +2 -4
  72. package/build/component/generator/templates/templateNames.js.map +1 -1
  73. package/build/component/m365/constants.d.ts +1 -0
  74. package/build/component/m365/constants.d.ts.map +1 -1
  75. package/build/component/m365/constants.js +2 -1
  76. package/build/component/m365/constants.js.map +1 -1
  77. package/build/component/m365/packageService.d.ts.map +1 -1
  78. package/build/component/m365/packageService.js +37 -5
  79. package/build/component/m365/packageService.js.map +1 -1
  80. package/build/core/FxCore.d.ts.map +1 -1
  81. package/build/core/FxCore.js +1 -1
  82. package/build/core/FxCore.js.map +1 -1
  83. package/build/core/share.d.ts.map +1 -1
  84. package/build/core/share.js +6 -1
  85. package/build/core/share.js.map +1 -1
  86. package/build/error/depCheck.js +1 -1
  87. package/build/error/depCheck.js.map +1 -1
  88. package/build/index.d.ts +2 -2
  89. package/build/index.d.ts.map +1 -1
  90. package/build/index.js +4 -4
  91. package/build/index.js.map +1 -1
  92. package/build/question/create.d.ts.map +1 -1
  93. package/build/question/create.js +7 -15
  94. package/build/question/create.js.map +1 -1
  95. package/build/question/questionNames.d.ts +1 -0
  96. package/build/question/questionNames.d.ts.map +1 -1
  97. package/build/question/questionNames.js +1 -0
  98. package/build/question/questionNames.js.map +1 -1
  99. package/build/question/scaffold/vs/createRootNode.d.ts.map +1 -1
  100. package/build/question/scaffold/vs/createRootNode.js +9 -11
  101. package/build/question/scaffold/vs/createRootNode.js.map +1 -1
  102. package/build/question/scaffold/vsc/CapabilityOptions.d.ts +4 -8
  103. package/build/question/scaffold/vsc/CapabilityOptions.d.ts.map +1 -1
  104. package/build/question/scaffold/vsc/CapabilityOptions.js +26 -44
  105. package/build/question/scaffold/vsc/CapabilityOptions.js.map +1 -1
  106. package/build/question/scaffold/vsc/ProjectTypeOptions.d.ts +2 -4
  107. package/build/question/scaffold/vsc/ProjectTypeOptions.d.ts.map +1 -1
  108. package/build/question/scaffold/vsc/ProjectTypeOptions.js +5 -14
  109. package/build/question/scaffold/vsc/ProjectTypeOptions.js.map +1 -1
  110. package/build/question/scaffold/vsc/createFromTdpNode.d.ts.map +1 -1
  111. package/build/question/scaffold/vsc/createFromTdpNode.js +12 -33
  112. package/build/question/scaffold/vsc/createFromTdpNode.js.map +1 -1
  113. package/build/question/scaffold/vsc/createRootNode.d.ts +2 -1
  114. package/build/question/scaffold/vsc/createRootNode.d.ts.map +1 -1
  115. package/build/question/scaffold/vsc/createRootNode.js +25 -39
  116. package/build/question/scaffold/vsc/createRootNode.js.map +1 -1
  117. package/build/question/scaffold/vsc/customEngineAgentNode.js +2 -2
  118. package/build/question/scaffold/vsc/customEngineAgentNode.js.map +1 -1
  119. package/build/question/scaffold/vsc/officeAddinProjectTypeNode.d.ts.map +1 -1
  120. package/build/question/scaffold/vsc/officeAddinProjectTypeNode.js +3 -0
  121. package/build/question/scaffold/vsc/officeAddinProjectTypeNode.js.map +1 -1
  122. package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +4 -2
  123. package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
  124. package/build/question/scaffold/vsc/teamsProjectTypeNode.js +159 -11
  125. package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
  126. package/build/tsconfig.tsbuildinfo +1 -1
  127. package/package.json +4 -4
  128. package/resource/package.nls.json +14 -15
  129. package/resource/yaml-schema/v1.10/yaml.schema.json +2058 -0
  130. package/resource/yaml-schema/yaml.schema.json +5 -54
  131. package/templates/fallback/common.zip +0 -0
  132. package/templates/fallback/csharp.zip +0 -0
  133. package/templates/fallback/js.zip +0 -0
  134. package/templates/fallback/python.zip +0 -0
  135. package/templates/fallback/ts.zip +0 -0
  136. package/build/component/driver/share/shareToOthers.d.ts +0 -17
  137. package/build/component/driver/share/shareToOthers.d.ts.map +0 -1
  138. package/build/component/driver/share/shareToOthers.js +0 -127
  139. package/build/component/driver/share/shareToOthers.js.map +0 -1
  140. package/build/component/generator/templates/metadata/tdp.d.ts +0 -3
  141. package/build/component/generator/templates/metadata/tdp.d.ts.map +0 -1
  142. package/build/component/generator/templates/metadata/tdp.js +0 -51
  143. package/build/component/generator/templates/metadata/tdp.js.map +0 -1
  144. package/build/question/scaffold/vsc/agentForTeamsNode.d.ts +0 -6
  145. package/build/question/scaffold/vsc/agentForTeamsNode.d.ts.map +0 -1
  146. package/build/question/scaffold/vsc/agentForTeamsNode.js +0 -146
  147. package/build/question/scaffold/vsc/agentForTeamsNode.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAI3E,OAAO,EAAE,OAAO,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAGlE,OAAO,EAA8B,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAgBnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhF;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEtF;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAUD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAYhF;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAwBnF;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMzE;AAgCD,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,SAAS,qBAAqB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,sBAAsB;IAChC,OAAO,mBAAmB;CAC3B;AAED,qBAAa,YAAY;IACvB,OAAc,OAAO,SAAK;WACN,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAkB3E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,CAE5E;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAgDlC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAI3E,OAAO,EAAE,OAAO,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAGlE,OAAO,EAA8B,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAgBnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMtF;AACD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEhF;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEtF;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAUD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAYhF;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAwBnF;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMzE;AAgCD,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,SAAS,qBAAqB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,sBAAsB;IAChC,OAAO,mBAAmB;CAC3B;AAED,qBAAa,YAAY;IACvB,OAAc,OAAO,SAAK;WACN,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAkB3E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,CAE5E;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAgDlC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getResolvedManifest = exports.normalizePath = exports.RetryHandler = exports.MeetingsContext = exports.CommandScope = exports.hasMeetingExtension = exports.getFeaturesFromAppDefinition = exports.containsUnsupportedFeature = exports.needBotCode = exports.isBotAndBotBasedMessageExtension = exports.isBotBasedMessageExtension = exports.isBot = exports.needTabCode = exports.needTabAndBotCode = exports.isGroupApp = exports.isPersonalApp = exports.renderTemplate = exports.getCustomizedKeys = void 0;
3
+ exports.getResolvedManifest = exports.normalizePath = exports.RetryHandler = exports.MeetingsContext = exports.CommandScope = exports.hasMeetingExtension = exports.getFeaturesFromAppDefinition = exports.containsUnsupportedFeature = exports.needBotCode = exports.isBotAndBotBasedMessageExtension = exports.isBotBasedMessageExtension = exports.containsBotBasedMessageExtension = exports.isBot = exports.needTabCode = exports.needTabAndBotCode = exports.isGroupApp = exports.isPersonalApp = exports.renderTemplate = exports.getCustomizedKeys = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  // Copyright (c) Microsoft Corporation.
6
6
  // Licensed under the MIT license.
@@ -68,18 +68,22 @@ function needTabAndBotCode(appDefinition) {
68
68
  }
69
69
  exports.needTabAndBotCode = needTabAndBotCode;
70
70
  function needTabCode(appDefinition) {
71
- return isPersonalApp(appDefinition) || isGroupApp(appDefinition);
71
+ return (isPersonalApp(appDefinition) || isGroupApp(appDefinition)) && !needBotCode(appDefinition);
72
72
  }
73
73
  exports.needTabCode = needTabCode;
74
74
  function isBot(appDefinition) {
75
75
  return !!appDefinition.bots && appDefinition.bots.length > 0;
76
76
  }
77
77
  exports.isBot = isBot;
78
- function isBotBasedMessageExtension(appDefinition) {
78
+ function containsBotBasedMessageExtension(appDefinition) {
79
79
  return (!!appDefinition.messagingExtensions &&
80
80
  appDefinition.messagingExtensions.length > 0 &&
81
81
  !!appDefinition.messagingExtensions[0].botId);
82
82
  }
83
+ exports.containsBotBasedMessageExtension = containsBotBasedMessageExtension;
84
+ function isBotBasedMessageExtension(appDefinition) {
85
+ return containsBotBasedMessageExtension(appDefinition) && !isBot(appDefinition);
86
+ }
83
87
  exports.isBotBasedMessageExtension = isBotBasedMessageExtension;
84
88
  function isBotAndBotBasedMessageExtension(appDefinition) {
85
89
  return isBot(appDefinition) && isBotBasedMessageExtension(appDefinition);
@@ -122,7 +126,7 @@ function getFeaturesFromAppDefinition(appDefinition) {
122
126
  if (isBot(appDefinition)) {
123
127
  features.push(bot);
124
128
  }
125
- if (isBotBasedMessageExtension(appDefinition)) {
129
+ if (containsBotBasedMessageExtension(appDefinition)) {
126
130
  features.push(messageExtension);
127
131
  }
128
132
  return features;
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/util/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAMhD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,wBAAgB,gBAAgB,CAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAMpC;AAGD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQrB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAYjE;AAED,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BzF"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/util/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOhD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,wBAAgB,gBAAgB,CAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAMpC;AAGD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQrB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAYjE;AAED,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BzF"}
@@ -6,6 +6,7 @@ exports.updateVersionForTeamsAppYamlFile = exports.createDriverContext = exports
6
6
  const tslib_1 = require("tslib");
7
7
  const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
8
8
  const path_1 = tslib_1.__importDefault(require("path"));
9
+ const semver_1 = tslib_1.__importDefault(require("semver"));
9
10
  const yaml_1 = require("yaml");
10
11
  const globalVars_1 = require("../../../common/globalVars");
11
12
  const versionMetadata_1 = require("../../../common/versionMetadata");
@@ -49,12 +50,13 @@ async function updateVersionForTeamsAppYamlFile(projectPath) {
49
50
  if (await fs_extra_1.default.pathExists(ymlPath)) {
50
51
  const ymlContent = await fs_extra_1.default.readFile(ymlPath, "utf-8");
51
52
  const document = (0, yaml_1.parseDocument)(ymlContent);
52
- const version = document.get("version");
53
- if (version <= "v1.7") {
54
- if (version <= "v1.6") {
53
+ const version = document.get("version").slice(1);
54
+ const validVersion = semver_1.default.coerce(version);
55
+ if (validVersion && semver_1.default.lte(validVersion, "1.7.0")) {
56
+ if (semver_1.default.lte(validVersion, "1.6.0")) {
55
57
  convertOutputJsonPathToOutputFolder(document);
56
58
  }
57
- if (version === "v1.3") {
59
+ if (semver_1.default.eq(validVersion, "1.3.0")) {
58
60
  renameClientSecret(document);
59
61
  }
60
62
  document.set("version", "v1.8");
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/component/driver/util/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/component/driver/util/utils.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EAEP,OAAO,EACP,eAAe,EACf,MAAM,EAGN,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAKzD;;;;GAIG;AACH,qBAAa,oBAAoB;WACX,aAAa,CAC/B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CA2CvC;AAID,aAAK,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;AAC9D,wBAAsB,OAAO,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAyB5E;AAED,qBAAa,uBAAwB,SAAQ,wBAAwB;IACnE,aAAa,SAA4B;IAGzB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAW7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IAkCrB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAmC7C"}
1
+ {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EAEP,OAAO,EACP,eAAe,EACf,MAAM,EAGN,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAKzD;;;;GAIG;AACH,qBAAa,oBAAoB;WACX,aAAa,CAC/B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CA2CvC;AAID,aAAK,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;AAC9D,wBAAsB,OAAO,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAyB5E;AAED,qBAAa,uBAAwB,SAAQ,wBAAwB;IACnE,aAAa,SAA4B;IAGzB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAY7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IAkCrB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAmC7C"}
@@ -97,6 +97,7 @@ class OfficeAddinGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerato
97
97
  return [
98
98
  templateNames_1.TemplateNames.OutlookTaskpane,
99
99
  templateNames_1.TemplateNames.WXPTaskpane,
100
+ templateNames_1.TemplateNames.ExcelCFShortcut,
100
101
  templateNames_1.TemplateNames.OfficeAddinCommon,
101
102
  templateNames_1.TemplateNames.DeclarativeAgentMetaOSNewProject,
102
103
  templateNames_1.TemplateNames.DeclarativeAgentMetaOSUpgradeProject,
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/helper.ts"],"names":[],"mappings":"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"}
@@ -707,12 +707,12 @@ const commonLanguages = [
707
707
  constants_2.ProgrammingLanguage.PY,
708
708
  constants_2.ProgrammingLanguage.CSharp,
709
709
  ];
710
- async function updatePromptForCustomApi(spec, language, chatFolder) {
710
+ async function updatePromptForCustomApi(spec, language, chatFolder, promptFileName) {
711
711
  if (commonLanguages.includes(language)) {
712
712
  const object = `{ "path": null, "body": null, "query": null }`;
713
713
  const cSharpObject = `{ "path": {}, "body": {}, "query": {} }`;
714
- const promptFilePath = path_1.default.join(chatFolder, "skprompt.txt");
715
- const prompt = `The following is a conversation with an AI assistant.\nThe assistant can help to call APIs for the open api spec file${spec.info.description ? ". " + spec.info.description : "."}\nIf the API doesn't require parameters, invoke it with default JSON object ${language === constants_2.ProgrammingLanguage.CSharp ? cSharpObject : object}.\n\ncontext:\nAvailable actions: {{getAction}}.`;
714
+ const promptFilePath = path_1.default.join(chatFolder, promptFileName);
715
+ const prompt = `The following is a conversation with an AI assistant.\nThe assistant can help to call APIs for the open api spec file${spec.info.description ? ". " + spec.info.description : "."}\nIf the API doesn't require parameters, invoke it with default JSON object ${language === constants_2.ProgrammingLanguage.CSharp ? cSharpObject : object}.\n\n${shouldGenerateTeamsAIV2Code(language) ? "context:\nAvailable actions: {{getAction}}." : ""}`;
716
716
  await fs_extra_1.default.writeFile(promptFilePath, prompt, { encoding: "utf-8", flag: "w" });
717
717
  }
718
718
  }
@@ -789,10 +789,13 @@ function filterSchema(schema) {
789
789
  }
790
790
  return filteredSchema;
791
791
  }
792
+ function shouldGenerateTeamsAIV2Code(language) {
793
+ return language === constants_2.ProgrammingLanguage.JS || language === constants_2.ProgrammingLanguage.TS;
794
+ }
792
795
  async function updateActionForCustomApi(specItems, language, chatFolder) {
793
796
  var _a, _b, _c;
794
797
  if (commonLanguages.includes(language)) {
795
- const actionsFilePath = path_1.default.join(chatFolder, "actions.json");
798
+ const actionsFilePath = path_1.default.join(chatFolder, shouldGenerateTeamsAIV2Code(language) ? "functions.json" : "actions.json");
796
799
  const actions = [];
797
800
  for (const item of specItems) {
798
801
  const parameters = {
@@ -844,88 +847,26 @@ async function updateActionForCustomApi(specItems, language, chatFolder) {
844
847
  parameters: parameters,
845
848
  });
846
849
  }
847
- await fs_extra_1.default.writeFile(actionsFilePath, JSON.stringify(actions, null, 2));
850
+ if (shouldGenerateTeamsAIV2Code(language)) {
851
+ // Convert actions array to object format for Teams AI v2
852
+ const actionsObject = {};
853
+ for (const action of actions) {
854
+ if (action.name) {
855
+ actionsObject[action.name] = {
856
+ name: action.name,
857
+ description: action.description,
858
+ parameters: action.parameters,
859
+ };
860
+ }
861
+ }
862
+ await fs_extra_1.default.writeFile(actionsFilePath, JSON.stringify(actionsObject, null, 2));
863
+ }
864
+ else {
865
+ await fs_extra_1.default.writeFile(actionsFilePath, JSON.stringify(actions, null, 2));
866
+ }
848
867
  }
849
868
  }
850
869
  const ActionCode = {
851
- javascript: `
852
- app.ai.action("{{operationId}}", async (context, state, parameter) => {
853
- const client = await api.getClient();
854
- // Add authentication configuration for the client
855
- const apiPath = client.paths["{{pathUrl}}"];
856
- if (apiPath && apiPath.{{method}}) {
857
- const result = await apiPath.{{method}}(parameter.path, parameter.body, {
858
- params: parameter.query,
859
- });
860
- if (!result || !result.data) {
861
- throw new Error("Get empty result from api call.");
862
- }
863
- const cardName = "{{operationId}}".replace(/[^a-zA-Z0-9]/g, "_");
864
- const cardTemplatePath = path.join(__dirname, '../adaptiveCards', cardName + '.json');
865
- const isTeamsChannel = context.activity.channelId === Channels.Msteams;
866
- if (await fs.exists(cardTemplatePath)){
867
- const card = generateAdaptiveCard(cardTemplatePath, result);
868
- await context.sendActivity({
869
- attachments: [card],
870
- ...(isTeamsChannel ? { channelData: { feedbackLoopEnabled: true }} : {}),
871
- entities: [
872
- {
873
- type: "https://schema.org/Message",
874
- "@type": "Message",
875
- "@context": "https://schema.org",
876
- additionalType: ["AIGeneratedContent"], // AI Generated label
877
- },
878
- ]
879
- });
880
- }
881
- else {
882
- await context.sendActivity(JSON.stringify(result.data));
883
- }
884
- } else {
885
- await context.sendActivity("no result");
886
- }
887
- return "result";
888
- });
889
- `,
890
- typescript: `
891
- app.ai.action("{{operationId}}", async (context: TurnContext, state: ApplicationTurnState, parameter: any) => {
892
- const client = await api.getClient();
893
- // Add authentication configuration for the client
894
- const apiPath = client.paths["{{pathUrl}}"];
895
- if (apiPath && apiPath.{{method}}) {
896
- const result = await apiPath.{{method}}(parameter.path, parameter.body, {
897
- params: parameter.query,
898
- });
899
- if (!result || !result.data) {
900
- throw new Error("Get empty result from api call.");
901
- }
902
- const cardName = "{{operationId}}".replace(/[^a-zA-Z0-9]/g, "_");
903
- const cardTemplatePath = path.join(__dirname, '../adaptiveCards', cardName + '.json');
904
- const isTeamsChannel = context.activity.channelId === Channels.Msteams;
905
- if (await fs.exists(cardTemplatePath)){
906
- const card = generateAdaptiveCard(cardTemplatePath, result);
907
- await context.sendActivity({
908
- attachments: [card],
909
- ...(isTeamsChannel ? { channelData: { feedbackLoopEnabled: true }} : {}),
910
- entities: [
911
- {
912
- type: "https://schema.org/Message",
913
- "@type": "Message",
914
- "@context": "https://schema.org",
915
- additionalType: ["AIGeneratedContent"], // AI Generated label
916
- },
917
- ]
918
- });
919
- }
920
- else {
921
- await context.sendActivity(JSON.stringify(result.data));
922
- }
923
- } else {
924
- await context.sendActivity("no result");
925
- }
926
- return "result";
927
- });
928
- `,
929
870
  python: `
930
871
  @bot_app.ai.action("{{operationId}}")
931
872
  async def {{operationId}}(
@@ -1000,6 +941,92 @@ async def {{operationId}}(
1000
941
  return "complete";
1001
942
  }`,
1002
943
  };
944
+ const functionDefinitionCode = {
945
+ javascript: `.function(
946
+ functionDefs.{{operationId}}.name,
947
+ functionDefs.{{operationId}}.description,
948
+ functionDefs.{{operationId}}.parameters,
949
+ async (parameter) => {
950
+ const result = await functionHandlers.{{operationId}}Handler(parameter);
951
+ if(result) {
952
+ await send(result);
953
+ return "result showed";
954
+ } else {
955
+ return "no result";
956
+ }
957
+ }
958
+ )`,
959
+ typescript: `.function(
960
+ functionDefs.{{operationId}}.name,
961
+ functionDefs.{{operationId}}.description,
962
+ functionDefs.{{operationId}}.parameters,
963
+ async (parameter) => {
964
+ const result = await functionHandlers.{{operationId}}Handler(parameter);
965
+ if(result) {
966
+ await send(result);
967
+ return "result showed";
968
+ } else {
969
+ return "no result";
970
+ }
971
+ }
972
+ )`,
973
+ };
974
+ const functionHandlerCode = {
975
+ javascript: `const {{operationId}}Handler = async (
976
+ parameters
977
+ ) => {
978
+ const client = await api.getClient();
979
+ // Add authentication configuration for the client
980
+ const apiPath = client.paths["{{pathUrl}}"];
981
+ if (apiPath && apiPath.{{method}}) {
982
+ const result = await apiPath.{{method}}(parameters.path, parameters.body, {
983
+ params: parameters.query,
984
+ });
985
+ if (!result || !result.data) {
986
+ throw new Error("Get empty result from api call.");
987
+ }
988
+ const cardName = "{{operationId}}".replace(/[^a-zA-Z0-9]/g, "_");
989
+ const cardTemplatePath = path.join(__dirname, '../adaptiveCards', cardName + '.json');
990
+ if (await fs.exists(cardTemplatePath)){
991
+ const card = generateAdaptiveCard(cardTemplatePath, result);
992
+ return card;
993
+ } else {
994
+ return JSON.stringify(result.data);
995
+ }
996
+ } else {
997
+ return "";
998
+ }
999
+
1000
+ };
1001
+
1002
+ module.exports = { {{operationId}}Handler };`,
1003
+ typescript: `export const {{operationId}}Handler = async (
1004
+ parameter: any
1005
+ ) => {
1006
+ const client = await api.getClient();
1007
+ // Add authentication configuration for the client
1008
+ const apiPath = client.paths["{{pathUrl}}"];
1009
+ if (apiPath && apiPath.{{method}}) {
1010
+ const result = await apiPath.{{method}}(parameter.path, parameter.body, {
1011
+ params: parameter.query,
1012
+ });
1013
+ if (!result || !result.data) {
1014
+ throw new Error("Get empty result from api call.");
1015
+ }
1016
+ const cardName = "{{operationId}}".replace(/[^a-zA-Z0-9]/g, "_");
1017
+ const cardTemplatePath = path.join(__dirname, '../adaptiveCards', cardName + '.json');
1018
+ if (await fs.exists(cardTemplatePath)){
1019
+ const card = generateAdaptiveCard(cardTemplatePath, result);
1020
+ return card;
1021
+ } else {
1022
+ return JSON.stringify(result.data);
1023
+ }
1024
+ } else {
1025
+ return "";
1026
+ }
1027
+
1028
+ };`,
1029
+ };
1003
1030
  const AuthCode = {
1004
1031
  javascript: {
1005
1032
  actionCode: `addAuthConfig(client);`,
@@ -1010,28 +1037,33 @@ const AuthCode = {
1010
1037
  actionPlaceholder: `// Add authentication configuration for the client`,
1011
1038
  },
1012
1039
  };
1013
- async function updateCodeForCustomApi(specItems, language, destinationPath, openapiSpecFileName, needAuth) {
1040
+ async function updateCodeForCustomApi(specItems, language, destinationPath, openapiSpecFileName) {
1014
1041
  if (language === constants_2.ProgrammingLanguage.JS || language === constants_2.ProgrammingLanguage.TS) {
1015
- const codeTemplate = ActionCode[language === constants_2.ProgrammingLanguage.JS ? "javascript" : "typescript"];
1016
1042
  const appFolderPath = path_1.default.join(destinationPath, "src", "app");
1017
- const actionsCode = [];
1043
+ const functionDefinitionTemplate = functionDefinitionCode[language === constants_2.ProgrammingLanguage.JS ? "javascript" : "typescript"];
1044
+ const functionHandlerTemplate = functionHandlerCode[language === constants_2.ProgrammingLanguage.JS ? "javascript" : "typescript"];
1018
1045
  const authCodeTemplate = AuthCode[language === constants_2.ProgrammingLanguage.JS ? "javascript" : "typescript"];
1046
+ const appFilePath = path_1.default.join(appFolderPath, language === constants_2.ProgrammingLanguage.JS ? "app.js" : "app.ts");
1047
+ const handlerFilePath = path_1.default.join(appFolderPath, language === constants_2.ProgrammingLanguage.JS ? "handlers.js" : "handlers.ts");
1048
+ const functionDefinitionsCode = [];
1049
+ const functionHandlersCode = [];
1019
1050
  for (const item of specItems) {
1020
1051
  const auth = item.auth;
1021
- const code = codeTemplate
1052
+ functionDefinitionsCode.push(functionDefinitionTemplate.replace(/{{operationId}}/g, item.item.operationId));
1053
+ functionHandlersCode.push(functionHandlerTemplate
1022
1054
  .replace(authCodeTemplate.actionPlaceholder, auth ? authCodeTemplate.actionCode : "")
1023
1055
  .replace(/{{operationId}}/g, item.item.operationId)
1024
1056
  .replace(/{{pathUrl}}/g, item.pathUrl)
1025
- .replace(/{{method}}/g, item.method);
1026
- actionsCode.push(code);
1057
+ .replace(/{{method}}/g, item.method));
1027
1058
  }
1028
- // Update code in app file
1029
- const indexFilePath = path_1.default.join(appFolderPath, language === constants_2.ProgrammingLanguage.JS ? "app.js" : "app.ts");
1030
- const indexFileContent = (await fs_extra_1.default.readFile(indexFilePath)).toString();
1031
- const updateIndexFileContent = indexFileContent
1059
+ const appFileContent = (await fs_extra_1.default.readFile(appFilePath)).toString();
1060
+ const updatedAppFileContent = appFileContent.replace("// Replace with function definition code", `${functionDefinitionsCode.join("\n")};`);
1061
+ await fs_extra_1.default.writeFile(appFilePath, updatedAppFileContent);
1062
+ const handlerFileContent = (await fs_extra_1.default.readFile(handlerFilePath)).toString();
1063
+ const updatedHandlerFileContent = handlerFileContent
1032
1064
  .replace("{{OPENAPI_SPEC_PATH}}", openapiSpecFileName)
1033
- .replace("// Replace with action code", actionsCode.join("\n"));
1034
- await fs_extra_1.default.writeFile(indexFilePath, updateIndexFileContent);
1065
+ .replace("// Replace with function handler code", functionHandlersCode.join("\t\t\n"));
1066
+ await fs_extra_1.default.writeFile(handlerFilePath, updatedHandlerFileContent);
1035
1067
  }
1036
1068
  else if (language === constants_2.ProgrammingLanguage.PY) {
1037
1069
  // Update code in bot.py
@@ -1078,13 +1110,15 @@ async function updateCodeForCustomApi(specItems, language, destinationPath, open
1078
1110
  }
1079
1111
  async function updateForCustomApi(spec, language, destinationPath, openapiSpecFileName) {
1080
1112
  const warnings = [];
1081
- let chatFolder = path_1.default.join(destinationPath, "src", "prompts", "chat");
1113
+ let chatFolder = shouldGenerateTeamsAIV2Code(language)
1114
+ ? path_1.default.join(destinationPath, "src", "app")
1115
+ : path_1.default.join(destinationPath, "src", "prompts", "chat");
1082
1116
  if (language === constants_2.ProgrammingLanguage.CSharp) {
1083
1117
  chatFolder = path_1.default.join(destinationPath, "prompts", "Chat");
1084
1118
  }
1085
1119
  await fs_extra_1.default.ensureDir(chatFolder);
1086
1120
  // 1. update prompt folder
1087
- await updatePromptForCustomApi(spec, language, chatFolder);
1121
+ await updatePromptForCustomApi(spec, language, chatFolder, shouldGenerateTeamsAIV2Code(language) ? "instructions.txt" : "skprompt.txt");
1088
1122
  const [specItems, needAuth] = parseSpec(spec);
1089
1123
  // 2. update adaptive card folder
1090
1124
  const generateWarnings = await updateAdaptiveCardForCustomApi(specItems, language, destinationPath);
@@ -1092,7 +1126,7 @@ async function updateForCustomApi(spec, language, destinationPath, openapiSpecFi
1092
1126
  // 3. update actions file
1093
1127
  await updateActionForCustomApi(specItems, language, chatFolder);
1094
1128
  // 4. update code
1095
- await updateCodeForCustomApi(specItems, language, destinationPath, openapiSpecFileName, needAuth);
1129
+ await updateCodeForCustomApi(specItems, language, destinationPath, openapiSpecFileName);
1096
1130
  // 5. add prompt suggestions
1097
1131
  const manifestPath = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName);
1098
1132
  await updatePromptSuggestions(specItems, manifestPath);