Moar changes

nojaf · nojaf · commit fe18ccfbf324 · 2025-07-22T12:06:28.000+02:00
diff --git a/rescript.json b/rescript.json
@@ -8,5 +8,6 @@
         "@tests/reanalyze-deadcode",
         "@tests/incremental-typechecking",
         "@tests/reanalyze-termination"
-    ]
+    ],
+    "jsx": { "version": 4 }
 }
diff --git a/tests/analysis_tests/tests-incremental-typechecking/rescript.json b/tests/analysis_tests/tests-incremental-typechecking/rescript.json
@@ -1,5 +1,5 @@
 {
-  "name": "test-generic-jsx-transform",
+  "name": "@tests/incremental-typechecking",
   "sources": [
     {
       "dir": "src",
diff --git a/tests/analysis_tests/tests-incremental-typechecking/src/ConstructorCompletion__Json.res b/tests/analysis_tests/tests-incremental-typechecking/src/ConstructorCompletion__Json.res
@@ -1,2 +1,2 @@
-let x = Js.Json.Array()
-//                    ^com
+// let x = Js.Json.Array()
+//                       ^com
diff --git a/tests/analysis_tests/tests-incremental-typechecking/src/ConstructorCompletion__Own.res b/tests/analysis_tests/tests-incremental-typechecking/src/ConstructorCompletion__Own.res
@@ -2,5 +2,5 @@ module WithVariant = {
   type t = One({miss: bool}) | Two(bool)
 }
 
-let x = WithVariant.One()
-//                      ^com
+// let x = WithVariant.One()
+//                         ^com
diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/rescript.json b/tests/analysis_tests/tests-reanalyze/deadcode/rescript.json
@@ -7,7 +7,7 @@
   },
   "name": "@tests/reanalyze-deadcode",
   "jsx": { "version": 4 },
-  "bs-dependencies": ["@rescript/react"],
+  "bs-dependencies": ["@tests/rescript-react"],
   "sources": [
     {
       "dir": "src",
diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/src/exception/ExportWithRename.res b/tests/analysis_tests/tests-reanalyze/deadcode/src/exception/ExportWithRename.res
diff --git a/tests/analysis_tests/tests-reanalyze/termination/rescript.json b/tests/analysis_tests/tests-reanalyze/termination/rescript.json
@@ -4,7 +4,7 @@
     "suppress": [],
     "unsuppress": []
   },
-  "name": "arnold",
+  "name": "@tests/reanalyze-termination",
   "bs-dependencies": [],
   "sources": [
     {
diff --git a/tests/analysis_tests/tests/rescript.json b/tests/analysis_tests/tests/rescript.json
@@ -10,7 +10,7 @@
     }
   ],
   "bsc-flags": ["-w -33-44-8"],
-  "bs-dependencies": ["@rescript/react"],
+  "bs-dependencies": ["@tests/rescript-react"],
   "jsx": { "version": 4 },
   "suffix": ".res.js",
   "editor": {
diff --git a/tests/gentype_tests/typescript-react-example/rescript.json b/tests/gentype_tests/typescript-react-example/rescript.json
@@ -18,7 +18,7 @@
   "name": "@tests/gentype-react-example",
   "bsc-flags": [],
   "jsx": { "version": 4 },
-  "bs-dependencies": ["@rescript/react"],
+  "bs-dependencies": ["@tests/rescript-react"],
   "sources": [
     {
       "dir": "src",
diff --git a/tests/gentype_tests/typescript-react-example/src/nested/NestedTuples.gen.tsx b/tests/gentype_tests/typescript-react-example/src/nested/NestedTuples.gen.tsx
@@ -0,0 +1,32 @@
+/* TypeScript file generated from NestedTuples.res by genType. */
+
+/* eslint-disable */
+/* tslint:disable */
+
+import * as NestedTuplesJS from './NestedTuples.res.js';
+
+export type coord = [number, number, (undefined | number)];
+
+export type coord2 = [number, number, (null | undefined | number)];
+
+export type person = { readonly name: string; readonly age: number };
+
+export type couple = [person, person];
+
+export const testTuple: (param:[number, number]) => number = NestedTuplesJS.testTuple as any;
+
+export const origin: [number, number, (undefined | number)] = NestedTuplesJS.origin as any;
+
+export const computeArea: (param:[number, number, (undefined | number)]) => number = NestedTuplesJS.computeArea as any;
+
+export const computeAreaWithIdent: (param:coord) => number = NestedTuplesJS.computeAreaWithIdent as any;
+
+export const computeAreaNoConverters: (param:[number, number]) => number = NestedTuplesJS.computeAreaNoConverters as any;
+
+export const coord2d: <T1,T2,T3>(x:T1, y:T2) => [T1, T2, (undefined | T3)] = NestedTuplesJS.coord2d as any;
+
+export const getFirstName: (param:couple) => string = NestedTuplesJS.getFirstName as any;
+
+export const marry: (first:person, second:person) => couple = NestedTuplesJS.marry as any;
+
+export const changeSecondAge: (param:couple) => couple = NestedTuplesJS.changeSecondAge as any;
diff --git a/tests/gentype_tests/typescript-react-example/src/nested/NestedTuples.js b/tests/gentype_tests/typescript-react-example/src/nested/NestedTuples.js
diff --git a/tests/gentype_tests/typescript-react-example/src/nested/NestedTuples.res b/tests/gentype_tests/typescript-react-example/src/nested/NestedTuples.res
diff --git a/tests/gentype_tests/typescript-react-example/src/nested/NestedTypes.gen.tsx b/tests/gentype_tests/typescript-react-example/src/nested/NestedTypes.gen.tsx
@@ -0,0 +1,135 @@
+/* TypeScript file generated from NestedTypes.res by genType. */
+
+/* eslint-disable */
+/* tslint:disable */
+
+import * as NestedTypesJS from './NestedTypes.res.js';
+
+import type {Json_t as Js_Json_t} from '../../src/shims/Js.shim';
+
+import type {List_t as Belt_List_t} from '../../src/shims/Belt.shim';
+
+import type {M_t__ as TypeNameSanitize_M_t__} from '../../src/TypeNameSanitize.gen';
+
+import type {list} from '../../src/shims/RescriptPervasives.shim';
+
+import type {t_ as TypeNameSanitize_t_} from '../../src/TypeNameSanitize.gen';
+
+import type {t as Location_t} from '../../src/location/location.gen';
+
+export type t = number;
+
+export type typeWithVars<x,y,z> = 
+    { TAG: "A"; _0: x; _1: y }
+  | { TAG: "B"; _0: z };
+
+export type tree = {
+  readonly label: string; 
+  readonly left?: tree; 
+  readonly right?: tree
+};
+
+export type selfRecursive = { readonly self: selfRecursive };
+
+export type mutuallyRecursiveA = { readonly b: mutuallyRecursiveB };
+
+export type mutuallyRecursiveB = { readonly a: mutuallyRecursiveA };
+
+export abstract class opaqueVariant { protected opaque!: any }; /* simulate opaque types */
+
+export type twice<a> = [a, a];
+
+export type genTypeMispelled = number;
+
+export type dictString = {[id: string]: string};
+
+export type nullOrString = (null | string);
+
+export type nullOrString2 = (null | string);
+
+export type nullOrString3 = (null | string);
+
+export type nullOrString4 = (null | string);
+
+export type nullableOrString = (null | undefined | string);
+
+export type nullableOrString2 = (null | undefined | string);
+
+export type nullableOrString3 = (null | undefined | string);
+
+export type nullableOrString4 = (null | undefined | string);
+
+export type undefinedOrString = (undefined | string);
+
+export type undefinedOrString2 = (undefined | string);
+
+export type undefinedOrString3 = (undefined | string);
+
+export type undefinedOrString4 = (undefined | string);
+
+export type record = { readonly i: number; readonly s: string };
+
+export type decorator<a,b> = (_1:a) => b;
+
+export type marshalFields = {
+  readonly _rec: string; 
+  readonly _switch: string; 
+  readonly switch: string; 
+  readonly __: string; 
+  readonly ___: string; 
+  readonly foo__: string; 
+  readonly _foo__: string; 
+  readonly _Uppercase: string; 
+  readonly _Uppercase__: string
+};
+
+export type marshalMutableField = { _match: number };
+
+export type ocaml_array<a> = a[];
+
+export type someRecord = { readonly id: number };
+
+export type instantiateTypeParameter = ocaml_array<someRecord>;
+
+export type vector<a> = [a, a];
+export type Vector<a> = vector<a>;
+
+export type date = Date;
+
+export type ObjectId_t = number;
+
+export type tPrimed = [TypeNameSanitize_t_, TypeNameSanitize_M_t__];
+
+export const someIntList: list<number> = NestedTypesJS.someIntList as any;
+
+export const map: <T1,T2>(_1:Belt_List_t<T1>, _2:((_1:T1) => T2)) => Belt_List_t<T2> = NestedTypesJS.map as any;
+
+export const swap: (tree:tree) => tree = NestedTypesJS.swap as any;
+
+export const selfRecursiveConverter: (param:selfRecursive) => selfRecursive = NestedTypesJS.selfRecursiveConverter as any;
+
+export const mutuallyRecursiveConverter: (param:mutuallyRecursiveA) => mutuallyRecursiveB = NestedTypesJS.mutuallyRecursiveConverter as any;
+
+export const testFunctionOnOptionsAsArgument: <T1,a>(a:(undefined | a), foo:((_1:(undefined | a)) => T1)) => T1 = NestedTypesJS.testFunctionOnOptionsAsArgument as any;
+
+export const stringT: string = NestedTypesJS.stringT as any;
+
+export const jsStringT: string = NestedTypesJS.jsStringT as any;
+
+export const jsString2T: string = NestedTypesJS.jsString2T as any;
+
+export const jsonStringify: (_1:Js_Json_t) => string = NestedTypesJS.jsonStringify as any;
+
+export const testConvertNull: (x:(null | record)) => (null | record) = NestedTypesJS.testConvertNull as any;
+
+export const testConvertLocation: (x:Location_t) => Location_t = NestedTypesJS.testConvertLocation as any;
+
+export const testMarshalFields: marshalFields = NestedTypesJS.testMarshalFields as any;
+
+export const setMatch: (x:marshalMutableField) => void = NestedTypesJS.setMatch as any;
+
+export const testInstantiateTypeParameter: (x:instantiateTypeParameter) => instantiateTypeParameter = NestedTypesJS.testInstantiateTypeParameter as any;
+
+export const currentTime: Date = NestedTypesJS.currentTime as any;
+
+export const optFunction: (undefined | (() => number)) = NestedTypesJS.optFunction as any;
diff --git a/tests/gentype_tests/typescript-react-example/src/nested/NestedTypes.js b/tests/gentype_tests/typescript-react-example/src/nested/NestedTypes.js
diff --git a/tests/gentype_tests/typescript-react-example/src/nested/NestedTypes.res b/tests/gentype_tests/typescript-react-example/src/nested/NestedTypes.res

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`"@tests/reanalyze-deadcode",`
`9`	`9`	`"@tests/incremental-typechecking",`
`10`	`10`	`"@tests/reanalyze-termination"`
`11`		`- ]`
	`11`	`+ ],`
	`12`	`+ "jsx": { "version": 4 }`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "test-generic-jsx-transform",`
	`2`	`+ "name": "@tests/incremental-typechecking",`
`3`	`3`	`"sources": [`
`4`	`4`	`{`
`5`	`5`	`"dir": "src",`
-Original file line number
+Diff line change
@@ @@ -1,2 +1,2 @@ @@
 -let x = Js.Json.Array()
 -//                    ^com
 +// let x = Js.Json.Array()
 +//                       ^com
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ module WithVariant = {`
`2`	`2`	`type t = One({miss: bool}) \| Two(bool)`
`3`	`3`	`}`
`4`	`4`
`5`		`-let x = WithVariant.One()`
`6`		`-// ^com`
	`5`	`+// let x = WithVariant.One()`
	`6`	`+// ^com`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`},`
`8`	`8`	`"name": "@tests/reanalyze-deadcode",`
`9`	`9`	`"jsx": { "version": 4 },`
`10`		`- "bs-dependencies": ["@rescript/react"],`
	`10`	`+ "bs-dependencies": ["@tests/rescript-react"],`
`11`	`11`	`"sources": [`
`12`	`12`	`{`
`13`	`13`	`"dir": "src",`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"suppress": [],`
`5`	`5`	`"unsuppress": []`
`6`	`6`	`},`
`7`		`- "name": "arnold",`
	`7`	`+ "name": "@tests/reanalyze-termination",`
`8`	`8`	`"bs-dependencies": [],`
`9`	`9`	`"sources": [`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"bsc-flags": ["-w -33-44-8"],`
`13`		`- "bs-dependencies": ["@rescript/react"],`
	`13`	`+ "bs-dependencies": ["@tests/rescript-react"],`
`14`	`14`	`"jsx": { "version": 4 },`
`15`	`15`	`"suffix": ".res.js",`
`16`	`16`	`"editor": {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"name": "@tests/gentype-react-example",`
`19`	`19`	`"bsc-flags": [],`
`20`	`20`	`"jsx": { "version": 4 },`
`21`		`- "bs-dependencies": ["@rescript/react"],`
	`21`	`+ "bs-dependencies": ["@tests/rescript-react"],`
`22`	`22`	`"sources": [`
`23`	`23`	`{`
`24`	`24`	`"dir": "src",`