GenType: fix runtime error on @genType.as output (#6509)

* Gentype: fix runtime error on `@genType.as` output * [skip ci] add changelog
rescript-lang · Dec 6, 2023 · fc7b900 · fc7b900
1 parent 3ec3479
commit fc7b900
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 #### :bug: Bug Fix
 - Fix issue where an inline record with attributes did not parse. https://github.com/rescript-lang/rescript-compiler/pull/6499
 - Fix issue with uncurried function with 1 arg being a variable where an undefined variable could be emitted. https://github.com/rescript-lang/rescript-compiler/pull/6507
+- Fix runtime errors on `@genType.as("alias")` output. https://github.com/rescript-lang/rescript-compiler/pull/6509
 
 # 11.0.0-rc.6
 

diff --git a/jscomp/gentype/Translation.ml b/jscomp/gentype/Translation.ml
@@ -90,9 +90,9 @@ let translateValue ~attributes ~config ~docString ~outputFileRelative ~resolver
     |> addAnnotationsToFunction
   in
   let resolvedNameOriginal =
-    nameAs |> TypeEnv.addModulePath ~typeEnv |> ResolvedName.toString
+    name |> TypeEnv.addModulePath ~typeEnv |> ResolvedName.toString
   in
-  let resolvedName = name |> TypeEnv.addModulePath ~typeEnv in
+  let resolvedName = nameAs |> TypeEnv.addModulePath ~typeEnv in
   let moduleAccessPath =
     typeEnv |> TypeEnv.getModuleAccessPath ~name:resolvedNameOriginal
   in

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-react-example/src/ExportWithRename.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx
@@ -10,4 +10,4 @@ const ExportWithRenameBS: any = ExportWithRenameBS__Es6Import;
 
 export type Props = { readonly s: string };
 
-export const make: React.ComponentType<{ readonly s: string }> = ExportWithRenameBS.ExportWithRename;
+export const Renamed: React.ComponentType<{ readonly s: string }> = ExportWithRenameBS.make;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res
@@ -1,2 +1,2 @@
-@genType.as("ExportWithRename") @react.component
+@genType.as("Renamed") @react.component
 let make = (~s) => React.string(s)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx
@@ -6,4 +6,4 @@
 import * as WarningsBS__Es6Import from './Warnings.bs';
 const WarningsBS: any = WarningsBS__Es6Import;
 
-export const x: number = WarningsBS.ddd;
+export const ddd: number = WarningsBS.x;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ const ExportWithRenameBS: any = ExportWithRenameBS__Es6Import;

		export type Props = { readonly s: string };

		export const make: React.ComponentType<{ readonly s: string }> = ExportWithRenameBS.ExportWithRename;
		export const Renamed: React.ComponentType<{ readonly s: string }> = ExportWithRenameBS.make;