@devlearning/swagger-generator 0.0.15 → 0.0.17

package/dist/generator.js

@@ -18,6 +18,9 @@ export class Generator {
             const method = Object.getOwnPropertyNames(swaggerMethod)[0];
             const swaggerMethodInfo = swaggerMethod[method];
             console.debug(`\tAPI - ${apiName} - ${method}`);
+            if (apiName == '/api/v{version}/TransportOrder/ListByServiceRequest') {
+                console.debug('');
+            }
             let parametersString = this.retrieveParameters(swaggerMethodInfo);
             let queryParameters = this.retrieveQueryParameters(swaggerMethodInfo);
             let returnTypeString = this.retrieveReturnType(swaggerMethodInfo);
@@ -107,7 +110,9 @@ ${MODEL_POST}`, { flag: 'w' });
                 parameters += `${this.toFirstLetterLowercase(parameter.name)}: Models.${parameter.schema.$ref.replace('#/components/schemas/', '')}, `;
             }
             else {
-                parameters += `${this.toFirstLetterLowercase(parameter.name)}: ${this.getNativeType(parameter.schema)}, `;
+                const nativeType = this.getNativeType(parameter.schema);
+                const nullable = !parameter.required ? '?' : '';
+                parameters += `${this.toFirstLetterLowercase(parameter.name)}${nullable}: ${nativeType}, `;
             }
         });
         if (parameters.length > 2)
@@ -123,8 +128,13 @@ ${MODEL_POST}`, { flag: 'w' });
         let parameters = `?`;
         filteredParameters.forEach(parameter => {
             if (parameter.schema.$ref != null) {
-                this.parametrizeObject(parameter.schema.$ref);
-                //parameters += `${parameter.name}: ${parameter.schema.$ref.replace('#/components/schemas/', '')}&`;
+                if (this.isEnum(parameter.schema.$ref) != null) {
+                    parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `}&`;
+                    ;
+                }
+                else {
+                    throw new Error("retrieveQueryParameters unmanaged parameter.schema.$ref");
+                }
             }
             else {
                 parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `}&`;
@@ -138,7 +148,7 @@ ${MODEL_POST}`, { flag: 'w' });
         if (swaggerMethodInfo.responses[200] == null)
             return 'void';
         if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null)
-            return `Models.${swaggerMethodInfo.responses[200]?.content[contentType].schema.$ref.replace('#/components/schemas/', '')}`;
+            return `Models.${this.getObjectName(swaggerMethodInfo.responses[200]?.content[contentType].schema.$ref)}`;
         if (swaggerMethodInfo.responses[200]?.content[contentType].schema.type != null)
             return this.getNativeType(swaggerMethodInfo.responses[200]?.content[contentType].schema);
         console.error("unmanaged swaggerMethodInfo", swaggerMethodInfo);
@@ -149,7 +159,7 @@ ${MODEL_POST}`, { flag: 'w' });
             return swaggerComponentProperty.$ref.replace('#/components/schemas/', '');
         if (swaggerComponentProperty.type != null && swaggerComponentProperty.type == 'array')
             if (swaggerComponentProperty.items.$ref != null)
-                return `${swaggerComponentProperty.items.$ref.replace('#/components/schemas/', '')}[]`;
+                return `${this.getObjectName(swaggerComponentProperty.items.$ref)}[]`;
             else
                 return this.getNativeType(swaggerComponentProperty);
         if (swaggerComponentProperty.type != null)
@@ -160,12 +170,19 @@ ${MODEL_POST}`, { flag: 'w' });
         throw new Error("unmanaged swaggerMethodInfo");
     }
     parametrizeObject(objectName) {
-        let component = this._swagger.components.schemas[objectName.replace('#/components/schemas/', '')];
+        let component = this._swagger.components.schemas[this.getObjectName(objectName)];
         if (component == null || component.properties == null)
             return ``;
         console.debug(component.properties);
         return ``;
     }
+    isEnum(objectName) {
+        let component = this._swagger.components.schemas[this.getObjectName(objectName)];
+        return component.enum != null;
+    }
+    getObjectName(ref) {
+        return ref.replace('#/components/schemas/', '');
+    }
     retrieveObjectContent(name, swaggerComponent) {
         if (swaggerComponent.type == 'object')
             return this.retrieveObjectProperties(swaggerComponent);

package/package.json

@@ -1,24 +1,24 @@
-{
-  "name": "@devlearning/swagger-generator",
-  "version": "0.0.15",
-  "description": "",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "dev": "ts-node --esm ./src/index.ts http://localhost:5208/swagger/v1/swagger.json autogeneration/output",
-    "deploy": "npx tsc && npm publish"
-  },
-  "bin": {
-    "swgen": "./dist/index.js"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/node": "^18.15.0",
-    "node-fetch": "^3.3.2",
-    "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.1.6"
-  }
+{
+  "name": "@devlearning/swagger-generator",
+  "version": "0.0.17",
+  "description": "",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "dev": "ts-node --esm ./src/index.ts http://localhost:5208/swagger/v1/swagger.json autogeneration/output",
+    "deploy": "npx tsc && npm publish"
+  },
+  "bin": {
+    "swgen": "./dist/index.js"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^18.15.0",
+    "node-fetch": "^3.3.2",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.1.6"
+  }
 }