Update gentype_tests

Author: shulhi

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

@@ -5,6 +5,4 @@
 
 import * as ExportWithRenameJS from './ExportWithRename.res.js';
 
-export type props<s> = { readonly s: s };
-
-export const Renamed: React.ComponentType<{ readonly s: string }> = ExportWithRenameJS.make as any;
+export const Renamed: (s:string) => JSX.Element = ExportWithRenameJS.make as any;

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

@@ -8,47 +8,19 @@ import {default as makeNotChecked} from './hookExample';
 import {default as defaultNotChecked} from './hookExample';
 
 // In case of type error, check the type of 'make' in 'ImportHookDefault.res' and './hookExample'.
-export const makeTypeChecked: React.ComponentType<{
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: ImportHooks_renderMe<string>
-}> = makeNotChecked as any;
+export const makeTypeChecked: (person:person, children:JSX.Element, renderMe:ImportHooks_renderMe<string>) => JSX.Element = makeNotChecked as any;
 
 // Export 'make' early to allow circular import from the '.bs.js' file.
-export const make: unknown = makeTypeChecked as React.ComponentType<{
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: ImportHooks_renderMe<string>
-}> as any;
+export const make: unknown = makeTypeChecked as (person:person, children:JSX.Element, renderMe:ImportHooks_renderMe<string>) => JSX.Element as any;
 
 // In case of type error, check the type of 'default' in 'ImportHookDefault.res' and './hookExample'.
-export const defaultTypeChecked: React.ComponentType<{
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: ImportHooks_renderMe<string>
-}> = defaultNotChecked as any;
+export const defaultTypeChecked: (person:person, children:JSX.Element, renderMe:ImportHooks_renderMe<string>) => JSX.Element = defaultNotChecked as any;
 
 // Export '$$default' early to allow circular import from the '.bs.js' file.
-export const $$default: unknown = defaultTypeChecked as React.ComponentType<{
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: ImportHooks_renderMe<string>
-}> as any;
+export const $$default: unknown = defaultTypeChecked as (person:person, children:JSX.Element, renderMe:ImportHooks_renderMe<string>) => JSX.Element as any;
 
 import type {renderMe as ImportHooks_renderMe} from './ImportHooks.gen';
 
 export type person = { readonly name: string; readonly age: number };
 
-export type props<person,children,renderMe> = {
-  readonly person: person; 
-  readonly children: children; 
-  readonly renderMe: renderMe
-};
-
-export type MM_props<person,children,renderMe> = {
-  readonly person: person; 
-  readonly children: children; 
-  readonly renderMe: renderMe
-};
-
 export default $$default;

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

@@ -8,20 +8,10 @@ import {makeRenamed as makeRenamedNotChecked} from './hookExample';
 import {foo as fooNotChecked} from './hookExample';
 
 // In case of type error, check the type of 'makeRenamed' in 'ImportHooks.res' and './hookExample'.
-export const makeRenamedTypeChecked: React.ComponentType<{
-  readonly actions?: JSX.Element; 
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: renderMe<any>
-}> = makeRenamedNotChecked as any;
+export const makeRenamedTypeChecked: <a>(actions:JSX.Element, person:person, children:JSX.Element, renderMe:renderMe<a>) => JSX.Element = makeRenamedNotChecked as any;
 
 // Export 'makeRenamed' early to allow circular import from the '.bs.js' file.
-export const makeRenamed: unknown = makeRenamedTypeChecked as React.ComponentType<{
-  readonly actions?: JSX.Element; 
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: renderMe<any>
-}> as any;
+export const makeRenamed: unknown = makeRenamedTypeChecked as <a>(actions:JSX.Element, person:person, children:JSX.Element, renderMe:renderMe<a>) => JSX.Element as any;
 
 // In case of type error, check the type of 'foo' in 'ImportHooks.res' and './hookExample'.
 export const fooTypeChecked: (person:person) => string = fooNotChecked as any;
@@ -32,10 +22,3 @@ export const foo: unknown = fooTypeChecked as (person:person) => string as any;
 export type person = { readonly name: string; readonly age: number };
 
 export type renderMe<a> = React.ComponentType<{ readonly randomString: string; readonly poly: a }>;
-
-export type props<actions,person,children,renderMe> = {
-  readonly actions?: actions; 
-  readonly person: person; 
-  readonly children: children; 
-  readonly renderMe: renderMe
-};

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

@@ -6,11 +6,9 @@
 import {default as defaultNotChecked} from './';
 
 // In case of type error, check the type of 'default' in 'ImportIndex.res' and './'.
-export const defaultTypeChecked: React.ComponentType<{ readonly method?: "push" | "replace" }> = defaultNotChecked as any;
+export const defaultTypeChecked: (method:"push" | "replace") => JSX.Element = defaultNotChecked as any;
 
 // Export '$$default' early to allow circular import from the '.bs.js' file.
-export const $$default: unknown = defaultTypeChecked as React.ComponentType<{ readonly method?: "push" | "replace" }> as any;
-
-export type props<method> = { readonly method?: method };
+export const $$default: unknown = defaultTypeChecked as (method:"push" | "replace") => JSX.Element as any;
 
 export default $$default;

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

@@ -6,38 +6,19 @@
 import {make as makeNotChecked} from './hookExample';
 
 // In case of type error, check the type of 'make' in 'JSXV4.res' and './hookExample'.
-export const makeTypeChecked: React.ComponentType<{
-  readonly actions?: JSX.Element; 
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: renderMe<any>
-}> = makeNotChecked as any;
+export const makeTypeChecked: <a>(actions:JSX.Element, person:person, children:JSX.Element, renderMe:renderMe<a>) => JSX.Element = makeNotChecked as any;
 
 // Export 'make' early to allow circular import from the '.bs.js' file.
-export const make: unknown = makeTypeChecked as React.ComponentType<{
-  readonly actions?: JSX.Element; 
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: renderMe<any>
-}> as any;
+export const make: unknown = makeTypeChecked as <a>(actions:JSX.Element, person:person, children:JSX.Element, renderMe:renderMe<a>) => JSX.Element as any;
 
 const JSXV4JS = require('./JSXV4.res.js');
 
-export type CompV4_props<x,y> = { readonly x: x; readonly y: y };
-
 export type person = { readonly name: string; readonly age: number };
 
 export type props2<a> = { readonly randomString: string; readonly poly: a };
 
 export type renderMe<a> = (_1:props2<a>) => JSX.Element;
 
-export type props<actions,person,children,renderMe> = {
-  readonly actions?: actions; 
-  readonly person: person; 
-  readonly children: children; 
-  readonly renderMe: renderMe
-};
-
-export const CompV4_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4JS.CompV4.make as any;
+export const CompV4_make: (x:string, y:string) => JSX.Element = JSXV4JS.CompV4.make as any;
 
-export const CompV4: { make: React.ComponentType<{ readonly x: string; readonly y: string }> } = JSXV4JS.CompV4 as any;
+export const CompV4: { make: (x:string, y:string) => JSX.Element } = JSXV4JS.CompV4 as any;

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

@@ -6,15 +6,13 @@
 import {default as defaultNotChecked} from './MyInput';
 
 // In case of type error, check the type of 'default' in 'MyInput.res' and './MyInput'.
-export const defaultTypeChecked: React.ComponentType<{ readonly onFocus?: (_1:inputFocusEvent) => void }> = defaultNotChecked as any;
+export const defaultTypeChecked: (onFocus:((_1:inputFocusEvent) => void)) => JSX.Element = defaultNotChecked as any;
 
 // Export '$$default' early to allow circular import from the '.bs.js' file.
-export const $$default: unknown = defaultTypeChecked as React.ComponentType<{ readonly onFocus?: (_1:inputFocusEvent) => void }> as any;
+export const $$default: unknown = defaultTypeChecked as (onFocus:((_1:inputFocusEvent) => void)) => JSX.Element as any;
 
 import type {inputFocusEvent as $$inputFocusEvent} from './shims/JsxEvent.shim';
 
 export type inputFocusEvent = $$inputFocusEvent;
 
-export type props<onFocus> = { readonly onFocus?: onFocus };
-
 export default $$default;