Merge branch 'develop' into main

Author: ProtocolNebula

changelog.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [2.1.1] - 2021-01-03
+
+### Added
+- Now `-v` is available as parameter as `--version` alias.
+
+### Changed
+- Auto-generated types (parameters, request body, ... without explicit declaration) forced to to CapitalCase (UpperCamelCase).
+> Please check and update your code after generate the template.
+
+### Fixed
+- "Native" types previously was generating a new model in parameters or other cases.
+
 ## [2.1.0] - 2021-01-02
 
 ### Changed

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@protocolnebula/ts-openapi-generator",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Build API and models from Swagger/OpenAPI to use in any project type",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",

package.json

@@ -1,6 +1,7 @@
 import * as yargs from 'yargs';
 
 export const argumentsInstance = yargs
+  .alias('version', 'v')
   .usage('Usage: $0 [options]')
   // .command('count', 'Count the lines in a file')
   .example(

src/services/arguments.service.ts

@@ -1,4 +1,4 @@
-import { camel } from 'case';
+import { capital } from 'case';
 import { OpenAPIV3 } from 'openapi-types';
 import { ModelAttributessModel } from '../../../models/model-attributes.model';
 import { ModelModel } from '../../../models/model.model';
@@ -95,7 +95,7 @@ export abstract class ParserBaseService {
         const parameter = new ModelAttributessModel(rawParameter.name);
         parameter.typeURI = this.parseSchema(
           rawParameter.schema,
-          camel(`${defaultName} ${rawParameter.name}`),
+          capital(`${defaultName} ${rawParameter.name}`, '', true),
         )?.typeURI;
         parameter.description = rawParameter.description;
         parameter.deprecated = rawParameter.deprecated;
@@ -125,17 +125,18 @@ export abstract class ParserBaseService {
       instance.typeURI = schema.$ref;
       return instance;
     } else if (this.isSchemaObject(schema)) {
-      if (mediaType === 'text/html') {
-        const instance = new ModelAttributessModel(null);
-        instance.typeURI = schema.type;
-        return instance;
-      }
       if (schema.type === 'array') {
         const instance = this.parseSchema(schema.items, defaultName, mediaType);
         instance.isArray = true;
         return instance;
       }
 
+      if (mediaType === 'text/html' || schema?.type !== 'object') {
+        const instance = new ModelAttributessModel(null);
+        instance.typeURI = schema.type;
+        return instance;
+      }
+
       const newModel = new ModelModel(defaultName);
       newModel.addAttributes(this.parseAttributes(schema));
       this.store.models.add(newModel);

src/services/parsers/open-api-v3/parser-base.service.ts

@@ -1,4 +1,4 @@
-import { camel } from 'case';
+import { capital } from 'case';
 import { ApiModel } from '../models/api.model';
 import { PhysycalFile } from '../models/entities';
 import { Store } from '../stores/entities.store';
@@ -65,5 +65,5 @@ export function getApiDefaultModelName(
   api: ApiModel,
   modelFor: string = 'request',
 ): string {
-  return camel(`${api.verb.toLowerCase()} ${api.name} ${modelFor}`);
+  return capital(`${api.verb.toLowerCase()} ${api.name} ${modelFor}`, '', true);
 }