Skip to content

Commit

Permalink
ExtractInterfaces: don't extract interfaces from inside conditional t…
Browse files Browse the repository at this point in the history
…ypes
  • Loading branch information
oyvindberg committed Oct 17, 2022
1 parent 28eaaad commit 10e2ae1
Show file tree
Hide file tree
Showing 29 changed files with 53 additions and 251 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "componentstest"
version := "0.0-unknown-c856ab"
version := "0.0-unknown-282f31"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-bootstrap"
version := "0.32-6eac56"
version := "0.32-f36d83"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-contextmenu"
version := "2.13.0-e70b6a"
version := "2.13.0-fc8fd3"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-dropzone"
version := "10.1.10-505392"
version := "10.1.10-ea1309"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-markdown"
version := "0.0-unknown-a12fbc"
version := "0.0-unknown-7eefe5"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-select"
version := "0.0-unknown-685a3b"
version := "0.0-unknown-37de55"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
organization := "org.scalablytyped"
name := "react"
version := "16.9.2-89c3ae"
version := "16.9.2-f9dd03"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,12 @@ import japgolly.scalajs.react.facade.React.Element
import japgolly.scalajs.react.facade.React.Node
import japgolly.scalajs.react.vdom.VdomElement
import japgolly.scalajs.react.vdom.VdomNode
import typingsJapgolly.std.Exclude
import org.scalablytyped.runtime.StObject
import scala.scalajs.js
import scala.scalajs.js.annotation.{JSGlobalScope, JSGlobal, JSImport, JSName, JSBracketAccess}

object anon {

trait `0`[R] extends StObject {

var ref: js.UndefOr[Exclude[R, String]] = js.undefined
}
object `0` {

inline def apply[R](): `0`[R] = {
val __obj = js.Dynamic.literal()
__obj.asInstanceOf[`0`[R]]
}

extension [Self <: `0`[?], R](x: Self & `0`[R]) {

inline def setRef(value: Exclude[R, String]): Self = StObject.set(x, "ref", value.asInstanceOf[js.Any])

inline def setRefUndefined: Self = StObject.set(x, "ref", js.undefined)
}
}

trait `1` extends StObject {

var defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any
}
object `1` {

inline def apply(
defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any
): `1` = {
val __obj = js.Dynamic.literal(defaultProps = defaultProps.asInstanceOf[js.Any])
__obj.asInstanceOf[`1`]
}

extension [Self <: `1`](x: Self) {

inline def setDefaultProps(value: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any): Self = StObject.set(x, "defaultProps", value.asInstanceOf[js.Any])
}
}

trait Children extends StObject {

var children: js.UndefOr[Node] = js.undefined
Expand All @@ -76,30 +37,6 @@ object anon {
}
}

trait DefaultProps extends StObject {

var defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any

var propTypes: /* import warning: importer.ImportType#apply Failed type conversion: infer T */ js.Any
}
object DefaultProps {

inline def apply(
defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any,
propTypes: /* import warning: importer.ImportType#apply Failed type conversion: infer T */ js.Any
): DefaultProps = {
val __obj = js.Dynamic.literal(defaultProps = defaultProps.asInstanceOf[js.Any], propTypes = propTypes.asInstanceOf[js.Any])
__obj.asInstanceOf[DefaultProps]
}

extension [Self <: DefaultProps](x: Self) {

inline def setDefaultProps(value: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any): Self = StObject.set(x, "defaultProps", value.asInstanceOf[js.Any])

inline def setPropTypes(value: /* import warning: importer.ImportType#apply Failed type conversion: infer T */ js.Any): Self = StObject.set(x, "propTypes", value.asInstanceOf[js.Any])
}
}

trait Html extends StObject {

var __html: String
Expand All @@ -116,42 +53,4 @@ object anon {
inline def set__html(value: String): Self = StObject.set(x, "__html", value.asInstanceOf[js.Any])
}
}

trait PropTypes extends StObject {

var propTypes: /* import warning: importer.ImportType#apply Failed type conversion: infer T */ js.Any
}
object PropTypes {

inline def apply(propTypes: /* import warning: importer.ImportType#apply Failed type conversion: infer T */ js.Any): PropTypes = {
val __obj = js.Dynamic.literal(propTypes = propTypes.asInstanceOf[js.Any])
__obj.asInstanceOf[PropTypes]
}

extension [Self <: PropTypes](x: Self) {

inline def setPropTypes(value: /* import warning: importer.ImportType#apply Failed type conversion: infer T */ js.Any): Self = StObject.set(x, "propTypes", value.asInstanceOf[js.Any])
}
}

trait Ref extends StObject {

var ref: js.UndefOr[
/* import warning: importer.ImportType#apply Failed type conversion: infer R */ js.Any
] = js.undefined
}
object Ref {

inline def apply(): Ref = {
val __obj = js.Dynamic.literal()
__obj.asInstanceOf[Ref]
}

extension [Self <: Ref](x: Self) {

inline def setRef(value: /* import warning: importer.ImportType#apply Failed type conversion: infer R */ js.Any): Self = StObject.set(x, "ref", value.asInstanceOf[js.Any])

inline def setRefUndefined: Self = StObject.set(x, "ref", js.undefined)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trait FunctionComponentElement[P]
with ReactElement {

var ref: js.UndefOr[
/* import warning: importer.ImportType#apply Failed type conversion: 'ref' extends keyof P ? P extends react.anon.Ref ? R : never : never */ js.Any
/* import warning: importer.ImportType#apply Failed type conversion: 'ref' extends keyof P ? P extends { ref :infer R | undefined} ? R : never : never */ js.Any
] = js.undefined
}
object FunctionComponentElement {
Expand All @@ -23,7 +23,7 @@ object FunctionComponentElement {
extension [Self <: FunctionComponentElement[?], P](x: Self & FunctionComponentElement[P]) {

inline def setRef(
value: /* import warning: importer.ImportType#apply Failed type conversion: 'ref' extends keyof P ? P extends react.anon.Ref ? R : never : never */ js.Any
value: /* import warning: importer.ImportType#apply Failed type conversion: 'ref' extends keyof P ? P extends { ref :infer R | undefined} ? R : never : never */ js.Any
): Self = StObject.set(x, "ref", value.asInstanceOf[js.Any])

inline def setRefUndefined: Self = StObject.set(x, "ref", js.undefined)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import scala.scalajs.js.annotation.{JSGlobalScope, JSGlobal, JSImport, JSName, J
* See https://www.typescriptlang.org/docs/handbook/2/conditional-types.html for an intro.
* You'll have to cast your way around this structure, unfortunately.
* TS definition: {{{
'ref' extends keyof P ? P extends react.anon.Ref ? string extends R ? react.react.PropsWithoutRef<P> & react.anon.0<R> : P : P : P
'ref' extends keyof P ? P extends { ref :infer R | undefined} ? string extends R ? react.react.PropsWithoutRef<P> & { ref :std.Exclude<R, string> | undefined} : P : P : P
}}}
*/
@js.native
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import scala.scalajs.js.annotation.{JSGlobalScope, JSGlobal, JSImport, JSName, J
* See https://www.typescriptlang.org/docs/handbook/2/conditional-types.html for an intro.
* You'll have to cast your way around this structure, unfortunately.
* TS definition: {{{
C extends react.anon.DefaultProps ? react.react.Defaultize<react.react.MergePropTypes<P, / * import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify PropTypes.InferProps<T> * / any>, D> : C extends react.anon.PropTypes ? react.react.MergePropTypes<P, / * import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify PropTypes.InferProps<T> * / any> : C extends react.anon.1 ? react.react.Defaultize<P, D> : P
C extends { propTypes :infer T, defaultProps :infer D} ? react.react.Defaultize<react.react.MergePropTypes<P, / * import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify PropTypes.InferProps<T> * / any>, D> : C extends { propTypes :infer T} ? react.react.MergePropTypes<P, / * import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify PropTypes.InferProps<T> * / any> : C extends { defaultProps :infer D} ? react.react.Defaultize<P, D> : P
}}}
*/
@js.native
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "semantic-ui-react"
version := "0.0-unknown-68bc54"
version := "0.0-unknown-08f7ef"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "stardust-ui__react-component-event-listener"
version := "0.38.0-90ae78"
version := "0.38.0-45b64e"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "stardust-ui__react-component-ref"
version := "0.38.0-bb268d"
version := "0.38.0-151950"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % "2.1.1",
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"org.scalablytyped" %%% "react" % "16.9.2-89c3ae",
"org.scalablytyped" %%% "react" % "16.9.2-f9dd03",
"org.scalablytyped" %%% "std" % "0.0-unknown-f06d0f")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "componentstest"
version := "0.0-unknown-b559f4"
version := "0.0-unknown-e063e5"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"me.shadaj" %%% "slinky-web" % "0.7.2",
"org.scalablytyped" %%% "react" % "16.9.2-2aa5d1",
"org.scalablytyped" %%% "react" % "16.9.2-cebe65",
"org.scalablytyped" %%% "std" % "0.0-unknown-8512d2")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-bootstrap"
version := "0.32-9191df"
version := "0.32-ae6c10"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"me.shadaj" %%% "slinky-web" % "0.7.2",
"org.scalablytyped" %%% "react" % "16.9.2-2aa5d1",
"org.scalablytyped" %%% "react" % "16.9.2-cebe65",
"org.scalablytyped" %%% "std" % "0.0-unknown-8512d2")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-contextmenu"
version := "2.13.0-fb96e3"
version := "2.13.0-fed211"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"me.shadaj" %%% "slinky-web" % "0.7.2",
"org.scalablytyped" %%% "react" % "16.9.2-2aa5d1",
"org.scalablytyped" %%% "react" % "16.9.2-cebe65",
"org.scalablytyped" %%% "std" % "0.0-unknown-8512d2")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-dropzone"
version := "10.1.10-bdd78f"
version := "10.1.10-01ef01"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"me.shadaj" %%% "slinky-web" % "0.7.2",
"org.scalablytyped" %%% "react" % "16.9.2-2aa5d1",
"org.scalablytyped" %%% "react" % "16.9.2-cebe65",
"org.scalablytyped" %%% "std" % "0.0-unknown-8512d2")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-markdown"
version := "0.0-unknown-c5de7a"
version := "0.0-unknown-118adf"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"me.shadaj" %%% "slinky-web" % "0.7.2",
"org.scalablytyped" %%% "react" % "16.9.2-2aa5d1",
"org.scalablytyped" %%% "react" % "16.9.2-cebe65",
"org.scalablytyped" %%% "std" % "0.0-unknown-8512d2")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
organization := "org.scalablytyped"
name := "react-select"
version := "0.0-unknown-118bbf"
version := "0.0-unknown-cb7764"
scalaVersion := "3.1.2"
enablePlugins(ScalaJSPlugin)
libraryDependencies ++= Seq(
"com.olvind" %%% "scalablytyped-runtime" % "2.4.2",
"me.shadaj" %%% "slinky-web" % "0.7.2",
"org.scalablytyped" %%% "react" % "16.9.2-2aa5d1",
"org.scalablytyped" %%% "react" % "16.9.2-cebe65",
"org.scalablytyped" %%% "std" % "0.0-unknown-8512d2")
publishArtifact in packageDoc := false
scalacOptions ++= List("-encoding", "utf-8", "-feature", "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-no-indent", "-source:future")
Expand Down
Loading

0 comments on commit 10e2ae1

Please sign in to comment.