@devlearning/swagger-generator 1.1.2 → 1.1.3

package/dist/generator.d.ts

@@ -31,6 +31,7 @@ export declare class Generator {
     isDate(schema: SwaggerSchema): boolean;
     getObjectName(ref: string): string;
     retrieveComponentProperties(swaggerComponent: SwaggerComponent): PropertyDto[];
+    retrieveSchemaProperties(schema: SwaggerSchema): PropertyDto[];
     retrieveEnumValues(name: string, swaggerCopmponent: SwaggerComponent): EnumValueDto[];
     retrieveNestedObjects(usedTypes: TypeDto[]): void;
     retrieveNestedObjectsRecursive(swaggerComponent: SwaggerComponent, usedTypes: TypeDto[]): void;

package/dist/generator.js

@@ -68,32 +68,41 @@ export class Generator {
         this._barModels.start(Object.getOwnPropertyNames(this._swagger.paths).length, 0);
         let usedTypes = [];
         let usedMultiPart = [];
-        // for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
-        //   const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
-        //   const apiSwaggerMethodKey = this._swagger.paths[apiName];
-        //   const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
-        //   const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
-        //   const 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);
-        //   }
-        //   const responseRefType = this.computeRequestBodyType(apiSwaggerMethod!);
-        //   if (responseRefType && !responseRefType.isVoid && !responseRefType.isNativeType) {
-        //     usedTypes = usedTypes.concat(responseRefType.typeName);
-        //   }
-        //   const contentRefType = this.computeResponseType(apiSwaggerMethod!);
-        //   if (contentRefType && !contentRefType.isVoid && !contentRefType.isNativeType) {
-        //     usedTypes = usedTypes.concat(contentRefType.typeName);
-        //   }
-        // }
+        for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
+            const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
+            const apiSwaggerMethodKey = this._swagger.paths[apiName];
+            const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
+            const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
+            //   const 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);
+            //   }
+            //   const responseRefType = this.computeRequestBodyType(apiSwaggerMethod!);
+            //   if (responseRefType && !responseRefType.isVoid && !responseRefType.isNativeType) {
+            //     usedTypes = usedTypes.concat(responseRefType.typeName);
+            //   }
+            //   const contentRefType = this.computeResponseType(apiSwaggerMethod!);
+            //   if (contentRefType && !contentRefType.isVoid && !contentRefType.isNativeType) {
+            //     usedTypes = usedTypes.concat(contentRefType.typeName);
+            //   }
+            if (apiSwaggerMethod.requestBody?.content[contentTypeMultipartFormData]?.schema != null) {
+                usedMultiPart.push(apiName);
+            }
+        }
         for (let index = 0; index < this._apis.length; index++) {
             if (this._apis[index].returnType && this._apis[index].returnType.isTypeReference) {
                 usedTypes.push(this._apis[index].returnType);
+                // if (this._apis[index].returnType!.typeName.startsWith("hotac_")) {
+                //   debugger
+                // }
             }
             if (this._apis[index].parameters) {
                 this._apis[index].parameters.forEach(parameter => {
                     if (parameter.isTypeReference) {
                         usedTypes.push(parameter);
+                        // if (parameter.typeName.startsWith("hotac_")) {
+                        //   debugger
+                        // }
                     }
                 });
             }
@@ -121,14 +130,14 @@ export class Generator {
             const swaggerMethod = this._swagger.paths[apiName];
             const method = Object.getOwnPropertyNames(swaggerMethod)[0];
             const swaggerMethodInfo = swaggerMethod[method];
-            throw new Error(`MultiPart FormData is not supported yet for ${apiName} - ${method}.`);
-            // this._models.push({
-            //   typeName: this.getApiNameNormalized(apiName),
-            //   modelType: 'class',
-            //   name: this.getApiNameNormalized(apiName),
-            //   properties: this.retrieveComponentProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema),
-            //   enumValues: [],
-            // });
+            const schema = swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema;
+            this._models.push({
+                typeName: this.getApiNameNormalized(apiName),
+                modelType: 'class',
+                name: this.getApiNameNormalized(apiName),
+                properties: this.retrieveSchemaProperties(schema),
+                enumValues: [],
+            });
         });
     }
     generateApi() {
@@ -401,17 +410,22 @@ export class Generator {
         }
         return properties;
     }
-    // retrieveSchemaProperties(schema: SwaggerSchema) {
-    //   if (schema.properties == null) return [];
-    //   let properties: PropertyDto[] = [];
-    //   for (let j = 0; j < Object.getOwnPropertyNames(schema.properties).length; j++) {
-    //     let propertyName = Object.getOwnPropertyNames(schema.properties)[j];
-    //     properties +=
-    //       `
-    // ${this.toFirstLetterLowercase(propertyName)}: ${this.retrieveType(schema.properties[propertyName])} | undefined;`
-    //   }
-    //   return properties;
-    // }
+    retrieveSchemaProperties(schema) {
+        if (schema.properties == null)
+            return [];
+        let properties = [];
+        for (let index = 0; index < Object.getOwnPropertyNames(schema.properties).length; index++) {
+            const propertyName = Object.getOwnPropertyNames(schema.properties)[index];
+            const property = schema.properties[propertyName];
+            const type = this.retrieveType(property);
+            properties.push({
+                ...type,
+                name: propertyName,
+                nullable: type.nullable,
+            });
+        }
+        return properties;
+    }
     retrieveEnumValues(name, swaggerCopmponent) {
         if (swaggerCopmponent.enum == null)
             return [];
@@ -432,14 +446,16 @@ export class Generator {
     retrieveNestedObjects(usedTypes) {
         for (let i = 0; i < usedTypes.length; i++) {
             const swaggerCopmponent = this._swagger.components.schemas[usedTypes[i].typeName];
+            if (!swaggerCopmponent)
+                continue;
             this.retrieveNestedObjectsRecursive(swaggerCopmponent, usedTypes);
         }
     }
     retrieveNestedObjectsRecursive(swaggerComponent, usedTypes) {
-        try {
-            if (!swaggerComponent.properties)
-                return;
-            for (let j = 0; j < Object.getOwnPropertyNames(swaggerComponent.properties).length; j++) {
+        if (!swaggerComponent.properties)
+            return;
+        for (let j = 0; j < Object.getOwnPropertyNames(swaggerComponent.properties).length; j++) {
+            try {
                 const propertyName = Object.getOwnPropertyNames(swaggerComponent.properties)[j];
                 let nestedUsedType = '';
                 if (!swaggerComponent.properties[propertyName])
@@ -468,9 +484,9 @@ export class Generator {
                     this.retrieveNestedObjectsRecursive(nested, usedTypes);
                 }
             }
-        }
-        catch (error) {
-            debugger;
+            catch (error) {
+                debugger;
+            }
         }
     }
     getNativeType(schema) {
@@ -515,7 +531,7 @@ export class Generator {
         if (normalizedApiName.charAt(0) == '_') {
             normalizedApiName = normalizedApiName.slice(1);
         }
-        return this.toFirstLetterLowercase(normalizedApiName);
+        return normalizedApiName;
     }
     toFirstLetterLowercase(value) {
         return value.charAt(0).toLowerCase() + value.slice(1);

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

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import { API_POST, API_PRE } from './constants.js';
 import { Utils } from '../utils.js';
+import { Normalizator } from './normalizator.js';
 export class ApiAngularWriter {
     _outputDirectory;
     constructor(_outputDirectory) {
@@ -14,7 +15,7 @@ export class ApiAngularWriter {
         this._writeFile(apiString);
     }
     _apiString(api) {
-        let apiNameNormalized = Utils.getNormalizedApiPath(api.name);
+        let apiNameNormalized = Utils.getNormalizedApiPathAngular(api.name);
         let parametersString = this._parameters(api);
         let queryParametersPreparation = this._queryParametersPreparation(api);
         let requestPreparation = this._requestPreparation(api);
@@ -22,7 +23,7 @@ export class ApiAngularWriter {
         let returnTypeString = this._returnType(api);
         let haveRequest = api.haveRequest;
         let method = api.method.toLowerCase();
-        let httpOptions = api.isMultiPart ? 'httpOptionsMultiPart' : 'httpOptions';
+        let httpOptions = api.isMultiPart ? 'httpOptionsMultipart' : 'httpOptions';
         let apiString = `
   public ${apiNameNormalized}(${parametersString}): Observable<${returnTypeString}> {
     ${queryParametersPreparation}${requestPreparation}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
@@ -37,8 +38,10 @@ export class ApiAngularWriter {
     _parameters(api) {
         let parametersString = '';
         api.parameters.forEach(parameter => {
+            const libraryDate = 'moment.Moment';
             const prefixType = parameter.isEnum || !parameter.isNativeType ? 'Models.' : '';
-            parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${prefixType}${parameter.typeName}, `;
+            const typeName = parameter.typeName === 'dateTime' ? libraryDate : `${prefixType}${Normalizator.mapTsTypeToAngular(parameter.typeName)}`;
+            parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${typeName}, `;
         });
         if (api.parameters.length > 0)
             parametersString = parametersString.substring(0, parametersString.length - 2);
@@ -47,7 +50,7 @@ export class ApiAngularWriter {
     _returnType(api) {
         const prefixType = !api.returnType?.isNativeType ? 'Models.' : '';
         const isArray = api.returnType?.isArray ? '[]' : '';
-        return api.returnType ? `${prefixType}${api.returnType.typeName}${isArray}` : 'any';
+        return api.returnType ? `${prefixType}${Normalizator.mapTsTypeToAngular(api.returnType.typeName)}${isArray}` : 'any';
     }
     _queryParametersPreparation(api) {
         let queryParametersPreparation = '';

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

@@ -1,5 +1,7 @@
 import fs from 'fs';
 import { MODEL_POST, MODEL_PRE } from './constants.js';
+import { Normalizator } from './normalizator.js';
+import { Utils } from '../utils.js';
 export class ModelAngularWriter {
     _outputDirectory;
     constructor(_outputDirectory) {
@@ -14,7 +16,7 @@ export class ModelAngularWriter {
     }
     _modelString(model) {
         let modelString = `
-export ${model.modelType} ${model.name} {
+export ${model.modelType} ${Utils.toPascalCase(model.name)} {
 ${this._properties(model)}${this._enumValues(model)}
 }
 `;
@@ -25,8 +27,9 @@ ${this._properties(model)}${this._enumValues(model)}
         model.properties.forEach(property => {
             //const libraryDate = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date'
             const libraryDate = 'moment.Moment';
-            const typeName = property.typeName === 'dateTime' ? libraryDate : property.typeName;
-            propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName};\n`;
+            const isArray = property.isArray ? '[]' : '';
+            const typeName = property.typeName === 'dateTime' ? libraryDate : Normalizator.mapTsTypeToAngular(property.typeName);
+            propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName}${isArray};\n`;
         });
         return propertiesString.trimEnd();
     }

package/dist/generators-writers/angular/normalizator.d.ts

@@ -0,0 +1,3 @@
+export declare class Normalizator {
+    static mapTsTypeToAngular(type: string): string;
+}

package/dist/generators-writers/angular/normalizator.js

@@ -0,0 +1,37 @@
+import { Utils } from "../utils.js";
+export class Normalizator {
+    static mapTsTypeToAngular(type) {
+        const normalized = type.trim().toLowerCase();
+        if (normalized.endsWith("[]")) {
+            const inner = normalized.slice(0, -2).trim();
+            return `${Normalizator.mapTsTypeToAngular(inner)}[]`;
+        }
+        switch (normalized) {
+            case "string":
+            case "uuid":
+                return "string";
+            case "date":
+            case "datetime":
+                return "datetime";
+            case "number":
+            case "float":
+            case "double":
+            case "integer":
+            case "int":
+            case "long":
+                return "number";
+            case "boolean":
+            case "bool":
+                return "boolean";
+            case "any":
+            case "object":
+                return "any";
+            case "null":
+                return "null";
+            case "undefined":
+                return "undefined";
+            default:
+                return Utils.toPascalCase(type);
+        }
+    }
+}

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

@@ -49,7 +49,7 @@ export class ApiDartWriter {
                 else {
                     responseType = Utils.toDartClassName(responseType) ?? responseType;
                 }
-                var methodName = Utils.getNormalizedApiPath(api.name);
+                var methodName = Utils.getNormalizedApiPathDart(api.name);
                 if (methodName.startsWith(Utils.toFirstLetterLowercase(tag))) {
                     methodName = methodName.slice(tag.length);
                     methodName = Utils.toFirstLetterLowercase(methodName);

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

@@ -14,7 +14,7 @@ export class ApiNextJsWriter {
         this._writeFile(apiString);
     }
     _apiString(api) {
-        let apiNameNormalized = Utils.toCamelCase(Utils.getNormalizedApiPath(api.name));
+        let apiNameNormalized = Utils.toCamelCase(Utils.getNormalizedApiPathDart(api.name));
         let parametersString = this._parameters(api);
         let queryParametersPreparation = this._queryParametersPreparation(api);
         let requestPreparation = this._requestPreparation(api);

package/dist/generators-writers/utils.d.ts

@@ -1,6 +1,7 @@
 import { SwaggerSchema } from "@src/models/swagger/swagger-schema.js";
 export declare class Utils {
-    static getNormalizedApiPath(apiName: string): string;
+    static getNormalizedApiPathAngular(apiName: string): string;
+    static getNormalizedApiPathDart(apiName: string): string;
     static toFirstLetterLowercase(value: string): string;
     static toCamelCase(input: string): string;
     static toPascalCase(input: string): string;

package/dist/generators-writers/utils.js

@@ -1,7 +1,15 @@
 import fs from 'fs';
 import path from 'path';
 export class Utils {
-    static getNormalizedApiPath(apiName) {
+    static getNormalizedApiPathAngular(apiName) {
+        let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+        if (normalizedApiName.charAt(0) == '_') {
+            normalizedApiName = normalizedApiName.slice(1);
+        }
+        normalizedApiName = normalizedApiName.replaceAll('/', '_');
+        return normalizedApiName;
+    }
+    static getNormalizedApiPathDart(apiName) {
         let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
         if (normalizedApiName.charAt(0) == '_') {
             normalizedApiName = normalizedApiName.slice(1);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Swagger generator apis and models for Angular and NextJS",
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "debug-angular": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogeneration/output --target angular --dateTimeLibrary moment",
+    "debug-angular": "npx tsx src/index.ts --url http://localhost:5208/swagger/v1/swagger.json --output autogeneration/output --target angular --dateTimeLibrary moment",
     "debug-nextjs": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogeneration/output --target next --dateTimeLibrary date-fns",
     "debug-flutter": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogen --target flutter --package coqudo_app",
     "copy-templates": "copyfiles -u 3 \"src/generators-writers/dart/templates/**/*\" dist/generators-writers/dart",

package/src/generator.ts

@@ -96,37 +96,47 @@ export class Generator {
     let usedTypes: TypeDto[] = [];
     let usedMultiPart: string[] = [];
 
-    // for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
-    //   const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
-    //   const apiSwaggerMethodKey = this._swagger.paths[apiName];
-    //   const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
-    //   const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
-
-    //   const 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);
-    //   }
-
-    //   const responseRefType = this.computeRequestBodyType(apiSwaggerMethod!);
-    //   if (responseRefType && !responseRefType.isVoid && !responseRefType.isNativeType) {
-    //     usedTypes = usedTypes.concat(responseRefType.typeName);
-    //   }
-
-    //   const contentRefType = this.computeResponseType(apiSwaggerMethod!);
-    //   if (contentRefType && !contentRefType.isVoid && !contentRefType.isNativeType) {
-    //     usedTypes = usedTypes.concat(contentRefType.typeName);
-    //   }
-    // }
+    for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
+      const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
+      const apiSwaggerMethodKey = this._swagger.paths[apiName];
+      const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
+      const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
+
+      //   const 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);
+      //   }
+
+      //   const responseRefType = this.computeRequestBodyType(apiSwaggerMethod!);
+      //   if (responseRefType && !responseRefType.isVoid && !responseRefType.isNativeType) {
+      //     usedTypes = usedTypes.concat(responseRefType.typeName);
+      //   }
+
+      //   const contentRefType = this.computeResponseType(apiSwaggerMethod!);
+      //   if (contentRefType && !contentRefType.isVoid && !contentRefType.isNativeType) {
+      //     usedTypes = usedTypes.concat(contentRefType.typeName);
+      //   }
+
+      if (apiSwaggerMethod.requestBody?.content[contentTypeMultipartFormData]?.schema != null) {
+        usedMultiPart.push(apiName);
+      }
+    }
 
     for (let index = 0; index < this._apis.length; index++) {
       if (this._apis[index].returnType && this._apis[index].returnType!.isTypeReference) {
         usedTypes.push(this._apis[index].returnType!);
+        // if (this._apis[index].returnType!.typeName.startsWith("hotac_")) {
+        //   debugger
+        // }
       }
 
       if (this._apis[index].parameters) {
         this._apis[index].parameters.forEach(parameter => {
           if (parameter.isTypeReference) {
             usedTypes.push(parameter);
+            // if (parameter.typeName.startsWith("hotac_")) {
+            //   debugger
+            // }
           }
         });
       }
@@ -162,15 +172,15 @@ export class Generator {
       const swaggerMethod = this._swagger.paths[apiName];
       const method = Object.getOwnPropertyNames(swaggerMethod)[0];
       const swaggerMethodInfo = swaggerMethod[method];
-
-      throw new Error(`MultiPart FormData is not supported yet for ${apiName} - ${method}.`);
-      // this._models.push({
-      //   typeName: this.getApiNameNormalized(apiName),
-      //   modelType: 'class',
-      //   name: this.getApiNameNormalized(apiName),
-      //   properties: this.retrieveComponentProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema),
-      //   enumValues: [],
-      // });
+      const schema = swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema;
+
+      this._models.push({
+        typeName: this.getApiNameNormalized(apiName),
+        modelType: 'class',
+        name: this.getApiNameNormalized(apiName),
+        properties: this.retrieveSchemaProperties(schema),
+        enumValues: [],
+      });
     });
   }
 
@@ -462,19 +472,24 @@ export class Generator {
     return properties;
   }
 
-  // retrieveSchemaProperties(schema: SwaggerSchema) {
-  //   if (schema.properties == null) return [];
+  retrieveSchemaProperties(schema: SwaggerSchema) {
+    if (schema.properties == null) return [];
 
-  //   let properties: PropertyDto[] = [];
-  //   for (let j = 0; j < Object.getOwnPropertyNames(schema.properties).length; j++) {
-  //     let propertyName = Object.getOwnPropertyNames(schema.properties)[j];
-  //     properties +=
-  //       `
-  // ${this.toFirstLetterLowercase(propertyName)}: ${this.retrieveType(schema.properties[propertyName])} | undefined;`
-  //   }
+    let properties: PropertyDto[] = [];
+    
+    for (let index = 0; index < Object.getOwnPropertyNames(schema.properties).length; index++) {
+      const propertyName = Object.getOwnPropertyNames(schema.properties)[index];
+      const property = schema.properties[propertyName];
+      const type = this.retrieveType(property);
+      properties.push({
+        ...type,
+        name: propertyName,
+        nullable: type.nullable,
+      });
+    }
 
-  //   return properties;
-  // }
+    return properties;
+  }
 
   retrieveEnumValues(name: string, swaggerCopmponent: SwaggerComponent) {
     if (swaggerCopmponent.enum == null) return [];
@@ -498,15 +513,16 @@ export class Generator {
   retrieveNestedObjects(usedTypes: TypeDto[]) {
     for (let i = 0; i < usedTypes.length; i++) {
       const swaggerCopmponent = this._swagger.components.schemas[usedTypes[i].typeName];
+      if (!swaggerCopmponent) continue;
       this.retrieveNestedObjectsRecursive(swaggerCopmponent, usedTypes);
     }
   }
 
   retrieveNestedObjectsRecursive(swaggerComponent: SwaggerComponent, usedTypes: TypeDto[]) {
-    try {
-      if (!swaggerComponent.properties) return;
+    if (!swaggerComponent.properties) return;
 
-      for (let j = 0; j < Object.getOwnPropertyNames(swaggerComponent.properties).length; j++) {
+    for (let j = 0; j < Object.getOwnPropertyNames(swaggerComponent.properties).length; j++) {
+      try {
         const propertyName = Object.getOwnPropertyNames(swaggerComponent.properties)[j];
 
         let nestedUsedType = '';
@@ -535,9 +551,9 @@ export class Generator {
           });
           this.retrieveNestedObjectsRecursive(nested, usedTypes);
         }
+      } catch (error) {
+        debugger
       }
-    } catch (error) {
-      debugger
     }
   }
 
@@ -575,7 +591,7 @@ export class Generator {
     if (normalizedApiName.charAt(0) == '_') {
       normalizedApiName = normalizedApiName.slice(1);
     }
-    return this.toFirstLetterLowercase(normalizedApiName);
+    return normalizedApiName;
   }
 
   toFirstLetterLowercase(value: string) {

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

@@ -3,6 +3,7 @@ import { API_POST, API_PRE } from './constants.js';
 import { ApiDto } from '@src/models/api-dto.js';
 import { Utils } from '../utils.js';
 import { ParameterDto } from '@src/models/parameter-dto.js';
+import { Normalizator } from './normalizator.js';
 
 export class ApiAngularWriter {
   private _outputDirectory: string;
@@ -24,7 +25,8 @@ export class ApiAngularWriter {
 
   private _apiString(api: ApiDto) {
 
-    let apiNameNormalized = Utils.getNormalizedApiPath(api.name);
+    let apiNameNormalized = Utils.getNormalizedApiPathAngular(api.name);
+
     let parametersString = this._parameters(api);
     let queryParametersPreparation = this._queryParametersPreparation(api);
     let requestPreparation = this._requestPreparation(api);
@@ -32,7 +34,7 @@ export class ApiAngularWriter {
     let returnTypeString = this._returnType(api);
     let haveRequest = api.haveRequest;
     let method = api.method.toLowerCase();
-    let httpOptions = api.isMultiPart ? 'httpOptionsMultiPart' : 'httpOptions';
+    let httpOptions = api.isMultiPart ? 'httpOptionsMultipart' : 'httpOptions';
 
     let apiString = `
   public ${apiNameNormalized}(${parametersString}): Observable<${returnTypeString}> {
@@ -51,8 +53,11 @@ export class ApiAngularWriter {
     let parametersString = '';
 
     api.parameters.forEach(parameter => {
+      const libraryDate = 'moment.Moment';
       const prefixType = parameter.isEnum || !parameter.isNativeType ? 'Models.' : '';
-      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${prefixType}${parameter.typeName}, `;
+      const typeName = parameter.typeName === 'dateTime' ? libraryDate : `${prefixType}${Normalizator.mapTsTypeToAngular(parameter.typeName)}`;
+
+      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${typeName}, `;
     });
 
     if (api.parameters.length > 0)
@@ -64,7 +69,7 @@ export class ApiAngularWriter {
   private _returnType(api: ApiDto) {
     const prefixType = !api.returnType?.isNativeType ? 'Models.' : '';
     const isArray = api.returnType?.isArray ? '[]' : '';
-    return api.returnType ? `${prefixType}${api.returnType.typeName}${isArray}` : 'any';
+    return api.returnType ? `${prefixType}${Normalizator.mapTsTypeToAngular(api.returnType.typeName)}${isArray}` : 'any';
   }
 
   private _queryParametersPreparation(api: ApiDto) {

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

@@ -1,6 +1,8 @@
 import fs from 'fs';
 import { MODEL_POST, MODEL_PRE } from './constants.js';
 import { ModelDto } from '@src/models/model-dto.js';
+import { Normalizator } from './normalizator.js';
+import { Utils } from '../utils.js';
 
 export class ModelAngularWriter {
   private _outputDirectory: string;
@@ -22,7 +24,7 @@ export class ModelAngularWriter {
 
   private _modelString(model: ModelDto) {
     let modelString = `
-export ${model.modelType} ${model.name} {
+export ${model.modelType} ${Utils.toPascalCase(model.name)} {
 ${this._properties(model)}${this._enumValues(model)}
 }
 `;
@@ -36,8 +38,9 @@ ${this._properties(model)}${this._enumValues(model)}
     model.properties.forEach(property => {
       //const libraryDate = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date'
       const libraryDate = 'moment.Moment';
-      const typeName = property.typeName === 'dateTime' ? libraryDate : property.typeName;
-      propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName};\n`;
+      const isArray = property.isArray ? '[]' : '';
+      const typeName = property.typeName === 'dateTime' ? libraryDate : Normalizator.mapTsTypeToAngular(property.typeName);
+      propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName}${isArray};\n`;
     });
 
     return propertiesString.trimEnd();

package/src/generators-writers/angular/normalizator.ts

@@ -0,0 +1,42 @@
+import { Utils } from "../utils.js";
+
+export class Normalizator {
+
+  public static mapTsTypeToAngular(type: string): string {
+    const normalized: string = type.trim().toLowerCase();
+
+    if (normalized.endsWith("[]")) {
+      const inner: string = normalized.slice(0, -2).trim();
+      return `${Normalizator.mapTsTypeToAngular(inner)}[]`;
+    }
+
+    switch (normalized) {
+      case "string":
+      case "uuid":
+        return "string";
+      case "date":
+      case "datetime":
+        return "datetime";
+      case "number":
+      case "float":
+      case "double":
+      case "integer":
+      case "int":
+      case "long":
+        return "number";
+      case "boolean":
+      case "bool":
+        return "boolean";
+      case "any":
+      case "object":
+        return "any";
+      case "null":
+        return "null";
+      case "undefined":
+        return "undefined";
+      default:
+        return Utils.toPascalCase(type);
+    }
+  }
+
+}

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

@@ -97,7 +97,7 @@ export class ApiDartWriter {
           responseType = Utils.toDartClassName(responseType) ?? responseType;
         }
 
-        var methodName = Utils.getNormalizedApiPath(api.name);
+        var methodName = Utils.getNormalizedApiPathDart(api.name);
         if (methodName.startsWith(Utils.toFirstLetterLowercase(tag))) {
           methodName = methodName.slice(tag.length);
           methodName = Utils.toFirstLetterLowercase(methodName);

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

@@ -24,7 +24,7 @@ export class ApiNextJsWriter {
 
   private _apiString(api: ApiDto) {
 
-    let apiNameNormalized = Utils.toCamelCase(Utils.getNormalizedApiPath(api.name));
+    let apiNameNormalized = Utils.toCamelCase(Utils.getNormalizedApiPathDart(api.name));
     let parametersString = this._parameters(api);
     let queryParametersPreparation = this._queryParametersPreparation(api);
     let requestPreparation = this._requestPreparation(api);

package/src/generators-writers/utils.ts

@@ -4,7 +4,19 @@ import path from 'path';
 
 export class Utils {
 
-  public static getNormalizedApiPath(apiName: string) {
+  public static getNormalizedApiPathAngular(apiName: string) {
+    let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+
+    if (normalizedApiName.charAt(0) == '_') {
+      normalizedApiName = normalizedApiName.slice(1);
+    }
+
+    normalizedApiName = normalizedApiName.replaceAll('/', '_');
+
+    return normalizedApiName;
+  }
+
+  public static getNormalizedApiPathDart(apiName: string) {
     let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
 
     if (normalizedApiName.charAt(0) == '_') {