@devlearning/swagger-generator 1.0.8 → 1.0.10

package/autogeneration/output/api.autogenerated.ts

@@ -0,0 +1,50 @@
+import { HttpClient } from '@angular/common/http';
+import { Observable, catchError, map } from 'rxjs';
+import * as Models from './model.autogenerated';
+import { HttpHeaders } from "@angular/common/http";
+
+export const httpOptions = {
+  headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
+};
+
+export const httpOptionsMultipart = {};
+
+export abstract class ApiAutogeneratedService {
+  constructor(
+    public _http: HttpClient,
+    public _baseUrl: string,
+  ) { }
+
+  protected abstract _momentToString(moment: moment.Moment): string;
+  protected abstract _handleRequest<T>(request: T): T;
+  protected abstract _handleMultipart<T>(request: T): FormData;
+  protected abstract _handleResponse<T>(response: T): T;
+  protected abstract _handleError(error: any, obs: any): Observable<never>;
+
+
+  public catalog_Product_Read(idProduct?: number): Observable<Models.Product> {
+    let idProductParam: string = idProduct != null && idProduct != undefined ? encodeURIComponent('' + idProduct) : '';
+      return this._http.get<Models.Product>(`${this._baseUrl}/catalog/Product/Read?idProduct=${idProductParam}`, httpOptions)
+      .pipe(
+        map(x => this._handleResponse(x)),
+        catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
+      );
+  }
+
+  public catalog_Product_List(): Observable<Models.Product[]> {
+    return this._http.get<Models.Product[]>(`${this._baseUrl}/catalog/Product/List`, httpOptions)
+      .pipe(
+        map(x => this._handleResponse(x)),
+        catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
+      );
+  }
+
+  public tenant_Tenant(): Observable<string> {
+    return this._http.get<string>(`${this._baseUrl}/tenant/Tenant`, httpOptions)
+      .pipe(
+        map(x => this._handleResponse(x)),
+        catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
+      );
+  }
+
+}

package/autogeneration/output/model.autogenerated.ts

@@ -0,0 +1,10 @@
+import * as moment from 'moment';
+  
+  
+export class Product {
+  idProduct?: string;
+  name?: string;
+  quantity?: number;
+}
+
+  

package/dist/generator.js

@@ -44,7 +44,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];
@@ -78,7 +78,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/', ''));
                 }
@@ -127,7 +127,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);
             apiWriter.write(this._apis);
@@ -136,11 +136,11 @@ export class Generator {
             const apiWriter = new ApiNextJsWriter(this._outputDirectory);
             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);
             apiWriter.write(this._models);
@@ -149,7 +149,7 @@ export class Generator {
             const apiWriter = new ModelNextJsWriter(this._outputDirectory);
             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();
     }
     computeParameters(apiName, swaggerMethod) {

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

@@ -37,14 +37,16 @@ export class ApiAngularWriter {
     _parameters(api) {
         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)
             parametersString = parametersString.substring(0, parametersString.length - 2);
         return parametersString;
     }
     _returnType(api) {
-        return api.returnType ? api.returnType.typeName : 'any';
+        const prefixType = !api.returnType?.isNativeType ? 'Models.' : '';
+        return api.returnType ? `${prefixType}${api.returnType.typeName}` : 'any';
     }
     _queryParametersPreparation(api) {
         let queryParametersPreparation = '';

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@devlearning/swagger-generator",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "description": "Swagger generator apis and models for Angular and NextJS",
     "main": "index.js",
     "type": "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Swagger generator apis and models for Angular and NextJS",
   "main": "index.js",
   "type": "module",

package/src/generator.ts

@@ -15,7 +15,6 @@ import { ModelNextJsWriter } from './generators-writers/nextjs/model-nextjs-writ
 import { ModelAngularWriter } from './generators-writers/angular/model-angular-writer.js';
 import { PropertyDto } from './models/property-dto.js';
 import { EnumValueDto } from './models/enum-value-dto.js';
-import pkg from '../package.json' assert { type: 'json' };
 
 const contentTypeApplicationJson = 'application/json';
 const contentTypeMultipartFormData = 'multipart/form-data';
@@ -53,8 +52,6 @@ export class Generator {
   }
 
   generate() {
-    console.info(`%c[Swagger API Generator] Version ${pkg.version}`, 'color: #4CAF50; font-weight: bold;');
-
     console.info('%c[Swagger API Generator] %cStarting to parse Swagger JSON file...', 'color: #4CAF50; font-weight: bold;', 'color: #2196F3;');
 
     this.computeApi();

package/tsconfig.json

@@ -1,10 +1,9 @@
 {
   "compilerOptions": {
     "target": "ES2022",
-    "module": "NodeNext",
+    "module": "ES2022",
     "baseUrl": "./src",
     "moduleResolution": "NodeNext",
-    "resolveJsonModule": true,
     "paths": {
       "@src/*": [
         "*"

package/dist/models/swagger-component-property.js

@@ -1 +0,0 @@
-export {};

package/dist/models/swagger-component.js

@@ -1 +0,0 @@
-export {};

package/dist/models/swagger-content.js

@@ -1 +0,0 @@
-export {};

package/dist/models/swagger-info.js

@@ -1 +0,0 @@
-export {};

package/dist/models/swagger-method.js

@@ -1 +0,0 @@
-export {};

package/dist/models/swagger-schema.js

@@ -1 +0,0 @@
-export {};

package/dist/models/swagger.js

@@ -1 +0,0 @@
-export {};