Specialize uses of new dict literal to direct JS object creation

CHANGELOG.md

@@ -16,6 +16,7 @@
 
 - Allow coercing polyvariants to variants when we can guarantee that the runtime representation matches. https://github.com/rescript-lang/rescript-compiler/pull/6981
 - Add new dict literal syntax (`dict{"foo": "bar"}`). https://github.com/rescript-lang/rescript-compiler/pull/6774
+- Optimize usage of the new dict literal syntax to emit an actual JS object literal. https://github.com/rescript-lang/rescript-compiler/pull/6538
 
 #### :nail_care: Polish
 
@@ -2618,4 +2619,4 @@ Features:
 
 # 1.0.0
 
-Initial release
+Initial release

jscomp/core/lam_dispatch_primitive.ml

@@ -264,6 +264,17 @@ let translate loc (prim_name : string) (args : J.expression list) : J.expression
       match args with
       | [e] -> {e with expression_desc = Await e}
       | _ -> assert false)
+  | "?create_dict" -> (
+    match args with
+    | [{expression_desc = Array (items, _)}] ->
+        E.obj
+        (items
+        |> List.filter_map (fun (exp : J.expression) ->
+                match exp.expression_desc with
+                | Caml_block ([{expression_desc = Str {txt}}; expr], _, _, _) ->
+                    Some (Js_op.Lit txt, expr)
+                | _ -> None))
+    | _ -> assert false)
   | missing_impl ->
     let msg = Warnings.message (Bs_unimplemented_primitive missing_impl) in
     Location.raise_errorf ~loc "%s" msg

jscomp/runtime/caml_dict.res

@@ -0,0 +1 @@
+external unsafe_create: array<(string, 'a)> => dict<'a> = "?create_dict"

jscomp/runtime/caml_dict.resi

@@ -0,0 +1 @@
+external unsafe_create: array<(string, 'a)> => dict<'a> = "?create_dict"

jscomp/runtime/release.ninja

@@ -21,6 +21,8 @@ o runtime/caml_bigint.cmj : cc_cmi runtime/caml_bigint.res | runtime/caml_bigint
 o runtime/caml_bigint.cmi : cc runtime/caml_bigint.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_bytes.cmj : cc_cmi runtime/caml_bytes.res | runtime/caml_bytes.cmi
 o runtime/caml_bytes.cmi : cc runtime/caml_bytes.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
+o runtime/caml_dict.cmj : cc_cmi runtime/caml_dict.res | runtime/caml_dict.cmi
+o runtime/caml_dict.cmi : cc runtime/caml_dict.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_exceptions.cmj : cc_cmi runtime/caml_exceptions.res | runtime/caml_exceptions.cmi
 o runtime/caml_exceptions.cmi : cc runtime/caml_exceptions.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_float.cmj : cc_cmi runtime/caml_float.res | runtime/caml_float.cmi runtime/caml_float_extern.cmj
@@ -62,4 +64,4 @@ o runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj : cc runti
 o runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.res | runtime/bs_stdlib_mini.cmi runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
-o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml.cmi runtime/caml.cmj runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bigint.cmi runtime/caml_bigint.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_bigint_extern.cmi runtime/caml_bigint_extern.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj
+o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml.cmi runtime/caml.cmj runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bigint.cmi runtime/caml_bigint.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_dict.cmi runtime/caml_dict.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_bigint_extern.cmi runtime/caml_bigint_extern.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj

jscomp/syntax/src/res_comments_table.ml

@@ -1349,11 +1349,7 @@ and walk_expression expr t comments =
       ( {
           pexp_desc =
             Pexp_ident
-              {
-                txt =
-                  Longident.Ldot
-                    (Longident.Ldot (Lident "Js", "Dict"), "fromArray");
-              };
+              {txt = Longident.Ldot (Lident "Caml_dict", "unsafe_create")};
         },
         [(Nolabel, key_values)] )
     when Res_parsetree_viewer.is_tuple_array key_values ->

jscomp/syntax/src/res_core.ml

@@ -3946,8 +3946,7 @@ and parse_dict_expr ~start_pos p =
   Ast_helper.Exp.apply ~loc
     (Ast_helper.Exp.ident ~loc
        (Location.mkloc
-          (Longident.Ldot
-             (Longident.Ldot (Longident.Lident "Js", "Dict"), "fromArray"))
+          (Longident.Ldot (Longident.Lident "Caml_dict", "unsafe_create"))
           loc))
     [(Asttypes.Nolabel, Ast_helper.Exp.array ~loc key_value_pairs)]
 

jscomp/syntax/src/res_printer.ml

@@ -4078,11 +4078,7 @@ and print_pexp_apply ~state expr cmt_tbl =
       ( {
           pexp_desc =
             Pexp_ident
-              {
-                txt =
-                  Longident.Ldot
-                    (Longident.Ldot (Lident "Js", "Dict"), "fromArray");
-              };
+              {txt = Longident.Ldot (Lident "Caml_dict", "unsafe_create")};
         },
         [(Nolabel, key_values)] )
     when Res_parsetree_viewer.is_tuple_array key_values ->

jscomp/syntax/tests/parsing/grammar/expressions/expected/dict.res.txt

@@ -1,7 +1,7 @@
-let x = Js.Dict.fromArray [||]
-let x = Js.Dict.fromArray [|("foo", {js|bar|js})|]
-let x = Js.Dict.fromArray [|("foo", {js|bar|js});("bar", {js|baz|js})|]
+let x = Caml_dict.unsafe_create [||]
+let x = Caml_dict.unsafe_create [|("foo", {js|bar|js})|]
+let x = Caml_dict.unsafe_create [|("foo", {js|bar|js});("bar", {js|baz|js})|]
 let baz = {js|foo|js}
 let x =
-  Js.Dict.fromArray
+  Caml_dict.unsafe_create
     [|("foo", {js|bar|js});("bar", {js|baz|js});("baz", baz)|]

jscomp/syntax/tests/printer/expr/expected/dict.res.txt

@@ -17,14 +17,10 @@ let x = dict{
   "baz": baz,
 }
 
-let x = dict{"foo": "bar", "bar": "baz"}
-let x = dict{"foo": "bar", "bar": "baz", "baz": baz}
+let x = Js.Dict.fromArray([("foo", "bar"), ("bar", "baz")])
+let x = Js.Dict.fromArray([("foo", "bar"), ("bar", "baz"), ("baz", baz)])
 
-let x = dict{
-  "foo": "bar",
-  "bar": "baz",
-  "baz": baz,
-}
+let x = Js.Dict.fromArray([("foo", "bar"), ("bar", "baz"), ("baz", baz)])
 
 // comments
 let x = dict{/* foo */ "foo": "bar"}
@@ -64,22 +60,30 @@ let x = dict{
   "baz": baz /* bar */,
 }
 
-let x = dict{/* foo */ "foo": "bar", /* bar */ "bar": "baz"}
-let x = dict{/* foo */ "foo": "bar", /* bar */ "bar": "baz", /* baz */ "baz": baz}
-let x = dict{"foo": /* foo */ "bar", "bar": /* bar */ "baz", "baz": /* baz */ baz}
-let x = dict{"foo": "bar" /* foo */, "bar": "baz" /* bar */, "baz": baz /* baz */}
+let x = Js.Dict.fromArray([/* foo */ ("foo", "bar"), /* bar */ ("bar", "baz")])
+let x = Js.Dict.fromArray([
+  (/* foo */ "foo", "bar"),
+  (/* bar */ "bar", "baz"),
+  (/* baz */ "baz", baz),
+])
+let x = Js.Dict.fromArray([
+  ("foo", /* foo */ "bar"),
+  ("bar", /* bar */ "baz"),
+  ("baz", /* baz */ baz),
+])
+let x = Js.Dict.fromArray([
+  ("foo", "bar" /* foo */),
+  ("bar", "baz" /* bar */),
+  ("baz", baz /* baz */),
+])
 
-let x = dict{
+let x = Js.Dict.fromArray([
   // foo
-  "foo": "bar",
+  ("foo", "bar"),
   // bar
-  "bar": "baz",
+  ("bar", "baz"),
   // baz
-  "baz": baz,
-}
+  ("baz", baz),
+])
 
-let x = dict{
-  "foo": "bar", // foo
-  "bar": "baz", // bar
-  "baz": baz, // baz
-}
+let x = Js.Dict.fromArray([("foo", "bar"), ("bar", "baz"), ("baz", baz)]) // foo // bar // baz

jscomp/test/DictTests.res

@@ -0,0 +1,8 @@
+let someString = "hello"
+
+let createdDict = dict{
+  "name": "hello",
+  "age": "what",
+  "more": "stuff",
+  "otherStr": someString,
+}

lib/.npmignore

@@ -2,3 +2,4 @@
 *.log
 *.ninja
 .ninja_log
+bs/.project-files-cache

lib/es6/caml_dict.js

@@ -0,0 +1 @@
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

lib/js/caml_dict.js

@@ -0,0 +1 @@
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

packages/artifacts.txt

@@ -80,6 +80,7 @@ lib/es6/caml_array_extern.js
 lib/es6/caml_bigint.js
 lib/es6/caml_bigint_extern.js
 lib/es6/caml_bytes.js
+lib/es6/caml_dict.js
 lib/es6/caml_exceptions.js
 lib/es6/caml_float.js
 lib/es6/caml_float_extern.js
@@ -238,6 +239,7 @@ lib/js/caml_array_extern.js
 lib/js/caml_bigint.js
 lib/js/caml_bigint_extern.js
 lib/js/caml_bytes.js
+lib/js/caml_dict.js
 lib/js/caml_exceptions.js
 lib/js/caml_float.js
 lib/js/caml_float_extern.js