@devlearning/swagger-generator 1.0.11 → 1.0.12

package/autogeneration/output/api.autogenerated.ts

@@ -22,7 +22,7 @@ export abstract class ApiAutogeneratedService {
   protected abstract _handleError(error: any, obs: any): Observable<never>;
 
 
-  public catalog_Product_Read(idProduct?: number): Observable<Models.Product> {
+  public catalogProductRead(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(
@@ -31,7 +31,7 @@ export abstract class ApiAutogeneratedService {
       );
   }
 
-  public catalog_Product_List(): Observable<Models.Product[]> {
+  public catalogProductList(): Observable<Models.Product[]> {
     return this._http.get<Models.Product[]>(`${this._baseUrl}/catalog/Product/List`, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),
@@ -39,52 +39,52 @@ export abstract class ApiAutogeneratedService {
       );
   }
 
-  public identiy_token(request: Models.AuthTokenCommand): Observable<Models.AuthenticationToken> {
+  public identityToken(request: Models.AuthTokenCommand): Observable<Models.AuthenticationToken> {
     let wrappedRequest = this._handleRequest(request);
-    return this._http.post<Models.AuthenticationToken>(`${this._baseUrl}/identiy/token`, wrappedRequest, httpOptions)
+    return this._http.post<Models.AuthenticationToken>(`${this._baseUrl}/identity/token`, wrappedRequest, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),
         catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
       );
   }
 
-  public identiy_refreshToken(request: Models.AuthRefreshTokenCommand): Observable<Models.AuthenticationToken> {
+  public identityRefreshToken(request: Models.AuthRefreshTokenCommand): Observable<Models.AuthenticationToken> {
     let wrappedRequest = this._handleRequest(request);
-    return this._http.post<Models.AuthenticationToken>(`${this._baseUrl}/identiy/refreshToken`, wrappedRequest, httpOptions)
+    return this._http.post<Models.AuthenticationToken>(`${this._baseUrl}/identity/refreshToken`, wrappedRequest, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),
         catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
       );
   }
 
-  public identiy_generateResetPasswordCode(request: Models.AuthGenerateResetPasswordCodeCommand): Observable<Models.Result> {
+  public identityGenerateResetPasswordCode(request: Models.AuthGenerateResetPasswordCodeCommand): Observable<Models.Result> {
     let wrappedRequest = this._handleRequest(request);
-    return this._http.post<Models.Result>(`${this._baseUrl}/identiy/generateResetPasswordCode`, wrappedRequest, httpOptions)
+    return this._http.post<Models.Result>(`${this._baseUrl}/identity/generateResetPasswordCode`, wrappedRequest, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),
         catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
       );
   }
 
-  public identiy_resetPassword(request: Models.AuthResetPasswordCommand): Observable<Models.Result> {
+  public identityResetPassword(request: Models.AuthResetPasswordCommand): Observable<Models.Result> {
     let wrappedRequest = this._handleRequest(request);
-    return this._http.post<Models.Result>(`${this._baseUrl}/identiy/resetPassword`, wrappedRequest, httpOptions)
+    return this._http.post<Models.Result>(`${this._baseUrl}/identity/resetPassword`, wrappedRequest, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),
         catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
       );
   }
 
-  public identiy_verifyResetPasswordCode(request: Models.AuthVerifyResetPasswordCodeCommand): Observable<Models.Result> {
+  public identityVerifyResetPasswordCode(request: Models.AuthVerifyResetPasswordCodeCommand): Observable<Models.Result> {
     let wrappedRequest = this._handleRequest(request);
-    return this._http.post<Models.Result>(`${this._baseUrl}/identiy/verifyResetPasswordCode`, wrappedRequest, httpOptions)
+    return this._http.post<Models.Result>(`${this._baseUrl}/identity/verifyResetPasswordCode`, wrappedRequest, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),
         catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
       );
   }
 
-  public tenant_Tenant(): Observable<string> {
+  public tenantTenant(): Observable<string> {
     return this._http.get<string>(`${this._baseUrl}/tenant/Tenant`, httpOptions)
       .pipe(
         map(x => this._handleResponse(x)),

package/autogeneration/output/model.autogenerated.ts

@@ -38,10 +38,10 @@ export class AuthVerifyResetPasswordCodeCommand {
 
 export class AuthenticationToken {
   idAuthUser: string;
-  username?: string;
-  accessToken?: string;
+  username: string;
+  accessToken: string;
   expiresIn: number;
-  refreshToken?: string;
+  refreshToken: string;
   refreshTokenExpiresIn: number;
 }
 

package/dist/generators-writers/utils.js

@@ -4,7 +4,10 @@ export class Utils {
         if (normalizedApiName.charAt(0) == '_') {
             normalizedApiName = normalizedApiName.slice(1);
         }
-        return this.toFirstLetterLowercase(normalizedApiName);
+        normalizedApiName = this.toCamelCase(normalizedApiName);
+        normalizedApiName = this.toFirstLetterLowercase(normalizedApiName);
+        normalizedApiName = normalizedApiName.replaceAll('_', '');
+        return normalizedApiName;
     }
     static toFirstLetterLowercase(value) {
         return value.charAt(0).toLowerCase() + value.slice(1);

package/package.json

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

package/src/generators-writers/utils.ts

@@ -8,7 +8,14 @@ export class Utils {
     if (normalizedApiName.charAt(0) == '_') {
       normalizedApiName = normalizedApiName.slice(1);
     }
-    return this.toFirstLetterLowercase(normalizedApiName);
+
+    normalizedApiName = this.toCamelCase(normalizedApiName);
+
+    normalizedApiName = this.toFirstLetterLowercase(normalizedApiName);
+
+    normalizedApiName = normalizedApiName.replaceAll('_', '');
+
+    return normalizedApiName;
   }
 
   public static toFirstLetterLowercase(value: string) {