Skip to content

Commit fd988e8

Browse files
ferdikoomenferdikoomen
committed
- Woking on babel support
- Working on test server - Embedding all templates
1 parent f5ed969 commit fd988e8

Some content is hidden

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

57 files changed

+3571
-891
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ junit.xml
1111
dist
1212
archive
1313
coverage
14+
samples/dist
1415
test/result

‎.prettierignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎bin/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ program
1212
.version(pkg.version)
1313
.requiredOption('-i, --input <value>', 'OpenAPI specification, can be a path, url or string content (required)')
1414
.requiredOption('-o, --output <value>', 'Output directory (required)')
15-
.option('-c, --client <value>', 'HTTP client to generate [fetch, xhr]', 'fetch')
15+
.option('-c, --client <value>', 'HTTP client to generate [fetch, xhr, node]', 'fetch')
1616
.option('--useOptions', 'Use options instead of arguments')
1717
.option('--useUnionTypes', 'Use union types instead of enums')
1818
.option('--exportCore <value>', 'Write core files to disk', true)

‎package.json‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "openapi-typescript-codegen",
3-
"version": "0.4.11",
3+
"version": "0.5.0",
44
"description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
55
"author": "Ferdi Koomen",
66
"homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",
@@ -43,19 +43,20 @@
4343
"src/templates/**/*.ts"
4444
],
4545
"scripts": {
46-
"clean": "rimraf ./dist ./test/result ./coverage ./samples/examples ./node_modules/.cache",
46+
"clean": "rimraf ./dist ./test/generator/dist ./test/server/dist ./coverage ./samples/dist ./node_modules/.cache",
4747
"build": "rollup --config --environment NODE_ENV:development",
4848
"build:watch": "rollup --config --environment NODE_ENV:development --watch",
4949
"release": "rollup --config --environment NODE_ENV:production",
50-
"run": "node ./test/index.js",
50+
"start": "nest start --path ./test/server/tsconfig.json",
51+
"start:watch": "nest start --path ./test/server/tsconfig.json --watch",
5152
"test": "jest",
5253
"test:update": "jest --updateSnapshot",
5354
"test:watch": "jest --watch",
5455
"test:coverage": "jest --coverage",
55-
"eslint": "eslint \"./src/**/*.ts\" \"./bin/index.js\"",
56-
"eslint:fix": "eslint \"./src/**/*.ts\" \"./bin/index.js\" --fix",
57-
"prettier": "prettier \"./src/**/*.ts\" \"./bin/index.js\" --check",
58-
"prettier:fix": "prettier \"./src/**/*.ts\" \"./bin/index.js\" --write",
56+
"eslint": "eslint \"./src/**/*.{js,ts}\" \"./test/**/*.{js,ts}\" \"./bin/index.js\"",
57+
"eslint:fix": "eslint \"./src/**/*.{js,ts}\" \"./test/**/*.{js,ts}\" \"./bin/index.js\" --fix",
58+
"prettier": "prettier \"./src/**/*.{js,ts}\" \"./test/**/*.{js,ts}\" \"./bin/index.js\" --check",
59+
"prettier:fix": "prettier \"./src/**/*.{js,ts}\" \"./test/**/*.{js,ts}\" \"./bin/index.js\" --write",
5960
"prepublish": "yarn run clean && yarn run release",
6061
"codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b"
6162
},
@@ -72,15 +73,25 @@
7273
"@babel/core": "7.11.6",
7374
"@babel/preset-env": "7.11.5",
7475
"@babel/preset-typescript": "7.10.4",
75-
"@rollup/plugin-commonjs": "15.0.0",
76+
"@nestjs/cli": "7.5.1",
77+
"@nestjs/common": "7.4.4",
78+
"@nestjs/core": "7.4.4",
79+
"@nestjs/platform-express": "7.4.4",
80+
"@nestjs/schematics": "7.1.2",
81+
"@nestjs/swagger": "4.6.1",
82+
"@nestjs/testing": "7.4.4",
83+
"@rollup/plugin-commonjs": "15.1.0",
7684
"@rollup/plugin-node-resolve": "9.0.0",
85+
"@types/express": "4.17.8",
7786
"@types/jest": "26.0.14",
7887
"@types/js-yaml": "3.12.5",
7988
"@types/mkdirp": "1.0.1",
80-
"@types/node": "14.11.1",
89+
"@types/node": "14.11.2",
8190
"@types/rimraf": "3.0.0",
82-
"@typescript-eslint/eslint-plugin": "4.1.1",
83-
"@typescript-eslint/parser": "4.1.1",
91+
"@typescript-eslint/eslint-plugin": "4.2.0",
92+
"@typescript-eslint/parser": "4.2.0",
93+
"class-transformer": "0.3.1",
94+
"class-validator": "0.12.2",
8495
"codecov": "3.7.2",
8596
"eslint": "7.9.0",
8697
"eslint-config-prettier": "6.11.0",
@@ -90,9 +101,11 @@
90101
"jest": "26.4.2",
91102
"jest-cli": "26.4.2",
92103
"prettier": "2.1.2",
93-
"rollup": "2.27.1",
104+
"reflect-metadata": "0.1.13",
105+
"rollup": "2.28.1",
94106
"rollup-plugin-terser": "7.0.2",
95107
"rollup-plugin-typescript2": "0.27.2",
108+
"swagger-ui-express": "4.1.4",
96109
"typescript": "4.0.3"
97110
}
98111
}

‎samples/.gitignore‎

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

‎samples/codegen.sh‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
#!/bin/sh
22

33
rm -rf examples
4+
rm swagger-codegen-cli-v2.jar
5+
rm swagger-codegen-cli-v3.jar
46

5-
curl https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.14/swagger-codegen-cli-2.4.14.jar -o swagger-codegen-cli-v2.jar
6-
curl https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.20/swagger-codegen-cli-3.0.20.jar -o swagger-codegen-cli-v3.jar
7+
curl https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.15/swagger-codegen-cli-2.4.15.jar -o swagger-codegen-cli-v2.jar
8+
curl https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.21/swagger-codegen-cli-3.0.21.jar -o swagger-codegen-cli-v3.jar
79

8-
echo v2/typescript-aurelia && time java -jar ./swagger-codegen-cli-v2.jar generate -i v2/spec.json -l typescript-aurelia -o examples/v2/typescript-aurelia/
9-
echo v2/typescript-angular && time java -jar ./swagger-codegen-cli-v2.jar generate -i v2/spec.json -l typescript-angular -o examples/v2/typescript-angular/
10-
echo v2/typescript-inversify && time java -jar ./swagger-codegen-cli-v2.jar generate -i v2/spec.json -l typescript-inversify -o examples/v2/typescript-inversify/
11-
echo v2/typescript-fetch && time java -jar ./swagger-codegen-cli-v2.jar generate -i v2/spec.json -l typescript-fetch -o examples/v2/typescript-fetch/
12-
echo v2/typescript-jquery && time java -jar ./swagger-codegen-cli-v2.jar generate -i v2/spec.json -l typescript-jquery -o examples/v2/typescript-jquery/
13-
echo v2/typescript-node && time java -jar ./swagger-codegen-cli-v2.jar generate -i v2/spec.json -l typescript-node -o examples/v2/typescript-node/
10+
java -jar ./swagger-codegen-cli-v2.jar generate -i spec/v2.json -l typescript-aurelia -o dist/v2/typescript-aurelia/
11+
java -jar ./swagger-codegen-cli-v2.jar generate -i spec/v2.json -l typescript-angular -o dist/v2/typescript-angular/
12+
java -jar ./swagger-codegen-cli-v2.jar generate -i spec/v2.json -l typescript-inversify -o dist/v2/typescript-inversify/
13+
java -jar ./swagger-codegen-cli-v2.jar generate -i spec/v2.json -l typescript-fetch -o dist/v2/typescript-fetch/
14+
java -jar ./swagger-codegen-cli-v2.jar generate -i spec/v2.json -l typescript-jquery -o dist/v2/typescript-jquery/
15+
java -jar ./swagger-codegen-cli-v2.jar generate -i spec/v2.json -l typescript-node -o dist/v2/typescript-node/
1416

15-
echo v3/typescript-angular && time java -jar ./swagger-codegen-cli-v3.jar generate -i v3/spec.json -l typescript-angular -o examples/v3/typescript-angular/
16-
echo v3/typescript-fetch && time java -jar ./swagger-codegen-cli-v3.jar generate -i v3/spec.json -l typescript-fetch -o examples/v3/typescript-fetch/
17+
java -jar ./swagger-codegen-cli-v3.jar generate -i spec/v3.json -l typescript-angular -o dist/v3/typescript-angular/
18+
java -jar ./swagger-codegen-cli-v3.jar generate -i spec/v3.json -l typescript-fetch -o dist/v3/typescript-fetch/
1719

18-
echo v2/openapi-typescript-codegen && time node ../bin/index.js --input v2/spec.json --output examples/v2/openapi-typescript-codegen/
19-
echo v3/openapi-typescript-codegen && time node ../bin/index.js --input v3/spec.json --output examples/v3/openapi-typescript-codegen/
20-
21-
yarn install
22-
yarn run build
20+
node ../bin/index.js --input spec/v2.json --output dist/v2/openapi-typescript-codegen/
21+
node ../bin/index.js --input spec/v3.json --output dist/v3/openapi-typescript-codegen/

‎samples/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,13 @@ <h5>And used the following generators with their default options:</h5>
258258
</tr>
259259
<tr>
260260
<th>Generation time</th>
261-
<td data-type="openapi-typescript-codegen"><span class="badge">0.132s</span></td>
262-
<td data-type="aurelia"><span class="badge">0.715s</span></td>
263-
<td data-type="inversify"><span class="badge">0.788s</span></td>
264-
<td data-type="angular"><span class="badge">1.386s</span></td>
265-
<td data-type="fetch"><span class="badge">1.103s</span></td>
266-
<td data-type="jquery"><span class="badge">0.728s</span></td>
267-
<td data-type="node"><span class="badge">0.752s</span></td>
261+
<td data-type="openapi-typescript-codegen"><span class="badge">0.2s</span></td>
262+
<td data-type="aurelia"><span class="badge">0.7s</span></td>
263+
<td data-type="inversify"><span class="badge">0.7s</span></td>
264+
<td data-type="angular"><span class="badge">1.4s</span></td>
265+
<td data-type="fetch"><span class="badge">1.1s</span></td>
266+
<td data-type="jquery"><span class="badge">0.7s</span></td>
267+
<td data-type="node"><span class="badge">0.7s</span></td>
268268
</tr>
269269
</tbody>
270270
</table>

‎samples/package.json‎

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

samples/v2/spec.json renamed to samples/spec/v2.json

File renamed without changes.

samples/v3/spec.json renamed to samples/spec/v3.json

File renamed without changes.

0 commit comments

Comments
 (0)