@microsoft/teamsfx-core 2.0.7-alpha.8120e652f.0 → 2.0.7-alpha.8d8f5a0bb.0

package/build/component/feature/collaboration.js

@@ -4,19 +4,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamsCollaboration = exports.AadCollaboration = void 0;
 const tslib_1 = require("tslib");
+const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const axios_1 = tslib_1.__importDefault(require("axios"));
 const typedi_1 = require("typedi");
-const lib_1 = require("@feathersjs/hooks/lib");
+const error_1 = require("../../core/error");
+const globalVars_1 = require("../../core/globalVars");
+const common_1 = require("../../error/common");
 const aadAppClient_1 = require("../driver/aad/utility/aadAppClient");
 const constants_1 = require("../driver/aad/utility/constants");
 const addStartAndEndTelemetry_1 = require("../driver/middleware/addStartAndEndTelemetry");
-const axios_1 = tslib_1.__importDefault(require("axios"));
-const common_1 = require("../../error/common");
-const telemetry_1 = require("../driver/teamsApp/utils/telemetry");
-const constants_2 = require("../driver/teamsApp/constants");
 const appStudioClient_1 = require("../driver/teamsApp/clients/appStudioClient");
-const error_1 = require("../../core/error");
-const globalVars_1 = require("../../core/globalVars");
+const constants_2 = require("../driver/teamsApp/constants");
 const EventName = {
     grantPermission: "grant-permission",
     listCollaborator: "list-collaborator",
@@ -89,7 +88,7 @@ let AadCollaboration = class AadCollaboration {
         }
         const message = JSON.stringify(error);
         (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.error(message);
-        return new common_1.UnhandledError(error, componentNameAad);
+        return common_1.assembleError(error, componentNameAad);
     }
 };
 tslib_1.__decorate([
@@ -125,9 +124,8 @@ AadCollaboration = tslib_1.__decorate([
 ], AadCollaboration);
 exports.AadCollaboration = AadCollaboration;
 let TeamsCollaboration = class TeamsCollaboration {
-    constructor(ctx, m365TokenProvider) {
+    constructor(m365TokenProvider) {
         this.tokenProvider = m365TokenProvider;
-        telemetry_1.TelemetryUtils.init(ctx);
     }
     async grantPermission(ctx, teamsAppId, userInfo) {
         try {
@@ -219,7 +217,7 @@ let TeamsCollaboration = class TeamsCollaboration {
         }
         const message = JSON.stringify(error);
         (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.error(message);
-        return new common_1.UnhandledError(error, componentNameTeams);
+        return common_1.assembleError(error, componentNameTeams);
     }
 };
 tslib_1.__decorate([
@@ -251,7 +249,7 @@ tslib_1.__decorate([
 ], TeamsCollaboration.prototype, "checkPermission", null);
 TeamsCollaboration = tslib_1.__decorate([
     typedi_1.Service("teams-collaboration"),
-    tslib_1.__metadata("design:paramtypes", [Object, Object])
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], TeamsCollaboration);
 exports.TeamsCollaboration = TeamsCollaboration;
 //# sourceMappingURL=collaboration.js.map

package/build/component/feature/collaboration.js.map

@@ -1 +1 @@
-{"version":3,"file":"collaboration.js","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collaboration.js","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"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"}

package/build/component/generator/copilotPlugin/generator.d.ts

@@ -1,10 +1,12 @@
 import { Context, FxError, Inputs, Result, Warning } from "@microsoft/teamsfx-api";
+import { ActionContext } from "../../middleware/actionExecutionMW";
 export interface CopilotPluginGeneratorResult {
     warnings?: Warning[];
 }
 export declare class CopilotPluginGenerator {
-    static generateFromApiSpec(context: Context, inputs: Inputs, destinationPath: string): Promise<Result<CopilotPluginGeneratorResult, FxError>>;
+    static generateMeFromApiSpec(context: Context, inputs: Inputs, destinationPath: string, actionContext?: ActionContext): Promise<Result<CopilotPluginGeneratorResult, FxError>>;
+    static generatePluginFromApiSpec(context: Context, inputs: Inputs, destinationPath: string, actionContext?: ActionContext): Promise<Result<CopilotPluginGeneratorResult, FxError>>;
     static generateFromOpenAIPlugin(context: Context, inputs: Inputs, destinationPath: string): Promise<Result<CopilotPluginGeneratorResult, FxError>>;
-    private static generateForME;
+    private static generate;
 }
 //# sourceMappingURL=generator.d.ts.map

package/build/component/generator/copilotPlugin/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAIN,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAiDhC,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,qBAAa,sBAAsB;WASb,mBAAmB,CACrC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;WAuBrC,wBAAwB,CAC1C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;mBAUpC,aAAa;CAkMnC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAIN,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AA2DtF,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,qBAAa,sBAAsB;WASb,qBAAqB,CACvC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;WA8BrC,yBAAyB,CAC3C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;WA8BrC,wBAAwB,CAC1C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;mBAWpC,QAAQ;CAsM9B"}

package/build/component/generator/copilotPlugin/generator.js

@@ -20,40 +20,57 @@ const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
 const create_1 = require("../../../question/create");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const error_1 = require("../../../error");
-const spec_parser_1 = require("../../../common/spec-parser");
+const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
 const util = tslib_1.__importStar(require("util"));
 const util_1 = require("../../../question/util");
 const featureFlags_1 = require("../../../common/featureFlags");
+const lodash_1 = require("lodash");
 const fromApiSpecComponentName = "copilot-plugin-existing-api";
+const pluginFromApiSpecComponentName = "api-copilot-plugin-existing-api";
 const fromApiSpecTemplateName = "copilot-plugin-existing-api";
-const fromApiSpecWithApiKeyComponentName = "copilot-plugin-existing-api-api-key";
 const fromApiSpecWithApiKeyTemplateName = "copilot-plugin-existing-api-api-key";
 const fromOpenAIPlugincomponentName = "copilot-plugin-from-oai-plugin";
 const fromOpenAIPluginTemplateName = "copilot-plugin-from-oai-plugin";
 const apiSpecFolderName = "apiSpecificationFile";
 const apiSpecYamlFileName = "openapi.yaml";
 const apiSpecJsonFileName = "openapi.json";
-const invalidApiSpecErrorName = "invalid-api-spec";
 const copilotPluginExistingApiSpecUrlTelemetryEvent = "copilot-plugin-existing-api-spec-url";
-const isRemoteUrlTelemetryProperty = "remote-url";
+const apiPluginFromApiSpecTemplateName = "api-plugin-existing-api";
+var GenerateType;
+(function (GenerateType) {
+    GenerateType["ME"] = "api-me";
+    GenerateType["ApiPlugin"] = "api-plugin";
+})(GenerateType || (GenerateType = {}));
 function normalizePath(path) {
     return "./" + path.replace(/\\/g, "/");
 }
 class CopilotPluginGenerator {
-    static async generateFromApiSpec(context, inputs, destinationPath) {
+    static async generateMeFromApiSpec(context, inputs, destinationPath, actionContext) {
         const apiOperations = inputs[questionNames_1.QuestionNames.ApiOperation];
         const authApi = inputs.supportedApisFromApiSpec.find((api) => !!api.data.authName && apiOperations.includes(api.id));
-        return await this.generateForME(context, inputs, destinationPath, authApi ? fromApiSpecWithApiKeyTemplateName : fromApiSpecTemplateName, authApi ? fromApiSpecWithApiKeyComponentName : fromApiSpecComponentName, authApi === null || authApi === void 0 ? void 0 : authApi.data);
+        const templateName = authApi ? fromApiSpecWithApiKeyTemplateName : fromApiSpecTemplateName;
+        const componentName = fromApiSpecComponentName;
+        lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, { ["template-name" /* templateName */]: templateName });
+        return await this.generate(context, inputs, destinationPath, templateName, componentName, false, authApi === null || authApi === void 0 ? void 0 : authApi.data);
+    }
+    static async generatePluginFromApiSpec(context, inputs, destinationPath, actionContext) {
+        const apiOperations = inputs[questionNames_1.QuestionNames.ApiOperation];
+        const authApi = inputs.supportedApisFromApiSpec.find((api) => !!api.data.authName && apiOperations.includes(api.id));
+        const templateName = apiPluginFromApiSpecTemplateName;
+        const componentName = fromApiSpecComponentName;
+        lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, { ["template-name" /* templateName */]: templateName });
+        return await this.generate(context, inputs, destinationPath, templateName, componentName, true, authApi === null || authApi === void 0 ? void 0 : authApi.data);
     }
     static async generateFromOpenAIPlugin(context, inputs, destinationPath) {
-        return await this.generateForME(context, inputs, destinationPath, fromOpenAIPluginTemplateName, fromOpenAIPlugincomponentName);
+        return await this.generate(context, inputs, destinationPath, fromOpenAIPluginTemplateName, fromOpenAIPlugincomponentName, false);
     }
-    static async generateForME(context, inputs, destinationPath, templateName, componentName, apiKeyAuthData) {
+    static async generate(context, inputs, destinationPath, templateName, componentName, isPlugin, apiKeyAuthData) {
         var _a, _b;
         try {
             const appName = inputs[questionNames_1.QuestionNames.AppName];
             const language = inputs[questionNames_1.QuestionNames.ProgrammingLanguage];
             const safeProjectNameFromVS = language === "csharp" ? inputs[questionNames_1.QuestionNames.SafeProjectName] : undefined;
+            const type = isPlugin ? GenerateType.ApiPlugin : GenerateType.ME;
             const manifestPath = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName);
             const apiSpecFolderPath = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, apiSpecFolderName);
             let url = (_a = inputs[questionNames_1.QuestionNames.ApiSpecLocation]) !== null && _a !== void 0 ? _a : (_b = inputs.openAIPluginManifest) === null || _b === void 0 ? void 0 : _b.api.url;
@@ -83,15 +100,16 @@ class CopilotPluginGenerator {
             if (templateRes.isErr())
                 return teamsfx_api_1.err(templateRes.error);
             context.telemetryReporter.sendTelemetryEvent(copilotPluginExistingApiSpecUrlTelemetryEvent, {
-                [isRemoteUrlTelemetryProperty]: util_1.isValidHttpUrl(url).toString(),
+                ["remote-url" /* isRemoteUrlTelemetryProperty */]: util_1.isValidHttpUrl(url).toString(),
+                ["generate-type" /* generateType */]: type,
             });
             // validate API spec
             const allowAPIKeyAuth = featureFlags_1.isApiKeyEnabled();
             const allowMultipleParameters = featureFlags_1.isMultipleParametersEnabled();
-            const specParser = new spec_parser_1.SpecParser(url, { allowAPIKeyAuth, allowMultipleParameters });
+            const specParser = new m365_spec_parser_1.SpecParser(url, { allowAPIKeyAuth, allowMultipleParameters });
             const validationRes = await specParser.validate();
             const warnings = validationRes.warnings;
-            const operationIdWarning = warnings.find((w) => w.type === spec_parser_1.WarningType.OperationIdMissing);
+            const operationIdWarning = warnings.find((w) => w.type === m365_spec_parser_1.WarningType.OperationIdMissing);
             if (operationIdWarning && operationIdWarning.data) {
                 const apisMissingOperationId = operationIdWarning.data.filter((api) => filters.includes(api));
                 if (apisMissingOperationId.length > 0) {
@@ -102,22 +120,23 @@ class CopilotPluginGenerator {
                     warnings.splice(warnings.indexOf(operationIdWarning), 1);
                 }
             }
-            const specVersionWarning = warnings.find((w) => w.type === spec_parser_1.WarningType.ConvertSwaggerToOpenAPI);
+            const specVersionWarning = warnings.find((w) => w.type === m365_spec_parser_1.WarningType.ConvertSwaggerToOpenAPI);
             if (specVersionWarning) {
                 specVersionWarning.content = ""; // We don't care content of this warning
             }
-            if (validationRes.status === spec_parser_1.ValidationStatus.Error) {
+            if (validationRes.status === m365_spec_parser_1.ValidationStatus.Error) {
                 helper_1.logValidationResults(validationRes.errors, warnings, context, true, false, true);
                 const errorMessage = inputs.platform === teamsfx_api_1.Platform.VSCode
                     ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.multipleValidationErrors.vscode.message")
                     : localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.multipleValidationErrors.message");
-                return teamsfx_api_1.err(new teamsfx_api_1.UserError(componentName, invalidApiSpecErrorName, errorMessage, errorMessage));
+                return teamsfx_api_1.err(new teamsfx_api_1.UserError(componentName, helper_1.invalidApiSpecErrorName, errorMessage, errorMessage));
             }
             // generate files
             await fs.ensureDir(apiSpecFolderPath);
             const adaptiveCardFolder = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName);
             const generateResult = await specParser.generate(manifestPath, filters, openapiSpecPath, adaptiveCardFolder);
             context.telemetryReporter.sendTelemetryEvent(helper_1.specParserGenerateResultTelemetryEvent, {
+                ["generate-type" /* generateType */]: type,
                 [helper_1.specParserGenerateResultAllSuccessTelemetryProperty]: generateResult.allSuccess.toString(),
                 [helper_1.specParserGenerateResultWarningsTelemetryProperty]: generateResult.warnings
                     .map((w) => w.type.toString() + ": " + w.content)
@@ -125,7 +144,7 @@ class CopilotPluginGenerator {
             });
             if (generateResult.warnings.length > 0) {
                 generateResult.warnings.find((o) => {
-                    if (o.type === spec_parser_1.WarningType.OperationOnlyContainsOptionalParam) {
+                    if (o.type === m365_spec_parser_1.WarningType.OperationOnlyContainsOptionalParam) {
                         o.content = ""; // We don't care content of this warning
                     }
                 });
@@ -166,7 +185,7 @@ class CopilotPluginGenerator {
         }
         catch (e) {
             let error;
-            if (e instanceof spec_parser_1.SpecParserError) {
+            if (e instanceof m365_spec_parser_1.SpecParserError) {
                 error = helper_1.convertSpecParserErrorToFxError(e);
             }
             else {
@@ -186,9 +205,22 @@ tslib_1.__decorate([
         }),
     ]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object, String]),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, String, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], CopilotPluginGenerator, "generateMeFromApiSpec", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        actionExecutionMW_1.ActionExecutionMW({
+            enableTelemetry: true,
+            telemetryComponentName: pluginFromApiSpecComponentName,
+            telemetryEventName: telemetryEvents_1.TelemetryEvents.Generate,
+            errorSource: pluginFromApiSpecComponentName,
+        }),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], CopilotPluginGenerator, "generateFromApiSpec", null);
+], CopilotPluginGenerator, "generatePluginFromApiSpec", null);
 tslib_1.__decorate([
     lib_1.hooks([
         actionExecutionMW_1.ActionExecutionMW({

package/build/component/generator/copilotPlugin/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/generator.ts"],"names":[],"mappings":"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"}

package/build/component/generator/copilotPlugin/helper.d.ts

@@ -1,8 +1,8 @@
 /**
  * @author yuqzho@microsoft.com
  */
-import { Context, FxError, OpenAIPluginManifest, Result, TeamsAppManifest, ApiOperation, Warning } from "@microsoft/teamsfx-api";
-import { ErrorType as ApiSpecErrorType, WarningResult, SpecParserError, ErrorResult as ApiSpecErrorResult } from "../../../common/spec-parser";
+import { Context, FxError, OpenAIPluginManifest, Result, TeamsAppManifest, ApiOperation, Warning, Inputs } from "@microsoft/teamsfx-api";
+import { ErrorType as ApiSpecErrorType, WarningResult, SpecParserError, ErrorResult as ApiSpecErrorResult } from "@microsoft/m365-spec-parser";
 declare enum OpenAIPluginManifestErrorType {
     AuthNotSupported = "openai-pliugin-auth-not-supported",
     ApiUrlMissing = "openai-plugin-api-url-missing"
@@ -10,6 +10,7 @@ declare enum OpenAIPluginManifestErrorType {
 export declare const specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
 export declare const specParserGenerateResultAllSuccessTelemetryProperty = "all-success";
 export declare const specParserGenerateResultWarningsTelemetryProperty = "warnings";
+export declare const invalidApiSpecErrorName = "invalid-api-spec";
 export interface ErrorResult {
     /**
      * The type of error.
@@ -25,7 +26,8 @@ export declare class OpenAIPluginManifestHelper {
     static loadOpenAIPluginManifest(input: string): Promise<OpenAIPluginManifest>;
     static updateManifest(openAiPluginManifest: OpenAIPluginManifest, teamsAppManifest: TeamsAppManifest, manifestPath: string): Promise<Result<undefined, FxError>>;
 }
-export declare function listOperations(context: Context, manifest: OpenAIPluginManifest | undefined, apiSpecUrl: string | undefined, teamsManifestPath: string | undefined, includeExistingAPIs?: boolean, shouldLogWarning?: boolean, existingCorrelationId?: string): Promise<Result<ApiOperation[], ErrorResult[]>>;
+export declare function listOperations(context: Context, manifest: OpenAIPluginManifest | undefined, apiSpecUrl: string | undefined, inputs: Inputs, includeExistingAPIs?: boolean, shouldLogWarning?: boolean, existingCorrelationId?: string): Promise<Result<ApiOperation[], ErrorResult[]>>;
+export declare function listPluginExistingOperations(manifest: TeamsAppManifest, teamsManifestPath: string, destinationApiSpecFilePath: string): Promise<string[]>;
 export declare function logValidationResults(errors: ErrorResult[], warnings: WarningResult[], context: Context, isApiSpec: boolean, shouldLogWarning: boolean, shouldSkipTelemetry: boolean, existingCorrelationId?: string): void;
 export declare function generateScaffoldingSummary(warnings: Warning[], teamsManifest: TeamsAppManifest, projectPath: string): string;
 export declare function convertSpecParserErrorToFxError(error: SpecParserError): FxError;

package/build/component/generator/copilotPlugin/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/helper.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,OAAO,EAEP,oBAAoB,EACpB,MAAM,EAIN,gBAAgB,EAChB,YAAY,EAEZ,OAAO,EAMR,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAEL,SAAS,IAAI,gBAAgB,EAE7B,aAAa,EAEb,eAAe,EAEf,WAAW,IAAI,kBAAkB,EAElC,MAAM,6BAA6B,CAAC;AAwBrC,aAAK,6BAA6B;IAChC,gBAAgB,sCAAsC;IACtD,aAAa,kCAAkC;CAChD;AAED,eAAO,MAAM,sCAAsC,gCAAgC,CAAC;AACpF,eAAO,MAAM,mDAAmD,gBAAgB,CAAC;AACjF,eAAO,MAAM,iDAAiD,aAAa,CAAC;AAE5E,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,gBAAgB,GAAG,6BAA6B,CAAC;IAEvD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,qBAAa,0BAA0B;WACxB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;WA0BtE,cAAc,CACzB,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAUvC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,oBAAoB,GAAG,SAAS,EAC1C,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,mBAAmB,UAAO,EAC1B,gBAAgB,UAAO,EACvB,qBAAqB,CAAC,EAAE,MAAM,GAC7B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAoFhD;AAgCD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,EAAE,EACrB,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,OAAO,EAClB,gBAAgB,EAAE,OAAO,EACzB,mBAAmB,EAAE,OAAO,EAC5B,qBAAqB,CAAC,EAAE,MAAM,GAC7B,IAAI,CAuEN;AA0BD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,gBAAgB,EAC/B,WAAW,EAAE,MAAM,GAClB,MAAM,CA6BR;AAkKD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAE/E;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBvE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,EAAE,CAQzF"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/helper.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,OAAO,EAEP,oBAAoB,EACpB,MAAM,EAIN,gBAAgB,EAChB,YAAY,EAEZ,OAAO,EAKP,MAAM,EACP,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAEL,SAAS,IAAI,gBAAgB,EAE7B,aAAa,EAEb,eAAe,EAEf,WAAW,IAAI,kBAAkB,EAElC,MAAM,6BAA6B,CAAC;AA2BrC,aAAK,6BAA6B;IAChC,gBAAgB,sCAAsC;IACtD,aAAa,kCAAkC;CAChD;AAED,eAAO,MAAM,sCAAsC,gCAAgC,CAAC;AACpF,eAAO,MAAM,mDAAmD,gBAAgB,CAAC;AACjF,eAAO,MAAM,iDAAiD,aAAa,CAAC;AAE5E,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAG1D,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,gBAAgB,GAAG,6BAA6B,CAAC;IAEvD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,qBAAa,0BAA0B;WACxB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;WA0BtE,cAAc,CACzB,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAUvC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,oBAAoB,GAAG,SAAS,EAC1C,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,MAAM,EAAE,MAAM,EACd,mBAAmB,UAAO,EAC1B,gBAAgB,UAAO,EACvB,qBAAqB,CAAC,EAAE,MAAM,GAC7B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CA+FhD;AAgCD,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,EAC1B,iBAAiB,EAAE,MAAM,EACzB,0BAA0B,EAAE,MAAM,GACjC,OAAO,CAAC,MAAM,EAAE,CAAC,CA4CnB;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,EAAE,EACrB,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,OAAO,EAClB,gBAAgB,EAAE,OAAO,EACzB,mBAAmB,EAAE,OAAO,EAC5B,qBAAqB,CAAC,EAAE,MAAM,GAC7B,IAAI,CAuEN;AA0BD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,gBAAgB,EAC/B,WAAW,EAAE,MAAM,GAClB,MAAM,CA6BR;AAkKD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAE/E;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBvE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,EAAE,CAQzF"}

package/build/component/generator/copilotPlugin/helper.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatValidationErrors = exports.isYamlSpecFile = exports.convertSpecParserErrorToFxError = exports.generateScaffoldingSummary = exports.logValidationResults = exports.listOperations = exports.OpenAIPluginManifestHelper = exports.specParserGenerateResultWarningsTelemetryProperty = exports.specParserGenerateResultAllSuccessTelemetryProperty = exports.specParserGenerateResultTelemetryEvent = void 0;
+exports.formatValidationErrors = exports.isYamlSpecFile = exports.convertSpecParserErrorToFxError = exports.generateScaffoldingSummary = exports.logValidationResults = exports.listPluginExistingOperations = exports.listOperations = exports.OpenAIPluginManifestHelper = exports.invalidApiSpecErrorName = exports.specParserGenerateResultWarningsTelemetryProperty = exports.specParserGenerateResultAllSuccessTelemetryProperty = exports.specParserGenerateResultTelemetryEvent = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author yuqzho@microsoft.com
@@ -10,7 +10,7 @@ const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const utils_1 = require("../utils");
-const spec_parser_1 = require("../../../common/spec-parser");
+const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const error_1 = require("../../../error");
@@ -19,6 +19,9 @@ const constant_1 = require("../../configManager/constant");
 const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
 const path_1 = tslib_1.__importDefault(require("path"));
 const featureFlags_1 = require("../../../common/featureFlags");
+const questionNames_1 = require("../../../question/questionNames");
+const PluginManifestUtils_1 = require("../../driver/teamsApp/utils/PluginManifestUtils");
+const constants_1 = require("../../../question/constants");
 const manifestFilePath = "/.well-known/ai-plugin.json";
 const componentName = "OpenAIPluginManifestHelper";
 var OpenAIPluginManifestErrorType;
@@ -29,6 +32,8 @@ var OpenAIPluginManifestErrorType;
 exports.specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
 exports.specParserGenerateResultAllSuccessTelemetryProperty = "all-success";
 exports.specParserGenerateResultWarningsTelemetryProperty = "warnings";
+exports.invalidApiSpecErrorName = "invalid-api-spec";
+const apiSpecNotUsedInPlugin = "api-spec-not-used-in-plugin";
 class OpenAIPluginManifestHelper {
     static async loadOpenAIPluginManifest(input) {
         input = input.trim();
@@ -60,7 +65,7 @@ class OpenAIPluginManifestHelper {
     }
 }
 exports.OpenAIPluginManifestHelper = OpenAIPluginManifestHelper;
-async function listOperations(context, manifest, apiSpecUrl, teamsManifestPath, includeExistingAPIs = true, shouldLogWarning = true, existingCorrelationId) {
+async function listOperations(context, manifest, apiSpecUrl, inputs, includeExistingAPIs = true, shouldLogWarning = true, existingCorrelationId) {
     if (manifest) {
         const errors = validateOpenAIPluginManifest(manifest);
         logValidationResults(errors, [], context, false, shouldLogWarning, false, existingCorrelationId);
@@ -69,35 +74,45 @@ async function listOperations(context, manifest, apiSpecUrl, teamsManifestPath,
         }
         apiSpecUrl = manifest.api.url;
     }
+    const isPlugin = inputs[questionNames_1.QuestionNames.Capabilities] === constants_1.copilotPluginApiSpecOptionId;
     try {
-        const allowAPIKeyAuth = featureFlags_1.isApiKeyEnabled();
-        const allowMultipleParameters = featureFlags_1.isMultipleParametersEnabled();
-        const specParser = new spec_parser_1.SpecParser(apiSpecUrl, {
+        const allowAPIKeyAuth = isPlugin || featureFlags_1.isApiKeyEnabled();
+        const allowMultipleParameters = isPlugin || featureFlags_1.isMultipleParametersEnabled();
+        const specParser = new m365_spec_parser_1.SpecParser(apiSpecUrl, {
             allowAPIKeyAuth,
             allowMultipleParameters,
         });
         const validationRes = await specParser.validate();
         validationRes.errors = formatValidationErrors(validationRes.errors);
         logValidationResults(validationRes.errors, validationRes.warnings, context, true, shouldLogWarning, false, existingCorrelationId);
-        if (validationRes.status === spec_parser_1.ValidationStatus.Error) {
+        if (validationRes.status === m365_spec_parser_1.ValidationStatus.Error) {
             return teamsfx_api_1.err(validationRes.errors);
         }
         let operations = await specParser.list();
         // Filter out exsiting APIs
         if (!includeExistingAPIs) {
+            const teamsManifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
             if (!teamsManifestPath) {
                 throw new error_1.MissingRequiredInputError("teamsManifestPath", "inputs");
             }
             const manifest = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
+            let existingOperations = [];
             if (manifest.isOk()) {
-                const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifest.value);
-                const existingOperations = existingOperationIds.map((key) => { var _a; return (_a = operations.find((item) => item.operationId === key)) === null || _a === void 0 ? void 0 : _a.api; });
+                if (isPlugin) {
+                    existingOperations = await listPluginExistingOperations(manifest.value, teamsManifestPath, inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath]);
+                }
+                else {
+                    const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifest.value);
+                    existingOperations = operations
+                        .filter((operation) => existingOperationIds.includes(operation.operationId))
+                        .map((operation) => operation.api);
+                }
                 operations = operations.filter((operation) => !existingOperations.includes(operation.api));
                 // No extra API can be added
                 if (operations.length == 0) {
                     const errors = [
                         {
-                            type: spec_parser_1.ErrorType.NoExtraAPICanBeAdded,
+                            type: m365_spec_parser_1.ErrorType.NoExtraAPICanBeAdded,
                             content: localizeUtils_1.getLocalizedString("error.copilotPlugin.noExtraAPICanBeAdded"),
                         },
                     ];
@@ -113,7 +128,7 @@ async function listOperations(context, manifest, apiSpecUrl, teamsManifestPath,
         return teamsfx_api_1.ok(sortedOperations);
     }
     catch (e) {
-        if (e instanceof spec_parser_1.SpecParserError) {
+        if (e instanceof m365_spec_parser_1.SpecParserError) {
             throw convertSpecParserErrorToFxError(e);
         }
         else {
@@ -148,6 +163,33 @@ function sortOperations(operations) {
 function formatTelemetryValidationProperty(result) {
     return result.type.toString() + ": " + result.content;
 }
+async function listPluginExistingOperations(manifest, teamsManifestPath, destinationApiSpecFilePath) {
+    const getApiSPecFileRes = await PluginManifestUtils_1.pluginManifestUtils.getApiSpecFilePathFromTeamsManifest(manifest, teamsManifestPath);
+    if (getApiSPecFileRes.isErr()) {
+        throw getApiSPecFileRes.error;
+    }
+    let apiSpecFilePath;
+    const apiSpecFiles = getApiSPecFileRes.value;
+    for (const file of apiSpecFiles) {
+        if (path_1.default.resolve(file) === path_1.default.resolve(destinationApiSpecFilePath)) {
+            apiSpecFilePath = file;
+            break;
+        }
+    }
+    if (!apiSpecFilePath) {
+        throw new teamsfx_api_1.UserError("listPluginExistingOperations", apiSpecNotUsedInPlugin, localizeUtils_1.getLocalizedString("error.copilotPlugin.apiSpecNotUsedInPlugin", destinationApiSpecFilePath), localizeUtils_1.getLocalizedString("error.copilotPlugin.apiSpecNotUsedInPlugin", destinationApiSpecFilePath));
+    }
+    const specParser = new m365_spec_parser_1.SpecParser(apiSpecFilePath);
+    const validationRes = await specParser.validate();
+    validationRes.errors = formatValidationErrors(validationRes.errors);
+    if (validationRes.status === m365_spec_parser_1.ValidationStatus.Error) {
+        const errorMessage = localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.multipleValidationErrors.message");
+        throw new teamsfx_api_1.UserError("listPluginExistingOperations", exports.invalidApiSpecErrorName, errorMessage, errorMessage);
+    }
+    const operations = await specParser.list();
+    return operations.map((o) => o.api);
+}
+exports.listPluginExistingOperations = listPluginExistingOperations;
 function logValidationResults(errors, warnings, context, isApiSpec, shouldLogWarning, shouldSkipTelemetry, existingCorrelationId) {
     if (!shouldSkipTelemetry) {
         const properties = {
@@ -242,11 +284,11 @@ function generateScaffoldingSummary(warnings, teamsManifest, projectPath) {
 exports.generateScaffoldingSummary = generateScaffoldingSummary;
 function formatApiSpecValidationWarningMessage(specWarnings, apiSpecFileName) {
     const resultWarnings = [];
-    const operationIdWarning = specWarnings.find((w) => w.type === spec_parser_1.WarningType.OperationIdMissing);
+    const operationIdWarning = specWarnings.find((w) => w.type === m365_spec_parser_1.WarningType.OperationIdMissing);
     if (operationIdWarning) {
         resultWarnings.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.operationId", `${constant_1.SummaryConstant.NotExecuted} ${operationIdWarning.content}`, teamsfx_api_1.ManifestTemplateFileName));
     }
-    const swaggerWarning = specWarnings.find((w) => w.type === spec_parser_1.WarningType.ConvertSwaggerToOpenAPI);
+    const swaggerWarning = specWarnings.find((w) => w.type === m365_spec_parser_1.WarningType.ConvertSwaggerToOpenAPI);
     if (swaggerWarning) {
         resultWarnings.push(`${constant_1.SummaryConstant.NotExecuted} ` +
             localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.swaggerVersion", apiSpecFileName));
@@ -285,7 +327,7 @@ function validateTeamsManifestLength(teamsManifest, projectPath, warnings) {
     }
     // validate command
     if (teamsfx_api_1.ManifestUtil.parseCommonProperties(teamsManifest).isApiME) {
-        const optionalParamsOnlyWarnings = warnings.filter((o) => o.type === spec_parser_1.WarningType.OperationOnlyContainsOptionalParam);
+        const optionalParamsOnlyWarnings = warnings.filter((o) => o.type === m365_spec_parser_1.WarningType.OperationOnlyContainsOptionalParam);
         const commands = teamsManifest.composeExtensions[0].commands;
         if (optionalParamsOnlyWarnings) {
             for (const optionalParamsOnlyWarning of optionalParamsOnlyWarnings) {
@@ -300,7 +342,7 @@ function validateTeamsManifestLength(teamsManifest, projectPath, warnings) {
         for (const command of commands) {
             if (command.type === "query") {
                 if (!command.apiResponseRenderingTemplateFile) {
-                    const errorDetail = (_e = warnings.find((w) => w.type === spec_parser_1.WarningType.GenerateCardFailed && w.data === command.id)) === null || _e === void 0 ? void 0 : _e.content;
+                    const errorDetail = (_e = warnings.find((w) => w.type === m365_spec_parser_1.WarningType.GenerateCardFailed && w.data === command.id)) === null || _e === void 0 ? void 0 : _e.content;
                     resultWarnings.push(localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCardTemlate", "apiResponseRenderingTemplateFile", command.id) +
                         localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCardTemlate.mitigation", teamsfx_api_1.AppPackageFolderName, `composeExtensions/commands/${command.id}/apiResponseRenderingTemplateFile`, path_1.default.join(teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName)) +
                         (errorDetail ? os_1.EOL + errorDetail : ""));
@@ -351,7 +393,7 @@ exports.formatValidationErrors = formatValidationErrors;
 function formatValidationErrorContent(error) {
     try {
         switch (error.type) {
-            case spec_parser_1.ErrorType.SpecNotValid: {
+            case m365_spec_parser_1.ErrorType.SpecNotValid: {
                 let content = error.content;
                 if (error.content.startsWith("ResolverError: Error downloading")) {
                     content = error.content
@@ -362,23 +404,23 @@ function formatValidationErrorContent(error) {
                 }
                 return content;
             }
-            case spec_parser_1.ErrorType.RemoteRefNotSupported:
+            case m365_spec_parser_1.ErrorType.RemoteRefNotSupported:
                 return localizeUtils_1.getLocalizedString("core.common.RemoteRefNotSupported", error.data.join(", "));
-            case spec_parser_1.ErrorType.NoServerInformation:
+            case m365_spec_parser_1.ErrorType.NoServerInformation:
                 return localizeUtils_1.getLocalizedString("core.common.NoServerInformation");
-            case spec_parser_1.ErrorType.UrlProtocolNotSupported:
+            case m365_spec_parser_1.ErrorType.UrlProtocolNotSupported:
                 return localizeUtils_1.getLocalizedString("core.common.UrlProtocolNotSupported", error.data);
-            case spec_parser_1.ErrorType.RelativeServerUrlNotSupported:
+            case m365_spec_parser_1.ErrorType.RelativeServerUrlNotSupported:
                 return localizeUtils_1.getLocalizedString("core.common.RelativeServerUrlNotSupported");
-            case spec_parser_1.ErrorType.NoSupportedApi:
+            case m365_spec_parser_1.ErrorType.NoSupportedApi:
                 return localizeUtils_1.getLocalizedString("core.common.NoSupportedApi");
-            case spec_parser_1.ErrorType.NoExtraAPICanBeAdded:
+            case m365_spec_parser_1.ErrorType.NoExtraAPICanBeAdded:
                 return localizeUtils_1.getLocalizedString("error.copilotPlugin.noExtraAPICanBeAdded");
-            case spec_parser_1.ErrorType.ResolveServerUrlFailed:
+            case m365_spec_parser_1.ErrorType.ResolveServerUrlFailed:
                 return error.content;
-            case spec_parser_1.ErrorType.Cancelled:
+            case m365_spec_parser_1.ErrorType.Cancelled:
                 return localizeUtils_1.getLocalizedString("core.common.CancelledMessage");
-            case spec_parser_1.ErrorType.SwaggerNotSupported:
+            case m365_spec_parser_1.ErrorType.SwaggerNotSupported:
                 return localizeUtils_1.getLocalizedString("core.common.SwaggerNotSupported");
             default:
                 return error.content;