(Js.)Dict.t -> dict

Author: cknitt

runtime/Dict.res

@@ -1,4 +1,4 @@
-type t<'a> = Js.Dict.t<'a>
+type t<'a> = dict<'a>
 
 @get_index external getUnsafe: (t<'a>, string) => 'a = ""
 @get_index external get: (t<'a>, string) => option<'a> = ""

runtime/Dict.resi

@@ -6,7 +6,7 @@ Compiles to a regular JavaScript object.*/
 /**
 Type representing a dictionary of value `'a`.
 */
-type t<'a> = Js.Dict.t<'a>
+type t<'a> = dict<'a>
 
 /**
 `getUnsafe(dict, key)` Returns the `value` at the provided `key`.
@@ -71,7 +71,7 @@ let delete: (t<'a>, string) => unit
 
 ## Examples
 ```rescript
-let dict1: Dict.t<int> = Dict.make() // You can annotate the type of the values of your dict yourself if you want
+let dict1: dict<int> = Dict.make() // You can annotate the type of the values of your dict yourself if you want
 
 let dict2 = Dict.make() // Or you can let ReScript infer it via usage.
 dict2->Dict.set("someKey", 12)
@@ -99,7 +99,7 @@ external fromArray: array<(string, 'a)> => t<'a> = "Object.fromEntries"
 // Pretend we have an iterator of the correct shape
 @val external someIterator: Iterator.t<(string, int)> = "someIterator"
 
-let dict = Dict.fromIterator(someIterator) // Dict.t<int>
+let dict = Dict.fromIterator(someIterator) // dict<int>
 ```
 */
 @val

runtime/JSON.res

@@ -4,7 +4,7 @@ type rec t = Js.Json.t =
   | @as(null) Null
   | String(string)
   | Number(float)
-  | Object(Dict.t<t>)
+  | Object(dict<t>)
   | Array(array<t>)
 
 @unboxed
@@ -47,15 +47,15 @@ module Classify = {
     | Null
     | String(string)
     | Number(float)
-    | Object(Dict.t<t>)
+    | Object(dict<t>)
     | Array(array<t>)
 
   @val external _internalClass: 'a => string = "Object.prototype.toString.call"
   external _asBool: 'a => bool = "%identity"
   external _asString: 'a => string = "%identity"
   external _asFloat: 'a => float = "%identity"
   external _asArray: 'a => array<Js.Json.t> = "%identity"
-  external _asDict: 'a => Dict.t<Js.Json.t> = "%identity"
+  external _asDict: 'a => dict<Js.Json.t> = "%identity"
 
   let classify = value => {
     switch _internalClass(value) {
@@ -75,7 +75,7 @@ module Encode = {
   external string: string => t = "%identity"
   external int: int => t = "%identity"
   external float: float => t = "%identity"
-  external object: Dict.t<t> => t = "%identity"
+  external object: dict<t> => t = "%identity"
   external array: array<t> => t = "%identity"
 }
 
@@ -86,7 +86,7 @@ module Decode = {
   let float = (json: t) => Type.typeof(json) === #number ? Some((Obj.magic(json): float)) : None
   let object = (json: t) =>
     if Type.typeof(json) === #object && !Array.isArray(json) && !(Obj.magic(json) === Null.null) {
-      Some((Obj.magic(json): Dict.t<t>))
+      Some((Obj.magic(json): dict<t>))
     } else {
       None
     }

runtime/JSON.resi

@@ -11,7 +11,7 @@ type rec t = Js.Json.t =
   | @as(null) Null
   | String(string)
   | Number(float)
-  | Object(Dict.t<t>)
+  | Object(dict<t>)
   | Array(array<t>)
 
 @unboxed
@@ -578,7 +578,7 @@ module Classify: {
     | Null
     | String(string)
     | Number(float)
-    | Object(Dict.t<t>)
+    | Object(dict<t>)
     | Array(array<t>)
 
   /**
@@ -660,7 +660,7 @@ module Encode: {
   JSON.Encode.object(dict)
   ```
   */
-  external object: Dict.t<t> => t = "%identity"
+  external object: dict<t> => t = "%identity"
 
   /**
   Returns an array as a JSON object.
@@ -733,7 +733,7 @@ module Decode: {
   let float: t => option<float>
 
   /**
-  Decodes a single JSON value. If the value is an object, it will return `Some(Dict.t)` - otherwise it will return `None`.
+  Decodes a single JSON value. If the value is an object, it will return `Some(dict)` - otherwise it will return `None`.
 
   ## Examples
   ```rescript
@@ -744,7 +744,7 @@ module Decode: {
   // None
   ```
   */
-  let object: t => option<Dict.t<t>>
+  let object: t => option<dict<t>>
 
   /**
   Decodes a single JSON value. If the value is an array, it will return `Some(array)` - otherwise it will return `None`.

runtime/Js_json.res

@@ -30,15 +30,15 @@ type rec t =
   | @as(null) Null
   | String(string)
   | Number(float)
-  | Object(Js_dict.t<t>)
+  | Object(dict<t>)
   | Array(array<t>)
 
 module Kind = {
   type json = t
   type rec t<_> =
     | String: t<Js_string.t>
     | Number: t<float>
-    | Object: t<Js_dict.t<json>>
+    | Object: t<dict<json>>
     | Array: t<array<json>>
     | Boolean: t<bool>
     | Null: t<Js_types.null_val>
@@ -50,7 +50,7 @@ type tagged_t =
   | JSONNull
   | JSONString(string)
   | JSONNumber(float)
-  | JSONObject(Js_dict.t<t>)
+  | JSONObject(dict<t>)
   | JSONArray(array<t>)
 
 let classify = (x: t): tagged_t => {
@@ -105,7 +105,7 @@ let decodeObject = json =>
       (!Js_array2.isArray(json) &&
       !((Obj.magic(json): Js_null.t<'a>) === Js_extern.null))
   ) {
-    Some((Obj.magic((json: t)): Js_dict.t<t>))
+    Some((Obj.magic((json: t)): dict<t>))
   } else {
     None
   }
@@ -143,15 +143,15 @@ let decodeNull = (json): option<Js_null.t<_>> =>
 external string: string => t = "%identity"
 external number: float => t = "%identity"
 external boolean: bool => t = "%identity"
-external object_: Js_dict.t<t> => t = "%identity"
+external object_: dict<t> => t = "%identity"
 
 /* external array_ : t array -> t = "%identity" */
 
 external array: array<t> => t = "%identity"
 external stringArray: array<string> => t = "%identity"
 external numberArray: array<float> => t = "%identity"
 external booleanArray: array<bool> => t = "%identity"
-external objectArray: array<Js_dict.t<t>> => t = "%identity"
+external objectArray: array<dict<t>> => t = "%identity"
 @val @scope("JSON") external stringify: t => string = "stringify"
 @val @scope("JSON") external stringifyWithSpace: (t, @as(json`null`) _, int) => string = "stringify"
 

runtime/Js_json.resi

@@ -36,7 +36,7 @@ type rec t =
   | @as(null) Null
   | String(string)
   | Number(float)
-  | Object(Js_dict.t<t>)
+  | Object(dict<t>)
   | Array(array<t>)
 
 module Kind: {
@@ -45,7 +45,7 @@ module Kind: {
   type rec t<_> =
     | String: t<Js_string.t>
     | Number: t<float>
-    | Object: t<Js_dict.t<json>>
+    | Object: t<dict<json>>
     | Array: t<array<json>>
     | Boolean: t<bool>
     | Null: t<Js_types.null_val>
@@ -57,7 +57,7 @@ type tagged_t =
   | JSONNull
   | JSONString(string)
   | JSONNumber(float)
-  | JSONObject(Js_dict.t<t>)
+  | JSONObject(dict<t>)
   | JSONArray(array<t>)
 
 /* ## Accessors */
@@ -82,7 +82,7 @@ let decodeNumber: t => option<float>
 /**
 `decodeObject(json)` returns `Some(o)` if `json` is an `object`, `None` otherwise.
 */
-let decodeObject: t => option<Js_dict.t<t>>
+let decodeObject: t => option<dict<t>>
 
 /**
 `decodeArray(json)` returns `Some(a)` if `json` is an `array`, `None` otherwise.
@@ -118,8 +118,8 @@ external number: float => t = "%identity"
 /** `boolean(b)` makes a JSON boolean of the `bool` `b`. */
 external boolean: bool => t = "%identity"
 
-/** `object_(dict)` makes a JSON object of the `Js.Dict.t` `dict`. */
-external object_: Js_dict.t<t> => t = "%identity"
+/** `object_(dict)` makes a JSON object of the `dict`. */
+external object_: dict<t> => t = "%identity"
 
 /** `array_(a)` makes a JSON array of the `Js.Json.t` array `a`. */
 external array: array<t> => t = "%identity"
@@ -140,7 +140,7 @@ external numberArray: array<float> => t = "%identity"
 external booleanArray: array<bool> => t = "%identity"
 
 /** `objectArray(a) makes a JSON array of the `JsDict.t` array `a`. */
-external objectArray: array<Js_dict.t<t>> => t = "%identity"
+external objectArray: array<dict<t>> => t = "%identity"
 
 /* ## String conversion */
 
@@ -178,7 +178,7 @@ let getIds = s => {
 
   switch Js.Json.classify(json) {
   | Js.Json.JSONObject(value) =>
-    /* In this branch, compiler infer value : Js.Json.t Js.Dict.t */
+    /* In this branch, compiler infer value : Js.Json.t dict */
     switch Js.Dict.get(value, "ids") {
     | Some(ids) =>
       switch Js.Json.classify(ids) {

tests/gentype_tests/typescript-react-example/package-lock.json

@@ -17,10 +17,10 @@ let undefined0 = (x: Js.undefined<int>) => x
 let undefined1 = (x: Undefined.t<int>) => x
 
 @genType
-let dict0 = (x: Js.Dict.t<string>) => x
+let dict0 = (x: dict<string>) => x
 
 @genType
-let dict1 = (x: Dict.t<string>) => x
+let dict1 = (x: dict<string>) => x
 
 @genType
 let promise0 = (x: promise<string>) => x

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

@@ -1 +1 @@
-type t<'a> = Js.Dict.t<'a>
+type t<'a> = dict<'a>

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

@@ -60,7 +60,7 @@ type opaqueVariant =
 @gentype
 type genTypeMispelled = int
 
-@genType type dictString = Js.Dict.t<string>
+@genType type dictString = dict<string>
 
 @genType let jsonStringify = Js.Json.stringify