@microsoft/m365-spec-parser 0.2.2-rc.0 → 0.2.2

package/dist/index.esm2017.js

@@ -188,19 +188,16 @@ ConstantString.PluginManifestSchema = "https://developer.microsoft.com/json-sche
 // Copyright (c) Microsoft Corporation.
 class Utils {
     static hasNestedObjectInSchema(schema) {
-        if (this.isObjectSchema(schema)) {
+        if (schema.type === "object") {
             for (const property in schema.properties) {
                 const nestedSchema = schema.properties[property];
-                if (this.isObjectSchema(nestedSchema)) {
+                if (nestedSchema.type === "object") {
                     return true;
                 }
             }
         }
         return false;
     }
-    static isObjectSchema(schema) {
-        return schema.type === "object" || (!schema.type && !!schema.properties);
-    }
     static containMultipleMediaTypes(bodyObject) {
         return Object.keys((bodyObject === null || bodyObject === void 0 ? void 0 : bodyObject.content) || {}).length > 1;
     }
@@ -429,7 +426,7 @@ class Utils {
                 optionalParams.push(parameter);
             }
         }
-        else if (Utils.isObjectSchema(schema)) {
+        else if (schema.type === "object") {
             const { properties } = schema;
             for (const property in properties) {
                 let isRequired = false;
@@ -767,7 +764,7 @@ class Validator {
         }
         const isRequiredWithoutDefault = isRequired && schema.default === undefined;
         const isCopilot = this.projectType === ProjectType.Copilot;
-        if (isCopilot && Utils.hasNestedObjectInSchema(schema)) {
+        if (isCopilot && this.hasNestedObjectInSchema(schema)) {
             paramResult.isValid = false;
             paramResult.reason = [ErrorType.RequestBodyContainsNestedObject];
             return paramResult;
@@ -783,7 +780,7 @@ class Validator {
                 paramResult.optionalNum = paramResult.optionalNum + 1;
             }
         }
-        else if (Utils.isObjectSchema(schema)) {
+        else if (schema.type === "object") {
             const { properties } = schema;
             for (const property in properties) {
                 let isRequired = false;
@@ -819,7 +816,7 @@ class Validator {
         for (let i = 0; i < paramObject.length; i++) {
             const param = paramObject[i];
             const schema = param.schema;
-            if (isCopilot && Utils.hasNestedObjectInSchema(schema)) {
+            if (isCopilot && this.hasNestedObjectInSchema(schema)) {
                 paramResult.isValid = false;
                 paramResult.reason.push(ErrorType.ParamsContainsNestedObject);
                 continue;
@@ -862,6 +859,17 @@ class Validator {
         }
         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.
@@ -920,7 +928,7 @@ class CopilotValidator extends Validator {
         const requestJsonBody = requestBody === null || requestBody === void 0 ? void 0 : requestBody.content["application/json"];
         if (requestJsonBody) {
             const requestBodySchema = requestJsonBody.schema;
-            if (!Utils.isObjectSchema(requestBodySchema)) {
+            if (requestBodySchema.type !== "object") {
                 result.reason.push(ErrorType.PostBodySchemaIsNotJson);
             }
             const requestBodyParamResult = this.checkPostBodySchema(requestBodySchema, requestBody.required);
@@ -1365,7 +1373,7 @@ class AdaptiveCardGenerator {
             return [template];
         }
         // some schema may not contain type but contain properties
-        if (Utils.isObjectSchema(schema)) {
+        if (schema.type === "object" || (!schema.type && schema.properties)) {
             const { properties } = schema;
             const result = [];
             for (const property in properties) {
@@ -1433,7 +1441,7 @@ class AdaptiveCardGenerator {
     }
     // Find the first array property in the response schema object with the well-known name
     static getResponseJsonPathFromSchema(schema) {
-        if (Utils.isObjectSchema(schema)) {
+        if (schema.type === "object" || (!schema.type && schema.properties)) {
             const { properties } = schema;
             for (const property in properties) {
                 const schema = properties[property];