@devlearning/swagger-generator 1.0.3 → 1.0.5

package/dist/generators-writers/nextjs/api-nextjs-writer.js

@@ -59,11 +59,11 @@ ${preparation}const response = await axios.${method}<${returnTypeString}>(\`${ap
     _queryParametersPreparationStatement(parameter) {
         if (parameter.nullable) {
             if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-                return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined && isValid(${parameter.name}) ? encodeURIComponent(dateToZulu(${parameter.name})) : '';
+                return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined && isValid(${parameter.name}) ? encodeURIComponent(dateToZulu(${parameter.name})) : '';
 `;
             }
             else {
-                return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined ? encodeURIComponent('' + ${parameter.name}) : '';
+                return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined ? encodeURIComponent('' + ${parameter.name}) : '';
 `;
             }
         }

package/package.json

@@ -1,19 +1,25 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "1.0.3",
-  "description": "",
+  "version": "1.0.5",
+  "description": "Swagger generator apis and models for Angular and NextJS",
   "main": "index.js",
   "type": "module",
   "scripts": {
     "dev": "ts-node --esm ./src/index.ts http://localhost:7550/swagger/ApiGateway/swagger.json autogeneration/output",
-    "debug-angular": "npx tsx src/index.ts http://localhost:5208/swagger/v1/swagger.json autogeneration/output angular moment",
-    "debug-nextjs": "npx tsx src/index.ts http://localhost:5208/swagger/v1/swagger.json autogeneration/output next date-fns",
+    "debug-angular": "npx tsx src/index.ts http://localhost:7550/swagger/ApiGateway/swagger.json autogeneration/output angular moment",
+    "debug-nextjs": "npx tsx src/index.ts http://localhost:7550/swagger/ApiGateway/swagger.json autogeneration/output next date-fns",
     "deploy": "npx tsc && npm publish"
   },
   "bin": {
     "swgen": "./dist/index.js"
   },
-  "keywords": [],
+  "keywords": [
+    "swagger",
+    "angular",
+    "nextjs",
+    "api",
+    "generator"
+  ],
   "author": "",
   "license": "ISC",
   "dependencies": {

package/src/generator.ts

@@ -67,7 +67,7 @@ export class Generator {
     this._barApis.start(Object.getOwnPropertyNames(this._swagger.paths).length, 0);
     for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
       const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
-      this._barApis.update(index, { message: `Elaborando api... ${apiName}` });
+      this._barApis.update(index, { message: `Apis parsing... ${apiName}` });
       const apiSwaggerMethodKey = this._swagger.paths[apiName];
       const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
       const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
@@ -108,7 +108,7 @@ export class Generator {
       let parametersRefType = apiSwaggerMethod.parameters?.filter(x => x.in == 'query' && x.schema?.$ref != null).map(x => x.schema.$ref.replace('#/components/schemas/', ''))
       if (parametersRefType) {
         usedTypes = usedTypes.concat(parametersRefType);
-        this._barModels.update(index, { message: `Elaborando model... ${usedTypes}` });
+        this._barModels.update(index, { message: `Models parsing... ${usedTypes}` });
 
         if (apiSwaggerMethod.responses[200].content[contentTypeApplicationJson]?.schema.$ref != null) {
           usedTypes.push(apiSwaggerMethod.responses[200].content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', ''));
@@ -170,7 +170,7 @@ export class Generator {
   }
 
   generateApi() {
-    this._barApis.update(this._apis.length, { message: `Inizio scrittura api...` });
+    this._barApis.update(this._apis.length, { message: `Api generating...` });
 
     if (this._outputFormat == 'angular') {
       const apiWriter = new ApiAngularWriter(this._outputDirectory);
@@ -180,14 +180,14 @@ export class Generator {
       apiWriter.write(this._apis);
     }
 
-    this._barApis.update(this._apis.length, { message: `Scrittura api completata` });
+    this._barApis.update(this._apis.length, { message: `Api gerated` });
 
     this._barApis.stop();
   }
 
 
   generateModel() {
-    this._barModels.update(this._apis.length, { message: `Inizio scrittura model...` });
+    this._barModels.update(this._apis.length, { message: `Model generation...` });
 
     if (this._outputFormat == 'angular') {
       const apiWriter = new ModelAngularWriter(this._outputDirectory);
@@ -197,7 +197,7 @@ export class Generator {
       apiWriter.write(this._models);
     }
 
-    this._barModels.update(this._apis.length, { message: `Scrittura model completata` });
+    this._barModels.update(this._apis.length, { message: `Model generated` });
 
     this._barModels.stop();
   }

package/src/generators-writers/angular/api-angular-writer.ts

@@ -51,7 +51,8 @@ export class ApiAngularWriter {
     let parametersString = '';
 
     api.parameters.forEach(parameter => {
-      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${parameter.typeName}, `;
+      const prefixType = parameter.isEnum || !parameter.isNativeType ? 'Models.' : '';
+      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${prefixType}${parameter.typeName}, `;
     });
 
     if (api.parameters.length > 0)
@@ -61,7 +62,8 @@ export class ApiAngularWriter {
   }
 
   private _returnType(api: ApiDto) {
-    return api.returnType ? api.returnType.typeName : 'any';
+    const prefixType = !api.returnType?.isNativeType ? 'Models.' : '';
+    return api.returnType ? `${prefixType}${api.returnType.typeName}` : 'any';
   }
 
   private _queryParametersPreparation(api: ApiDto) {

package/src/generators-writers/nextjs/api-nextjs-writer.ts

@@ -80,10 +80,10 @@ ${preparation}const response = await axios.${method}<${returnTypeString}>(\`${ap
   private _queryParametersPreparationStatement(parameter: ParameterDto) {
     if (parameter.nullable) {
       if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-        return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined && isValid(${parameter.name}) ? encodeURIComponent(dateToZulu(${parameter.name})) : '';
+        return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined && isValid(${parameter.name}) ? encodeURIComponent(dateToZulu(${parameter.name})) : '';
 `;
       } else {
-        return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined ? encodeURIComponent('' + ${parameter.name}) : '';
+        return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined ? encodeURIComponent('' + ${parameter.name}) : '';
 `;
       }
     } else {