@sleekify/sleekify-fastify 1.0.0 → 1.0.2

package/dist/src/index.d.ts

@@ -40,4 +40,5 @@ export declare class Sleekify {
     private addServiceHandlers;
     private getSuccessStatusCodes;
     private sortObject;
+    private sortOperationObjects;
 }

package/dist/src/index.js

@@ -109,6 +109,13 @@ class Sleekify {
             for (const key of components) {
                 this.sortObject(result, `components.${key}`);
             }
+            this.sortOperationObjects(result);
+            if (result.servers !== undefined) {
+                result.servers.sort((a, b) => a.url.localeCompare(b.url));
+            }
+            if (result.tags !== undefined) {
+                result.tags.sort((a, b) => a.name.localeCompare(b.name));
+            }
         }
         return result;
     }
@@ -137,7 +144,6 @@ class Sleekify {
                 this.addServiceHandlers(clazz, classInstance, pathItemObject);
             }
         }
-        // TODO - sort specification?
     }
     addComponents(clazz, componentsObject) {
         if (this.specification.components === undefined) {
@@ -182,11 +188,6 @@ class Sleekify {
     }
     addRequestBody(operationObject, resolvedConsumes, resolvedSchema) {
         if (operationObject.requestBody === undefined) {
-            operationObject.requestBody = {};
-        }
-        const referenceObject = operationObject.requestBody;
-        const requestBody = operationObject.requestBody;
-        if (referenceObject.$ref === undefined && requestBody.content === undefined) {
             operationObject.requestBody = {
                 content: resolvedConsumes.reduce((content, mediaType) => {
                     content[mediaType] = {
@@ -196,6 +197,10 @@ class Sleekify {
                 }, {})
             };
         }
+        const requestBody = operationObject.requestBody;
+        if (lodash_1.default.isEmpty(requestBody) || (requestBody.content !== undefined && lodash_1.default.isEmpty(requestBody.content) && Object.keys(requestBody).length === 1)) {
+            delete operationObject.requestBody;
+        }
     }
     addResponses(operationObject, resolvedProduces, resolvedSchema, resolvedStatusCodes) {
         if (resolvedStatusCodes.length === 0) {
@@ -219,15 +224,20 @@ class Sleekify {
             }
             else {
                 const referenceOrResponse = operationObject.responses[resolvedStatusCode];
-                if (referenceOrResponse.$ref === undefined && referenceOrResponse.content === undefined) {
-                    const responseObject = operationObject.responses[resolvedStatusCode];
-                    /* add content to an existing response object */
-                    responseObject.content = resolvedProduces.reduce((content, mediaType) => {
-                        content[mediaType] = {
-                            schema: resolvedSchema
-                        };
-                        return content;
-                    }, {});
+                if (referenceOrResponse.$ref === undefined) {
+                    if (referenceOrResponse.content === undefined) {
+                        const responseObject = operationObject.responses[resolvedStatusCode];
+                        /* add content to an existing response object */
+                        responseObject.content = resolvedProduces.reduce((content, mediaType) => {
+                            content[mediaType] = {
+                                schema: resolvedSchema
+                            };
+                            return content;
+                        }, {});
+                    }
+                    if (lodash_1.default.isEmpty(referenceOrResponse.content)) {
+                        delete referenceOrResponse.content;
+                    }
                 }
             }
         }
@@ -254,7 +264,13 @@ class Sleekify {
     addServiceHandlers(clazz, classInstance, pathItemObject) {
         const path = pathItemObject.path;
         const operationMap = {};
-        for (const propertyName of Object.getOwnPropertyNames(Object.getPrototypeOf(classInstance))) {
+        const propertyNameMap = {};
+        for (let prototype = Object.getPrototypeOf(classInstance); prototype !== Object.prototype; prototype = Object.getPrototypeOf(prototype)) {
+            for (const propertyName of Object.getOwnPropertyNames(prototype)) {
+                propertyNameMap[propertyName] = null;
+            }
+        }
+        for (const propertyName in propertyNameMap) {
             const propertyValue = classInstance[propertyName];
             if (['constructor', 'function'].includes(propertyName) || !lodash_1.default.isFunction(propertyValue)) {
                 continue;
@@ -314,5 +330,22 @@ class Sleekify {
         }
         lodash_1.default.set(root, path, result);
     }
+    sortOperationObjects(result) {
+        if (result.paths !== undefined) {
+            for (const path in result.paths) {
+                const pathItemObject = result.paths[path];
+                for (const methodMap of methodMapArray) {
+                    const operationObject = pathItemObject[methodMap.key];
+                    if (operationObject !== undefined) {
+                        this.sortObject(operationObject, 'callbacks');
+                        this.sortObject(operationObject, 'responses');
+                        if (operationObject.tags !== undefined) {
+                            operationObject.tags.sort();
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 exports.Sleekify = Sleekify;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@sleekify/sleekify-fastify",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "A TypeScript decorator driven approach for developing Fastify web applications.",
   "scripts": {
     "build": "tsc",
     "lint": "eslint --ext .ts .",
-    "test": "node --experimental-vm-modules ./node_modules/.bin/jest",
+    "test": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
     "validate": "npm run build && npm run lint -- --fix && npm test"
   },
   "repository": {
@@ -41,7 +41,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@sleekify/sleekify": "^1.0.0",
+    "@sleekify/sleekify": "^1.0.4",
     "@types/node": "^20.4.5",
     "fastify": "^5.0.0",
     "fastify-openapi-glue": "^4.7.1",