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

package/dist/index.node.cjs.js

@@ -7,6 +7,7 @@ var converter = require('swagger2openapi');
 var jsyaml = require('js-yaml');
 var fs = require('fs-extra');
 var path = require('path');
+var teamsManifest = require('@microsoft/teams-manifest');
 var crypto = require('crypto');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -235,19 +236,16 @@ class SpecParserError extends Error {
 // 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;
     }
@@ -476,7 +474,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;
@@ -814,7 +812,7 @@ class Validator {
         }
         const isRequiredWithoutDefault = isRequired && schema.default === undefined;
         const isCopilot = this.projectType === exports.ProjectType.Copilot;
-        if (isCopilot && Utils.hasNestedObjectInSchema(schema)) {
+        if (isCopilot && this.hasNestedObjectInSchema(schema)) {
             paramResult.isValid = false;
             paramResult.reason = [exports.ErrorType.RequestBodyContainsNestedObject];
             return paramResult;
@@ -830,7 +828,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;
@@ -866,7 +864,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(exports.ErrorType.ParamsContainsNestedObject);
                 continue;
@@ -909,6 +907,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.
@@ -967,7 +976,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(exports.ErrorType.PostBodySchemaIsNotJson);
             }
             const requestBodyParamResult = this.checkPostBodySchema(requestBodySchema, requestBody.required);
@@ -1414,7 +1423,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) {
@@ -1482,7 +1491,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];
@@ -1638,16 +1647,30 @@ class ManifestUpdater {
         return __awaiter(this, void 0, void 0, function* () {
             const manifest = yield fs__default['default'].readJSON(manifestPath);
             const apiPluginRelativePath = ManifestUpdater.getRelativePath(manifestPath, apiPluginFilePath);
-            manifest.copilotExtensions = manifest.copilotExtensions || {};
-            // Insert plugins in manifest.json if it is plugin for Copilot.
-            if (!options.isGptPlugin) {
-                manifest.copilotExtensions.plugins = [
-                    {
-                        file: apiPluginRelativePath,
-                        id: ConstantString.DefaultPluginId,
-                    },
-                ];
-                ManifestUpdater.updateManifestDescription(manifest, spec);
+            const useCopilotExtensionsInSchema = yield teamsManifest.ManifestUtil.useCopilotExtensionsInSchema(manifest);
+            if (manifest.copilotExtensions || useCopilotExtensionsInSchema) {
+                manifest.copilotExtensions = manifest.copilotExtensions || {};
+                if (!options.isGptPlugin) {
+                    manifest.copilotExtensions.plugins = [
+                        {
+                            file: apiPluginRelativePath,
+                            id: ConstantString.DefaultPluginId,
+                        },
+                    ];
+                    ManifestUpdater.updateManifestDescription(manifest, spec);
+                }
+            }
+            else {
+                manifest.copilotAgents = manifest.copilotAgents || {};
+                if (!options.isGptPlugin) {
+                    manifest.copilotAgents.plugins = [
+                        {
+                            file: apiPluginRelativePath,
+                            id: ConstantString.DefaultPluginId,
+                        },
+                    ];
+                    ManifestUpdater.updateManifestDescription(manifest, spec);
+                }
             }
             const appName = this.removeEnvs(manifest.name.short);
             const specRelativePath = ManifestUpdater.getRelativePath(manifestPath, outputSpecPath);
@@ -1723,7 +1746,7 @@ class ManifestUpdater {
                                 if (requestBody) {
                                     const requestJsonBody = requestBody.content["application/json"];
                                     const requestBodySchema = requestJsonBody.schema;
-                                    if (Utils.isObjectSchema(requestBodySchema)) {
+                                    if (requestBodySchema.type === "object") {
                                         for (const property in requestBodySchema.properties) {
                                             const schema = requestBodySchema.properties[property];
                                             ManifestUpdater.checkSchema(schema, method, pathUrl);