Fix handling of exotic identifiers for let bindings in GenType

CHANGELOG.md

@@ -31,6 +31,7 @@
 - Fix unpacking first-class module in default argument of react component. https://github.com/rescript-lang/rescript/pull/8296
 - Fix exception record field regression. https://github.com/rescript-lang/rescript/pull/8319
 - Rewatch: ignore stale lock for unrelated process name. https://github.com/rescript-lang/rescript/pull/8316
+- Fix handling of exotic identifiers for let bindings in GenType. https://github.com/rescript-lang/rescript/pull/8315
 
 #### :memo: Documentation
 

compiler/gentype/TranslateSignature.ml

@@ -13,7 +13,7 @@ let translate_signature_value ~config ~output_file_relative ~resolver ~type_env
     (val_id, val_attributes |> Annotation.from_attributes ~config ~loc:val_loc)
   with
   | id, GenType ->
-    id |> Ident.name
+    id |> Ident.name |> Ext_ident.unwrap_uppercase_exotic
     |> Translation.translate_value ~attributes:val_attributes ~config
          ~doc_string:(Annotation.doc_string_from_attrs val_attributes)
          ~output_file_relative ~resolver ~type_env ~type_expr

compiler/gentype/TranslateSignatureFromTypes.ml

@@ -72,7 +72,7 @@ and translate_signature_item_from_types ~config ~output_file_relative ~resolver
     |> translate_module_declaration_from_types ~config ~output_file_relative
          ~resolver ~type_env ~id
   | Types.Sig_value (id, {val_attributes; val_loc; val_type}) ->
-    let name = id |> Ident.name in
+    let name = id |> Ident.name |> Ext_ident.unwrap_uppercase_exotic in
     if !Debug.translation then Log_.item "Translate Sig Value %s\n" name;
     let module_item = Runtime.new_module_item ~name in
     type_env |> TypeEnv.update_module_item ~module_item;

compiler/gentype/TranslateStructure.ml

@@ -104,7 +104,7 @@ let translate_value_binding ~config ~output_file_relative ~resolver ~type_env
     {Typedtree.vb_attributes; vb_expr; vb_pat} : Translation.t =
   match vb_pat.pat_desc with
   | Tpat_var (id, _) | Tpat_alias ({pat_desc = Tpat_any}, id, _) ->
-    let name = id |> Ident.name in
+    let name = id |> Ident.name |> Ext_ident.unwrap_uppercase_exotic in
     if !Debug.translation then Log_.item "Translate Value Binding %s\n" name;
     let module_item = Runtime.new_module_item ~name in
     type_env |> TypeEnv.update_module_item ~module_item;
@@ -113,7 +113,7 @@ let translate_value_binding ~config ~output_file_relative ~resolver ~type_env
       |> Annotation.from_attributes ~config ~loc:vb_pat.pat_loc
       = GenType
     then
-      id |> Ident.name
+      name
       |> Translation.translate_value ~attributes:vb_attributes ~config
            ~doc_string:(Annotation.doc_string_from_attrs vb_attributes)
            ~output_file_relative ~resolver ~type_env ~type_expr:vb_pat.pat_type

tests/gentype_tests/typescript-react-example/src/EscapedNames.gen.tsx

@@ -20,4 +20,10 @@ export type record = {
   readonly UPPERCASE: number
 };
 
+export type props = {};
+
 export const myRecord: record = EscapedNamesJS.myRecord as any;
+
+export const Icon_Add: React.ComponentType<{}> = EscapedNamesJS.Icon_Add as any;
+
+export const SomeValue: string = EscapedNamesJS.SomeValue as any;

tests/gentype_tests/typescript-react-example/src/EscapedNames.res

@@ -24,3 +24,12 @@ let myRecord = {
   \"Illegal-field name": 7,
   \"UPPERCASE": 100,
 }
+
+/* https://github.com/rescript-lang/rescript/issues/8312 */
+type props = {}
+let make = (_: props) => React.null
+@genType
+let \"Icon_Add": props => React.element = make
+
+@genType
+let \"SomeValue" = "hello"