@microsoft/m365-spec-parser 0.2.3-alpha.c59b92632.0 → 0.2.3-alpha.decc8f69b.0

package/dist/index.node.cjs.js

@@ -83,8 +83,6 @@ exports.ErrorType = void 0;
     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";
@@ -152,7 +150,7 @@ ConstantString.WrappedCardResponseLayout = "list";
 ConstantString.GetMethod = "get";
 ConstantString.PostMethod = "post";
 ConstantString.AdaptiveCardVersion = "1.5";
-ConstantString.AdaptiveCardSchema = "http://adaptivecards.io/schemas/adaptive-card.json";
+ConstantString.AdaptiveCardSchema = "https://adaptivecards.io/schemas/adaptive-card.json";
 ConstantString.AdaptiveCardType = "AdaptiveCard";
 ConstantString.TextBlockType = "TextBlock";
 ConstantString.ImageType = "Image";
@@ -239,17 +237,6 @@ class SpecParserError extends Error {
 
 // Copyright (c) Microsoft Corporation.
 class Utils {
-    static hasNestedObjectInSchema(schema) {
-        if (this.isObjectSchema(schema)) {
-            for (const property in schema.properties) {
-                const nestedSchema = schema.properties[property];
-                if (this.isObjectSchema(nestedSchema)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
     static isObjectSchema(schema) {
         return schema.type === "object" || (!schema.type && !!schema.properties);
     }
@@ -381,7 +368,7 @@ class Utils {
         }
         return newStr;
     }
-    static checkServerUrl(servers) {
+    static checkServerUrl(servers, allowHttp = false) {
         const errors = [];
         let serverUrl;
         try {
@@ -404,8 +391,7 @@ class Utils {
                 data: servers,
             });
         }
-        else if (protocol !== "https:") {
-            // Http server url is not supported
+        else if (protocol !== "https:" && !(protocol === "http:" && allowHttp)) {
             const protocolString = protocol.slice(0, -1);
             errors.push({
                 type: exports.ErrorType.UrlProtocolNotSupported,
@@ -421,10 +407,11 @@ class Utils {
         let hasTopLevelServers = false;
         let hasPathLevelServers = false;
         let hasOperationLevelServers = false;
+        const allowHttp = options.projectType === exports.ProjectType.Copilot;
         if (spec.servers && spec.servers.length >= 1) {
             hasTopLevelServers = true;
             // for multiple server, we only use the first url
-            const serverErrors = Utils.checkServerUrl(spec.servers);
+            const serverErrors = Utils.checkServerUrl(spec.servers, allowHttp);
             errors.push(...serverErrors);
         }
         const paths = spec.paths;
@@ -432,7 +419,7 @@ class Utils {
             const methods = paths[path];
             if ((methods === null || methods === void 0 ? void 0 : methods.servers) && methods.servers.length >= 1) {
                 hasPathLevelServers = true;
-                const serverErrors = Utils.checkServerUrl(methods.servers);
+                const serverErrors = Utils.checkServerUrl(methods.servers, allowHttp);
                 errors.push(...serverErrors);
             }
             for (const method in methods) {
@@ -440,7 +427,7 @@ class Utils {
                 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);
+                        const serverErrors = Utils.checkServerUrl(operationObject.servers, allowHttp);
                         errors.push(...serverErrors);
                     }
                 }
@@ -753,8 +740,8 @@ class Validator {
             result.reason.push(exports.ErrorType.NoServerInformation);
         }
         else {
-            // server url should be absolute url with https protocol
-            const serverValidateResult = Utils.checkServerUrl([serverObj]);
+            const allowHttp = this.projectType === exports.ProjectType.Copilot;
+            const serverValidateResult = Utils.checkServerUrl([serverObj], allowHttp);
             result.reason.push(...serverValidateResult.map((item) => item.type));
         }
         return result;
@@ -802,11 +789,6 @@ class Validator {
         }
         const isRequiredWithoutDefault = isRequired && schema.default === undefined;
         const isCopilot = this.projectType === exports.ProjectType.Copilot;
-        if (isCopilot && Utils.hasNestedObjectInSchema(schema)) {
-            paramResult.isValid = false;
-            paramResult.reason = [exports.ErrorType.RequestBodyContainsNestedObject];
-            return paramResult;
-        }
         if (schema.type === "string" ||
             schema.type === "integer" ||
             schema.type === "boolean" ||
@@ -854,11 +836,6 @@ class Validator {
         for (let i = 0; i < paramObject.length; i++) {
             const param = paramObject[i];
             const schema = param.schema;
-            if (isCopilot && Utils.hasNestedObjectInSchema(schema)) {
-                paramResult.isValid = false;
-                paramResult.reason.push(exports.ErrorType.ParamsContainsNestedObject);
-                continue;
-            }
             const isRequiredWithoutDefault = param.required && schema.default === undefined;
             if (isCopilot) {
                 if (isRequiredWithoutDefault) {