@microsoft/teamsfx-core 2.0.6-alpha.da822cd72.0 → 2.0.6-alpha.e5db52f29.0

package/build/component/driver/teamsApp/teamsappMgr.js

@@ -0,0 +1,278 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.teamsappMgr = void 0;
+const tslib_1 = require("tslib");
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path = tslib_1.__importStar(require("path"));
+const typedi_1 = require("typedi");
+const util = tslib_1.__importStar(require("util"));
+const localizeUtils_1 = require("../../../common/localizeUtils");
+const tools_1 = require("../../../common/tools");
+const common_1 = require("../../../error/common");
+const lifecycle_1 = require("../../configManager/lifecycle");
+const utils_1 = require("../../utils");
+const envUtil_1 = require("../../utils/envUtil");
+const pathUtils_1 = require("../../utils/pathUtils");
+const configure_1 = require("./configure");
+const constants_1 = require("./constants");
+const createAppPackage_1 = require("./createAppPackage");
+const publishAppPackage_1 = require("./publishAppPackage");
+const ManifestUtils_1 = require("./utils/ManifestUtils");
+class TeamsAppMgr {
+    async ensureAppPackageFile(inputs) {
+        // if no package file input, then do package first
+        if (!inputs["package-file"]) {
+            const packageRes = await this.packageTeamsApp(inputs);
+            if (packageRes.isErr()) {
+                return teamsfx_api_1.err(packageRes.error);
+            }
+            inputs["package-file"] = packageRes.value.outputZipPath;
+        }
+        if (!(await fs_extra_1.default.pathExists(inputs["package-file"]))) {
+            return teamsfx_api_1.err(new common_1.FileNotFoundError("updateTeamsApp", inputs["package-file"]));
+        }
+        return teamsfx_api_1.ok(undefined);
+    }
+    async readManifestFromZip(appPackagePath) {
+        const archivedFile = await fs_extra_1.default.readFile(appPackagePath);
+        const zipEntries = new adm_zip_1.default(archivedFile).getEntries();
+        const manifestFile = zipEntries.find((x) => x.entryName === constants_1.Constants.MANIFEST_FILE);
+        if (manifestFile) {
+            const manifestContent = manifestFile.getData().toString();
+            const manifest = JSON.parse(manifestContent);
+            return teamsfx_api_1.ok(manifest);
+        }
+        return teamsfx_api_1.err(new common_1.FileNotFoundError("readManifestFromZip", appPackagePath + ":" + constants_1.Constants.MANIFEST_FILE));
+    }
+    async checkAndTryToLoadEnv(inputs) {
+        //check placeholders in manifest file, if there are unresolved placeholders in manifest file, try to load env file
+        const manifestFile = inputs["manifest-file"];
+        const manifestString = await fs_extra_1.default.readFile(manifestFile, { encoding: "utf-8" });
+        const unresolved = [];
+        const resovled = [];
+        lifecycle_1.resolveString(manifestString, resovled, unresolved);
+        let env = undefined;
+        if (unresolved.length > 0) {
+            if (!inputs["env-file"]) {
+                const envRes = await envUtil_1.envUtil.listEnv(inputs.projectPath);
+                if (envRes.isErr()) {
+                    return teamsfx_api_1.err(envRes.error);
+                }
+                const envs = envRes.value;
+                const envFolderPathRes = await pathUtils_1.pathUtils.getEnvFolderPath(inputs.projectPath);
+                if (envFolderPathRes.isErr()) {
+                    return teamsfx_api_1.err(envFolderPathRes.error);
+                }
+                const envFolder = envFolderPathRes.value;
+                if (!envFolder)
+                    return teamsfx_api_1.ok(env);
+                if (inputs.env) {
+                    // env provided
+                    if (envs.includes(inputs.env)) {
+                        //env provided and found
+                        inputs["env-file"] = path.join(envFolder, `.env.${inputs.env}`);
+                        env = inputs.env;
+                    }
+                    else {
+                        // env provided but not found
+                        return teamsfx_api_1.err(new common_1.FileNotFoundError("updateTeamsApp", path.join(envFolder, `.env.${inputs.env}`)));
+                    }
+                }
+                else {
+                    //env not provided
+                    if (envs.length > 1) {
+                        //need provide
+                        return teamsfx_api_1.err(new common_1.MissingRequiredInputError("env", "updateTeamsApp"));
+                    }
+                    else if (envs.length === 1) {
+                        // no need provide
+                        env = envs[0];
+                        inputs["env-file"] = path.join(envFolder, `.env.${env}`);
+                    }
+                    else {
+                        // no env file found
+                    }
+                }
+            }
+            if (inputs["env-file"]) {
+                const res = await envUtil_1.envUtil.loadEnvFile(inputs["env-file"]);
+                if (res.isErr()) {
+                    return teamsfx_api_1.err(res.error);
+                }
+            }
+        }
+        return teamsfx_api_1.ok(env);
+    }
+    async packageTeamsApp(inputs) {
+        if (!inputs["manifest-file"]) {
+            const defaultManifestPath = ManifestUtils_1.manifestUtils.getTeamsAppManifestPath(inputs.projectPath);
+            if (!(await fs_extra_1.default.pathExists(defaultManifestPath))) {
+                return teamsfx_api_1.err(new common_1.MissingRequiredInputError("package-file/manifest-file", "updateTeamsApp"));
+            }
+            inputs["manifest-file"] = defaultManifestPath;
+        }
+        else {
+            if (!(await fs_extra_1.default.pathExists(inputs["manifest-file"]))) {
+                return teamsfx_api_1.err(new common_1.FileNotFoundError("updateTeamsApp", inputs["manifest-file"]));
+            }
+        }
+        const loadEnvRes = await this.checkAndTryToLoadEnv(inputs);
+        if (loadEnvRes.isErr())
+            return teamsfx_api_1.err(loadEnvRes.error);
+        const env = loadEnvRes.value;
+        // reach here means manifes-file is provided and exists
+        inputs["output-package-file"] =
+            inputs["output-package-file"] ||
+                path.join(inputs.projectPath, "appPackage", "build", env ? `appPackage.${env}.zip` : "appPackage.zip");
+        inputs["output-manifest-file"] =
+            inputs["output-manifest-file"] ||
+                path.join(inputs.projectPath, "appPackage", "build", env ? `manifest.${env}.json` : "manifest.json");
+        const packageArgs = {
+            manifestPath: inputs["manifest-file"],
+            outputZipPath: inputs["output-package-file"],
+            outputJsonPath: inputs["output-manifest-file"],
+        };
+        const buildDriver = typedi_1.Container.get(createAppPackage_1.actionName);
+        const driverContext = utils_1.createDriverContext(inputs);
+        const res = (await buildDriver.execute(packageArgs, driverContext)).result;
+        if (res.isErr()) {
+            return teamsfx_api_1.err(res.error);
+        }
+        return teamsfx_api_1.ok(packageArgs);
+    }
+    /**
+     * entry of validate teams app
+     */
+    async validateTeamsApp(inputs) {
+        const context = utils_1.createDriverContext(inputs);
+        if (!inputs["manifest-file"] && !inputs["package-file"]) {
+            // neither manifest-file nor package-file provided, use default manifest file
+            const defaultManifestPath = ManifestUtils_1.manifestUtils.getTeamsAppManifestPath(inputs.projectPath);
+            if (!(await fs_extra_1.default.pathExists(defaultManifestPath))) {
+                return teamsfx_api_1.err(new common_1.MissingRequiredInputError("package-file/manifest-file", "validateTeamsApp"));
+            }
+            inputs["manifest-file"] = defaultManifestPath;
+        }
+        if (inputs["manifest-file"]) {
+            const loadEnvRes = await this.checkAndTryToLoadEnv(inputs);
+            if (loadEnvRes.isErr())
+                return teamsfx_api_1.err(loadEnvRes.error);
+            const teamsAppManifestFilePath = inputs["manifest-file"];
+            const args = {
+                manifestPath: teamsAppManifestFilePath,
+                showMessage: (inputs === null || inputs === void 0 ? void 0 : inputs.showMessage) != undefined ? inputs.showMessage : true,
+            };
+            const driver = typedi_1.Container.get("teamsApp/validateManifest");
+            const result = (await driver.execute(args, context)).result;
+            if (result.isErr()) {
+                return teamsfx_api_1.err(result.error);
+            }
+        }
+        else if (inputs["package-file"]) {
+            const teamsAppPackageFilePath = inputs["package-file"];
+            const args = {
+                appPackagePath: teamsAppPackageFilePath,
+                showMessage: true,
+            };
+            const driver = typedi_1.Container.get("teamsApp/validateAppPackage");
+            const result = (await driver.execute(args, context)).result;
+            if (result.isErr()) {
+                return teamsfx_api_1.err(result.error);
+            }
+        }
+        return teamsfx_api_1.ok(undefined);
+    }
+    /**
+     * entry of update teams app
+     */
+    async updateTeamsApp(inputs) {
+        var _a;
+        // 1. zip package if necessary
+        const packageRes = await this.ensureAppPackageFile(inputs);
+        if (packageRes.isErr()) {
+            return teamsfx_api_1.err(packageRes.error);
+        }
+        const appPackageFile = inputs["package-file"];
+        const driverContext = utils_1.createDriverContext(inputs);
+        // 2. validate against app package
+        const args = {
+            appPackagePath: appPackageFile,
+            showMessage: true,
+        };
+        const driver = typedi_1.Container.get("teamsApp/validateAppPackage");
+        const validateRes = (await driver.execute(args, driverContext)).result;
+        if (validateRes.isErr()) {
+            return teamsfx_api_1.err(validateRes.error);
+        }
+        // 3. update app package
+        const updateTeamsAppArgs = {
+            appPackagePath: appPackageFile,
+        };
+        const configureDriver = typedi_1.Container.get(configure_1.actionName);
+        const updateRes = (await configureDriver.execute(updateTeamsAppArgs, driverContext)).result;
+        if (updateRes.isErr()) {
+            return teamsfx_api_1.err(updateRes.error);
+        }
+        // 4. show result
+        let loginHint = "";
+        const accountRes = await driverContext.m365TokenProvider.getJsonObject({
+            scopes: tools_1.AppStudioScopes,
+        });
+        if (accountRes.isOk()) {
+            loginHint = accountRes.value.unique_name;
+        }
+        const manifestRes = await this.readManifestFromZip(appPackageFile);
+        if (manifestRes.isErr()) {
+            return teamsfx_api_1.err(manifestRes.error);
+        }
+        const manifest = manifestRes.value;
+        const teamsAppId = manifest.id;
+        const url = util.format(constants_1.Constants.DEVELOPER_PORTAL_APP_PACKAGE_URL, teamsAppId, loginHint);
+        const message = [
+            {
+                content: localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedCLINotice"),
+                color: teamsfx_api_1.Colors.BRIGHT_GREEN,
+            },
+            { content: url, color: teamsfx_api_1.Colors.BRIGHT_CYAN },
+        ];
+        void ((_a = driverContext.ui) === null || _a === void 0 ? void 0 : _a.showMessage("info", message, false));
+        return teamsfx_api_1.ok(undefined);
+    }
+    async publishTeamsApp(inputs) {
+        var _a;
+        // 1. zip package if necessary
+        const packageRes = await this.ensureAppPackageFile(inputs);
+        if (packageRes.isErr()) {
+            return teamsfx_api_1.err(packageRes.error);
+        }
+        const appPackageFile = inputs["package-file"];
+        const driverContext = utils_1.createDriverContext(inputs);
+        // 2. validate against app package
+        const args = {
+            appPackagePath: appPackageFile,
+            showMessage: true,
+        };
+        const driver = typedi_1.Container.get("teamsApp/validateAppPackage");
+        const validateRes = (await driver.execute(args, driverContext)).result;
+        if (validateRes.isErr()) {
+            return teamsfx_api_1.err(validateRes.error);
+        }
+        // 3. publish app package
+        const publishArgs = {
+            appPackagePath: appPackageFile,
+        };
+        const publishDriver = typedi_1.Container.get(publishAppPackage_1.actionName);
+        const updateRes = (await publishDriver.execute(publishArgs, driverContext)).result;
+        if (updateRes.isErr()) {
+            return teamsfx_api_1.err(updateRes.error);
+        }
+        void ((_a = driverContext.ui) === null || _a === void 0 ? void 0 : _a.showMessage("info", `publish successfully, Go to admin portal: ${constants_1.Constants.TEAMS_ADMIN_PORTAL}`, false));
+        return teamsfx_api_1.ok(undefined);
+    }
+}
+exports.teamsappMgr = new TeamsAppMgr();
+//# sourceMappingURL=teamsappMgr.js.map

package/build/component/driver/teamsApp/teamsappMgr.js.map

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

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,EACR,MAAM,wBAAwB,CAAC;AAwChC,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;WAkBrC,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;CAwKnC"}
+{"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,EACR,MAAM,wBAAwB,CAAC;AA2ChC,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;WAkBrC,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;CAyKnC"}

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

@@ -13,19 +13,15 @@ const generator_1 = require("../generator");
 const path_1 = tslib_1.__importDefault(require("path"));
 const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
 const telemetryEvents_1 = require("../spfx/utils/telemetryEvents");
-const specParser_1 = require("../../../common/spec-parser/specParser");
 const questionNames_1 = require("../../../question/questionNames");
 const helper_1 = require("./helper");
-const interfaces_1 = require("../../../common/spec-parser/interfaces");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 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 utils_1 = require("../../../common/spec-parser/utils");
-const constants_1 = require("../../../common/spec-parser/constants");
+const spec_parser_1 = require("../../../common/spec-parser");
 const util = tslib_1.__importStar(require("util"));
-const specParserError_1 = require("../../../common/spec-parser/specParserError");
 const util_1 = require("../../../question/util");
 const fromApiSpeccomponentName = "copilot-plugin-existing-api";
 const fromApiSpecTemplateName = "copilot-plugin-existing-api";
@@ -56,30 +52,31 @@ class CopilotPluginGenerator {
             const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, templateName, language === create_1.ProgrammingLanguage.CSharp ? create_1.ProgrammingLanguage.CSharp : undefined);
             if (templateRes.isErr())
                 return teamsfx_api_1.err(templateRes.error);
-            const url = (_a = inputs[questionNames_1.QuestionNames.ApiSpecLocation]) !== null && _a !== void 0 ? _a : (_b = inputs.openAIPluginManifest) === null || _b === void 0 ? void 0 : _b.api.url;
+            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;
+            url = url.trim();
             context.telemetryReporter.sendTelemetryEvent(copilotPluginExistingApiSpecUrlTelemetryEvent, {
                 [isRemoteUrlTelemetryProperty]: util_1.isValidHttpUrl(url).toString(),
             });
             // validate API spec
-            const specParser = new specParser_1.SpecParser(url);
+            const specParser = new spec_parser_1.SpecParser(url);
             const validationRes = await specParser.validate();
             const warnings = validationRes.warnings;
-            const operationIdWarning = warnings.find((w) => w.type === interfaces_1.WarningType.OperationIdMissing);
+            const operationIdWarning = warnings.find((w) => w.type === spec_parser_1.WarningType.OperationIdMissing);
             if (operationIdWarning && operationIdWarning.data) {
                 const apisMissingOperationId = operationIdWarning.data.filter((api) => filters.includes(api));
                 if (apisMissingOperationId.length > 0) {
-                    operationIdWarning.content = util.format(constants_1.ConstantString.MissingOperationId, apisMissingOperationId.join(", "));
+                    operationIdWarning.content = util.format(localizeUtils_1.getLocalizedString("core.common.MissingOperationId"), apisMissingOperationId.join(", "));
                     delete operationIdWarning.data;
                 }
                 else {
                     warnings.splice(warnings.indexOf(operationIdWarning), 1);
                 }
             }
-            const specVersionWarning = warnings.find((w) => w.type === interfaces_1.WarningType.ConvertSwaggerToOpenAPI);
+            const specVersionWarning = warnings.find((w) => w.type === spec_parser_1.WarningType.ConvertSwaggerToOpenAPI);
             if (specVersionWarning) {
                 specVersionWarning.content = ""; // We don't care content of this warning
             }
-            if (validationRes.status === interfaces_1.ValidationStatus.Error) {
+            if (validationRes.status === 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")
@@ -92,7 +89,7 @@ class CopilotPluginGenerator {
             await fs.ensureDir(apiSpecFolderPath);
             let isYaml;
             try {
-                isYaml = await utils_1.isYamlSpecFile(url);
+                isYaml = await helper_1.isYamlSpecFile(url);
             }
             catch (e) {
                 isYaml = false;
@@ -108,7 +105,7 @@ class CopilotPluginGenerator {
             });
             if (generateResult.warnings.length > 0) {
                 generateResult.warnings.find((o) => {
-                    if (o.type === interfaces_1.WarningType.OperationOnlyContainsOptionalParam) {
+                    if (o.type === spec_parser_1.WarningType.OperationOnlyContainsOptionalParam) {
                         o.content = ""; // We don't care content of this warning
                     }
                 });
@@ -149,7 +146,7 @@ class CopilotPluginGenerator {
         }
         catch (e) {
             let error;
-            if (e instanceof specParserError_1.SpecParserError) {
+            if (e instanceof spec_parser_1.SpecParserError) {
                 error = helper_1.convertSpecParserErrorToFxError(e);
             }
             else {

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

@@ -2,8 +2,8 @@
  * @author yuqzho@microsoft.com
  */
 import { Context, FxError, OpenAIPluginManifest, Result, TeamsAppManifest, ApiOperation, Warning } from "@microsoft/teamsfx-api";
-import { ErrorType as ApiSpecErrorType, WarningResult } from "../../../common/spec-parser/interfaces";
-import { SpecParserError } from "../../../common/spec-parser/specParserError";
+import { ErrorType as ApiSpecErrorType, WarningResult, SpecParserError } from "../../../common/spec-parser";
+import { ErrorResult as ApiSpecErrorResult } from "../../../common/spec-parser/interfaces";
 declare enum OpenAIPluginManifestErrorType {
     AuthNotSupported = "openai-pliugin-auth-not-supported",
     ApiUrlMissing = "openai-plugin-api-url-missing"
@@ -20,6 +20,7 @@ export interface ErrorResult {
      * The content of the error.
      */
     content: string;
+    data?: any;
 }
 export declare class OpenAIPluginManifestHelper {
     static loadOpenAIPluginManifest(input: string): Promise<OpenAIPluginManifest>;
@@ -29,5 +30,7 @@ export declare function listOperations(context: Context, manifest: OpenAIPluginM
 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;
+export declare function isYamlSpecFile(specPath: string): Promise<boolean>;
+export declare function formatValidationErrors(errors: ApiSpecErrorResult[]): ApiSpecErrorResult[];
 export {};
 //# sourceMappingURL=helper.d.ts.map

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,EACL,SAAS,IAAI,gBAAgB,EAE7B,aAAa,EAEd,MAAM,wCAAwC,CAAC;AAShD,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAgB9E,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;CACjB;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,CA2EhD;AAoBD,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"}
+{"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,EAChB,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAEL,WAAW,IAAI,kBAAkB,EAClC,MAAM,wCAAwC,CAAC;AAgBhD,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,CA4EhD;AAoBD,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.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.listOperations = exports.OpenAIPluginManifestHelper = exports.specParserGenerateResultWarningsTelemetryProperty = exports.specParserGenerateResultAllSuccessTelemetryProperty = exports.specParserGenerateResultTelemetryEvent = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author yuqzho@microsoft.com
@@ -10,8 +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 interfaces_1 = require("../../../common/spec-parser/interfaces");
-const specParser_1 = require("../../../common/spec-parser/specParser");
+const spec_parser_1 = require("../../../common/spec-parser");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const error_1 = require("../../../error");
@@ -19,7 +18,7 @@ const os_1 = require("os");
 const constant_1 = require("../../configManager/constant");
 const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
 const path_1 = tslib_1.__importDefault(require("path"));
-const specParserError_1 = require("../../../common/spec-parser/specParserError");
+const interfaces_1 = require("../../../common/spec-parser/interfaces");
 const manifestFilePath = "/.well-known/ai-plugin.json";
 const componentName = "OpenAIPluginManifestHelper";
 var OpenAIPluginManifestErrorType;
@@ -71,10 +70,11 @@ async function listOperations(context, manifest, apiSpecUrl, teamsManifestPath,
         apiSpecUrl = manifest.api.url;
     }
     try {
-        const specParser = new specParser_1.SpecParser(apiSpecUrl);
+        const specParser = new spec_parser_1.SpecParser(apiSpecUrl);
         const validationRes = await specParser.validate();
+        validationRes.errors = formatValidationErrors(validationRes.errors);
         logValidationResults(validationRes.errors, validationRes.warnings, context, true, shouldLogWarning, false, existingCorrelationId);
-        if (validationRes.status === interfaces_1.ValidationStatus.Error) {
+        if (validationRes.status === spec_parser_1.ValidationStatus.Error) {
             return teamsfx_api_1.err(validationRes.errors);
         }
         let operations = await specParser.list();
@@ -93,7 +93,7 @@ async function listOperations(context, manifest, apiSpecUrl, teamsManifestPath,
                 if (operations.length == 0) {
                     const errors = [
                         {
-                            type: interfaces_1.ErrorType.NoExtraAPICanBeAdded,
+                            type: spec_parser_1.ErrorType.NoExtraAPICanBeAdded,
                             content: localizeUtils_1.getLocalizedString("error.copilotPlugin.noExtraAPICanBeAdded"),
                         },
                     ];
@@ -109,7 +109,7 @@ async function listOperations(context, manifest, apiSpecUrl, teamsManifestPath,
         return teamsfx_api_1.ok(sortedOperations);
     }
     catch (e) {
-        if (e instanceof specParserError_1.SpecParserError) {
+        if (e instanceof spec_parser_1.SpecParserError) {
             throw convertSpecParserErrorToFxError(e);
         }
         else {
@@ -227,11 +227,11 @@ function generateScaffoldingSummary(warnings, teamsManifest, projectPath) {
 exports.generateScaffoldingSummary = generateScaffoldingSummary;
 function formatApiSpecValidationWarningMessage(specWarnings, apiSpecFileName) {
     const resultWarnings = [];
-    const operationIdWarning = specWarnings.find((w) => w.type === interfaces_1.WarningType.OperationIdMissing);
+    const operationIdWarning = specWarnings.find((w) => w.type === 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 === interfaces_1.WarningType.ConvertSwaggerToOpenAPI);
+    const swaggerWarning = specWarnings.find((w) => w.type === spec_parser_1.WarningType.ConvertSwaggerToOpenAPI);
     if (swaggerWarning) {
         resultWarnings.push(`${constant_1.SummaryConstant.NotExecuted} ` +
             localizeUtils_1.getLocalizedString("core.copilotPlugin.scaffold.summary.warning.swaggerVersion", apiSpecFileName));
@@ -269,8 +269,8 @@ function validateTeamsManifestLength(teamsManifest, projectPath, warnings) {
         resultWarnings.push(formatLengthExceedingErrorMessage("/description/full", descriptionFullLimit));
     }
     // validate command
-    if (teamsfx_api_1.ManifestUtil.parseCommonProperties(teamsManifest).isCopilotPlugin) {
-        const optionalParamsOnlyWarnings = warnings.filter((o) => o.type === interfaces_1.WarningType.OperationOnlyContainsOptionalParam);
+    if (teamsfx_api_1.ManifestUtil.parseCommonProperties(teamsManifest).isApiME) {
+        const optionalParamsOnlyWarnings = warnings.filter((o) => o.type === spec_parser_1.WarningType.OperationOnlyContainsOptionalParam);
         const commands = teamsManifest.composeExtensions[0].commands;
         if (optionalParamsOnlyWarnings) {
             for (const optionalParamsOnlyWarning of optionalParamsOnlyWarnings) {
@@ -285,7 +285,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 === interfaces_1.WarningType.GenerateCardFailed && w.data === command.id)) === null || _e === void 0 ? void 0 : _e.content;
+                    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;
                     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 : ""));
@@ -303,4 +303,74 @@ function convertSpecParserErrorToFxError(error) {
     return new teamsfx_api_1.SystemError("SpecParser", error.errorType.toString(), error.message, error.message);
 }
 exports.convertSpecParserErrorToFxError = convertSpecParserErrorToFxError;
+async function isYamlSpecFile(specPath) {
+    if (specPath.endsWith(".yaml") || specPath.endsWith(".yml")) {
+        return true;
+    }
+    else if (specPath.endsWith(".json")) {
+        return false;
+    }
+    const isRemoteFile = specPath.startsWith("http:") || specPath.startsWith("https:");
+    const fileContent = isRemoteFile
+        ? (await axios_1.default.get(specPath)).data
+        : await fs_extra_1.default.readFile(specPath, "utf-8");
+    try {
+        JSON.parse(fileContent);
+        return false;
+    }
+    catch (error) {
+        return true;
+    }
+}
+exports.isYamlSpecFile = isYamlSpecFile;
+function formatValidationErrors(errors) {
+    return errors.map((error) => {
+        return {
+            type: error.type,
+            content: formatValidationErrorContent(error),
+            data: error.data,
+        };
+    });
+}
+exports.formatValidationErrors = formatValidationErrors;
+function formatValidationErrorContent(error) {
+    try {
+        switch (error.type) {
+            case interfaces_1.ErrorType.SpecNotValid: {
+                let content = error.content;
+                if (error.content.startsWith("ResolverError: Error downloading")) {
+                    content = error.content
+                        .split("\n")
+                        .map((o) => o.trim())
+                        .join(". ");
+                    content = content + ". " + localizeUtils_1.getLocalizedString("core.common.ErrorFetchApiSpec");
+                }
+                return content;
+            }
+            case interfaces_1.ErrorType.RemoteRefNotSupported:
+                return localizeUtils_1.getLocalizedString("core.common.RemoteRefNotSupported", error.data.join(", "));
+            case interfaces_1.ErrorType.NoServerInformation:
+                return localizeUtils_1.getLocalizedString("core.common.NoServerInformation");
+            case interfaces_1.ErrorType.UrlProtocolNotSupported:
+                return localizeUtils_1.getLocalizedString("core.common.UrlProtocolNotSupported", error.data);
+            case interfaces_1.ErrorType.RelativeServerUrlNotSupported:
+                return localizeUtils_1.getLocalizedString("core.common.RelativeServerUrlNotSupported");
+            case interfaces_1.ErrorType.NoSupportedApi:
+                return localizeUtils_1.getLocalizedString("core.common.NoSupportedApi");
+            case interfaces_1.ErrorType.NoExtraAPICanBeAdded:
+                return localizeUtils_1.getLocalizedString("error.copilotPlugin.noExtraAPICanBeAdded");
+            case interfaces_1.ErrorType.ResolveServerUrlFailed:
+                return error.content;
+            case interfaces_1.ErrorType.Cancelled:
+                return localizeUtils_1.getLocalizedString("core.common.CancelledMessage");
+            case interfaces_1.ErrorType.SwaggerNotSupported:
+                return localizeUtils_1.getLocalizedString("core.common.SwaggerNotSupported");
+            default:
+                return error.content;
+        }
+    }
+    catch (e) {
+        return error.content;
+    }
+}
 //# sourceMappingURL=helper.js.map