npm - @microsoft/teamsfx-core - Versions diffs - 2.0.12-alpha.dc2ed64c9.0 → 2.0.12-alpha.decc8f69b.0 - Mend

@microsoft/teamsfx-core 2.0.12-alpha.dc2ed64c9.0 → 2.0.12-alpha.decc8f69b.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 (141) hide show

package/build/component/driver/teamsApp/validate.js CHANGED Viewed

@@ -69,6 +69,13 @@ let ValidateManifestDriver = class ValidateManifestDriver {
                 (0, localizeUtils_1.getLocalizedString)("error.appstudio.validateSchemaNotDefined"),
             ]), constants_1.HelpLinks.WhyNeedProvision));
         }
+        // validate localization files
+        const localizationFilesValidationRes = await this.validateLocalizatoinFiles(args, context, manifest);
+        if (localizationFilesValidationRes.isErr()) {
+            return (0, teamsfx_api_1.err)(localizationFilesValidationRes.error);
+        }
+        telemetryProperties[telemetry_1.TelemetryPropertyKey.localizationValidationErrors] =
+            localizationFilesValidationRes.value.error.map((r) => r.replace(/\//g, "")).join(";");
         let declarativeCopilotValidationResult;
         let pluginValidationResult;
         let pluginPath = "";
@@ -116,6 +123,7 @@ let ValidateManifestDriver = class ValidateManifestDriver {
         }
         const actionErrorCount = (_a = declarativeCopilotValidationResult === null || declarativeCopilotValidationResult === void 0 ? void 0 : declarativeCopilotValidationResult.actionValidationResult.filter((o) => o.filePath !== pluginPath).reduce((acc, { validationResult }) => acc + validationResult.length, 0)) !== null && _a !== void 0 ? _a : 0;
         const allErrorCount = manifestValidationResult.length +
+            localizationFilesValidationRes.value.error.length +
             ((_b = declarativeCopilotValidationResult === null || declarativeCopilotValidationResult === void 0 ? void 0 : declarativeCopilotValidationResult.validationResult.length) !== null && _b !== void 0 ? _b : 0) +
             ((_c = pluginValidationResult === null || pluginValidationResult === void 0 ? void 0 : pluginValidationResult.validationResult.length) !== null && _c !== void 0 ? _c : 0) +
             actionErrorCount;
@@ -145,6 +153,19 @@ let ValidateManifestDriver = class ValidateManifestDriver {
                         });
                     });
                 }
+                if (localizationFilesValidationRes.value.error.length > 0) {
+                    outputMessage.push({
+                        content: (0, localizeUtils_1.getDefaultString)("driver.teamsApp.summary.validateTeamsManifest.checkPath", localizationFilesValidationRes.value.filePath) + "\n",
+                        color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+                    });
+                    localizationFilesValidationRes.value.error.map((error) => {
+                        outputMessage.push({ content: `${constant_1.SummaryConstant.Failed} `, color: teamsfx_api_1.Colors.BRIGHT_RED });
+                        outputMessage.push({
+                            content: `${error}\n`,
+                            color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+                        });
+                    });
+                }
                 if (declarativeCopilotValidationResult) {
                     const validationMessage = CopilotGptManifestUtils_1.copilotGptManifestUtils.logValidationErrors(declarativeCopilotValidationResult, context.platform, pluginPath);
                     if (validationMessage) {
@@ -174,6 +195,18 @@ let ValidateManifestDriver = class ValidateManifestDriver {
                             os_1.EOL +
                             teamsManifestErrors;
                 }
+                if (localizationFilesValidationRes.value.error.length > 0) {
+                    const localizationErrors = localizationFilesValidationRes.value.error
+                        .map((error) => {
+                        return `${constant_1.SummaryConstant.Failed} ${error}`;
+                    })
+                        .join(os_1.EOL);
+                    outputMessage +=
+                        os_1.EOL +
+                            (0, localizeUtils_1.getLocalizedString)("driver.teamsApp.summary.validateTeamsManifest.checkPath", localizationFilesValidationRes.value.filePath) +
+                            os_1.EOL +
+                            localizationErrors;
+                }
                 if (declarativeCopilotValidationResult) {
                     const validationMessage = CopilotGptManifestUtils_1.copilotGptManifestUtils.logValidationErrors(declarativeCopilotValidationResult, context.platform, pluginPath);
                     if (validationMessage) {
@@ -229,6 +262,63 @@ let ValidateManifestDriver = class ValidateManifestDriver {
         }
         return (0, teamsfx_api_1.ok)(undefined);
     }
+    async validateLocalizatoinFiles(args, context, manifest) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        if (((_b = (_a = manifest.localizationInfo) === null || _a === void 0 ? void 0 : _a.additionalLanguages) === null || _b === void 0 ? void 0 : _b.length) == 0 &&
+            !((_c = manifest.localizationInfo) === null || _c === void 0 ? void 0 : _c.defaultLanguageFile)) {
+            return (0, teamsfx_api_1.ok)({ error: [] });
+        }
+        const languageList = ((_d = manifest.localizationInfo) === null || _d === void 0 ? void 0 : _d.additionalLanguages) || [];
+        if ((_e = manifest.localizationInfo) === null || _e === void 0 ? void 0 : _e.defaultLanguageFile) {
+            languageList.push({
+                languageTag: manifest.localizationInfo.defaultLanguageTag,
+                file: manifest.localizationInfo.defaultLanguageFile,
+            });
+        }
+        for (const language of languageList) {
+            const filePath = language === null || language === void 0 ? void 0 : language.file;
+            if (!filePath) {
+                return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([
+                    (0, localizeUtils_1.getLocalizedString)("error.appstudio.localizationFile.pathNotDefined", filePath),
+                ])));
+            }
+            const localizationFileDir = path_1.default.dirname((0, common_1.getAbsolutePath)(args.manifestPath, context.projectPath));
+            const localizationFilePath = (0, common_1.getAbsolutePath)(filePath, localizationFileDir);
+            const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(localizationFilePath);
+            if (manifestRes.isErr()) {
+                return (0, teamsfx_api_1.err)(manifestRes.error);
+            }
+            const localizationFile = manifestRes.value;
+            try {
+                const schema = await teamsfx_api_1.ManifestUtil.fetchSchema(localizationFile);
+                // the current localization schema has invalid regex sytax, we need to manually fix the properties temporarily
+                const activityDespString = "^activities.activityTypes\\[\\b([0-9]|[1-8][0-9]|9[0-9]|1[01][0-9]|12[0-7])\\b]\\.description$";
+                const fixedActivityDespString = "^activities.activityTypes\\[\\b([0-9]|[1-8][0-9]|9[0-9]|1[01][0-9]|12[0-7])\\b\\]\\.description$";
+                if ((_f = schema.patternProperties) === null || _f === void 0 ? void 0 : _f[activityDespString]) {
+                    schema.patternProperties[fixedActivityDespString] =
+                        schema.patternProperties[activityDespString];
+                    delete schema.patternProperties[activityDespString];
+                }
+                const activityTemplateString = "^activities.activityTypes\\[\\b([0-9]|[1-8][0-9]|9[0-9]|1[01][0-9]|12[0-7])\\b]\\.templateText$";
+                const fixedActivityTemplateString = "^activities.activityTypes\\[\\b([0-9]|[1-8][0-9]|9[0-9]|1[01][0-9]|12[0-7])\\b\\]\\.templateText$";
+                if ((_g = schema.patternProperties) === null || _g === void 0 ? void 0 : _g[activityTemplateString]) {
+                    schema.patternProperties[fixedActivityTemplateString] =
+                        schema.patternProperties[activityTemplateString];
+                    delete schema.patternProperties[activityTemplateString];
+                }
+                const validationRes = await teamsfx_api_1.ManifestUtil.validateManifestAgainstSchema(localizationFile, schema);
+                if (validationRes.length > 0) {
+                    return (0, teamsfx_api_1.ok)({ error: validationRes, filePath: localizationFilePath });
+                }
+            }
+            catch (e) {
+                return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([
+                    (0, localizeUtils_1.getLocalizedString)("error.appstudio.localizationFile.validationException", filePath, e.message),
+                ])));
+            }
+        }
+        return (0, teamsfx_api_1.ok)({ error: [] });
+    }
 };
 tslib_1.__decorate([
     (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),

package/build/component/driver/teamsApp/validate.js.map CHANGED Viewed

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

package/build/component/generator/apiSpec/generator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/apiSpec/generator.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,OAAO,EAKP,OAAO,EACP,eAAe,EACf,MAAM,EAIN,MAAM,EAGN,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;~~AAuCzD~~,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAUD,qBAAa,aAAc,SAAQ,wBAAwB;IACzD,aAAa,SAAoB;IAQ1B,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAW1D,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAqB1B,gBAAgB,CAC3B,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;IA8I9B,IAAI,CACf,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;~~CAgJ7C~~"}
1	+ {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/apiSpec/generator.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,OAAO,EAKP,OAAO,EACP,eAAe,EACf,MAAM,EAIN,MAAM,EAGN,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAwCzD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAUD,qBAAa,aAAc,SAAQ,wBAAwB;IACzD,aAAa,SAAoB;IAQ1B,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAW1D,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAqB1B,gBAAgB,CAC3B,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;IA8I9B,IAAI,CACf,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;CAqK7C"}

package/build/component/generator/apiSpec/generator.js CHANGED Viewed

@@ -185,11 +185,15 @@ class SpecGenerator extends templateGenerator_1.DefaultTemplateGenerator {
         try {
             const getTemplateInfosState = inputs.getTemplateInfosState;
             const isDeclarativeCopilot = inputs[constants_1.QuestionNames.Capabilities] === constants_1.CapabilityOptions.declarativeCopilot().id;
+            const isKiotaIntegration = featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
+                !!inputs[constants_1.QuestionNames.ApiPluginManifestPath];
             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, teamsfx_api_1.DefaultApiSpecFolderName);
-            const openapiSpecFileName = getTemplateInfosState.isYaml
-                ? teamsfx_api_1.DefaultApiSpecYamlFileName
-                : teamsfx_api_1.DefaultApiSpecJsonFileName;
+            const apiSpecFolderPath = path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, isKiotaIntegration ? "" : teamsfx_api_1.DefaultApiSpecFolderName);
+            const openapiSpecFileName = isKiotaIntegration
+                ? path_1.default.basename(inputs[constants_1.QuestionNames.ApiSpecLocation])
+                : getTemplateInfosState.isYaml
+                    ? teamsfx_api_1.DefaultApiSpecYamlFileName
+                    : teamsfx_api_1.DefaultApiSpecJsonFileName;
             let openapiSpecPath = path_1.default.join(apiSpecFolderPath, openapiSpecFileName);
             if (getTemplateInfosState.templateName === forCustomCopilotRagCustomApi) {
                 const language = inputs[constants_1.QuestionNames.ProgrammingLanguage];
@@ -200,7 +204,9 @@ class SpecGenerator extends templateGenerator_1.DefaultTemplateGenerator {
             await fs.ensureDir(apiSpecFolderPath);
             let warnings;
             const pluginManifestPath = getTemplateInfosState.type === m365_spec_parser_1.ProjectType.Copilot
-                ? path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.DefaultPluginManifestFileName)
+                ? path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, isKiotaIntegration
+                    ? path_1.default.basename(inputs[constants_1.QuestionNames.ApiPluginManifestPath])
+                    : teamsfx_api_1.DefaultPluginManifestFileName)
                 : undefined;
             const responseTemplateFolder = getTemplateInfosState.type === m365_spec_parser_1.ProjectType.SME
                 ? path_1.default.join(destinationPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName)
@@ -219,7 +225,7 @@ class SpecGenerator extends templateGenerator_1.DefaultTemplateGenerator {
             }
             if (isDeclarativeCopilot) {
                 const gptManifestPath = path_1.default.join(path_1.default.dirname(manifestPath), defaultDeclarativeCopilotManifestFileName);
-                const addAcionResult = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(gptManifestPath, defaultDeclarativeCopilotActionId, teamsfx_api_1.DefaultPluginManifestFileName);
+                const addAcionResult = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(gptManifestPath, defaultDeclarativeCopilotActionId, path_1.default.basename(pluginManifestPath));
                 if (addAcionResult.isErr()) {
                     return (0, teamsfx_api_1.err)(addAcionResult.error);
                 }
@@ -229,12 +235,16 @@ class SpecGenerator extends templateGenerator_1.DefaultTemplateGenerator {
                 const spec = specs[1];
                 try {
                     const language = inputs[constants_1.QuestionNames.ProgrammingLanguage];
-                    await (0, helper_1.updateForCustomApi)(spec, language, destinationPath, openapiSpecFileName);
+                    const updateWarnings = await (0, helper_1.updateForCustomApi)(spec, language, destinationPath, openapiSpecFileName);
+                    warnings.push(...updateWarnings);
                 }
                 catch (error) {
                     throw new teamsfx_api_1.SystemError(this.componentName, failedToUpdateCustomApiTemplateErrorName, error.message, error.message);
                 }
             }
+            if (isKiotaIntegration) {
+                await (0, helper_1.copyKiotaFolder)(inputs[constants_1.QuestionNames.ApiPluginManifestPath], destinationPath);
+            }
             const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
             if (manifestRes.isErr()) {
                 return (0, teamsfx_api_1.err)(manifestRes.error);

package/build/component/generator/apiSpec/generator.js.map CHANGED Viewed

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

package/build/component/generator/apiSpec/helper.d.ts CHANGED Viewed

@@ -2,8 +2,10 @@
  * @author yuqzho@microsoft.com
  */
 import { ErrorResult as ApiSpecErrorResult, ErrorType as ApiSpecErrorType, ParseOptions, ProjectType, SpecParser, SpecParserError, WarningResult } from "@microsoft/m365-spec-parser";
+import { AuthType } from "@microsoft/m365-spec-parser/dist/src/interfaces";
 import { ApiOperation, Context, FxError, Inputs, Result, TeamsAppManifest, Warning } from "@microsoft/teamsfx-api";
 import { OpenAPIV3 } from "openapi-types";
+import { AuthActionInjectResult } from "../../configManager/actionInjector";
 export declare function getParserOptions(type: ProjectType, isDeclarativeCopilot?: boolean, platform?: string): ParseOptions;
 export declare const specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
 export declare const specParserGenerateResultAllSuccessTelemetryProperty = "all-success";
@@ -32,6 +34,7 @@ interface SpecParserGenerateResult {
 }
 export declare function generateFromApiSpec(specParser: SpecParser, teamsManifestPath: string, inputs: Inputs, context: Context, sourceComponent: string, projectType: ProjectType, outputFilePath: SpecParserOutputFilePath): Promise<Result<SpecParserGenerateResult, FxError>>;
 export declare function logValidationResults(projectType: ProjectType, errors: ErrorResult[], warnings: WarningResult[], context: Context, shouldLogWarning: boolean, shouldSkipTelemetry: boolean, specHash?: string, existingCorrelationId?: string): void;
+export declare function injectAuthAction(projectPath: string, authName: string, authScheme: AuthType, outputApiSpecPath: string, forceToAddNew: boolean): Promise<AuthActionInjectResult | undefined>;
 /**
  * Generate scaffolding warning summary.
  * @param warnings warnings returned from spec-parser.
@@ -44,7 +47,8 @@ export declare function logValidationResults(projectType: ProjectType, errors: E
 export declare function generateScaffoldingSummary(warnings: Warning[], teamsManifest: TeamsAppManifest, apiSpecFilePath: string, pluginManifestPath: string | undefined, projectPath: string): Promise<string>;
 export declare function convertSpecParserErrorToFxError(error: SpecParserError): FxError;
 export declare function formatValidationErrors(errors: ApiSpecErrorResult[], inputs: Inputs): ApiSpecErrorResult[];
-export declare function updateForCustomApi(spec: OpenAPIV3.Document, language: string, destinationPath: string, openapiSpecFileName: string): Promise<void>;
+export declare function updateForCustomApi(spec: OpenAPIV3.Document, language: string, destinationPath: string, openapiSpecFileName: string): Promise<WarningResult[]>;
 export declare function getEnvName(authName: string, authType?: string): string;
+export declare function copyKiotaFolder(specPath: string, projectPath: string): Promise<void>;
 export {};
 //# sourceMappingURL=helper.d.ts.map

package/build/component/generator/apiSpec/helper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/apiSpec/helper.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAEL,WAAW,IAAI,kBAAkB,EACjC,SAAS,IAAI,gBAAgB,EAI7B,YAAY,EACZ,WAAW,EACX,UAAU,EACV,eAAe,EAGf,aAAa,EAEd,MAAM,6BAA6B,CAAC;~~AAErC~~,OAAO,EACL,YAAY,EAEZ,OAAO,EACP,OAAO,EACP,MAAM,EAIN,MAAM,EAEN,gBAAgB,EAEhB,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;~~AA6C1C~~,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,WAAW,EACjB,oBAAoB,CAAC,EAAE,OAAO,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,YAAY,CAgCd;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,CAAC;IAEvB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,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,CAqKhD;AA8CD,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,EAC1B,iBAAiB,EAAE,MAAM,EACzB,0BAA0B,EAAE,MAAM,GACjC,OAAO,CAAC,MAAM,EAAE,CAAC,CA6BnB;AAED,UAAU,wBAAwB;IAChC,0BAA0B,EAAE,MAAM,CAAC;IACnC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,UAAU,wBAAwB;IAChC,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AACD,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,UAAU,EACtB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,wBAAwB,GACvC,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC,CA+FpD;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,WAAW,EAAE,EACrB,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,EACzB,mBAAmB,EAAE,OAAO,EAC5B,QAAQ,CAAC,EAAE,MAAM,EACjB,qBAAqB,CAAC,EAAE,MAAM,GAC7B,IAAI,CAwEN;AAED;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,gBAAgB,EAC/B,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA6CjB;~~AAuND~~,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAO/E;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,MAAM,EAAE,MAAM,GACb,kBAAkB,EAAE,CAQtB;~~AAieD~~,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,SAAS,CAAC,QAAQ,EACxB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,~~IAAI~~,CAAC,~~CAoBf~~;AAOD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAEtE"}
1	+ {"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/apiSpec/helper.ts"],"names":[],"mappings":"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"}

package/build/component/generator/apiSpec/helper.js CHANGED Viewed

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnvName = exports.updateForCustomApi = exports.formatValidationErrors = exports.convertSpecParserErrorToFxError = exports.generateScaffoldingSummary = exports.logValidationResults = exports.generateFromApiSpec = exports.listPluginExistingOperations = exports.listOperations = exports.invalidApiSpecErrorName = exports.specParserGenerateResultWarningsTelemetryProperty = exports.specParserGenerateResultAllSuccessTelemetryProperty = exports.specParserGenerateResultTelemetryEvent = exports.getParserOptions = void 0;
+exports.copyKiotaFolder = exports.getEnvName = exports.updateForCustomApi = exports.formatValidationErrors = exports.convertSpecParserErrorToFxError = exports.generateScaffoldingSummary = exports.injectAuthAction = exports.logValidationResults = exports.generateFromApiSpec = exports.listPluginExistingOperations = exports.listOperations = exports.invalidApiSpecErrorName = exports.specParserGenerateResultWarningsTelemetryProperty = exports.specParserGenerateResultAllSuccessTelemetryProperty = exports.specParserGenerateResultTelemetryEvent = exports.getParserOptions = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author yuqzho@microsoft.com
@@ -22,6 +22,8 @@ const PluginManifestUtils_1 = require("../../driver/teamsApp/utils/PluginManifes
 const telemetry_1 = require("../../../common/telemetry");
 const util = tslib_1.__importStar(require("util"));
 const constants_2 = require("../../../common/constants");
+const versionMetadata_1 = require("../../../common/versionMetadata");
+const actionInjector_1 = require("../../configManager/actionInjector");
 function getParserOptions(type, isDeclarativeCopilot, platform) {
     return type === m365_spec_parser_1.ProjectType.Copilot
         ? {
@@ -339,6 +341,26 @@ function logValidationResults(projectType, errors, warnings, context, shouldLogW
     void context.logProvider.info(outputMessage);
 }
 exports.logValidationResults = logValidationResults;
+async function injectAuthAction(projectPath, authName, authScheme, outputApiSpecPath, forceToAddNew) {
+    const ymlPath = path_1.default.join(projectPath, versionMetadata_1.MetadataV3.configFile);
+    const localYamlPath = path_1.default.join(projectPath, versionMetadata_1.MetadataV3.localConfigFile);
+    const relativeSpecPath = "./" + path_1.default.relative(projectPath, outputApiSpecPath).replace(/\\/g, "/");
+    if (m365_spec_parser_1.Utils.isBearerTokenAuth(authScheme)) {
+        const res = await actionInjector_1.ActionInjector.injectCreateAPIKeyAction(ymlPath, authName, relativeSpecPath, forceToAddNew);
+        if (await fs_extra_1.default.pathExists(localYamlPath)) {
+            await actionInjector_1.ActionInjector.injectCreateAPIKeyAction(localYamlPath, authName, relativeSpecPath, forceToAddNew);
+        }
+        return res;
+    }
+    else if (m365_spec_parser_1.Utils.isOAuthWithAuthCodeFlow(authScheme)) {
+        const res = await actionInjector_1.ActionInjector.injectCreateOAuthAction(ymlPath, authName, relativeSpecPath, forceToAddNew);
+        if (await fs_extra_1.default.pathExists(localYamlPath)) {
+            await actionInjector_1.ActionInjector.injectCreateOAuthAction(localYamlPath, authName, relativeSpecPath, forceToAddNew);
+        }
+        return res;
+    }
+}
+exports.injectAuthAction = injectAuthAction;
 /**
  * Generate scaffolding warning summary.
  * @param warnings warnings returned from spec-parser.
@@ -393,6 +415,10 @@ function formatApiSpecValidationWarningMessage(specWarnings, apiSpecFileName, te
         resultWarnings.push(`${constant_1.SummaryConstant.NotExecuted} ` +
             (0, localizeUtils_1.getLocalizedString)("core.copilotPlugin.scaffold.summary.warning.swaggerVersion", apiSpecFileName));
     }
+    const specialCharactersWarnings = specWarnings.filter((w) => w.type === m365_spec_parser_1.WarningType.OperationIdContainsSpecialCharacters);
+    specialCharactersWarnings.forEach((warning) => {
+        resultWarnings.push((0, localizeUtils_1.getLocalizedString)("core.copilotPlugin.scaffold.summary.warning.operationIdContainsSpecialCharacters", warning.data.operationId, warning.data.operationId.replace(/[^a-zA-Z0-9]/g, "_")));
+    });
     return resultWarnings;
 }
 function validateTeamsManifestLength(teamsManifest, warnings) {
@@ -511,10 +537,6 @@ function mapInvalidReasonToMessage(reason) {
             return (0, localizeUtils_1.getLocalizedString)("core.common.invalidReason.PostBodyContainsRequiredUnsupportedSchema");
         case m365_spec_parser_1.ErrorType.ParamsContainRequiredUnsupportedSchema:
             return (0, localizeUtils_1.getLocalizedString)("core.common.invalidReason.ParamsContainRequiredUnsupportedSchema");
-        case m365_spec_parser_1.ErrorType.ParamsContainsNestedObject:
-            return (0, localizeUtils_1.getLocalizedString)("core.common.invalidReason.ParamsContainsNestedObject");
-        case m365_spec_parser_1.ErrorType.RequestBodyContainsNestedObject:
-            return (0, localizeUtils_1.getLocalizedString)("core.common.invalidReason.RequestBodyContainsNestedObject");
         case m365_spec_parser_1.ErrorType.ExceededRequiredParamsLimit:
             return (0, localizeUtils_1.getLocalizedString)("core.common.invalidReason.ExceededRequiredParamsLimit");
         case m365_spec_parser_1.ErrorType.NoParameter:
@@ -636,6 +658,7 @@ async function updatePromptForCustomApi(spec, language, chatFolder) {
     }
 }
 async function updateAdaptiveCardForCustomApi(specItems, language, destinationPath) {
+    const warnings = [];
     if (commonLanguages.includes(language)) {
         let adaptiveCardsFolderPath = path_1.default.join(destinationPath, "src", "adaptiveCards");
         if (language === constants_1.ProgrammingLanguage.CSharp) {
@@ -644,14 +667,34 @@ async function updateAdaptiveCardForCustomApi(specItems, language, destinationPa
         await fs_extra_1.default.ensureDir(adaptiveCardsFolderPath);
         for (const item of specItems) {
             const name = item.item.operationId.replace(/[^a-zA-Z0-9]/g, "_");
-            const [card, jsonPath] = m365_spec_parser_1.AdaptiveCardGenerator.generateAdaptiveCard(item.item, true);
-            if (jsonPath !== "$" && card.body && card.body[0] && card.body[0].$data) {
-                card.body[0].$data = `\${${jsonPath}}`;
+            try {
+                const [card, jsonPath, jsonData, generateWarnings] = m365_spec_parser_1.AdaptiveCardGenerator.generateAdaptiveCard(item.item, true, 5);
+                if (jsonPath !== "$" && card.body && card.body[0] && card.body[0].$data) {
+                    card.body[0].$data = `\${${jsonPath}}`;
+                }
+                const cardFilePath = path_1.default.join(adaptiveCardsFolderPath, `${name}.json`);
+                const jsonDataPath = path_1.default.join(adaptiveCardsFolderPath, `${name}.data.json`);
+                await fs_extra_1.default.writeFile(cardFilePath, JSON.stringify(card, null, 2));
+                await fs_extra_1.default.writeFile(jsonDataPath, JSON.stringify(jsonData, null, 2));
+                generateWarnings.forEach((w) => {
+                    warnings.push({
+                        type: m365_spec_parser_1.WarningType.GenerateJsonDataFailed,
+                        // TODO: move message to package.nls.json file
+                        content: util.format("Failed to create the adaptive card mock data for API '%s': %s. Mitigation: Not required but you can manually add it to the adaptiveCards folder.", item.item.operationId, w.content),
+                        data: item.item.operationId,
+                    });
+                });
+            }
+            catch (err) {
+                warnings.push({
+                    type: m365_spec_parser_1.WarningType.GenerateCardFailed,
+                    content: (0, localizeUtils_1.getLocalizedString)("core.copilotPlugin.scaffold.summary.warning.generate.ac.failed", item.item.operationId, err.message),
+                    data: item.item.operationId,
+                });
             }
-            const cardFilePath = path_1.default.join(adaptiveCardsFolderPath, `${name}.json`);
-            await fs_extra_1.default.writeFile(cardFilePath, JSON.stringify(card, null, 2));
         }
     }
+    return warnings;
 }
 function filterSchema(schema) {
     const filteredSchema = { type: schema.type };
@@ -750,14 +793,23 @@ const ActionCode = {
 app.ai.action("{{operationId}}", async (context, state, parameter) => {
   const client = await api.getClient();
   // Add authentication configuration for the client
-  const path = client.paths["{{pathUrl}}"];
-  if (path && path.{{method}}) {
-    const result = await path.{{method}}(parameter.path, parameter.body, {
+  const apiPath = client.paths["{{pathUrl}}"];
+  if (apiPath && apiPath.{{method}}) {
+    const result = await apiPath.{{method}}(parameter.path, parameter.body, {
       params: parameter.query,
     });
+    if (!result || !result.data) {
+      throw new Error("Get empty result from api call.");
+    }
     const cardName = "{{operationId}}".replace(/[^a-zA-Z0-9]/g, "_");
-    const card = generateAdaptiveCard("../adaptiveCards/" + cardName + ".json", result);
-    await context.sendActivity({ attachments: [card] });
+    const cardTemplatePath = path.join(__dirname, '../adaptiveCards', cardName + '.json');
+    if (await fs.exists(cardTemplatePath)){
+      const card = generateAdaptiveCard(cardTemplatePath, result);
+      await context.sendActivity({ attachments: [card] });
+    }
+    else {
+      await context.sendActivity(JSON.stringify(result.data));
+    }
   } else {
     await context.sendActivity("no result");
   }
@@ -768,14 +820,23 @@ app.ai.action("{{operationId}}", async (context, state, parameter) => {
 app.ai.action("{{operationId}}", async (context: TurnContext, state: ApplicationTurnState, parameter: any) => {
   const client = await api.getClient();
   // Add authentication configuration for the client
-  const path = client.paths["{{pathUrl}}"];
-  if (path && path.{{method}}) {
-    const result = await path.{{method}}(parameter.path, parameter.body, {
+  const apiPath = client.paths["{{pathUrl}}"];
+  if (apiPath && apiPath.{{method}}) {
+    const result = await apiPath.{{method}}(parameter.path, parameter.body, {
       params: parameter.query,
     });
+    if (!result || !result.data) {
+      throw new Error("Get empty result from api call.");
+    }
     const cardName = "{{operationId}}".replace(/[^a-zA-Z0-9]/g, "_");
-    const card = generateAdaptiveCard("../adaptiveCards/" + cardName + ".json", result);
-    await context.sendActivity({ attachments: [card] });
+    const cardTemplatePath = path.join(__dirname, '../adaptiveCards', cardName + '.json');
+    if (await fs.exists(cardTemplatePath)){
+      const card = generateAdaptiveCard(cardTemplatePath, result);
+      await context.sendActivity({ attachments: [card] });
+    }
+    else {
+      await context.sendActivity(JSON.stringify(result.data));
+    }
   } else {
     await context.sendActivity("no result");
   }
@@ -798,18 +859,22 @@ async def {{operationId}}(
     await context.send_activity(resp.reason)
   else:
     card_template_path = os.path.join(current_dir, 'adaptiveCards/{{operationId}}.json')
-    with open(card_template_path) as card_template_file:
+    if not os.path.exists(card_template_path):
+      json_resoponse_str = resp.text
+      await context.send_activity(json_resoponse_str)
+    else:
+      with open(card_template_path) as card_template_file:
         adaptive_card_template = card_template_file.read()
-    renderer = AdaptiveCardRenderer(adaptive_card_template)
+      renderer = AdaptiveCardRenderer(adaptive_card_template)
-    json_resoponse_str = resp.text
-    rendered_card_str = renderer.render(json_resoponse_str)
-    rendered_card_json = json.loads(rendered_card_str)
-    card = CardFactory.adaptive_card(rendered_card_json)
-    message = MessageFactory.attachment(card)
-    await context.send_activity(message)
+      json_resoponse_str = resp.text
+      rendered_card_str = renderer.render(json_resoponse_str)
+      rendered_card_json = json.loads(rendered_card_str)
+      card = CardFactory.adaptive_card(rendered_card_json)
+      message = MessageFactory.attachment(card)
+      await context.send_activity(message)
   return "success"
   `,
     cs: `
@@ -824,9 +889,14 @@ async def {{operationId}}(
                 var data = response.Content;
                 var cardTemplatePath = "./adaptiveCards/{{operationId}}.json";
-                var message = RenderCardToMessage(cardTemplatePath, data);
-                await turnContext.SendActivityAsync(message);
+                if (File.Exists(cardTemplatePath)) {
+                    var message = RenderCardToMessage(cardTemplatePath, data);
+                    await turnContext.SendActivityAsync(message);
+                }
+                else
+                {
+                    await turnContext.SendActivityAsync(data);
+                }
             }
             catch (Exception ex) {
                 await turnContext.SendActivityAsync("Failed to call API with error:  " + ex.Message);
@@ -912,6 +982,7 @@ async function updateCodeForCustomApi(specItems, language, destinationPath, open
     }
 }
 async function updateForCustomApi(spec, language, destinationPath, openapiSpecFileName) {
+    const warnings = [];
     let chatFolder = path_1.default.join(destinationPath, "src", "prompts", "chat");
     if (language === constants_1.ProgrammingLanguage.CSharp) {
         chatFolder = path_1.default.join(destinationPath, "prompts", "Chat");
@@ -921,11 +992,13 @@ async function updateForCustomApi(spec, language, destinationPath, openapiSpecFi
     await updatePromptForCustomApi(spec, language, chatFolder);
     const [specItems, needAuth] = parseSpec(spec);
     // 2. update adaptive card folder
-    await updateAdaptiveCardForCustomApi(specItems, language, destinationPath);
+    const generateWarnings = await updateAdaptiveCardForCustomApi(specItems, language, destinationPath);
+    warnings.push(...generateWarnings);
     // 3. update actions file
     await updateActionForCustomApi(specItems, language, chatFolder);
     // 4. update code
     await updateCodeForCustomApi(specItems, language, destinationPath, openapiSpecFileName, needAuth);
+    return warnings;
 }
 exports.updateForCustomApi = updateForCustomApi;
 const EnvNameMapping = {
@@ -936,4 +1009,18 @@ function getEnvName(authName, authType) {
     return m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_${EnvNameMapping[authType !== null && authType !== void 0 ? authType : "apiKey"]}`);
 }
 exports.getEnvName = getEnvName;
+async function copyKiotaFolder(specPath, projectPath) {
+    const originKiotaFolder = path_1.default.join(path_1.default.dirname(specPath), "..", ".kiota");
+    if (!(await fs_extra_1.default.pathExists(originKiotaFolder))) {
+        return;
+    }
+    const destinationKiotaFolder = path_1.default.join(projectPath, ".kiota");
+    if (await fs_extra_1.default.pathExists(destinationKiotaFolder)) {
+        return;
+    }
+    await fs_extra_1.default.ensureDir(destinationKiotaFolder);
+    await fs_extra_1.default.copy(originKiotaFolder, destinationKiotaFolder, { recursive: true });
+    return;
+}
+exports.copyKiotaFolder = copyKiotaFolder;
 //# sourceMappingURL=helper.js.map