@microsoft/m365-spec-parser 0.2.1-rc-hotfix.0 → 0.2.2-alpha.4a7c0c761.0

package/dist/index.node.cjs.js

@@ -59,10 +59,12 @@ exports.ErrorType = void 0;
     ErrorType["RelativeServerUrlNotSupported"] = "relative-server-url-not-supported";
     ErrorType["NoSupportedApi"] = "no-supported-api";
     ErrorType["NoExtraAPICanBeAdded"] = "no-extra-api-can-be-added";
+    ErrorType["AddedAPINotInOriginalSpec"] = "added-api-not-in-original-spec";
     ErrorType["ResolveServerUrlFailed"] = "resolve-server-url-failed";
     ErrorType["SwaggerNotSupported"] = "swagger-not-supported";
     ErrorType["MultipleAuthNotSupported"] = "multiple-auth-not-supported";
     ErrorType["SpecVersionNotSupported"] = "spec-version-not-supported";
+    ErrorType["CircularReferenceNotSupported"] = "circular-reference-not-supported";
     ErrorType["ListFailed"] = "list-failed";
     ErrorType["listSupportedAPIInfoFailed"] = "list-supported-api-info-failed";
     ErrorType["FilterSpecFailed"] = "filter-spec-failed";
@@ -299,7 +301,7 @@ class Utils {
     static updateFirstLetter(str) {
         return str.charAt(0).toUpperCase() + str.slice(1);
     }
-    static getResponseJson(operationObject) {
+    static getResponseJson(operationObject, allowMultipleMediaType = false) {
         var _a, _b;
         let json = {};
         let multipleMediaType = false;
@@ -310,7 +312,9 @@ class Utils {
                 json = responseObject.content["application/json"];
                 if (Utils.containMultipleMediaTypes(responseObject)) {
                     multipleMediaType = true;
-                    json = {};
+                    if (!allowMultipleMediaType) {
+                        json = {};
+                    }
                 }
                 else {
                     break;
@@ -578,6 +582,19 @@ class Utils {
 
 // Copyright (c) Microsoft Corporation.
 class Validator {
+    constructor() {
+        this.hasCircularReference = false;
+    }
+    checkCircularReference() {
+        try {
+            JSON.stringify(this.spec);
+        }
+        catch (e) {
+            if (e.message.includes("Converting circular structure to JSON")) {
+                this.hasCircularReference = true;
+            }
+        }
+    }
     listAPIs() {
         var _a;
         if (this.apiMap) {
@@ -673,6 +690,22 @@ class Validator {
         }
         return result;
     }
+    validateCircularReference(method, path) {
+        const result = { isValid: true, reason: [] };
+        if (this.hasCircularReference) {
+            const operationObject = this.spec.paths[path][method];
+            try {
+                JSON.stringify(operationObject);
+            }
+            catch (e) {
+                if (e.message.includes("Converting circular structure to JSON")) {
+                    result.isValid = false;
+                    result.reason.push(exports.ErrorType.CircularReferenceNotSupported);
+                }
+            }
+        }
+        return result;
+    }
     validateResponse(method, path) {
         const result = { isValid: true, reason: [] };
         const operationObject = this.spec.paths[path][method];
@@ -861,6 +894,7 @@ class CopilotValidator extends Validator {
         this.projectType = exports.ProjectType.Copilot;
         this.options = options;
         this.spec = spec;
+        this.checkCircularReference();
     }
     validateSpec() {
         const result = { errors: [], warnings: [] };
@@ -886,6 +920,10 @@ class CopilotValidator extends Validator {
         if (!methodAndPathResult.isValid) {
             return methodAndPathResult;
         }
+        const circularReferenceResult = this.validateCircularReference(method, path);
+        if (!circularReferenceResult.isValid) {
+            return circularReferenceResult;
+        }
         const operationObject = this.spec.paths[path][method];
         // validate auth
         const authCheckResult = this.validateAuth(method, path);
@@ -929,6 +967,7 @@ class SMEValidator extends Validator {
         this.projectType = exports.ProjectType.SME;
         this.options = options;
         this.spec = spec;
+        this.checkCircularReference();
     }
     validateSpec() {
         const result = { errors: [], warnings: [] };
@@ -956,6 +995,10 @@ class SMEValidator extends Validator {
         if (!methodAndPathResult.isValid) {
             return methodAndPathResult;
         }
+        const circularReferenceResult = this.validateCircularReference(method, path);
+        if (!circularReferenceResult.isValid) {
+            return circularReferenceResult;
+        }
         const operationObject = this.spec.paths[path][method];
         // validate auth
         const authCheckResult = this.validateAuth(method, path);
@@ -1026,6 +1069,7 @@ class TeamsAIValidator extends Validator {
         this.projectType = exports.ProjectType.TeamsAi;
         this.options = options;
         this.spec = spec;
+        this.checkCircularReference();
     }
     validateSpec() {
         const result = { errors: [], warnings: [] };
@@ -1045,6 +1089,10 @@ class TeamsAIValidator extends Validator {
         if (!methodAndPathResult.isValid) {
             return methodAndPathResult;
         }
+        const circularReferenceResult = this.validateCircularReference(method, path);
+        if (!circularReferenceResult.isValid) {
+            return circularReferenceResult;
+        }
         const operationObject = this.spec.paths[path][method];
         // validate operationId
         if (!this.options.allowMissingId && !operationObject.operationId) {
@@ -1120,9 +1168,9 @@ class SpecFilter {
 
 // Copyright (c) Microsoft Corporation.
 class AdaptiveCardGenerator {
-    static generateAdaptiveCard(operationItem) {
+    static generateAdaptiveCard(operationItem, allowMultipleMediaType = false) {
         try {
-            const { json } = Utils.getResponseJson(operationItem);
+            const { json } = Utils.getResponseJson(operationItem, allowMultipleMediaType);
             let cardBody = [];
             let schema = json.schema;
             let jsonPath = "$";
@@ -1643,7 +1691,6 @@ class ManifestUpdater {
                         const auth = authInfo.authScheme;
                         const safeRegistrationIdName = Utils.getSafeRegistrationIdEnvName(`${authInfo.name}_${ConstantString.RegistrationIdPostfix[authInfo.authScheme.type]}`);
                         if (Utils.isAPIKeyAuth(auth) || Utils.isBearerTokenAuth(auth)) {
-                            const safeApiSecretRegistrationId = Utils.getSafeRegistrationIdEnvName(`${authInfo.name}_${ConstantString.RegistrationIdPostfix[authInfo.authScheme.type]}`);
                             composeExtension.authorization = {
                                 authType: "apiSecretServiceAuth",
                                 apiSecretServiceAuthConfiguration: {
@@ -1652,16 +1699,13 @@ class ManifestUpdater {
                             };
                         }
                         else if (Utils.isOAuthWithAuthCodeFlow(auth)) {
+                            // TODO: below schema is coming from design doc, may need to update when shcema is finalized
                             composeExtension.authorization = {
                                 authType: "oAuth2.0",
                                 oAuthConfiguration: {
                                     oauthConfigurationId: `\${{${safeRegistrationIdName}}}`,
                                 },
                             };
-                            updatedPart.webApplicationInfo = {
-                                id: "${{AAD_APP_CLIENT_ID}}",
-                                resource: "api://${{DOMAIN}}/${{AAD_APP_CLIENT_ID}}",
-                            };
                         }
                     }
                     updatedPart.composeExtensions = [composeExtension];
@@ -1699,12 +1743,17 @@ class ManifestUpdater {
                                         command.parameters = command.parameters.filter((param) => param.isRequired);
                                     }
                                     else if (command.parameters && command.parameters.length > 0) {
-                                        command.parameters = [command.parameters[0]];
-                                        warnings.push({
-                                            type: exports.WarningType.OperationOnlyContainsOptionalParam,
-                                            content: Utils.format(ConstantString.OperationOnlyContainsOptionalParam, command.id),
-                                            data: command.id,
-                                        });
+                                        if (command.parameters.length > 1) {
+                                            command.parameters = [command.parameters[0]];
+                                            warnings.push({
+                                                type: exports.WarningType.OperationOnlyContainsOptionalParam,
+                                                content: Utils.format(ConstantString.OperationOnlyContainsOptionalParam, command.id),
+                                                data: {
+                                                    commandId: command.id,
+                                                    parameterName: command.parameters[0].name,
+                                                },
+                                            });
+                                        }
                                     }
                                     if (adaptiveCardFolder) {
                                         const adaptiveCardPath = path__default['default'].join(adaptiveCardFolder, command.id + ".json");
@@ -1782,7 +1831,13 @@ class SpecParser {
             try {
                 try {
                     yield this.loadSpec();
-                    yield this.parser.validate(this.spec);
+                    if (!this.parser.$refs.circular) {
+                        yield this.parser.validate(this.spec);
+                    }
+                    else {
+                        const clonedUnResolveSpec = JSON.parse(JSON.stringify(this.unResolveSpec));
+                        yield this.parser.validate(clonedUnResolveSpec);
+                    }
                 }
                 catch (e) {
                     return {
@@ -1877,7 +1932,7 @@ class SpecParser {
                     if (isValid) {
                         const serverObj = Utils.getServerObject(spec, method.toLocaleLowerCase(), path);
                         if (serverObj) {
-                            apiResult.server = Utils.resolveEnv(serverObj.url);
+                            apiResult.server = serverObj.url;
                         }
                         const authArray = Utils.getAuthArray(operation.security, spec);
                         for (const auths of authArray) {
@@ -1919,7 +1974,8 @@ class SpecParser {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                     throw new SpecParserError(ConstantString.CancelledMessage, exports.ErrorType.Cancelled);
                 }
-                const newSpec = (yield this.parser.dereference(newUnResolvedSpec));
+                const clonedUnResolveSpec = JSON.parse(JSON.stringify(newUnResolvedSpec));
+                const newSpec = (yield this.parser.dereference(clonedUnResolveSpec));
                 return [newUnResolvedSpec, newSpec];
             }
             catch (err) {
@@ -2033,7 +2089,8 @@ class SpecParser {
     loadSpec() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.spec) {
-                this.unResolveSpec = (yield this.parser.parse(this.pathOrSpec));
+                const spec = (yield this.parser.parse(this.pathOrSpec));
+                this.unResolveSpec = this.resolveEnvForSpec(spec);
                 // Convert swagger 2.0 to openapi 3.0
                 if (!this.unResolveSpec.openapi && this.unResolveSpec.swagger === "2.0") {
                     const specObj = yield converter__default['default'].convert(this.unResolveSpec, {});
@@ -2070,6 +2127,11 @@ class SpecParser {
             yield fs__default['default'].outputFile(outputSpecPath, resultStr);
         });
     }
+    resolveEnvForSpec(spec) {
+        const specString = JSON.stringify(spec);
+        const specResolved = Utils.resolveEnv(specString);
+        return JSON.parse(specResolved);
+    }
 }
 
 exports.AdaptiveCardGenerator = AdaptiveCardGenerator;