sync the latest syntax (#5972)

Author: mununki

CHANGELOG.md

@@ -16,6 +16,7 @@
 
 - Add the gap property to jsxDOMStyle https://github.com/rescript-lang/rescript-compiler/pull/5956
 - Fix issue where error messages related to non-existent props were displayed without location information https://github.com/rescript-lang/syntax/pull/730
+- Fix issue where uncurried functions were incorrectly converting the type of a prop given as a default value to curried https://github.com/rescript-lang/syntax/pull/731
 
 # 10.1.2
 

jscomp/napkin/CHANGELOG.md

@@ -57,6 +57,7 @@
 - Fix dropping attributes from props in make function in JSX V4 https://github.com/rescript-lang/syntax/pull/723
 - Fix an issue where error messages related to duplicate props were displayed without a loc and were unclear https://github.com/rescript-lang/syntax/pull/728
 - Fix issue where error messages related to non-existent props were displayed without location information https://github.com/rescript-lang/syntax/pull/730
+- Fix issue where uncurried functions were incorrectly converting the type of a prop given as a default value to curried https://github.com/rescript-lang/syntax/pull/731
 
 #### :eyeglasses: Spec Compliance
 

lib/4.06.1/unstable/js_compiler.ml

@@ -275411,19 +275411,10 @@ let argToType ~newtypes ~(typeConstraints : core_type option) types
   in
   match (type_, name, default) with
   | Some type_, name, _ when isOptional name ->
-    ( true,
-      getLabel name,
-      attrs,
-      loc,
-      {type_ with ptyp_attributes = optionalAttrs} )
-    :: types
+    (true, getLabel name, attrs, loc, type_) :: types
   | Some type_, name, _ -> (false, getLabel name, attrs, loc, type_) :: types
   | None, name, _ when isOptional name ->
-    ( true,
-      getLabel name,
-      attrs,
-      loc,
-      Typ.var ~loc ~attrs:optionalAttrs (safeTypeFromValue name) )
+    (true, getLabel name, attrs, loc, Typ.var ~loc (safeTypeFromValue name))
     :: types
   | None, name, _ when isLabelled name ->
     (false, getLabel name, attrs, loc, Typ.var ~loc (safeTypeFromValue name))

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -275411,19 +275411,10 @@ let argToType ~newtypes ~(typeConstraints : core_type option) types
   in
   match (type_, name, default) with
   | Some type_, name, _ when isOptional name ->
-    ( true,
-      getLabel name,
-      attrs,
-      loc,
-      {type_ with ptyp_attributes = optionalAttrs} )
-    :: types
+    (true, getLabel name, attrs, loc, type_) :: types
   | Some type_, name, _ -> (false, getLabel name, attrs, loc, type_) :: types
   | None, name, _ when isOptional name ->
-    ( true,
-      getLabel name,
-      attrs,
-      loc,
-      Typ.var ~loc ~attrs:optionalAttrs (safeTypeFromValue name) )
+    (true, getLabel name, attrs, loc, Typ.var ~loc (safeTypeFromValue name))
     :: types
   | None, name, _ when isLabelled name ->
     (false, getLabel name, attrs, loc, Typ.var ~loc (safeTypeFromValue name))

lib/4.06.1/whole_compiler.ml

@@ -285795,19 +285795,10 @@ let argToType ~newtypes ~(typeConstraints : core_type option) types
   in
   match (type_, name, default) with
   | Some type_, name, _ when isOptional name ->
-    ( true,
-      getLabel name,
-      attrs,
-      loc,
-      {type_ with ptyp_attributes = optionalAttrs} )
-    :: types
+    (true, getLabel name, attrs, loc, type_) :: types
   | Some type_, name, _ -> (false, getLabel name, attrs, loc, type_) :: types
   | None, name, _ when isOptional name ->
-    ( true,
-      getLabel name,
-      attrs,
-      loc,
-      Typ.var ~loc ~attrs:optionalAttrs (safeTypeFromValue name) )
+    (true, getLabel name, attrs, loc, Typ.var ~loc (safeTypeFromValue name))
     :: types
   | None, name, _ when isLabelled name ->
     (false, getLabel name, attrs, loc, Typ.var ~loc (safeTypeFromValue name))