Skip to content

Commit 07c98cf

Browse files
ferdikoomenferdikoomen
committed
- Modernized setup and using typescript for test files
1 parent cfdbe48 commit 07c98cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+767
-775
lines changed

‎.babelrc.js‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.eslintignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dist
2+
test/generated
3+
test/e2e/generated
4+
node_modules

‎.eslintrc.json‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
{
22
"parser": "@typescript-eslint/parser",
3-
"extends": [
4-
"plugin:@typescript-eslint/recommended",
5-
"plugin:prettier/recommended",
6-
"prettier"
7-
],
3+
"extends": ["plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", "prettier"],
84
"env": {
95
"es6": true,
106
"node": true,
117
"jest": true
128
},
13-
"plugins": [
14-
"simple-import-sort"
15-
],
9+
"plugins": ["simple-import-sort"],
1610
"rules": {
1711
"@typescript-eslint/no-explicit-any": 0,
1812
"@typescript-eslint/no-inferrable-types": 0,

‎babel.config.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"targets": {
7+
"node": true
8+
}
9+
}
10+
],
11+
[
12+
"@babel/preset-typescript",
13+
{
14+
"onlyRemoveTypeImports": true
15+
}
16+
]
17+
]
18+
}

‎jest.config.js‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎jest.config.ts‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import type { Config } from '@jest/types';
2+
3+
const config: Config.InitialOptions = {
4+
projects: [
5+
{
6+
displayName: 'UNIT',
7+
testEnvironment: 'node',
8+
testMatch: ['<rootDir>/src/**/*.spec.ts', '<rootDir>/test/index.spec.ts'],
9+
moduleFileExtensions: ['js', 'ts', 'd.ts'],
10+
moduleNameMapper: {
11+
'\\.hbs$': '<rootDir>/src/templates/__mocks__/index.ts',
12+
},
13+
},
14+
{
15+
displayName: 'E2E',
16+
testEnvironment: 'node',
17+
testMatch: [
18+
'<rootDir>/test/e2e/v2.fetch.spec.ts',
19+
'<rootDir>/test/e2e/v2.xhr.spec.ts',
20+
'<rootDir>/test/e2e/v2.node.spec.ts',
21+
'<rootDir>/test/e2e/v2.axios.spec.ts',
22+
'<rootDir>/test/e2e/v2.babel.spec.ts',
23+
'<rootDir>/test/e2e/v3.fetch.spec.ts',
24+
'<rootDir>/test/e2e/v3.xhr.spec.ts',
25+
'<rootDir>/test/e2e/v3.node.spec.ts',
26+
'<rootDir>/test/e2e/v3.axios.spec.ts',
27+
'<rootDir>/test/e2e/v3.babel.spec.ts',
28+
],
29+
},
30+
],
31+
collectCoverageFrom: ['<rootDir>/src/**/*.ts', '!<rootDir>/src/**/*.d.ts', '!<rootDir>/bin', '!<rootDir>/dist'],
32+
};
33+
34+
export default config;

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
"keywords": [
1616
"openapi",
1717
"swagger",
18-
"codegen",
1918
"generator",
20-
"client",
2119
"typescript",
2220
"yaml",
2321
"json",
2422
"fetch",
2523
"xhr",
24+
"axios",
2625
"node"
2726
],
2827
"maintainers": [
@@ -46,16 +45,15 @@
4645
"build": "rollup --config --environment NODE_ENV:development",
4746
"build:watch": "rollup --config --environment NODE_ENV:development --watch",
4847
"release": "rollup --config --environment NODE_ENV:production",
49-
"run": "NODE_ENV=production node ./test/index.js",
48+
"validate": "tsc --project tsconfig.json --noEmit",
49+
"run": "node ./test/index.js",
5050
"test": "jest --selectProjects UNIT",
5151
"test:update": "jest --selectProjects UNIT --updateSnapshot",
5252
"test:watch": "jest --selectProjects UNIT --watch",
5353
"test:coverage": "jest --selectProjects UNIT --coverage",
5454
"test:e2e": "jest --selectProjects E2E --runInBand",
55-
"eslint": "eslint \"./src/**/*.ts\" \"./bin/index.js\" \"./types/index.d.ts\"",
56-
"eslint:fix": "eslint \"./src/**/*.ts\" \"./bin/index.js\" \"./types/index.d.ts\" --fix",
57-
"prettier": "prettier \"./src/**/*.ts\" \"./bin/index.js\" \"./types/index.d.ts\" --check",
58-
"prettier:fix": "prettier \"./src/**/*.ts\" \"./bin/index.js\" \"./types/index.d.ts\" --write",
55+
"eslint": "eslint .",
56+
"eslint:fix": "eslint . --fix",
5957
"prepublishOnly": "yarn run clean && yarn run release",
6058
"codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b"
6159
},
@@ -68,17 +66,17 @@
6866
"form-data": "^4.0.0",
6967
"handlebars": "^4.7.6",
7068
"json-schema-ref-parser": "^9.0.7",
71-
"mkdirp": "^1.0.4",
72-
"node-fetch": "^2.6.5",
73-
"rimraf": "^3.0.2"
69+
"node-fetch": "^2.6.6"
7470
},
7571
"devDependencies": {
7672
"@babel/cli": "7.16.7",
7773
"@babel/core": "7.16.7",
7874
"@babel/preset-env": "7.16.7",
7975
"@babel/preset-typescript": "7.16.7",
76+
"@rollup/plugin-alias": "3.1.9",
8077
"@rollup/plugin-commonjs": "21.0.1",
8178
"@rollup/plugin-node-resolve": "13.1.3",
79+
"@rollup/plugin-typescript": "8.3.0",
8280
"@types/express": "4.17.13",
8381
"@types/glob": "7.2.0",
8482
"@types/jest": "27.4.0",
@@ -98,9 +96,11 @@
9896
"prettier": "2.5.1",
9997
"puppeteer": "13.0.1",
10098
"qs": "6.10.2",
99+
"rimraf": "^3.0.2",
101100
"rollup": "2.63.0",
101+
"rollup-plugin-node-externals": "3.1.2",
102102
"rollup-plugin-terser": "7.0.2",
103-
"rollup-plugin-typescript2": "0.31.1",
103+
"ts-node": "10.4.0",
104104
"tslib": "2.3.1",
105105
"typescript": "4.5.4"
106106
}

‎rollup.config.js‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
'use strict';
2-
3-
const commonjs = require('@rollup/plugin-commonjs');
4-
const { nodeResolve } = require('@rollup/plugin-node-resolve');
5-
const { terser } = require('rollup-plugin-terser');
6-
const typescript = require('rollup-plugin-typescript2');
7-
const handlebars = require('handlebars');
8-
const path = require('path');
9-
const fs = require('fs');
10-
11-
const pkg = require('./package.json');
12-
const external = Object.keys(pkg.dependencies);
1+
import alias from '@rollup/plugin-alias';
2+
import commonjs from '@rollup/plugin-commonjs';
3+
import { nodeResolve } from '@rollup/plugin-node-resolve';
4+
import typescript from '@rollup/plugin-typescript';
5+
import { readFileSync } from 'fs';
6+
import { precompile } from 'handlebars';
7+
import { dirname, extname, resolve } from 'path';
8+
import externals from 'rollup-plugin-node-externals';
9+
import { terser } from 'rollup-plugin-terser';
1310

1411
/**
1512
* Custom plugin to parse handlebar imports and precompile
@@ -18,15 +15,15 @@ const external = Object.keys(pkg.dependencies);
1815
*/
1916
const handlebarsPlugin = () => ({
2017
resolveId: (file, importer) => {
21-
if (path.extname(file) === '.hbs') {
22-
return path.resolve(path.dirname(importer), file);
18+
if (extname(file) === '.hbs') {
19+
return resolve(dirname(importer), file);
2320
}
2421
return null;
2522
},
26-
load: (file) => {
27-
if (path.extname(file) === '.hbs') {
28-
const template = fs.readFileSync(file, 'utf8').toString().trim();
29-
const templateSpec = handlebars.precompile(template, {
23+
load: file => {
24+
if (extname(file) === '.hbs') {
25+
const template = readFileSync(file, 'utf8').toString().trim();
26+
const templateSpec = precompile(template, {
3027
strict: true,
3128
noEscape: true,
3229
preventIndent: true,
@@ -38,43 +35,45 @@ const handlebarsPlugin = () => ({
3835
union: true,
3936
intersection: true,
4037
enumerator: true,
41-
escapeQuotes: true,
4238
},
4339
});
4440
return `export default ${templateSpec};`;
4541
}
4642
return null;
47-
}
43+
},
4844
});
4945

5046
const getPlugins = () => {
5147
const plugins = [
52-
handlebarsPlugin(),
53-
typescript(),
48+
externals({
49+
deps: true,
50+
}),
5451
nodeResolve(),
55-
commonjs(),
56-
]
52+
commonjs({
53+
sourceMap: false,
54+
}),
55+
handlebarsPlugin(),
56+
typescript({
57+
module: 'esnext',
58+
}),
59+
alias({
60+
entries: {
61+
handlebars: 'handlebars/lib/handlebars.runtime',
62+
},
63+
}),
64+
];
5765
if (process.env.NODE_ENV === 'development') {
5866
return plugins;
5967
}
6068
return [...plugins, terser()];
6169
};
6270

63-
module.exports = {
71+
export default {
6472
input: './src/index.ts',
6573
output: {
74+
exports: 'named',
6675
file: './dist/index.js',
6776
format: 'cjs',
6877
},
69-
external: [
70-
'fs',
71-
'os',
72-
'util',
73-
'path',
74-
'http',
75-
'https',
76-
'handlebars/runtime',
77-
...external,
78-
],
7978
plugins: getPlugins(),
8079
};

‎src/index.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as OpenAPI from './index';
1+
import OpenAPI from './index';
22

33
describe('index', () => {
44
it('parses v2 without issues', async () => {

‎src/index.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,8 @@ export async function generate({
108108
}
109109
}
110110
}
111+
112+
export default {
113+
HttpClient,
114+
generate,
115+
};

0 commit comments

Comments
 (0)