rewrite jsx in res, add helper functions

Author: mununki

jscomp/main/builtin_cmi_datasets.ml

@@ -1,4 +1,4 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+/* Copyright (C) 2022- Authors of ReScript
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -20,20 +20,39 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 type element
 type ref
 
-external null : element = "null" [@@bs.val]
-external float : float -> element = "%identity"
-external int : int -> element = "%identity"
-external string : string -> element = "%identity"
-external array : element array -> element = "%identity"
+@val external null: element = "null"
 
-type ('props, 'return) componentLike = 'props -> 'return
-type 'props component = ('props, element) componentLike
+external float: float => element = "%identity"
+external int: int => element = "%identity"
+external string: string => element = "%identity"
 
-(* this function exists to prepare for making `component` abstract *)
-external component : ('props, element) componentLike -> 'props component
-  = "%identity"
+external array: array<element> => element = "%identity"
+
+type componentLike<'props, 'return> = 'props => 'return
+type component<'props> = componentLike<'props, element>
+
+/* this function exists to prepare for making `component` abstract */
+external component: componentLike<'props, element> => component<'props> = "%identity"
+
+%%private(
+  @val
+  external propsWithKey: (@as(json`{}`) _, 'props, {"key": string}) => 'props = "Object.assign"
+
+  @inline
+  let addKeyProp = (~key: option<string>=?, p: 'props): 'props =>
+    switch key {
+    | Some(key) => propsWithKey(p, {"key": key})
+    | None => p
+    }
+)
+
+let createElementWithKey = (~key=?, createElement, component, props) =>
+  createElement(component, addKeyProp(~key?, props))
+
+let createElementVariadicWithKey = (~key=?, createElementVariadic, component, props, elements) =>
+  createElementVariadic(component, addKeyProp(~key?, props), elements)

jscomp/main/builtin_cmj_datasets.ml

@@ -64,7 +64,7 @@ o others/js_vector.cmj : cc_cmi others/js_vector.ml | others/belt_internals.cmi
 o others/js_vector.cmi : cc others/js_vector.mli | others/belt_internals.cmi others/js.cmi $bsc
 o others/js_weakmap.cmi others/js_weakmap.cmj : cc others/js_weakmap.ml | others/belt_internals.cmi others/js.cmi $bsc
 o others/js_weakset.cmi others/js_weakset.cmj : cc others/js_weakset.ml | others/belt_internals.cmi others/js.cmi $bsc
-o others/jsx.cmi others/jsx.cmj : cc others/jsx.ml | others/belt_internals.cmi others/js.cmi $bsc
+o others/jsx.cmi others/jsx.cmj : cc others/jsx.res | others/belt_internals.cmi others/js.cmi $bsc
 o others/jsxDOM.cmi others/jsxDOM.cmj : cc others/jsxDOM.res | others/belt_internals.cmi others/js.cmi others/jsx.cmj others/jsxDOMStyle.cmj others/jsxEvent.cmj $bsc
 o others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj : cc others/jsxDOMStyle.ml | others/belt_internals.cmi others/js.cmi $bsc
 o others/jsxEvent.cmi others/jsxEvent.cmj : cc others/jsxEvent.ml | others/belt_internals.cmi others/js.cmi $bsc

jscomp/others/jsx.ml jscomp/others/jsx.resjscomp/others/jsx.ml renamed to jscomp/others/jsx.res

@@ -1 +1,21 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+
+
+import * as Curry from "./curry.js";
+
+function createElementWithKey(key, createElement, component, props) {
+  return Curry._2(createElement, component, key !== undefined ? Object.assign({}, props, {
+                    key: key
+                  }) : props);
+}
+
+function createElementVariadicWithKey(key, createElementVariadic, component, props, elements) {
+  return Curry._3(createElementVariadic, component, key !== undefined ? Object.assign({}, props, {
+                    key: key
+                  }) : props, elements);
+}
+
+export {
+  createElementWithKey ,
+  createElementVariadicWithKey ,
+}
+/* No side effect */

jscomp/others/release.ninja

@@ -1 +1,19 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+'use strict';
+
+var Curry = require("./curry.js");
+
+function createElementWithKey(key, createElement, component, props) {
+  return Curry._2(createElement, component, key !== undefined ? Object.assign({}, props, {
+                    key: key
+                  }) : props);
+}
+
+function createElementVariadicWithKey(key, createElementVariadic, component, props, elements) {
+  return Curry._3(createElementVariadic, component, key !== undefined ? Object.assign({}, props, {
+                    key: key
+                  }) : props, elements);
+}
+
+exports.createElementWithKey = createElementWithKey;
+exports.createElementVariadicWithKey = createElementVariadicWithKey;
+/* No side effect */

lib/4.06.1/unstable/js_compiler.ml

@@ -794,7 +794,7 @@ lib/ocaml/js_weakset.cmt
 lib/ocaml/js_weakset.ml
 lib/ocaml/jsx.cmi
 lib/ocaml/jsx.cmt
-lib/ocaml/jsx.ml
+lib/ocaml/jsx.res
 lib/ocaml/jsxDOM.cmi
 lib/ocaml/jsxDOM.cmt
 lib/ocaml/jsxDOM.res