Merge commit 'ecc65e3da08a8c9041089f751d27b9e405a02c99' into custom-templates

Author: josh-hemphill

Dockerfile

@@ -0,0 +1,7 @@
+FROM node:alpine
+WORKDIR /usr/src/openapi
+COPY . /usr/src/openapi
+RUN npm install
+RUN npm run release
+ENTRYPOINT [ "node", "/usr/src/openapi/bin/index.js" ]
+CMD "--help"

README.md

@@ -17,6 +17,7 @@ To release a new version, run `npm run release` and push everything, including t
 [![NPM][npm-image]][npm-url]
 [![License][license-image]][license-url]
 [![Coverage][coverage-image]][coverage-url]
+[![Coverage][coverage-image]][coverage-url]
 [![Downloads][downloads-image]][downloads-url]
 [![Build][build-image]][build-url]
 
@@ -71,6 +72,21 @@ $ openapi --help
     $ openapi --input ./spec.json --output ./generated --client xhr
 ```
 
+## Docker usage
+
+To build the Docker container, execute the following command:
+
+```
+docker build . --tag openapi-typescript-codegen
+```
+
+After this is done, you can execute the CLI commands:
+
+```
+docker run openapi-typescript-codegen --help
+docker run openapi-typescript-codegen --input sample.yaml --output client
+```
+
 Documentation
 ===
 - [Basic usage](docs/basic-usage.md)

package.json

@@ -56,7 +56,8 @@
         "eslint": "eslint .",
         "eslint:fix": "eslint . --fix",
         "prepublishOnly": "npm run clean && npm run release",
-        "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b"
+        "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b",
+        "docker": "docker build -t eeelenbaas/openapi-typescript-codegen ."
     },
     "dependencies": {
         "camelcase": "^6.3.0",

src/openApi/v3/parser/getModels.ts

@@ -15,6 +15,19 @@ export const getModels = (openApi: OpenApi): Model[] => {
                 models.push(model);
             }
         }
+        for (const definitionName in openApi.components.parameters) {
+            if (openApi.components.parameters.hasOwnProperty(definitionName)) {
+                const definition = openApi.components.parameters[definitionName];
+                const definitionType = getType(definitionName);
+                const schema = definition.schema;
+                if (schema) {
+                    const model = getModel(openApi, schema, true, definitionType.base.replace(reservedWords, '_$1'));
+                    model.description = definition.description || null;
+                    model.deprecated = definition.deprecated;
+                    models.push(model);
+                }
+            }
+        }
     }
     return models;
 };

src/openApi/v3/parser/getOperationParameterName.spec.ts

@@ -13,5 +13,7 @@ describe('getOperationParameterName', () => {
         expect(getOperationParameterName('123.foo.bar')).toEqual('fooBar');
         expect(getOperationParameterName('Foo-Bar')).toEqual('fooBar');
         expect(getOperationParameterName('FOO-BAR')).toEqual('fooBar');
+        expect(getOperationParameterName('foo[bar]')).toEqual('fooBar');
+        expect(getOperationParameterName('foo.bar[]')).toEqual('fooBarArray');
     });
 });

src/openApi/v3/parser/getOperationParameterName.ts

@@ -9,6 +9,7 @@ import { reservedWords } from '../../../utils/reservedWords';
 export const getOperationParameterName = (value: string): string => {
     const clean = value
         .replace(/^[^a-zA-Z]+/g, '')
+        .replace('[]', 'Array')
         .replace(/[^\w\-]+/g, '-')
         .trim();
     return camelCase(clean).replace(reservedWords, '_$1');

src/templates/core/OpenAPI.hbs

@@ -10,11 +10,11 @@ export type OpenAPIConfig = {
 	VERSION: string;
 	WITH_CREDENTIALS: boolean;
 	CREDENTIALS: 'include' | 'omit' | 'same-origin';
-	TOKEN?: string | Resolver<string>;
-	USERNAME?: string | Resolver<string>;
-	PASSWORD?: string | Resolver<string>;
-	HEADERS?: Headers | Resolver<Headers>;
-	ENCODE_PATH?: (path: string) => string;
+	TOKEN?: string | Resolver<string> | undefined;
+	USERNAME?: string | Resolver<string> | undefined;
+	PASSWORD?: string | Resolver<string> | undefined;
+	HEADERS?: Headers | Resolver<Headers> | undefined;
+	ENCODE_PATH?: ((path: string) => string) | undefined;
 };
 
 export const OpenAPI: OpenAPIConfig = {

src/templates/core/angular/getHeaders.hbs

@@ -1,4 +1,4 @@
-const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {
+export const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {
 	return forkJoin({
 		token: resolve(options, config.TOKEN),
 		username: resolve(options, config.USERNAME),

src/templates/core/angular/getRequestBody.hbs

@@ -1,4 +1,4 @@
-const getRequestBody = (options: ApiRequestOptions): any => {
+export const getRequestBody = (options: ApiRequestOptions): any => {
 	if (options.body) {
 		if (options.mediaType?.includes('/json')) {
 			return JSON.stringify(options.body)

src/templates/core/angular/getResponseBody.hbs

@@ -1,4 +1,4 @@
-const getResponseBody = <T>(response: HttpResponse<T>): T | undefined => {
+export const getResponseBody = <T>(response: HttpResponse<T>): T | undefined => {
 	if (response.status !== 204 && response.body !== null) {
 		return response.body;
 	}