wip

cknitt · cknitt · commit 2410ffb1ae1f · 2025-02-10T17:01:32.000+01:00
diff --git a/lib/es6/Stdlib.js b/lib/es6/Stdlib.js
@@ -11,7 +11,7 @@ function assertEqual(a, b) {
     RE_EXN_ID: "Assert_failure",
     _1: [
       "Stdlib.res",
-      312,
+      314,
       4
     ],
     Error: new Error()
@@ -56,6 +56,10 @@ let $$Int16Array;
 
 let $$Int32Array;
 
+let $$Iterator;
+
+let $$JSON;
+
 let List;
 
 let $$Map;
@@ -122,6 +126,8 @@ export {
   $$Int8Array,
   $$Int16Array,
   $$Int32Array,
+  $$Iterator,
+  $$JSON,
   List,
   $$Map,
   $$Math,
diff --git a/lib/es6/Stdlib_Iterator.js b/lib/es6/Stdlib_Iterator.js
diff --git a/lib/es6/Stdlib_JSON.js b/lib/es6/Stdlib_JSON.js
diff --git a/lib/js/Stdlib.js b/lib/js/Stdlib.js
@@ -11,7 +11,7 @@ function assertEqual(a, b) {
     RE_EXN_ID: "Assert_failure",
     _1: [
       "Stdlib.res",
-      312,
+      314,
       4
     ],
     Error: new Error()
@@ -56,6 +56,10 @@ let $$Int16Array;
 
 let $$Int32Array;
 
+let $$Iterator;
+
+let $$JSON;
+
 let List;
 
 let $$Map;
@@ -121,6 +125,8 @@ exports.Int = Int;
 exports.$$Int8Array = $$Int8Array;
 exports.$$Int16Array = $$Int16Array;
 exports.$$Int32Array = $$Int32Array;
+exports.$$Iterator = $$Iterator;
+exports.$$JSON = $$JSON;
 exports.List = List;
 exports.$$Map = $$Map;
 exports.$$Math = $$Math;
diff --git a/lib/js/Stdlib_Iterator.js b/lib/js/Stdlib_Iterator.js
diff --git a/lib/js/Stdlib_JSON.js b/lib/js/Stdlib_JSON.js
diff --git a/packages/artifacts.txt b/packages/artifacts.txt
@@ -89,8 +89,6 @@ lib/es6/Intl_PluralRules.js
 lib/es6/Intl_RelativeTimeFormat.js
 lib/es6/Intl_Segmenter.js
 lib/es6/Intl_Segments.js
-lib/es6/Iterator.js
-lib/es6/JSON.js
 lib/es6/Js.js
 lib/es6/Js_OO.js
 lib/es6/Js_array.js
@@ -178,6 +176,8 @@ lib/es6/Stdlib_Int.js
 lib/es6/Stdlib_Int16Array.js
 lib/es6/Stdlib_Int32Array.js
 lib/es6/Stdlib_Int8Array.js
+lib/es6/Stdlib_Iterator.js
+lib/es6/Stdlib_JSON.js
 lib/es6/Stdlib_List.js
 lib/es6/Stdlib_Map.js
 lib/es6/Stdlib_Math.js
@@ -260,8 +260,6 @@ lib/js/Intl_PluralRules.js
 lib/js/Intl_RelativeTimeFormat.js
 lib/js/Intl_Segmenter.js
 lib/js/Intl_Segments.js
-lib/js/Iterator.js
-lib/js/JSON.js
 lib/js/Js.js
 lib/js/Js_OO.js
 lib/js/Js_array.js
@@ -349,6 +347,8 @@ lib/js/Stdlib_Int.js
 lib/js/Stdlib_Int16Array.js
 lib/js/Stdlib_Int32Array.js
 lib/js/Stdlib_Int8Array.js
+lib/js/Stdlib_Iterator.js
+lib/js/Stdlib_JSON.js
 lib/js/Stdlib_List.js
 lib/js/Stdlib_Map.js
 lib/js/Stdlib_Math.js
@@ -686,18 +686,6 @@ lib/ocaml/Intl_Segments.cmi
 lib/ocaml/Intl_Segments.cmj
 lib/ocaml/Intl_Segments.cmt
 lib/ocaml/Intl_Segments.res
-lib/ocaml/Iterator.cmi
-lib/ocaml/Iterator.cmj
-lib/ocaml/Iterator.cmt
-lib/ocaml/Iterator.cmti
-lib/ocaml/Iterator.res
-lib/ocaml/Iterator.resi
-lib/ocaml/JSON.cmi
-lib/ocaml/JSON.cmj
-lib/ocaml/JSON.cmt
-lib/ocaml/JSON.cmti
-lib/ocaml/JSON.res
-lib/ocaml/JSON.resi
 lib/ocaml/Js.cmi
 lib/ocaml/Js.cmj
 lib/ocaml/Js.cmt
@@ -1098,6 +1086,18 @@ lib/ocaml/Stdlib_Int8Array.cmi
 lib/ocaml/Stdlib_Int8Array.cmj
 lib/ocaml/Stdlib_Int8Array.cmt
 lib/ocaml/Stdlib_Int8Array.res
+lib/ocaml/Stdlib_Iterator.cmi
+lib/ocaml/Stdlib_Iterator.cmj
+lib/ocaml/Stdlib_Iterator.cmt
+lib/ocaml/Stdlib_Iterator.cmti
+lib/ocaml/Stdlib_Iterator.res
+lib/ocaml/Stdlib_Iterator.resi
+lib/ocaml/Stdlib_JSON.cmi
+lib/ocaml/Stdlib_JSON.cmj
+lib/ocaml/Stdlib_JSON.cmt
+lib/ocaml/Stdlib_JSON.cmti
+lib/ocaml/Stdlib_JSON.res
+lib/ocaml/Stdlib_JSON.resi
 lib/ocaml/Stdlib_List.cmi
 lib/ocaml/Stdlib_List.cmj
 lib/ocaml/Stdlib_List.cmt
diff --git a/runtime/RescriptTools_Docgen.res b/runtime/RescriptTools_Docgen.res
@@ -102,4 +102,4 @@ type doc = {
 /**
 `decodeFromJson(json)` parse JSON generated from `restool doc` command
 */
-external decodeFromJson: JSON.t => doc = "%identity"
+external decodeFromJson: Stdlib_JSON.t => doc = "%identity"
diff --git a/runtime/RescriptTools_Docgen.resi b/runtime/RescriptTools_Docgen.resi
@@ -99,4 +99,4 @@ type doc = {
   items: array<item>,
 }
 
-let decodeFromJson: JSON.t => doc
+let decodeFromJson: Stdlib_JSON.t => doc
diff --git a/runtime/Stdlib.res b/runtime/Stdlib.res
@@ -17,6 +17,8 @@ module Int = Stdlib_Int
 module Int8Array = Stdlib_Int8Array
 module Int16Array = Stdlib_Int16Array
 module Int32Array = Stdlib_Int32Array
+module Iterator = Stdlib_Iterator
+module JSON = Stdlib_JSON
 module List = Stdlib_List
 module Map = Stdlib_Map
 module Math = Stdlib_Math
diff --git a/runtime/Stdlib_Array.res b/runtime/Stdlib_Array.res
@@ -5,7 +5,7 @@ external setUnsafe: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
 
 external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
 
-@val external fromIterator: Iterator.t<'a> => array<'a> = "Array.from"
+@val external fromIterator: Stdlib_Iterator.t<'a> => array<'a> = "Array.from"
 @val external fromArrayLike: Js.Array2.array_like<'a> => array<'a> = "Array.from"
 @val
 external fromArrayLikeWithMap: (Js.Array2.array_like<'a>, 'a => 'b) => array<'b> = "Array.from"
diff --git a/runtime/Stdlib_Array.resi b/runtime/Stdlib_Array.resi
@@ -13,7 +13,7 @@ Map.fromArray([("foo", 1), ("bar", 2)])
 ```
 */
 @val
-external fromIterator: Iterator.t<'a> => array<'a> = "Array.from"
+external fromIterator: Stdlib_Iterator.t<'a> => array<'a> = "Array.from"
 
 // TODO: Docs
 @val external fromArrayLike: Js.Array2.array_like<'a> => array<'a> = "Array.from"
diff --git a/runtime/Stdlib_Dict.res b/runtime/Stdlib_Dict.res
@@ -12,7 +12,7 @@ let delete = (dict, string) => {
 @obj external make: unit => dict<'a> = ""
 
 @val external fromArray: array<(string, 'a)> => dict<'a> = "Object.fromEntries"
-@val external fromIterator: Iterator.t<(string, 'a)> => dict<'a> = "Object.fromEntries"
+@val external fromIterator: Stdlib_Iterator.t<(string, 'a)> => dict<'a> = "Object.fromEntries"
 
 @val external toArray: dict<'a> => array<(string, 'a)> = "Object.entries"
 
diff --git a/runtime/Stdlib_Dict.resi b/runtime/Stdlib_Dict.resi
@@ -113,7 +113,7 @@ iterator
 ```
 */
 @val
-external fromIterator: Iterator.t<(string, 'a)> => dict<'a> = "Object.fromEntries"
+external fromIterator: Stdlib_Iterator.t<(string, 'a)> => dict<'a> = "Object.fromEntries"
 
 /**
 `toArray(dictionary)` returns an array of all the key/value pairs of the dictionary.
diff --git a/runtime/Stdlib_Iterator.res b/runtime/Stdlib_Iterator.res
diff --git a/runtime/Stdlib_Iterator.resi b/runtime/Stdlib_Iterator.resi
diff --git a/runtime/Stdlib_JSON.res b/runtime/Stdlib_JSON.res
diff --git a/runtime/Stdlib_JSON.resi b/runtime/Stdlib_JSON.resi
diff --git a/runtime/Stdlib_Map.res b/runtime/Stdlib_Map.res
@@ -2,7 +2,7 @@ type t<'k, 'v>
 
 @new external make: unit => t<'k, 'v> = "Map"
 @new external fromArray: array<('k, 'v)> => t<'k, 'v> = "Map"
-@new external fromIterator: Iterator.t<('k, 'v)> => t<'k, 'v> = "Map"
+@new external fromIterator: Stdlib_Iterator.t<('k, 'v)> => t<'k, 'v> = "Map"
 
 @get external size: t<'k, 'v> => int = "size"
 
@@ -16,6 +16,6 @@ type t<'k, 'v>
 @send external set: (t<'k, 'v>, 'k, 'v) => unit = "set"
 @send external delete: (t<'k, 'v>, 'k) => bool = "delete"
 
-@send external keys: t<'k, 'v> => Iterator.t<'k> = "keys"
-@send external values: t<'k, 'v> => Iterator.t<'v> = "values"
-@send external entries: t<'k, 'v> => Iterator.t<('k, 'v)> = "entries"
+@send external keys: t<'k, 'v> => Stdlib_Iterator.t<'k> = "keys"
+@send external values: t<'k, 'v> => Stdlib_Iterator.t<'v> = "values"
+@send external entries: t<'k, 'v> => Stdlib_Iterator.t<('k, 'v)> = "entries"
diff --git a/runtime/Stdlib_Map.resi b/runtime/Stdlib_Map.resi
@@ -78,7 +78,7 @@ iterator
 ```
 */
 @new
-external fromIterator: Iterator.t<('k, 'v)> => t<'k, 'v> = "Map"
+external fromIterator: Stdlib_Iterator.t<('k, 'v)> => t<'k, 'v> = "Map"
 
 /**
 Returns the size, the number of key/value pairs, of the map.
@@ -231,7 +231,7 @@ Console.log(map->Map.keys->Iterator.toArray)
 ```
 */
 @send
-external keys: t<'k, 'v> => Iterator.t<'k> = "keys"
+external keys: t<'k, 'v> => Stdlib_Iterator.t<'k> = "keys"
 
 /**
 Returns an iterator that holds all values of the map.
@@ -253,7 +253,7 @@ Console.log(map->Map.values->Iterator.toArray)
 ```
 */
 @send
-external values: t<'k, 'v> => Iterator.t<'v> = "values"
+external values: t<'k, 'v> => Stdlib_Iterator.t<'v> = "values"
 
 /**
 Returns an iterator that holds all entries of the map.
@@ -276,4 +276,4 @@ Console.log(map->Map.entries->Iterator.toArray)
 ```
 */
 @send
-external entries: t<'k, 'v> => Iterator.t<('k, 'v)> = "entries"
+external entries: t<'k, 'v> => Stdlib_Iterator.t<('k, 'v)> = "entries"
diff --git a/runtime/Stdlib_Set.res b/runtime/Stdlib_Set.res
@@ -2,7 +2,7 @@ type t<'a>
 
 @new external make: unit => t<'a> = "Set"
 @new external fromArray: array<'a> => t<'a> = "Set"
-@new external fromIterator: Iterator.t<'a> => t<'a> = "Set"
+@new external fromIterator: Stdlib_Iterator.t<'a> => t<'a> = "Set"
 
 @get external size: t<'a> => int = "size"
 
@@ -14,7 +14,7 @@ type t<'a>
 
 @send external forEach: (t<'a>, 'a => unit) => unit = "forEach"
 
-@send external values: t<'a> => Iterator.t<'a> = "values"
+@send external values: t<'a> => Stdlib_Iterator.t<'a> = "values"
 
 @send external difference: (t<'a>, t<'a>) => t<'a> = "difference"
 @send external intersection: (t<'a>, t<'a>) => t<'a> = "intersection"
diff --git a/runtime/Stdlib_Set.resi b/runtime/Stdlib_Set.resi
@@ -73,7 +73,7 @@ iterator
 ```
 */
 @new
-external fromIterator: Iterator.t<'a> => t<'a> = "Set"
+external fromIterator: Stdlib_Iterator.t<'a> => t<'a> = "Set"
 
 /**
 Returns the size, the number of unique values, of the set.
@@ -206,7 +206,7 @@ Console.log(set->Set.values->Iterator.toArray)
 ```
 */
 @send
-external values: t<'a> => Iterator.t<'a> = "values"
+external values: t<'a> => Stdlib_Iterator.t<'a> = "values"
 
 /** 
 Returns a new set with the values of the set that are not in the other set.
diff --git a/tests/gentype_tests/typescript-react-example/src/Core.gen.tsx b/tests/gentype_tests/typescript-react-example/src/Core.gen.tsx
@@ -8,21 +8,25 @@ import {someFunWithNullThenOptionalArgs as someFunWithNullThenOptionalArgsNotChe
 import {someFunWithNullUndefinedArg as someFunWithNullUndefinedArgNotChecked} from './CoreTS';
 
 // In case of type error, check the type of 'someFunWithNullThenOptionalArgs' in 'Core.res' and './CoreTS'.
-export const someFunWithNullThenOptionalArgsTypeChecked: (_1:(null | string), _2:(undefined | string)) => string = someFunWithNullThenOptionalArgsNotChecked as any;
+export const someFunWithNullThenOptionalArgsTypeChecked: (_1:Stdlib_Null_t<string>, _2:(undefined | string)) => string = someFunWithNullThenOptionalArgsNotChecked as any;
 
 // Export 'someFunWithNullThenOptionalArgs' early to allow circular import from the '.bs.js' file.
-export const someFunWithNullThenOptionalArgs: unknown = someFunWithNullThenOptionalArgsTypeChecked as (_1:(null | string), _2:(undefined | string)) => string as any;
+export const someFunWithNullThenOptionalArgs: unknown = someFunWithNullThenOptionalArgsTypeChecked as (_1:Stdlib_Null_t<string>, _2:(undefined | string)) => string as any;
 
 // In case of type error, check the type of 'someFunWithNullUndefinedArg' in 'Core.res' and './CoreTS'.
-export const someFunWithNullUndefinedArgTypeChecked: (_1:(null | undefined | string), _2:number) => string = someFunWithNullUndefinedArgNotChecked as any;
+export const someFunWithNullUndefinedArgTypeChecked: (_1:Stdlib_Nullable_t<string>, _2:number) => string = someFunWithNullUndefinedArgNotChecked as any;
 
 // Export 'someFunWithNullUndefinedArg' early to allow circular import from the '.bs.js' file.
-export const someFunWithNullUndefinedArg: unknown = someFunWithNullUndefinedArgTypeChecked as (_1:(null | undefined | string), _2:number) => string as any;
+export const someFunWithNullUndefinedArg: unknown = someFunWithNullUndefinedArgTypeChecked as (_1:Stdlib_Nullable_t<string>, _2:number) => string as any;
 
 const CoreJS = require('./Core.res.js');
 
 import type {Date_t as Stdlib_Date_t} from './Stdlib.gen';
 
+import type {Null_t as Stdlib_Null_t} from './Stdlib.gen';
+
+import type {Nullable_t as Stdlib_Nullable_t} from './Stdlib.gen';
+
 import type {Promise_t as Stdlib_Promise_t} from './Stdlib.gen';
 
 import type {RegExp_t as Stdlib_RegExp_t} from './Stdlib.gen';
@@ -39,11 +43,11 @@ export type t2 = { readonly x: (undefined | string) };
 
 export const null0: (x:(null | number)) => (null | number) = CoreJS.null0 as any;
 
-export const null1: (x:(null | number)) => (null | number) = CoreJS.null1 as any;
+export const null1: (x:Stdlib_Null_t<number>) => Stdlib_Null_t<number> = CoreJS.null1 as any;
 
 export const nullable0: (x:(null | undefined | number)) => (null | undefined | number) = CoreJS.nullable0 as any;
 
-export const nullable1: (x:(null | undefined | number)) => (null | undefined | number) = CoreJS.nullable1 as any;
+export const nullable1: (x:Stdlib_Nullable_t<number>) => Stdlib_Nullable_t<number> = CoreJS.nullable1 as any;
 
 export const undefined0: (x:(undefined | number)) => (undefined | number) = CoreJS.undefined0 as any;
 
diff --git a/tests/tests/src/core/Core_IteratorTests.mjs b/tests/tests/src/core/Core_IteratorTests.mjs
@@ -1,7 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Test from "./Test.mjs";
-import * as $$Iterator from "rescript/lib/es6/Iterator.js";
+import * as Stdlib_Iterator from "rescript/lib/es6/Stdlib_Iterator.js";
 import * as Primitive_object from "rescript/lib/es6/Primitive_object.js";
 import * as Stdlib_AsyncIterator from "rescript/lib/es6/Stdlib_AsyncIterator.js";
 
@@ -17,7 +17,7 @@ let syncResult = {
   contents: undefined
 };
 
-$$Iterator.forEach(iterator, v => {
+Stdlib_Iterator.forEach(iterator, v => {
   if (v === "b") {
     syncResult.contents = "b";
     return;
diff --git a/tests/tests/src/core/Core_TempTests.mjs b/tests/tests/src/core/Core_TempTests.mjs
@@ -1,8 +1,8 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as $$JSON from "rescript/lib/es6/JSON.js";
 import * as Stdlib_Int from "rescript/lib/es6/Stdlib_Int.js";
 import * as Stdlib_Dict from "rescript/lib/es6/Stdlib_Dict.js";
+import * as Stdlib_JSON from "rescript/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Array from "rescript/lib/es6/Stdlib_Array.js";
 import * as Stdlib_Float from "rescript/lib/es6/Stdlib_Float.js";
 import * as Stdlib_BigInt from "rescript/lib/es6/Stdlib_BigInt.js";
@@ -97,14 +97,14 @@ console.info("---");
 
 let json = JSON.parse("{\"foo\": \"bar\"}");
 
-let json$1 = $$JSON.Classify.classify(json);
+let json$1 = Stdlib_JSON.Classify.classify(json);
 
 let tmp;
 
 if (typeof json$1 !== "object" || json$1.TAG !== "Object") {
   tmp = undefined;
 } else {
-  let value = $$JSON.Classify.classify(json$1._0["foo"]);
+  let value = Stdlib_JSON.Classify.classify(json$1._0["foo"]);
   tmp = typeof value !== "object" || value.TAG !== "String" ? undefined : value._0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,4 @@ type doc = {`
`99`	`99`	`items: array<item>,`
`100`	`100`	`}`
`101`	`101`
`102`		`-let decodeFromJson: JSON.t => doc`
	`102`	`+let decodeFromJson: Stdlib_JSON.t => doc`