Merge branch 'master' into feature/generate-client-instance

Author: lub0v-parsable

package.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.12.2",
+    "version": "0.12.5",
     "description": "Library that generates Typescript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",
@@ -63,7 +63,7 @@
         "@types/node-fetch": "^2.5.12",
         "abort-controller": "^3.0.0",
         "axios": "^0.24.0",
-        "camelcase": "^6.2.0",
+        "camelcase": "^6.2.1",
         "commander": "^8.3.0",
         "cross-blob": "^2.0.1",
         "form-data": "^4.0.0",
@@ -76,33 +76,33 @@
     "devDependencies": {
         "@babel/cli": "7.16.0",
         "@babel/core": "7.16.0",
-        "@babel/preset-env": "7.16.0",
+        "@babel/preset-env": "7.16.4",
         "@babel/preset-typescript": "7.16.0",
         "@rollup/plugin-commonjs": "21.0.1",
         "@rollup/plugin-node-resolve": "13.0.6",
         "@types/express": "4.17.13",
         "@types/glob": "7.2.0",
-        "@types/jest": "27.0.2",
-        "@types/node": "16.11.7",
+        "@types/jest": "27.0.3",
+        "@types/node": "16.11.11",
         "@types/qs": "6.9.7",
-        "@typescript-eslint/eslint-plugin": "5.3.1",
-        "@typescript-eslint/parser": "5.3.1",
+        "@typescript-eslint/eslint-plugin": "5.5.0",
+        "@typescript-eslint/parser": "5.5.0",
         "codecov": "3.8.3",
-        "eslint": "8.2.0",
+        "eslint": "8.3.0",
         "eslint-config-prettier": "8.3.0",
         "eslint-plugin-prettier": "4.0.0",
         "eslint-plugin-simple-import-sort": "7.0.0",
         "express": "4.17.1",
         "glob": "7.2.0",
-        "jest": "27.3.1",
-        "jest-cli": "27.3.1",
-        "prettier": "2.4.1",
-        "puppeteer": "11.0.0",
+        "jest": "27.4.3",
+        "jest-cli": "27.4.3",
+        "prettier": "2.5.0",
+        "puppeteer": "12.0.1",
         "qs": "6.10.1",
-        "rollup": "2.59.0",
+        "rollup": "2.60.2",
         "rollup-plugin-terser": "7.0.2",
-        "rollup-plugin-typescript2": "0.30.0",
+        "rollup-plugin-typescript2": "0.31.1",
         "tslib": "2.3.1",
-        "typescript": "4.4.4"
+        "typescript": "4.5.2"
     }
 }

rollup.config.js

@@ -38,6 +38,7 @@ const handlebarsPlugin = () => ({
                     union: true,
                     intersection: true,
                     enumerator: true,
+                    escapeQuotes: true,
                 },
             });
             return `export default ${templateSpec};`;

src/openApi/v2/parser/getMappedType.spec.ts

@@ -2,7 +2,6 @@ import { getMappedType } from './getMappedType';
 
 describe('getMappedType', () => {
     it('should map types to the basics', () => {
-        expect(getMappedType('File')).toEqual('binary');
         expect(getMappedType('file')).toEqual('binary');
         expect(getMappedType('string')).toEqual('string');
         expect(getMappedType('date')).toEqual('string');

src/openApi/v2/parser/getMappedType.ts

@@ -1,5 +1,4 @@
 const TYPE_MAPPINGS = new Map<string, string>([
-    ['File', 'binary'],
     ['file', 'binary'],
     ['any', 'any'],
     ['object', 'any'],

src/openApi/v2/parser/getModelComposition.ts

@@ -59,6 +59,9 @@ export function getModelComposition(
         modelProperties.forEach(modelProperty => {
             composition.imports.push(...modelProperty.imports);
             composition.enums.push(...modelProperty.enums);
+            if (modelProperty.export === 'enum') {
+                composition.enums.push(modelProperty);
+            }
         });
         properties.push(...modelProperties);
     }

src/openApi/v2/parser/getServer.ts

@@ -8,5 +8,6 @@ export function getServer(openApi: OpenApi): string {
     const scheme = openApi.schemes?.[0] || 'http';
     const host = openApi.host;
     const basePath = openApi.basePath || '';
-    return host ? `${scheme}://${host}${basePath}` : basePath;
+    const url = host ? `${scheme}://${host}${basePath}` : basePath;
+    return url.replace(/\/$/g, '');
 }

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

@@ -2,7 +2,6 @@ import { getMappedType } from './getMappedType';
 
 describe('getMappedType', () => {
     it('should map types to the basics', () => {
-        expect(getMappedType('File')).toEqual('binary');
         expect(getMappedType('file')).toEqual('binary');
         expect(getMappedType('string')).toEqual('string');
         expect(getMappedType('date')).toEqual('string');

src/openApi/v3/parser/getMappedType.ts

@@ -1,5 +1,4 @@
 const TYPE_MAPPINGS = new Map<string, string>([
-    ['File', 'binary'],
     ['file', 'binary'],
     ['any', 'any'],
     ['object', 'any'],

src/openApi/v3/parser/getModel.ts

@@ -165,7 +165,7 @@ export function getModel(
         model.default = getModelDefault(definition, model);
 
         if (definition.properties) {
-            const modelProperties = getModelProperties(openApi, definition, getModel);
+            const modelProperties = getModelProperties(openApi, definition, getModel, model);
             modelProperties.forEach(modelProperty => {
                 model.imports.push(...modelProperty.imports);
                 model.enums.push(...modelProperty.enums);
@@ -185,7 +185,7 @@ export function getModel(
         model.type = definitionType.type;
         model.base = definitionType.base;
         model.template = definitionType.template;
-        model.isNullable = definitionType.isNullable;
+        model.isNullable = definitionType.isNullable || model.isNullable;
         model.imports.push(...definitionType.imports);
         model.default = getModelDefault(definition, model);
         return model;

src/openApi/v3/parser/getModelComposition.ts

@@ -59,6 +59,9 @@ export function getModelComposition(
         modelProperties.forEach(modelProperty => {
             composition.imports.push(...modelProperty.imports);
             composition.enums.push(...modelProperty.enums);
+            if (modelProperty.export === 'enum') {
+                composition.enums.push(modelProperty);
+            }
         });
         properties.push(...modelProperties);
     }