@microsoft/m365-spec-parser 0.2.1-rc-hotfix.0 → 0.2.2-alpha.02a122217.0

package/dist/index.esm2017.mjs

@@ -17,10 +17,12 @@ var ErrorType;
     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";
@@ -257,21 +259,28 @@ class Utils {
     static updateFirstLetter(str) {
         return str.charAt(0).toUpperCase() + str.slice(1);
     }
-    static getResponseJson(operationObject) {
-        var _a, _b;
+    static getResponseJson(operationObject, allowMultipleMediaType = false) {
+        var _a;
         let json = {};
         let multipleMediaType = false;
         for (const code of ConstantString.ResponseCodeFor20X) {
             const responseObject = (_a = operationObject === null || operationObject === void 0 ? void 0 : operationObject.responses) === null || _a === void 0 ? void 0 : _a[code];
-            if ((_b = responseObject === null || responseObject === void 0 ? void 0 : responseObject.content) === null || _b === void 0 ? void 0 : _b["application/json"]) {
-                multipleMediaType = false;
-                json = responseObject.content["application/json"];
-                if (Utils.containMultipleMediaTypes(responseObject)) {
-                    multipleMediaType = true;
-                    json = {};
-                }
-                else {
-                    break;
+            if (responseObject === null || responseObject === void 0 ? void 0 : responseObject.content) {
+                for (const contentType of Object.keys(responseObject.content)) {
+                    // json media type can also be "application/json; charset=utf-8"
+                    if (contentType.indexOf("application/json") >= 0) {
+                        multipleMediaType = false;
+                        json = responseObject.content[contentType];
+                        if (Utils.containMultipleMediaTypes(responseObject)) {
+                            multipleMediaType = true;
+                            if (!allowMultipleMediaType) {
+                                json = {};
+                            }
+                        }
+                        else {
+                            return { json, multipleMediaType };
+                        }
+                    }
                 }
             }
         }
@@ -532,10 +541,46 @@ class Utils {
         const serverUrl = operationServer || methodServer || rootServer;
         return serverUrl;
     }
+    static limitACBodyProperties(body, maxCount) {
+        const result = [];
+        let currentCount = 0;
+        for (const element of body) {
+            if (element.type === ConstantString.ContainerType) {
+                const items = this.limitACBodyProperties(element.items, maxCount - currentCount);
+                result.push({
+                    type: ConstantString.ContainerType,
+                    $data: element.$data,
+                    items: items,
+                });
+                currentCount += items.length;
+            }
+            else {
+                result.push(element);
+                currentCount++;
+            }
+            if (currentCount >= maxCount) {
+                break;
+            }
+        }
+        return result;
+    }
 }
 
 // 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) {
@@ -631,6 +676,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(ErrorType.CircularReferenceNotSupported);
+                }
+            }
+        }
+        return result;
+    }
     validateResponse(method, path) {
         const result = { isValid: true, reason: [] };
         const operationObject = this.spec.paths[path][method];
@@ -819,6 +880,7 @@ class CopilotValidator extends Validator {
         this.projectType = ProjectType.Copilot;
         this.options = options;
         this.spec = spec;
+        this.checkCircularReference();
     }
     validateSpec() {
         const result = { errors: [], warnings: [] };
@@ -844,6 +906,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);
@@ -887,6 +953,7 @@ class SMEValidator extends Validator {
         this.projectType = ProjectType.SME;
         this.options = options;
         this.spec = spec;
+        this.checkCircularReference();
     }
     validateSpec() {
         const result = { errors: [], warnings: [] };
@@ -914,6 +981,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);
@@ -984,6 +1055,7 @@ class TeamsAIValidator extends Validator {
         this.projectType = ProjectType.TeamsAi;
         this.options = options;
         this.spec = spec;
+        this.checkCircularReference();
     }
     validateSpec() {
         const result = { errors: [], warnings: [] };
@@ -1003,6 +1075,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) {
@@ -1035,6 +1111,161 @@ class ValidatorFactory {
     }
 }
 
+// Copyright (c) Microsoft Corporation.
+class SpecOptimizer {
+    static optimize(spec, options) {
+        const mergedOptions = Object.assign(Object.assign({}, SpecOptimizer.defaultOptions), (options !== null && options !== void 0 ? options : {}));
+        const newSpec = JSON.parse(JSON.stringify(spec));
+        if (mergedOptions.removeUserDefinedRootProperty) {
+            SpecOptimizer.removeUserDefinedRootProperty(newSpec);
+        }
+        if (mergedOptions.removeUnusedComponents) {
+            SpecOptimizer.removeUnusedComponents(newSpec);
+        }
+        if (mergedOptions.removeUnusedTags) {
+            SpecOptimizer.removeUnusedTags(newSpec);
+        }
+        if (mergedOptions.removeUnusedSecuritySchemas) {
+            SpecOptimizer.removeUnusedSecuritySchemas(newSpec);
+        }
+        return newSpec;
+    }
+    static removeUnusedSecuritySchemas(spec) {
+        if (!spec.components || !spec.components.securitySchemes) {
+            return;
+        }
+        const usedSecuritySchemas = new Set();
+        for (const pathKey in spec.paths) {
+            for (const methodKey in spec.paths[pathKey]) {
+                const operation = spec.paths[pathKey][methodKey];
+                if (operation.security) {
+                    operation.security.forEach((securityReq) => {
+                        for (const schemaKey in securityReq) {
+                            usedSecuritySchemas.add(schemaKey);
+                        }
+                    });
+                }
+            }
+        }
+        if (spec.security) {
+            spec.security.forEach((securityReq) => {
+                for (const schemaKey in securityReq) {
+                    usedSecuritySchemas.add(schemaKey);
+                }
+            });
+        }
+        for (const schemaKey in spec.components.securitySchemes) {
+            if (!usedSecuritySchemas.has(schemaKey)) {
+                delete spec.components.securitySchemes[schemaKey];
+            }
+        }
+        if (Object.keys(spec.components.securitySchemes).length === 0) {
+            delete spec.components.securitySchemes;
+        }
+        if (Object.keys(spec.components).length === 0) {
+            delete spec.components;
+        }
+    }
+    static removeUnusedTags(spec) {
+        if (!spec.tags) {
+            return;
+        }
+        const usedTags = new Set();
+        for (const pathKey in spec.paths) {
+            for (const methodKey in spec.paths[pathKey]) {
+                const operation = spec.paths[pathKey][methodKey];
+                if (operation.tags) {
+                    operation.tags.forEach((tag) => usedTags.add(tag));
+                }
+            }
+        }
+        spec.tags = spec.tags.filter((tagObj) => usedTags.has(tagObj.name));
+    }
+    static removeUserDefinedRootProperty(spec) {
+        for (const key in spec) {
+            if (key.startsWith("x-")) {
+                delete spec[key];
+            }
+        }
+    }
+    static removeUnusedComponents(spec) {
+        const components = spec.components;
+        if (!components) {
+            return;
+        }
+        delete spec.components;
+        const usedComponentsSet = new Set();
+        const specString = JSON.stringify(spec);
+        const componentReferences = SpecOptimizer.getComponentReferences(specString);
+        for (const reference of componentReferences) {
+            this.addComponent(reference, usedComponentsSet, components);
+        }
+        const newComponents = {};
+        for (const componentName of usedComponentsSet) {
+            const parts = componentName.split("/");
+            const component = this.getComponent(componentName, components);
+            if (component) {
+                let current = newComponents;
+                for (let i = 2; i < parts.length; i++) {
+                    if (i === parts.length - 1) {
+                        current[parts[i]] = component;
+                    }
+                    else if (!current[parts[i]]) {
+                        current[parts[i]] = {};
+                    }
+                    current = current[parts[i]];
+                }
+            }
+        }
+        // securitySchemes are referenced directly by name, to void issue, just keep them all and use removeUnusedSecuritySchemas to remove unused ones
+        if (components.securitySchemes) {
+            newComponents.securitySchemes = components.securitySchemes;
+        }
+        if (Object.keys(newComponents).length !== 0) {
+            spec.components = newComponents;
+        }
+    }
+    static getComponentReferences(specString) {
+        const matches = Array.from(specString.matchAll(/['"](#\/components\/.+?)['"]/g));
+        const matchResult = matches.map((match) => match[1]);
+        return matchResult;
+    }
+    static getComponent(componentPath, components) {
+        const parts = componentPath.split("/");
+        let current = components;
+        for (const part of parts) {
+            if (part === "#" || part === "components") {
+                continue;
+            }
+            current = current[part];
+            if (!current) {
+                return null;
+            }
+        }
+        return current;
+    }
+    static addComponent(componentName, usedComponentsSet, components) {
+        if (usedComponentsSet.has(componentName)) {
+            return;
+        }
+        usedComponentsSet.add(componentName);
+        const component = this.getComponent(componentName, components);
+        if (component) {
+            const componentString = JSON.stringify(component);
+            const componentReferences = SpecOptimizer.getComponentReferences(componentString);
+            for (const reference of componentReferences) {
+                this.addComponent(reference, usedComponentsSet, components);
+            }
+        }
+    }
+}
+SpecOptimizer.defaultOptions = {
+    removeUnusedComponents: true,
+    removeUnusedTags: true,
+    removeUserDefinedRootProperty: true,
+    removeUnusedSecuritySchemas: true,
+};
+
 // Copyright (c) Microsoft Corporation.
 class SpecFilter {
     static specFilter(filter, unResolveSpec, resolvedSpec, options) {
@@ -1068,7 +1299,7 @@ class SpecFilter {
                 }
             }
             newSpec.paths = newPaths;
-            return newSpec;
+            return SpecOptimizer.optimize(newSpec);
         }
         catch (err) {
             throw new SpecParserError(err.toString(), ErrorType.FilterSpecFailed);
@@ -1078,9 +1309,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 = "$";
@@ -1191,7 +1422,7 @@ class AdaptiveCardGenerator {
                         {
                             type: "Image",
                             url: `\${${name}}`,
-                            $when: `\${${name} != null}`,
+                            $when: `\${${name} != null && ${name} != ''}`,
                         },
                     ];
                 }
@@ -1200,7 +1431,7 @@ class AdaptiveCardGenerator {
                         {
                             type: "Image",
                             url: "${$data}",
-                            $when: "${$data != null}",
+                            $when: "${$data != null && $data != ''}",
                         },
                     ];
                 }
@@ -1293,7 +1524,7 @@ function inferPreviewCardTemplate(card) {
         result.image = {
             url: `\${${inferredProperties.imageUrl}}`,
             alt: `\${if(${inferredProperties.imageUrl}, ${inferredProperties.imageUrl}, 'N/A')}`,
-            $when: `\${${inferredProperties.imageUrl} != null}`,
+            $when: `\${${inferredProperties.imageUrl} != null && ${inferredProperties.imageUrl} != ''}`,
         };
     }
     return result;
@@ -1435,6 +1666,7 @@ class ManifestUpdater {
                         const confirmationBodies = [];
                         if (operationItem) {
                             const operationId = operationItem.operationId;
+                            const safeFunctionName = operationId.replace(/[^a-zA-Z0-9]/g, "_");
                             const description = (_a = operationItem.description) !== null && _a !== void 0 ? _a : "";
                             const summary = operationItem.summary;
                             const paramObject = operationItem.parameters;
@@ -1462,7 +1694,7 @@ class ManifestUpdater {
                                 }
                             }
                             const funcObj = {
-                                name: operationId,
+                                name: safeFunctionName,
                                 description: description,
                             };
                             if (options.allowResponseSemantics) {
@@ -1470,7 +1702,7 @@ class ManifestUpdater {
                                     const { json } = Utils.getResponseJson(operationItem);
                                     if (json.schema) {
                                         const [card, jsonPath] = AdaptiveCardGenerator.generateAdaptiveCard(operationItem);
-                                        card.body = card.body.slice(0, 5);
+                                        card.body = Utils.limitACBodyProperties(card.body, 5);
                                         const responseSemantic = wrapResponseSemantics(card, jsonPath);
                                         funcObj.capabilities = {
                                             response_semantics: responseSemantic,
@@ -1498,7 +1730,7 @@ class ManifestUpdater {
                                 }
                             }
                             functions.push(funcObj);
-                            functionNames.push(operationId);
+                            functionNames.push(safeFunctionName);
                             const conversationStarterStr = (summary !== null && summary !== void 0 ? summary : description).slice(0, ConstantString.ConversationStarterMaxLens);
                             if (conversationStarterStr) {
                                 conversationStarters.push(conversationStarterStr);
@@ -1596,7 +1828,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: {
@@ -1605,16 +1836,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];
@@ -1650,12 +1878,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: 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: WarningType.OperationOnlyContainsOptionalParam,
+                                            content: Utils.format(ConstantString.OperationOnlyContainsOptionalParam, command.id),
+                                            data: {
+                                                commandId: command.id,
+                                                parameterName: command.parameters[0].name,
+                                            },
+                                        });
+                                    }
                                 }
                                 if (adaptiveCardFolder) {
                                     const adaptiveCardPath = path.join(adaptiveCardFolder, command.id + ".json");
@@ -1731,7 +1964,13 @@ class SpecParser {
         try {
             try {
                 await this.loadSpec();
-                await this.parser.validate(this.spec);
+                if (!this.parser.$refs.circular) {
+                    await this.parser.validate(this.spec);
+                }
+                else {
+                    const clonedUnResolveSpec = JSON.parse(JSON.stringify(this.unResolveSpec));
+                    await this.parser.validate(clonedUnResolveSpec);
+                }
             }
             catch (e) {
                 return {
@@ -1819,19 +2058,36 @@ class SpecParser {
                     isValid: isValid,
                     reason: reason,
                 };
-                if (isValid) {
+                // Try best to parse server url and auth type
+                try {
                     const serverObj = Utils.getServerObject(spec, method.toLocaleLowerCase(), path);
                     if (serverObj) {
-                        apiResult.server = Utils.resolveEnv(serverObj.url);
+                        apiResult.server = serverObj.url;
                     }
+                }
+                catch (err) {
+                    // ignore
+                }
+                try {
                     const authArray = Utils.getAuthArray(operation.security, spec);
-                    for (const auths of authArray) {
-                        if (auths.length === 1) {
-                            apiResult.auth = auths[0];
-                            break;
+                    if (authArray.length !== 0) {
+                        for (const auths of authArray) {
+                            if (auths.length === 1) {
+                                apiResult.auth = auths[0];
+                                break;
+                            }
+                            else {
+                                apiResult.auth = {
+                                    authScheme: { type: "multipleAuth" },
+                                    name: auths.map((auth) => auth.name).join(", "),
+                                };
+                            }
                         }
                     }
                 }
+                catch (err) {
+                    // ignore
+                }
                 result.APIs.push(apiResult);
             }
             result.allAPICount = result.APIs.length;
@@ -1862,7 +2118,8 @@ class SpecParser {
             if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                 throw new SpecParserError(ConstantString.CancelledMessage, ErrorType.Cancelled);
             }
-            const newSpec = (await this.parser.dereference(newUnResolvedSpec));
+            const clonedUnResolveSpec = JSON.parse(JSON.stringify(newUnResolvedSpec));
+            const newSpec = (await this.parser.dereference(clonedUnResolveSpec));
             return [newUnResolvedSpec, newSpec];
         }
         catch (err) {
@@ -1935,10 +2192,11 @@ class SpecParser {
                             const operation = newSpec.paths[url][method];
                             try {
                                 const [card, jsonPath] = AdaptiveCardGenerator.generateAdaptiveCard(operation);
-                                const fileName = path.join(adaptiveCardFolder, `${operation.operationId}.json`);
+                                const safeAdaptiveCardName = operation.operationId.replace(/[^a-zA-Z0-9]/g, "_");
+                                const fileName = path.join(adaptiveCardFolder, `${safeAdaptiveCardName}.json`);
                                 const wrappedCard = wrapAdaptiveCard(card, jsonPath);
                                 await fs.outputJSON(fileName, wrappedCard, { spaces: 2 });
-                                const dataFileName = path.join(adaptiveCardFolder, `${operation.operationId}.data.json`);
+                                const dataFileName = path.join(adaptiveCardFolder, `${safeAdaptiveCardName}.data.json`);
                                 await fs.outputJSON(dataFileName, {}, { spaces: 2 });
                             }
                             catch (err) {
@@ -1970,7 +2228,8 @@ class SpecParser {
     }
     async loadSpec() {
         if (!this.spec) {
-            this.unResolveSpec = (await this.parser.parse(this.pathOrSpec));
+            const spec = (await 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 = await converter.convert(this.unResolveSpec, {});
@@ -2004,6 +2263,11 @@ class SpecParser {
         }
         await fs.outputFile(outputSpecPath, resultStr);
     }
+    resolveEnvForSpec(spec) {
+        const specString = JSON.stringify(spec);
+        const specResolved = Utils.resolveEnv(specString);
+        return JSON.parse(specResolved);
+    }
 }
 
 export { AdaptiveCardGenerator, ConstantString, ErrorType, ProjectType, SpecParser, SpecParserError, Utils, ValidationStatus, WarningType };