@devlearning/swagger-generator 0.0.37 → 0.0.39

package/README.md

@@ -2,4 +2,6 @@ Add task on package.json
 
 "swgen": "swgen http://localhost:5208/swagger/v1/swagger.json src/app/core/autogenerated"
 
-specify url of your swagger.json and path destination of generated files (in this example you must create path core/autogenerated)
+this generation work with momentjs
+
+specify url of your swagger.json and path destination of generated files (in this example you must create path core/autogenerated)

package/autogeneration/output/api.autogenerated.ts

@@ -16,7 +16,7 @@ export abstract class ApiAutogeneratedService {
   protected abstract _handleError(error: any, obs: any): Observable<never>;
 
 
-  public _catalog_Product(): Observable<string> {
+  public catalog_Product(): Observable<string> {
     return this._http.get<string>(`${this._baseUrl}/catalog/Product`, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),
@@ -24,7 +24,7 @@ export abstract class ApiAutogeneratedService {
       );
   }
 
-  public _tenant_Tenant(): Observable<string> {
+  public tenant_Tenant(): Observable<string> {
     return this._http.get<string>(`${this._baseUrl}/tenant/Tenant`, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),

package/dist/api.constants.js

@@ -1,7 +1,13 @@
 export const API_PRE = `import { HttpClient } from '@angular/common/http';
 import { Observable, catchError, map } from 'rxjs';
-import { httpOptions, httpOptionsMultipart } from 'src/app/core/utils/http-options';
 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(

package/dist/generator.js

@@ -40,7 +40,7 @@ export class Generator {
             }
             apiMethods +=
                 `
-  public ${apiName.replace('/api/v{version}/', '').replaceAll('/', '_')}(${parametersString}): Observable<${returnTypeString}> {
+  public ${this.getApiNameNormalized(apiName)}(${parametersString}): Observable<${returnTypeString}> {
     ${queryParametersDeclaration}${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
       .pipe(
         map(x => this._handleResponse(x)),
@@ -118,7 +118,7 @@ export ${type} ${modelName} {${content}
             const method = Object.getOwnPropertyNames(swaggerMethod)[0];
             const swaggerMethodInfo = swaggerMethod[method];
             let type = 'class';
-            let modelName = this.getModelNameByApi(apiName);
+            let modelName = this.getApiNameNormalized(apiName);
             let content = this.retrieveSchemaProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema);
             models +=
                 `
@@ -132,7 +132,7 @@ ${MODEL_POST}`, { flag: 'w' });
     }
     retrieveParameters(swaggerMethodInfo, apiName) {
         if (swaggerMethodInfo.requestBody != null && swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData] != null) {
-            var modelName = this.getModelNameByApi(apiName);
+            var modelName = this.getApiNameNormalized(apiName);
             return `request: Models.${modelName}`;
         }
         else {
@@ -378,8 +378,12 @@ ${MODEL_POST}`, { flag: 'w' });
             throw new Error("unmanaged schema");
         }
     }
-    getModelNameByApi(apiName) {
-        return apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+    getApiNameNormalized(apiName) {
+        let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+        if (normalizedApiName.charAt(0) == '_') {
+            normalizedApiName = normalizedApiName.slice(1);
+        }
+        return this.toFirstLetterLowercase(normalizedApiName);
     }
     toFirstLetterLowercase(value) {
         return value.charAt(0).toLowerCase() + value.slice(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/api.constants.ts

@@ -1,8 +1,14 @@
 export const API_PRE =
     `import { HttpClient } from '@angular/common/http';
 import { Observable, catchError, map } from 'rxjs';
-import { httpOptions, httpOptionsMultipart } from 'src/app/core/utils/http-options';
 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(

package/src/generator.ts

@@ -51,7 +51,7 @@ export class Generator {
 
       apiMethods +=
         `
-  public ${apiName.replace('/api/v{version}/', '').replaceAll('/', '_')}(${parametersString}): Observable<${returnTypeString}> {
+  public ${this.getApiNameNormalized(apiName)}(${parametersString}): Observable<${returnTypeString}> {
     ${queryParametersDeclaration}${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
       .pipe(
         map(x => this._handleResponse(x)),
@@ -143,7 +143,7 @@ export ${type} ${modelName} {${content}
 }
 `;
       }
-      
+
     }
 
     usedMultiPart.forEach(apiName => {
@@ -152,7 +152,7 @@ export ${type} ${modelName} {${content}
       const swaggerMethodInfo = swaggerMethod[method];
 
       let type = 'class';
-      let modelName = this.getModelNameByApi(apiName);
+      let modelName = this.getApiNameNormalized(apiName);
       let content = this.retrieveSchemaProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema);
       models +=
         `
@@ -170,7 +170,7 @@ ${MODEL_POST}`,
 
   retrieveParameters(swaggerMethodInfo: SwaggerMethod, apiName: string) {
     if (swaggerMethodInfo.requestBody != null && swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData] != null) {
-      var modelName = this.getModelNameByApi(apiName);
+      var modelName = this.getApiNameNormalized(apiName);
       return `request: Models.${modelName}`;
     } else {
       if (swaggerMethodInfo.requestBody != null) {
@@ -433,8 +433,13 @@ ${MODEL_POST}`,
     }
   }
 
-  getModelNameByApi(apiName: string) {
-    return apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+  getApiNameNormalized(apiName: string) {
+    let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+
+    if (normalizedApiName.charAt(0) == '_') {
+      normalizedApiName = normalizedApiName.slice(1);
+    }
+    return this.toFirstLetterLowercase(normalizedApiName);
   }
 
   toFirstLetterLowercase(value: string) {