Skip to content

Commit 2dbcf77

Browse files
committed
refactor
1 parent 9d21e40 commit 2dbcf77

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

jscomp/gentype/EmitType.ml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@ let generatedFilesExtension ~(config : Config.t) =
2020
Filename.remove_extension s
2121
| None -> ".gen"
2222

23-
let outputFileSuffix ~(config : Config.t) ?(moduleExtension = ".tsx") () =
23+
let inputFileSuffix ~(config : Config.t) =
2424
match config.generatedFileExtension with
2525
| Some s when Filename.extension s <> "" (* double extension *) -> s
26-
| _ -> generatedFilesExtension ~config ^ moduleExtension
26+
| _ -> generatedFilesExtension ~config ^ ".tsx"
27+
28+
let outputFileSuffix ~(config : Config.t) =
29+
generatedFilesExtension ~config ^ ".js"
2730

2831
let generatedModuleExtension ~(config : Config.t) =
2932
match config.moduleResolution with
3033
| Node -> generatedFilesExtension ~config
31-
| Node16 -> outputFileSuffix ~config ~moduleExtension:".js" ()
32-
| Bundler -> outputFileSuffix ~config ()
34+
| Node16 -> inputFileSuffix ~config
35+
| Bundler -> outputFileSuffix ~config
3336

3437
let shimExtension = ".shim.ts"
3538

jscomp/gentype/Paths.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let findNameSpace cmt =
2929
|> keepAfterDash
3030

3131
let getOutputFileRelative ~config cmt =
32-
(cmt |> handleNamespace) ^ EmitType.outputFileSuffix ~config ()
32+
(cmt |> handleNamespace) ^ EmitType.inputFileSuffix ~config
3333

3434
let getOutputFile ~(config : Config.t) cmt =
3535
Filename.concat config.projectRoot (getOutputFileRelative ~config cmt)

0 commit comments

Comments
 (0)