Merge branch 'master' of github.com:devTeaa/openapi-typescript-codegen into support-service-request-type

Author: herman-gdn

.babelrc.js

@@ -0,0 +1,4 @@
+dist
+test/generated
+test/e2e/generated
+node_modules

.eslintignore

@@ -1,18 +1,12 @@
 {
     "parser": "@typescript-eslint/parser",
-    "extends": [
-        "plugin:@typescript-eslint/recommended",
-        "plugin:prettier/recommended",
-        "prettier"
-    ],
+    "extends": ["plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", "prettier"],
     "env": {
         "es6": true,
         "node": true,
         "jest": true
     },
-    "plugins": [
-        "simple-import-sort"
-    ],
+    "plugins": ["simple-import-sort"],
     "rules": {
         "@typescript-eslint/no-explicit-any": 0,
         "@typescript-eslint/no-inferrable-types": 0,

.eslintrc.json

@@ -8,7 +8,4 @@ updates:
   open-pull-requests-limit: 10
   ignore:
     - dependency-name: "@types/node-fetch"
-    - dependency-name: "abort-controller"
-    - dependency-name: "cross-blob"
-    - dependency-name: "form-data"
     - dependency-name: "node-fetch"

.github/dependabot.yml

@@ -457,7 +457,6 @@ classes in NodeJS).
 
 ```
 npm install axios --save-dev
-npm install [email protected] --save-dev
 npm install [email protected] --save-dev
 ```
 
@@ -481,7 +480,6 @@ in order to compile and run this client, you might need to install the `node-fet
 ```
 npm install @types/[email protected] --save-dev
 npm install [email protected] --save-dev
-npm install [email protected] --save-dev
 npm install [email protected] --save-dev
 npm install [email protected] --save-dev
 ```

README.md

@@ -0,0 +1,18 @@
+{
+    "presets": [
+        [
+            "@babel/preset-env",
+            {
+                "targets": {
+                    "node": true
+                }
+            }
+        ],
+        [
+            "@babel/preset-typescript",
+            {
+                "onlyRemoveTypeImports": true
+            }
+        ]
+    ]
+}

babel.config.json

@@ -3,7 +3,7 @@
 'use strict';
 
 const path = require('path');
-const program = require('commander');
+const { program } = require('commander');
 const pkg = require('../package.json');
 
 const params = program

bin/index.js

@@ -0,0 +1,34 @@
+import type { Config } from '@jest/types';
+
+const config: Config.InitialOptions = {
+    projects: [
+        {
+            displayName: 'UNIT',
+            testEnvironment: 'node',
+            testMatch: ['<rootDir>/src/**/*.spec.ts', '<rootDir>/test/index.spec.ts'],
+            moduleFileExtensions: ['js', 'ts', 'd.ts'],
+            moduleNameMapper: {
+                '\\.hbs$': '<rootDir>/src/templates/__mocks__/index.ts',
+            },
+        },
+        {
+            displayName: 'E2E',
+            testEnvironment: 'node',
+            testMatch: [
+                '<rootDir>/test/e2e/v2.fetch.spec.ts',
+                '<rootDir>/test/e2e/v2.xhr.spec.ts',
+                '<rootDir>/test/e2e/v2.node.spec.ts',
+                '<rootDir>/test/e2e/v2.axios.spec.ts',
+                '<rootDir>/test/e2e/v2.babel.spec.ts',
+                '<rootDir>/test/e2e/v3.fetch.spec.ts',
+                '<rootDir>/test/e2e/v3.xhr.spec.ts',
+                '<rootDir>/test/e2e/v3.node.spec.ts',
+                '<rootDir>/test/e2e/v3.axios.spec.ts',
+                '<rootDir>/test/e2e/v3.babel.spec.ts',
+            ],
+        },
+    ],
+    collectCoverageFrom: ['<rootDir>/src/**/*.ts', '!<rootDir>/src/**/*.d.ts', '!<rootDir>/bin', '!<rootDir>/dist'],
+};
+
+export default config;

jest.config.js

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.12.5",
+    "version": "0.13.0",
     "description": "Library that generates Typescript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",
@@ -15,14 +15,13 @@
     "keywords": [
         "openapi",
         "swagger",
-        "codegen",
         "generator",
-        "client",
         "typescript",
         "yaml",
         "json",
         "fetch",
         "xhr",
+        "axios",
         "node"
     ],
     "maintainers": [
@@ -46,63 +45,62 @@
         "build": "rollup --config --environment NODE_ENV:development",
         "build:watch": "rollup --config --environment NODE_ENV:development --watch",
         "release": "rollup --config --environment NODE_ENV:production",
-        "run": "NODE_ENV=production node ./test/index.js",
+        "validate": "tsc --project tsconfig.json --noEmit",
+        "run": "node ./test/index.js",
         "test": "jest --selectProjects UNIT",
         "test:update": "jest --selectProjects UNIT --updateSnapshot",
         "test:watch": "jest --selectProjects UNIT --watch",
         "test:coverage": "jest --selectProjects UNIT --coverage",
         "test:e2e": "jest --selectProjects E2E --runInBand",
-        "eslint": "eslint \"./src/**/*.ts\" \"./bin/index.js\" \"./types/index.d.ts\"",
-        "eslint:fix": "eslint \"./src/**/*.ts\" \"./bin/index.js\" \"./types/index.d.ts\" --fix",
-        "prettier": "prettier \"./src/**/*.ts\" \"./bin/index.js\" \"./types/index.d.ts\" --check",
-        "prettier:fix": "prettier \"./src/**/*.ts\" \"./bin/index.js\" \"./types/index.d.ts\" --write",
+        "eslint": "eslint .",
+        "eslint:fix": "eslint . --fix",
         "prepublishOnly": "yarn run clean && yarn run release",
         "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b"
     },
     "dependencies": {
         "@types/node-fetch": "^2.5.12",
         "abort-controller": "^3.0.0",
         "axios": "^0.24.0",
-        "camelcase": "^6.2.1",
+        "camelcase": "^6.3.0",
         "commander": "^8.3.0",
-        "cross-blob": "^2.0.1",
         "form-data": "^4.0.0",
         "handlebars": "^4.7.6",
         "json-schema-ref-parser": "^9.0.7",
-        "mkdirp": "^1.0.4",
-        "node-fetch": "^2.6.5",
-        "rimraf": "^3.0.2"
+        "node-fetch": "^2.6.6"
     },
     "devDependencies": {
-        "@babel/cli": "7.16.0",
-        "@babel/core": "7.16.0",
-        "@babel/preset-env": "7.16.4",
-        "@babel/preset-typescript": "7.16.0",
+        "@babel/cli": "7.16.7",
+        "@babel/core": "7.16.7",
+        "@babel/preset-env": "7.16.7",
+        "@babel/preset-typescript": "7.16.7",
         "@rollup/plugin-commonjs": "21.0.1",
-        "@rollup/plugin-node-resolve": "13.0.6",
+        "@rollup/plugin-node-resolve": "13.1.3",
+        "@rollup/plugin-typescript": "8.3.0",
         "@types/express": "4.17.13",
         "@types/glob": "7.2.0",
-        "@types/jest": "27.0.3",
-        "@types/node": "16.11.11",
+        "@types/jest": "27.4.0",
+        "@types/node": "17.0.8",
         "@types/qs": "6.9.7",
-        "@typescript-eslint/eslint-plugin": "5.5.0",
-        "@typescript-eslint/parser": "5.5.0",
+        "@typescript-eslint/eslint-plugin": "5.9.0",
+        "@typescript-eslint/parser": "5.9.0",
         "codecov": "3.8.3",
-        "eslint": "8.3.0",
+        "eslint": "8.6.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",
+        "express": "4.17.2",
         "glob": "7.2.0",
-        "jest": "27.4.3",
-        "jest-cli": "27.4.3",
-        "prettier": "2.5.0",
-        "puppeteer": "12.0.1",
-        "qs": "6.10.1",
-        "rollup": "2.60.2",
+        "jest": "27.4.7",
+        "jest-cli": "27.4.7",
+        "prettier": "2.5.1",
+        "puppeteer": "13.0.1",
+        "qs": "6.10.2",
+        "rimraf": "^3.0.2",
+        "rollup": "2.63.0",
+        "rollup-plugin-node-externals": "3.1.2",
         "rollup-plugin-terser": "7.0.2",
-        "rollup-plugin-typescript2": "0.31.1",
+        "ts-node": "10.4.0",
         "tslib": "2.3.1",
-        "typescript": "4.5.2"
+        "typescript": "4.5.4"
     }
 }