From 710eff04c39ce62bb878b84905731f52f7825c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Raddum=20Berg?= Date: Sun, 28 Feb 2021 00:39:27 +0100 Subject: [PATCH] Builders: initialize `null` correctly --- .../scalajs/flavours/GenCompanions.scala | 7 +- .../flavours/JapgollyGenComponents.scala | 3 +- .../flavours/SlinkyGenComponents.scala | 3 +- .../flavours/defaultInterpretation.scala | 141 +++++++++--------- .../check-japgolly/m/material-ui/build.sbt | 4 +- .../check-japgolly/r/react/build.sbt | 2 +- .../scala/typingsJapgolly/react/mod.scala | 3 +- .../check-slinky/m/material-ui/build.sbt | 4 +- .../check-slinky/r/react/build.sbt | 2 +- .../main/scala/typingsSlinky/react/mod.scala | 3 +- .../check/r/react-icon-base/build.sbt | 4 +- .../react-icons/check/r/react-icons/build.sbt | 6 +- tests/react-icons/check/r/react/build.sbt | 2 +- .../src/main/scala/typings/react/mod.scala | 9 +- .../check-japgolly/c/componentstest/build.sbt | 4 +- .../r/react-bootstrap/build.sbt | 4 +- .../r/react-contextmenu/build.sbt | 4 +- .../check-japgolly/r/react-dropzone/build.sbt | 4 +- .../check-japgolly/r/react-select/build.sbt | 4 +- .../check-japgolly/r/react/build.sbt | 2 +- .../react/mod/ComponentElement.scala | 3 +- .../react/mod/DOMElement.scala | 4 +- .../react/mod/DetailedReactHTMLElement.scala | 4 +- .../react/mod/FunctionComponentElement.scala | 3 +- .../react/mod/ReactElement.scala | 3 +- .../react/mod/ReactPortal.scala | 3 +- .../react/mod/ReactSVGElement.scala | 4 +- .../typingsJapgolly/react/mod/RefObject.scala | 3 +- .../react/mod/SuspenseProps.scala | 3 +- .../s/semantic-ui-react/build.sbt | 4 +- .../build.sbt | 4 +- .../build.sbt | 4 +- .../typesMod.scala | 3 +- .../check-slinky/c/componentstest/build.sbt | 4 +- .../check-slinky/r/react-bootstrap/build.sbt | 4 +- .../r/react-contextmenu/build.sbt | 4 +- .../check-slinky/r/react-dropzone/build.sbt | 4 +- .../check-slinky/r/react-select/build.sbt | 4 +- .../check-slinky/r/react/build.sbt | 2 +- .../react/mod/ComponentElement.scala | 3 +- .../typingsSlinky/react/mod/DOMElement.scala | 4 +- .../react/mod/DetailedReactHTMLElement.scala | 4 +- .../react/mod/FunctionComponentElement.scala | 3 +- .../react/mod/ReactElement.scala | 3 +- .../typingsSlinky/react/mod/ReactPortal.scala | 3 +- .../react/mod/ReactSVGElement.scala | 4 +- .../typingsSlinky/react/mod/RefObject.scala | 3 +- .../react/mod/SuspenseProps.scala | 3 +- .../s/semantic-ui-react/build.sbt | 4 +- .../build.sbt | 4 +- .../build.sbt | 4 +- .../typesMod.scala | 3 +- .../r/react-transition-group/build.sbt | 4 +- .../check-japgolly/r/react/build.sbt | 2 +- .../scala/typingsJapgolly/react/mod.scala | 3 +- .../r/react-transition-group/build.sbt | 4 +- .../check-slinky/r/react/build.sbt | 2 +- .../main/scala/typingsSlinky/react/mod.scala | 3 +- 58 files changed, 190 insertions(+), 155 deletions(-) diff --git a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/GenCompanions.scala b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/GenCompanions.scala index a670ae99a3..4719bf5b4b 100644 --- a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/GenCompanions.scala +++ b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/GenCompanions.scala @@ -66,10 +66,10 @@ final class GenCompanions(findProps: FindProps, enableLongApplyMethod: Boolean) Empty case Res.One(_, props) if props.isEmpty => Empty - case Res.One(_, props) => + case Res.One(_, props: IArray[Prop]) => val requiredProps = if (enableLongApplyMethod) props - else props.filter(_.optionality === Optionality.No) + else props.filter(p => p.optionality === Optionality.No || p.optionality === Optionality.Null) IArray.fromOptions( Some(generateCreator(Name.APPLY, requiredProps, cls.codePath, cls.tparams)) @@ -150,6 +150,7 @@ final class GenCompanions(findProps: FindProps, enableLongApplyMethod: Boolean) val impl: ExprTree = { val objName = Name("__obj") Block.flatten( + interpretedProps.collect { case (_, Left(valDef)) => valDef }, IArray(Val(objName, Call(Ref(QualifiedName.DynamicLiteral), IArray(initializers.map(_.value))))), mutators.map(f => f.value(Ref(objName))), IArray(Cast(Ref(QualifiedName(IArray(objName))), ret)), @@ -161,7 +162,7 @@ final class GenCompanions(findProps: FindProps, enableLongApplyMethod: Boolean) level = ProtectionLevel.Default, name = name, tparams = typeTparams, - params = IArray(interpretedProps.map(_._2)), + params = IArray(interpretedProps.collect { case (_, Right(param)) => param }), impl = impl, resultType = ret, isOverride = false, diff --git a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/JapgollyGenComponents.scala b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/JapgollyGenComponents.scala index 3d13f1928f..b4da7f0b56 100644 --- a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/JapgollyGenComponents.scala +++ b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/JapgollyGenComponents.scala @@ -463,6 +463,7 @@ class JapgollyGenComponents( ) Block.flatten( + interpretedProps.collect { case (_, Left(valDef)) => valDef }, IArray(Val(objName, Call(Ref(QualifiedName.DynamicLiteral), IArray(initializers.map(_.value))))), mutators.map(f => f.value(Ref(objName))), IArray(newed), @@ -470,7 +471,7 @@ class JapgollyGenComponents( } val paramsOpt: Option[IArray[IArray[ParamTree]]] = - interpretedProps.map(_._2) match { + interpretedProps.collect { case (_, Right(param)) => param } match { case Empty if tparams.nonEmpty => Some(IArray(IArray())) // allow nullary apply if there are type parameters case Empty => None case nonEmpty => Some(IArray(nonEmpty)) diff --git a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/SlinkyGenComponents.scala b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/SlinkyGenComponents.scala index a8c61b0852..ada1ecb690 100644 --- a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/SlinkyGenComponents.scala +++ b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/SlinkyGenComponents.scala @@ -538,6 +538,7 @@ class SlinkyGenComponents( ) Block.flatten( + interpretedProps.collect { case (_, Left(valDef)) => valDef }, IArray(Val(objName, Call(Ref(QualifiedName.DynamicLiteral), IArray(initializers.map(_.value))))), mutators.map(f => f.value(Ref(objName))), IArray(newed), @@ -545,7 +546,7 @@ class SlinkyGenComponents( } val paramsOpt: Option[IArray[IArray[ParamTree]]] = - interpretedProps.map(_._2) match { + interpretedProps.collect { case (_, Right(param)) => param } match { case Empty if tparams.nonEmpty => Some(IArray(IArray())) // allow nullary apply if there are type parameters case Empty => None case nonEmpty => Some(IArray(nonEmpty)) diff --git a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/defaultInterpretation.scala b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/defaultInterpretation.scala index d64b875481..8edab69626 100644 --- a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/defaultInterpretation.scala +++ b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/defaultInterpretation.scala @@ -14,7 +14,7 @@ case class Mutator(value: ExprTree => ExprTree) extends ObjectUpdater * Note that this is not the only possible way of doing it, [[GenBuilderOpsClass]] does it differently */ object defaultInterpretation { - def apply(prop: Prop): (ObjectUpdater, ParamTree) = + def apply(prop: Prop): (ObjectUpdater, Either[ExprTree.Val, ParamTree]) = prop match { case Prop.CompressedProp(name, tpe, asExpr, isRequired) => val default = if (isRequired) NotImplemented else Null @@ -23,7 +23,7 @@ object defaultInterpretation { val updater = Mutator(ref => if (isRequired) asExpr(ref) else If(BinaryOp(Ref(name), "!=", Null), asExpr(ref), None)) - (updater, param) + (updater, Right(param)) case prop @ Prop.Normal(Prop.Variant(tpe, asExpr, _, _), _, optionality, _, _) => def updateObj(value: ExprTree): Mutator = @@ -34,74 +34,73 @@ object defaultInterpretation { ), ) - val (default, newType: TypeRef, namedArgOpt) = - optionality match { - case Optionality.No => - val updater = - if (prop.canBeInitializer) Initializer(Arg.Named(prop.name, asExpr(Ref(prop.name)))) - else updateObj(asExpr(Ref(prop.name))) - - (NotImplemented, tpe, updater) - - case Optionality.Null => - val default = if (prop.main.extendsAnyVal) Cast(Null, tpe) else Null - - val updater = - if (prop.canBeInitializer) Initializer(Arg.Named(prop.name, asExpr(Ref(prop.name)))) - else updateObj(asExpr(Ref(prop.name))) - - (default, tpe, updater) - - case Optionality.Undef if prop.main.extendsAnyVal => - val updater = Mutator { ref => - If( - pred = Unary("!", Call(Ref(QualifiedName.isUndefined), IArray(IArray(Ref(prop.name))))), - ifTrue = updateObj(asExpr(Select(Ref(prop.name), Name("get")))).value(ref), - ifFalse = None, - ) - } - (undefined, TypeRef.UndefOr(tpe), updater) - - case Optionality.Undef => - val updater = Mutator { ref => - If( - pred = BinaryOp(Ref(prop.name), "!=", Null), - ifTrue = updateObj(asExpr(Ref(prop.name))).value(ref), - ifFalse = None, - ) - } - (Null, tpe, updater) - - case Optionality.NullOrUndef => - val updater = Mutator { ref => - val shortedDefaultImplementation = - asExpr(Null) match { - // default implementation, save boilerplate - case Cast(Null, TypeRef.Any) => - updateObj(asExpr(Ref(prop.name))) - case _ => - updateObj( - If( - pred = BinaryOp(Ref(prop.name), "!=", Null), - ifTrue = asExpr(Cast(Ref(prop.name), tpe)), - ifFalse = Some(Null), - ), - ) - } - - If( - pred = Unary("!", Call(Ref(QualifiedName.isUndefined), IArray(IArray(Ref(prop.name))))), - ifTrue = shortedDefaultImplementation.value(ref), - ifFalse = None, - ) - } - - val newType = TypeRef.Union(IArray(TypeRef.undefined, TypeRef.Null, tpe), NoComments, sort = false) - - (undefined, newType, updater) - } - - val param = ParamTree(prop.name, isImplicit = false, isVal = false, newType, default, NoComments) - (namedArgOpt, param) + optionality match { + case Optionality.No => + val updater = + if (prop.canBeInitializer) Initializer(Arg.Named(prop.name, asExpr(Ref(prop.name)))) + else updateObj(asExpr(Ref(prop.name))) + + (updater, Right(ParamTree(prop.name, isImplicit = false, isVal = false, tpe, NotImplemented, NoComments))) + + case Optionality.Null => + val updater = + if (prop.canBeInitializer) Initializer(Arg.Named(prop.name, asExpr(Ref(prop.name)))) + else updateObj(asExpr(Ref(prop.name))) + + (updater, Left(Val(prop.name, if (prop.main.extendsAnyVal) Cast(Null, tpe) else Null))) + + case Optionality.Undef if prop.main.extendsAnyVal => + val updater = Mutator { ref => + If( + pred = Unary("!", Call(Ref(QualifiedName.isUndefined), IArray(IArray(Ref(prop.name))))), + ifTrue = updateObj(asExpr(Select(Ref(prop.name), Name("get")))).value(ref), + ifFalse = None, + ) + } + val param = + ParamTree(prop.name, isImplicit = false, isVal = false, TypeRef.UndefOr(tpe), undefined, NoComments) + (updater, Right(param)) + + case Optionality.Undef => + val updater = Mutator { ref => + If( + pred = BinaryOp(Ref(prop.name), "!=", Null), + ifTrue = updateObj(asExpr(Ref(prop.name))).value(ref), + ifFalse = None, + ) + } + val param = ParamTree(prop.name, isImplicit = false, isVal = false, tpe, Null, NoComments) + (updater, Right(param)) + + case Optionality.NullOrUndef => + val updater = Mutator { ref => + val shortedDefaultImplementation = + asExpr(Null) match { + // default implementation, save boilerplate + case Cast(Null, TypeRef.Any) => + updateObj(asExpr(Ref(prop.name))) + case _ => + updateObj( + If( + pred = BinaryOp(Ref(prop.name), "!=", Null), + ifTrue = asExpr(Cast(Ref(prop.name), tpe)), + ifFalse = Some(Null), + ), + ) + } + + If( + pred = Unary("!", Call(Ref(QualifiedName.isUndefined), IArray(IArray(Ref(prop.name))))), + ifTrue = shortedDefaultImplementation.value(ref), + ifFalse = None, + ) + } + + val newType = TypeRef.Union(IArray(TypeRef.undefined, TypeRef.Null, tpe), NoComments, sort = false) + + val param = ParamTree(prop.name, isImplicit = false, isVal = false, newType, undefined, NoComments) + (updater, Right(param)) + } + } } diff --git a/tests/material-ui/check-japgolly/m/material-ui/build.sbt b/tests/material-ui/check-japgolly/m/material-ui/build.sbt index 96a374ebdd..69ec664d4f 100644 --- a/tests/material-ui/check-japgolly/m/material-ui/build.sbt +++ b/tests/material-ui/check-japgolly/m/material-ui/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "material-ui" -version := "0.0-unknown-28d847" +version := "0.0-unknown-f78bcc" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "0.0-unknown-be04ee", + "org.scalablytyped" %%% "react" % "0.0-unknown-bcfda0", "org.scalablytyped" %%% "std" % "0.0-unknown-310cd4") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/material-ui/check-japgolly/r/react/build.sbt b/tests/material-ui/check-japgolly/r/react/build.sbt index a611eeb400..3226440fde 100644 --- a/tests/material-ui/check-japgolly/r/react/build.sbt +++ b/tests/material-ui/check-japgolly/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-be04ee" +version := "0.0-unknown-bcfda0" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/material-ui/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod.scala b/tests/material-ui/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod.scala index 0c82d08fc9..4b0e959158 100644 --- a/tests/material-ui/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod.scala +++ b/tests/material-ui/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod.scala @@ -193,7 +193,8 @@ object mod { @scala.inline def apply(props: js.Any, `type`: String | ComponentClassP[js.Object] | SFC[_]): Element = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[Element] } diff --git a/tests/material-ui/check-slinky/m/material-ui/build.sbt b/tests/material-ui/check-slinky/m/material-ui/build.sbt index 03f05aea22..e7037e345b 100644 --- a/tests/material-ui/check-slinky/m/material-ui/build.sbt +++ b/tests/material-ui/check-slinky/m/material-ui/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "material-ui" -version := "0.0-unknown-6d54e7" +version := "0.0-unknown-4475ac" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "0.0-unknown-09c72a", + "org.scalablytyped" %%% "react" % "0.0-unknown-eed1bf", "org.scalablytyped" %%% "std" % "0.0-unknown-da7a30") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/material-ui/check-slinky/r/react/build.sbt b/tests/material-ui/check-slinky/r/react/build.sbt index 744ebd84c1..713c95457f 100644 --- a/tests/material-ui/check-slinky/r/react/build.sbt +++ b/tests/material-ui/check-slinky/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-09c72a" +version := "0.0-unknown-eed1bf" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod.scala b/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod.scala index eeeca34093..7fba503b2a 100644 --- a/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod.scala +++ b/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod.scala @@ -182,7 +182,8 @@ object mod { @scala.inline def apply(props: js.Any, `type`: String | ReactComponentClass[_]): slinky.core.facade.ReactElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[slinky.core.facade.ReactElement] } diff --git a/tests/react-icons/check/r/react-icon-base/build.sbt b/tests/react-icons/check/r/react-icon-base/build.sbt index e9ea553a3a..90a6148ab7 100644 --- a/tests/react-icons/check/r/react-icon-base/build.sbt +++ b/tests/react-icons/check/r/react-icon-base/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "react-icon-base" -version := "2.1-3e9841" +version := "2.1-65cec9" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "0.0-unknown-f7b5df", + "org.scalablytyped" %%% "react" % "0.0-unknown-db50fc", "org.scalablytyped" %%% "std" % "0.0-unknown-dc26fd") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-icons/check/r/react-icons/build.sbt b/tests/react-icons/check/r/react-icons/build.sbt index 45a48cfaef..34140edb3d 100644 --- a/tests/react-icons/check/r/react-icons/build.sbt +++ b/tests/react-icons/check/r/react-icons/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-icons" -version := "2.2-834c51" +version := "2.2-8273f6" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "0.0-unknown-f7b5df", - "org.scalablytyped" %%% "react-icon-base" % "2.1-3e9841", + "org.scalablytyped" %%% "react" % "0.0-unknown-db50fc", + "org.scalablytyped" %%% "react-icon-base" % "2.1-65cec9", "org.scalablytyped" %%% "std" % "0.0-unknown-dc26fd") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-icons/check/r/react/build.sbt b/tests/react-icons/check/r/react/build.sbt index 48170024d2..d3f6debd98 100644 --- a/tests/react-icons/check/r/react/build.sbt +++ b/tests/react-icons/check/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-f7b5df" +version := "0.0-unknown-db50fc" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/react-icons/check/r/react/src/main/scala/typings/react/mod.scala b/tests/react-icons/check/r/react/src/main/scala/typings/react/mod.scala index 5ce0fbcc25..c43b7f28ce 100644 --- a/tests/react-icons/check/r/react/src/main/scala/typings/react/mod.scala +++ b/tests/react-icons/check/r/react/src/main/scala/typings/react/mod.scala @@ -167,7 +167,8 @@ object mod { @scala.inline def apply[P /* <: HTMLAttributes[T] | SVGAttributes[T] */, T /* <: Element */](props: js.Any, ref: Ref[T], `type`: String): DOMElement[P, T] = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[DOMElement[P, T]] } @@ -231,7 +232,8 @@ object mod { @scala.inline def apply(props: js.Any, `type`: String | ComponentClass[_]): ReactElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[ReactElement] } @@ -297,7 +299,8 @@ object mod { @scala.inline def apply(props: js.Any, ref: Ref[SVGElement], `type`: animate | circle | clipPath): ReactSVGElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[ReactSVGElement] } diff --git a/tests/react-integration-test/check-japgolly/c/componentstest/build.sbt b/tests/react-integration-test/check-japgolly/c/componentstest/build.sbt index f11dfc7a16..30bbee7e20 100644 --- a/tests/react-integration-test/check-japgolly/c/componentstest/build.sbt +++ b/tests/react-integration-test/check-japgolly/c/componentstest/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "componentstest" -version := "0.0-unknown-b3aac1" +version := "0.0-unknown-c62cb6" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "16.9.2-5cfa3c", + "org.scalablytyped" %%% "react" % "16.9.2-0e03be", "org.scalablytyped" %%% "std" % "0.0-unknown-43ed0a") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-japgolly/r/react-bootstrap/build.sbt b/tests/react-integration-test/check-japgolly/r/react-bootstrap/build.sbt index 0bb35ca532..cb19de89b3 100644 --- a/tests/react-integration-test/check-japgolly/r/react-bootstrap/build.sbt +++ b/tests/react-integration-test/check-japgolly/r/react-bootstrap/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-bootstrap" -version := "0.32-a43133" +version := "0.32-9c84e7" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "16.9.2-5cfa3c", + "org.scalablytyped" %%% "react" % "16.9.2-0e03be", "org.scalablytyped" %%% "std" % "0.0-unknown-43ed0a") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-japgolly/r/react-contextmenu/build.sbt b/tests/react-integration-test/check-japgolly/r/react-contextmenu/build.sbt index 7260318325..791b7a0f08 100644 --- a/tests/react-integration-test/check-japgolly/r/react-contextmenu/build.sbt +++ b/tests/react-integration-test/check-japgolly/r/react-contextmenu/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-contextmenu" -version := "2.13.0-bcee21" +version := "2.13.0-717ed4" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "16.9.2-5cfa3c", + "org.scalablytyped" %%% "react" % "16.9.2-0e03be", "org.scalablytyped" %%% "std" % "0.0-unknown-43ed0a") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-japgolly/r/react-dropzone/build.sbt b/tests/react-integration-test/check-japgolly/r/react-dropzone/build.sbt index 45df925dcf..21a74fa901 100644 --- a/tests/react-integration-test/check-japgolly/r/react-dropzone/build.sbt +++ b/tests/react-integration-test/check-japgolly/r/react-dropzone/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-dropzone" -version := "10.1.10-9528b8" +version := "10.1.10-d9f6ec" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "16.9.2-5cfa3c", + "org.scalablytyped" %%% "react" % "16.9.2-0e03be", "org.scalablytyped" %%% "std" % "0.0-unknown-43ed0a") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-japgolly/r/react-select/build.sbt b/tests/react-integration-test/check-japgolly/r/react-select/build.sbt index 0a352d79fd..b42d8805fa 100644 --- a/tests/react-integration-test/check-japgolly/r/react-select/build.sbt +++ b/tests/react-integration-test/check-japgolly/r/react-select/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-select" -version := "0.0-unknown-3ad0b0" +version := "0.0-unknown-b204ed" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "16.9.2-5cfa3c", + "org.scalablytyped" %%% "react" % "16.9.2-0e03be", "org.scalablytyped" %%% "std" % "0.0-unknown-43ed0a") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-japgolly/r/react/build.sbt b/tests/react-integration-test/check-japgolly/r/react/build.sbt index 837ee65eb8..0723549aaa 100644 --- a/tests/react-integration-test/check-japgolly/r/react/build.sbt +++ b/tests/react-integration-test/check-japgolly/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "16.9.2-5cfa3c" +version := "16.9.2-0e03be" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ComponentElement.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ComponentElement.scala index 748b868b23..ff74c4214c 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ComponentElement.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ComponentElement.scala @@ -16,7 +16,8 @@ object ComponentElement { @scala.inline def apply[P, T /* <: japgolly.scalajs.react.raw.React.Component[P with js.Object, js.Object] */](props: js.Any, `type`: js.Any): ComponentElement[P, T] = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[ComponentElement[P, T]] } diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DOMElement.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DOMElement.scala index 5057bd8ec5..716d9db6d5 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DOMElement.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DOMElement.scala @@ -19,7 +19,9 @@ object DOMElement { @scala.inline def apply[P /* <: HTMLAttributes[T] | SVGAttributes[T] */, T /* <: Element */](props: js.Any, `type`: js.Any): DomElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val ref = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[DomElement] } diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DetailedReactHTMLElement.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DetailedReactHTMLElement.scala index e506e20fc6..ee17ac6ad1 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DetailedReactHTMLElement.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DetailedReactHTMLElement.scala @@ -12,7 +12,9 @@ object DetailedReactHTMLElement { @scala.inline def apply[P /* <: HTMLAttributes[T] */, T /* <: HTMLElement */](props: js.Any, `type`: js.Any): DetailedReactHTMLElement[P, T] = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val ref = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[DetailedReactHTMLElement[P, T]] } diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/FunctionComponentElement.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/FunctionComponentElement.scala index 03183559b4..b9dd878f2e 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/FunctionComponentElement.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/FunctionComponentElement.scala @@ -14,7 +14,8 @@ object FunctionComponentElement { @scala.inline def apply[P](props: js.Any, `type`: js.Any): FunctionComponentElement[P] = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[FunctionComponentElement[P]] } diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactElement.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactElement.scala index 5385c87af4..90981cfdad 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactElement.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactElement.scala @@ -19,7 +19,8 @@ object ReactElement { @scala.inline def apply(props: js.Any, `type`: js.Any): Element = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[Element] } diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactPortal.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactPortal.scala index 3cd089a3d1..f9395b9953 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactPortal.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactPortal.scala @@ -16,7 +16,8 @@ object ReactPortal { @scala.inline def apply(props: js.Any, `type`: js.Any): ReactPortal = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[ReactPortal] } diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactSVGElement.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactSVGElement.scala index 8f05f302b3..bdcbc14a47 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactSVGElement.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactSVGElement.scala @@ -13,7 +13,9 @@ object ReactSVGElement { @scala.inline def apply(props: js.Any, `type`: js.Any): ReactSVGElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val ref = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[ReactSVGElement] } diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/RefObject.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/RefObject.scala index 37447f7b75..d27eaecc68 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/RefObject.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/RefObject.scala @@ -15,7 +15,8 @@ object RefObject { @scala.inline def apply[T](): RefHandle[T] = { - val __obj = js.Dynamic.literal() + val current = null + val __obj = js.Dynamic.literal(current = current.asInstanceOf[js.Any]) __obj.asInstanceOf[RefHandle[T]] } diff --git a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/SuspenseProps.scala b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/SuspenseProps.scala index 863b36e367..ecddb4cfee 100644 --- a/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/SuspenseProps.scala +++ b/tests/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/SuspenseProps.scala @@ -20,7 +20,8 @@ object SuspenseProps { @scala.inline def apply(): SuspenseProps = { - val __obj = js.Dynamic.literal() + val fallback = null + val __obj = js.Dynamic.literal(fallback = fallback.asInstanceOf[js.Any]) __obj.asInstanceOf[SuspenseProps] } diff --git a/tests/react-integration-test/check-japgolly/s/semantic-ui-react/build.sbt b/tests/react-integration-test/check-japgolly/s/semantic-ui-react/build.sbt index 3077f69585..c82d48971f 100644 --- a/tests/react-integration-test/check-japgolly/s/semantic-ui-react/build.sbt +++ b/tests/react-integration-test/check-japgolly/s/semantic-ui-react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "semantic-ui-react" -version := "0.0-unknown-c70301" +version := "0.0-unknown-2b49ef" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "16.9.2-5cfa3c", + "org.scalablytyped" %%% "react" % "16.9.2-0e03be", "org.scalablytyped" %%% "std" % "0.0-unknown-43ed0a") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/build.sbt b/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/build.sbt index 332621ac08..07c4b52483 100644 --- a/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/build.sbt +++ b/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-event-listener" -version := "0.38.0-00bf8c" +version := "0.38.0-5d95cf" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "16.9.2-5cfa3c", + "org.scalablytyped" %%% "react" % "16.9.2-0e03be", "org.scalablytyped" %%% "std" % "0.0-unknown-43ed0a") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/build.sbt b/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/build.sbt index 7ce04955f0..c0c5c93413 100644 --- a/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/build.sbt +++ b/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-ref" -version := "0.38.0-b681ab" +version := "0.38.0-e55ca0" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "16.9.2-5cfa3c", + "org.scalablytyped" %%% "react" % "16.9.2-0e03be", "org.scalablytyped" %%% "std" % "0.0-unknown-43ed0a") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/typesMod.scala b/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/typesMod.scala index 48f07a0b3c..86b2863cb7 100644 --- a/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/typesMod.scala +++ b/tests/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/typesMod.scala @@ -30,7 +30,8 @@ object typesMod { @scala.inline def apply(children: VdomElement): RefProps = { - val __obj = js.Dynamic.literal(children = children.rawElement.asInstanceOf[js.Any]) + val innerRef = null + val __obj = js.Dynamic.literal(children = children.rawElement.asInstanceOf[js.Any], innerRef = innerRef.asInstanceOf[js.Any]) __obj.asInstanceOf[RefProps] } diff --git a/tests/react-integration-test/check-slinky/c/componentstest/build.sbt b/tests/react-integration-test/check-slinky/c/componentstest/build.sbt index 41e7bcf963..7df027d5d6 100644 --- a/tests/react-integration-test/check-slinky/c/componentstest/build.sbt +++ b/tests/react-integration-test/check-slinky/c/componentstest/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "componentstest" -version := "0.0-unknown-c6dcad" +version := "0.0-unknown-e805d7" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "16.9.2-f96243", + "org.scalablytyped" %%% "react" % "16.9.2-46b1eb", "org.scalablytyped" %%% "std" % "0.0-unknown-615776") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react-bootstrap/build.sbt b/tests/react-integration-test/check-slinky/r/react-bootstrap/build.sbt index 3c8359bd38..11226cb055 100644 --- a/tests/react-integration-test/check-slinky/r/react-bootstrap/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react-bootstrap/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-bootstrap" -version := "0.32-152e4e" +version := "0.32-76e0eb" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "16.9.2-f96243", + "org.scalablytyped" %%% "react" % "16.9.2-46b1eb", "org.scalablytyped" %%% "std" % "0.0-unknown-615776") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react-contextmenu/build.sbt b/tests/react-integration-test/check-slinky/r/react-contextmenu/build.sbt index 4a963b3af6..f850b7ec9e 100644 --- a/tests/react-integration-test/check-slinky/r/react-contextmenu/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react-contextmenu/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-contextmenu" -version := "2.13.0-439a3f" +version := "2.13.0-d42580" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "16.9.2-f96243", + "org.scalablytyped" %%% "react" % "16.9.2-46b1eb", "org.scalablytyped" %%% "std" % "0.0-unknown-615776") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react-dropzone/build.sbt b/tests/react-integration-test/check-slinky/r/react-dropzone/build.sbt index 641710c405..b6bbb8e8d6 100644 --- a/tests/react-integration-test/check-slinky/r/react-dropzone/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react-dropzone/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-dropzone" -version := "10.1.10-f83e3f" +version := "10.1.10-d409e9" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "16.9.2-f96243", + "org.scalablytyped" %%% "react" % "16.9.2-46b1eb", "org.scalablytyped" %%% "std" % "0.0-unknown-615776") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react-select/build.sbt b/tests/react-integration-test/check-slinky/r/react-select/build.sbt index fe7ab397b0..3ec3a3a507 100644 --- a/tests/react-integration-test/check-slinky/r/react-select/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react-select/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-select" -version := "0.0-unknown-fdcfea" +version := "0.0-unknown-0e8c12" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "16.9.2-f96243", + "org.scalablytyped" %%% "react" % "16.9.2-46b1eb", "org.scalablytyped" %%% "std" % "0.0-unknown-615776") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react/build.sbt b/tests/react-integration-test/check-slinky/r/react/build.sbt index 13237c5ec4..99207742c0 100644 --- a/tests/react-integration-test/check-slinky/r/react/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "16.9.2-f96243" +version := "16.9.2-46b1eb" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ComponentElement.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ComponentElement.scala index 0e34ce63f7..ba1a1e98c8 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ComponentElement.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ComponentElement.scala @@ -16,7 +16,8 @@ object ComponentElement { @scala.inline def apply[P, T /* <: ReactComponentClass[P] */](props: js.Any, `type`: js.Any): ComponentElement[P, T] = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[ComponentElement[P, T]] } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMElement.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMElement.scala index 57b86d55b0..3818c0b843 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMElement.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMElement.scala @@ -17,7 +17,9 @@ object DOMElement { @scala.inline def apply[P /* <: HTMLAttributes[T] | SVGAttributes[T] */, T /* <: Element */](props: js.Any, `type`: js.Any): slinky.core.facade.ReactElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val ref = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[slinky.core.facade.ReactElement] } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DetailedReactHTMLElement.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DetailedReactHTMLElement.scala index 88e1dd7d4d..c3bb0b9512 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DetailedReactHTMLElement.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DetailedReactHTMLElement.scala @@ -12,7 +12,9 @@ object DetailedReactHTMLElement { @scala.inline def apply[P /* <: HTMLAttributes[T] */, T /* <: HTMLElement */](props: js.Any, `type`: js.Any): DetailedReactHTMLElement[P, T] = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val ref = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[DetailedReactHTMLElement[P, T]] } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/FunctionComponentElement.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/FunctionComponentElement.scala index 04a38d17c2..ad79245fce 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/FunctionComponentElement.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/FunctionComponentElement.scala @@ -14,7 +14,8 @@ object FunctionComponentElement { @scala.inline def apply[P](props: js.Any, `type`: js.Any): FunctionComponentElement[P] = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[FunctionComponentElement[P]] } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactElement.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactElement.scala index dc8634574d..7e075cdbaa 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactElement.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactElement.scala @@ -18,7 +18,8 @@ object ReactElement { @scala.inline def apply(props: js.Any, `type`: js.Any): slinky.core.facade.ReactElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[slinky.core.facade.ReactElement] } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactPortal.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactPortal.scala index f77dbd5ffa..06330f3100 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactPortal.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactPortal.scala @@ -14,7 +14,8 @@ object ReactPortal { @scala.inline def apply(props: js.Any, `type`: js.Any): ReactPortal = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[ReactPortal] } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactSVGElement.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactSVGElement.scala index 713a5ed35e..fd819c42ba 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactSVGElement.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactSVGElement.scala @@ -13,7 +13,9 @@ object ReactSVGElement { @scala.inline def apply(props: js.Any, `type`: js.Any): ReactSVGElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val ref = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any], ref = ref.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[ReactSVGElement] } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/RefObject.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/RefObject.scala index 52f4130234..0e5890c847 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/RefObject.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/RefObject.scala @@ -15,7 +15,8 @@ object RefObject { @scala.inline def apply[T](): ReactRef[T] = { - val __obj = js.Dynamic.literal() + val current = null + val __obj = js.Dynamic.literal(current = current.asInstanceOf[js.Any]) __obj.asInstanceOf[ReactRef[T]] } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SuspenseProps.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SuspenseProps.scala index af547b648c..beee865147 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SuspenseProps.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SuspenseProps.scala @@ -17,7 +17,8 @@ object SuspenseProps { @scala.inline def apply(): SuspenseProps = { - val __obj = js.Dynamic.literal() + val fallback = null + val __obj = js.Dynamic.literal(fallback = fallback.asInstanceOf[js.Any]) __obj.asInstanceOf[SuspenseProps] } diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt b/tests/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt index 25c9eefc6f..8b67c95737 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "semantic-ui-react" -version := "0.0-unknown-4dce11" +version := "0.0-unknown-1884b4" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "16.9.2-f96243", + "org.scalablytyped" %%% "react" % "16.9.2-46b1eb", "org.scalablytyped" %%% "std" % "0.0-unknown-615776") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt index 6d0c175b2f..b340d09ec9 100644 --- a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt +++ b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-event-listener" -version := "0.38.0-70b652" +version := "0.38.0-8f9a24" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "16.9.2-f96243", + "org.scalablytyped" %%% "react" % "16.9.2-46b1eb", "org.scalablytyped" %%% "std" % "0.0-unknown-615776") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt index 8aeb48a425..5e00112ed6 100644 --- a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt +++ b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-ref" -version := "0.38.0-aaff8d" +version := "0.38.0-50c36e" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "16.9.2-f96243", + "org.scalablytyped" %%% "react" % "16.9.2-46b1eb", "org.scalablytyped" %%% "std" % "0.0-unknown-615776") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/typesMod.scala b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/typesMod.scala index b1a0004047..599e989728 100644 --- a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/typesMod.scala +++ b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/typesMod.scala @@ -30,7 +30,8 @@ object typesMod { @scala.inline def apply(children: ReactElement): RefProps = { - val __obj = js.Dynamic.literal(children = children.asInstanceOf[js.Any]) + val innerRef = null + val __obj = js.Dynamic.literal(children = children.asInstanceOf[js.Any], innerRef = innerRef.asInstanceOf[js.Any]) __obj.asInstanceOf[RefProps] } diff --git a/tests/react-transition-group/check-japgolly/r/react-transition-group/build.sbt b/tests/react-transition-group/check-japgolly/r/react-transition-group/build.sbt index bec06de52c..51938d2484 100644 --- a/tests/react-transition-group/check-japgolly/r/react-transition-group/build.sbt +++ b/tests/react-transition-group/check-japgolly/r/react-transition-group/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-transition-group" -version := "2.0-e94267" +version := "2.0-e1422d" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.7.5", "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", - "org.scalablytyped" %%% "react" % "0.0-unknown-fb4621", + "org.scalablytyped" %%% "react" % "0.0-unknown-b52bd7", "org.scalablytyped" %%% "std" % "0.0-unknown-b18a12") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-transition-group/check-japgolly/r/react/build.sbt b/tests/react-transition-group/check-japgolly/r/react/build.sbt index f34217739f..4683e3d23c 100644 --- a/tests/react-transition-group/check-japgolly/r/react/build.sbt +++ b/tests/react-transition-group/check-japgolly/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-fb4621" +version := "0.0-unknown-b52bd7" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/react-transition-group/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod.scala b/tests/react-transition-group/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod.scala index 24816962e3..37ab066f8f 100644 --- a/tests/react-transition-group/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod.scala +++ b/tests/react-transition-group/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod.scala @@ -193,7 +193,8 @@ object mod { object ReactElement { @scala.inline - def apply(props: js.Any, `type`: String | ComponentClassP[js.Object] | SFC[_], key: Key = null): Element = { + def apply(props: js.Any, `type`: String | ComponentClassP[js.Object] | SFC[_]): Element = { + val key = null val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[Element] diff --git a/tests/react-transition-group/check-slinky/r/react-transition-group/build.sbt b/tests/react-transition-group/check-slinky/r/react-transition-group/build.sbt index 1bd69200af..4f0efb07a0 100644 --- a/tests/react-transition-group/check-slinky/r/react-transition-group/build.sbt +++ b/tests/react-transition-group/check-slinky/r/react-transition-group/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-transition-group" -version := "2.0-d96426" +version := "2.0-1c6eca" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.4.0", "me.shadaj" %%% "slinky-web" % "0.6.6", - "org.scalablytyped" %%% "react" % "0.0-unknown-8764af", + "org.scalablytyped" %%% "react" % "0.0-unknown-eea966", "org.scalablytyped" %%% "std" % "0.0-unknown-49daf5") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-transition-group/check-slinky/r/react/build.sbt b/tests/react-transition-group/check-slinky/r/react/build.sbt index 826a843fb1..1400c00a6c 100644 --- a/tests/react-transition-group/check-slinky/r/react/build.sbt +++ b/tests/react-transition-group/check-slinky/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-8764af" +version := "0.0-unknown-eea966" scalaVersion := "2.13.3" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod.scala b/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod.scala index ce299f8507..65ee5567af 100644 --- a/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod.scala +++ b/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod.scala @@ -210,7 +210,8 @@ object mod { @scala.inline def apply(props: js.Any, `type`: String | ReactComponentClass[_]): slinky.core.facade.ReactElement = { - val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any]) + val key = null + val __obj = js.Dynamic.literal(props = props.asInstanceOf[js.Any], key = key.asInstanceOf[js.Any]) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) __obj.asInstanceOf[slinky.core.facade.ReactElement] }