@microsoft/m365-spec-parser 0.2.3-alpha.786f6c493.0 → 0.2.3-alpha.8abc127ff.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);
     }
@@ -319,27 +306,33 @@ class Utils {
         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 (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 };
-                        }
-                    }
-                }
+            if (!responseObject) {
+                continue;
+            }
+            multipleMediaType = Utils.containMultipleMediaTypes(responseObject);
+            if (!allowMultipleMediaType && multipleMediaType) {
+                json = {};
+                continue;
+            }
+            const mediaObj = Utils.getJsonContentType(responseObject);
+            if (Object.keys(mediaObj).length > 0) {
+                json = mediaObj;
+                return { json, multipleMediaType };
             }
         }
         return { json, multipleMediaType };
     }
+    static getJsonContentType(responseObject) {
+        if (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) {
+                    return responseObject.content[contentType];
+                }
+            }
+        }
+        return {};
+    }
     static convertPathToCamelCase(path) {
         const pathSegments = path.split(/[./{]/);
         const camelCaseSegments = pathSegments.map((segment) => {
@@ -375,7 +368,7 @@ class Utils {
         }
         return newStr;
     }
-    static checkServerUrl(servers) {
+    static checkServerUrl(servers, allowHttp = false) {
         const errors = [];
         let serverUrl;
         try {
@@ -398,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,
@@ -415,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;
@@ -426,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) {
@@ -434,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);
                     }
                 }
@@ -747,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;
@@ -796,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" ||
@@ -848,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) {
@@ -1327,15 +1310,152 @@ class SpecFilter {
     }
 }
 
+// Copyright (c) Microsoft Corporation.
+class JsonDataGenerator {
+    static generate(schema) {
+        return this.generateMockData(schema);
+    }
+    static generateMockData(schema) {
+        if (this.visitedSchemas.has(schema)) {
+            return null; // Prevent circular reference
+        }
+        this.visitedSchemas.add(schema);
+        let result;
+        if (schema.anyOf) {
+            // Select the first schema in anyOf
+            const selectedSchema = schema.anyOf[0];
+            result = this.generateMockData(selectedSchema);
+        }
+        else if (schema.oneOf) {
+            // Select the first schema in oneOf
+            const selectedSchema = schema.oneOf[0];
+            result = this.generateMockData(selectedSchema);
+        }
+        else if (schema.allOf) {
+            // merge all schemas in allOf
+            result = {};
+            for (const subschema of schema.allOf) {
+                const data = this.generateMockData(subschema);
+                result = Object.assign(Object.assign({}, result), data);
+            }
+        }
+        else {
+            switch (schema.type) {
+                case "string":
+                    if (schema.example !== undefined) {
+                        result = schema.example;
+                    }
+                    else if (schema.format) {
+                        switch (schema.format) {
+                            case "date-time":
+                                result = "2024-11-01T05:25:43.593Z";
+                                break;
+                            case "email":
+                                result = "example@example.com";
+                                break;
+                            case "uuid":
+                                result = "123e4567-e89b-12d3-a456-426614174000";
+                                break;
+                            case "ipv4":
+                                result = "192.168.0.1";
+                                break;
+                            case "ipv6":
+                                result = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
+                                break;
+                            default:
+                                result = "example string";
+                        }
+                    }
+                    else {
+                        result = "example string";
+                    }
+                    break;
+                case "number":
+                    if (schema.example !== undefined) {
+                        result = schema.example;
+                    }
+                    else if (schema.format) {
+                        switch (schema.format) {
+                            case "float":
+                                result = 3.14;
+                                break;
+                            case "double":
+                                result = 3.14159;
+                                break;
+                            default:
+                                result = 123;
+                        }
+                    }
+                    else {
+                        result = 123;
+                    }
+                    break;
+                case "integer":
+                    if (schema.example !== undefined) {
+                        result = schema.example;
+                    }
+                    else if (schema.format) {
+                        switch (schema.format) {
+                            case "int32":
+                                result = 123456;
+                                break;
+                            case "int64":
+                                result = 123456789;
+                                break;
+                            default:
+                                result = 123;
+                        }
+                    }
+                    else {
+                        result = 123;
+                    }
+                    break;
+                case "boolean":
+                    result = schema.example !== undefined ? schema.example : true;
+                    break;
+                case "array":
+                    result = [this.generateMockData(schema.items)];
+                    break;
+                case "object":
+                    result = {};
+                    if (schema.properties) {
+                        for (const key in schema.properties) {
+                            result[key] = this.generateMockData(schema.properties[key]);
+                        }
+                    }
+                    break;
+                default:
+                    result = schema.example || null;
+            }
+        }
+        this.visitedSchemas.delete(schema);
+        return result;
+    }
+}
+JsonDataGenerator.visitedSchemas = new Set();
+
 // Copyright (c) Microsoft Corporation.
 class AdaptiveCardGenerator {
     static generateAdaptiveCard(operationItem, allowMultipleMediaType = false, maxElementCount = Number.MAX_SAFE_INTEGER) {
         try {
             const { json } = Utils.getResponseJson(operationItem, allowMultipleMediaType);
             let cardBody = [];
+            let jsonData = {};
+            const warnings = [];
+            const operationId = operationItem.operationId;
             let schema = json.schema;
             let jsonPath = "$";
             if (schema && Object.keys(schema).length > 0) {
+                try {
+                    jsonData = JsonDataGenerator.generate(schema);
+                }
+                catch (err) {
+                    warnings.push({
+                        type: exports.WarningType.GenerateJsonDataFailed,
+                        content: Utils.format(ConstantString.GenerateJsonDataFailed, operationId, err.toString()),
+                        data: operationId,
+                    });
+                }
                 jsonPath = AdaptiveCardGenerator.getResponseJsonPathFromSchema(schema);
                 if (jsonPath !== "$") {
                     schema = schema.properties[jsonPath];
@@ -1368,7 +1488,7 @@ class AdaptiveCardGenerator {
                 version: ConstantString.AdaptiveCardVersion,
                 body: cardBody,
             };
-            return [fullCard, jsonPath];
+            return [fullCard, jsonPath, jsonData, warnings];
         }
         catch (err) {
             throw new SpecParserError(err.toString(), exports.ErrorType.GenerateAdaptiveCardFailed);
@@ -1698,36 +1818,11 @@ class ManifestUpdater {
                     for (const method in operations) {
                         if (options.allowMethods.includes(method)) {
                             const operationItem = operations[method];
-                            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;
-                                const requestBody = operationItem.requestBody;
-                                if (paramObject) {
-                                    for (let i = 0; i < paramObject.length; i++) {
-                                        const param = paramObject[i];
-                                        const schema = param.schema;
-                                        ManifestUpdater.checkSchema(schema, method, pathUrl);
-                                        confirmationBodies.push(ManifestUpdater.getConfirmationBodyItem(param.name));
-                                    }
-                                }
-                                if (requestBody) {
-                                    const requestJsonBody = requestBody.content["application/json"];
-                                    const requestBodySchema = requestJsonBody.schema;
-                                    if (Utils.isObjectSchema(requestBodySchema)) {
-                                        for (const property in requestBodySchema.properties) {
-                                            const schema = requestBodySchema.properties[property];
-                                            ManifestUpdater.checkSchema(schema, method, pathUrl);
-                                            confirmationBodies.push(ManifestUpdater.getConfirmationBodyItem(property));
-                                        }
-                                    }
-                                    else {
-                                        throw new SpecParserError(Utils.format(ConstantString.UnsupportedSchema, method, pathUrl, JSON.stringify(requestBodySchema)), exports.ErrorType.UpdateManifestFailed);
-                                    }
-                                }
                                 let funcDescription = operationItem.description || operationItem.summary || "";
                                 if (funcDescription.length > ConstantString.FunctionDescriptionMaxLens) {
                                     warnings.push({
@@ -1761,14 +1856,39 @@ class ManifestUpdater {
                                     }
                                 }
                                 if (options.allowConfirmation && method !== ConstantString.GetMethod) {
-                                    if (!funcObj.capabilities) {
-                                        funcObj.capabilities = {};
+                                    const paramObject = operationItem.parameters;
+                                    const requestBody = operationItem.requestBody;
+                                    const confirmationBodies = [];
+                                    if (paramObject) {
+                                        for (let i = 0; i < paramObject.length; i++) {
+                                            const param = paramObject[i];
+                                            const schema = param.schema;
+                                            ManifestUpdater.checkSchema(schema, method, pathUrl);
+                                            confirmationBodies.push(ManifestUpdater.getConfirmationBodyItem(param.name));
+                                        }
+                                    }
+                                    if (requestBody) {
+                                        const requestJsonBody = Utils.getJsonContentType(requestBody);
+                                        const requestBodySchema = requestJsonBody.schema;
+                                        if (Utils.isObjectSchema(requestBodySchema)) {
+                                            for (const property in requestBodySchema.properties) {
+                                                const schema = requestBodySchema.properties[property];
+                                                ManifestUpdater.checkSchema(schema, method, pathUrl);
+                                                confirmationBodies.push(ManifestUpdater.getConfirmationBodyItem(property));
+                                            }
+                                        }
+                                        else {
+                                            throw new SpecParserError(Utils.format(ConstantString.UnsupportedSchema, method, pathUrl, JSON.stringify(requestBodySchema)), exports.ErrorType.UpdateManifestFailed);
+                                        }
                                     }
-                                    funcObj.capabilities.confirmation = {
-                                        type: "AdaptiveCard",
-                                        title: (_b = operationItem.summary) !== null && _b !== void 0 ? _b : description,
-                                    };
                                     if (confirmationBodies.length > 0) {
+                                        if (!funcObj.capabilities) {
+                                            funcObj.capabilities = {};
+                                        }
+                                        funcObj.capabilities.confirmation = {
+                                            type: "AdaptiveCard",
+                                            title: (_b = operationItem.summary) !== null && _b !== void 0 ? _b : description,
+                                        };
                                         funcObj.capabilities.confirmation.body = confirmationBodies.join("\n");
                                     }
                                 }
@@ -1983,130 +2103,6 @@ class ManifestUpdater {
     }
 }
 
-// Copyright (c) Microsoft Corporation.
-class JsonDataGenerator {
-    static generate(schema) {
-        return this.generateMockData(schema);
-    }
-    static generateMockData(schema) {
-        if (this.visitedSchemas.has(schema)) {
-            return null; // Prevent circular reference
-        }
-        this.visitedSchemas.add(schema);
-        let result;
-        if (schema.anyOf) {
-            // Select the first schema in anyOf
-            const selectedSchema = schema.anyOf[0];
-            result = this.generateMockData(selectedSchema);
-        }
-        else if (schema.oneOf) {
-            // Select the first schema in oneOf
-            const selectedSchema = schema.oneOf[0];
-            result = this.generateMockData(selectedSchema);
-        }
-        else if (schema.allOf) {
-            // merge all schemas in allOf
-            result = {};
-            for (const subschema of schema.allOf) {
-                const data = this.generateMockData(subschema);
-                result = Object.assign(Object.assign({}, result), data);
-            }
-        }
-        else {
-            switch (schema.type) {
-                case "string":
-                    if (schema.example !== undefined) {
-                        result = schema.example;
-                    }
-                    else if (schema.format) {
-                        switch (schema.format) {
-                            case "date-time":
-                                result = "2024-11-01T05:25:43.593Z";
-                                break;
-                            case "email":
-                                result = "example@example.com";
-                                break;
-                            case "uuid":
-                                result = "123e4567-e89b-12d3-a456-426614174000";
-                                break;
-                            case "ipv4":
-                                result = "192.168.0.1";
-                                break;
-                            case "ipv6":
-                                result = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
-                                break;
-                            default:
-                                result = "example string";
-                        }
-                    }
-                    else {
-                        result = "example string";
-                    }
-                    break;
-                case "number":
-                    if (schema.example !== undefined) {
-                        result = schema.example;
-                    }
-                    else if (schema.format) {
-                        switch (schema.format) {
-                            case "float":
-                                result = 3.14;
-                                break;
-                            case "double":
-                                result = 3.14159;
-                                break;
-                            default:
-                                result = 123;
-                        }
-                    }
-                    else {
-                        result = 123;
-                    }
-                    break;
-                case "integer":
-                    if (schema.example !== undefined) {
-                        result = schema.example;
-                    }
-                    else if (schema.format) {
-                        switch (schema.format) {
-                            case "int32":
-                                result = 123456;
-                                break;
-                            case "int64":
-                                result = 123456789;
-                                break;
-                            default:
-                                result = 123;
-                        }
-                    }
-                    else {
-                        result = 123;
-                    }
-                    break;
-                case "boolean":
-                    result = schema.example !== undefined ? schema.example : true;
-                    break;
-                case "array":
-                    result = [this.generateMockData(schema.items)];
-                    break;
-                case "object":
-                    result = {};
-                    if (schema.properties) {
-                        for (const key in schema.properties) {
-                            result[key] = this.generateMockData(schema.properties[key]);
-                        }
-                    }
-                    break;
-                default:
-                    result = schema.example || null;
-            }
-        }
-        this.visitedSchemas.delete(schema);
-        return result;
-    }
-}
-JsonDataGenerator.visitedSchemas = new Set();
-
 // Copyright (c) Microsoft Corporation.
 /**
  * A class that parses an OpenAPI specification file and provides methods to validate, list, and generate artifacts.
@@ -2415,25 +2411,11 @@ class SpecParser {
                             if (this.options.allowMethods.includes(method)) {
                                 const operation = newSpec.paths[url][method];
                                 try {
-                                    const [card, jsonPath] = AdaptiveCardGenerator.generateAdaptiveCard(operation);
+                                    const [card, jsonPath, jsonData, warnings] = AdaptiveCardGenerator.generateAdaptiveCard(operation);
+                                    result.warnings.push(...warnings);
                                     const safeAdaptiveCardName = operation.operationId.replace(/[^a-zA-Z0-9]/g, "_");
                                     const fileName = path__default['default'].join(adaptiveCardFolder, `${safeAdaptiveCardName}.json`);
                                     const wrappedCard = wrapAdaptiveCard(card, jsonPath);
-                                    const { json } = Utils.getResponseJson(operation, false);
-                                    const schema = json.schema;
-                                    let jsonData = {};
-                                    if (schema && Object.keys(schema).length > 0) {
-                                        try {
-                                            jsonData = JsonDataGenerator.generate(schema);
-                                        }
-                                        catch (err) {
-                                            result.warnings.push({
-                                                type: exports.WarningType.GenerateJsonDataFailed,
-                                                content: Utils.format(ConstantString.GenerateJsonDataFailed, operation.operationId, err.toString()),
-                                                data: operation.operationId,
-                                            });
-                                        }
-                                    }
                                     yield fs__default['default'].outputJSON(fileName, wrappedCard, { spaces: 2 });
                                     const dataFileName = path__default['default'].join(adaptiveCardFolder, `${safeAdaptiveCardName}.data.json`);
                                     yield fs__default['default'].outputJSON(dataFileName, jsonData, { spaces: 2 });