GenType: ensure JS import works regardless moduleResolution (#6541)

Author: cometkim

CHANGELOG.md

@@ -17,6 +17,10 @@
 - GenType: support `@deriving(accessors)` outputs. https://github.com/rescript-lang/rescript-compiler/pull/6537
 - Allow coercing ints and floats to unboxed variants that have a catch-all unboxed int or float case. https://github.com/rescript-lang/rescript-compiler/pull/6540
 
+#### :bug: Bug Fix
+
+- GenType: now emits full suffix on JS import path to be compatible with `.res.js`. https://github.com/rescript-lang/rescript-compiler/pull/6541
+
 # 11.0.0-rc.8
 
 #### :rocket: New Feature

jscomp/gentype/EmitJs.ml

@@ -247,9 +247,9 @@ let emitCodeItem ~config ~emitters ~moduleItemsEmitter ~env ~fileName
       |> ModuleResolver.resolveModule ~config ~importExtension:config.suffix
            ~outputFileRelative ~resolver ~useBsDependencies:false
     in
-    let fileNameBs = fileName |> ModuleName.forBsFile in
+    let fileNameJs = fileName |> ModuleName.forJsFile in
     let envWithRequires =
-      fileNameBs |> requireModule ~import:false ~env ~importPath
+      fileNameJs |> requireModule ~import:false ~env ~importPath
     in
     let default = "default" in
     let make = "make" in
@@ -358,7 +358,7 @@ let emitCodeItem ~config ~emitters ~moduleItemsEmitter ~env ~fileName
       | _ -> emitters
     in
     let emitters =
-      (fileNameBs |> ModuleName.toString)
+      (fileNameJs |> ModuleName.toString)
       ^ "."
       ^ (moduleAccessPath |> Runtime.emitModuleAccessPath ~config)
       |> EmitType.emitExportConst ~config ~docString ~early:false ~emitters

jscomp/gentype/EmitType.ml

@@ -378,13 +378,6 @@ let emitImportValueAsEarly ~emitters ~name ~nameAs importPath =
 
 let emitRequire ~importedValueOrComponent ~early ~emitters ~(config : Config.t)
     ~moduleName importPath =
-  let importPath =
-    match config.moduleResolution with
-    | Node ->
-      importPath
-      |> ImportPath.chopExtensionSafe (* for backward compatibility *)
-    | _ -> importPath
-  in
   let moduleNameString = ModuleName.toString moduleName in
   let importPathString = ImportPath.emit importPath in
   let output =

jscomp/gentype/ModuleName.ml

@@ -17,10 +17,10 @@ let sanitizeId s =
   then s
   else "_" ^ s
 
-let forBsFile s = sanitizeId s ^ "BS"
+let forJsFile s = sanitizeId s ^ "JS"
 
 let forInnerModule ~fileName ~innerModuleName =
-  (fileName |> forBsFile) ^ "." ^ innerModuleName
+  (fileName |> forJsFile) ^ "." ^ innerModuleName
 
 let fromStringUnsafe s = s
 let toString s = s

jscomp/gentype/ModuleName.mli

@@ -2,7 +2,7 @@ type t
 
 val compare : t -> t -> int
 val curry : t
-val forBsFile : t -> t
+val forJsFile : t -> t
 val forInnerModule : fileName:t -> innerModuleName:string -> t
 
 val fromStringUnsafe : string -> t

jscomp/gentype_tests/typescript-react-example/.eslintrc.json

@@ -5,6 +5,6 @@
   ],
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint"],
-  "ignorePatterns": ["src/**/*.bs.js"],
+  "ignorePatterns": ["src/**/*.res.js"],
   "root": true
 }

jscomp/gentype_tests/typescript-react-example/Makefile

@@ -7,7 +7,7 @@ test:
 	npm run lint
 
 clean:
-	rm -rf node_modules lib src/*.bs.js src/*.gen.tsx
+	rm -rf node_modules lib src/*.res.js src/*.gen.tsx
 
 .DEFAULT_GOAL := test
 

jscomp/gentype_tests/typescript-react-example/rescript.json

@@ -29,5 +29,5 @@
     "module": "es6",
     "in-source": true
   },
-  "suffix": ".bs.js"
+  "suffix": ".res.js"
 }