emit types import

cometkim · cometkim · commit 6533c9a58c5a · 2023-04-21T02:53:35.000+09:00
diff --git a/jscomp/gentype/EmitType.ml b/jscomp/gentype/EmitType.ml
@@ -20,12 +20,17 @@ let generatedFilesExtension ~(config : Config.t) =
     Filename.remove_extension s
   | None -> ".gen"
 
-let outputFileSuffix ~(config : Config.t) =
+let outputFileSuffix ~(config : Config.t) ?(moduleExtension = ".tsx") () =
   match config.generatedFileExtension with
   | Some s when Filename.extension s <> "" (* double extension  *) -> s
-  | _ -> generatedFilesExtension ~config ^ ".tsx"
+  | _ -> generatedFilesExtension ~config ^ moduleExtension
+
+let generatedModuleExtension ~(config : Config.t) =
+  match config.moduleResolution with
+  | Node -> generatedFilesExtension ~config
+  | Node16 -> outputFileSuffix ~config ~moduleExtension:".js" ()
+  | Bundler -> outputFileSuffix ~config ()
 
-let generatedModuleExtension ~config = generatedFilesExtension ~config
 let shimExtension = ".shim.ts"
 
 let interfaceName ~(config : Config.t) name =
diff --git a/jscomp/gentype/Paths.ml b/jscomp/gentype/Paths.ml
@@ -29,7 +29,7 @@ let findNameSpace cmt =
   |> keepAfterDash
 
 let getOutputFileRelative ~config cmt =
-  (cmt |> handleNamespace) ^ EmitType.outputFileSuffix ~config
+  (cmt |> handleNamespace) ^ EmitType.outputFileSuffix ~config ()
 
 let getOutputFile ~(config : Config.t) cmt =
   Filename.concat config.projectRoot (getOutputFileRelative ~config cmt)
diff --git a/jscomp/gentype_tests/typescript-react-example/package-lock.json b/jscomp/gentype_tests/typescript-react-example/package-lock.json
diff --git a/jscomp/gentype_tests/typescript-res-bundler/bsconfig.json b/jscomp/gentype_tests/typescript-res-bundler/bsconfig.json
@@ -2,7 +2,7 @@
   "gentypeconfig": {
     "language": "typescript",
     "module": "es6",
-    "moduleResolution": "node16",
+    "moduleResolution": "bundler",
     "importPath": "relative",
     "debug": {
       "all": false
diff --git a/jscomp/gentype_tests/typescript-res-bundler/package-lock.json b/jscomp/gentype_tests/typescript-res-bundler/package-lock.json
diff --git a/jscomp/gentype_tests/typescript-res-bundler/package.json b/jscomp/gentype_tests/typescript-res-bundler/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "typescript-res-node16",
+  "name": "typescript-res-bundler",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
diff --git a/jscomp/gentype_tests/typescript-res-bundler/src/Bar.bs.js b/jscomp/gentype_tests/typescript-res-bundler/src/Bar.bs.js
diff --git a/jscomp/gentype_tests/typescript-res-bundler/src/Bar.gen.tsx b/jscomp/gentype_tests/typescript-res-bundler/src/Bar.gen.tsx
@@ -0,0 +1,11 @@
+/* TypeScript file generated from Bar.res by genType. */
+/* eslint-disable import/first */
+
+
+// @ts-ignore: Implicit any on import
+import * as BarBS__Es6Import from './Bar.bs';
+const BarBS: any = BarBS__Es6Import;
+
+import type {t as Foo_t} from './Foo.gen.tsx';
+
+export const makeFoo: (_1:{ readonly bar: number }) => Foo_t = BarBS.makeFoo;
diff --git a/jscomp/gentype_tests/typescript-res-bundler/src/Bar.res b/jscomp/gentype_tests/typescript-res-bundler/src/Bar.res
@@ -1,5 +1,5 @@
 @genType
 let makeFoo = (~bar) => {
-  let foo = Foo.make
-  {...foo, bar}
+  open Foo
+  {...make(), bar}
 }
diff --git a/jscomp/gentype_tests/typescript-res-bundler/src/Foo.bs.js b/jscomp/gentype_tests/typescript-res-bundler/src/Foo.bs.js
diff --git a/jscomp/gentype_tests/typescript-res-bundler/src/Foo.gen.tsx b/jscomp/gentype_tests/typescript-res-bundler/src/Foo.gen.tsx
@@ -0,0 +1,12 @@
+/* TypeScript file generated from Foo.res by genType. */
+/* eslint-disable import/first */
+
+
+// @ts-ignore: Implicit any on import
+import * as FooBS__Es6Import from './Foo.bs';
+const FooBS: any = FooBS__Es6Import;
+
+// tslint:disable-next-line:interface-over-type-literal
+export type t = { readonly foo: number; readonly bar: number };
+
+export const make: () => t = FooBS.make;
diff --git a/jscomp/gentype_tests/typescript-res-bundler/src/Foo.res b/jscomp/gentype_tests/typescript-res-bundler/src/Foo.res
@@ -2,4 +2,4 @@
 type t = {foo: int, bar: int}
 
 @genType
-let make = () => {foo: 0, bar: int}
+let make = () => {foo: 0, bar: 0}
diff --git a/jscomp/gentype_tests/typescript-res-bundler/tsconfig.json b/jscomp/gentype_tests/typescript-res-bundler/tsconfig.json
@@ -3,7 +3,9 @@
     "target": "esnext",
     "module": "esnext",
     "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
     "rootDir": "src",
+    "jsx": "react",
     "noEmit": true
   },
   "include": [
diff --git a/jscomp/gentype_tests/typescript-res-node16/package-lock.json b/jscomp/gentype_tests/typescript-res-node16/package-lock.json
diff --git a/jscomp/gentype_tests/typescript-res-node16/src/Bar.bs.js b/jscomp/gentype_tests/typescript-res-node16/src/Bar.bs.js
diff --git a/jscomp/gentype_tests/typescript-res-node16/src/Bar.gen.tsx b/jscomp/gentype_tests/typescript-res-node16/src/Bar.gen.tsx
@@ -0,0 +1,11 @@
+/* TypeScript file generated from Bar.res by genType. */
+/* eslint-disable import/first */
+
+
+// @ts-ignore: Implicit any on import
+import * as BarBS__Es6Import from './Bar.bs';
+const BarBS: any = BarBS__Es6Import;
+
+import type {t as Foo_t} from './Foo.gen.js';
+
+export const makeFoo: (_1:{ readonly bar: number }) => Foo_t = BarBS.makeFoo;
diff --git a/jscomp/gentype_tests/typescript-res-node16/src/Bar.res b/jscomp/gentype_tests/typescript-res-node16/src/Bar.res
@@ -1,5 +1,5 @@
 @genType
 let makeFoo = (~bar) => {
-  let foo = Foo.make
-  {...foo, bar}
+  open Foo
+  {...make(), bar}
 }
diff --git a/jscomp/gentype_tests/typescript-res-node16/src/Foo.bs.js b/jscomp/gentype_tests/typescript-res-node16/src/Foo.bs.js
diff --git a/jscomp/gentype_tests/typescript-res-node16/src/Foo.gen.tsx b/jscomp/gentype_tests/typescript-res-node16/src/Foo.gen.tsx
@@ -0,0 +1,12 @@
+/* TypeScript file generated from Foo.res by genType. */
+/* eslint-disable import/first */
+
+
+// @ts-ignore: Implicit any on import
+import * as FooBS__Es6Import from './Foo.bs';
+const FooBS: any = FooBS__Es6Import;
+
+// tslint:disable-next-line:interface-over-type-literal
+export type t = { readonly foo: number; readonly bar: number };
+
+export const make: () => t = FooBS.make;
diff --git a/jscomp/gentype_tests/typescript-res-node16/src/Foo.res b/jscomp/gentype_tests/typescript-res-node16/src/Foo.res
@@ -2,4 +2,4 @@
 type t = {foo: int, bar: int}
 
 @genType
-let make = () => {foo: 0, bar: int}
+let make = () => {foo: 0, bar: 0}
diff --git a/jscomp/gentype_tests/typescript-res-node16/tsconfig.json b/jscomp/gentype_tests/typescript-res-node16/tsconfig.json
@@ -4,6 +4,7 @@
     "module": "esnext",
     "moduleResolution": "node16",
     "rootDir": "src",
+    "jsx": "react",
     "noEmit": true
   },
   "include": [

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "typescript-res-node16",`
	`2`	`+ "name": "typescript-res-bundler",`
`3`	`3`	`"version": "0.1.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`@genType`
`2`	`2`	`let makeFoo = (~bar) => {`
`3`		`- let foo = Foo.make`
`4`		`- {...foo, bar}`
	`3`	`+ open Foo`
	`4`	`+ {...make(), bar}`
`5`	`5`	`}`