apply moduleResolution to bs imports

Author: cometkim

jscomp/gentype/EmitType.ml

@@ -13,29 +13,6 @@ let fileHeader ~sourceFile =
     ~lines:["TypeScript file generated from " ^ sourceFile ^ " by genType."]
   ^ "/* eslint-disable import/first */\n\n"
 
-let generatedFilesExtension ~(config : Config.t) =
-  match config.generatedFileExtension with
-  | Some s ->
-    (* from .foo.bar to .foo *)
-    Filename.remove_extension s
-  | None -> ".gen"
-
-let inputFileSuffix ~(config : Config.t) =
-  match config.generatedFileExtension with
-  | Some s when Filename.extension s <> "" (* double extension  *) -> s
-  | _ -> generatedFilesExtension ~config ^ ".tsx"
-
-let outputFileSuffix ~(config : Config.t) =
-  generatedFilesExtension ~config ^ ".js"
-
-let generatedModuleExtension ~(config : Config.t) =
-  match config.moduleResolution with
-  | Node -> generatedFilesExtension ~config
-  | Node16 -> inputFileSuffix ~config
-  | Bundler -> outputFileSuffix ~config
-
-let shimExtension = ".shim.ts"
-
 let interfaceName ~(config : Config.t) name =
   match config.exportInterfaces with
   | true -> "I" ^ name
@@ -395,6 +372,11 @@ let emitRequire ~importedValueOrComponent ~early ~emitters ~(config : Config.t)
     | true -> "// tslint:disable-next-line:no-var-requires\n"
     | false -> "// @ts-ignore: Implicit any on import\n"
   in
+  let importPath =
+    match config.moduleResolution with
+    | Node -> importPath |> ImportPath.chopExtensionSafe (* for backward compatibility *)
+    | _ -> importPath
+  in
   match config.module_ with
   | ES6 when not importedValueOrComponent ->
     let moduleNameString = ModuleName.toString moduleName in

jscomp/gentype/GenTypeConfig.ml

@@ -40,7 +40,7 @@ let default =
     projectRoot = "";
     shimsMap = ModuleNameMap.empty;
     sources = None;
-    suffix = "";
+    suffix = ".bs.js";
   }
 
 let bsPlatformLib ~config =
@@ -182,9 +182,8 @@ let readConfig ~getBsConfigFile ~namespace =
     in
     let suffix =
       match bsconf |> getStringOption "suffix" with
-      | Some ".bs.js" -> ".bs"
       | Some s -> s
-      | _ -> ".bs"
+      | _ -> default.suffix
     in
     let bsDependencies =
       match bsconf |> getOpt "bs-dependencies" with

jscomp/gentype/GenTypeMain.ml

@@ -104,7 +104,7 @@ let processCmtFile cmt =
     let isInterface = Filename.check_suffix cmtFile ".cmti" in
     let resolver =
       ModuleResolver.createLazyResolver ~config
-        ~extensions:[".res"; EmitType.shimExtension] ~excludeFile:(fun fname ->
+        ~extensions:[".res"; ".shim.ts"] ~excludeFile:(fun fname ->
           fname = "React.res" || fname = "ReasonReact.res")
     in
     let inputCMT, hasGenTypeAnnotations =

jscomp/gentype/ImportPath.ml

@@ -13,19 +13,19 @@ let fromModule ~dir ~importExtension moduleName =
 
 let fromStringUnsafe s = ("", s)
 
-let chopExtensionSafe s =
-  try s |> Filename.chop_extension with Invalid_argument _ -> s
+let chopExtensionSafe (dir, s) =
+  try (dir, s |> Filename.chop_extension) with Invalid_argument _ -> (dir, s)
 
 let dump (dir, s) = NodeFilename.concat dir s
 
 let toCmt ~(config : Config.t) ~outputFileRelative (dir, s) =
   let open Filename in
   concat
     (outputFileRelative |> dirname)
-    (((dir, s |> chopExtensionSafe) |> dump)
+    ((dir, s) |> chopExtensionSafe |> dump)
     ^ (match config.namespace with
       | None -> ""
       | Some name -> "-" ^ name)
-    ^ ".cmt")
+    ^ ".cmt"
 
 let emit (dir, s) = (dir, s) |> dump

jscomp/gentype/ImportPath.mli

@@ -3,6 +3,7 @@ open GenTypeCommon
 type t
 
 val bsCurryPath : config:Config.t -> t
+val chopExtensionSafe : t -> t
 val dump : t -> string
 val emit : t -> string
 val fromModule : dir:string -> importExtension:string -> ModuleName.t -> t

jscomp/gentype/ModuleExtension.ml

@@ -0,0 +1,28 @@
+open GenTypeCommon
+
+let shimExtension ~(config : Config.t) =
+  match config.moduleResolution with
+  | Node -> ".shim"
+  | Node16 -> ".shim.js"
+  | Bundler -> ".shim.ts"
+
+let generatedFilesExtension ~(config : Config.t) =
+  match config.generatedFileExtension with
+  | Some s ->
+    (* from .foo.bar to .foo *)
+    Filename.remove_extension s
+  | None -> ".gen"
+
+let inputFileSuffix ~(config : Config.t) =
+  match config.generatedFileExtension with
+  | Some s when Filename.extension s <> "" (* double extension  *) -> s
+  | _ -> generatedFilesExtension ~config ^ ".tsx"
+
+let outputFileSuffix ~(config : Config.t) =
+  generatedFilesExtension ~config ^ ".js"
+
+let generatedModuleExtension ~(config : Config.t) =
+  match config.moduleResolution with
+  | Node -> generatedFilesExtension ~config
+  | Node16 -> inputFileSuffix ~config
+  | Bundler -> outputFileSuffix ~config

jscomp/gentype/ModuleResolver.ml

@@ -256,7 +256,7 @@ let resolveGeneratedModule ~config ~outputFileRelative ~resolver moduleName =
       (moduleName |> ModuleName.toString);
   let importPath =
     resolveModule ~config
-      ~importExtension:(EmitType.generatedModuleExtension ~config)
+      ~importExtension:(ModuleExtension.generatedModuleExtension ~config)
       ~outputFileRelative ~resolver ~useBsDependencies:true moduleName
   in
   if !Debug.moduleResolution then
@@ -272,12 +272,7 @@ let importPathForReasonModuleName ~(config : Config.t) ~outputFileRelative
   | shimModuleName ->
     if !Debug.moduleResolution then
       Log_.item "ShimModuleName: %s\n" (shimModuleName |> ModuleName.toString);
-    let importExtension =
-      match config.moduleResolution with
-      | Node -> ".shim"
-      | Node16 -> ".shim.js"
-      | Bundler -> ".shim.ts"
-    in
+    let importExtension = ModuleExtension.shimExtension ~config in
     let importPath =
       resolveModule ~config ~importExtension ~outputFileRelative
         ~resolver ~useBsDependencies:false shimModuleName

jscomp/gentype/Paths.ml

@@ -29,7 +29,7 @@ let findNameSpace cmt =
   |> keepAfterDash
 
 let getOutputFileRelative ~config cmt =
-  (cmt |> handleNamespace) ^ EmitType.inputFileSuffix ~config
+  (cmt |> handleNamespace) ^ ModuleExtension.inputFileSuffix ~config
 
 let getOutputFile ~(config : Config.t) cmt =
   Filename.concat config.projectRoot (getOutputFileRelative ~config cmt)

jscomp/gentype_tests/typescript-res-bundler/src/Bar.gen.tsx

@@ -3,12 +3,12 @@
 
 
 // @ts-ignore: Implicit any on import
-import * as BarBS__Es6Import from './Bar.bs';
+import * as BarBS__Es6Import from './Bar.bs.js';
 const BarBS: any = BarBS__Es6Import;
 
 import type {Json_t as Js_Json_t} from '../src/shims/Js.shim.ts';
 
-import type {t as Foo_t} from './Foo.gen.tsx';
+import type {t as Foo_t} from './Foo.gen.js';
 
 export const makeFoo: (_1:{ readonly bar: number }) => Foo_t = BarBS.makeFoo;
 

jscomp/gentype_tests/typescript-res-bundler/src/Foo.gen.tsx

@@ -3,7 +3,7 @@
 
 
 // @ts-ignore: Implicit any on import
-import * as FooBS__Es6Import from './Foo.bs';
+import * as FooBS__Es6Import from './Foo.bs.js';
 const FooBS: any = FooBS__Es6Import;
 
 // tslint:disable-next-line:interface-over-type-literal

jscomp/gentype_tests/typescript-res-node16/package-lock.json

@@ -3,12 +3,12 @@
 
 
 // @ts-ignore: Implicit any on import
-import * as BarBS__Es6Import from './Bar.bs';
+import * as BarBS__Es6Import from './Bar.bs.js';
 const BarBS: any = BarBS__Es6Import;
 
 import type {Json_t as Js_Json_t} from '../src/shims/Js.shim.js';
 
-import type {t as Foo_t} from './Foo.gen.js';
+import type {t as Foo_t} from './Foo.gen.tsx';
 
 export const makeFoo: (_1:{ readonly bar: number }) => Foo_t = BarBS.makeFoo;
 

jscomp/gentype_tests/typescript-res-node16/src/Bar.gen.tsx

@@ -3,7 +3,7 @@
 
 
 // @ts-ignore: Implicit any on import
-import * as FooBS__Es6Import from './Foo.bs';
+import * as FooBS__Es6Import from './Foo.bs.js';
 const FooBS: any = FooBS__Es6Import;
 
 // tslint:disable-next-line:interface-over-type-literal