@microsoft/m365-spec-parser 0.1.1-alpha.2f5decfcc.0 → 0.1.1-alpha.42af26ca6.0

package/dist/index.esm2017.mjs

@@ -20,6 +20,7 @@ var ErrorType;
     ErrorType["ResolveServerUrlFailed"] = "resolve-server-url-failed";
     ErrorType["SwaggerNotSupported"] = "swagger-not-supported";
     ErrorType["MultipleAuthNotSupported"] = "multiple-auth-not-supported";
+    ErrorType["SpecVersionNotSupported"] = "spec-version-not-supported";
     ErrorType["ListFailed"] = "list-failed";
     ErrorType["listSupportedAPIInfoFailed"] = "list-supported-api-info-failed";
     ErrorType["FilterSpecFailed"] = "filter-spec-failed";
@@ -28,6 +29,21 @@ var ErrorType;
     ErrorType["GenerateFailed"] = "generate-failed";
     ErrorType["ValidateFailed"] = "validate-failed";
     ErrorType["GetSpecFailed"] = "get-spec-failed";
+    ErrorType["AuthTypeIsNotSupported"] = "auth-type-is-not-supported";
+    ErrorType["MissingOperationId"] = "missing-operation-id";
+    ErrorType["PostBodyContainMultipleMediaTypes"] = "post-body-contain-multiple-media-types";
+    ErrorType["ResponseContainMultipleMediaTypes"] = "response-contain-multiple-media-types";
+    ErrorType["ResponseJsonIsEmpty"] = "response-json-is-empty";
+    ErrorType["PostBodySchemaIsNotJson"] = "post-body-schema-is-not-json";
+    ErrorType["PostBodyContainsRequiredUnsupportedSchema"] = "post-body-contains-required-unsupported-schema";
+    ErrorType["ParamsContainRequiredUnsupportedSchema"] = "params-contain-required-unsupported-schema";
+    ErrorType["ParamsContainsNestedObject"] = "params-contains-nested-object";
+    ErrorType["RequestBodyContainsNestedObject"] = "request-body-contains-nested-object";
+    ErrorType["ExceededRequiredParamsLimit"] = "exceeded-required-params-limit";
+    ErrorType["NoParameter"] = "no-parameter";
+    ErrorType["NoAPIInfo"] = "no-api-info";
+    ErrorType["MethodNotAllowed"] = "method-not-allowed";
+    ErrorType["UrlPathNotExist"] = "url-path-not-exist";
     ErrorType["Cancelled"] = "cancelled";
     ErrorType["Unknown"] = "unknown";
 })(ErrorType || (ErrorType = {}));
@@ -75,6 +91,7 @@ ConstantString.ResolveServerUrlFailed = "Unable to resolve the server URL: pleas
 ConstantString.OperationOnlyContainsOptionalParam = "Operation %s contains multiple optional parameters. The first optional parameter is used for this command.";
 ConstantString.ConvertSwaggerToOpenAPI = "The Swagger 2.0 file has been converted to OpenAPI 3.0.";
 ConstantString.SwaggerNotSupported = "Swagger 2.0 is not supported. Please convert to OpenAPI 3.0 manually before proceeding.";
+ConstantString.SpecVersionNotSupported = "Unsupported OpenAPI version %s. Please use version 3.0.x.";
 ConstantString.MultipleAuthNotSupported = "Multiple authentication methods are unsupported. Ensure all selected APIs use identical authentication.";
 ConstantString.UnsupportedSchema = "Unsupported schema in %s %s: %s";
 ConstantString.WrappedCardVersion = "devPreview";
@@ -172,221 +189,9 @@ class Utils {
         }
         return false;
     }
-    static checkParameters(paramObject, isCopilot) {
-        const paramResult = {
-            requiredNum: 0,
-            optionalNum: 0,
-            isValid: true,
-        };
-        if (!paramObject) {
-            return paramResult;
-        }
-        for (let i = 0; i < paramObject.length; i++) {
-            const param = paramObject[i];
-            const schema = param.schema;
-            if (isCopilot && this.hasNestedObjectInSchema(schema)) {
-                paramResult.isValid = false;
-                continue;
-            }
-            const isRequiredWithoutDefault = param.required && schema.default === undefined;
-            if (isCopilot) {
-                if (isRequiredWithoutDefault) {
-                    paramResult.requiredNum = paramResult.requiredNum + 1;
-                }
-                else {
-                    paramResult.optionalNum = paramResult.optionalNum + 1;
-                }
-                continue;
-            }
-            if (param.in === "header" || param.in === "cookie") {
-                if (isRequiredWithoutDefault) {
-                    paramResult.isValid = false;
-                }
-                continue;
-            }
-            if (schema.type !== "boolean" &&
-                schema.type !== "string" &&
-                schema.type !== "number" &&
-                schema.type !== "integer") {
-                if (isRequiredWithoutDefault) {
-                    paramResult.isValid = false;
-                }
-                continue;
-            }
-            if (param.in === "query" || param.in === "path") {
-                if (isRequiredWithoutDefault) {
-                    paramResult.requiredNum = paramResult.requiredNum + 1;
-                }
-                else {
-                    paramResult.optionalNum = paramResult.optionalNum + 1;
-                }
-            }
-        }
-        return paramResult;
-    }
-    static checkPostBody(schema, isRequired = false, isCopilot = false) {
-        var _a;
-        const paramResult = {
-            requiredNum: 0,
-            optionalNum: 0,
-            isValid: true,
-        };
-        if (Object.keys(schema).length === 0) {
-            return paramResult;
-        }
-        const isRequiredWithoutDefault = isRequired && schema.default === undefined;
-        if (isCopilot && this.hasNestedObjectInSchema(schema)) {
-            paramResult.isValid = false;
-            return paramResult;
-        }
-        if (schema.type === "string" ||
-            schema.type === "integer" ||
-            schema.type === "boolean" ||
-            schema.type === "number") {
-            if (isRequiredWithoutDefault) {
-                paramResult.requiredNum = paramResult.requiredNum + 1;
-            }
-            else {
-                paramResult.optionalNum = paramResult.optionalNum + 1;
-            }
-        }
-        else if (schema.type === "object") {
-            const { properties } = schema;
-            for (const property in properties) {
-                let isRequired = false;
-                if (schema.required && ((_a = schema.required) === null || _a === void 0 ? void 0 : _a.indexOf(property)) >= 0) {
-                    isRequired = true;
-                }
-                const result = Utils.checkPostBody(properties[property], isRequired, isCopilot);
-                paramResult.requiredNum += result.requiredNum;
-                paramResult.optionalNum += result.optionalNum;
-                paramResult.isValid = paramResult.isValid && result.isValid;
-            }
-        }
-        else {
-            if (isRequiredWithoutDefault && !isCopilot) {
-                paramResult.isValid = false;
-            }
-        }
-        return paramResult;
-    }
     static containMultipleMediaTypes(bodyObject) {
         return Object.keys((bodyObject === null || bodyObject === void 0 ? void 0 : bodyObject.content) || {}).length > 1;
     }
-    /**
-     * Checks if the given API is supported.
-     * @param {string} method - The HTTP method of the API.
-     * @param {string} path - The path of the API.
-     * @param {OpenAPIV3.Document} spec - The OpenAPI specification document.
-     * @returns {boolean} - Returns true if the API is supported, false otherwise.
-     * @description The following APIs are supported:
-     * 1. only support Get/Post operation without auth property
-     * 2. parameter inside query or path only support string, number, boolean and integer
-     * 3. parameter inside post body only support string, number, boolean, integer and object
-     * 4. request body + required parameters <= 1
-     * 5. response body should be “application/json” and not empty, and response code should be 20X
-     * 6. only support request body with “application/json” content type
-     */
-    static isSupportedApi(method, path, spec, options) {
-        var _a;
-        const pathObj = spec.paths[path];
-        method = method.toLocaleLowerCase();
-        if (pathObj) {
-            if (((_a = options.allowMethods) === null || _a === void 0 ? void 0 : _a.includes(method)) && pathObj[method]) {
-                const securities = pathObj[method].security;
-                const isTeamsAi = options.projectType === ProjectType.TeamsAi;
-                const isCopilot = options.projectType === ProjectType.Copilot;
-                // Teams AI project doesn't care about auth, it will use authProvider for user to implement
-                if (!isTeamsAi) {
-                    const authArray = Utils.getAuthArray(securities, spec);
-                    if (!Utils.isSupportedAuth(authArray, options)) {
-                        return false;
-                    }
-                }
-                const operationObject = pathObj[method];
-                if (!options.allowMissingId && !operationObject.operationId) {
-                    return false;
-                }
-                const paramObject = operationObject.parameters;
-                const requestBody = operationObject.requestBody;
-                const requestJsonBody = requestBody === null || requestBody === void 0 ? void 0 : requestBody.content["application/json"];
-                if (!isTeamsAi && Utils.containMultipleMediaTypes(requestBody)) {
-                    return false;
-                }
-                const responseJson = Utils.getResponseJson(operationObject, isTeamsAi);
-                if (Object.keys(responseJson).length === 0) {
-                    return false;
-                }
-                // Teams AI project doesn't care about request parameters/body
-                if (isTeamsAi) {
-                    return true;
-                }
-                let requestBodyParamResult = {
-                    requiredNum: 0,
-                    optionalNum: 0,
-                    isValid: true,
-                };
-                if (requestJsonBody) {
-                    const requestBodySchema = requestJsonBody.schema;
-                    if (isCopilot && requestBodySchema.type !== "object") {
-                        return false;
-                    }
-                    requestBodyParamResult = Utils.checkPostBody(requestBodySchema, requestBody.required, isCopilot);
-                }
-                if (!requestBodyParamResult.isValid) {
-                    return false;
-                }
-                const paramResult = Utils.checkParameters(paramObject, isCopilot);
-                if (!paramResult.isValid) {
-                    return false;
-                }
-                // Copilot support arbitrary parameters
-                if (isCopilot) {
-                    return true;
-                }
-                if (requestBodyParamResult.requiredNum + paramResult.requiredNum > 1) {
-                    if (options.allowMultipleParameters &&
-                        requestBodyParamResult.requiredNum + paramResult.requiredNum <=
-                            ConstantString.SMERequiredParamsMaxNum) {
-                        return true;
-                    }
-                    return false;
-                }
-                else if (requestBodyParamResult.requiredNum +
-                    requestBodyParamResult.optionalNum +
-                    paramResult.requiredNum +
-                    paramResult.optionalNum ===
-                    0) {
-                    return false;
-                }
-                else {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    static isSupportedAuth(authSchemeArray, options) {
-        if (authSchemeArray.length === 0) {
-            return true;
-        }
-        if (options.allowAPIKeyAuth || options.allowOauth2 || options.allowBearerTokenAuth) {
-            // Currently we don't support multiple auth in one operation
-            if (authSchemeArray.length > 0 && authSchemeArray.every((auths) => auths.length > 1)) {
-                return false;
-            }
-            for (const auths of authSchemeArray) {
-                if (auths.length === 1) {
-                    if ((options.allowAPIKeyAuth && Utils.isAPIKeyAuth(auths[0].authScheme)) ||
-                        (options.allowOauth2 && Utils.isOAuthWithAuthCodeFlow(auths[0].authScheme)) ||
-                        (options.allowBearerTokenAuth && Utils.isBearerTokenAuth(auths[0].authScheme))) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
     static isBearerTokenAuth(authScheme) {
         return authScheme.type === "http" && authScheme.scheme === "bearer";
     }
@@ -394,10 +199,9 @@ class Utils {
         return authScheme.type === "apiKey";
     }
     static isOAuthWithAuthCodeFlow(authScheme) {
-        if (authScheme.type === "oauth2" && authScheme.flows && authScheme.flows.authorizationCode) {
-            return true;
-        }
-        return false;
+        return !!(authScheme.type === "oauth2" &&
+            authScheme.flows &&
+            authScheme.flows.authorizationCode);
     }
     static getAuthArray(securities, spec) {
         var _a;
@@ -425,14 +229,17 @@ class Utils {
     static updateFirstLetter(str) {
         return str.charAt(0).toUpperCase() + str.slice(1);
     }
-    static getResponseJson(operationObject, isTeamsAiProject = false) {
+    static getResponseJson(operationObject) {
         var _a, _b;
         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 (!isTeamsAiProject && Utils.containMultipleMediaTypes(responseObject)) {
+                if (Utils.containMultipleMediaTypes(responseObject)) {
+                    multipleMediaType = true;
                     json = {};
                 }
                 else {
@@ -440,7 +247,7 @@ class Utils {
                 }
             }
         }
-        return json;
+        return { json, multipleMediaType };
     }
     static convertPathToCamelCase(path) {
         const pathSegments = path.split(/[./{]/);
@@ -460,10 +267,10 @@ class Utils {
             return undefined;
         }
     }
-    static resolveServerUrl(url) {
+    static resolveEnv(str) {
         const placeHolderReg = /\${{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*}}/g;
-        let matches = placeHolderReg.exec(url);
-        let newUrl = url;
+        let matches = placeHolderReg.exec(str);
+        let newStr = str;
         while (matches != null) {
             const envVar = matches[1];
             const envVal = process.env[envVar];
@@ -471,17 +278,17 @@ class Utils {
                 throw new Error(Utils.format(ConstantString.ResolveServerUrlFailed, envVar));
             }
             else {
-                newUrl = newUrl.replace(matches[0], envVal);
+                newStr = newStr.replace(matches[0], envVal);
             }
-            matches = placeHolderReg.exec(url);
+            matches = placeHolderReg.exec(str);
         }
-        return newUrl;
+        return newStr;
     }
     static checkServerUrl(servers) {
         const errors = [];
         let serverUrl;
         try {
-            serverUrl = Utils.resolveServerUrl(servers[0].url);
+            serverUrl = Utils.resolveEnv(servers[0].url);
         }
         catch (err) {
             errors.push({
@@ -512,6 +319,7 @@ class Utils {
         return errors;
     }
     static validateServer(spec, options) {
+        var _a;
         const errors = [];
         let hasTopLevelServers = false;
         let hasPathLevelServers = false;
@@ -532,7 +340,7 @@ class Utils {
             }
             for (const method in methods) {
                 const operationObject = methods[method];
-                if (Utils.isSupportedApi(method, path, spec, options)) {
+                if (((_a = options.allowMethods) === null || _a === void 0 ? void 0 : _a.includes(method)) && operationObject) {
                     if ((operationObject === null || operationObject === void 0 ? void 0 : operationObject.servers) && operationObject.servers.length >= 1) {
                         hasOperationLevelServers = true;
                         const serverErrors = Utils.checkServerUrl(operationObject.servers);
@@ -659,13 +467,7 @@ class Utils {
             }
         }
         const operationId = operationItem.operationId;
-        const parameters = [];
-        if (requiredParams.length !== 0) {
-            parameters.push(...requiredParams);
-        }
-        else {
-            parameters.push(optionalParams[0]);
-        }
+        const parameters = [...requiredParams, ...optionalParams];
         const command = {
             context: ["compose"],
             type: "query",
@@ -674,142 +476,559 @@ class Utils {
             parameters: parameters,
             description: ((_b = operationItem.description) !== null && _b !== void 0 ? _b : "").slice(0, ConstantString.CommandDescriptionMaxLens),
         };
-        let warning = undefined;
-        if (requiredParams.length === 0 && optionalParams.length > 1) {
-            warning = {
-                type: WarningType.OperationOnlyContainsOptionalParam,
-                content: Utils.format(ConstantString.OperationOnlyContainsOptionalParam, operationId),
-                data: operationId,
-            };
+        return command;
+    }
+    static format(str, ...args) {
+        let index = 0;
+        return str.replace(/%s/g, () => {
+            const arg = args[index++];
+            return arg !== undefined ? arg : "";
+        });
+    }
+    static getSafeRegistrationIdEnvName(authName) {
+        if (!authName) {
+            return "";
         }
-        return [command, warning];
+        let safeRegistrationIdEnvName = authName.toUpperCase().replace(/[^A-Z0-9_]/g, "_");
+        if (!safeRegistrationIdEnvName.match(/^[A-Z]/)) {
+            safeRegistrationIdEnvName = "PREFIX_" + safeRegistrationIdEnvName;
+        }
+        return safeRegistrationIdEnvName;
     }
-    static listSupportedAPIs(spec, options) {
-        const paths = spec.paths;
+    static getServerObject(spec, method, path) {
+        const pathObj = spec.paths[path];
+        const operationObject = pathObj[method];
+        const rootServer = spec.servers && spec.servers[0];
+        const methodServer = spec.paths[path].servers && spec.paths[path].servers[0];
+        const operationServer = operationObject.servers && operationObject.servers[0];
+        const serverUrl = operationServer || methodServer || rootServer;
+        return serverUrl;
+    }
+}
+
+// Copyright (c) Microsoft Corporation.
+class Validator {
+    listAPIs() {
+        var _a;
+        if (this.apiMap) {
+            return this.apiMap;
+        }
+        const paths = this.spec.paths;
         const result = {};
         for (const path in paths) {
             const methods = paths[path];
             for (const method in methods) {
-                if (Utils.isSupportedApi(method, path, spec, options)) {
-                    const operationObject = methods[method];
-                    result[`${method.toUpperCase()} ${path}`] = operationObject;
+                const operationObject = methods[method];
+                if (((_a = this.options.allowMethods) === null || _a === void 0 ? void 0 : _a.includes(method)) && operationObject) {
+                    const validateResult = this.validateAPI(method, path);
+                    result[`${method.toUpperCase()} ${path}`] = {
+                        operation: operationObject,
+                        isValid: validateResult.isValid,
+                        reason: validateResult.reason,
+                    };
                 }
             }
         }
+        this.apiMap = result;
         return result;
     }
-    static validateSpec(spec, parser, isSwaggerFile, options) {
-        const errors = [];
-        const warnings = [];
-        if (isSwaggerFile) {
-            warnings.push({
-                type: WarningType.ConvertSwaggerToOpenAPI,
-                content: ConstantString.ConvertSwaggerToOpenAPI,
+    validateSpecVersion() {
+        const result = { errors: [], warnings: [] };
+        if (this.spec.openapi >= "3.1.0") {
+            result.errors.push({
+                type: ErrorType.SpecVersionNotSupported,
+                content: Utils.format(ConstantString.SpecVersionNotSupported, this.spec.openapi),
+                data: this.spec.openapi,
             });
         }
-        // Server validation
-        const serverErrors = Utils.validateServer(spec, options);
-        errors.push(...serverErrors);
-        // Remote reference not supported
-        const refPaths = parser.$refs.paths();
-        // refPaths [0] is the current spec file path
-        if (refPaths.length > 1) {
-            errors.push({
-                type: ErrorType.RemoteRefNotSupported,
-                content: Utils.format(ConstantString.RemoteRefNotSupported, refPaths.join(", ")),
-                data: refPaths,
-            });
-        }
-        // No supported API
-        const apiMap = Utils.listSupportedAPIs(spec, options);
-        if (Object.keys(apiMap).length === 0) {
-            errors.push({
+        return result;
+    }
+    validateSpecServer() {
+        const result = { errors: [], warnings: [] };
+        const serverErrors = Utils.validateServer(this.spec, this.options);
+        result.errors.push(...serverErrors);
+        return result;
+    }
+    validateSpecNoSupportAPI() {
+        const result = { errors: [], warnings: [] };
+        const apiMap = this.listAPIs();
+        const validAPIs = Object.entries(apiMap).filter(([, value]) => value.isValid);
+        if (validAPIs.length === 0) {
+            result.errors.push({
                 type: ErrorType.NoSupportedApi,
                 content: ConstantString.NoSupportedApi,
             });
         }
+        return result;
+    }
+    validateSpecOperationId() {
+        const result = { errors: [], warnings: [] };
+        const apiMap = this.listAPIs();
         // OperationId missing
         const apisMissingOperationId = [];
         for (const key in apiMap) {
-            const pathObjectItem = apiMap[key];
-            if (!pathObjectItem.operationId) {
+            const { operation } = apiMap[key];
+            if (!operation.operationId) {
                 apisMissingOperationId.push(key);
             }
         }
         if (apisMissingOperationId.length > 0) {
-            warnings.push({
+            result.warnings.push({
                 type: WarningType.OperationIdMissing,
                 content: Utils.format(ConstantString.MissingOperationId, apisMissingOperationId.join(", ")),
                 data: apisMissingOperationId,
             });
         }
-        let status = ValidationStatus.Valid;
-        if (warnings.length > 0 && errors.length === 0) {
-            status = ValidationStatus.Warning;
+        return result;
+    }
+    validateMethodAndPath(method, path) {
+        const result = { isValid: true, reason: [] };
+        if (this.options.allowMethods && !this.options.allowMethods.includes(method)) {
+            result.isValid = false;
+            result.reason.push(ErrorType.MethodNotAllowed);
+            return result;
         }
-        else if (errors.length > 0) {
-            status = ValidationStatus.Error;
+        const pathObj = this.spec.paths[path];
+        if (!pathObj || !pathObj[method]) {
+            result.isValid = false;
+            result.reason.push(ErrorType.UrlPathNotExist);
+            return result;
         }
-        return {
-            status,
-            warnings,
-            errors,
-        };
+        return result;
     }
-    static format(str, ...args) {
-        let index = 0;
-        return str.replace(/%s/g, () => {
-            const arg = args[index++];
-            return arg !== undefined ? arg : "";
-        });
+    validateResponse(method, path) {
+        const result = { isValid: true, reason: [] };
+        const operationObject = this.spec.paths[path][method];
+        const { json, multipleMediaType } = Utils.getResponseJson(operationObject);
+        // only support response body only contains “application/json” content type
+        if (multipleMediaType) {
+            result.reason.push(ErrorType.ResponseContainMultipleMediaTypes);
+        }
+        else if (Object.keys(json).length === 0) {
+            // response body should not be empty
+            result.reason.push(ErrorType.ResponseJsonIsEmpty);
+        }
+        return result;
     }
-    static getSafeRegistrationIdEnvName(authName) {
-        if (!authName) {
-            return "";
+    validateServer(method, path) {
+        const result = { isValid: true, reason: [] };
+        const serverObj = Utils.getServerObject(this.spec, method, path);
+        if (!serverObj) {
+            // should contain server URL
+            result.reason.push(ErrorType.NoServerInformation);
         }
-        let safeRegistrationIdEnvName = authName.toUpperCase().replace(/[^A-Z0-9_]/g, "_");
-        if (!safeRegistrationIdEnvName.match(/^[A-Z]/)) {
-            safeRegistrationIdEnvName = "PREFIX_" + safeRegistrationIdEnvName;
+        else {
+            // server url should be absolute url with https protocol
+            const serverValidateResult = Utils.checkServerUrl([serverObj]);
+            result.reason.push(...serverValidateResult.map((item) => item.type));
         }
-        return safeRegistrationIdEnvName;
+        return result;
     }
-    static getAllAPICount(spec) {
-        let count = 0;
-        const paths = spec.paths;
-        for (const path in paths) {
-            const methods = paths[path];
-            for (const method in methods) {
-                if (ConstantString.AllOperationMethods.includes(method)) {
-                    count++;
+    validateAuth(method, path) {
+        const pathObj = this.spec.paths[path];
+        const operationObject = pathObj[method];
+        const securities = operationObject.security;
+        const authSchemeArray = Utils.getAuthArray(securities, this.spec);
+        if (authSchemeArray.length === 0) {
+            return { isValid: true, reason: [] };
+        }
+        if (this.options.allowAPIKeyAuth ||
+            this.options.allowOauth2 ||
+            this.options.allowBearerTokenAuth) {
+            // Currently we don't support multiple auth in one operation
+            if (authSchemeArray.length > 0 && authSchemeArray.every((auths) => auths.length > 1)) {
+                return {
+                    isValid: false,
+                    reason: [ErrorType.MultipleAuthNotSupported],
+                };
+            }
+            for (const auths of authSchemeArray) {
+                if (auths.length === 1) {
+                    if ((this.options.allowAPIKeyAuth && Utils.isAPIKeyAuth(auths[0].authScheme)) ||
+                        (this.options.allowOauth2 && Utils.isOAuthWithAuthCodeFlow(auths[0].authScheme)) ||
+                        (this.options.allowBearerTokenAuth && Utils.isBearerTokenAuth(auths[0].authScheme))) {
+                        return { isValid: true, reason: [] };
+                    }
+                }
+            }
+        }
+        return { isValid: false, reason: [ErrorType.AuthTypeIsNotSupported] };
+    }
+    checkPostBodySchema(schema, isRequired = false) {
+        var _a;
+        const paramResult = {
+            requiredNum: 0,
+            optionalNum: 0,
+            isValid: true,
+            reason: [],
+        };
+        if (Object.keys(schema).length === 0) {
+            return paramResult;
+        }
+        const isRequiredWithoutDefault = isRequired && schema.default === undefined;
+        const isCopilot = this.projectType === ProjectType.Copilot;
+        if (isCopilot && this.hasNestedObjectInSchema(schema)) {
+            paramResult.isValid = false;
+            paramResult.reason = [ErrorType.RequestBodyContainsNestedObject];
+            return paramResult;
+        }
+        if (schema.type === "string" ||
+            schema.type === "integer" ||
+            schema.type === "boolean" ||
+            schema.type === "number") {
+            if (isRequiredWithoutDefault) {
+                paramResult.requiredNum = paramResult.requiredNum + 1;
+            }
+            else {
+                paramResult.optionalNum = paramResult.optionalNum + 1;
+            }
+        }
+        else if (schema.type === "object") {
+            const { properties } = schema;
+            for (const property in properties) {
+                let isRequired = false;
+                if (schema.required && ((_a = schema.required) === null || _a === void 0 ? void 0 : _a.indexOf(property)) >= 0) {
+                    isRequired = true;
                 }
+                const result = this.checkPostBodySchema(properties[property], isRequired);
+                paramResult.requiredNum += result.requiredNum;
+                paramResult.optionalNum += result.optionalNum;
+                paramResult.isValid = paramResult.isValid && result.isValid;
+                paramResult.reason.push(...result.reason);
             }
         }
-        return count;
+        else {
+            if (isRequiredWithoutDefault && !isCopilot) {
+                paramResult.isValid = false;
+                paramResult.reason.push(ErrorType.PostBodyContainsRequiredUnsupportedSchema);
+            }
+        }
+        return paramResult;
+    }
+    checkParamSchema(paramObject) {
+        const paramResult = {
+            requiredNum: 0,
+            optionalNum: 0,
+            isValid: true,
+            reason: [],
+        };
+        if (!paramObject) {
+            return paramResult;
+        }
+        const isCopilot = this.projectType === ProjectType.Copilot;
+        for (let i = 0; i < paramObject.length; i++) {
+            const param = paramObject[i];
+            const schema = param.schema;
+            if (isCopilot && this.hasNestedObjectInSchema(schema)) {
+                paramResult.isValid = false;
+                paramResult.reason.push(ErrorType.ParamsContainsNestedObject);
+                continue;
+            }
+            const isRequiredWithoutDefault = param.required && schema.default === undefined;
+            if (isCopilot) {
+                if (isRequiredWithoutDefault) {
+                    paramResult.requiredNum = paramResult.requiredNum + 1;
+                }
+                else {
+                    paramResult.optionalNum = paramResult.optionalNum + 1;
+                }
+                continue;
+            }
+            if (param.in === "header" || param.in === "cookie") {
+                if (isRequiredWithoutDefault) {
+                    paramResult.isValid = false;
+                    paramResult.reason.push(ErrorType.ParamsContainRequiredUnsupportedSchema);
+                }
+                continue;
+            }
+            if (schema.type !== "boolean" &&
+                schema.type !== "string" &&
+                schema.type !== "number" &&
+                schema.type !== "integer") {
+                if (isRequiredWithoutDefault) {
+                    paramResult.isValid = false;
+                    paramResult.reason.push(ErrorType.ParamsContainRequiredUnsupportedSchema);
+                }
+                continue;
+            }
+            if (param.in === "query" || param.in === "path") {
+                if (isRequiredWithoutDefault) {
+                    paramResult.requiredNum = paramResult.requiredNum + 1;
+                }
+                else {
+                    paramResult.optionalNum = paramResult.optionalNum + 1;
+                }
+            }
+        }
+        return paramResult;
+    }
+    hasNestedObjectInSchema(schema) {
+        if (schema.type === "object") {
+            for (const property in schema.properties) {
+                const nestedSchema = schema.properties[property];
+                if (nestedSchema.type === "object") {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
+
+// Copyright (c) Microsoft Corporation.
+class CopilotValidator extends Validator {
+    constructor(spec, options) {
+        super();
+        this.projectType = ProjectType.Copilot;
+        this.options = options;
+        this.spec = spec;
+    }
+    validateSpec() {
+        const result = { errors: [], warnings: [] };
+        // validate spec version
+        let validationResult = this.validateSpecVersion();
+        result.errors.push(...validationResult.errors);
+        // validate spec server
+        validationResult = this.validateSpecServer();
+        result.errors.push(...validationResult.errors);
+        // validate no supported API
+        validationResult = this.validateSpecNoSupportAPI();
+        result.errors.push(...validationResult.errors);
+        // validate operationId missing
+        validationResult = this.validateSpecOperationId();
+        result.warnings.push(...validationResult.warnings);
+        return result;
+    }
+    validateAPI(method, path) {
+        const result = { isValid: true, reason: [] };
+        method = method.toLocaleLowerCase();
+        // validate method and path
+        const methodAndPathResult = this.validateMethodAndPath(method, path);
+        if (!methodAndPathResult.isValid) {
+            return methodAndPathResult;
+        }
+        const operationObject = this.spec.paths[path][method];
+        // validate auth
+        const authCheckResult = this.validateAuth(method, path);
+        result.reason.push(...authCheckResult.reason);
+        // validate operationId
+        if (!this.options.allowMissingId && !operationObject.operationId) {
+            result.reason.push(ErrorType.MissingOperationId);
+        }
+        // validate server
+        const validateServerResult = this.validateServer(method, path);
+        result.reason.push(...validateServerResult.reason);
+        // validate response
+        const validateResponseResult = this.validateResponse(method, path);
+        result.reason.push(...validateResponseResult.reason);
+        // validate requestBody
+        const requestBody = operationObject.requestBody;
+        const requestJsonBody = requestBody === null || requestBody === void 0 ? void 0 : requestBody.content["application/json"];
+        if (Utils.containMultipleMediaTypes(requestBody)) {
+            result.reason.push(ErrorType.PostBodyContainMultipleMediaTypes);
+        }
+        if (requestJsonBody) {
+            const requestBodySchema = requestJsonBody.schema;
+            if (requestBodySchema.type !== "object") {
+                result.reason.push(ErrorType.PostBodySchemaIsNotJson);
+            }
+            const requestBodyParamResult = this.checkPostBodySchema(requestBodySchema, requestBody.required);
+            result.reason.push(...requestBodyParamResult.reason);
+        }
+        // validate parameters
+        const paramObject = operationObject.parameters;
+        const paramResult = this.checkParamSchema(paramObject);
+        result.reason.push(...paramResult.reason);
+        if (result.reason.length > 0) {
+            result.isValid = false;
+        }
+        return result;
+    }
+}
+
+// Copyright (c) Microsoft Corporation.
+class SMEValidator extends Validator {
+    constructor(spec, options) {
+        super();
+        this.projectType = ProjectType.SME;
+        this.options = options;
+        this.spec = spec;
+    }
+    validateSpec() {
+        const result = { errors: [], warnings: [] };
+        // validate spec version
+        let validationResult = this.validateSpecVersion();
+        result.errors.push(...validationResult.errors);
+        // validate spec server
+        validationResult = this.validateSpecServer();
+        result.errors.push(...validationResult.errors);
+        // validate no supported API
+        validationResult = this.validateSpecNoSupportAPI();
+        result.errors.push(...validationResult.errors);
+        // validate operationId missing
+        validationResult = this.validateSpecOperationId();
+        result.warnings.push(...validationResult.warnings);
+        return result;
+    }
+    validateAPI(method, path) {
+        const result = { isValid: true, reason: [] };
+        method = method.toLocaleLowerCase();
+        // validate method and path
+        const methodAndPathResult = this.validateMethodAndPath(method, path);
+        if (!methodAndPathResult.isValid) {
+            return methodAndPathResult;
+        }
+        const operationObject = this.spec.paths[path][method];
+        // validate auth
+        const authCheckResult = this.validateAuth(method, path);
+        result.reason.push(...authCheckResult.reason);
+        // validate operationId
+        if (!this.options.allowMissingId && !operationObject.operationId) {
+            result.reason.push(ErrorType.MissingOperationId);
+        }
+        // validate server
+        const validateServerResult = this.validateServer(method, path);
+        result.reason.push(...validateServerResult.reason);
+        // validate response
+        const validateResponseResult = this.validateResponse(method, path);
+        result.reason.push(...validateResponseResult.reason);
+        let postBodyResult = {
+            requiredNum: 0,
+            optionalNum: 0,
+            isValid: true,
+            reason: [],
+        };
+        // validate requestBody
+        const requestBody = operationObject.requestBody;
+        const requestJsonBody = requestBody === null || requestBody === void 0 ? void 0 : requestBody.content["application/json"];
+        if (Utils.containMultipleMediaTypes(requestBody)) {
+            result.reason.push(ErrorType.PostBodyContainMultipleMediaTypes);
+        }
+        if (requestJsonBody) {
+            const requestBodySchema = requestJsonBody.schema;
+            postBodyResult = this.checkPostBodySchema(requestBodySchema, requestBody.required);
+            result.reason.push(...postBodyResult.reason);
+        }
+        // validate parameters
+        const paramObject = operationObject.parameters;
+        const paramResult = this.checkParamSchema(paramObject);
+        result.reason.push(...paramResult.reason);
+        // validate total parameters count
+        if (paramResult.isValid && postBodyResult.isValid) {
+            const paramCountResult = this.validateParamCount(postBodyResult, paramResult);
+            result.reason.push(...paramCountResult.reason);
+        }
+        if (result.reason.length > 0) {
+            result.isValid = false;
+        }
+        return result;
+    }
+    validateParamCount(postBodyResult, paramResult) {
+        const result = { isValid: true, reason: [] };
+        const totalRequiredParams = postBodyResult.requiredNum + paramResult.requiredNum;
+        const totalParams = totalRequiredParams + postBodyResult.optionalNum + paramResult.optionalNum;
+        if (totalRequiredParams > 1) {
+            if (!this.options.allowMultipleParameters ||
+                totalRequiredParams > SMEValidator.SMERequiredParamsMaxNum) {
+                result.reason.push(ErrorType.ExceededRequiredParamsLimit);
+            }
+        }
+        else if (totalParams === 0) {
+            result.reason.push(ErrorType.NoParameter);
+        }
+        return result;
+    }
+}
+SMEValidator.SMERequiredParamsMaxNum = 5;
+
+// Copyright (c) Microsoft Corporation.
+class TeamsAIValidator extends Validator {
+    constructor(spec, options) {
+        super();
+        this.projectType = ProjectType.TeamsAi;
+        this.options = options;
+        this.spec = spec;
+    }
+    validateSpec() {
+        const result = { errors: [], warnings: [] };
+        // validate spec server
+        let validationResult = this.validateSpecServer();
+        result.errors.push(...validationResult.errors);
+        // validate no supported API
+        validationResult = this.validateSpecNoSupportAPI();
+        result.errors.push(...validationResult.errors);
+        return result;
+    }
+    validateAPI(method, path) {
+        const result = { isValid: true, reason: [] };
+        method = method.toLocaleLowerCase();
+        // validate method and path
+        const methodAndPathResult = this.validateMethodAndPath(method, path);
+        if (!methodAndPathResult.isValid) {
+            return methodAndPathResult;
+        }
+        const operationObject = this.spec.paths[path][method];
+        // validate operationId
+        if (!this.options.allowMissingId && !operationObject.operationId) {
+            result.reason.push(ErrorType.MissingOperationId);
+        }
+        // validate server
+        const validateServerResult = this.validateServer(method, path);
+        result.reason.push(...validateServerResult.reason);
+        if (result.reason.length > 0) {
+            result.isValid = false;
+        }
+        return result;
+    }
+}
+
+class ValidatorFactory {
+    static create(spec, options) {
+        var _a;
+        const type = (_a = options.projectType) !== null && _a !== void 0 ? _a : ProjectType.SME;
+        switch (type) {
+            case ProjectType.SME:
+                return new SMEValidator(spec, options);
+            case ProjectType.Copilot:
+                return new CopilotValidator(spec, options);
+            case ProjectType.TeamsAi:
+                return new TeamsAIValidator(spec, options);
+            default:
+                throw new Error(`Invalid project type: ${type}`);
+        }
     }
 }
 
 // Copyright (c) Microsoft Corporation.
 class SpecFilter {
     static specFilter(filter, unResolveSpec, resolvedSpec, options) {
+        var _a;
         try {
             const newSpec = Object.assign({}, unResolveSpec);
             const newPaths = {};
             for (const filterItem of filter) {
                 const [method, path] = filterItem.split(" ");
                 const methodName = method.toLowerCase();
-                if (!Utils.isSupportedApi(methodName, path, resolvedSpec, options)) {
-                    continue;
-                }
-                if (!newPaths[path]) {
-                    newPaths[path] = Object.assign({}, unResolveSpec.paths[path]);
-                    for (const m of ConstantString.AllOperationMethods) {
-                        delete newPaths[path][m];
+                const pathObj = (_a = resolvedSpec.paths) === null || _a === void 0 ? void 0 : _a[path];
+                if (ConstantString.AllOperationMethods.includes(methodName) &&
+                    pathObj &&
+                    pathObj[methodName]) {
+                    const validator = ValidatorFactory.create(resolvedSpec, options);
+                    const validateResult = validator.validateAPI(methodName, path);
+                    if (!validateResult.isValid) {
+                        continue;
+                    }
+                    if (!newPaths[path]) {
+                        newPaths[path] = Object.assign({}, unResolveSpec.paths[path]);
+                        for (const m of ConstantString.AllOperationMethods) {
+                            delete newPaths[path][m];
+                        }
+                    }
+                    newPaths[path][methodName] = unResolveSpec.paths[path][methodName];
+                    // Add the operationId if missing
+                    if (!newPaths[path][methodName].operationId) {
+                        newPaths[path][methodName].operationId = `${methodName}${Utils.convertPathToCamelCase(path)}`;
                     }
-                }
-                newPaths[path][methodName] = unResolveSpec.paths[path][methodName];
-                // Add the operationId if missing
-                if (!newPaths[path][methodName].operationId) {
-                    newPaths[path][methodName].operationId = `${methodName}${Utils.convertPathToCamelCase(path)}`;
                 }
             }
             newSpec.paths = newPaths;
@@ -831,9 +1050,10 @@ class ManifestUpdater {
                 pluginFile: apiPluginRelativePath,
             },
         ];
+        const appName = this.removeEnvs(manifest.name.short);
         ManifestUpdater.updateManifestDescription(manifest, spec);
         const specRelativePath = ManifestUpdater.getRelativePath(manifestPath, outputSpecPath);
-        const apiPlugin = ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, options);
+        const apiPlugin = ManifestUpdater.generatePluginManifestSchema(spec, specRelativePath, appName, options);
         return [manifest, apiPlugin];
     }
     static updateManifestDescription(manifest, spec) {
@@ -857,7 +1077,7 @@ class ManifestUpdater {
         }
         return parameter;
     }
-    static generatePluginManifestSchema(spec, specRelativePath, options) {
+    static generatePluginManifestSchema(spec, specRelativePath, appName, options) {
         var _a, _b, _c;
         const functions = [];
         const functionNames = [];
@@ -922,7 +1142,7 @@ class ManifestUpdater {
         }
         const apiPlugin = {
             schema_version: "v2",
-            name_for_human: spec.info.title,
+            name_for_human: appName,
             description_for_human: (_c = spec.info.description) !== null && _c !== void 0 ? _c : "<Please add description of the plugin>",
             functions: functions,
             runtimes: [
@@ -1006,16 +1226,26 @@ class ManifestUpdater {
                         if ((_a = options.allowMethods) === null || _a === void 0 ? void 0 : _a.includes(method)) {
                             const operationItem = operations[method];
                             if (operationItem) {
-                                const [command, warning] = Utils.parseApiInfo(operationItem, options);
+                                const command = Utils.parseApiInfo(operationItem, options);
+                                if (command.parameters &&
+                                    command.parameters.length >= 1 &&
+                                    command.parameters.some((param) => param.isRequired)) {
+                                    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 (adaptiveCardFolder) {
                                     const adaptiveCardPath = path.join(adaptiveCardFolder, command.id + ".json");
                                     command.apiResponseRenderingTemplateFile = (await fs.pathExists(adaptiveCardPath))
                                         ? ManifestUpdater.getRelativePath(manifestPath, adaptiveCardPath)
                                         : "";
                                 }
-                                if (warning) {
-                                    warnings.push(warning);
-                                }
                                 commands.push(command);
                             }
                         }
@@ -1029,13 +1259,22 @@ class ManifestUpdater {
         const relativePath = path.relative(path.dirname(from), to);
         return path.normalize(relativePath).replace(/\\/g, "/");
     }
+    static removeEnvs(str) {
+        const placeHolderReg = /\${{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*}}/g;
+        const matches = placeHolderReg.exec(str);
+        let newStr = str;
+        if (matches != null) {
+            newStr = newStr.replace(matches[0], "");
+        }
+        return newStr;
+    }
 }
 
 // Copyright (c) Microsoft Corporation.
 class AdaptiveCardGenerator {
     static generateAdaptiveCard(operationItem) {
         try {
-            const json = Utils.getResponseJson(operationItem);
+            const { json } = Utils.getResponseJson(operationItem);
             let cardBody = [];
             let schema = json.schema;
             let jsonPath = "$";
@@ -1323,6 +1562,8 @@ class SpecParser {
                     errors: [{ type: ErrorType.SpecNotValid, content: e.toString() }],
                 };
             }
+            const errors = [];
+            const warnings = [];
             if (!this.options.allowSwagger && this.isSwaggerFile) {
                 return {
                     status: ValidationStatus.Error,
@@ -1332,7 +1573,38 @@ class SpecParser {
                     ],
                 };
             }
-            return Utils.validateSpec(this.spec, this.parser, !!this.isSwaggerFile, this.options);
+            // Remote reference not supported
+            const refPaths = this.parser.$refs.paths();
+            // refPaths [0] is the current spec file path
+            if (refPaths.length > 1) {
+                errors.push({
+                    type: ErrorType.RemoteRefNotSupported,
+                    content: Utils.format(ConstantString.RemoteRefNotSupported, refPaths.join(", ")),
+                    data: refPaths,
+                });
+            }
+            if (!!this.isSwaggerFile && this.options.allowSwagger) {
+                warnings.push({
+                    type: WarningType.ConvertSwaggerToOpenAPI,
+                    content: ConstantString.ConvertSwaggerToOpenAPI,
+                });
+            }
+            const validator = this.getValidator(this.spec);
+            const validationResult = validator.validateSpec();
+            warnings.push(...validationResult.warnings);
+            errors.push(...validationResult.errors);
+            let status = ValidationStatus.Valid;
+            if (warnings.length > 0 && errors.length === 0) {
+                status = ValidationStatus.Warning;
+            }
+            else if (errors.length > 0) {
+                status = ValidationStatus.Error;
+            }
+            return {
+                status: status,
+                warnings: warnings,
+                errors: errors,
+            };
         }
         catch (err) {
             throw new SpecParserError(err.toString(), ErrorType.ValidateFailed);
@@ -1352,45 +1624,40 @@ class SpecParser {
         try {
             await this.loadSpec();
             const spec = this.spec;
-            const apiMap = this.getAllSupportedAPIs(spec);
+            const apiMap = this.getAPIs(spec);
             const result = {
-                validAPIs: [],
+                APIs: [],
                 allAPICount: 0,
                 validAPICount: 0,
             };
             for (const apiKey in apiMap) {
+                const { operation, isValid, reason } = apiMap[apiKey];
+                const [method, path] = apiKey.split(" ");
+                const operationId = (_a = operation.operationId) !== null && _a !== void 0 ? _a : `${method.toLowerCase()}${Utils.convertPathToCamelCase(path)}`;
                 const apiResult = {
-                    api: "",
+                    api: apiKey,
                     server: "",
-                    operationId: "",
+                    operationId: operationId,
+                    isValid: isValid,
+                    reason: reason,
                 };
-                const [method, path] = apiKey.split(" ");
-                const operation = apiMap[apiKey];
-                const rootServer = spec.servers && spec.servers[0];
-                const methodServer = spec.paths[path].servers && ((_a = spec.paths[path]) === null || _a === void 0 ? void 0 : _a.servers[0]);
-                const operationServer = operation.servers && operation.servers[0];
-                const serverUrl = operationServer || methodServer || rootServer;
-                if (!serverUrl) {
-                    throw new SpecParserError(ConstantString.NoServerInformation, ErrorType.NoServerInformation);
-                }
-                apiResult.server = Utils.resolveServerUrl(serverUrl.url);
-                let operationId = operation.operationId;
-                if (!operationId) {
-                    operationId = `${method.toLowerCase()}${Utils.convertPathToCamelCase(path)}`;
-                }
-                apiResult.operationId = operationId;
-                const authArray = Utils.getAuthArray(operation.security, spec);
-                for (const auths of authArray) {
-                    if (auths.length === 1) {
-                        apiResult.auth = auths[0];
-                        break;
+                if (isValid) {
+                    const serverObj = Utils.getServerObject(spec, method.toLocaleLowerCase(), path);
+                    if (serverObj) {
+                        apiResult.server = Utils.resolveEnv(serverObj.url);
+                    }
+                    const authArray = Utils.getAuthArray(operation.security, spec);
+                    for (const auths of authArray) {
+                        if (auths.length === 1) {
+                            apiResult.auth = auths[0];
+                            break;
+                        }
                     }
                 }
-                apiResult.api = apiKey;
-                result.validAPIs.push(apiResult);
+                result.APIs.push(apiResult);
             }
-            result.allAPICount = Utils.getAllAPICount(spec);
-            result.validAPICount = result.validAPIs.length;
+            result.allAPICount = result.APIs.length;
+            result.validAPICount = result.APIs.filter((api) => api.isValid).length;
             return result;
         }
         catch (err) {
@@ -1482,15 +1749,18 @@ class SpecParser {
             const newSpecs = await this.getFilteredSpecs(filter, signal);
             const newUnResolvedSpec = newSpecs[0];
             const newSpec = newSpecs[1];
-            const authSet = new Set();
             let hasMultipleAuth = false;
+            let authInfo = undefined;
             for (const url in newSpec.paths) {
                 for (const method in newSpec.paths[url]) {
                     const operation = newSpec.paths[url][method];
                     const authArray = Utils.getAuthArray(operation.security, newSpec);
                     if (authArray && authArray.length > 0) {
-                        authSet.add(authArray[0][0]);
-                        if (authSet.size > 1) {
+                        const currentAuth = authArray[0][0];
+                        if (!authInfo) {
+                            authInfo = authArray[0][0];
+                        }
+                        else if (authInfo.name !== currentAuth.name) {
                             hasMultipleAuth = true;
                             break;
                         }
@@ -1537,7 +1807,6 @@ class SpecParser {
             if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                 throw new SpecParserError(ConstantString.CancelledMessage, ErrorType.Cancelled);
             }
-            const authInfo = Array.from(authSet)[0];
             const [updatedManifest, warnings] = await ManifestUpdater.updateManifest(manifestPath, outputSpecPath, newSpec, this.options, adaptiveCardFolder, authInfo);
             await fs.outputJSON(manifestPath, updatedManifest, { spaces: 2 });
             result.warnings.push(...warnings);
@@ -1563,13 +1832,19 @@ class SpecParser {
             this.spec = (await this.parser.dereference(clonedUnResolveSpec));
         }
     }
-    getAllSupportedAPIs(spec) {
-        if (this.apiMap !== undefined) {
-            return this.apiMap;
+    getAPIs(spec) {
+        const validator = this.getValidator(spec);
+        const apiMap = validator.listAPIs();
+        this.apiMap = apiMap;
+        return apiMap;
+    }
+    getValidator(spec) {
+        if (this.validator) {
+            return this.validator;
         }
-        const result = Utils.listSupportedAPIs(spec, this.options);
-        this.apiMap = result;
-        return result;
+        const validator = ValidatorFactory.create(spec, this.options);
+        this.validator = validator;
+        return validator;
     }
 }