Skip to content

Commit ef2590c

Browse files
authored
Merge pull request lukeautry#777 from WoH/master
fix: Remove ts-fmt formatting
2 parents c19d15d + bddc198 commit ef2590c

File tree

3 files changed

+2
-63
lines changed

3 files changed

+2
-63
lines changed

packages/cli/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"minimatch": "^3.0.4",
3838
"moment": "^2.24.0",
3939
"typescript": "^3.9.2",
40-
"typescript-formatter": "^7.2.2",
4140
"validator": "^12.2.0",
4241
"yamljs": "^0.3.0",
4342
"yargs": "^14.0.0"

packages/cli/src/routeGeneration/routeGenerator.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
11
import * as fs from 'fs';
22
import * as handlebars from 'handlebars';
33
import * as path from 'path';
4-
import * as tsfmt from 'typescript-formatter';
54
import { ExtendedRoutesConfig } from '../cli';
65
import { Tsoa, TsoaRoute, assertNever } from '@tsoa/runtime';
76
import { fsReadFile, fsWriteFile } from '../utils/fs';
87
import { isRefType } from '../utils/internalTypeGuards';
98
import { normalisePath } from './../utils/pathUtils';
109

1110
export class RouteGenerator {
12-
private tsfmtConfig = {
13-
editorconfig: true,
14-
replace: true,
15-
tsconfig: {
16-
newLine: 'LF',
17-
},
18-
tsfmt: true,
19-
tslint: false,
20-
verify: true,
21-
vscode: true,
22-
};
23-
2411
constructor(private readonly metadata: Tsoa.Metadata, private readonly options: ExtendedRoutesConfig) {}
2512

2613
public async GenerateRoutes(middlewareTemplate: string, pathTransformer: (path: string) => string) {
@@ -33,8 +20,7 @@ export class RouteGenerator {
3320
const fileName = `${this.options.routesDir}/${this.options.routesFileName || 'routes.ts'}`;
3421
const content = this.buildContent(middlewareTemplate, pathTransformer);
3522

36-
const formatted = await tsfmt.processString(fileName, content, this.tsfmtConfig as any);
37-
await fsWriteFile(fileName, formatted.dest);
23+
await fsWriteFile(fileName, content);
3824
}
3925

4026
public async GenerateCustomRoutes(template: string, pathTransformer: (path: string) => string) {

yarn.lock

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2161,16 +2161,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
21612161
dependencies:
21622162
delayed-stream "~1.0.0"
21632163

2164-
commander@^2.12.1, commander@^2.19.0, commander@^2.20.0, commander@~2.20.0:
2164+
commander@^2.12.1, commander@^2.20.0, commander@~2.20.0:
21652165
version "2.20.0"
21662166
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
21672167
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
21682168

2169-
commandpost@^1.0.0:
2170-
version "1.4.0"
2171-
resolved "https://registry.yarnpkg.com/commandpost/-/commandpost-1.4.0.tgz#89218012089dfc9b67a337ba162f15c88e0f1048"
2172-
integrity sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==
2173-
21742169
compare-func@^1.3.1:
21752170
version "1.3.2"
21762171
resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
@@ -2670,16 +2665,6 @@ ecc-jsbn@~0.1.1:
26702665
jsbn "~0.1.0"
26712666
safer-buffer "^2.1.0"
26722667

2673-
editorconfig@^0.15.0:
2674-
version "0.15.3"
2675-
resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
2676-
integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
2677-
dependencies:
2678-
commander "^2.19.0"
2679-
lru-cache "^4.1.5"
2680-
semver "^5.6.0"
2681-
sigmund "^1.0.1"
2682-
26832668
ee-first@1.1.1:
26842669
version "1.1.1"
26852670
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -4435,14 +4420,6 @@ loud-rejection@^1.0.0:
44354420
currently-unhandled "^0.4.1"
44364421
signal-exit "^3.0.0"
44374422

4438-
lru-cache@^4.1.5:
4439-
version "4.1.5"
4440-
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
4441-
integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
4442-
dependencies:
4443-
pseudomap "^1.0.2"
4444-
yallist "^2.1.2"
4445-
44464423
lru-cache@^5.1.1:
44474424
version "5.1.1"
44484425
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -5530,11 +5507,6 @@ proxy-addr@~2.0.5:
55305507
forwarded "~0.1.2"
55315508
ipaddr.js "1.9.1"
55325509

5533-
pseudomap@^1.0.2:
5534-
version "1.0.2"
5535-
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
5536-
integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
5537-
55385510
psl@^1.1.28:
55395511
version "1.8.0"
55405512
resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
@@ -6037,11 +6009,6 @@ shebang-regex@^1.0.0:
60376009
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
60386010
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
60396011

6040-
sigmund@^1.0.1:
6041-
version "1.0.1"
6042-
resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
6043-
integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
6044-
60456012
signal-exit@^3.0.0, signal-exit@^3.0.2:
60466013
version "3.0.2"
60476014
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -6680,14 +6647,6 @@ typedarray@^0.0.6:
66806647
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
66816648
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
66826649

6683-
typescript-formatter@^7.2.2:
6684-
version "7.2.2"
6685-
resolved "https://registry.yarnpkg.com/typescript-formatter/-/typescript-formatter-7.2.2.tgz#a147181839b7bb09c2377b072f20f6336547c00a"
6686-
integrity sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==
6687-
dependencies:
6688-
commandpost "^1.0.0"
6689-
editorconfig "^0.15.0"
6690-
66916650
typescript@^3.9.2:
66926651
version "3.9.3"
66936652
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
@@ -6975,11 +6934,6 @@ y18n@^4.0.0:
69756934
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
69766935
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
69776936

6978-
yallist@^2.1.2:
6979-
version "2.1.2"
6980-
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
6981-
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
6982-
69836937
yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
69846938
version "3.1.1"
69856939
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"

0 commit comments

Comments
 (0)