@omnigraph/openapi 0.109.7 → 0.109.9-alpha-20250521155934-2fbf68b9f412aa05247a14ac6344ef7ff6f435e8

package/cjs/getJSONSchemaOptionsFromOpenAPIOptions.js

@@ -327,7 +327,14 @@ async function getJSONSchemaOptionsFromOpenAPIOptions(name, { source, fallbackFo
                     operationConfig.headers = operationConfig.headers || {};
                     operationConfig.headers.Accept = methodObj.produces.join(', ');
                 }
-                if ('content' in responseObj) {
+                /**
+                 * The OAS rule is that 204 responses should not specify a content key.
+                 * But in the real world, it happens that some specifications present 204 responses with an
+                 * empty content key.
+                 *
+                 * @see https://swagger.io/docs/specification/v3_0/describing-responses/#empty-response-body
+                 */
+                if ('content' in responseObj && Object.keys(responseObj.content).length !== 0) {
                     const responseObjForStatusCode = {
                         oneOf: [],
                     };
@@ -438,13 +445,13 @@ async function getJSONSchemaOptionsFromOpenAPIOptions(name, { source, fallbackFo
                         const xLinkObj = schemaObj.properties?.[hateOasConfig.linkObjectIdentifier]?.[hateOasConfig.linkObjectExtensionIdentifier]?.find(link => link[hateOasConfig.linkNameIdentifier] === linkName);
                         if (xLinkObj) {
                             const xLinkHref = xLinkObj[hateOasConfig.linkPathIdentifier];
-                            const cleanXLinkHref = xLinkHref.replace(/{[^}]+}/g, '');
+                            const cleanXLinkHref = xLinkHref.replace(/{[^}]+}/g, '{}');
                             const deferred = (0, utils_2.createDeferred)();
                             function findActualOperationAndPath(possibleName, possibleOasDoc, possibleMethodObjFieldMap) {
                                 let actualOperation;
                                 let actualPath;
                                 for (const path in possibleOasDoc.paths) {
-                                    const cleanPath = path.replace(/{[^}]+}/g, '');
+                                    const cleanPath = path.replace(/{[^}]+}/g, '{}');
                                     if (cleanPath === cleanXLinkHref) {
                                         actualPath = path;
                                         actualOperation = possibleOasDoc.paths[path][method];

package/esm/getJSONSchemaOptionsFromOpenAPIOptions.js

@@ -324,7 +324,14 @@ export async function getJSONSchemaOptionsFromOpenAPIOptions(name, { source, fal
                     operationConfig.headers = operationConfig.headers || {};
                     operationConfig.headers.Accept = methodObj.produces.join(', ');
                 }
-                if ('content' in responseObj) {
+                /**
+                 * The OAS rule is that 204 responses should not specify a content key.
+                 * But in the real world, it happens that some specifications present 204 responses with an
+                 * empty content key.
+                 *
+                 * @see https://swagger.io/docs/specification/v3_0/describing-responses/#empty-response-body
+                 */
+                if ('content' in responseObj && Object.keys(responseObj.content).length !== 0) {
                     const responseObjForStatusCode = {
                         oneOf: [],
                     };
@@ -435,13 +442,13 @@ export async function getJSONSchemaOptionsFromOpenAPIOptions(name, { source, fal
                         const xLinkObj = schemaObj.properties?.[hateOasConfig.linkObjectIdentifier]?.[hateOasConfig.linkObjectExtensionIdentifier]?.find(link => link[hateOasConfig.linkNameIdentifier] === linkName);
                         if (xLinkObj) {
                             const xLinkHref = xLinkObj[hateOasConfig.linkPathIdentifier];
-                            const cleanXLinkHref = xLinkHref.replace(/{[^}]+}/g, '');
+                            const cleanXLinkHref = xLinkHref.replace(/{[^}]+}/g, '{}');
                             const deferred = createDeferred();
                             function findActualOperationAndPath(possibleName, possibleOasDoc, possibleMethodObjFieldMap) {
                                 let actualOperation;
                                 let actualPath;
                                 for (const path in possibleOasDoc.paths) {
-                                    const cleanPath = path.replace(/{[^}]+}/g, '');
+                                    const cleanPath = path.replace(/{[^}]+}/g, '{}');
                                     if (cleanPath === cleanXLinkHref) {
                                         actualPath = path;
                                         actualOperation = possibleOasDoc.paths[path][method];

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@omnigraph/openapi",
-  "version": "0.109.7",
+  "version": "0.109.9-alpha-20250521155934-2fbf68b9f412aa05247a14ac6344ef7ff6f435e8",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
   },
   "dependencies": {
     "@graphql-mesh/cross-helpers": "^0.4.10",
-    "@graphql-mesh/fusion-composition": "^0.8.6",
+    "@graphql-mesh/fusion-composition": "^0.8.7",
     "@graphql-mesh/string-interpolation": "^0.5.8",
     "@graphql-mesh/types": "^0.104.3",
     "@graphql-mesh/utils": "^0.104.3",