group Jsx modules

aspeddro · aspeddro · commit 1f700059758f · 2025-05-31T13:49:59.000-03:00
diff --git a/lib/es6/Jsx.js b/lib/es6/Jsx.js
@@ -1 +1,15 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+
+
+
+let DOMStyle;
+
+let Event;
+
+let DOM;
+
+export {
+  DOMStyle,
+  Event,
+  DOM,
+}
+/* No side effect */
diff --git a/lib/es6/Jsx_common.js b/lib/es6/Jsx_common.js
@@ -0,0 +1 @@
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/lib/js/Jsx.js b/lib/js/Jsx.js
@@ -1 +1,13 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+'use strict';
+
+
+let DOMStyle;
+
+let Event;
+
+let DOM;
+
+exports.DOMStyle = DOMStyle;
+exports.Event = Event;
+exports.DOM = DOM;
+/* No side effect */
diff --git a/lib/js/Jsx_common.js b/lib/js/Jsx_common.js
@@ -0,0 +1 @@
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/runtime/Jsx.res b/runtime/Jsx.res
@@ -22,19 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-@notUndefined
-type element
-
-@val external null: element = "null"
-
-external float: float => element = "%identity"
-external int: int => element = "%identity"
-external string: string => element = "%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"
+include Jsx_common
+module DOMStyle = JsxDOMStyle
+module Event = JsxEvent
+module DOM = JsxDOM
diff --git a/runtime/JsxDOM.res b/runtime/JsxDOM.res
@@ -22,6 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+@@deprecated("Use `Jsx.DOM` instead.")
 type style = JsxDOMStyle.t
 type domRef
 /**
@@ -38,7 +39,7 @@ type popoverTargetAction = | @as("toggle") Toggle | @as("show") Show | @as("hide
 */
 type domProps = {
   key?: string,
-  children?: Jsx.element,
+  children?: Jsx_common.element,
   ref?: domRef,
   /* accessibility */
   /* https://www.w3.org/TR/wai-aria-1.1/ */
diff --git a/runtime/JsxDOMStyle.res b/runtime/JsxDOMStyle.res
@@ -22,6 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+@@deprecated("Use `Jsx.DOMStyle` instead.")
 type t = {
   /**
     See [`accent-color`](https://developer.mozilla.org/docs/Web/CSS/accent-color) on MDN.
diff --git a/runtime/JsxEvent.res b/runtime/JsxEvent.res
@@ -22,6 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+@@deprecated("Use `Jsx.Event` instead.")
 type synthetic<'a>
 
 module MakeEventWithType = (
diff --git a/runtime/Jsx_common.res b/runtime/Jsx_common.res
@@ -0,0 +1,40 @@
+/* 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * 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. */
+
+@notUndefined
+type element
+
+@val external null: element = "null"
+
+external float: float => element = "%identity"
+external int: int => element = "%identity"
+external string: string => element = "%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"
diff --git a/tests/analysis_tests/tests/src/expected/Completion.res.txt b/tests/analysis_tests/tests/src/expected/Completion.res.txt
diff --git a/tests/analysis_tests/tests/src/expected/Fragment.res.txt b/tests/analysis_tests/tests/src/expected/Fragment.res.txt
@@ -1,5 +1,5 @@
 Hover src/Fragment.res 6:19
-{"contents": {"kind": "markdown", "value": "```rescript\nReact.component<SectionHeader.props<React.element>>\n```\n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C12%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype SectionHeader.props<'children> = {children: 'children}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Fragment.res%22%2C1%2C2%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype React.element = Jsx.element\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C0%2C0%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nReact.component<SectionHeader.props<Jsx.element>>\n```\n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C12%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype SectionHeader.props<'children> = {children: 'children}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Fragment.res%22%2C1%2C2%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype Jsx.element = Jsx_common.element\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Jsx.res%22%2C0%2C-1%5D)\n"}}
 
 Hover src/Fragment.res 9:56
 Nothing at that position. Now trying to use completion.
diff --git a/tests/build_tests/jsx_settings_inheritance/node_modules/@rescript/react/src/ReactDOM.res b/tests/build_tests/jsx_settings_inheritance/node_modules/@rescript/react/src/ReactDOM.res
diff --git a/tests/build_tests/super_errors/expected/jsx_type_mismatch_array_element.res.expected b/tests/build_tests/super_errors/expected/jsx_type_mismatch_array_element.res.expected
@@ -8,6 +8,5 @@
   20 [2m│[0m 
 
   This has type: [1;31marray<'a>[0m
-  But it's expected to have type: [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx.element[0m[2m)[0m
-  
-  You need to convert each item in this array to a JSX element first, then use [1;33mReact.array[0m to convert the array of JSX elements into a single JSX element.
+  But it's expected to have type:
+    [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx_common.element[0m[2m)[0m
diff --git a/tests/build_tests/super_errors/expected/jsx_type_mismatch_array_raw.res.expected b/tests/build_tests/super_errors/expected/jsx_type_mismatch_array_raw.res.expected
@@ -8,6 +8,5 @@
   18 [2m│[0m 
 
   This has type: [1;31marray<'a>[0m
-  But it's expected to have type: [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx.element[0m[2m)[0m
-  
-  You need to convert each item in this array to a JSX element first, then use [1;33mReact.array[0m to convert the array of JSX elements into a single JSX element.
+  But it's expected to have type:
+    [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx_common.element[0m[2m)[0m
diff --git a/tests/build_tests/super_errors/expected/jsx_type_mismatch_float.res.expected b/tests/build_tests/super_errors/expected/jsx_type_mismatch_float.res.expected
@@ -8,6 +8,5 @@
   18 [2m│[0m 
 
   This has type: [1;31mfloat[0m
-  But it's expected to have type: [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx.element[0m[2m)[0m
-  
-  In JSX, all content must be JSX elements. You can convert float to a JSX element with [1;33mReact.float[0m.
+  But it's expected to have type:
+    [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx_common.element[0m[2m)[0m
diff --git a/tests/build_tests/super_errors/expected/jsx_type_mismatch_int.res.expected b/tests/build_tests/super_errors/expected/jsx_type_mismatch_int.res.expected
@@ -8,6 +8,5 @@
   18 [2m│[0m 
 
   This has type: [1;31mint[0m
-  But it's expected to have type: [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx.element[0m[2m)[0m
-  
-  In JSX, all content must be JSX elements. You can convert int to a JSX element with [1;33mReact.int[0m.
+  But it's expected to have type:
+    [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx_common.element[0m[2m)[0m
diff --git a/tests/build_tests/super_errors/expected/jsx_type_mismatch_option.res.expected b/tests/build_tests/super_errors/expected/jsx_type_mismatch_option.res.expected
@@ -8,7 +8,5 @@
   18 [2m│[0m 
 
   This has type: [1;31moption<'a>[0m
-  But it's expected to have type: [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx.element[0m[2m)[0m
-  
-  You need to unwrap this option to its underlying value first, then turn that value into a JSX element.
-  For [1;33mNone[0m, you can use [1;33mReact.null[0m to output nothing into JSX.
+  But it's expected to have type:
+    [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx_common.element[0m[2m)[0m
diff --git a/tests/build_tests/super_errors/expected/jsx_type_mismatch_string.res.expected b/tests/build_tests/super_errors/expected/jsx_type_mismatch_string.res.expected
@@ -8,6 +8,5 @@
   18 [2m│[0m 
 
   This has type: [1;31mstring[0m
-  But it's expected to have type: [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx.element[0m[2m)[0m
-  
-  In JSX, all content must be JSX elements. You can convert string to a JSX element with [1;33mReact.string[0m.
+  But it's expected to have type:
+    [1;33mReact.element[0m [2m(defined as[0m [1;33mJsx_common.element[0m[2m)[0m

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */`