diff --git a/docs/changelog.md b/docs/changelog.md new file mode 100644 index 0000000000..83db0ca6cc --- /dev/null +++ b/docs/changelog.md @@ -0,0 +1,191 @@ +--- +id: changelog +title: Changelog +--- + +## 1.0.0-beta6 + +[Full changelog](https://github.com/ScalablyTyped/Converter/compare/v1.0.0-beta5...v1.0.0-beta6) + +This is a big release because we finally enable expansion of [type mappings](http://typescript) for most static cases. + +Given the following typescript definition: + +```typescript +interface Person { + name: string + age: number + favouriteColor: "red" | "blue" +} + +declare const patch: (p: Person, pp: Pick, "name" | "age">) => Person; + +``` + +We now end up with these Scala.js definitions: +```scala +trait Person extends js.Object { + var age: Double = js.native + var favouriteColor: red | blue = js.native + var name: String = js.native +} + +/* Inlined std.Pick, 'name' | 'age'> */ +trait PickPartialPersonnameage extends js.Object { + var age: js.UndefOr[Double] = js.native + var name: js.UndefOr[String] = js.native +} + +@JSGlobal("patch") +@js.native +object patch extends js.Object { + def apply(p: Person, pp: PickPartialPersonnameage): Person = js.native +} +``` + +This functionality is widely used in typescript, so finally enabling this is a big improvement. + +Note that the functionality has been enabled for a few +[selected libraries](https://github.com/ScalablyTyped/Converter/pull/123/commits/b5ca33fc89ae5c387190117f6480195bd770174d#diff-dda33cf244aa28da6ffad51bad89b6ee) for quite a while. + +Also note that this still has quite a few limitations, in particular it gives up when encountering most conditional types. +This can be improved down the road. This functionality will probably never be available for cases like `Partial`. + +### Improved naming scheme for anonymous object types + +There has long been a naming scheme in order to name anonymous things like this: +```typescript +declare const foo: (someObject: {foo: number, bar?: string}) => void; +``` +```scala +@JSGlobal("foo") +@js.native +object foo extends js.Object { + def apply(someObject: AnonFooBar): Unit = js.native +} +``` + +Since we suddenly got a lot more anonymous object types because of the expanded type mappings, the scheme needed some improvements. +Generated names like AnonFoo will generally be shorter than before. + +### Rewritten tag detection in slinky flavour + +For the slinky flavour the generated components receive an element type like `a`, `div`, etc. + +This enables the user to supply DOM props with normal Slinky syntax. For instance a component like this +```scala +import slinky.web.html.button.tag +// import ... + +object Paper + extends ExternalComponentWithAttributesWithRefType[tag.type, default] { + /* The following DOM/SVG props were specified: className, contentEditable, dangerouslySetInnerHTML, defaultChecked, defaultValue, dir, draggable, height, hidden, id, lang, placeholder, spellCheck, style, suppressContentEditableWarning, tabIndex, title, width */ + def apply(about: String = null /*, ... */) = ??? +} +``` +can be used like this +```scala +Paper(about = "foo")(className := "className") +``` + +After the rewrite both element detection and props trimming is much more reliable than before. + +In particular we used to only check if the actual props matched the name of a prop for the identified element, + now we only trim it if the type is exactly what the given element would accept. + +### Improved parser +For better or worse ScalablyTyped has it's own parser. +It received some improvements and is now able to parse 100% of DefinitelyTyped for the first time + +### Improved plugin +- Fixed a bug where we compile the same library simultaneously and ended up with corrupt jar files. Fixed by a file-level lock +- Should now be less susceptible to OOM after a usage of a class loader cache was removed. + +### Contributors + 17 Øyvind Raddum Berg + 1 Jocelyn Boullier + 1 Lorenzo Gabriele + 1 Mushtaq Ahmed + +## 1.0.0-beta5 +[Full changelog](https://github.com/ScalablyTyped/Converter/compare/v1.0.0-beta4...v1.0.0-beta5) + +- Full support for Scala.js 1.0.0 +- Redesigned the sbt plugin to use `allDependencies` rather than `unmanagedDependencies` + +### Contributors + 18 Øyvind Raddum Berg + 1 FabioPinheiro + +## 1.0.0-beta4 +[Full changelog](https://github.com/ScalablyTyped/Converter/compare/v1.0.0-beta3...v1.0.0-beta4) + +Rewrote the plugin from just a source generator to compiling all the libraries for you. +For most use cases this is a huge improvement. + +### Contributors + 8 Øyvind Raddum Berg + +## 1.0.0-beta3 and 1.0.0-beta2 +Bugfix releases + +## 1.0.0-beta1 - Beta release announcement! + +It's a great pleasure to finally open source the ScalablyTyped converter + and release the project as an sbt plugin. + +You now decide your own Scala version, your own Scala.js version and your own versions of libraries. + +All projects built with the plugin will now continue to build forever, as opposed to the old distribution method + where libraries had to be culled every now and then. + + +## Important changes: + +### The [published ScalablyTyped distribution](https://github.com/oyvindberg/ScalablyTyped) is deprecated. + +Once you factor in cross builds and flavours it's impossible to keep a useful set of precompiled binaries. + +Going forward it'll continue to serve as QA to ensure that we're able to + convert the newest versions of important libraries. + +It'll also be updated immediately to the newest available versions, Scala 2.13 and Scala.js 1.0.0 pre-releases. + +All usage should be migrated to the new plugin. + +### Facades are deprecated +Most usage of facades have been to enable better usage with react. +This is now solved by [flavours](flavour.md) instead. + +In particular the react-facade which was widely used in the demos and saw some use outside is now deprecated. + +If you want to keep using it feel free to copy it into your own repository (it's MIT licensed). + +If we come across anything which is not solved by (potentially writing new) flavours, we can revisit this. + +### New naming convention + +One of the recognizable features of ScalablyTyped was the rather peculiar naming scheme which served to avoid name collisions. + +The final feature which was merged before release was "adaptive naming", which manages the same while generating much nicer looking code. + +It typically looked like this: +```scala +import typings.reactDashRouter.reactDashRouterMod.RouteProps +``` + +After the change, the same import is now +```scala +import typings.reactRouter.mod.RouteProps +``` + +Everyone migrating to the plugin from the ScalablyTyped distribution will have to rewrite most of their imports. +It should be easy once you see the pattern. Most module names will have lost part of it's prefix, and the top-level +module for each library is now simply called `mod`. + +Consult [this commit](https://github.com/ScalablyTyped/SlinkyTypedDemos/commit/e135fc55aeaf53162d9cd472f5cc0bee76bdabe0) +to see what was needed to port the Slinky demos. + + + + diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/EnabledTypeMappingExpansion.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/EnabledTypeMappingExpansion.scala index 7723d43226..95c533c007 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/EnabledTypeMappingExpansion.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/EnabledTypeMappingExpansion.scala @@ -1,81 +1,9 @@ package org.scalablytyped.converter.internal.importer import org.scalablytyped.converter.Selection -import org.scalablytyped.converter.internal.ts.{TsIdentLibrary, TsIdentLibraryScoped, TsIdentLibrarySimple} +import org.scalablytyped.converter.internal.ts.TsIdentLibrary object EnabledTypeMappingExpansion { val DefaultSelection: Selection[TsIdentLibrary] = - Selection.NoneExcept( - TsIdentLibrary("amap-js-api"), - TsIdentLibrary("antd"), - TsIdentLibrary("instagram-private-api"), - TsIdentLibrary("jest-config"), - TsIdentLibrary("react-autosuggest"), - TsIdentLibrary("react-dropzone"), - TsIdentLibrary("react-native"), - TsIdentLibrary("react-onsenui"), - TsIdentLibrary("react-select"), - TsIdentLibraryScoped("ant-design", "colors"), - TsIdentLibraryScoped("ant-design", "create-react-context"), - TsIdentLibraryScoped("ant-design", "dark-theme"), - TsIdentLibraryScoped("ant-design", "icons"), - TsIdentLibraryScoped("ant-design", "icons-angular"), - TsIdentLibraryScoped("ant-design", "icons-react"), - TsIdentLibraryScoped("ant-design", "icons-react-native"), - TsIdentLibraryScoped("ant-design", "icons-vue"), - TsIdentLibraryScoped("ant-design", "pro-layout"), - TsIdentLibraryScoped("ant-design", "react-native"), - TsIdentLibraryScoped("material-ui", "core"), - TsIdentLibraryScoped("material-ui", "icons"), - TsIdentLibraryScoped("material-ui", "lab"), - TsIdentLibraryScoped("material-ui", "system"), - TsIdentLibraryScoped("material-ui", "utils"), - TsIdentLibraryScoped("nivo", "annotations"), - TsIdentLibraryScoped("nivo", "axes"), - TsIdentLibraryScoped("nivo", "bar"), - TsIdentLibraryScoped("nivo", "bullet"), - TsIdentLibraryScoped("nivo", "calendar"), - TsIdentLibraryScoped("nivo", "chord"), - TsIdentLibraryScoped("nivo", "circle-packing"), - TsIdentLibraryScoped("nivo", "colors"), - TsIdentLibraryScoped("nivo", "core"), - TsIdentLibraryScoped("nivo", "generators"), - TsIdentLibraryScoped("nivo", "geo"), - TsIdentLibraryScoped("nivo", "heatmap"), - TsIdentLibraryScoped("nivo", "legends"), - TsIdentLibraryScoped("nivo", "line"), - TsIdentLibraryScoped("nivo", "parallel-coordinates"), - TsIdentLibraryScoped("nivo", "pie"), - TsIdentLibraryScoped("nivo", "radar"), - TsIdentLibraryScoped("nivo", "sankey"), - TsIdentLibraryScoped("nivo", "scales"), - TsIdentLibraryScoped("nivo", "scatterplot"), - TsIdentLibraryScoped("nivo", "stream"), - TsIdentLibraryScoped("nivo", "sunburst"), - TsIdentLibraryScoped("nivo", "tooltip"), - TsIdentLibraryScoped("nivo", "treemap"), - TsIdentLibraryScoped("nivo", "voronoi"), - TsIdentLibraryScoped("nivo", "waffle"), - TsIdentLibraryScoped("react-navigation", "core"), - TsIdentLibraryScoped("react-navigation", "native"), - TsIdentLibraryScoped("tensorflow", "tfjs"), - TsIdentLibraryScoped("tensorflow", "tfjs-converter"), - TsIdentLibraryScoped("tensorflow", "tfjs-core"), - TsIdentLibraryScoped("tensorflow", "tfjs-data"), - TsIdentLibraryScoped("tensorflow", "tfjs-layers"), - TsIdentLibraryScoped("tensorflow", "tfjs-node"), - TsIdentLibraryScoped("uifabric", "foundation"), - TsIdentLibraryScoped("uifabric", "icons"), - TsIdentLibraryScoped("uifabric", "merge-styles"), - TsIdentLibraryScoped("uifabric", "react-hooks"), - TsIdentLibraryScoped("uifabric", "set-version"), - TsIdentLibraryScoped("uifabric", "styling"), - TsIdentLibraryScoped("uifabric", "utilities"), - TsIdentLibrarySimple("react-navigation"), - TsIdentLibrarySimple("react-navigation-drawer"), - TsIdentLibrarySimple("react-navigation-material-bottom-tabs"), - TsIdentLibrarySimple("react-navigation-stack"), - TsIdentLibrary("@storybook/api"), - TsIdentLibrary("styled-components"), - ) + Selection.AllExcept("std", "prop-types", "react").map(TsIdentLibrary.apply) } diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/ImportType.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/ImportType.scala index 2820c6965c..6437790edc 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/ImportType.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/ImportType.scala @@ -120,8 +120,8 @@ class ImportType(stdNames: QualifiedName.StdNames) { def c = Comments(Comment.warning(s"Unsupported type mapping: \n${TsTypeFormatter(tpe)}\n")) scope.stack collectFirst { - case x: TsDeclTypeAlias if x.name === TsIdent.Record => - TypeRef.StringDictionary(TypeRef(ImportName(x.tparams.head.name)), NoComments) + case x: TsDeclTypeAlias if x.codePath.forceHasPath.codePath === TsQIdent.Std.Record => + TypeRef.StringDictionary(TypeRef(ImportName(x.tparams(1).name)), NoComments) case x: TsNamedDecl => TypeRef.Intersection(IArray(TypeRef.StringLiteral(x.name.value), base)).withComments(c) } getOrElse base.withComments(c) @@ -205,15 +205,27 @@ class ImportType(stdNames: QualifiedName.StdNames) { case TsTypeKeyOf(_) => TypeRef.String - case TsTypeTuple(StrippedRepeat(targs)) => - TypeRef( - QualifiedName.Array, - IArray(TypeRef.Union(targs map apply(wildcards.maybeAllow, scope, importName), false)), - NoComments, - ) - case TsTypeTuple(targs) => - TypeRef.Tuple(targs map apply(wildcards.maybeAllow, scope, importName)) + targs match { + case IArray.initLast(init, TsTypeRepeated(repeated)) => + ts.FollowAliases(scope)(repeated) match { + case TsTypeRef( + _, + TsQIdent.Std.Array | TsQIdent.Std.ReadonlyArray | TsQIdent.Array | TsQIdent.ReadonlyArray, + IArray.exactlyOne(elem), + ) => + TypeRef( + importName(TsQIdent.Array), + IArray(apply(wildcards, scope, importName)(TsTypeUnion(init :+ elem))).distinct, + NoComments, + ) + case other => + val c = Comment.warning(s"repeated non-array type: ${TsTypeFormatter(other)}") + TypeRef(importName(TsQIdent.Array), Empty, Comments(c)) + } + case nonRepeating => + TypeRef.Tuple(nonRepeating map apply(wildcards.maybeAllow, scope, importName)) + } case TsTypeRepeated(underlying) => TypeRef.Repeated(apply(wildcards, scope, importName)(underlying), NoComments) @@ -226,8 +238,8 @@ class ImportType(stdNames: QualifiedName.StdNames) { TypeRef.Boolean } - case TsTypeAsserts(ident) => - TypeRef.Boolean.withComments(Comments(s"/* asserts ${ident.value} */")) + case TsTypeAsserts(ident, isOpt) => + TypeRef.Boolean.withComments(Comments(s"/* asserts ${ident.value} ${isOpt.fold("")("is " + _)}*/")) case TsTypeLiteral(lit) => lit match { @@ -301,17 +313,4 @@ class ImportType(stdNames: QualifiedName.StdNames) { orAny(wildcards, scope / param, importName)(param.tpe) withOptional param.isOptional withComments Comments( s"/* ${param.name.value} */", ) - - private object StrippedRepeat { - def unapply(types: IArray[TsType]): Option[IArray[TsType]] = { - var found = false - val ret = types.map { - case TsTypeRepeated(x) => - found = true - x - case other => other - } - if (found) Some(ret) else None - } - } } diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase1ReadTypescript.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase1ReadTypescript.scala index 670ec63471..6aa2cc127a 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase1ReadTypescript.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase1ReadTypescript.scala @@ -234,7 +234,7 @@ object Phase1ReadTypescript { T.DefaultedTypeArguments.visitTsParsedFile(scope.caching), //after FlattenTrees T.InlineTrivialParents.visitTsParsedFile(scope.caching), //after FlattenTrees and DefaultedTypeArguments if (expandTypeMappings(libName)) T.ExpandTypeMappings.visitTsParsedFile(scope.caching) else identity, // before ExtractInterfaces - if (expandTypeMappings(libName)) T.ExpandTypeMappings.After(libName, scope) else identity, // before ExtractInterfaces + if (expandTypeMappings(libName)) T.ExpandTypeMappings.After.visitTsParsedFile(scope.caching) else identity, // before ExtractInterfaces ( T.SimplifyConditionals >> // after ExpandTypeMappings T.TypeAliasToConstEnum >> diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase3Compile.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase3Compile.scala index c6878508d7..33c3d3b7db 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase3Compile.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase3Compile.scala @@ -13,7 +13,6 @@ import org.scalablytyped.converter.internal.scalajs._ import org.scalablytyped.converter.internal.scalajs.flavours.FlavourImpl import org.scalablytyped.converter.internal.sets.SetOps import org.scalablytyped.converter.internal.ts.TsIdentLibrary -import os.RelPath import scala.collection.immutable.SortedSet import scala.concurrent.Await @@ -36,6 +35,7 @@ class Phase3Compile( softWrites: Boolean, flavour: FlavourImpl, generateScalaJsBundlerFile: Boolean, + ensureSourceFilesWritten: Boolean, ) extends Phase[Source, Phase2Res, PublishedSbtProject] { val ScalaFiles: PartialFunction[(os.RelPath, Array[Byte]), Array[Byte]] = { @@ -59,7 +59,7 @@ class Phase3Compile( _lib match { case Facade => - val buildJson = Json[FacadeJson](source.path / "build.json") + val buildJson = Json.force[FacadeJson](source.path / "build.json") val dependencies: PhaseRes[Source, Set[Source]] = PhaseRes.sequenceSet( @@ -85,9 +85,7 @@ class Phase3Compile( require(sourceFilesBase.nonEmpty, "no files found") val sourceFiles: Map[os.RelPath, Array[Byte]] = - sourceFilesBase mapValues { - case (bytes, _) => bytes - } + sourceFilesBase mapValues { case (bytes, _) => bytes } val newestChange: Instant = sourceFilesBase.foldLeft(Instant.MIN) { @@ -95,7 +93,8 @@ class Phase3Compile( if (acc isBefore instant) instant else acc } - val metadataOpt = None + val externalDeps: Set[Dep] = buildJson.dependencies ++ flavour.dependencies + val sbtLayout = ContentSbtProject( v = versions, comments = NoComments, @@ -104,25 +103,25 @@ class Phase3Compile( version = VersionHack.TemplateValue, publishUser = publishUser, localDeps = IArray.fromTraversable(deps.values), - deps = buildJson.dependencies.map(identity), + deps = externalDeps, scalaFiles = sourceFiles, resources = Map(), projectName = projectName, - metadataOpt = metadataOpt, + metadataOpt = None, declaredVersion = None, ) go( logger = logger, deps = deps, - externalDeps = buildJson.dependencies ++ flavour.dependencies, + externalDeps = externalDeps, source = source, name = source.libName.value, sbtLayout = sbtLayout, compilerPaths = CompilerPaths(versions, source.path), deleteUnknownFiles = false, makeVersion = digest => s"${constants.DateTimePattern.format(newestChange)}-${digest.hexString.take(6)}", - metadataOpt = metadataOpt, + metadataOpt = None, ) } @@ -144,9 +143,8 @@ class Phase3Compile( val compilerPaths = CompilerPaths.of(versions, targetFolder, lib.libName) val externalDeps = flavour.dependencies - val resources: Map[RelPath, Array[Byte]] = - if (generateScalaJsBundlerFile) - ScalaJsBundlerDepFile(compilerPaths.classesDir, lib.source.libName, lib.libVersion) + val resources: Map[os.RelPath, Array[Byte]] = + if (generateScalaJsBundlerFile) ScalaJsBundlerDepFile(lib.source.libName, lib.libVersion) else Map() val sbtLayout = ContentSbtProject( @@ -197,8 +195,10 @@ class Phase3Compile( val digest = Digest.of(sbtLayout.all collect ScalaFiles) val finalVersion = makeVersion(digest) val allFilesProperVersion = VersionHack.templateVersion(sbtLayout, finalVersion) - //Next line is that actually spits out files - files.sync(allFilesProperVersion.all, compilerPaths.baseDir, deleteUnknownFiles, softWrites) + + if (ensureSourceFilesWritten) { + files.sync(allFilesProperVersion.all, compilerPaths.baseDir, deleteUnknownFiles, softWrites) + } val reference = Dep.ScalaJs(organization, name, finalVersion) @@ -208,11 +208,10 @@ class Phase3Compile( reference, )(compilerPaths.baseDir, deps, metadataOpt) - val existing: IvyLayout[os.Path, Synced] = - IvyLayout[Synced](sbtProject, Synced.Unchanged, Synced.Unchanged, Synced.Unchanged, Synced.Unchanged) - .mapFiles(publishFolder / _) + val existing: IvyLayout[os.Path, Unit] = + IvyLayout(sbtProject, (), (), (), ()).mapFiles(publishFolder / _) - val jarFile = existing.jarFile._1 + val jarFile = existing.jarFile._1 val lockFile = jarFile / os.up / ".lock" FileLocking.withLock(lockFile.toNIO) { _ => @@ -220,11 +219,11 @@ class Phase3Compile( logger warn s"Using cached build $jarFile" PhaseRes.Ok(PublishedSbtProject(sbtProject)(compilerPaths.classesDir, existing, None)) } else { - { - implicit val wd = os.home - % rm ("-Rf", compilerPaths.classesDir) - } + remove(compilerPaths.classesDir) os.makeDir.all(compilerPaths.classesDir) + if (!ensureSourceFilesWritten) { + files.sync(allFilesProperVersion.all, compilerPaths.baseDir, deleteUnknownFiles, softWrites) + } val jarDeps: Set[Compiler.InternalDep] = deps.values.to[Set].map(x => Compiler.InternalDepJar(x.localIvyFiles.jarFile._1)) @@ -238,20 +237,16 @@ class Phase3Compile( compiler.compile(name, digest, compilerPaths, jarDeps, externalDeps) match { case Right(()) => val writtenIvyFiles: IvyLayout[os.Path, Synced] = - build - .ContentForPublish( - versions, - compilerPaths, - sbtProject, - ZonedDateTime.now(), - allFilesProperVersion, - externalDeps, - ) - .mapFiles(p => publishFolder / p) - .mapValues(files.softWriteBytes) + ContentForPublish( + versions, + compilerPaths, + sbtProject, + ZonedDateTime.now(), + externalDeps, + ).mapFiles(p => publishFolder / p).mapValues(files.softWriteBytes) val elapsed = System.currentTimeMillis - t0 - logger warn s"Built ${jarFile} in $elapsed ms" + logger warn s"Built $jarFile in $elapsed ms" PhaseRes.Ok(PublishedSbtProject(sbtProject)(compilerPaths.classesDir, writtenIvyFiles, None)) @@ -260,13 +255,16 @@ class Phase3Compile( PhaseRes.Failure(Map(source -> Right(s"Compilation failed"))) } - { - implicit val wd = os.home - % rm ("-Rf", compilerPaths.targetDir) - } + remove(compilerPaths.targetDir) ret } } } + + /* don't use `os.remove` as it's much slower */ + def remove(p: os.Path): Unit = { + implicit val wd = os.home + % rm ("-Rf", p) + } } diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/PhaseFlavour.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/PhaseFlavour.scala index 88007f7d97..ecba20bcf4 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/PhaseFlavour.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/PhaseFlavour.scala @@ -25,15 +25,15 @@ class PhaseFlavour(flavour: FlavourImpl) extends Phase[Source, Phase2Res, Phase2 case lib: LibScalaJs => getDeps((lib.dependencies.keys: Iterable[Source]).to[SortedSet]).map { case Phase2Res.Unpack(deps, _) => - val scope = new TreeScope.Root( + val originalScope = new TreeScope.Root( libName = lib.scalaName, - _dependencies = deps.map { case (_, lib) => lib.scalaName -> lib.packageTree }, + _dependencies = lib.dependencies.map { case (_, lib) => lib.scalaName -> lib.packageTree }, logger = logger, pedantic = false, outputPkg = flavour.outputPkg, ) - val tree = flavour.rewrittenTree(scope, lib.packageTree) + val tree = flavour.rewrittenTree(originalScope, lib.packageTree) LibScalaJs(lib.source)( lib.libName, diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/ScalaJsBundlerDepFile.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/ScalaJsBundlerDepFile.scala index 867fed4441..259ffc92d9 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/ScalaJsBundlerDepFile.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/ScalaJsBundlerDepFile.scala @@ -25,7 +25,7 @@ object ScalaJsBundlerDepFile { implicit val Decoder: Decoder[NpmDependencies] = deriveDecoder[NpmDependencies] } - def apply(dir: os.Path, libName: TsIdentLibrary, v: LibraryVersion): Map[os.RelPath, Array[Byte]] = + def apply(libName: TsIdentLibrary, v: LibraryVersion): Map[os.RelPath, Array[Byte]] = (v.libraryVersion, v.inGit) match { case (Some(version), None) if libName =/= ts.TsIdent.std => val deps = List(Map(libName.value -> version)) diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Source.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Source.scala index 9d33b13030..2b29db0166 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Source.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Source.scala @@ -118,7 +118,7 @@ object Source { import jsonCodecs._ val typingsJsonPath = fromFolder.folder.path / os.RelPath(path) - val typingsJson = Json[TypingsJson](typingsJsonPath) + val typingsJson = Json.force[TypingsJson](typingsJsonPath) IArray(InFile(typingsJsonPath / os.up / typingsJson.main)) case _ => Empty } diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/build/ContentForPublish.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/build/ContentForPublish.scala index 22bb1981e5..c283dd0dc6 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/build/ContentForPublish.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/build/ContentForPublish.scala @@ -17,13 +17,12 @@ object ContentForPublish { paths: CompilerPaths, p: SbtProject, publication: ZonedDateTime, - sourceFiles: Layout[os.RelPath, Array[Byte]], externalDeps: Set[Dep], ): IvyLayout[os.RelPath, Array[Byte]] = IvyLayout( p = p, jarFile = createJar(publication)(paths.classesDir), - sourceFile = createJar(sourceFiles, publication), + sourceFile = createJar(publication)(paths.sourcesDir), ivyFile = fromXml(ivy(v, p, publication, externalDeps)), pomFile = fromXml(pom(v, p, externalDeps)), ) @@ -65,24 +64,6 @@ object ContentForPublish { baos.toByteArray } - def createJar(sourceFiles: Layout[os.RelPath, Array[Byte]], publication: ZonedDateTime): Array[Byte] = { - val baos = new ByteArrayOutputStream(1024 * 1024) - val jar = new JarOutputStream(baos, createManifest()) - - try { - sourceFiles.all.foreach { - case (relFile, contents) => - val entry = new JarEntry(relFile.toString) - entry.setTime(publication.toEpochSecond) - jar.putNextEntry(entry) - jar.write(contents) - jar.closeEntry() - } - } finally jar.close() - - baos.toByteArray - } - def ivy(v: Versions, p: SbtProject, publication: ZonedDateTime, externalDeps: Set[Dep]): Elem = { val artifactName = p.reference.mangledArtifact(v) diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/build/SbtProject.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/build/SbtProject.scala index dc8e1166c9..5c0f2d4184 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/build/SbtProject.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/build/SbtProject.scala @@ -17,7 +17,7 @@ case class SbtProject(name: String, artifactId: String, reference: Dep.ScalaJs)( case class PublishedSbtProject(project: SbtProject)( val classfileDir: os.Path, - val localIvyFiles: IvyLayout[os.Path, Synced], + val localIvyFiles: IvyLayout[os.Path, _], val publishedOpt: Option[Unit], ) diff --git a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/flavourImpl.scala b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/flavourImpl.scala index 2e90e54865..270b8dcc18 100644 --- a/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/flavourImpl.scala +++ b/importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/flavourImpl.scala @@ -2,7 +2,7 @@ package org.scalablytyped.converter.internal.importer import org.scalablytyped.converter.Flavour import org.scalablytyped.converter.internal.scalajs.Name -import org.scalablytyped.converter.internal.scalajs.flavours.FlavourImpl +import org.scalablytyped.converter.internal.scalajs.flavours.{FlavourImpl, SlinkyFlavour} object flavourImpl { def apply( @@ -18,7 +18,7 @@ object flavourImpl { outputPkg = outputPackage, ) case Flavour.Slinky => - FlavourImpl.Slinky(outputPkg = outputPackage) + SlinkyFlavour(outputPkg = outputPackage) case Flavour.SlinkyNative => FlavourImpl.SlinkyNative(outputPkg = outputPackage) case Flavour.Japgolly => diff --git a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Ci.scala b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Ci.scala index 2ebfd2b8c0..7f215aa766 100644 --- a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Ci.scala +++ b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Ci.scala @@ -259,7 +259,7 @@ class Ci(config: Ci.Config, paths: Ci.Paths) { val externalsFolderF: Future[InFolder] = dtFolderF.map { dtFolder => val external: NotNeededPackages = - Json[NotNeededPackages](dtFolder.path / os.up / "notNeededPackages.json") + Json.force[NotNeededPackages](dtFolder.path / os.up / "notNeededPackages.json") UpToDateExternals( interfaceLogger, @@ -353,6 +353,7 @@ class Ci(config: Ci.Config, paths: Ci.Paths) { softWrites = config.softWrites, flavour = flavour, generateScalaJsBundlerFile = true, + ensureSourceFilesWritten = true, ), "build", ) @@ -406,7 +407,7 @@ target/ val summaryFile = targetFolder / Summary.path val formattedDiff: String = { - val existingOpt = Try(Json[Summary](summaryFile)).toOption + val existingOpt = Try(Json.force[Summary](summaryFile)).toOption val diff = Summary.diff(BuildInfo.gitSha.take(6), existingOpt, summary) Json.persist(summaryFile)(summary) Summary.formatDiff(diff) diff --git a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Libraries.scala b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Libraries.scala index 703a72eafb..1dd27598e6 100644 --- a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Libraries.scala +++ b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Libraries.scala @@ -283,7 +283,7 @@ object Libraries { base ++ circular map TsIdentLibrary.apply } - val Slow = Set("@pulumi/aws", "aws-sdk", "googleapis", "@material-ui/core") map TsIdentLibrary.apply + val Slow = Set("@pulumi/aws", "aws-sdk", "googleapis", "@material-ui/core", "@storybook/components") map TsIdentLibrary.apply /* These are all the libraries used in demos. The set doubles as the extended test set */ val DemoSet: Set[TsIdentLibrary] = expo ++ Set( diff --git a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/build/BloopCompiler.scala b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/build/BloopCompiler.scala index 4c23c5d4ce..49819ce89a 100644 --- a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/build/BloopCompiler.scala +++ b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/build/BloopCompiler.scala @@ -12,6 +12,8 @@ import bloop.engine.NoPool import bloop.io.AbsolutePath import bloop.logging.{DebugFilter, Logger => BloopLogger} import com.olvind.logging.{Formatter, Logger} +import coursier.cache.ArtifactError +import coursier.error.FetchError import coursier.util.Task import coursier.{Attributes, Dependency, Fetch, Module} import org.scalablytyped.converter.internal.scalajs.{Dep, Versions} @@ -46,12 +48,22 @@ object BloopCompiler { attributes = Attributes(), ) - def resolve(versions: Versions, deps: Dep*)(implicit ec: ExecutionContext): Future[Array[AbsolutePath]] = - Fetch[Task]() - .withDependencies(deps map toCoursier(versions)) - .io - .future() - .map(files => files.map(f => AbsolutePath(f)).toArray) + def resolve(versions: Versions, deps: Dep*)(implicit ec: ExecutionContext): Future[Array[AbsolutePath]] = { + def go(remainingAttempts: Int): Future[Array[AbsolutePath]] = + Fetch[Task]() + .withDependencies(deps map toCoursier(versions)) + .io + .future() + .map(files => files.map(f => AbsolutePath(f)).toArray) + .recoverWith { + case x: FetchError.DownloadingArtifacts if remainingAttempts > 0 && x.errors.exists { + case (_, artifactError) => artifactError.isInstanceOf[ArtifactError.Recoverable] + } => + go(remainingAttempts - 1) + } + + go(remainingAttempts = 3) + } def apply( logger: Logger[Unit], @@ -105,7 +117,7 @@ class BloopCompiler private ( val classPath = { val fromExternalDeps: Array[AbsolutePath] = - Await.result(BloopCompiler.resolve(versions, externalDeps.toArray: _*)(ec), 10.seconds) + Await.result(BloopCompiler.resolve(versions, externalDeps.toArray: _*)(ExecutionContext.global), Duration.Inf) val fromDependencyJars: Set[AbsolutePath] = deps.collect { case Compiler.InternalDepJar(jar) => AbsolutePath(jar.toIO) } diff --git a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/documentation/NpmjsFetcher.scala b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/documentation/NpmjsFetcher.scala index 9858a8e6ca..823848b229 100644 --- a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/documentation/NpmjsFetcher.scala +++ b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/documentation/NpmjsFetcher.scala @@ -1,12 +1,12 @@ -package org.scalablytyped.converter.internal.importer.documentation +package org.scalablytyped.converter.internal +package importer +package documentation import java.nio.file.Path import com.olvind.logging.Logger import gigahorse.HttpClient import gigahorse.support.okhttp.Gigahorse -import org.scalablytyped.converter.internal.files -import org.scalablytyped.converter.internal.importer.{Json, Source} import org.scalablytyped.converter.internal.stringUtils.encodeURIComponent import org.scalablytyped.converter.internal.ts.TsIdentLibrarySimple diff --git a/importer/src/test/resources/chart.js/check/c/chart_dot_js/build.sbt b/importer/src/test/resources/chart.js/check/c/chart_dot_js/build.sbt index 4d5292f1c2..dcebbdd63c 100644 --- a/importer/src/test/resources/chart.js/check/c/chart_dot_js/build.sbt +++ b/importer/src/test/resources/chart.js/check/c/chart_dot_js/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "chart_dot_js" -version := "0.0-unknown-5366ae" +version := "0.0-unknown-0417af" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/AnonGlobal.scala b/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/AnonDictkey.scala similarity index 87% rename from importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/AnonGlobal.scala rename to importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/AnonDictkey.scala index 72e2285172..61cbd0fe37 100644 --- a/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/AnonGlobal.scala +++ b/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/AnonDictkey.scala @@ -8,20 +8,20 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonGlobal +trait AnonDictkey extends /* key */ StringDictionary[js.Any] { var global: ChartOptions with ChartFontOptions = js.native } -object AnonGlobal { +object AnonDictkey { @scala.inline def apply( global: ChartOptions with ChartFontOptions, StringDictionary: /* key */ StringDictionary[js.Any] = null - ): AnonGlobal = { + ): AnonDictkey = { val __obj = js.Dynamic.literal(global = global.asInstanceOf[js.Any]) if (StringDictionary != null) js.Dynamic.global.Object.assign(__obj, StringDictionary) - __obj.asInstanceOf[AnonGlobal] + __obj.asInstanceOf[AnonDictkey] } } diff --git a/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/TypeofClassChart.scala b/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/TypeofChart.scala similarity index 91% rename from importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/TypeofClassChart.scala rename to importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/TypeofChart.scala index 858ed41f2f..d10a685c13 100644 --- a/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/TypeofClassChart.scala +++ b/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/TypeofChart.scala @@ -11,13 +11,13 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait TypeofClassChart +trait TypeofChart extends Instantiable2[ (/* context */ ArrayLike[CanvasRenderingContext2D | HTMLCanvasElement]) | (/* context */ CanvasRenderingContext2D) | (/* context */ HTMLCanvasElement) | (/* context */ String), /* options */ js.Any, Chart ] { var controllers: StringDictionary[js.Any] = js.native - var defaults: AnonGlobal = js.native + var defaults: AnonDictkey = js.native } diff --git a/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/mod/^.scala b/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/mod/^.scala index 9bbffc1a96..4c2b656f4b 100644 --- a/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/mod/^.scala +++ b/importer/src/test/resources/chart.js/check/c/chart_dot_js/src/main/scala/typings/chartJs/mod/^.scala @@ -1,8 +1,8 @@ package typings.chartJs.mod import org.scalablytyped.runtime.StringDictionary -import typings.chartJs.AnonGlobal -import typings.chartJs.TypeofClassChart +import typings.chartJs.AnonDictkey +import typings.chartJs.TypeofChart import typings.std.ArrayLike import typings.std.CanvasRenderingContext2D import typings.std.HTMLCanvasElement @@ -22,8 +22,8 @@ class ^ protected () extends Chart { @JSImport("chart.js", JSImport.Namespace) @js.native object ^ extends js.Object { - val Chart: TypeofClassChart = js.native + val Chart: TypeofChart = js.native var controllers: StringDictionary[js.Any] = js.native - var defaults: AnonGlobal = js.native + var defaults: AnonDictkey = js.native } diff --git a/importer/src/test/resources/export-as-namespace/check/a/angular-agility/build.sbt b/importer/src/test/resources/export-as-namespace/check/a/angular-agility/build.sbt index 1ff9d9f5f9..28463fd21e 100644 --- a/importer/src/test/resources/export-as-namespace/check/a/angular-agility/build.sbt +++ b/importer/src/test/resources/export-as-namespace/check/a/angular-agility/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "angular-agility" -version := "0.0-unknown-ad90c7" +version := "0.0-unknown-b38301" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "angular" % "1.6-a834ce", + "org.scalablytyped" %%% "angular" % "1.6-600247", "org.scalablytyped" %%% "std" % "0.0-unknown-eec27d") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") diff --git a/importer/src/test/resources/export-as-namespace/check/a/angular/build.sbt b/importer/src/test/resources/export-as-namespace/check/a/angular/build.sbt index ec29721e58..1409f7820e 100644 --- a/importer/src/test/resources/export-as-namespace/check/a/angular/build.sbt +++ b/importer/src/test/resources/export-as-namespace/check/a/angular/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "angular" -version := "1.6-a834ce" +version := "1.6-600247" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/AnonArgs.scala b/importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/AnonInstantiable.scala similarity index 89% rename from importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/AnonArgs.scala rename to importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/AnonInstantiable.scala index 42cf55e039..7e11cdc0ec 100644 --- a/importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/AnonArgs.scala +++ b/importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/AnonInstantiable.scala @@ -6,6 +6,6 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonArgs[T] +trait AnonInstantiable[T] extends Instantiable1[/* args (repeated) */ js.Any, T] diff --git a/importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/mod/auto.scala b/importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/mod/auto.scala index 807c7ff0a8..0866c174cf 100644 --- a/importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/mod/auto.scala +++ b/importer/src/test/resources/export-as-namespace/check/a/angular/src/main/scala/typings/angular/mod/auto.scala @@ -1,6 +1,6 @@ package typings.angular.mod -import typings.angular.AnonArgs +import typings.angular.AnonInstantiable import typings.angular.mod._Global_.Function import scala.scalajs.js import scala.scalajs.js.`|` @@ -22,8 +22,8 @@ object auto extends js.Object { def get[T](name: String): T = js.native def get[T](name: String, caller: String): T = js.native def has(name: String): Boolean = js.native - def instantiate[T](typeConstructor: AnonArgs[T]): T = js.native - def instantiate[T](typeConstructor: AnonArgs[T], locals: js.Any): T = js.native + def instantiate[T](typeConstructor: AnonInstantiable[T]): T = js.native + def instantiate[T](typeConstructor: AnonInstantiable[T], locals: js.Any): T = js.native def invoke[T](func: Injectable[Function | (js.Function1[/* repeated */ _, T])]): T = js.native def invoke[T](func: Injectable[Function | (js.Function1[/* repeated */ _, T])], context: js.Any): T = js.native def invoke[T](func: Injectable[Function | (js.Function1[/* repeated */ _, T])], context: js.Any, locals: js.Any): T = js.native diff --git a/importer/src/test/resources/fp-ts/check/f/fp-ts/build.sbt b/importer/src/test/resources/fp-ts/check/f/fp-ts/build.sbt index 1a818d46a3..16f8064b27 100644 --- a/importer/src/test/resources/fp-ts/check/f/fp-ts/build.sbt +++ b/importer/src/test/resources/fp-ts/check/f/fp-ts/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "fp-ts" -version := "1.2.0-33cefb" +version := "1.2.0-43d10e" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/fp-ts/check/f/fp-ts/src/main/scala/typings/fpTs/AnonNever.scala b/importer/src/test/resources/fp-ts/check/f/fp-ts/src/main/scala/typings/fpTs/AnonNever.scala deleted file mode 100644 index 9a9a6f941d..0000000000 --- a/importer/src/test/resources/fp-ts/check/f/fp-ts/src/main/scala/typings/fpTs/AnonNever.scala +++ /dev/null @@ -1,21 +0,0 @@ -package typings.fpTs - -import typings.fpTs.hktMod.HKT -import scala.scalajs.js -import scala.scalajs.js.`|` -import scala.scalajs.js.annotation._ - -@js.native -trait AnonNever extends js.Object { - var never: HKT[scala.Nothing, scala.Nothing] = js.native -} - -object AnonNever { - @scala.inline - def apply(never: HKT[scala.Nothing, scala.Nothing]): AnonNever = { - val __obj = js.Dynamic.literal(never = never.asInstanceOf[js.Any]) - - __obj.asInstanceOf[AnonNever] - } -} - diff --git a/importer/src/test/resources/fp-ts/check/f/fp-ts/src/main/scala/typings/fpTs/hktMod/package.scala b/importer/src/test/resources/fp-ts/check/f/fp-ts/src/main/scala/typings/fpTs/hktMod/package.scala index d17a091348..c2b05deff4 100644 --- a/importer/src/test/resources/fp-ts/check/f/fp-ts/src/main/scala/typings/fpTs/hktMod/package.scala +++ b/importer/src/test/resources/fp-ts/check/f/fp-ts/src/main/scala/typings/fpTs/hktMod/package.scala @@ -6,5 +6,5 @@ import scala.scalajs.js.annotation._ package object hktMod { type Type[URI /* <: typings.fpTs.hktMod.URIS */, A] = /* import warning: importer.ImportType#apply Failed type conversion: fp-ts.fp-ts/lib/HKT.URI2HKT[URI] */ js.Any - type URIS = /* import warning: importer.ImportType#apply Failed type conversion: fp-ts.fp-ts/lib/HKT.URI2HKT & fp-ts.Anon_Never[keyof fp-ts.fp-ts/lib/HKT.URI2HKT | 'never']['_URI'] */ js.Any + type URIS = /* import warning: importer.ImportType#apply Failed type conversion: fp-ts.fp-ts/lib/HKT.HKT['_URI'] */ js.Any } diff --git a/importer/src/test/resources/material-ui/check-japgolly/m/material-ui/build.sbt b/importer/src/test/resources/material-ui/check-japgolly/m/material-ui/build.sbt index 98b112347e..4995b1de56 100644 --- a/importer/src/test/resources/material-ui/check-japgolly/m/material-ui/build.sbt +++ b/importer/src/test/resources/material-ui/check-japgolly/m/material-ui/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "material-ui" -version := "0.0-unknown-089c9b" +version := "0.0-unknown-2ae586" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "0.0-unknown-129a34", - "org.scalablytyped" %%% "std" % "0.0-unknown-c1e19b") + "org.scalablytyped" %%% "react" % "0.0-unknown-965b10", + "org.scalablytyped" %%% "std" % "0.0-unknown-5a59ff") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/material-ui/check-japgolly/r/react/build.sbt b/importer/src/test/resources/material-ui/check-japgolly/r/react/build.sbt index 5eba89b598..64c6a1a98f 100644 --- a/importer/src/test/resources/material-ui/check-japgolly/r/react/build.sbt +++ b/importer/src/test/resources/material-ui/check-japgolly/r/react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-129a34" +version := "0.0-unknown-965b10" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-c1e19b") + "org.scalablytyped" %%% "std" % "0.0-unknown-5a59ff") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/material-ui/check-japgolly/s/std/build.sbt b/importer/src/test/resources/material-ui/check-japgolly/s/std/build.sbt index c833208932..fdb03a3c32 100644 --- a/importer/src/test/resources/material-ui/check-japgolly/s/std/build.sbt +++ b/importer/src/test/resources/material-ui/check-japgolly/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-c1e19b" +version := "0.0-unknown-5a59ff" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..154708d327 --- /dev/null +++ b/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala @@ -0,0 +1,34 @@ +package typingsJapgolly.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: org.scalajs.dom.raw.HTMLAnchorElement = js.native + var abbr: org.scalajs.dom.raw.HTMLElement = js.native + var address: org.scalajs.dom.raw.HTMLElement = js.native + var area: org.scalajs.dom.raw.HTMLAreaElement = js.native + var article: org.scalajs.dom.raw.HTMLElement = js.native + var aside: org.scalajs.dom.raw.HTMLElement = js.native + var audio: org.scalajs.dom.raw.HTMLAudioElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: org.scalajs.dom.raw.HTMLAnchorElement, + abbr: org.scalajs.dom.raw.HTMLElement, + address: org.scalajs.dom.raw.HTMLElement, + area: org.scalajs.dom.raw.HTMLAreaElement, + article: org.scalajs.dom.raw.HTMLElement, + aside: org.scalajs.dom.raw.HTMLElement, + audio: org.scalajs.dom.raw.HTMLAudioElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any]) + + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala b/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..a05b5c1a4b --- /dev/null +++ b/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala @@ -0,0 +1,20 @@ +package typingsJapgolly.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: org.scalajs.dom.raw.SVGCircleElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply(circle: org.scalajs.dom.raw.SVGCircleElement): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala b/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala index 47b5c32966..abe66b498d 100644 --- a/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala +++ b/importer/src/test/resources/material-ui/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala @@ -6,6 +6,10 @@ import scala.scalajs.js.annotation._ package object std { type Element = org.scalajs.dom.raw.Node + type HTMLAnchorElement = org.scalajs.dom.raw.Element + type HTMLAreaElement = org.scalajs.dom.raw.Element + type HTMLAudioElement = org.scalajs.dom.raw.Element type HTMLElement = org.scalajs.dom.raw.Element type Partial[T] = T + type SVGCircleElement = org.scalajs.dom.raw.Element } diff --git a/importer/src/test/resources/material-ui/check-slinky/m/material-ui/build.sbt b/importer/src/test/resources/material-ui/check-slinky/m/material-ui/build.sbt index ce2cebdfd1..d0a618e6a9 100644 --- a/importer/src/test/resources/material-ui/check-slinky/m/material-ui/build.sbt +++ b/importer/src/test/resources/material-ui/check-slinky/m/material-ui/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "material-ui" -version := "0.0-unknown-09f9f7" +version := "0.0-unknown-2499f4" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "0.0-unknown-41ab35", - "org.scalablytyped" %%% "std" % "0.0-unknown-dec9c9") + "org.scalablytyped" %%% "react" % "0.0-unknown-44e59c", + "org.scalablytyped" %%% "std" % "0.0-unknown-903f63") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/material-ui/check-slinky/r/react/build.sbt b/importer/src/test/resources/material-ui/check-slinky/r/react/build.sbt index 05df67cd3d..e980b76f55 100644 --- a/importer/src/test/resources/material-ui/check-slinky/r/react/build.sbt +++ b/importer/src/test/resources/material-ui/check-slinky/r/react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-41ab35" +version := "0.0-unknown-44e59c" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "std" % "0.0-unknown-dec9c9") + "org.scalablytyped" %%% "std" % "0.0-unknown-903f63") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/material-ui/check-slinky/s/std/build.sbt b/importer/src/test/resources/material-ui/check-slinky/s/std/build.sbt index 473901e234..b3b2de9bcb 100644 --- a/importer/src/test/resources/material-ui/check-slinky/s/std/build.sbt +++ b/importer/src/test/resources/material-ui/check-slinky/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-dec9c9" +version := "0.0-unknown-903f63" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..1e76b4da18 --- /dev/null +++ b/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala @@ -0,0 +1,34 @@ +package typingsSlinky.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: org.scalajs.dom.raw.HTMLAnchorElement = js.native + var abbr: org.scalajs.dom.raw.HTMLElement = js.native + var address: org.scalajs.dom.raw.HTMLElement = js.native + var area: org.scalajs.dom.raw.HTMLAreaElement = js.native + var article: org.scalajs.dom.raw.HTMLElement = js.native + var aside: org.scalajs.dom.raw.HTMLElement = js.native + var audio: org.scalajs.dom.raw.HTMLAudioElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: org.scalajs.dom.raw.HTMLAnchorElement, + abbr: org.scalajs.dom.raw.HTMLElement, + address: org.scalajs.dom.raw.HTMLElement, + area: org.scalajs.dom.raw.HTMLAreaElement, + article: org.scalajs.dom.raw.HTMLElement, + aside: org.scalajs.dom.raw.HTMLElement, + audio: org.scalajs.dom.raw.HTMLAudioElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any]) + + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala b/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..904ccf916f --- /dev/null +++ b/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala @@ -0,0 +1,20 @@ +package typingsSlinky.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: org.scalajs.dom.raw.SVGCircleElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply(circle: org.scalajs.dom.raw.SVGCircleElement): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala b/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala index 638451868d..aceb30b2d9 100644 --- a/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala +++ b/importer/src/test/resources/material-ui/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala @@ -6,6 +6,10 @@ import scala.scalajs.js.annotation._ package object std { type Element = org.scalajs.dom.raw.Node + type HTMLAnchorElement = org.scalajs.dom.raw.Element + type HTMLAreaElement = org.scalajs.dom.raw.Element + type HTMLAudioElement = org.scalajs.dom.raw.Element type HTMLElement = org.scalajs.dom.raw.Element type Partial[T] = T + type SVGCircleElement = org.scalajs.dom.raw.Element } diff --git a/importer/src/test/resources/material-ui/check/m/material-ui/build.sbt b/importer/src/test/resources/material-ui/check/m/material-ui/build.sbt index 6e82ce2547..65cee70e28 100644 --- a/importer/src/test/resources/material-ui/check/m/material-ui/build.sbt +++ b/importer/src/test/resources/material-ui/check/m/material-ui/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "material-ui" -version := "0.0-unknown-81182e" +version := "0.0-unknown-2b6d65" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "0.0-unknown-cf0283", - "org.scalablytyped" %%% "std" % "0.0-unknown-b9ee21") + "org.scalablytyped" %%% "react" % "0.0-unknown-613a91", + "org.scalablytyped" %%% "std" % "0.0-unknown-a7aa54") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/material-ui/check/r/react/build.sbt b/importer/src/test/resources/material-ui/check/r/react/build.sbt index 9bac5fb425..1d61c57562 100644 --- a/importer/src/test/resources/material-ui/check/r/react/build.sbt +++ b/importer/src/test/resources/material-ui/check/r/react/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-cf0283" +version := "0.0-unknown-613a91" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-b9ee21") + "org.scalablytyped" %%% "std" % "0.0-unknown-a7aa54") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/material-ui/check/s/std/build.sbt b/importer/src/test/resources/material-ui/check/s/std/build.sbt index dae97a4ffe..f9c433c23c 100644 --- a/importer/src/test/resources/material-ui/check/s/std/build.sbt +++ b/importer/src/test/resources/material-ui/check/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-b9ee21" +version := "0.0-unknown-a7aa54" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..e88544bdd0 --- /dev/null +++ b/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala @@ -0,0 +1,34 @@ +package typings.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: HTMLAnchorElement = js.native + var abbr: HTMLElement = js.native + var address: HTMLElement = js.native + var area: HTMLAreaElement = js.native + var article: HTMLElement = js.native + var aside: HTMLElement = js.native + var audio: HTMLAudioElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: HTMLAnchorElement, + abbr: HTMLElement, + address: HTMLElement, + area: HTMLAreaElement, + article: HTMLElement, + aside: HTMLElement, + audio: HTMLAudioElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any]) + + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala b/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..6148083e33 --- /dev/null +++ b/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala @@ -0,0 +1,20 @@ +package typings.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: SVGCircleElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply(circle: SVGCircleElement): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/package.scala b/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/package.scala index c012eee2f7..644edbc9a4 100644 --- a/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/package.scala +++ b/importer/src/test/resources/material-ui/check/s/std/src/main/scala/typings/std/package.scala @@ -6,6 +6,10 @@ import scala.scalajs.js.annotation._ package object std { type Element = typings.std.Node + type HTMLAnchorElement = typings.std.Element + type HTMLAreaElement = typings.std.Element + type HTMLAudioElement = typings.std.Element type HTMLElement = typings.std.Element type Partial[T] = T + type SVGCircleElement = typings.std.Element } diff --git a/importer/src/test/resources/material-ui/in/stdlib.d.ts b/importer/src/test/resources/material-ui/in/stdlib.d.ts index a6fe2a1a36..6aee2f417d 100644 --- a/importer/src/test/resources/material-ui/in/stdlib.d.ts +++ b/importer/src/test/resources/material-ui/in/stdlib.d.ts @@ -4,6 +4,25 @@ interface Array {} interface Node{} interface Element extends Node {} interface HTMLElement extends Element {} +interface HTMLAnchorElement extends Element {} +interface HTMLAreaElement extends Element {} +interface HTMLAudioElement extends Element {} +interface SVGCircleElement extends Element {} + declare interface Function {} -declare type Partial = T; \ No newline at end of file +declare type Partial = T; + +interface HTMLElementTagNameMap { + "a": HTMLAnchorElement; + "abbr": HTMLElement; + "address": HTMLElement; + "area": HTMLAreaElement; + "article": HTMLElement; + "aside": HTMLElement; + "audio": HTMLAudioElement; +} + +interface SVGElementTagNameMap { + "circle": SVGCircleElement; +} diff --git a/importer/src/test/resources/react-icons/check/r/react-icons/build.sbt b/importer/src/test/resources/react-icons/check/r/react-icons/build.sbt index fdf975c4b8..58f732e0e1 100644 --- a/importer/src/test/resources/react-icons/check/r/react-icons/build.sbt +++ b/importer/src/test/resources/react-icons/check/r/react-icons/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react-icons" -version := "2.2-34ec13" +version := "2.2-4f1fe7" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/react-icons/check/r/react-icons/src/main/scala/typings/reactIcons/reactIconsProps.scala b/importer/src/test/resources/react-icons/check/r/react-icons/src/main/scala/typings/reactIcons/reactIconsProps.scala index 40b0c6b507..f59dd61cd3 100644 --- a/importer/src/test/resources/react-icons/check/r/react-icons/src/main/scala/typings/reactIcons/reactIconsProps.scala +++ b/importer/src/test/resources/react-icons/check/r/react-icons/src/main/scala/typings/reactIcons/reactIconsProps.scala @@ -6,23 +6,11 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ trait reactIconsProps { - @scala.inline - def `500pxProps`: IconBaseProps.type = typings.reactIconBase.mod.IconBaseProps type `500pxProps` = IconBaseProps - @scala.inline - def AdjustProps: IconBaseProps.type = typings.reactIconBase.mod.IconBaseProps type AdjustProps = IconBaseProps - @scala.inline - def AdnProps: IconBaseProps.type = typings.reactIconBase.mod.IconBaseProps type AdnProps = IconBaseProps - @scala.inline - def Fa500pxProps: IconBaseProps.type = typings.reactIconBase.mod.IconBaseProps type Fa500pxProps = IconBaseProps - @scala.inline - def FaAdjustProps: IconBaseProps.type = typings.reactIconBase.mod.IconBaseProps type FaAdjustProps = IconBaseProps - @scala.inline - def FaAdnProps: IconBaseProps.type = typings.reactIconBase.mod.IconBaseProps type FaAdnProps = IconBaseProps } diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/c/componentstest/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/c/componentstest/build.sbt index 24d4012e97..d65dbfc6e7 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/c/componentstest/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/c/componentstest/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "componentstest" -version := "0.0-unknown-4c9246" +version := "0.0-unknown-3b15c5" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-8e06d7", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "react" % "16.9.2-e4ed36", + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/c/componentstest/src/main/scala/typingsJapgolly/componentstest/components/Component.scala b/importer/src/test/resources/react-integration-test/check-japgolly/c/componentstest/src/main/scala/typingsJapgolly/componentstest/components/Component.scala index 08200a98ae..59fd474e9d 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/c/componentstest/src/main/scala/typingsJapgolly/componentstest/components/Component.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/c/componentstest/src/main/scala/typingsJapgolly/componentstest/components/Component.scala @@ -5,7 +5,6 @@ import japgolly.scalajs.react.CtorType.ChildArg import japgolly.scalajs.react.Key import japgolly.scalajs.react.component.JsForwardRef.UnmountedWithRoot import org.scalablytyped.runtime.StringDictionary -import typingsJapgolly.componentstest.mod.Props import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -18,7 +17,12 @@ object Component { _overrides: StringDictionary[js.Any] = null )( children: ChildArg* - ): UnmountedWithRoot[Props, typingsJapgolly.componentstest.mod.Component, Unit, Props] = { + ): UnmountedWithRoot[ + typingsJapgolly.componentstest.mod.A, + typingsJapgolly.componentstest.mod.Component, + Unit, + typingsJapgolly.componentstest.mod.A + ] = { val __obj = js.Dynamic.literal(aMember = aMember.asInstanceOf[js.Any]) __obj.updateDynamic("aCallback")(aCallback.toJsFn) @@ -26,10 +30,10 @@ object Component { if (_overrides != null) js.Dynamic.global.Object.assign(__obj, _overrides) val f = japgolly.scalajs.react.JsForwardRefComponent.force[ - typingsJapgolly.componentstest.mod.Props, + typingsJapgolly.componentstest.mod.A, japgolly.scalajs.react.Children.Varargs, typingsJapgolly.componentstest.mod.Component](this.componentImport) - f(__obj.asInstanceOf[typingsJapgolly.componentstest.mod.Props])(children: _*) + f(__obj.asInstanceOf[typingsJapgolly.componentstest.mod.A])(children: _*) } def B( bMember: String, @@ -38,7 +42,12 @@ object Component { _overrides: StringDictionary[js.Any] = null )( children: ChildArg* - ): UnmountedWithRoot[Props, typingsJapgolly.componentstest.mod.Component, Unit, Props] = { + ): UnmountedWithRoot[ + typingsJapgolly.componentstest.mod.B, + typingsJapgolly.componentstest.mod.Component, + Unit, + typingsJapgolly.componentstest.mod.B + ] = { val __obj = js.Dynamic.literal(bMember = bMember.asInstanceOf[js.Any]) bCallback.foreach(p => __obj.updateDynamic("bCallback")(p.toJsFn)) @@ -46,10 +55,10 @@ object Component { if (_overrides != null) js.Dynamic.global.Object.assign(__obj, _overrides) val f = japgolly.scalajs.react.JsForwardRefComponent.force[ - typingsJapgolly.componentstest.mod.Props, + typingsJapgolly.componentstest.mod.B, japgolly.scalajs.react.Children.Varargs, typingsJapgolly.componentstest.mod.Component](this.componentImport) - f(__obj.asInstanceOf[typingsJapgolly.componentstest.mod.Props])(children: _*) + f(__obj.asInstanceOf[typingsJapgolly.componentstest.mod.B])(children: _*) } @JSImport("componentstest", "Component") @js.native diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-bootstrap/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-bootstrap/build.sbt index 415e9c3c1b..4b65dd3914 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-bootstrap/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-bootstrap/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-bootstrap" -version := "0.32-3748f7" +version := "0.32-ac02a7" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-8e06d7", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "react" % "16.9.2-e4ed36", + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-contextmenu/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-contextmenu/build.sbt index 9dfcceadfa..15401a4e0b 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-contextmenu/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-contextmenu/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-contextmenu" -version := "2.13.0-deefba" +version := "2.13.0-1ab842" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-8e06d7", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "react" % "16.9.2-e4ed36", + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/build.sbt index e1277e4a70..eae25a28b9 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-dropzone" -version := "10.1.10-8e16fd" +version := "10.1.10-72c01b" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-8e06d7", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "react" % "16.9.2-e4ed36", + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala deleted file mode 100644 index 6cfa500ba8..0000000000 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala +++ /dev/null @@ -1,125 +0,0 @@ -package typingsJapgolly.reactDropzone - -import japgolly.scalajs.react.Callback -import japgolly.scalajs.react.CallbackTo -import japgolly.scalajs.react.ReactDragEventFrom -import japgolly.scalajs.react.raw.React.Ref -import org.scalajs.dom.raw.HTMLElement -import typingsJapgolly.react.mod.DragEventHandler -import typingsJapgolly.react.mod.Key -import typingsJapgolly.react.mod._Global_.JSX.Element -import typingsJapgolly.reactDropzone.mod.DropEvent -import typingsJapgolly.reactDropzone.mod.DropzoneState -import scala.scalajs.js -import scala.scalajs.js.`|` -import scala.scalajs.js.annotation._ - -/* Inlined react-dropzone.react-dropzone.DropzoneProps & react.react.RefAttributes */ -@js.native -trait DropzonePropsRefAttributesDropzoneRef extends js.Object { - var accept: js.UndefOr[String | js.Array[String]] = js.native - var children: js.UndefOr[js.Function1[/* state */ DropzoneState, Element]] = js.native - var disabled: js.UndefOr[Boolean] = js.native - var getFilesFromEvent: js.UndefOr[ - js.Function1[ - /* event */ DropEvent, - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ - ] - ] = js.native - var key: js.UndefOr[Key] = js.native - var maxSize: js.UndefOr[Double] = js.native - var minSize: js.UndefOr[Double] = js.native - var multiple: js.UndefOr[Boolean] = js.native - var noClick: js.UndefOr[Boolean] = js.native - var noDrag: js.UndefOr[Boolean] = js.native - var noDragEventsBubbling: js.UndefOr[Boolean] = js.native - var noKeyboard: js.UndefOr[Boolean] = js.native - var onDragEnter: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragLeave: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragOver: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDrop: js.UndefOr[ - js.Function3[ - /* acceptedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* rejectedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropAccepted: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropRejected: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onFileDialogCancel: js.UndefOr[js.Function0[Unit]] = js.native - var preventDropOnDocument: js.UndefOr[Boolean] = js.native - var ref: js.UndefOr[Ref] = js.native -} - -object DropzonePropsRefAttributesDropzoneRef { - @scala.inline - def apply( - accept: String | js.Array[String] = null, - children: /* state */ DropzoneState => CallbackTo[Element] = null, - disabled: js.UndefOr[Boolean] = js.undefined, - getFilesFromEvent: /* event */ DropEvent => CallbackTo[js.Any] = null, - key: Key = null, - maxSize: Int | Double = null, - minSize: Int | Double = null, - multiple: js.UndefOr[Boolean] = js.undefined, - noClick: js.UndefOr[Boolean] = js.undefined, - noDrag: js.UndefOr[Boolean] = js.undefined, - noDragEventsBubbling: js.UndefOr[Boolean] = js.undefined, - noKeyboard: js.UndefOr[Boolean] = js.undefined, - onDragEnter: ReactDragEventFrom[HTMLElement] => Callback = null, - onDragLeave: ReactDragEventFrom[HTMLElement] => Callback = null, - onDragOver: ReactDragEventFrom[HTMLElement] => Callback = null, - onDrop: (/* acceptedFiles */ js.Array[js.Any], /* rejectedFiles */ js.Array[js.Any], /* event */ DropEvent) => Callback = null, - onDropAccepted: (/* files */ js.Array[js.Any], /* event */ DropEvent) => Callback = null, - onDropRejected: (/* files */ js.Array[js.Any], /* event */ DropEvent) => Callback = null, - onFileDialogCancel: js.UndefOr[Callback] = js.undefined, - preventDropOnDocument: js.UndefOr[Boolean] = js.undefined, - ref: Ref = null - ): DropzonePropsRefAttributesDropzoneRef = { - val __obj = js.Dynamic.literal() - if (accept != null) __obj.updateDynamic("accept")(accept.asInstanceOf[js.Any]) - if (children != null) __obj.updateDynamic("children")(js.Any.fromFunction1((t0: /* state */ typingsJapgolly.reactDropzone.mod.DropzoneState) => children(t0).runNow())) - if (!js.isUndefined(disabled)) __obj.updateDynamic("disabled")(disabled.asInstanceOf[js.Any]) - if (getFilesFromEvent != null) __obj.updateDynamic("getFilesFromEvent")(js.Any.fromFunction1((t0: /* event */ typingsJapgolly.reactDropzone.mod.DropEvent) => getFilesFromEvent(t0).runNow())) - if (key != null) __obj.updateDynamic("key")(key.asInstanceOf[js.Any]) - if (maxSize != null) __obj.updateDynamic("maxSize")(maxSize.asInstanceOf[js.Any]) - if (minSize != null) __obj.updateDynamic("minSize")(minSize.asInstanceOf[js.Any]) - if (!js.isUndefined(multiple)) __obj.updateDynamic("multiple")(multiple.asInstanceOf[js.Any]) - if (!js.isUndefined(noClick)) __obj.updateDynamic("noClick")(noClick.asInstanceOf[js.Any]) - if (!js.isUndefined(noDrag)) __obj.updateDynamic("noDrag")(noDrag.asInstanceOf[js.Any]) - if (!js.isUndefined(noDragEventsBubbling)) __obj.updateDynamic("noDragEventsBubbling")(noDragEventsBubbling.asInstanceOf[js.Any]) - if (!js.isUndefined(noKeyboard)) __obj.updateDynamic("noKeyboard")(noKeyboard.asInstanceOf[js.Any]) - if (onDragEnter != null) __obj.updateDynamic("onDragEnter")(js.Any.fromFunction1((t0: japgolly.scalajs.react.ReactDragEventFrom[org.scalajs.dom.raw.HTMLElement]) => onDragEnter(t0).runNow())) - if (onDragLeave != null) __obj.updateDynamic("onDragLeave")(js.Any.fromFunction1((t0: japgolly.scalajs.react.ReactDragEventFrom[org.scalajs.dom.raw.HTMLElement]) => onDragLeave(t0).runNow())) - if (onDragOver != null) __obj.updateDynamic("onDragOver")(js.Any.fromFunction1((t0: japgolly.scalajs.react.ReactDragEventFrom[org.scalajs.dom.raw.HTMLElement]) => onDragOver(t0).runNow())) - if (onDrop != null) __obj.updateDynamic("onDrop")(js.Any.fromFunction3((t0: /* acceptedFiles */ js.Array[js.Any], t1: /* rejectedFiles */ js.Array[js.Any], t2: /* event */ typingsJapgolly.reactDropzone.mod.DropEvent) => onDrop(t0, t1, t2).runNow())) - if (onDropAccepted != null) __obj.updateDynamic("onDropAccepted")(js.Any.fromFunction2((t0: /* files */ js.Array[js.Any], t1: /* event */ typingsJapgolly.reactDropzone.mod.DropEvent) => onDropAccepted(t0, t1).runNow())) - if (onDropRejected != null) __obj.updateDynamic("onDropRejected")(js.Any.fromFunction2((t0: /* files */ js.Array[js.Any], t1: /* event */ typingsJapgolly.reactDropzone.mod.DropEvent) => onDropRejected(t0, t1).runNow())) - onFileDialogCancel.foreach(p => __obj.updateDynamic("onFileDialogCancel")(p.toJsFn)) - if (!js.isUndefined(preventDropOnDocument)) __obj.updateDynamic("preventDropOnDocument")(preventDropOnDocument.asInstanceOf[js.Any]) - if (ref != null) __obj.updateDynamic("ref")(ref.asInstanceOf[js.Any]) - __obj.asInstanceOf[DropzonePropsRefAttributesDropzoneRef] - } -} - diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/components/ReactDropzone.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/components/ReactDropzone.scala index 5c5397c751..36f17451da 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/components/ReactDropzone.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/components/ReactDropzone.scala @@ -5,12 +5,14 @@ import japgolly.scalajs.react.CallbackTo import japgolly.scalajs.react.Key import japgolly.scalajs.react.ReactDragEventFrom import japgolly.scalajs.react.component.JsForwardRef.UnmountedWithRoot +import japgolly.scalajs.react.raw.React.Element import japgolly.scalajs.react.raw.React.Ref import org.scalablytyped.runtime.StringDictionary import org.scalajs.dom.raw.HTMLElement -import typingsJapgolly.react.mod._Global_.JSX.Element -import typingsJapgolly.reactDropzone.DropzonePropsRefAttributesDropzoneRef +import typingsJapgolly.react.mod.RefAttributes import typingsJapgolly.reactDropzone.mod.DropEvent +import typingsJapgolly.reactDropzone.mod.DropzoneProps +import typingsJapgolly.reactDropzone.mod.DropzoneRef import typingsJapgolly.reactDropzone.mod.DropzoneState import scala.scalajs.js import scala.scalajs.js.`|` @@ -41,10 +43,10 @@ object ReactDropzone { )( children: /* state */ DropzoneState => CallbackTo[Element] = null ): UnmountedWithRoot[ - DropzonePropsRefAttributesDropzoneRef, + DropzoneProps with RefAttributes[DropzoneRef], Ref, Unit, - DropzonePropsRefAttributesDropzoneRef + DropzoneProps with RefAttributes[DropzoneRef] ] = { val __obj = js.Dynamic.literal() @@ -71,10 +73,10 @@ object ReactDropzone { if (_overrides != null) js.Dynamic.global.Object.assign(__obj, _overrides) val f = japgolly.scalajs.react.JsForwardRefComponent.force[ - typingsJapgolly.reactDropzone.DropzonePropsRefAttributesDropzoneRef, + typingsJapgolly.reactDropzone.mod.DropzoneProps with typingsJapgolly.react.mod.RefAttributes[typingsJapgolly.reactDropzone.mod.DropzoneRef], japgolly.scalajs.react.Children.None, japgolly.scalajs.react.raw.React.Ref](this.componentImport) - f(__obj.asInstanceOf[typingsJapgolly.reactDropzone.DropzonePropsRefAttributesDropzoneRef]) + f(__obj.asInstanceOf[typingsJapgolly.reactDropzone.mod.DropzoneProps with typingsJapgolly.react.mod.RefAttributes[typingsJapgolly.reactDropzone.mod.DropzoneRef]]) } @JSImport("react-dropzone", JSImport.Default) @js.native diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/mod/DropzoneProps.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/mod/DropzoneProps.scala index 2526d66225..a93d02f3d5 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/mod/DropzoneProps.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/mod/DropzoneProps.scala @@ -3,67 +3,15 @@ package typingsJapgolly.reactDropzone.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo import japgolly.scalajs.react.ReactDragEventFrom +import japgolly.scalajs.react.raw.React.Element import org.scalajs.dom.raw.HTMLElement -import typingsJapgolly.react.mod.DragEventHandler -import typingsJapgolly.react.mod._Global_.JSX.Element import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ -/* Inlined parent react-dropzone.react-dropzone.DropzoneOptions */ @js.native -trait DropzoneProps extends js.Object { - var accept: js.UndefOr[String | js.Array[String]] = js.native +trait DropzoneProps extends DropzoneOptions { var children: js.UndefOr[js.Function1[/* state */ DropzoneState, Element]] = js.native - var disabled: js.UndefOr[Boolean] = js.native - var getFilesFromEvent: js.UndefOr[ - js.Function1[ - /* event */ DropEvent, - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ - ] - ] = js.native - var maxSize: js.UndefOr[Double] = js.native - var minSize: js.UndefOr[Double] = js.native - var multiple: js.UndefOr[Boolean] = js.native - var noClick: js.UndefOr[Boolean] = js.native - var noDrag: js.UndefOr[Boolean] = js.native - var noDragEventsBubbling: js.UndefOr[Boolean] = js.native - var noKeyboard: js.UndefOr[Boolean] = js.native - var onDragEnter: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragLeave: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragOver: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDrop: js.UndefOr[ - js.Function3[ - /* acceptedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* rejectedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropAccepted: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropRejected: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onFileDialogCancel: js.UndefOr[js.Function0[Unit]] = js.native - var preventDropOnDocument: js.UndefOr[Boolean] = js.native } object DropzoneProps { diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/mod/default.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/mod/default.scala index 273911a9b4..5b1b2a93dc 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/mod/default.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-dropzone/src/main/scala/typingsJapgolly/reactDropzone/mod/default.scala @@ -1,7 +1,7 @@ package typingsJapgolly.reactDropzone.mod -import typingsJapgolly.react.mod._Global_.JSX.Element -import typingsJapgolly.reactDropzone.DropzonePropsRefAttributesDropzoneRef +import japgolly.scalajs.react.raw.React.Element +import typingsJapgolly.react.mod.RefAttributes import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -9,6 +9,6 @@ import scala.scalajs.js.annotation._ @JSImport("react-dropzone", JSImport.Default) @js.native object default extends js.Object { - def apply(props: DropzonePropsRefAttributesDropzoneRef): Element = js.native + def apply(props: DropzoneProps with RefAttributes[DropzoneRef]): Element = js.native } diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-select/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-select/build.sbt index e093875a7b..257ddbc0d7 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react-select/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react-select/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-select" -version := "0.0-unknown-4fee73" +version := "0.0-unknown-4f3b6a" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-8e06d7", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "react" % "16.9.2-e4ed36", + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/build.sbt index 439401d1ea..74af6cd41c 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react" -version := "16.9.2-8e06d7" +version := "16.9.2-e4ed36" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/AnonDefaultPropsD.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/Anon0.scala similarity index 77% rename from importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/AnonDefaultPropsD.scala rename to importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/Anon0.scala index c176422370..8ebf38dd9e 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/AnonDefaultPropsD.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/Anon0.scala @@ -5,18 +5,18 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonDefaultPropsD extends js.Object { +trait Anon0 extends js.Object { var defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any = js.native } -object AnonDefaultPropsD { +object Anon0 { @scala.inline def apply( defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any - ): AnonDefaultPropsD = { + ): Anon0 = { val __obj = js.Dynamic.literal(defaultProps = defaultProps.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonDefaultPropsD] + __obj.asInstanceOf[Anon0] } } diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/AnimationEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/AnimationEvent.scala index e07374dea0..b13e4a1cb5 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/AnimationEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/AnimationEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import typingsJapgolly.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -27,7 +28,7 @@ object AnimationEvent { isDefaultPrevented: CallbackTo[Boolean], isPropagationStopped: CallbackTo[Boolean], isTrusted: Boolean, - nativeEvent: NativeAnimationEvent, + nativeEvent: Event, persist: Callback, preventDefault: Callback, pseudoElement: String, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ClipboardEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ClipboardEvent.scala index 51e00c31ef..b6a6b60445 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ClipboardEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ClipboardEvent.scala @@ -3,6 +3,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo import org.scalajs.dom.raw.DataTransfer +import org.scalajs.dom.raw.Event import typingsJapgolly.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -25,7 +26,7 @@ object ClipboardEvent { isDefaultPrevented: CallbackTo[Boolean], isPropagationStopped: CallbackTo[Boolean], isTrusted: Boolean, - nativeEvent: NativeClipboardEvent, + nativeEvent: Event, persist: Callback, preventDefault: Callback, stopPropagation: Callback, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/CompositionEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/CompositionEvent.scala index a61e6b64d5..2460a142c6 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/CompositionEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/CompositionEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import typingsJapgolly.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -24,7 +25,7 @@ object CompositionEvent { isDefaultPrevented: CallbackTo[Boolean], isPropagationStopped: CallbackTo[Boolean], isTrusted: Boolean, - nativeEvent: NativeCompositionEvent, + nativeEvent: Event, persist: Callback, preventDefault: Callback, stopPropagation: Callback, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DragEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DragEvent.scala index e42868f780..667e1ac37b 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DragEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/DragEvent.scala @@ -3,6 +3,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo import org.scalajs.dom.raw.DataTransfer +import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -35,7 +36,7 @@ object DragEvent { metaKey: Boolean, movementX: Double, movementY: Double, - nativeEvent: NativeDragEvent, + nativeEvent: Event, pageX: Double, pageY: Double, persist: Callback, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/FocusEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/FocusEvent.scala index 51c02f3f99..2a37c4974a 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/FocusEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/FocusEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import typingsJapgolly.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -25,7 +26,7 @@ object FocusEvent { isDefaultPrevented: CallbackTo[Boolean], isPropagationStopped: CallbackTo[Boolean], isTrusted: Boolean, - nativeEvent: NativeFocusEvent, + nativeEvent: Event, persist: Callback, preventDefault: Callback, relatedTarget: org.scalajs.dom.raw.EventTarget, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/KeyboardEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/KeyboardEvent.scala index 41f7c42fec..c5e8559b74 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/KeyboardEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/KeyboardEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import typingsJapgolly.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -49,7 +50,7 @@ object KeyboardEvent { locale: String, location: Double, metaKey: Boolean, - nativeEvent: NativeKeyboardEvent, + nativeEvent: Event, persist: Callback, preventDefault: Callback, repeat: Boolean, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/PointerEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/PointerEvent.scala index fd300afd57..edea54c80b 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/PointerEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/PointerEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget import typingsJapgolly.react.reactStrings.mouse import typingsJapgolly.react.reactStrings.pen @@ -45,7 +46,7 @@ object PointerEvent { metaKey: Boolean, movementX: Double, movementY: Double, - nativeEvent: NativePointerEvent, + nativeEvent: Event, pageX: Double, pageY: Double, persist: Callback, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactDOM.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactDOM.scala index 693646c330..9eaa3651e5 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactDOM.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactDOM.scala @@ -1,5 +1,6 @@ package typingsJapgolly.react.mod +import org.scalajs.dom.raw.Element import org.scalajs.dom.raw.HTMLAnchorElement import org.scalajs.dom.raw.HTMLAreaElement import org.scalajs.dom.raw.HTMLAudioElement @@ -52,12 +53,6 @@ import org.scalajs.dom.raw.HTMLTitleElement import org.scalajs.dom.raw.HTMLTrackElement import org.scalajs.dom.raw.HTMLUListElement import org.scalajs.dom.raw.HTMLVideoElement -import typingsJapgolly.std.HTMLDataElement -import typingsJapgolly.std.HTMLDialogElement -import typingsJapgolly.std.HTMLTableDataCellElement -import typingsJapgolly.std.HTMLTableHeaderCellElement -import typingsJapgolly.std.HTMLTemplateElement -import typingsJapgolly.std.HTMLWebViewElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -95,7 +90,7 @@ object ReactDOM { code: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], col: DetailedHTMLFactory[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement], colgroup: DetailedHTMLFactory[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement], - data: DetailedHTMLFactory[DataHTMLAttributes[HTMLDataElement], HTMLDataElement], + data: DetailedHTMLFactory[DataHTMLAttributes[Element], Element], datalist: DetailedHTMLFactory[HTMLAttributes[HTMLDataListElement], HTMLDataListElement], dd: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], defs: SVGFactory, @@ -103,7 +98,7 @@ object ReactDOM { desc: SVGFactory, details: DetailedHTMLFactory[DetailsHTMLAttributes[HTMLElement], HTMLElement], dfn: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], - dialog: DetailedHTMLFactory[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement], + dialog: DetailedHTMLFactory[DialogHTMLAttributes[Element], Element], div: DetailedHTMLFactory[HTMLAttributes[HTMLDivElement], HTMLDivElement], dl: DetailedHTMLFactory[HTMLAttributes[HTMLDListElement], HTMLDListElement], dt: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], @@ -219,13 +214,13 @@ object ReactDOM { symbol: SVGFactory, table: DetailedHTMLFactory[TableHTMLAttributes[HTMLTableElement], HTMLTableElement], tbody: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - td: DetailedHTMLFactory[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement], - template: DetailedHTMLFactory[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement], + td: DetailedHTMLFactory[TdHTMLAttributes[Element], Element], + template: DetailedHTMLFactory[HTMLAttributes[Element], Element], text: SVGFactory, textPath: SVGFactory, textarea: DetailedHTMLFactory[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement], tfoot: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - th: DetailedHTMLFactory[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement], + th: DetailedHTMLFactory[ThHTMLAttributes[Element], Element], thead: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], time: DetailedHTMLFactory[TimeHTMLAttributes[HTMLElement], HTMLElement], title: DetailedHTMLFactory[HTMLAttributes[HTMLTitleElement], HTMLTitleElement], @@ -239,7 +234,7 @@ object ReactDOM { video: DetailedHTMLFactory[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement], view: SVGFactory, wbr: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], - webview: DetailedHTMLFactory[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] + webview: DetailedHTMLFactory[WebViewHTMLAttributes[Element], Element] ): ReactDOM = { val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], animate = animate.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], big = big.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], caption = caption.asInstanceOf[js.Any], circle = circle.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], clipPath = clipPath.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], defs = defs.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], desc = desc.asInstanceOf[js.Any], details = details.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], ellipse = ellipse.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], feBlend = feBlend.asInstanceOf[js.Any], feColorMatrix = feColorMatrix.asInstanceOf[js.Any], feComponentTransfer = feComponentTransfer.asInstanceOf[js.Any], feComposite = feComposite.asInstanceOf[js.Any], feConvolveMatrix = feConvolveMatrix.asInstanceOf[js.Any], feDiffuseLighting = feDiffuseLighting.asInstanceOf[js.Any], feDisplacementMap = feDisplacementMap.asInstanceOf[js.Any], feDistantLight = feDistantLight.asInstanceOf[js.Any], feDropShadow = feDropShadow.asInstanceOf[js.Any], feFlood = feFlood.asInstanceOf[js.Any], feFuncA = feFuncA.asInstanceOf[js.Any], feFuncB = feFuncB.asInstanceOf[js.Any], feFuncG = feFuncG.asInstanceOf[js.Any], feFuncR = feFuncR.asInstanceOf[js.Any], feGaussianBlur = feGaussianBlur.asInstanceOf[js.Any], feImage = feImage.asInstanceOf[js.Any], feMerge = feMerge.asInstanceOf[js.Any], feMergeNode = feMergeNode.asInstanceOf[js.Any], feMorphology = feMorphology.asInstanceOf[js.Any], feOffset = feOffset.asInstanceOf[js.Any], fePointLight = fePointLight.asInstanceOf[js.Any], feSpecularLighting = feSpecularLighting.asInstanceOf[js.Any], feSpotLight = feSpotLight.asInstanceOf[js.Any], feTile = feTile.asInstanceOf[js.Any], feTurbulence = feTurbulence.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], filter = filter.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], foreignObject = foreignObject.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], g = g.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], image = image.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], keygen = keygen.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], line = line.asInstanceOf[js.Any], linearGradient = linearGradient.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], marker = marker.asInstanceOf[js.Any], mask = mask.asInstanceOf[js.Any], menu = menu.asInstanceOf[js.Any], menuitem = menuitem.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], metadata = metadata.asInstanceOf[js.Any], meter = meter.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], output = output.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], path = path.asInstanceOf[js.Any], pattern = pattern.asInstanceOf[js.Any], picture = picture.asInstanceOf[js.Any], polygon = polygon.asInstanceOf[js.Any], polyline = polyline.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], radialGradient = radialGradient.asInstanceOf[js.Any], rect = rect.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], stop = stop.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], svg = svg.asInstanceOf[js.Any], switch = switch.asInstanceOf[js.Any], symbol = symbol.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], text = text.asInstanceOf[js.Any], textPath = textPath.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], time = time.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], tspan = tspan.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], use = use.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], view = view.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any], webview = webview.asInstanceOf[js.Any]) __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactHTML.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactHTML.scala index a0a81f479b..3ad35e36d3 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactHTML.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/ReactHTML.scala @@ -1,5 +1,6 @@ package typingsJapgolly.react.mod +import org.scalajs.dom.raw.Element import org.scalajs.dom.raw.HTMLAnchorElement import org.scalajs.dom.raw.HTMLAreaElement import org.scalajs.dom.raw.HTMLAudioElement @@ -52,12 +53,6 @@ import org.scalajs.dom.raw.HTMLTitleElement import org.scalajs.dom.raw.HTMLTrackElement import org.scalajs.dom.raw.HTMLUListElement import org.scalajs.dom.raw.HTMLVideoElement -import typingsJapgolly.std.HTMLDataElement -import typingsJapgolly.std.HTMLDialogElement -import typingsJapgolly.std.HTMLTableDataCellElement -import typingsJapgolly.std.HTMLTableHeaderCellElement -import typingsJapgolly.std.HTMLTemplateElement -import typingsJapgolly.std.HTMLWebViewElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -89,13 +84,13 @@ trait ReactHTML extends js.Object { var code: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native var col: DetailedHTMLFactory[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement] = js.native var colgroup: DetailedHTMLFactory[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement] = js.native - var data: DetailedHTMLFactory[DataHTMLAttributes[HTMLDataElement], HTMLDataElement] = js.native + var data: DetailedHTMLFactory[DataHTMLAttributes[Element], Element] = js.native var datalist: DetailedHTMLFactory[HTMLAttributes[HTMLDataListElement], HTMLDataListElement] = js.native var dd: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native var del: DetailedHTMLFactory[DelHTMLAttributes[HTMLElement], HTMLElement] = js.native var details: DetailedHTMLFactory[DetailsHTMLAttributes[HTMLElement], HTMLElement] = js.native var dfn: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var dialog: DetailedHTMLFactory[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement] = js.native + var dialog: DetailedHTMLFactory[DialogHTMLAttributes[Element], Element] = js.native var div: DetailedHTMLFactory[HTMLAttributes[HTMLDivElement], HTMLDivElement] = js.native var dl: DetailedHTMLFactory[HTMLAttributes[HTMLDListElement], HTMLDListElement] = js.native var dt: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native @@ -166,11 +161,11 @@ trait ReactHTML extends js.Object { var sup: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native var table: DetailedHTMLFactory[TableHTMLAttributes[HTMLTableElement], HTMLTableElement] = js.native var tbody: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native - var td: DetailedHTMLFactory[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement] = js.native - var template: DetailedHTMLFactory[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement] = js.native + var td: DetailedHTMLFactory[TdHTMLAttributes[Element], Element] = js.native + var template: DetailedHTMLFactory[HTMLAttributes[Element], Element] = js.native var textarea: DetailedHTMLFactory[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement] = js.native var tfoot: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native - var th: DetailedHTMLFactory[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement] = js.native + var th: DetailedHTMLFactory[ThHTMLAttributes[Element], Element] = js.native var thead: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native var time: DetailedHTMLFactory[TimeHTMLAttributes[HTMLElement], HTMLElement] = js.native var title: DetailedHTMLFactory[HTMLAttributes[HTMLTitleElement], HTMLTitleElement] = js.native @@ -181,7 +176,7 @@ trait ReactHTML extends js.Object { var `var`: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native var video: DetailedHTMLFactory[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement] = js.native var wbr: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var webview: DetailedHTMLFactory[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] = js.native + var webview: DetailedHTMLFactory[WebViewHTMLAttributes[Element], Element] = js.native } object ReactHTML { @@ -209,13 +204,13 @@ object ReactHTML { code: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], col: DetailedHTMLFactory[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement], colgroup: DetailedHTMLFactory[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement], - data: DetailedHTMLFactory[DataHTMLAttributes[HTMLDataElement], HTMLDataElement], + data: DetailedHTMLFactory[DataHTMLAttributes[Element], Element], datalist: DetailedHTMLFactory[HTMLAttributes[HTMLDataListElement], HTMLDataListElement], dd: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], del: DetailedHTMLFactory[DelHTMLAttributes[HTMLElement], HTMLElement], details: DetailedHTMLFactory[DetailsHTMLAttributes[HTMLElement], HTMLElement], dfn: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], - dialog: DetailedHTMLFactory[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement], + dialog: DetailedHTMLFactory[DialogHTMLAttributes[Element], Element], div: DetailedHTMLFactory[HTMLAttributes[HTMLDivElement], HTMLDivElement], dl: DetailedHTMLFactory[HTMLAttributes[HTMLDListElement], HTMLDListElement], dt: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], @@ -286,11 +281,11 @@ object ReactHTML { sup: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], table: DetailedHTMLFactory[TableHTMLAttributes[HTMLTableElement], HTMLTableElement], tbody: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - td: DetailedHTMLFactory[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement], - template: DetailedHTMLFactory[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement], + td: DetailedHTMLFactory[TdHTMLAttributes[Element], Element], + template: DetailedHTMLFactory[HTMLAttributes[Element], Element], textarea: DetailedHTMLFactory[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement], tfoot: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - th: DetailedHTMLFactory[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement], + th: DetailedHTMLFactory[ThHTMLAttributes[Element], Element], thead: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], time: DetailedHTMLFactory[TimeHTMLAttributes[HTMLElement], HTMLElement], title: DetailedHTMLFactory[HTMLAttributes[HTMLTitleElement], HTMLTitleElement], @@ -301,7 +296,7 @@ object ReactHTML { `var`: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], video: DetailedHTMLFactory[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement], wbr: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], - webview: DetailedHTMLFactory[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] + webview: DetailedHTMLFactory[WebViewHTMLAttributes[Element], Element] ): ReactHTML = { val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], big = big.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], caption = caption.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], details = details.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], keygen = keygen.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], menu = menu.asInstanceOf[js.Any], menuitem = menuitem.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], meter = meter.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], output = output.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], picture = picture.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], time = time.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any], webview = webview.asInstanceOf[js.Any]) __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/TouchEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/TouchEvent.scala index 37847a5524..487fd63539 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/TouchEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/TouchEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import typingsJapgolly.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -38,7 +39,7 @@ object TouchEvent { isPropagationStopped: CallbackTo[Boolean], isTrusted: Boolean, metaKey: Boolean, - nativeEvent: NativeTouchEvent, + nativeEvent: Event, persist: Callback, preventDefault: Callback, shiftKey: Boolean, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/TransitionEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/TransitionEvent.scala index 1e643e4c3c..35cfd4187d 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/TransitionEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/TransitionEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import typingsJapgolly.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -26,7 +27,7 @@ object TransitionEvent { isDefaultPrevented: CallbackTo[Boolean], isPropagationStopped: CallbackTo[Boolean], isTrusted: Boolean, - nativeEvent: NativeTransitionEvent, + nativeEvent: Event, persist: Callback, preventDefault: Callback, propertyName: String, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/UIEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/UIEvent.scala index bc96bc4265..cd1b78c85b 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/UIEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/UIEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import typingsJapgolly.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -25,7 +26,7 @@ object UIEvent { isDefaultPrevented: CallbackTo[Boolean], isPropagationStopped: CallbackTo[Boolean], isTrusted: Boolean, - nativeEvent: NativeUIEvent, + nativeEvent: Event, persist: Callback, preventDefault: Callback, stopPropagation: Callback, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/WheelEvent.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/WheelEvent.scala index 87d4f15d74..2f11c36b12 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/WheelEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/WheelEvent.scala @@ -2,6 +2,7 @@ package typingsJapgolly.react.mod import japgolly.scalajs.react.Callback import japgolly.scalajs.react.CallbackTo +import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -40,7 +41,7 @@ object WheelEvent { metaKey: Boolean, movementX: Double, movementY: Double, - nativeEvent: NativeWheelEvent, + nativeEvent: Event, pageX: Double, pageY: Double, persist: Callback, diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/_Global_/JSX/IntrinsicElements.scala b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/_Global_/JSX/IntrinsicElements.scala index 712e878f86..d186fa2751 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/_Global_/JSX/IntrinsicElements.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/r/react/src/main/scala/typingsJapgolly/react/mod/_Global_/JSX/IntrinsicElements.scala @@ -157,14 +157,6 @@ import typingsJapgolly.react.mod.TimeHTMLAttributes import typingsJapgolly.react.mod.TrackHTMLAttributes import typingsJapgolly.react.mod.VideoHTMLAttributes import typingsJapgolly.react.mod.WebViewHTMLAttributes -import typingsJapgolly.std.HTMLDataElement -import typingsJapgolly.std.HTMLDialogElement -import typingsJapgolly.std.HTMLTableDataCellElement -import typingsJapgolly.std.HTMLTableHeaderCellElement -import typingsJapgolly.std.HTMLTemplateElement -import typingsJapgolly.std.HTMLWebViewElement -import typingsJapgolly.std.SVGFEDropShadowElement -import typingsJapgolly.std.SVGForeignObjectElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -201,7 +193,7 @@ trait IntrinsicElements extends js.Object { var code: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native var col: DetailedHTMLProps[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement] = js.native var colgroup: DetailedHTMLProps[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement] = js.native - var data: DetailedHTMLProps[DataHTMLAttributes[HTMLDataElement], HTMLDataElement] = js.native + var data: DetailedHTMLProps[DataHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native var datalist: DetailedHTMLProps[HTMLAttributes[HTMLDataListElement], HTMLDataListElement] = js.native var dd: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native var defs: SVGProps[SVGDefsElement] = js.native @@ -209,7 +201,7 @@ trait IntrinsicElements extends js.Object { var desc: SVGProps[SVGDescElement] = js.native var details: DetailedHTMLProps[DetailsHTMLAttributes[HTMLElement], HTMLElement] = js.native var dfn: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var dialog: DetailedHTMLProps[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement] = js.native + var dialog: DetailedHTMLProps[DialogHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native var div: DetailedHTMLProps[HTMLAttributes[HTMLDivElement], HTMLDivElement] = js.native var dl: DetailedHTMLProps[HTMLAttributes[HTMLDListElement], HTMLDListElement] = js.native var dt: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native @@ -224,7 +216,7 @@ trait IntrinsicElements extends js.Object { var feDiffuseLighting: SVGProps[SVGFEDiffuseLightingElement] = js.native var feDisplacementMap: SVGProps[SVGFEDisplacementMapElement] = js.native var feDistantLight: SVGProps[SVGFEDistantLightElement] = js.native - var feDropShadow: SVGProps[SVGFEDropShadowElement] = js.native + var feDropShadow: SVGProps[org.scalajs.dom.raw.Element] = js.native var feFlood: SVGProps[SVGFEFloodElement] = js.native var feFuncA: SVGProps[SVGFEFuncAElement] = js.native var feFuncB: SVGProps[SVGFEFuncBElement] = js.native @@ -246,7 +238,7 @@ trait IntrinsicElements extends js.Object { var figure: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native var filter: SVGProps[SVGFilterElement] = js.native var footer: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var foreignObject: SVGProps[SVGForeignObjectElement] = js.native + var foreignObject: SVGProps[org.scalajs.dom.raw.Element] = js.native var form: DetailedHTMLProps[FormHTMLAttributes[HTMLFormElement], HTMLFormElement] = js.native var g: SVGProps[SVGGElement] = js.native var h1: DetailedHTMLProps[HTMLAttributes[HTMLHeadingElement], HTMLHeadingElement] = js.native @@ -328,13 +320,13 @@ trait IntrinsicElements extends js.Object { var symbol: SVGProps[SVGSymbolElement] = js.native var table: DetailedHTMLProps[TableHTMLAttributes[HTMLTableElement], HTMLTableElement] = js.native var tbody: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native - var td: DetailedHTMLProps[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement] = js.native - var template: DetailedHTMLProps[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement] = js.native + var td: DetailedHTMLProps[TdHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native + var template: DetailedHTMLProps[HTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native var text: SVGProps[SVGTextElement] = js.native var textPath: SVGProps[SVGTextPathElement] = js.native var textarea: DetailedHTMLProps[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement] = js.native var tfoot: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native - var th: DetailedHTMLProps[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement] = js.native + var th: DetailedHTMLProps[ThHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native var thead: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native var time: DetailedHTMLProps[TimeHTMLAttributes[HTMLElement], HTMLElement] = js.native var title: DetailedHTMLProps[HTMLAttributes[HTMLTitleElement], HTMLTitleElement] = js.native @@ -348,7 +340,7 @@ trait IntrinsicElements extends js.Object { var video: DetailedHTMLProps[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement] = js.native var view: SVGProps[SVGViewElement] = js.native var wbr: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var webview: DetailedHTMLProps[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] = js.native + var webview: DetailedHTMLProps[WebViewHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native } object IntrinsicElements { @@ -381,7 +373,7 @@ object IntrinsicElements { code: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], col: DetailedHTMLProps[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement], colgroup: DetailedHTMLProps[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement], - data: DetailedHTMLProps[DataHTMLAttributes[HTMLDataElement], HTMLDataElement], + data: DetailedHTMLProps[DataHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], datalist: DetailedHTMLProps[HTMLAttributes[HTMLDataListElement], HTMLDataListElement], dd: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], defs: SVGProps[SVGDefsElement], @@ -389,7 +381,7 @@ object IntrinsicElements { desc: SVGProps[SVGDescElement], details: DetailedHTMLProps[DetailsHTMLAttributes[HTMLElement], HTMLElement], dfn: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], - dialog: DetailedHTMLProps[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement], + dialog: DetailedHTMLProps[DialogHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], div: DetailedHTMLProps[HTMLAttributes[HTMLDivElement], HTMLDivElement], dl: DetailedHTMLProps[HTMLAttributes[HTMLDListElement], HTMLDListElement], dt: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], @@ -404,7 +396,7 @@ object IntrinsicElements { feDiffuseLighting: SVGProps[SVGFEDiffuseLightingElement], feDisplacementMap: SVGProps[SVGFEDisplacementMapElement], feDistantLight: SVGProps[SVGFEDistantLightElement], - feDropShadow: SVGProps[SVGFEDropShadowElement], + feDropShadow: SVGProps[org.scalajs.dom.raw.Element], feFlood: SVGProps[SVGFEFloodElement], feFuncA: SVGProps[SVGFEFuncAElement], feFuncB: SVGProps[SVGFEFuncBElement], @@ -426,7 +418,7 @@ object IntrinsicElements { figure: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], filter: SVGProps[SVGFilterElement], footer: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], - foreignObject: SVGProps[SVGForeignObjectElement], + foreignObject: SVGProps[org.scalajs.dom.raw.Element], form: DetailedHTMLProps[FormHTMLAttributes[HTMLFormElement], HTMLFormElement], g: SVGProps[SVGGElement], h1: DetailedHTMLProps[HTMLAttributes[HTMLHeadingElement], HTMLHeadingElement], @@ -507,13 +499,13 @@ object IntrinsicElements { symbol: SVGProps[SVGSymbolElement], table: DetailedHTMLProps[TableHTMLAttributes[HTMLTableElement], HTMLTableElement], tbody: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - td: DetailedHTMLProps[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement], - template: DetailedHTMLProps[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement], + td: DetailedHTMLProps[TdHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], + template: DetailedHTMLProps[HTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], text: SVGProps[SVGTextElement], textPath: SVGProps[SVGTextPathElement], textarea: DetailedHTMLProps[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement], tfoot: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - th: DetailedHTMLProps[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement], + th: DetailedHTMLProps[ThHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], thead: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], time: DetailedHTMLProps[TimeHTMLAttributes[HTMLElement], HTMLElement], title: DetailedHTMLProps[HTMLAttributes[HTMLTitleElement], HTMLTitleElement], @@ -527,7 +519,7 @@ object IntrinsicElements { video: DetailedHTMLProps[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement], view: SVGProps[SVGViewElement], wbr: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], - webview: DetailedHTMLProps[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] + webview: DetailedHTMLProps[WebViewHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] ): IntrinsicElements = { val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], animate = animate.asInstanceOf[js.Any], animateMotion = animateMotion.asInstanceOf[js.Any], animateTransform = animateTransform.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], big = big.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], caption = caption.asInstanceOf[js.Any], circle = circle.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], clipPath = clipPath.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], defs = defs.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], desc = desc.asInstanceOf[js.Any], details = details.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], ellipse = ellipse.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], feBlend = feBlend.asInstanceOf[js.Any], feColorMatrix = feColorMatrix.asInstanceOf[js.Any], feComponentTransfer = feComponentTransfer.asInstanceOf[js.Any], feComposite = feComposite.asInstanceOf[js.Any], feConvolveMatrix = feConvolveMatrix.asInstanceOf[js.Any], feDiffuseLighting = feDiffuseLighting.asInstanceOf[js.Any], feDisplacementMap = feDisplacementMap.asInstanceOf[js.Any], feDistantLight = feDistantLight.asInstanceOf[js.Any], feDropShadow = feDropShadow.asInstanceOf[js.Any], feFlood = feFlood.asInstanceOf[js.Any], feFuncA = feFuncA.asInstanceOf[js.Any], feFuncB = feFuncB.asInstanceOf[js.Any], feFuncG = feFuncG.asInstanceOf[js.Any], feFuncR = feFuncR.asInstanceOf[js.Any], feGaussianBlur = feGaussianBlur.asInstanceOf[js.Any], feImage = feImage.asInstanceOf[js.Any], feMerge = feMerge.asInstanceOf[js.Any], feMergeNode = feMergeNode.asInstanceOf[js.Any], feMorphology = feMorphology.asInstanceOf[js.Any], feOffset = feOffset.asInstanceOf[js.Any], fePointLight = fePointLight.asInstanceOf[js.Any], feSpecularLighting = feSpecularLighting.asInstanceOf[js.Any], feSpotLight = feSpotLight.asInstanceOf[js.Any], feTile = feTile.asInstanceOf[js.Any], feTurbulence = feTurbulence.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], filter = filter.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], foreignObject = foreignObject.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], g = g.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], image = image.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], keygen = keygen.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], line = line.asInstanceOf[js.Any], linearGradient = linearGradient.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], marker = marker.asInstanceOf[js.Any], mask = mask.asInstanceOf[js.Any], menu = menu.asInstanceOf[js.Any], menuitem = menuitem.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], metadata = metadata.asInstanceOf[js.Any], meter = meter.asInstanceOf[js.Any], mpath = mpath.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noindex = noindex.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], output = output.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], path = path.asInstanceOf[js.Any], pattern = pattern.asInstanceOf[js.Any], picture = picture.asInstanceOf[js.Any], polygon = polygon.asInstanceOf[js.Any], polyline = polyline.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], radialGradient = radialGradient.asInstanceOf[js.Any], rect = rect.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], stop = stop.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], svg = svg.asInstanceOf[js.Any], switch = switch.asInstanceOf[js.Any], symbol = symbol.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], text = text.asInstanceOf[js.Any], textPath = textPath.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], time = time.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], tspan = tspan.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], use = use.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], view = view.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any], webview = webview.asInstanceOf[js.Any]) __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/build.sbt index 6f67e67c7b..e460bf41cb 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "semantic-ui-react" -version := "0.0-unknown-adfd95" +version := "0.0-unknown-81cf91" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-8e06d7", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "react" % "16.9.2-e4ed36", + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/src/main/scala/typingsJapgolly/semanticUiReact/components/Button.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/src/main/scala/typingsJapgolly/semanticUiReact/components/Button.scala index 7e87d13c71..0bf31a6215 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/src/main/scala/typingsJapgolly/semanticUiReact/components/Button.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/src/main/scala/typingsJapgolly/semanticUiReact/components/Button.scala @@ -60,6 +60,7 @@ import typingsJapgolly.react.reactStrings.text import typingsJapgolly.react.reactStrings.time import typingsJapgolly.react.reactStrings.tree import typingsJapgolly.semanticUiReact.buttonMod.ButtonProps +import typingsJapgolly.semanticUiReact.buttonMod.StrictButtonProps import typingsJapgolly.semanticUiReact.genericMod.SemanticCOLORS import typingsJapgolly.semanticUiReact.genericMod.SemanticFLOATS import typingsJapgolly.semanticUiReact.genericMod.SemanticSIZES @@ -296,7 +297,7 @@ object Button { _overrides: StringDictionary[js.Any] = null )( children: ChildArg* - ): UnmountedWithRoot[ButtonProps, default, Unit, ButtonProps] = { + ): UnmountedWithRoot[StrictButtonProps, default, Unit, StrictButtonProps] = { val __obj = js.Dynamic.literal() if (about != null) __obj.updateDynamic("about")(about.asInstanceOf[js.Any]) @@ -506,10 +507,10 @@ object Button { if (_overrides != null) js.Dynamic.global.Object.assign(__obj, _overrides) val f = japgolly.scalajs.react.JsForwardRefComponent.force[ - typingsJapgolly.semanticUiReact.buttonMod.ButtonProps, + typingsJapgolly.semanticUiReact.buttonMod.StrictButtonProps, japgolly.scalajs.react.Children.Varargs, typingsJapgolly.semanticUiReact.mod.default](this.componentImport) - f(__obj.asInstanceOf[typingsJapgolly.semanticUiReact.buttonMod.ButtonProps])(children: _*) + f(__obj.asInstanceOf[typingsJapgolly.semanticUiReact.buttonMod.StrictButtonProps])(children: _*) } @JSImport("semantic-ui-react/dist/commonjs/elements/Button", JSImport.Default) @js.native diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/src/main/scala/typingsJapgolly/semanticUiReact/components/Input.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/src/main/scala/typingsJapgolly/semanticUiReact/components/Input.scala index dc4dcd466e..2eff4a99c9 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/src/main/scala/typingsJapgolly/semanticUiReact/components/Input.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/semantic-ui-react/src/main/scala/typingsJapgolly/semanticUiReact/components/Input.scala @@ -61,6 +61,7 @@ import typingsJapgolly.semanticUiReact.genericMod.HtmlInputrops import typingsJapgolly.semanticUiReact.genericMod.SemanticShorthandItem import typingsJapgolly.semanticUiReact.inputInputMod.InputOnChangeData import typingsJapgolly.semanticUiReact.inputInputMod.InputProps +import typingsJapgolly.semanticUiReact.inputInputMod.StrictInputProps import typingsJapgolly.semanticUiReact.inputMod.default import typingsJapgolly.semanticUiReact.semanticUiReactStrings.`left corner` import typingsJapgolly.semanticUiReact.semanticUiReactStrings.`right corner` @@ -300,7 +301,7 @@ object Input { _overrides: StringDictionary[js.Any] = null )( children: ChildArg* - ): UnmountedWithRoot[InputProps, default, Unit, InputProps] = { + ): UnmountedWithRoot[StrictInputProps, default, Unit, StrictInputProps] = { val __obj = js.Dynamic.literal() if (about != null) __obj.updateDynamic("about")(about.asInstanceOf[js.Any]) @@ -523,10 +524,10 @@ object Input { if (_overrides != null) js.Dynamic.global.Object.assign(__obj, _overrides) val f = japgolly.scalajs.react.JsForwardRefComponent.force[ - typingsJapgolly.semanticUiReact.inputInputMod.InputProps, + typingsJapgolly.semanticUiReact.inputInputMod.StrictInputProps, japgolly.scalajs.react.Children.Varargs, typingsJapgolly.semanticUiReact.inputMod.default](this.componentImport) - f(__obj.asInstanceOf[typingsJapgolly.semanticUiReact.inputInputMod.InputProps])(children: _*) + f(__obj.asInstanceOf[typingsJapgolly.semanticUiReact.inputInputMod.StrictInputProps])(children: _*) } @JSImport("semantic-ui-react/dist/commonjs/elements/Input", JSImport.Default) @js.native diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/build.sbt index 88d973b9c6..dac4ad1d88 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-event-listener" -version := "0.38.0-b57dea" +version := "0.38.0-bfd788" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-8e06d7", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "react" % "16.9.2-e4ed36", + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/AnonCaptureListener.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/AnonListener.scala similarity index 87% rename from importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/AnonCaptureListener.scala rename to importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/AnonListener.scala index 9bea6ee613..9b9203cfb0 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/AnonCaptureListener.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/AnonListener.scala @@ -5,27 +5,27 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonCaptureListener extends js.Object { +trait AnonListener extends js.Object { var capture: js.UndefOr[scala.Nothing] = js.native var listener: js.UndefOr[scala.Nothing] = js.native var targetRef: js.UndefOr[scala.Nothing] = js.native var `type`: js.UndefOr[scala.Nothing] = js.native } -object AnonCaptureListener { +object AnonListener { @scala.inline def apply( capture: js.UndefOr[scala.Nothing] = js.undefined, listener: js.UndefOr[scala.Nothing] = js.undefined, targetRef: js.UndefOr[scala.Nothing] = js.undefined, `type`: js.UndefOr[scala.Nothing] = js.undefined - ): AnonCaptureListener = { + ): AnonListener = { val __obj = js.Dynamic.literal() if (!js.isUndefined(capture)) __obj.updateDynamic("capture")(capture.asInstanceOf[js.Any]) if (!js.isUndefined(listener)) __obj.updateDynamic("listener")(listener.asInstanceOf[js.Any]) if (!js.isUndefined(targetRef)) __obj.updateDynamic("targetRef")(targetRef.asInstanceOf[js.Any]) if (!js.isUndefined(`type`)) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonCaptureListener] + __obj.asInstanceOf[AnonListener] } } diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/eventListenerMod.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/eventListenerMod.scala index 8364d7065c..cbd766bc13 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/eventListenerMod.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/eventListenerMod.scala @@ -12,7 +12,7 @@ object eventListenerMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonCapture | AnonCaptureListener = js.native + var propTypes: AnonCapture | AnonListener = js.native def apply[T /* <: EventTypes */](props: EventListenerOptions[T]): js.Any = js.native @js.native object defaultProps extends js.Object { diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/mod.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/mod.scala index ce34703f2d..843717425b 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/mod.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-event-listener/src/main/scala/typingsJapgolly/stardustUiReactComponentEventListener/mod.scala @@ -20,7 +20,7 @@ object mod extends js.Object { @js.native object EventListener extends js.Object { var displayName: String = js.native - var propTypes: AnonCapture | AnonCaptureListener = js.native + var propTypes: AnonCapture | AnonListener = js.native def apply[T /* <: EventTypes */](props: EventListenerOptions[T]): js.Any = js.native @js.native object defaultProps extends js.Object { diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/build.sbt index 9f6c7afa87..72785b1b4a 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-ref" -version := "0.38.0-4e928b" +version := "0.38.0-c4f435" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-8e06d7", - "org.scalablytyped" %%% "std" % "0.0-unknown-c63dde") + "org.scalablytyped" %%% "react" % "16.9.2-e4ed36", + "org.scalablytyped" %%% "std" % "0.0-unknown-6e7350") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/AnonChildrenInnerRef.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/AnonInnerRef.scala similarity index 80% rename from importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/AnonChildrenInnerRef.scala rename to importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/AnonInnerRef.scala index 2b6cd41f28..0715a342ea 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/AnonChildrenInnerRef.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/AnonInnerRef.scala @@ -5,21 +5,21 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonChildrenInnerRef extends js.Object { +trait AnonInnerRef extends js.Object { var children: js.UndefOr[scala.Nothing] = js.native var innerRef: js.UndefOr[scala.Nothing] = js.native } -object AnonChildrenInnerRef { +object AnonInnerRef { @scala.inline def apply( children: js.UndefOr[scala.Nothing] = js.undefined, innerRef: js.UndefOr[scala.Nothing] = js.undefined - ): AnonChildrenInnerRef = { + ): AnonInnerRef = { val __obj = js.Dynamic.literal() if (!js.isUndefined(children)) __obj.updateDynamic("children")(children.asInstanceOf[js.Any]) if (!js.isUndefined(innerRef)) __obj.updateDynamic("innerRef")(innerRef.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonChildrenInnerRef] + __obj.asInstanceOf[AnonInnerRef] } } diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/mod.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/mod.scala index 52a3776788..427d4ee82a 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/mod.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/mod.scala @@ -35,14 +35,14 @@ object mod extends js.Object { @js.native object RefFindNode extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } /* static members */ @js.native object RefForward extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/refFindNodeMod.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/refFindNodeMod.scala index 4febea2efe..ef15358d06 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/refFindNodeMod.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/refFindNodeMod.scala @@ -28,7 +28,7 @@ object refFindNodeMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/refForwardMod.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/refForwardMod.scala index ceff3458ff..e427145995 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/refForwardMod.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/stardust-ui__react-component-ref/src/main/scala/typingsJapgolly/stardustUiReactComponentRef/refForwardMod.scala @@ -23,7 +23,7 @@ object refForwardMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/std/build.sbt b/importer/src/test/resources/react-integration-test/check-japgolly/s/std/build.sbt index fc2dfd272a..0ca92f7a4b 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/std/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-c63dde" +version := "0.0-unknown-6e7350" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..bb36aee026 --- /dev/null +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala @@ -0,0 +1,229 @@ +package typingsJapgolly.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: org.scalajs.dom.raw.HTMLAnchorElement = js.native + var abbr: org.scalajs.dom.raw.HTMLElement = js.native + var address: org.scalajs.dom.raw.HTMLElement = js.native + var area: org.scalajs.dom.raw.HTMLAreaElement = js.native + var article: org.scalajs.dom.raw.HTMLElement = js.native + var aside: org.scalajs.dom.raw.HTMLElement = js.native + var audio: org.scalajs.dom.raw.HTMLAudioElement = js.native + var b: org.scalajs.dom.raw.HTMLElement = js.native + var base: org.scalajs.dom.raw.HTMLBaseElement = js.native + var bdi: org.scalajs.dom.raw.HTMLElement = js.native + var bdo: org.scalajs.dom.raw.HTMLElement = js.native + var blockquote: org.scalajs.dom.raw.HTMLQuoteElement = js.native + var body: org.scalajs.dom.raw.HTMLBodyElement = js.native + var br: org.scalajs.dom.raw.HTMLBRElement = js.native + var button: org.scalajs.dom.raw.HTMLButtonElement = js.native + var canvas: org.scalajs.dom.raw.HTMLCanvasElement = js.native + var cite: org.scalajs.dom.raw.HTMLElement = js.native + var code: org.scalajs.dom.raw.HTMLElement = js.native + var col: org.scalajs.dom.raw.HTMLTableColElement = js.native + var colgroup: org.scalajs.dom.raw.HTMLTableColElement = js.native + var data: org.scalajs.dom.raw.Element = js.native + var datalist: org.scalajs.dom.raw.HTMLDataListElement = js.native + var dd: org.scalajs.dom.raw.HTMLElement = js.native + var del: org.scalajs.dom.raw.HTMLModElement = js.native + var dfn: org.scalajs.dom.raw.HTMLElement = js.native + var dialog: org.scalajs.dom.raw.Element = js.native + var div: org.scalajs.dom.raw.HTMLDivElement = js.native + var dl: org.scalajs.dom.raw.HTMLDListElement = js.native + var dt: org.scalajs.dom.raw.HTMLElement = js.native + var em: org.scalajs.dom.raw.HTMLElement = js.native + var embed: org.scalajs.dom.raw.HTMLEmbedElement = js.native + var fieldset: org.scalajs.dom.raw.HTMLFieldSetElement = js.native + var figcaption: org.scalajs.dom.raw.HTMLElement = js.native + var figure: org.scalajs.dom.raw.HTMLElement = js.native + var footer: org.scalajs.dom.raw.HTMLElement = js.native + var form: org.scalajs.dom.raw.HTMLFormElement = js.native + var h1: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h2: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h3: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h4: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h5: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h6: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var head: org.scalajs.dom.raw.HTMLHeadElement = js.native + var header: org.scalajs.dom.raw.HTMLElement = js.native + var hgroup: org.scalajs.dom.raw.HTMLElement = js.native + var hr: org.scalajs.dom.raw.HTMLHRElement = js.native + var html: org.scalajs.dom.raw.HTMLHtmlElement = js.native + var i: org.scalajs.dom.raw.HTMLElement = js.native + var iframe: org.scalajs.dom.raw.HTMLIFrameElement = js.native + var img: org.scalajs.dom.raw.HTMLImageElement = js.native + var input: org.scalajs.dom.raw.HTMLInputElement = js.native + var ins: org.scalajs.dom.raw.HTMLModElement = js.native + var kbd: org.scalajs.dom.raw.HTMLElement = js.native + var label: org.scalajs.dom.raw.HTMLLabelElement = js.native + var legend: org.scalajs.dom.raw.HTMLLegendElement = js.native + var li: org.scalajs.dom.raw.HTMLLIElement = js.native + var link: org.scalajs.dom.raw.HTMLLinkElement = js.native + var main: org.scalajs.dom.raw.HTMLElement = js.native + var map: org.scalajs.dom.raw.HTMLMapElement = js.native + var mark: org.scalajs.dom.raw.HTMLElement = js.native + var meta: org.scalajs.dom.raw.HTMLMetaElement = js.native + var nav: org.scalajs.dom.raw.HTMLElement = js.native + var noscript: org.scalajs.dom.raw.HTMLElement = js.native + var `object`: org.scalajs.dom.raw.HTMLObjectElement = js.native + var ol: org.scalajs.dom.raw.HTMLOListElement = js.native + var optgroup: org.scalajs.dom.raw.HTMLOptGroupElement = js.native + var option: org.scalajs.dom.raw.HTMLOptionElement = js.native + var p: org.scalajs.dom.raw.HTMLParagraphElement = js.native + var param: org.scalajs.dom.raw.HTMLParamElement = js.native + var pre: org.scalajs.dom.raw.HTMLPreElement = js.native + var progress: org.scalajs.dom.raw.HTMLProgressElement = js.native + var q: org.scalajs.dom.raw.HTMLQuoteElement = js.native + var rp: org.scalajs.dom.raw.HTMLElement = js.native + var rt: org.scalajs.dom.raw.HTMLElement = js.native + var ruby: org.scalajs.dom.raw.HTMLElement = js.native + var s: org.scalajs.dom.raw.HTMLElement = js.native + var samp: org.scalajs.dom.raw.HTMLElement = js.native + var script: org.scalajs.dom.raw.HTMLScriptElement = js.native + var section: org.scalajs.dom.raw.HTMLElement = js.native + var select: org.scalajs.dom.raw.HTMLSelectElement = js.native + var small: org.scalajs.dom.raw.HTMLElement = js.native + var source: org.scalajs.dom.raw.HTMLSourceElement = js.native + var span: org.scalajs.dom.raw.HTMLSpanElement = js.native + var strong: org.scalajs.dom.raw.HTMLElement = js.native + var style: org.scalajs.dom.raw.HTMLStyleElement = js.native + var sub: org.scalajs.dom.raw.HTMLElement = js.native + var summary: org.scalajs.dom.raw.HTMLElement = js.native + var sup: org.scalajs.dom.raw.HTMLElement = js.native + var table: org.scalajs.dom.raw.HTMLTableElement = js.native + var tbody: org.scalajs.dom.raw.HTMLTableSectionElement = js.native + var td: org.scalajs.dom.raw.Element = js.native + var template: org.scalajs.dom.raw.Element = js.native + var textarea: org.scalajs.dom.raw.HTMLTextAreaElement = js.native + var tfoot: org.scalajs.dom.raw.HTMLTableSectionElement = js.native + var th: org.scalajs.dom.raw.Element = js.native + var thead: org.scalajs.dom.raw.HTMLTableSectionElement = js.native + var title: org.scalajs.dom.raw.HTMLTitleElement = js.native + var tr: org.scalajs.dom.raw.HTMLTableRowElement = js.native + var track: org.scalajs.dom.raw.HTMLTrackElement = js.native + var u: org.scalajs.dom.raw.HTMLElement = js.native + var ul: org.scalajs.dom.raw.HTMLUListElement = js.native + var `var`: org.scalajs.dom.raw.HTMLElement = js.native + var video: org.scalajs.dom.raw.HTMLVideoElement = js.native + var wbr: org.scalajs.dom.raw.HTMLElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: org.scalajs.dom.raw.HTMLAnchorElement, + abbr: org.scalajs.dom.raw.HTMLElement, + address: org.scalajs.dom.raw.HTMLElement, + area: org.scalajs.dom.raw.HTMLAreaElement, + article: org.scalajs.dom.raw.HTMLElement, + aside: org.scalajs.dom.raw.HTMLElement, + audio: org.scalajs.dom.raw.HTMLAudioElement, + b: org.scalajs.dom.raw.HTMLElement, + base: org.scalajs.dom.raw.HTMLBaseElement, + bdi: org.scalajs.dom.raw.HTMLElement, + bdo: org.scalajs.dom.raw.HTMLElement, + blockquote: org.scalajs.dom.raw.HTMLQuoteElement, + body: org.scalajs.dom.raw.HTMLBodyElement, + br: org.scalajs.dom.raw.HTMLBRElement, + button: org.scalajs.dom.raw.HTMLButtonElement, + canvas: org.scalajs.dom.raw.HTMLCanvasElement, + cite: org.scalajs.dom.raw.HTMLElement, + code: org.scalajs.dom.raw.HTMLElement, + col: org.scalajs.dom.raw.HTMLTableColElement, + colgroup: org.scalajs.dom.raw.HTMLTableColElement, + data: org.scalajs.dom.raw.Element, + datalist: org.scalajs.dom.raw.HTMLDataListElement, + dd: org.scalajs.dom.raw.HTMLElement, + del: org.scalajs.dom.raw.HTMLModElement, + dfn: org.scalajs.dom.raw.HTMLElement, + dialog: org.scalajs.dom.raw.Element, + div: org.scalajs.dom.raw.HTMLDivElement, + dl: org.scalajs.dom.raw.HTMLDListElement, + dt: org.scalajs.dom.raw.HTMLElement, + em: org.scalajs.dom.raw.HTMLElement, + embed: org.scalajs.dom.raw.HTMLEmbedElement, + fieldset: org.scalajs.dom.raw.HTMLFieldSetElement, + figcaption: org.scalajs.dom.raw.HTMLElement, + figure: org.scalajs.dom.raw.HTMLElement, + footer: org.scalajs.dom.raw.HTMLElement, + form: org.scalajs.dom.raw.HTMLFormElement, + h1: org.scalajs.dom.raw.HTMLHeadingElement, + h2: org.scalajs.dom.raw.HTMLHeadingElement, + h3: org.scalajs.dom.raw.HTMLHeadingElement, + h4: org.scalajs.dom.raw.HTMLHeadingElement, + h5: org.scalajs.dom.raw.HTMLHeadingElement, + h6: org.scalajs.dom.raw.HTMLHeadingElement, + head: org.scalajs.dom.raw.HTMLHeadElement, + header: org.scalajs.dom.raw.HTMLElement, + hgroup: org.scalajs.dom.raw.HTMLElement, + hr: org.scalajs.dom.raw.HTMLHRElement, + html: org.scalajs.dom.raw.HTMLHtmlElement, + i: org.scalajs.dom.raw.HTMLElement, + iframe: org.scalajs.dom.raw.HTMLIFrameElement, + img: org.scalajs.dom.raw.HTMLImageElement, + input: org.scalajs.dom.raw.HTMLInputElement, + ins: org.scalajs.dom.raw.HTMLModElement, + kbd: org.scalajs.dom.raw.HTMLElement, + label: org.scalajs.dom.raw.HTMLLabelElement, + legend: org.scalajs.dom.raw.HTMLLegendElement, + li: org.scalajs.dom.raw.HTMLLIElement, + link: org.scalajs.dom.raw.HTMLLinkElement, + main: org.scalajs.dom.raw.HTMLElement, + map: org.scalajs.dom.raw.HTMLMapElement, + mark: org.scalajs.dom.raw.HTMLElement, + meta: org.scalajs.dom.raw.HTMLMetaElement, + nav: org.scalajs.dom.raw.HTMLElement, + noscript: org.scalajs.dom.raw.HTMLElement, + `object`: org.scalajs.dom.raw.HTMLObjectElement, + ol: org.scalajs.dom.raw.HTMLOListElement, + optgroup: org.scalajs.dom.raw.HTMLOptGroupElement, + option: org.scalajs.dom.raw.HTMLOptionElement, + p: org.scalajs.dom.raw.HTMLParagraphElement, + param: org.scalajs.dom.raw.HTMLParamElement, + pre: org.scalajs.dom.raw.HTMLPreElement, + progress: org.scalajs.dom.raw.HTMLProgressElement, + q: org.scalajs.dom.raw.HTMLQuoteElement, + rp: org.scalajs.dom.raw.HTMLElement, + rt: org.scalajs.dom.raw.HTMLElement, + ruby: org.scalajs.dom.raw.HTMLElement, + s: org.scalajs.dom.raw.HTMLElement, + samp: org.scalajs.dom.raw.HTMLElement, + script: org.scalajs.dom.raw.HTMLScriptElement, + section: org.scalajs.dom.raw.HTMLElement, + select: org.scalajs.dom.raw.HTMLSelectElement, + small: org.scalajs.dom.raw.HTMLElement, + source: org.scalajs.dom.raw.HTMLSourceElement, + span: org.scalajs.dom.raw.HTMLSpanElement, + strong: org.scalajs.dom.raw.HTMLElement, + style: org.scalajs.dom.raw.HTMLStyleElement, + sub: org.scalajs.dom.raw.HTMLElement, + summary: org.scalajs.dom.raw.HTMLElement, + sup: org.scalajs.dom.raw.HTMLElement, + table: org.scalajs.dom.raw.HTMLTableElement, + tbody: org.scalajs.dom.raw.HTMLTableSectionElement, + td: org.scalajs.dom.raw.Element, + template: org.scalajs.dom.raw.Element, + textarea: org.scalajs.dom.raw.HTMLTextAreaElement, + tfoot: org.scalajs.dom.raw.HTMLTableSectionElement, + th: org.scalajs.dom.raw.Element, + thead: org.scalajs.dom.raw.HTMLTableSectionElement, + title: org.scalajs.dom.raw.HTMLTitleElement, + tr: org.scalajs.dom.raw.HTMLTableRowElement, + track: org.scalajs.dom.raw.HTMLTrackElement, + u: org.scalajs.dom.raw.HTMLElement, + ul: org.scalajs.dom.raw.HTMLUListElement, + `var`: org.scalajs.dom.raw.HTMLElement, + video: org.scalajs.dom.raw.HTMLVideoElement, + wbr: org.scalajs.dom.raw.HTMLElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any]) + __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) + __obj.updateDynamic("var")(`var`.asInstanceOf[js.Any]) + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..013011148c --- /dev/null +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala @@ -0,0 +1,26 @@ +package typingsJapgolly.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: org.scalajs.dom.raw.SVGCircleElement = js.native + var clipPath: org.scalajs.dom.raw.SVGClipPathElement = js.native + var defs: org.scalajs.dom.raw.SVGDefsElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply( + circle: org.scalajs.dom.raw.SVGCircleElement, + clipPath: org.scalajs.dom.raw.SVGClipPathElement, + defs: org.scalajs.dom.raw.SVGDefsElement + ): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any], clipPath = clipPath.asInstanceOf[js.Any], defs = defs.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala b/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala index 755cfafdec..1d400298d5 100644 --- a/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala +++ b/importer/src/test/resources/react-integration-test/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala @@ -92,7 +92,7 @@ package object std { /** * Construct a type with a set of properties K of type T */ - type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[K] + type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[T] type SVGCircleElement = org.scalajs.dom.raw.SVGElement type SVGClipPathElement = org.scalajs.dom.raw.SVGElement type SVGDefsElement = org.scalajs.dom.raw.SVGElement diff --git a/importer/src/test/resources/react-integration-test/check-slinky/c/componentstest/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/c/componentstest/build.sbt index 40fee1ccb9..f0c4b5fef6 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/c/componentstest/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/c/componentstest/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "componentstest" -version := "0.0-unknown-0d4f1a" +version := "0.0-unknown-e4de6c" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "16.9.2-acd257", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "react" % "16.9.2-33376e", + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/build.sbt index 092cd4262b..1a36324049 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-bootstrap" -version := "0.32-f2498d" +version := "0.32-f6ce97" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "16.9.2-acd257", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "react" % "16.9.2-33376e", + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/src/main/scala/typingsSlinky/reactBootstrap/components/ButtonGroup.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/src/main/scala/typingsSlinky/reactBootstrap/components/ButtonGroup.scala index dfd9168a56..d6ae3abf36 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/src/main/scala/typingsSlinky/reactBootstrap/components/ButtonGroup.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/src/main/scala/typingsSlinky/reactBootstrap/components/ButtonGroup.scala @@ -7,9 +7,19 @@ import slinky.core.BuildingComponent import slinky.core.ExternalComponentWithAttributesWithRefType import slinky.core.SyntheticEvent import slinky.core.TagMod +import slinky.web.SyntheticAnimationEvent +import slinky.web.SyntheticClipboardEvent +import slinky.web.SyntheticCompositionEvent +import slinky.web.SyntheticFocusEvent +import slinky.web.SyntheticKeyboardEvent import slinky.web.SyntheticMouseEvent +import slinky.web.SyntheticPointerEvent +import slinky.web.SyntheticTouchEvent +import slinky.web.SyntheticTransitionEvent +import slinky.web.SyntheticUIEvent +import slinky.web.SyntheticWheelEvent import slinky.web.html.`*`.tag -import typingsSlinky.react.mod.CSSProperties +import typingsSlinky.react.mod.DragEvent import typingsSlinky.react.reactStrings.`additions text` import typingsSlinky.react.reactStrings.`inline` import typingsSlinky.react.reactStrings.additions @@ -59,7 +69,7 @@ object ButtonGroup object componentImport extends js.Object override val component: String | js.Object = this.componentImport - /* The following DOM/SVG props were specified: accept, action, alt, async, autoComplete, autoFocus, capture, challenge, checked, className, colSpan, cols, content, contentEditable, controls, coords, dangerouslySetInnerHTML, default, defaultChecked, defaultValue, defer, dir, disabled, download, draggable, headers, height, hidden, high, href, htmlFor, id, integrity, kind, lang, list, loop, low, manifest, max, media, method, min, multiple, muted, name, nonce, onAbort, onAnimationEnd, onAnimationIteration, onAnimationStart, onBlur, onCanPlay, onCanPlayThrough, onChange, onClick, onCompositionEnd, onCompositionStart, onCompositionUpdate, onContextMenu, onCopy, onCut, onDoubleClick, onDrag, onDragEnd, onDragEnter, onDragExit, onDragLeave, onDragOver, onDragStart, onDrop, onDurationChange, onEmptied, onEncrypted, onEnded, onError, onFocus, onInput, onInvalid, onKeyDown, onKeyPress, onKeyUp, onLoad, onLoadStart, onLoadedData, onLoadedMetadata, onMouseDown, onMouseEnter, onMouseLeave, onMouseMove, onMouseOut, onMouseOver, onMouseUp, onPaste, onPause, onPlay, onPlaying, onPointerCancel, onPointerDown, onPointerEnter, onPointerLeave, onPointerMove, onPointerOut, onPointerOver, onPointerUp, onProgress, onRateChange, onScroll, onSeeked, onSeeking, onSelect, onStalled, onSubmit, onSuspend, onTimeUpdate, onTouchCancel, onTouchEnd, onTouchMove, onTouchStart, onTransitionEnd, onVolumeChange, onWaiting, onWheel, open, optimum, pattern, placeholder, poster, preload, readOnly, rel, required, reversed, rowSpan, rows, sandbox, scope, scoped, scrolling, selected, shape, size, sizes, spellCheck, src, start, step, suppressContentEditableWarning, tabIndex, target, type, value, width, wrap */ + /* The following DOM/SVG props were specified: accept, action, alt, async, autoComplete, autoFocus, capture, challenge, checked, cite, className, colSpan, cols, content, contentEditable, controls, coords, dangerouslySetInnerHTML, data, default, defaultChecked, defaultValue, defer, dir, disabled, download, draggable, form, headers, height, hidden, high, href, htmlFor, id, integrity, kind, label, lang, list, loop, low, manifest, max, media, method, min, multiple, muted, name, nonce, open, optimum, pattern, placeholder, poster, preload, readOnly, rel, required, reversed, rowSpan, rows, sandbox, scope, scoped, scrolling, selected, shape, size, sizes, span, spellCheck, src, start, step, style, summary, suppressContentEditableWarning, tabIndex, target, title, type, value, width, wrap */ def apply( about: String = null, acceptCharset: String = null, @@ -125,16 +135,13 @@ object ButtonGroup cellPadding: Double | String = null, cellSpacing: Double | String = null, charSet: String = null, - cite: String = null, classID: String = null, color: String = null, contextMenu: String = null, crossOrigin: String = null, - data: String = null, datatype: String = null, dateTime: String = null, encType: String = null, - form: String = null, formAction: String = null, formEncType: String = null, formMethod: String = null, @@ -154,16 +161,91 @@ object ButtonGroup justified: js.UndefOr[Boolean] = js.undefined, keyParams: String = null, keyType: String = null, - label: String = null, marginHeight: Int | Double = null, marginWidth: Int | Double = null, maxLength: Int | Double = null, mediaGroup: String = null, minLength: Int | Double = null, noValidate: js.UndefOr[Boolean] = js.undefined, + onAbort: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onAnimationEnd: SyntheticAnimationEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onAnimationIteration: SyntheticAnimationEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onAnimationStart: SyntheticAnimationEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, onAuxClick: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, onBeforeInput: SyntheticEvent[EventTarget with typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup, Event] => Unit = null, + onBlur: SyntheticFocusEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onCanPlay: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onCanPlayThrough: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onChange: SyntheticEvent[EventTarget with typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup, Event] => Unit = null, + onClick: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onCompositionEnd: SyntheticCompositionEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onCompositionStart: SyntheticCompositionEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onCompositionUpdate: SyntheticCompositionEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onContextMenu: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onCopy: SyntheticClipboardEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onCut: SyntheticClipboardEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDoubleClick: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDrag: DragEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDragEnd: DragEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDragEnter: DragEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDragExit: DragEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDragLeave: DragEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDragOver: DragEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDragStart: DragEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDrop: DragEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onDurationChange: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onEmptied: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onEncrypted: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onEnded: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onError: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onFocus: SyntheticFocusEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onInput: SyntheticEvent[EventTarget with typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup, Event] => Unit = null, + onInvalid: SyntheticEvent[EventTarget with typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup, Event] => Unit = null, + onKeyDown: SyntheticKeyboardEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onKeyPress: SyntheticKeyboardEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onKeyUp: SyntheticKeyboardEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onLoad: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onLoadStart: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onLoadedData: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onLoadedMetadata: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onMouseDown: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onMouseEnter: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onMouseLeave: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onMouseMove: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onMouseOut: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onMouseOver: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onMouseUp: SyntheticMouseEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPaste: SyntheticClipboardEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPause: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPlay: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPlaying: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPointerCancel: SyntheticPointerEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPointerDown: SyntheticPointerEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPointerEnter: SyntheticPointerEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPointerLeave: SyntheticPointerEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPointerMove: SyntheticPointerEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPointerOut: SyntheticPointerEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPointerOver: SyntheticPointerEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onPointerUp: SyntheticPointerEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onProgress: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onRateChange: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, onReset: SyntheticEvent[EventTarget with typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup, Event] => Unit = null, + onScroll: SyntheticUIEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onSeeked: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onSeeking: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onSelect: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onStalled: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onSubmit: SyntheticEvent[EventTarget with typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup, Event] => Unit = null, + onSuspend: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onTimeUpdate: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onTouchCancel: SyntheticTouchEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onTouchEnd: SyntheticTouchEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onTouchMove: SyntheticTouchEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onTouchStart: SyntheticTouchEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onTransitionEnd: SyntheticTransitionEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onVolumeChange: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onWaiting: SyntheticEvent[Event, typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, + onWheel: SyntheticWheelEvent[typingsSlinky.reactBootstrap.buttonGroupMod.ButtonGroup] => Unit = null, playsInline: js.UndefOr[Boolean] = js.undefined, prefix: String = null, property: String = null, @@ -174,14 +256,10 @@ object ButtonGroup seamless: js.UndefOr[Boolean] = js.undefined, security: String = null, slot: String = null, - span: Int | Double = null, srcDoc: String = null, srcLang: String = null, srcSet: String = null, - style: CSSProperties = null, - summary: String = null, suppressHydrationWarning: js.UndefOr[Boolean] = js.undefined, - title: String = null, typeof: String = null, unselectable: on | off = null, useMap: String = null, @@ -255,16 +333,13 @@ object ButtonGroup if (cellPadding != null) __obj.updateDynamic("cellPadding")(cellPadding.asInstanceOf[js.Any]) if (cellSpacing != null) __obj.updateDynamic("cellSpacing")(cellSpacing.asInstanceOf[js.Any]) if (charSet != null) __obj.updateDynamic("charSet")(charSet.asInstanceOf[js.Any]) - if (cite != null) __obj.updateDynamic("cite")(cite.asInstanceOf[js.Any]) if (classID != null) __obj.updateDynamic("classID")(classID.asInstanceOf[js.Any]) if (color != null) __obj.updateDynamic("color")(color.asInstanceOf[js.Any]) if (contextMenu != null) __obj.updateDynamic("contextMenu")(contextMenu.asInstanceOf[js.Any]) if (crossOrigin != null) __obj.updateDynamic("crossOrigin")(crossOrigin.asInstanceOf[js.Any]) - if (data != null) __obj.updateDynamic("data")(data.asInstanceOf[js.Any]) if (datatype != null) __obj.updateDynamic("datatype")(datatype.asInstanceOf[js.Any]) if (dateTime != null) __obj.updateDynamic("dateTime")(dateTime.asInstanceOf[js.Any]) if (encType != null) __obj.updateDynamic("encType")(encType.asInstanceOf[js.Any]) - if (form != null) __obj.updateDynamic("form")(form.asInstanceOf[js.Any]) if (formAction != null) __obj.updateDynamic("formAction")(formAction.asInstanceOf[js.Any]) if (formEncType != null) __obj.updateDynamic("formEncType")(formEncType.asInstanceOf[js.Any]) if (formMethod != null) __obj.updateDynamic("formMethod")(formMethod.asInstanceOf[js.Any]) @@ -284,16 +359,91 @@ object ButtonGroup if (!js.isUndefined(justified)) __obj.updateDynamic("justified")(justified.asInstanceOf[js.Any]) if (keyParams != null) __obj.updateDynamic("keyParams")(keyParams.asInstanceOf[js.Any]) if (keyType != null) __obj.updateDynamic("keyType")(keyType.asInstanceOf[js.Any]) - if (label != null) __obj.updateDynamic("label")(label.asInstanceOf[js.Any]) if (marginHeight != null) __obj.updateDynamic("marginHeight")(marginHeight.asInstanceOf[js.Any]) if (marginWidth != null) __obj.updateDynamic("marginWidth")(marginWidth.asInstanceOf[js.Any]) if (maxLength != null) __obj.updateDynamic("maxLength")(maxLength.asInstanceOf[js.Any]) if (mediaGroup != null) __obj.updateDynamic("mediaGroup")(mediaGroup.asInstanceOf[js.Any]) if (minLength != null) __obj.updateDynamic("minLength")(minLength.asInstanceOf[js.Any]) if (!js.isUndefined(noValidate)) __obj.updateDynamic("noValidate")(noValidate.asInstanceOf[js.Any]) + if (onAbort != null) __obj.updateDynamic("onAbort")(js.Any.fromFunction1(onAbort)) + if (onAnimationEnd != null) __obj.updateDynamic("onAnimationEnd")(js.Any.fromFunction1(onAnimationEnd)) + if (onAnimationIteration != null) __obj.updateDynamic("onAnimationIteration")(js.Any.fromFunction1(onAnimationIteration)) + if (onAnimationStart != null) __obj.updateDynamic("onAnimationStart")(js.Any.fromFunction1(onAnimationStart)) if (onAuxClick != null) __obj.updateDynamic("onAuxClick")(js.Any.fromFunction1(onAuxClick)) if (onBeforeInput != null) __obj.updateDynamic("onBeforeInput")(js.Any.fromFunction1(onBeforeInput)) + if (onBlur != null) __obj.updateDynamic("onBlur")(js.Any.fromFunction1(onBlur)) + if (onCanPlay != null) __obj.updateDynamic("onCanPlay")(js.Any.fromFunction1(onCanPlay)) + if (onCanPlayThrough != null) __obj.updateDynamic("onCanPlayThrough")(js.Any.fromFunction1(onCanPlayThrough)) + if (onChange != null) __obj.updateDynamic("onChange")(js.Any.fromFunction1(onChange)) + if (onClick != null) __obj.updateDynamic("onClick")(js.Any.fromFunction1(onClick)) + if (onCompositionEnd != null) __obj.updateDynamic("onCompositionEnd")(js.Any.fromFunction1(onCompositionEnd)) + if (onCompositionStart != null) __obj.updateDynamic("onCompositionStart")(js.Any.fromFunction1(onCompositionStart)) + if (onCompositionUpdate != null) __obj.updateDynamic("onCompositionUpdate")(js.Any.fromFunction1(onCompositionUpdate)) + if (onContextMenu != null) __obj.updateDynamic("onContextMenu")(js.Any.fromFunction1(onContextMenu)) + if (onCopy != null) __obj.updateDynamic("onCopy")(js.Any.fromFunction1(onCopy)) + if (onCut != null) __obj.updateDynamic("onCut")(js.Any.fromFunction1(onCut)) + if (onDoubleClick != null) __obj.updateDynamic("onDoubleClick")(js.Any.fromFunction1(onDoubleClick)) + if (onDrag != null) __obj.updateDynamic("onDrag")(js.Any.fromFunction1(onDrag)) + if (onDragEnd != null) __obj.updateDynamic("onDragEnd")(js.Any.fromFunction1(onDragEnd)) + if (onDragEnter != null) __obj.updateDynamic("onDragEnter")(js.Any.fromFunction1(onDragEnter)) + if (onDragExit != null) __obj.updateDynamic("onDragExit")(js.Any.fromFunction1(onDragExit)) + if (onDragLeave != null) __obj.updateDynamic("onDragLeave")(js.Any.fromFunction1(onDragLeave)) + if (onDragOver != null) __obj.updateDynamic("onDragOver")(js.Any.fromFunction1(onDragOver)) + if (onDragStart != null) __obj.updateDynamic("onDragStart")(js.Any.fromFunction1(onDragStart)) + if (onDrop != null) __obj.updateDynamic("onDrop")(js.Any.fromFunction1(onDrop)) + if (onDurationChange != null) __obj.updateDynamic("onDurationChange")(js.Any.fromFunction1(onDurationChange)) + if (onEmptied != null) __obj.updateDynamic("onEmptied")(js.Any.fromFunction1(onEmptied)) + if (onEncrypted != null) __obj.updateDynamic("onEncrypted")(js.Any.fromFunction1(onEncrypted)) + if (onEnded != null) __obj.updateDynamic("onEnded")(js.Any.fromFunction1(onEnded)) + if (onError != null) __obj.updateDynamic("onError")(js.Any.fromFunction1(onError)) + if (onFocus != null) __obj.updateDynamic("onFocus")(js.Any.fromFunction1(onFocus)) + if (onInput != null) __obj.updateDynamic("onInput")(js.Any.fromFunction1(onInput)) + if (onInvalid != null) __obj.updateDynamic("onInvalid")(js.Any.fromFunction1(onInvalid)) + if (onKeyDown != null) __obj.updateDynamic("onKeyDown")(js.Any.fromFunction1(onKeyDown)) + if (onKeyPress != null) __obj.updateDynamic("onKeyPress")(js.Any.fromFunction1(onKeyPress)) + if (onKeyUp != null) __obj.updateDynamic("onKeyUp")(js.Any.fromFunction1(onKeyUp)) + if (onLoad != null) __obj.updateDynamic("onLoad")(js.Any.fromFunction1(onLoad)) + if (onLoadStart != null) __obj.updateDynamic("onLoadStart")(js.Any.fromFunction1(onLoadStart)) + if (onLoadedData != null) __obj.updateDynamic("onLoadedData")(js.Any.fromFunction1(onLoadedData)) + if (onLoadedMetadata != null) __obj.updateDynamic("onLoadedMetadata")(js.Any.fromFunction1(onLoadedMetadata)) + if (onMouseDown != null) __obj.updateDynamic("onMouseDown")(js.Any.fromFunction1(onMouseDown)) + if (onMouseEnter != null) __obj.updateDynamic("onMouseEnter")(js.Any.fromFunction1(onMouseEnter)) + if (onMouseLeave != null) __obj.updateDynamic("onMouseLeave")(js.Any.fromFunction1(onMouseLeave)) + if (onMouseMove != null) __obj.updateDynamic("onMouseMove")(js.Any.fromFunction1(onMouseMove)) + if (onMouseOut != null) __obj.updateDynamic("onMouseOut")(js.Any.fromFunction1(onMouseOut)) + if (onMouseOver != null) __obj.updateDynamic("onMouseOver")(js.Any.fromFunction1(onMouseOver)) + if (onMouseUp != null) __obj.updateDynamic("onMouseUp")(js.Any.fromFunction1(onMouseUp)) + if (onPaste != null) __obj.updateDynamic("onPaste")(js.Any.fromFunction1(onPaste)) + if (onPause != null) __obj.updateDynamic("onPause")(js.Any.fromFunction1(onPause)) + if (onPlay != null) __obj.updateDynamic("onPlay")(js.Any.fromFunction1(onPlay)) + if (onPlaying != null) __obj.updateDynamic("onPlaying")(js.Any.fromFunction1(onPlaying)) + if (onPointerCancel != null) __obj.updateDynamic("onPointerCancel")(js.Any.fromFunction1(onPointerCancel)) + if (onPointerDown != null) __obj.updateDynamic("onPointerDown")(js.Any.fromFunction1(onPointerDown)) + if (onPointerEnter != null) __obj.updateDynamic("onPointerEnter")(js.Any.fromFunction1(onPointerEnter)) + if (onPointerLeave != null) __obj.updateDynamic("onPointerLeave")(js.Any.fromFunction1(onPointerLeave)) + if (onPointerMove != null) __obj.updateDynamic("onPointerMove")(js.Any.fromFunction1(onPointerMove)) + if (onPointerOut != null) __obj.updateDynamic("onPointerOut")(js.Any.fromFunction1(onPointerOut)) + if (onPointerOver != null) __obj.updateDynamic("onPointerOver")(js.Any.fromFunction1(onPointerOver)) + if (onPointerUp != null) __obj.updateDynamic("onPointerUp")(js.Any.fromFunction1(onPointerUp)) + if (onProgress != null) __obj.updateDynamic("onProgress")(js.Any.fromFunction1(onProgress)) + if (onRateChange != null) __obj.updateDynamic("onRateChange")(js.Any.fromFunction1(onRateChange)) if (onReset != null) __obj.updateDynamic("onReset")(js.Any.fromFunction1(onReset)) + if (onScroll != null) __obj.updateDynamic("onScroll")(js.Any.fromFunction1(onScroll)) + if (onSeeked != null) __obj.updateDynamic("onSeeked")(js.Any.fromFunction1(onSeeked)) + if (onSeeking != null) __obj.updateDynamic("onSeeking")(js.Any.fromFunction1(onSeeking)) + if (onSelect != null) __obj.updateDynamic("onSelect")(js.Any.fromFunction1(onSelect)) + if (onStalled != null) __obj.updateDynamic("onStalled")(js.Any.fromFunction1(onStalled)) + if (onSubmit != null) __obj.updateDynamic("onSubmit")(js.Any.fromFunction1(onSubmit)) + if (onSuspend != null) __obj.updateDynamic("onSuspend")(js.Any.fromFunction1(onSuspend)) + if (onTimeUpdate != null) __obj.updateDynamic("onTimeUpdate")(js.Any.fromFunction1(onTimeUpdate)) + if (onTouchCancel != null) __obj.updateDynamic("onTouchCancel")(js.Any.fromFunction1(onTouchCancel)) + if (onTouchEnd != null) __obj.updateDynamic("onTouchEnd")(js.Any.fromFunction1(onTouchEnd)) + if (onTouchMove != null) __obj.updateDynamic("onTouchMove")(js.Any.fromFunction1(onTouchMove)) + if (onTouchStart != null) __obj.updateDynamic("onTouchStart")(js.Any.fromFunction1(onTouchStart)) + if (onTransitionEnd != null) __obj.updateDynamic("onTransitionEnd")(js.Any.fromFunction1(onTransitionEnd)) + if (onVolumeChange != null) __obj.updateDynamic("onVolumeChange")(js.Any.fromFunction1(onVolumeChange)) + if (onWaiting != null) __obj.updateDynamic("onWaiting")(js.Any.fromFunction1(onWaiting)) + if (onWheel != null) __obj.updateDynamic("onWheel")(js.Any.fromFunction1(onWheel)) if (!js.isUndefined(playsInline)) __obj.updateDynamic("playsInline")(playsInline.asInstanceOf[js.Any]) if (prefix != null) __obj.updateDynamic("prefix")(prefix.asInstanceOf[js.Any]) if (property != null) __obj.updateDynamic("property")(property.asInstanceOf[js.Any]) @@ -304,14 +454,10 @@ object ButtonGroup if (!js.isUndefined(seamless)) __obj.updateDynamic("seamless")(seamless.asInstanceOf[js.Any]) if (security != null) __obj.updateDynamic("security")(security.asInstanceOf[js.Any]) if (slot != null) __obj.updateDynamic("slot")(slot.asInstanceOf[js.Any]) - if (span != null) __obj.updateDynamic("span")(span.asInstanceOf[js.Any]) if (srcDoc != null) __obj.updateDynamic("srcDoc")(srcDoc.asInstanceOf[js.Any]) if (srcLang != null) __obj.updateDynamic("srcLang")(srcLang.asInstanceOf[js.Any]) if (srcSet != null) __obj.updateDynamic("srcSet")(srcSet.asInstanceOf[js.Any]) - if (style != null) __obj.updateDynamic("style")(style.asInstanceOf[js.Any]) - if (summary != null) __obj.updateDynamic("summary")(summary.asInstanceOf[js.Any]) if (!js.isUndefined(suppressHydrationWarning)) __obj.updateDynamic("suppressHydrationWarning")(suppressHydrationWarning.asInstanceOf[js.Any]) - if (title != null) __obj.updateDynamic("title")(title.asInstanceOf[js.Any]) if (typeof != null) __obj.updateDynamic("typeof")(typeof.asInstanceOf[js.Any]) if (unselectable != null) __obj.updateDynamic("unselectable")(unselectable.asInstanceOf[js.Any]) if (useMap != null) __obj.updateDynamic("useMap")(useMap.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/src/main/scala/typingsSlinky/reactBootstrap/components/ToggleButtonGroup.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/src/main/scala/typingsSlinky/reactBootstrap/components/ToggleButtonGroup.scala index e80f9ad608..a8d21e1042 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/src/main/scala/typingsSlinky/reactBootstrap/components/ToggleButtonGroup.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-bootstrap/src/main/scala/typingsSlinky/reactBootstrap/components/ToggleButtonGroup.scala @@ -7,7 +7,7 @@ import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ -/* This component has complicated props, you'll have to assemble `props` yourself using js.Dynamic.literal(...) or similar. QualifiedName(IArray(Name(typingsSlinky), Name(reactBootstrap), Name(toggleButtonGroupMod), Name(ToggleButtonGroupProps))) was not a @ScalaJSDefined trait */ +/* This component has complicated props, you'll have to assemble `props` yourself using js.Dynamic.literal(...) or similar. Support for combinations of intersection and union types not implemented */ object ToggleButtonGroup extends ExternalComponentWithAttributesWithRefType[tag.type, typingsSlinky.reactBootstrap.mod.ToggleButtonGroup] { @JSImport("react-bootstrap", "ToggleButtonGroup") diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/build.sbt index ec566bea20..a6fd19aedd 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-contextmenu" -version := "2.13.0-b9f93e" +version := "2.13.0-6861c3" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "16.9.2-acd257", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "react" % "16.9.2-33376e", + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/src/main/scala/typingsSlinky/reactContextmenu/components/MenuItem.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/src/main/scala/typingsSlinky/reactContextmenu/components/MenuItem.scala index ce24eff1ce..1390dc17ba 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/src/main/scala/typingsSlinky/reactContextmenu/components/MenuItem.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/src/main/scala/typingsSlinky/reactContextmenu/components/MenuItem.scala @@ -8,7 +8,7 @@ import slinky.core.ExternalComponentWithAttributesWithRefType import slinky.core.TagMod import slinky.web.SyntheticMouseEvent import slinky.web.SyntheticTouchEvent -import slinky.web.html.`*`.tag +import slinky.web.html.div.tag import typingsSlinky.react.mod.HTMLAttributes import typingsSlinky.reactContextmenu.mod.MenuItemProps import scala.scalajs.js @@ -22,10 +22,11 @@ object MenuItem object componentImport extends js.Object override val component: String | js.Object = this.componentImport - /* The following DOM/SVG props were specified: className, disabled */ + /* The following DOM/SVG props were specified: className */ def apply( attributes: HTMLAttributes[HTMLDivElement] = null, data: /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Object */ js.Any = null, + disabled: js.UndefOr[Boolean] = js.undefined, divider: js.UndefOr[Boolean] = js.undefined, onClick: (js.Function3[ /* event */ SyntheticTouchEvent[HTMLDivElement] | SyntheticMouseEvent[HTMLDivElement], @@ -39,13 +40,14 @@ object MenuItem val __obj = js.Dynamic.literal() if (attributes != null) __obj.updateDynamic("attributes")(attributes.asInstanceOf[js.Any]) if (data != null) __obj.updateDynamic("data")(data.asInstanceOf[js.Any]) + if (!js.isUndefined(disabled)) __obj.updateDynamic("disabled")(disabled.asInstanceOf[js.Any]) if (!js.isUndefined(divider)) __obj.updateDynamic("divider")(divider.asInstanceOf[js.Any]) if (onClick != null) __obj.updateDynamic("onClick")(onClick.asInstanceOf[js.Any]) if (!js.isUndefined(preventClose)) __obj.updateDynamic("preventClose")(preventClose.asInstanceOf[js.Any]) if (_overrides != null) js.Dynamic.global.Object.assign(__obj, _overrides) super.apply(__obj.asInstanceOf[Props]) } - def apply(mods: TagMod[tag.type]*): BuildingComponent[tag.type, typingsSlinky.reactContextmenu.mod.MenuItem] = new slinky.core.BuildingComponent[slinky.web.html.`*`.tag.type, typingsSlinky.reactContextmenu.mod.MenuItem](js.Array(component.asInstanceOf[js.Any], js.Dictionary.empty)).apply(mods: _*) + def apply(mods: TagMod[tag.type]*): BuildingComponent[tag.type, typingsSlinky.reactContextmenu.mod.MenuItem] = new slinky.core.BuildingComponent[slinky.web.html.div.tag.type, typingsSlinky.reactContextmenu.mod.MenuItem](js.Array(component.asInstanceOf[js.Any], js.Dictionary.empty)).apply(mods: _*) type Props = MenuItemProps } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/src/main/scala/typingsSlinky/reactContextmenu/components/SubMenu.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/src/main/scala/typingsSlinky/reactContextmenu/components/SubMenu.scala index 37810d0137..0427e65370 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/src/main/scala/typingsSlinky/reactContextmenu/components/SubMenu.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-contextmenu/src/main/scala/typingsSlinky/reactContextmenu/components/SubMenu.scala @@ -8,7 +8,7 @@ import slinky.core.ExternalComponentWithAttributesWithRefType import slinky.core.facade.ReactElement import slinky.web.SyntheticMouseEvent import slinky.web.SyntheticTouchEvent -import slinky.web.html.`*`.tag +import slinky.web.html.div.tag import typingsSlinky.react.mod.ReactText import typingsSlinky.reactContextmenu.mod.SubMenuProps import scala.scalajs.js @@ -22,9 +22,10 @@ object SubMenu object componentImport extends js.Object override val component: String | js.Object = this.componentImport - /* The following DOM/SVG props were specified: className, disabled */ + /* The following DOM/SVG props were specified: className */ def apply( title: ReactElement | ReactText, + disabled: js.UndefOr[Boolean] = js.undefined, hoverDelay: Int | Double = null, onClick: (js.Function3[ /* event */ SyntheticTouchEvent[HTMLDivElement] | SyntheticMouseEvent[HTMLDivElement], @@ -37,6 +38,7 @@ object SubMenu _overrides: StringDictionary[js.Any] = null ): BuildingComponent[tag.type, typingsSlinky.reactContextmenu.mod.SubMenu] = { val __obj = js.Dynamic.literal(title = title.asInstanceOf[js.Any]) + if (!js.isUndefined(disabled)) __obj.updateDynamic("disabled")(disabled.asInstanceOf[js.Any]) if (hoverDelay != null) __obj.updateDynamic("hoverDelay")(hoverDelay.asInstanceOf[js.Any]) if (onClick != null) __obj.updateDynamic("onClick")(onClick.asInstanceOf[js.Any]) if (!js.isUndefined(preventCloseOnClick)) __obj.updateDynamic("preventCloseOnClick")(preventCloseOnClick.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/build.sbt index 953938f6d5..7147d197a8 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-dropzone" -version := "10.1.10-5ab964" +version := "10.1.10-328b51" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "16.9.2-acd257", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "react" % "16.9.2-33376e", + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala deleted file mode 100644 index b556b34df7..0000000000 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala +++ /dev/null @@ -1,132 +0,0 @@ -package typingsSlinky.reactDropzone - -import org.scalajs.dom.raw.HTMLElement -import typingsSlinky.react.mod.DragEvent -import typingsSlinky.react.mod.DragEventHandler -import typingsSlinky.react.mod.Key -import typingsSlinky.react.mod.Ref -import typingsSlinky.react.mod._Global_.JSX.Element -import typingsSlinky.reactDropzone.mod.DropEvent -import typingsSlinky.reactDropzone.mod.DropzoneRef -import typingsSlinky.reactDropzone.mod.DropzoneState -import scala.scalajs.js -import scala.scalajs.js.`|` -import scala.scalajs.js.annotation._ - -/* Inlined react-dropzone.react-dropzone.DropzoneProps & react.react.RefAttributes */ -@js.native -trait DropzonePropsRefAttributesDropzoneRef extends js.Object { - var accept: js.UndefOr[String | js.Array[String]] = js.native - var children: js.UndefOr[js.Function1[/* state */ DropzoneState, Element]] = js.native - var disabled: js.UndefOr[Boolean] = js.native - var getFilesFromEvent: js.UndefOr[ - js.Function1[ - /* event */ DropEvent, - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ - ] - ] = js.native - var key: js.UndefOr[Key] = js.native - var maxSize: js.UndefOr[Double] = js.native - var minSize: js.UndefOr[Double] = js.native - var multiple: js.UndefOr[Boolean] = js.native - var noClick: js.UndefOr[Boolean] = js.native - var noDrag: js.UndefOr[Boolean] = js.native - var noDragEventsBubbling: js.UndefOr[Boolean] = js.native - var noKeyboard: js.UndefOr[Boolean] = js.native - var onDragEnter: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragLeave: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragOver: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDrop: js.UndefOr[ - js.Function3[ - /* acceptedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* rejectedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropAccepted: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropRejected: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onFileDialogCancel: js.UndefOr[js.Function0[Unit]] = js.native - var preventDropOnDocument: js.UndefOr[Boolean] = js.native - var ref: js.UndefOr[Ref[DropzoneRef]] = js.native -} - -object DropzonePropsRefAttributesDropzoneRef { - @scala.inline - def apply( - accept: String | js.Array[String] = null, - children: /* state */ DropzoneState => Element = null, - disabled: js.UndefOr[Boolean] = js.undefined, - getFilesFromEvent: /* event */ DropEvent => /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ = null, - key: Key = null, - maxSize: Int | Double = null, - minSize: Int | Double = null, - multiple: js.UndefOr[Boolean] = js.undefined, - noClick: js.UndefOr[Boolean] = js.undefined, - noDrag: js.UndefOr[Boolean] = js.undefined, - noDragEventsBubbling: js.UndefOr[Boolean] = js.undefined, - noKeyboard: js.UndefOr[Boolean] = js.undefined, - onDragEnter: DragEvent[HTMLElement] => Unit = null, - onDragLeave: DragEvent[HTMLElement] => Unit = null, - onDragOver: DragEvent[HTMLElement] => Unit = null, - onDrop: (/* acceptedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], /* rejectedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], /* event */ DropEvent) => Unit = null, - onDropAccepted: (/* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], /* event */ DropEvent) => Unit = null, - onDropRejected: (/* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], /* event */ DropEvent) => Unit = null, - onFileDialogCancel: () => Unit = null, - preventDropOnDocument: js.UndefOr[Boolean] = js.undefined, - ref: Ref[DropzoneRef] = null - ): DropzonePropsRefAttributesDropzoneRef = { - val __obj = js.Dynamic.literal() - if (accept != null) __obj.updateDynamic("accept")(accept.asInstanceOf[js.Any]) - if (children != null) __obj.updateDynamic("children")(js.Any.fromFunction1(children)) - if (!js.isUndefined(disabled)) __obj.updateDynamic("disabled")(disabled.asInstanceOf[js.Any]) - if (getFilesFromEvent != null) __obj.updateDynamic("getFilesFromEvent")(js.Any.fromFunction1(getFilesFromEvent)) - if (key != null) __obj.updateDynamic("key")(key.asInstanceOf[js.Any]) - if (maxSize != null) __obj.updateDynamic("maxSize")(maxSize.asInstanceOf[js.Any]) - if (minSize != null) __obj.updateDynamic("minSize")(minSize.asInstanceOf[js.Any]) - if (!js.isUndefined(multiple)) __obj.updateDynamic("multiple")(multiple.asInstanceOf[js.Any]) - if (!js.isUndefined(noClick)) __obj.updateDynamic("noClick")(noClick.asInstanceOf[js.Any]) - if (!js.isUndefined(noDrag)) __obj.updateDynamic("noDrag")(noDrag.asInstanceOf[js.Any]) - if (!js.isUndefined(noDragEventsBubbling)) __obj.updateDynamic("noDragEventsBubbling")(noDragEventsBubbling.asInstanceOf[js.Any]) - if (!js.isUndefined(noKeyboard)) __obj.updateDynamic("noKeyboard")(noKeyboard.asInstanceOf[js.Any]) - if (onDragEnter != null) __obj.updateDynamic("onDragEnter")(js.Any.fromFunction1(onDragEnter)) - if (onDragLeave != null) __obj.updateDynamic("onDragLeave")(js.Any.fromFunction1(onDragLeave)) - if (onDragOver != null) __obj.updateDynamic("onDragOver")(js.Any.fromFunction1(onDragOver)) - if (onDrop != null) __obj.updateDynamic("onDrop")(js.Any.fromFunction3(onDrop)) - if (onDropAccepted != null) __obj.updateDynamic("onDropAccepted")(js.Any.fromFunction2(onDropAccepted)) - if (onDropRejected != null) __obj.updateDynamic("onDropRejected")(js.Any.fromFunction2(onDropRejected)) - if (onFileDialogCancel != null) __obj.updateDynamic("onFileDialogCancel")(js.Any.fromFunction0(onFileDialogCancel)) - if (!js.isUndefined(preventDropOnDocument)) __obj.updateDynamic("preventDropOnDocument")(preventDropOnDocument.asInstanceOf[js.Any]) - if (ref != null) __obj.updateDynamic("ref")(ref.asInstanceOf[js.Any]) - __obj.asInstanceOf[DropzonePropsRefAttributesDropzoneRef] - } -} - diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/components/ReactDropzone.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/components/ReactDropzone.scala index 7577ec1422..adecf8308b 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/components/ReactDropzone.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/components/ReactDropzone.scala @@ -1,13 +1,17 @@ package typingsSlinky.reactDropzone.components import org.scalablytyped.runtime.StringDictionary +import org.scalajs.dom.raw.HTMLElement import slinky.core.BuildingComponent import slinky.core.ExternalComponentWithAttributesWithRefType import slinky.core.TagMod import slinky.web.html.`*`.tag +import typingsSlinky.react.mod.DragEvent import typingsSlinky.react.mod.Ref -import typingsSlinky.reactDropzone.DropzonePropsRefAttributesDropzoneRef +import typingsSlinky.react.mod.RefAttributes import typingsSlinky.reactDropzone.mod.DropEvent +import typingsSlinky.reactDropzone.mod.DropzoneProps +import typingsSlinky.reactDropzone.mod.DropzoneRef import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -19,7 +23,7 @@ object ReactDropzone object componentImport extends js.Object override val component: String | js.Object = this.componentImport - /* The following DOM/SVG props were specified: disabled, multiple, onDragEnter, onDragLeave, onDragOver */ + /* The following DOM/SVG props were specified: disabled, multiple */ def apply( accept: String | js.Array[String] = null, getFilesFromEvent: /* event */ DropEvent => /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ = null, @@ -29,6 +33,9 @@ object ReactDropzone noDrag: js.UndefOr[Boolean] = js.undefined, noDragEventsBubbling: js.UndefOr[Boolean] = js.undefined, noKeyboard: js.UndefOr[Boolean] = js.undefined, + onDragEnter: DragEvent[HTMLElement] => Unit = null, + onDragLeave: DragEvent[HTMLElement] => Unit = null, + onDragOver: DragEvent[HTMLElement] => Unit = null, onDrop: (/* acceptedFiles */ js.Array[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ ], /* rejectedFiles */ js.Array[ @@ -53,6 +60,9 @@ object ReactDropzone if (!js.isUndefined(noDrag)) __obj.updateDynamic("noDrag")(noDrag.asInstanceOf[js.Any]) if (!js.isUndefined(noDragEventsBubbling)) __obj.updateDynamic("noDragEventsBubbling")(noDragEventsBubbling.asInstanceOf[js.Any]) if (!js.isUndefined(noKeyboard)) __obj.updateDynamic("noKeyboard")(noKeyboard.asInstanceOf[js.Any]) + if (onDragEnter != null) __obj.updateDynamic("onDragEnter")(js.Any.fromFunction1(onDragEnter)) + if (onDragLeave != null) __obj.updateDynamic("onDragLeave")(js.Any.fromFunction1(onDragLeave)) + if (onDragOver != null) __obj.updateDynamic("onDragOver")(js.Any.fromFunction1(onDragOver)) if (onDrop != null) __obj.updateDynamic("onDrop")(js.Any.fromFunction3(onDrop)) if (onDropAccepted != null) __obj.updateDynamic("onDropAccepted")(js.Any.fromFunction2(onDropAccepted)) if (onDropRejected != null) __obj.updateDynamic("onDropRejected")(js.Any.fromFunction2(onDropRejected)) @@ -62,6 +72,6 @@ object ReactDropzone super.apply(__obj.asInstanceOf[Props]) } def apply(mods: TagMod[tag.type]*): BuildingComponent[tag.type, Ref[js.Any] with js.Object] = new slinky.core.BuildingComponent[slinky.web.html.`*`.tag.type, typingsSlinky.react.mod.Ref[js.Any] with js.Object](js.Array(component.asInstanceOf[js.Any], js.Dictionary.empty)).apply(mods: _*) - type Props = DropzonePropsRefAttributesDropzoneRef + type Props = DropzoneProps with RefAttributes[DropzoneRef] } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/mod/DropzoneProps.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/mod/DropzoneProps.scala index 17143f5d31..d9f0d6fe50 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/mod/DropzoneProps.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/mod/DropzoneProps.scala @@ -1,74 +1,22 @@ package typingsSlinky.reactDropzone.mod import org.scalajs.dom.raw.HTMLElement +import slinky.core.facade.ReactElement import typingsSlinky.react.mod.DragEvent -import typingsSlinky.react.mod.DragEventHandler -import typingsSlinky.react.mod._Global_.JSX.Element import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ -/* Inlined parent react-dropzone.react-dropzone.DropzoneOptions */ @js.native -trait DropzoneProps extends js.Object { - var accept: js.UndefOr[String | js.Array[String]] = js.native - var children: js.UndefOr[js.Function1[/* state */ DropzoneState, Element]] = js.native - var disabled: js.UndefOr[Boolean] = js.native - var getFilesFromEvent: js.UndefOr[ - js.Function1[ - /* event */ DropEvent, - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ - ] - ] = js.native - var maxSize: js.UndefOr[Double] = js.native - var minSize: js.UndefOr[Double] = js.native - var multiple: js.UndefOr[Boolean] = js.native - var noClick: js.UndefOr[Boolean] = js.native - var noDrag: js.UndefOr[Boolean] = js.native - var noDragEventsBubbling: js.UndefOr[Boolean] = js.native - var noKeyboard: js.UndefOr[Boolean] = js.native - var onDragEnter: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragLeave: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragOver: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDrop: js.UndefOr[ - js.Function3[ - /* acceptedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* rejectedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropAccepted: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropRejected: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onFileDialogCancel: js.UndefOr[js.Function0[Unit]] = js.native - var preventDropOnDocument: js.UndefOr[Boolean] = js.native +trait DropzoneProps extends DropzoneOptions { + var children: js.UndefOr[js.Function1[/* state */ DropzoneState, ReactElement]] = js.native } object DropzoneProps { @scala.inline def apply( accept: String | js.Array[String] = null, - children: /* state */ DropzoneState => Element = null, + children: /* state */ DropzoneState => ReactElement = null, disabled: js.UndefOr[Boolean] = js.undefined, getFilesFromEvent: /* event */ DropEvent => /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ = null, maxSize: Int | Double = null, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/mod/default.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/mod/default.scala index 5c78ab8d80..09bd5949b9 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/mod/default.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-dropzone/src/main/scala/typingsSlinky/reactDropzone/mod/default.scala @@ -1,7 +1,7 @@ package typingsSlinky.reactDropzone.mod -import typingsSlinky.react.mod._Global_.JSX.Element -import typingsSlinky.reactDropzone.DropzonePropsRefAttributesDropzoneRef +import slinky.core.facade.ReactElement +import typingsSlinky.react.mod.RefAttributes import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -9,6 +9,6 @@ import scala.scalajs.js.annotation._ @JSImport("react-dropzone", JSImport.Default) @js.native object default extends js.Object { - def apply(props: DropzonePropsRefAttributesDropzoneRef): Element = js.native + def apply(props: DropzoneProps with RefAttributes[DropzoneRef]): ReactElement = js.native } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react-select/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/r/react-select/build.sbt index c2b83c053c..1ed2d23b75 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react-select/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react-select/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-select" -version := "0.0-unknown-353f4c" +version := "0.0-unknown-5958ff" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "16.9.2-acd257", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "react" % "16.9.2-33376e", + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/r/react/build.sbt index 9641d7db7f..6d832ff880 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react" -version := "16.9.2-acd257" +version := "16.9.2-33376e" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/AnonDefaultPropsD.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/Anon0.scala similarity index 77% rename from importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/AnonDefaultPropsD.scala rename to importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/Anon0.scala index a38c8aeb51..05bdadb8b9 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/AnonDefaultPropsD.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/Anon0.scala @@ -5,18 +5,18 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonDefaultPropsD extends js.Object { +trait Anon0 extends js.Object { var defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any = js.native } -object AnonDefaultPropsD { +object Anon0 { @scala.inline def apply( defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any - ): AnonDefaultPropsD = { + ): Anon0 = { val __obj = js.Dynamic.literal(defaultProps = defaultProps.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonDefaultPropsD] + __obj.asInstanceOf[Anon0] } } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/AnimationEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/AnimationEvent.scala index ef759bb5ca..a8ed8fb04a 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/AnimationEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/AnimationEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import typingsSlinky.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -25,7 +26,7 @@ object AnimationEvent { isDefaultPrevented: () => Boolean, isPropagationStopped: () => Boolean, isTrusted: Boolean, - nativeEvent: NativeAnimationEvent, + nativeEvent: Event, persist: () => Unit, preventDefault: () => Unit, pseudoElement: String, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ClipboardEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ClipboardEvent.scala index 8089219d34..bdaf3e233a 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ClipboardEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ClipboardEvent.scala @@ -1,6 +1,7 @@ package typingsSlinky.react.mod import org.scalajs.dom.raw.DataTransfer +import org.scalajs.dom.raw.Event import typingsSlinky.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -23,7 +24,7 @@ object ClipboardEvent { isDefaultPrevented: () => Boolean, isPropagationStopped: () => Boolean, isTrusted: Boolean, - nativeEvent: NativeClipboardEvent, + nativeEvent: Event, persist: () => Unit, preventDefault: () => Unit, stopPropagation: () => Unit, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/CompositionEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/CompositionEvent.scala index e90733363a..e584b2dee9 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/CompositionEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/CompositionEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import typingsSlinky.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -22,7 +23,7 @@ object CompositionEvent { isDefaultPrevented: () => Boolean, isPropagationStopped: () => Boolean, isTrusted: Boolean, - nativeEvent: NativeCompositionEvent, + nativeEvent: Event, persist: () => Unit, preventDefault: () => Unit, stopPropagation: () => Unit, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DragEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DragEvent.scala index 8c7d2e27cb..a414adeb81 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DragEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DragEvent.scala @@ -1,6 +1,7 @@ package typingsSlinky.react.mod import org.scalajs.dom.raw.DataTransfer +import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -33,7 +34,7 @@ object DragEvent { metaKey: Boolean, movementX: Double, movementY: Double, - nativeEvent: NativeDragEvent, + nativeEvent: Event, pageX: Double, pageY: Double, persist: () => Unit, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/FocusEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/FocusEvent.scala index bbaf0f0c6d..0a1fed8d08 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/FocusEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/FocusEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import typingsSlinky.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -23,7 +24,7 @@ object FocusEvent { isDefaultPrevented: () => Boolean, isPropagationStopped: () => Boolean, isTrusted: Boolean, - nativeEvent: NativeFocusEvent, + nativeEvent: Event, persist: () => Unit, preventDefault: () => Unit, relatedTarget: org.scalajs.dom.raw.EventTarget, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/KeyboardEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/KeyboardEvent.scala index d75f55b699..d4e3d0321b 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/KeyboardEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/KeyboardEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import typingsSlinky.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -47,7 +48,7 @@ object KeyboardEvent { locale: String, location: Double, metaKey: Boolean, - nativeEvent: NativeKeyboardEvent, + nativeEvent: Event, persist: () => Unit, preventDefault: () => Unit, repeat: Boolean, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/PointerEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/PointerEvent.scala index fb2387eb5b..eea1ae3b0c 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/PointerEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/PointerEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget import typingsSlinky.react.reactStrings.mouse import typingsSlinky.react.reactStrings.pen @@ -43,7 +44,7 @@ object PointerEvent { metaKey: Boolean, movementX: Double, movementY: Double, - nativeEvent: NativePointerEvent, + nativeEvent: Event, pageX: Double, pageY: Double, persist: () => Unit, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactDOM.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactDOM.scala index 0c83b9c164..ea6e396ac9 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactDOM.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactDOM.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Element import org.scalajs.dom.raw.HTMLAnchorElement import org.scalajs.dom.raw.HTMLAreaElement import org.scalajs.dom.raw.HTMLAudioElement @@ -52,12 +53,6 @@ import org.scalajs.dom.raw.HTMLTitleElement import org.scalajs.dom.raw.HTMLTrackElement import org.scalajs.dom.raw.HTMLUListElement import org.scalajs.dom.raw.HTMLVideoElement -import typingsSlinky.std.HTMLDataElement -import typingsSlinky.std.HTMLDialogElement -import typingsSlinky.std.HTMLTableDataCellElement -import typingsSlinky.std.HTMLTableHeaderCellElement -import typingsSlinky.std.HTMLTemplateElement -import typingsSlinky.std.HTMLWebViewElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -95,7 +90,7 @@ object ReactDOM { code: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], col: DetailedHTMLFactory[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement], colgroup: DetailedHTMLFactory[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement], - data: DetailedHTMLFactory[DataHTMLAttributes[HTMLDataElement], HTMLDataElement], + data: DetailedHTMLFactory[DataHTMLAttributes[Element], Element], datalist: DetailedHTMLFactory[HTMLAttributes[HTMLDataListElement], HTMLDataListElement], dd: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], defs: SVGFactory, @@ -103,7 +98,7 @@ object ReactDOM { desc: SVGFactory, details: DetailedHTMLFactory[DetailsHTMLAttributes[HTMLElement], HTMLElement], dfn: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], - dialog: DetailedHTMLFactory[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement], + dialog: DetailedHTMLFactory[DialogHTMLAttributes[Element], Element], div: DetailedHTMLFactory[HTMLAttributes[HTMLDivElement], HTMLDivElement], dl: DetailedHTMLFactory[HTMLAttributes[HTMLDListElement], HTMLDListElement], dt: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], @@ -219,13 +214,13 @@ object ReactDOM { symbol: SVGFactory, table: DetailedHTMLFactory[TableHTMLAttributes[HTMLTableElement], HTMLTableElement], tbody: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - td: DetailedHTMLFactory[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement], - template: DetailedHTMLFactory[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement], + td: DetailedHTMLFactory[TdHTMLAttributes[Element], Element], + template: DetailedHTMLFactory[HTMLAttributes[Element], Element], text: SVGFactory, textPath: SVGFactory, textarea: DetailedHTMLFactory[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement], tfoot: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - th: DetailedHTMLFactory[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement], + th: DetailedHTMLFactory[ThHTMLAttributes[Element], Element], thead: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], time: DetailedHTMLFactory[TimeHTMLAttributes[HTMLElement], HTMLElement], title: DetailedHTMLFactory[HTMLAttributes[HTMLTitleElement], HTMLTitleElement], @@ -239,7 +234,7 @@ object ReactDOM { video: DetailedHTMLFactory[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement], view: SVGFactory, wbr: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], - webview: DetailedHTMLFactory[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] + webview: DetailedHTMLFactory[WebViewHTMLAttributes[Element], Element] ): ReactDOM = { val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], animate = animate.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], big = big.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], caption = caption.asInstanceOf[js.Any], circle = circle.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], clipPath = clipPath.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], defs = defs.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], desc = desc.asInstanceOf[js.Any], details = details.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], ellipse = ellipse.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], feBlend = feBlend.asInstanceOf[js.Any], feColorMatrix = feColorMatrix.asInstanceOf[js.Any], feComponentTransfer = feComponentTransfer.asInstanceOf[js.Any], feComposite = feComposite.asInstanceOf[js.Any], feConvolveMatrix = feConvolveMatrix.asInstanceOf[js.Any], feDiffuseLighting = feDiffuseLighting.asInstanceOf[js.Any], feDisplacementMap = feDisplacementMap.asInstanceOf[js.Any], feDistantLight = feDistantLight.asInstanceOf[js.Any], feDropShadow = feDropShadow.asInstanceOf[js.Any], feFlood = feFlood.asInstanceOf[js.Any], feFuncA = feFuncA.asInstanceOf[js.Any], feFuncB = feFuncB.asInstanceOf[js.Any], feFuncG = feFuncG.asInstanceOf[js.Any], feFuncR = feFuncR.asInstanceOf[js.Any], feGaussianBlur = feGaussianBlur.asInstanceOf[js.Any], feImage = feImage.asInstanceOf[js.Any], feMerge = feMerge.asInstanceOf[js.Any], feMergeNode = feMergeNode.asInstanceOf[js.Any], feMorphology = feMorphology.asInstanceOf[js.Any], feOffset = feOffset.asInstanceOf[js.Any], fePointLight = fePointLight.asInstanceOf[js.Any], feSpecularLighting = feSpecularLighting.asInstanceOf[js.Any], feSpotLight = feSpotLight.asInstanceOf[js.Any], feTile = feTile.asInstanceOf[js.Any], feTurbulence = feTurbulence.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], filter = filter.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], foreignObject = foreignObject.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], g = g.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], image = image.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], keygen = keygen.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], line = line.asInstanceOf[js.Any], linearGradient = linearGradient.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], marker = marker.asInstanceOf[js.Any], mask = mask.asInstanceOf[js.Any], menu = menu.asInstanceOf[js.Any], menuitem = menuitem.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], metadata = metadata.asInstanceOf[js.Any], meter = meter.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], output = output.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], path = path.asInstanceOf[js.Any], pattern = pattern.asInstanceOf[js.Any], picture = picture.asInstanceOf[js.Any], polygon = polygon.asInstanceOf[js.Any], polyline = polyline.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], radialGradient = radialGradient.asInstanceOf[js.Any], rect = rect.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], stop = stop.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], svg = svg.asInstanceOf[js.Any], switch = switch.asInstanceOf[js.Any], symbol = symbol.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], text = text.asInstanceOf[js.Any], textPath = textPath.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], time = time.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], tspan = tspan.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], use = use.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], view = view.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any], webview = webview.asInstanceOf[js.Any]) __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactHTML.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactHTML.scala index 1d5dbf1075..ebd511dfdb 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactHTML.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactHTML.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Element import org.scalajs.dom.raw.HTMLAnchorElement import org.scalajs.dom.raw.HTMLAreaElement import org.scalajs.dom.raw.HTMLAudioElement @@ -52,12 +53,6 @@ import org.scalajs.dom.raw.HTMLTitleElement import org.scalajs.dom.raw.HTMLTrackElement import org.scalajs.dom.raw.HTMLUListElement import org.scalajs.dom.raw.HTMLVideoElement -import typingsSlinky.std.HTMLDataElement -import typingsSlinky.std.HTMLDialogElement -import typingsSlinky.std.HTMLTableDataCellElement -import typingsSlinky.std.HTMLTableHeaderCellElement -import typingsSlinky.std.HTMLTemplateElement -import typingsSlinky.std.HTMLWebViewElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -89,13 +84,13 @@ trait ReactHTML extends js.Object { var code: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native var col: DetailedHTMLFactory[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement] = js.native var colgroup: DetailedHTMLFactory[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement] = js.native - var data: DetailedHTMLFactory[DataHTMLAttributes[HTMLDataElement], HTMLDataElement] = js.native + var data: DetailedHTMLFactory[DataHTMLAttributes[Element], Element] = js.native var datalist: DetailedHTMLFactory[HTMLAttributes[HTMLDataListElement], HTMLDataListElement] = js.native var dd: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native var del: DetailedHTMLFactory[DelHTMLAttributes[HTMLElement], HTMLElement] = js.native var details: DetailedHTMLFactory[DetailsHTMLAttributes[HTMLElement], HTMLElement] = js.native var dfn: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var dialog: DetailedHTMLFactory[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement] = js.native + var dialog: DetailedHTMLFactory[DialogHTMLAttributes[Element], Element] = js.native var div: DetailedHTMLFactory[HTMLAttributes[HTMLDivElement], HTMLDivElement] = js.native var dl: DetailedHTMLFactory[HTMLAttributes[HTMLDListElement], HTMLDListElement] = js.native var dt: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native @@ -166,11 +161,11 @@ trait ReactHTML extends js.Object { var sup: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native var table: DetailedHTMLFactory[TableHTMLAttributes[HTMLTableElement], HTMLTableElement] = js.native var tbody: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native - var td: DetailedHTMLFactory[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement] = js.native - var template: DetailedHTMLFactory[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement] = js.native + var td: DetailedHTMLFactory[TdHTMLAttributes[Element], Element] = js.native + var template: DetailedHTMLFactory[HTMLAttributes[Element], Element] = js.native var textarea: DetailedHTMLFactory[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement] = js.native var tfoot: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native - var th: DetailedHTMLFactory[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement] = js.native + var th: DetailedHTMLFactory[ThHTMLAttributes[Element], Element] = js.native var thead: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native var time: DetailedHTMLFactory[TimeHTMLAttributes[HTMLElement], HTMLElement] = js.native var title: DetailedHTMLFactory[HTMLAttributes[HTMLTitleElement], HTMLTitleElement] = js.native @@ -181,7 +176,7 @@ trait ReactHTML extends js.Object { var `var`: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native var video: DetailedHTMLFactory[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement] = js.native var wbr: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var webview: DetailedHTMLFactory[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] = js.native + var webview: DetailedHTMLFactory[WebViewHTMLAttributes[Element], Element] = js.native } object ReactHTML { @@ -209,13 +204,13 @@ object ReactHTML { code: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], col: DetailedHTMLFactory[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement], colgroup: DetailedHTMLFactory[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement], - data: DetailedHTMLFactory[DataHTMLAttributes[HTMLDataElement], HTMLDataElement], + data: DetailedHTMLFactory[DataHTMLAttributes[Element], Element], datalist: DetailedHTMLFactory[HTMLAttributes[HTMLDataListElement], HTMLDataListElement], dd: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], del: DetailedHTMLFactory[DelHTMLAttributes[HTMLElement], HTMLElement], details: DetailedHTMLFactory[DetailsHTMLAttributes[HTMLElement], HTMLElement], dfn: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], - dialog: DetailedHTMLFactory[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement], + dialog: DetailedHTMLFactory[DialogHTMLAttributes[Element], Element], div: DetailedHTMLFactory[HTMLAttributes[HTMLDivElement], HTMLDivElement], dl: DetailedHTMLFactory[HTMLAttributes[HTMLDListElement], HTMLDListElement], dt: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], @@ -286,11 +281,11 @@ object ReactHTML { sup: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], table: DetailedHTMLFactory[TableHTMLAttributes[HTMLTableElement], HTMLTableElement], tbody: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - td: DetailedHTMLFactory[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement], - template: DetailedHTMLFactory[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement], + td: DetailedHTMLFactory[TdHTMLAttributes[Element], Element], + template: DetailedHTMLFactory[HTMLAttributes[Element], Element], textarea: DetailedHTMLFactory[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement], tfoot: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - th: DetailedHTMLFactory[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement], + th: DetailedHTMLFactory[ThHTMLAttributes[Element], Element], thead: DetailedHTMLFactory[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], time: DetailedHTMLFactory[TimeHTMLAttributes[HTMLElement], HTMLElement], title: DetailedHTMLFactory[HTMLAttributes[HTMLTitleElement], HTMLTitleElement], @@ -301,7 +296,7 @@ object ReactHTML { `var`: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], video: DetailedHTMLFactory[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement], wbr: DetailedHTMLFactory[HTMLAttributes[HTMLElement], HTMLElement], - webview: DetailedHTMLFactory[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] + webview: DetailedHTMLFactory[WebViewHTMLAttributes[Element], Element] ): ReactHTML = { val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], big = big.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], caption = caption.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], details = details.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], keygen = keygen.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], menu = menu.asInstanceOf[js.Any], menuitem = menuitem.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], meter = meter.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], output = output.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], picture = picture.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], time = time.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any], webview = webview.asInstanceOf[js.Any]) __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/TouchEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/TouchEvent.scala index 77a8a43496..bc2fcbbd54 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/TouchEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/TouchEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import typingsSlinky.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -36,7 +37,7 @@ object TouchEvent { isPropagationStopped: () => Boolean, isTrusted: Boolean, metaKey: Boolean, - nativeEvent: NativeTouchEvent, + nativeEvent: Event, persist: () => Unit, preventDefault: () => Unit, shiftKey: Boolean, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/TransitionEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/TransitionEvent.scala index b533ce6082..ae9deb3f7f 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/TransitionEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/TransitionEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import typingsSlinky.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -24,7 +25,7 @@ object TransitionEvent { isDefaultPrevented: () => Boolean, isPropagationStopped: () => Boolean, isTrusted: Boolean, - nativeEvent: NativeTransitionEvent, + nativeEvent: Event, persist: () => Unit, preventDefault: () => Unit, propertyName: String, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/UIEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/UIEvent.scala index d604f254d8..ad8f6fbe49 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/UIEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/UIEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import typingsSlinky.std.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -23,7 +24,7 @@ object UIEvent { isDefaultPrevented: () => Boolean, isPropagationStopped: () => Boolean, isTrusted: Boolean, - nativeEvent: NativeUIEvent, + nativeEvent: Event, persist: () => Unit, preventDefault: () => Unit, stopPropagation: () => Unit, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/WheelEvent.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/WheelEvent.scala index d75accafbe..0d9f9b1d9b 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/WheelEvent.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/WheelEvent.scala @@ -1,5 +1,6 @@ package typingsSlinky.react.mod +import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget import scala.scalajs.js import scala.scalajs.js.`|` @@ -38,7 +39,7 @@ object WheelEvent { metaKey: Boolean, movementX: Double, movementY: Double, - nativeEvent: NativeWheelEvent, + nativeEvent: Event, pageX: Double, pageY: Double, persist: () => Unit, diff --git a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/_Global_/JSX/IntrinsicElements.scala b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/_Global_/JSX/IntrinsicElements.scala index 369280e537..5831ffa5ec 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/_Global_/JSX/IntrinsicElements.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/_Global_/JSX/IntrinsicElements.scala @@ -157,14 +157,6 @@ import typingsSlinky.react.mod.TimeHTMLAttributes import typingsSlinky.react.mod.TrackHTMLAttributes import typingsSlinky.react.mod.VideoHTMLAttributes import typingsSlinky.react.mod.WebViewHTMLAttributes -import typingsSlinky.std.HTMLDataElement -import typingsSlinky.std.HTMLDialogElement -import typingsSlinky.std.HTMLTableDataCellElement -import typingsSlinky.std.HTMLTableHeaderCellElement -import typingsSlinky.std.HTMLTemplateElement -import typingsSlinky.std.HTMLWebViewElement -import typingsSlinky.std.SVGFEDropShadowElement -import typingsSlinky.std.SVGForeignObjectElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -201,7 +193,7 @@ trait IntrinsicElements extends js.Object { var code: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native var col: DetailedHTMLProps[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement] = js.native var colgroup: DetailedHTMLProps[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement] = js.native - var data: DetailedHTMLProps[DataHTMLAttributes[HTMLDataElement], HTMLDataElement] = js.native + var data: DetailedHTMLProps[DataHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native var datalist: DetailedHTMLProps[HTMLAttributes[HTMLDataListElement], HTMLDataListElement] = js.native var dd: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native var defs: SVGProps[SVGDefsElement] = js.native @@ -209,7 +201,7 @@ trait IntrinsicElements extends js.Object { var desc: SVGProps[SVGDescElement] = js.native var details: DetailedHTMLProps[DetailsHTMLAttributes[HTMLElement], HTMLElement] = js.native var dfn: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var dialog: DetailedHTMLProps[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement] = js.native + var dialog: DetailedHTMLProps[DialogHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native var div: DetailedHTMLProps[HTMLAttributes[HTMLDivElement], HTMLDivElement] = js.native var dl: DetailedHTMLProps[HTMLAttributes[HTMLDListElement], HTMLDListElement] = js.native var dt: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native @@ -224,7 +216,7 @@ trait IntrinsicElements extends js.Object { var feDiffuseLighting: SVGProps[SVGFEDiffuseLightingElement] = js.native var feDisplacementMap: SVGProps[SVGFEDisplacementMapElement] = js.native var feDistantLight: SVGProps[SVGFEDistantLightElement] = js.native - var feDropShadow: SVGProps[SVGFEDropShadowElement] = js.native + var feDropShadow: SVGProps[org.scalajs.dom.raw.Element] = js.native var feFlood: SVGProps[SVGFEFloodElement] = js.native var feFuncA: SVGProps[SVGFEFuncAElement] = js.native var feFuncB: SVGProps[SVGFEFuncBElement] = js.native @@ -246,7 +238,7 @@ trait IntrinsicElements extends js.Object { var figure: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native var filter: SVGProps[SVGFilterElement] = js.native var footer: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var foreignObject: SVGProps[SVGForeignObjectElement] = js.native + var foreignObject: SVGProps[org.scalajs.dom.raw.Element] = js.native var form: DetailedHTMLProps[FormHTMLAttributes[HTMLFormElement], HTMLFormElement] = js.native var g: SVGProps[SVGGElement] = js.native var h1: DetailedHTMLProps[HTMLAttributes[HTMLHeadingElement], HTMLHeadingElement] = js.native @@ -328,13 +320,13 @@ trait IntrinsicElements extends js.Object { var symbol: SVGProps[SVGSymbolElement] = js.native var table: DetailedHTMLProps[TableHTMLAttributes[HTMLTableElement], HTMLTableElement] = js.native var tbody: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native - var td: DetailedHTMLProps[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement] = js.native - var template: DetailedHTMLProps[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement] = js.native + var td: DetailedHTMLProps[TdHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native + var template: DetailedHTMLProps[HTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native var text: SVGProps[SVGTextElement] = js.native var textPath: SVGProps[SVGTextPathElement] = js.native var textarea: DetailedHTMLProps[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement] = js.native var tfoot: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native - var th: DetailedHTMLProps[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement] = js.native + var th: DetailedHTMLProps[ThHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native var thead: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement] = js.native var time: DetailedHTMLProps[TimeHTMLAttributes[HTMLElement], HTMLElement] = js.native var title: DetailedHTMLProps[HTMLAttributes[HTMLTitleElement], HTMLTitleElement] = js.native @@ -348,7 +340,7 @@ trait IntrinsicElements extends js.Object { var video: DetailedHTMLProps[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement] = js.native var view: SVGProps[SVGViewElement] = js.native var wbr: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement] = js.native - var webview: DetailedHTMLProps[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] = js.native + var webview: DetailedHTMLProps[WebViewHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] = js.native } object IntrinsicElements { @@ -381,7 +373,7 @@ object IntrinsicElements { code: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], col: DetailedHTMLProps[ColHTMLAttributes[HTMLTableColElement], HTMLTableColElement], colgroup: DetailedHTMLProps[ColgroupHTMLAttributes[HTMLTableColElement], HTMLTableColElement], - data: DetailedHTMLProps[DataHTMLAttributes[HTMLDataElement], HTMLDataElement], + data: DetailedHTMLProps[DataHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], datalist: DetailedHTMLProps[HTMLAttributes[HTMLDataListElement], HTMLDataListElement], dd: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], defs: SVGProps[SVGDefsElement], @@ -389,7 +381,7 @@ object IntrinsicElements { desc: SVGProps[SVGDescElement], details: DetailedHTMLProps[DetailsHTMLAttributes[HTMLElement], HTMLElement], dfn: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], - dialog: DetailedHTMLProps[DialogHTMLAttributes[HTMLDialogElement], HTMLDialogElement], + dialog: DetailedHTMLProps[DialogHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], div: DetailedHTMLProps[HTMLAttributes[HTMLDivElement], HTMLDivElement], dl: DetailedHTMLProps[HTMLAttributes[HTMLDListElement], HTMLDListElement], dt: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], @@ -404,7 +396,7 @@ object IntrinsicElements { feDiffuseLighting: SVGProps[SVGFEDiffuseLightingElement], feDisplacementMap: SVGProps[SVGFEDisplacementMapElement], feDistantLight: SVGProps[SVGFEDistantLightElement], - feDropShadow: SVGProps[SVGFEDropShadowElement], + feDropShadow: SVGProps[org.scalajs.dom.raw.Element], feFlood: SVGProps[SVGFEFloodElement], feFuncA: SVGProps[SVGFEFuncAElement], feFuncB: SVGProps[SVGFEFuncBElement], @@ -426,7 +418,7 @@ object IntrinsicElements { figure: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], filter: SVGProps[SVGFilterElement], footer: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], - foreignObject: SVGProps[SVGForeignObjectElement], + foreignObject: SVGProps[org.scalajs.dom.raw.Element], form: DetailedHTMLProps[FormHTMLAttributes[HTMLFormElement], HTMLFormElement], g: SVGProps[SVGGElement], h1: DetailedHTMLProps[HTMLAttributes[HTMLHeadingElement], HTMLHeadingElement], @@ -507,13 +499,13 @@ object IntrinsicElements { symbol: SVGProps[SVGSymbolElement], table: DetailedHTMLProps[TableHTMLAttributes[HTMLTableElement], HTMLTableElement], tbody: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - td: DetailedHTMLProps[TdHTMLAttributes[HTMLTableDataCellElement], HTMLTableDataCellElement], - template: DetailedHTMLProps[HTMLAttributes[HTMLTemplateElement], HTMLTemplateElement], + td: DetailedHTMLProps[TdHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], + template: DetailedHTMLProps[HTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], text: SVGProps[SVGTextElement], textPath: SVGProps[SVGTextPathElement], textarea: DetailedHTMLProps[TextareaHTMLAttributes[HTMLTextAreaElement], HTMLTextAreaElement], tfoot: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], - th: DetailedHTMLProps[ThHTMLAttributes[HTMLTableHeaderCellElement], HTMLTableHeaderCellElement], + th: DetailedHTMLProps[ThHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element], thead: DetailedHTMLProps[HTMLAttributes[HTMLTableSectionElement], HTMLTableSectionElement], time: DetailedHTMLProps[TimeHTMLAttributes[HTMLElement], HTMLElement], title: DetailedHTMLProps[HTMLAttributes[HTMLTitleElement], HTMLTitleElement], @@ -527,7 +519,7 @@ object IntrinsicElements { video: DetailedHTMLProps[VideoHTMLAttributes[HTMLVideoElement], HTMLVideoElement], view: SVGProps[SVGViewElement], wbr: DetailedHTMLProps[HTMLAttributes[HTMLElement], HTMLElement], - webview: DetailedHTMLProps[WebViewHTMLAttributes[HTMLWebViewElement], HTMLWebViewElement] + webview: DetailedHTMLProps[WebViewHTMLAttributes[org.scalajs.dom.raw.Element], org.scalajs.dom.raw.Element] ): IntrinsicElements = { val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], animate = animate.asInstanceOf[js.Any], animateMotion = animateMotion.asInstanceOf[js.Any], animateTransform = animateTransform.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], big = big.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], caption = caption.asInstanceOf[js.Any], circle = circle.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], clipPath = clipPath.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], defs = defs.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], desc = desc.asInstanceOf[js.Any], details = details.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], ellipse = ellipse.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], feBlend = feBlend.asInstanceOf[js.Any], feColorMatrix = feColorMatrix.asInstanceOf[js.Any], feComponentTransfer = feComponentTransfer.asInstanceOf[js.Any], feComposite = feComposite.asInstanceOf[js.Any], feConvolveMatrix = feConvolveMatrix.asInstanceOf[js.Any], feDiffuseLighting = feDiffuseLighting.asInstanceOf[js.Any], feDisplacementMap = feDisplacementMap.asInstanceOf[js.Any], feDistantLight = feDistantLight.asInstanceOf[js.Any], feDropShadow = feDropShadow.asInstanceOf[js.Any], feFlood = feFlood.asInstanceOf[js.Any], feFuncA = feFuncA.asInstanceOf[js.Any], feFuncB = feFuncB.asInstanceOf[js.Any], feFuncG = feFuncG.asInstanceOf[js.Any], feFuncR = feFuncR.asInstanceOf[js.Any], feGaussianBlur = feGaussianBlur.asInstanceOf[js.Any], feImage = feImage.asInstanceOf[js.Any], feMerge = feMerge.asInstanceOf[js.Any], feMergeNode = feMergeNode.asInstanceOf[js.Any], feMorphology = feMorphology.asInstanceOf[js.Any], feOffset = feOffset.asInstanceOf[js.Any], fePointLight = fePointLight.asInstanceOf[js.Any], feSpecularLighting = feSpecularLighting.asInstanceOf[js.Any], feSpotLight = feSpotLight.asInstanceOf[js.Any], feTile = feTile.asInstanceOf[js.Any], feTurbulence = feTurbulence.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], filter = filter.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], foreignObject = foreignObject.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], g = g.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], image = image.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], keygen = keygen.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], line = line.asInstanceOf[js.Any], linearGradient = linearGradient.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], marker = marker.asInstanceOf[js.Any], mask = mask.asInstanceOf[js.Any], menu = menu.asInstanceOf[js.Any], menuitem = menuitem.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], metadata = metadata.asInstanceOf[js.Any], meter = meter.asInstanceOf[js.Any], mpath = mpath.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noindex = noindex.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], output = output.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], path = path.asInstanceOf[js.Any], pattern = pattern.asInstanceOf[js.Any], picture = picture.asInstanceOf[js.Any], polygon = polygon.asInstanceOf[js.Any], polyline = polyline.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], radialGradient = radialGradient.asInstanceOf[js.Any], rect = rect.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], stop = stop.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], svg = svg.asInstanceOf[js.Any], switch = switch.asInstanceOf[js.Any], symbol = symbol.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], text = text.asInstanceOf[js.Any], textPath = textPath.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], time = time.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], tspan = tspan.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], use = use.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], view = view.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any], webview = webview.asInstanceOf[js.Any]) __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt index 7b29768f3a..bbef86074d 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "semantic-ui-react" -version := "0.0-unknown-ddb9b3" +version := "0.0-unknown-a862fb" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "16.9.2-acd257", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "react" % "16.9.2-33376e", + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Accordion.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Accordion.scala index 10053d354d..aca8c75b7d 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Accordion.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Accordion.scala @@ -6,7 +6,7 @@ import slinky.core.BuildingComponent import slinky.core.ExternalComponentWithAttributesWithRefType import slinky.core.TagMod import slinky.web.SyntheticMouseEvent -import slinky.web.html.`*`.tag +import slinky.web.html.div.tag import typingsSlinky.semanticUiReact.accordionAccordionMod.AccordionProps import typingsSlinky.semanticUiReact.accordionMod.default import typingsSlinky.semanticUiReact.accordionPanelMod.AccordionPanelProps @@ -49,7 +49,7 @@ object Accordion if (_overrides != null) js.Dynamic.global.Object.assign(__obj, _overrides) super.apply(__obj.asInstanceOf[Props]) } - def apply(mods: TagMod[tag.type]*): BuildingComponent[tag.type, default] = new slinky.core.BuildingComponent[slinky.web.html.`*`.tag.type, typingsSlinky.semanticUiReact.accordionMod.default](js.Array(component.asInstanceOf[js.Any], js.Dictionary.empty)).apply(mods: _*) + def apply(mods: TagMod[tag.type]*): BuildingComponent[tag.type, default] = new slinky.core.BuildingComponent[slinky.web.html.div.tag.type, typingsSlinky.semanticUiReact.accordionMod.default](js.Array(component.asInstanceOf[js.Any], js.Dictionary.empty)).apply(mods: _*) type Props = AccordionProps } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionAccordion.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionAccordion.scala index 3913d7875d..420e416ac9 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionAccordion.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionAccordion.scala @@ -6,7 +6,7 @@ import slinky.core.BuildingComponent import slinky.core.ExternalComponentWithAttributesWithRefType import slinky.core.TagMod import slinky.web.SyntheticMouseEvent -import slinky.web.html.`*`.tag +import slinky.web.html.div.tag import typingsSlinky.semanticUiReact.accordionAccordionAccordionMod.AccordionAccordionProps import typingsSlinky.semanticUiReact.accordionAccordionAccordionMod.default import typingsSlinky.semanticUiReact.accordionPanelMod.AccordionPanelProps @@ -44,7 +44,7 @@ object AccordionAccordion super.apply(__obj.asInstanceOf[Props]) } def apply(mods: TagMod[tag.type]*): BuildingComponent[tag.type, default] = new slinky.core.BuildingComponent[ - slinky.web.html.`*`.tag.type, + slinky.web.html.div.tag.type, typingsSlinky.semanticUiReact.accordionAccordionAccordionMod.default](js.Array(component.asInstanceOf[js.Any], js.Dictionary.empty)).apply(mods: _*) type Props = AccordionAccordionProps } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionPanel.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionPanel.scala index 7b89ad62b2..99301511f4 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionPanel.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionPanel.scala @@ -6,7 +6,7 @@ import slinky.core.BuildingComponent import slinky.core.ExternalComponentWithAttributesWithRefType import slinky.core.TagMod import slinky.web.SyntheticMouseEvent -import slinky.web.html.`*`.tag +import slinky.web.html.div.tag import typingsSlinky.semanticUiReact.accordionContentMod.AccordionContentProps import typingsSlinky.semanticUiReact.accordionPanelMod.AccordionPanelProps import typingsSlinky.semanticUiReact.accordionPanelMod.default @@ -41,7 +41,7 @@ object AccordionPanel super.apply(__obj.asInstanceOf[Props]) } def apply(mods: TagMod[tag.type]*): BuildingComponent[tag.type, default] = new slinky.core.BuildingComponent[ - slinky.web.html.`*`.tag.type, + slinky.web.html.div.tag.type, typingsSlinky.semanticUiReact.accordionPanelMod.default](js.Array(component.asInstanceOf[js.Any], js.Dictionary.empty)).apply(mods: _*) type Props = AccordionPanelProps } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionTitle.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionTitle.scala index bcc40353b0..e0c16ce892 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionTitle.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionTitle.scala @@ -6,7 +6,7 @@ import slinky.core.BuildingComponent import slinky.core.ExternalComponentWithAttributesWithRefType import slinky.core.TagMod import slinky.web.SyntheticMouseEvent -import slinky.web.html.`*`.tag +import slinky.web.html.div.tag import typingsSlinky.semanticUiReact.accordionTitleMod.AccordionTitleProps import typingsSlinky.semanticUiReact.accordionTitleMod.default import typingsSlinky.semanticUiReact.genericMod.SemanticShorthandContent @@ -45,7 +45,7 @@ object AccordionTitle super.apply(__obj.asInstanceOf[Props]) } def apply(mods: TagMod[tag.type]*): BuildingComponent[tag.type, default] = new slinky.core.BuildingComponent[ - slinky.web.html.`*`.tag.type, + slinky.web.html.div.tag.type, typingsSlinky.semanticUiReact.accordionTitleMod.default](js.Array(component.asInstanceOf[js.Any], js.Dictionary.empty)).apply(mods: _*) type Props = AccordionTitleProps } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Button.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Button.scala index da00ea7f0f..9ed2f7a26b 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Button.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Button.scala @@ -10,7 +10,6 @@ import slinky.core.SyntheticEvent import slinky.core.TagMod import slinky.web.SyntheticMouseEvent import slinky.web.html.button.tag -import typingsSlinky.react.mod.CSSProperties import typingsSlinky.react.reactStrings.`additions text` import typingsSlinky.react.reactStrings.`inline` import typingsSlinky.react.reactStrings.additions @@ -18,7 +17,6 @@ import typingsSlinky.react.reactStrings.all import typingsSlinky.react.reactStrings.ascending import typingsSlinky.react.reactStrings.assertive import typingsSlinky.react.reactStrings.both -import typingsSlinky.react.reactStrings.button import typingsSlinky.react.reactStrings.copy import typingsSlinky.react.reactStrings.date import typingsSlinky.react.reactStrings.descending @@ -42,10 +40,8 @@ import typingsSlinky.react.reactStrings.page import typingsSlinky.react.reactStrings.polite import typingsSlinky.react.reactStrings.popup import typingsSlinky.react.reactStrings.removals -import typingsSlinky.react.reactStrings.reset import typingsSlinky.react.reactStrings.spelling import typingsSlinky.react.reactStrings.step -import typingsSlinky.react.reactStrings.submit import typingsSlinky.react.reactStrings.text import typingsSlinky.react.reactStrings.time import typingsSlinky.react.reactStrings.tree @@ -80,7 +76,7 @@ object Button object componentImport extends js.Object override val component: String | js.Object = this.componentImport - /* The following DOM/SVG props were specified: autoFocus, className, contentEditable, dangerouslySetInnerHTML, defaultChecked, defaultValue, dir, disabled, draggable, hidden, id, lang, name, onAbort, onAnimationEnd, onAnimationIteration, onAnimationStart, onBlur, onCanPlay, onCanPlayThrough, onChange, onCompositionEnd, onCompositionStart, onCompositionUpdate, onContextMenu, onCopy, onCut, onDoubleClick, onDrag, onDragEnd, onDragEnter, onDragExit, onDragLeave, onDragOver, onDragStart, onDrop, onDurationChange, onEmptied, onEncrypted, onEnded, onError, onFocus, onInput, onInvalid, onKeyDown, onKeyPress, onKeyUp, onLoad, onLoadStart, onLoadedData, onLoadedMetadata, onMouseDown, onMouseEnter, onMouseLeave, onMouseMove, onMouseOut, onMouseOver, onMouseUp, onPaste, onPause, onPlay, onPlaying, onPointerCancel, onPointerDown, onPointerEnter, onPointerLeave, onPointerMove, onPointerOut, onPointerOver, onPointerUp, onProgress, onRateChange, onScroll, onSeeked, onSeeking, onSelect, onStalled, onSubmit, onSuspend, onTimeUpdate, onTouchCancel, onTouchEnd, onTouchMove, onTouchStart, onTransitionEnd, onVolumeChange, onWaiting, onWheel, placeholder, spellCheck, suppressContentEditableWarning, value */ + /* The following DOM/SVG props were specified: className, contentEditable, dangerouslySetInnerHTML, dir, disabled, draggable, form, hidden, id, lang, name, onAbort, onAnimationEnd, onAnimationIteration, onAnimationStart, onBlur, onCanPlay, onCanPlayThrough, onChange, onCompositionEnd, onCompositionStart, onCompositionUpdate, onContextMenu, onCopy, onCut, onDoubleClick, onDrag, onDragEnd, onDragEnter, onDragExit, onDragLeave, onDragOver, onDragStart, onDrop, onDurationChange, onEmptied, onEncrypted, onEnded, onError, onFocus, onInput, onInvalid, onKeyDown, onKeyPress, onKeyUp, onLoad, onLoadStart, onLoadedData, onLoadedMetadata, onMouseDown, onMouseEnter, onMouseLeave, onMouseMove, onMouseOut, onMouseOver, onMouseUp, onPaste, onPause, onPlay, onPlaying, onPointerCancel, onPointerDown, onPointerEnter, onPointerLeave, onPointerMove, onPointerOut, onPointerOver, onPointerUp, onProgress, onRateChange, onScroll, onSeeked, onSeeking, onSelect, onStalled, onSubmit, onSuspend, onTimeUpdate, onTouchCancel, onTouchEnd, onTouchMove, onTouchStart, onTransitionEnd, onVolumeChange, onWaiting, onWheel, spellCheck, style, suppressContentEditableWarning, title, type, value */ def apply( about: String = null, accessKey: String = null, @@ -138,6 +134,7 @@ object Button attached: Boolean | left | right | top | bottom = null, autoCapitalize: String = null, autoCorrect: String = null, + autoFocus: js.UndefOr[Boolean] = js.undefined, autoSave: String = null, basic: js.UndefOr[Boolean] = js.undefined, circular: js.UndefOr[Boolean] = js.undefined, @@ -146,9 +143,10 @@ object Button content: SemanticShorthandContent = null, contextMenu: String = null, datatype: String = null, + defaultChecked: js.UndefOr[Boolean] = js.undefined, + defaultValue: String | js.Array[String] = null, floated: SemanticFLOATS = null, fluid: js.UndefOr[Boolean] = js.undefined, - form: String = null, formAction: String = null, formEncType: String = null, formMethod: String = null, @@ -176,6 +174,7 @@ object Button onBeforeInput: SyntheticEvent[EventTarget with HTMLButtonElement, Event] => Unit = null, onClick: (/* event */ SyntheticMouseEvent[HTMLButtonElement], /* data */ ButtonProps) => Unit = null, onReset: SyntheticEvent[EventTarget with HTMLButtonElement, Event] => Unit = null, + placeholder: String = null, positive: js.UndefOr[Boolean] = js.undefined, prefix: String = null, primary: js.UndefOr[Boolean] = js.undefined, @@ -188,12 +187,9 @@ object Button security: String = null, size: SemanticSIZES = null, slot: String = null, - style: CSSProperties = null, suppressHydrationWarning: js.UndefOr[Boolean] = js.undefined, tabIndex: Double | String = null, - title: String = null, toggle: js.UndefOr[Boolean] = js.undefined, - `type`: submit | reset | button = null, typeof: String = null, unselectable: on | off = null, vocab: String = null, @@ -256,6 +252,7 @@ object Button if (attached != null) __obj.updateDynamic("attached")(attached.asInstanceOf[js.Any]) if (autoCapitalize != null) __obj.updateDynamic("autoCapitalize")(autoCapitalize.asInstanceOf[js.Any]) if (autoCorrect != null) __obj.updateDynamic("autoCorrect")(autoCorrect.asInstanceOf[js.Any]) + if (!js.isUndefined(autoFocus)) __obj.updateDynamic("autoFocus")(autoFocus.asInstanceOf[js.Any]) if (autoSave != null) __obj.updateDynamic("autoSave")(autoSave.asInstanceOf[js.Any]) if (!js.isUndefined(basic)) __obj.updateDynamic("basic")(basic.asInstanceOf[js.Any]) if (!js.isUndefined(circular)) __obj.updateDynamic("circular")(circular.asInstanceOf[js.Any]) @@ -264,9 +261,10 @@ object Button if (content != null) __obj.updateDynamic("content")(content.asInstanceOf[js.Any]) if (contextMenu != null) __obj.updateDynamic("contextMenu")(contextMenu.asInstanceOf[js.Any]) if (datatype != null) __obj.updateDynamic("datatype")(datatype.asInstanceOf[js.Any]) + if (!js.isUndefined(defaultChecked)) __obj.updateDynamic("defaultChecked")(defaultChecked.asInstanceOf[js.Any]) + if (defaultValue != null) __obj.updateDynamic("defaultValue")(defaultValue.asInstanceOf[js.Any]) if (floated != null) __obj.updateDynamic("floated")(floated.asInstanceOf[js.Any]) if (!js.isUndefined(fluid)) __obj.updateDynamic("fluid")(fluid.asInstanceOf[js.Any]) - if (form != null) __obj.updateDynamic("form")(form.asInstanceOf[js.Any]) if (formAction != null) __obj.updateDynamic("formAction")(formAction.asInstanceOf[js.Any]) if (formEncType != null) __obj.updateDynamic("formEncType")(formEncType.asInstanceOf[js.Any]) if (formMethod != null) __obj.updateDynamic("formMethod")(formMethod.asInstanceOf[js.Any]) @@ -290,6 +288,7 @@ object Button if (onBeforeInput != null) __obj.updateDynamic("onBeforeInput")(js.Any.fromFunction1(onBeforeInput)) if (onClick != null) __obj.updateDynamic("onClick")(js.Any.fromFunction2(onClick)) if (onReset != null) __obj.updateDynamic("onReset")(js.Any.fromFunction1(onReset)) + if (placeholder != null) __obj.updateDynamic("placeholder")(placeholder.asInstanceOf[js.Any]) if (!js.isUndefined(positive)) __obj.updateDynamic("positive")(positive.asInstanceOf[js.Any]) if (prefix != null) __obj.updateDynamic("prefix")(prefix.asInstanceOf[js.Any]) if (!js.isUndefined(primary)) __obj.updateDynamic("primary")(primary.asInstanceOf[js.Any]) @@ -302,12 +301,9 @@ object Button if (security != null) __obj.updateDynamic("security")(security.asInstanceOf[js.Any]) if (size != null) __obj.updateDynamic("size")(size.asInstanceOf[js.Any]) if (slot != null) __obj.updateDynamic("slot")(slot.asInstanceOf[js.Any]) - if (style != null) __obj.updateDynamic("style")(style.asInstanceOf[js.Any]) if (!js.isUndefined(suppressHydrationWarning)) __obj.updateDynamic("suppressHydrationWarning")(suppressHydrationWarning.asInstanceOf[js.Any]) if (tabIndex != null) __obj.updateDynamic("tabIndex")(tabIndex.asInstanceOf[js.Any]) - if (title != null) __obj.updateDynamic("title")(title.asInstanceOf[js.Any]) if (!js.isUndefined(toggle)) __obj.updateDynamic("toggle")(toggle.asInstanceOf[js.Any]) - if (`type` != null) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) if (typeof != null) __obj.updateDynamic("typeof")(typeof.asInstanceOf[js.Any]) if (unselectable != null) __obj.updateDynamic("unselectable")(unselectable.asInstanceOf[js.Any]) if (vocab != null) __obj.updateDynamic("vocab")(vocab.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Input.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Input.scala index 65b4e2fc09..6b4b6b7eb2 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Input.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Input.scala @@ -10,7 +10,6 @@ import slinky.core.SyntheticEvent import slinky.core.TagMod import slinky.web.SyntheticMouseEvent import slinky.web.html.input.tag -import typingsSlinky.react.mod.CSSProperties import typingsSlinky.react.mod.ChangeEvent import typingsSlinky.react.reactStrings.`additions text` import typingsSlinky.react.reactStrings.`inline` @@ -74,12 +73,13 @@ object Input object componentImport extends js.Object override val component: String | js.Object = this.componentImport - /* The following DOM/SVG props were specified: accept, alt, autoComplete, autoFocus, capture, checked, className, contentEditable, dangerouslySetInnerHTML, defaultChecked, defaultValue, dir, disabled, draggable, height, hidden, id, lang, list, max, min, multiple, name, onAbort, onAnimationEnd, onAnimationIteration, onAnimationStart, onBlur, onCanPlay, onCanPlayThrough, onClick, onCompositionEnd, onCompositionStart, onCompositionUpdate, onContextMenu, onCopy, onCut, onDoubleClick, onDrag, onDragEnd, onDragEnter, onDragExit, onDragLeave, onDragOver, onDragStart, onDrop, onDurationChange, onEmptied, onEncrypted, onEnded, onError, onFocus, onInput, onInvalid, onKeyDown, onKeyPress, onKeyUp, onLoad, onLoadStart, onLoadedData, onLoadedMetadata, onMouseDown, onMouseEnter, onMouseLeave, onMouseMove, onMouseOut, onMouseOver, onMouseUp, onPaste, onPause, onPlay, onPlaying, onPointerCancel, onPointerDown, onPointerEnter, onPointerLeave, onPointerMove, onPointerOut, onPointerOver, onPointerUp, onProgress, onRateChange, onScroll, onSeeked, onSeeking, onSelect, onStalled, onSubmit, onSuspend, onTimeUpdate, onTouchCancel, onTouchEnd, onTouchMove, onTouchStart, onTransitionEnd, onVolumeChange, onWaiting, onWheel, pattern, placeholder, readOnly, required, spellCheck, src, step, suppressContentEditableWarning, type, value, width */ + /* The following DOM/SVG props were specified: accept, autoComplete, autoFocus, capture, checked, className, contentEditable, dangerouslySetInnerHTML, defaultChecked, defaultValue, dir, disabled, draggable, form, height, hidden, id, lang, list, max, min, multiple, name, onAbort, onAnimationEnd, onAnimationIteration, onAnimationStart, onBlur, onCanPlay, onCanPlayThrough, onClick, onCompositionEnd, onCompositionStart, onCompositionUpdate, onContextMenu, onCopy, onCut, onDoubleClick, onDrag, onDragEnd, onDragEnter, onDragExit, onDragLeave, onDragOver, onDragStart, onDrop, onDurationChange, onEmptied, onEncrypted, onEnded, onError, onFocus, onInput, onInvalid, onKeyDown, onKeyPress, onKeyUp, onLoad, onLoadStart, onLoadedData, onLoadedMetadata, onMouseDown, onMouseEnter, onMouseLeave, onMouseMove, onMouseOut, onMouseOver, onMouseUp, onPaste, onPause, onPlay, onPlaying, onPointerCancel, onPointerDown, onPointerEnter, onPointerLeave, onPointerMove, onPointerOut, onPointerOver, onPointerUp, onProgress, onRateChange, onScroll, onSeeked, onSeeking, onSelect, onStalled, onSubmit, onSuspend, onTimeUpdate, onTouchCancel, onTouchEnd, onTouchMove, onTouchStart, onTransitionEnd, onVolumeChange, onWaiting, onWheel, pattern, placeholder, readOnly, required, spellCheck, src, step, style, suppressContentEditableWarning, title, type, value, width */ def apply( about: String = null, accessKey: String = null, action: js.Any | Boolean = null, actionPosition: left = null, + alt: String = null, `aria-activedescendant`: String = null, `aria-atomic`: js.UndefOr[Boolean] = js.undefined, `aria-autocomplete`: none | `inline` | list | both = null, @@ -139,7 +139,6 @@ object Input error: js.UndefOr[Boolean] = js.undefined, fluid: js.UndefOr[Boolean] = js.undefined, focus: js.UndefOr[Boolean] = js.undefined, - form: String = null, formAction: String = null, formEncType: String = null, formMethod: String = null, @@ -177,10 +176,8 @@ object Input security: String = null, size: mini | small | large | big | huge | massive = null, slot: String = null, - style: CSSProperties = null, suppressHydrationWarning: js.UndefOr[Boolean] = js.undefined, tabIndex: Double | String = null, - title: String = null, transparent: js.UndefOr[Boolean] = js.undefined, typeof: String = null, unselectable: on | off = null, @@ -192,6 +189,7 @@ object Input if (accessKey != null) __obj.updateDynamic("accessKey")(accessKey.asInstanceOf[js.Any]) if (action != null) __obj.updateDynamic("action")(action.asInstanceOf[js.Any]) if (actionPosition != null) __obj.updateDynamic("actionPosition")(actionPosition.asInstanceOf[js.Any]) + if (alt != null) __obj.updateDynamic("alt")(alt.asInstanceOf[js.Any]) if (`aria-activedescendant` != null) __obj.updateDynamic("aria-activedescendant")(`aria-activedescendant`.asInstanceOf[js.Any]) if (!js.isUndefined(`aria-atomic`)) __obj.updateDynamic("aria-atomic")(`aria-atomic`.asInstanceOf[js.Any]) if (`aria-autocomplete` != null) __obj.updateDynamic("aria-autocomplete")(`aria-autocomplete`.asInstanceOf[js.Any]) @@ -251,7 +249,6 @@ object Input if (!js.isUndefined(error)) __obj.updateDynamic("error")(error.asInstanceOf[js.Any]) if (!js.isUndefined(fluid)) __obj.updateDynamic("fluid")(fluid.asInstanceOf[js.Any]) if (!js.isUndefined(focus)) __obj.updateDynamic("focus")(focus.asInstanceOf[js.Any]) - if (form != null) __obj.updateDynamic("form")(form.asInstanceOf[js.Any]) if (formAction != null) __obj.updateDynamic("formAction")(formAction.asInstanceOf[js.Any]) if (formEncType != null) __obj.updateDynamic("formEncType")(formEncType.asInstanceOf[js.Any]) if (formMethod != null) __obj.updateDynamic("formMethod")(formMethod.asInstanceOf[js.Any]) @@ -287,10 +284,8 @@ object Input if (security != null) __obj.updateDynamic("security")(security.asInstanceOf[js.Any]) if (size != null) __obj.updateDynamic("size")(size.asInstanceOf[js.Any]) if (slot != null) __obj.updateDynamic("slot")(slot.asInstanceOf[js.Any]) - if (style != null) __obj.updateDynamic("style")(style.asInstanceOf[js.Any]) if (!js.isUndefined(suppressHydrationWarning)) __obj.updateDynamic("suppressHydrationWarning")(suppressHydrationWarning.asInstanceOf[js.Any]) if (tabIndex != null) __obj.updateDynamic("tabIndex")(tabIndex.asInstanceOf[js.Any]) - if (title != null) __obj.updateDynamic("title")(title.asInstanceOf[js.Any]) if (!js.isUndefined(transparent)) __obj.updateDynamic("transparent")(transparent.asInstanceOf[js.Any]) if (typeof != null) __obj.updateDynamic("typeof")(typeof.asInstanceOf[js.Any]) if (unselectable != null) __obj.updateDynamic("unselectable")(unselectable.asInstanceOf[js.Any]) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt index bdd8304e13..fe65f66b67 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-event-listener" -version := "0.38.0-e9fad7" +version := "0.38.0-e49227" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "16.9.2-acd257", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "react" % "16.9.2-33376e", + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/AnonCaptureListener.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/AnonListener.scala similarity index 87% rename from importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/AnonCaptureListener.scala rename to importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/AnonListener.scala index 5805f95207..e42ce713c1 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/AnonCaptureListener.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/AnonListener.scala @@ -5,27 +5,27 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonCaptureListener extends js.Object { +trait AnonListener extends js.Object { var capture: js.UndefOr[scala.Nothing] = js.native var listener: js.UndefOr[scala.Nothing] = js.native var targetRef: js.UndefOr[scala.Nothing] = js.native var `type`: js.UndefOr[scala.Nothing] = js.native } -object AnonCaptureListener { +object AnonListener { @scala.inline def apply( capture: js.UndefOr[scala.Nothing] = js.undefined, listener: js.UndefOr[scala.Nothing] = js.undefined, targetRef: js.UndefOr[scala.Nothing] = js.undefined, `type`: js.UndefOr[scala.Nothing] = js.undefined - ): AnonCaptureListener = { + ): AnonListener = { val __obj = js.Dynamic.literal() if (!js.isUndefined(capture)) __obj.updateDynamic("capture")(capture.asInstanceOf[js.Any]) if (!js.isUndefined(listener)) __obj.updateDynamic("listener")(listener.asInstanceOf[js.Any]) if (!js.isUndefined(targetRef)) __obj.updateDynamic("targetRef")(targetRef.asInstanceOf[js.Any]) if (!js.isUndefined(`type`)) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonCaptureListener] + __obj.asInstanceOf[AnonListener] } } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/eventListenerMod.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/eventListenerMod.scala index c552a0a6ad..ce6c0d979c 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/eventListenerMod.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/eventListenerMod.scala @@ -12,7 +12,7 @@ object eventListenerMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonCapture | AnonCaptureListener = js.native + var propTypes: AnonCapture | AnonListener = js.native def apply[T /* <: EventTypes */](props: EventListenerOptions[T]): js.Any = js.native @js.native object defaultProps extends js.Object { diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/mod.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/mod.scala index 8be36550e5..36317ca082 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/mod.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/src/main/scala/typingsSlinky/stardustUiReactComponentEventListener/mod.scala @@ -20,7 +20,7 @@ object mod extends js.Object { @js.native object EventListener extends js.Object { var displayName: String = js.native - var propTypes: AnonCapture | AnonCaptureListener = js.native + var propTypes: AnonCapture | AnonListener = js.native def apply[T /* <: EventTypes */](props: EventListenerOptions[T]): js.Any = js.native @js.native object defaultProps extends js.Object { diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt index 305b065891..48da8116aa 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-ref" -version := "0.38.0-61aaf8" +version := "0.38.0-a02e23" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "16.9.2-acd257", - "org.scalablytyped" %%% "std" % "0.0-unknown-de926c") + "org.scalablytyped" %%% "react" % "16.9.2-33376e", + "org.scalablytyped" %%% "std" % "0.0-unknown-da34c0") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/AnonChildrenInnerRef.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/AnonInnerRef.scala similarity index 80% rename from importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/AnonChildrenInnerRef.scala rename to importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/AnonInnerRef.scala index 343bc7b69f..0e8d104230 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/AnonChildrenInnerRef.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/AnonInnerRef.scala @@ -5,21 +5,21 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonChildrenInnerRef extends js.Object { +trait AnonInnerRef extends js.Object { var children: js.UndefOr[scala.Nothing] = js.native var innerRef: js.UndefOr[scala.Nothing] = js.native } -object AnonChildrenInnerRef { +object AnonInnerRef { @scala.inline def apply( children: js.UndefOr[scala.Nothing] = js.undefined, innerRef: js.UndefOr[scala.Nothing] = js.undefined - ): AnonChildrenInnerRef = { + ): AnonInnerRef = { val __obj = js.Dynamic.literal() if (!js.isUndefined(children)) __obj.updateDynamic("children")(children.asInstanceOf[js.Any]) if (!js.isUndefined(innerRef)) __obj.updateDynamic("innerRef")(innerRef.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonChildrenInnerRef] + __obj.asInstanceOf[AnonInnerRef] } } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/mod.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/mod.scala index 2feb6224f6..d27da1ac5d 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/mod.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/mod.scala @@ -35,14 +35,14 @@ object mod extends js.Object { @js.native object RefFindNode extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } /* static members */ @js.native object RefForward extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/refFindNodeMod.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/refFindNodeMod.scala index 69612af308..f2c5b96bde 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/refFindNodeMod.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/refFindNodeMod.scala @@ -28,7 +28,7 @@ object refFindNodeMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/refForwardMod.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/refForwardMod.scala index 5555f13e81..d43a20a8cf 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/refForwardMod.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/src/main/scala/typingsSlinky/stardustUiReactComponentRef/refForwardMod.scala @@ -23,7 +23,7 @@ object refForwardMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/std/build.sbt b/importer/src/test/resources/react-integration-test/check-slinky/s/std/build.sbt index 3388279c81..d592f9bbd8 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/std/build.sbt +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-de926c" +version := "0.0-unknown-da34c0" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..07a525749f --- /dev/null +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala @@ -0,0 +1,229 @@ +package typingsSlinky.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: org.scalajs.dom.raw.HTMLAnchorElement = js.native + var abbr: org.scalajs.dom.raw.HTMLElement = js.native + var address: org.scalajs.dom.raw.HTMLElement = js.native + var area: org.scalajs.dom.raw.HTMLAreaElement = js.native + var article: org.scalajs.dom.raw.HTMLElement = js.native + var aside: org.scalajs.dom.raw.HTMLElement = js.native + var audio: org.scalajs.dom.raw.HTMLAudioElement = js.native + var b: org.scalajs.dom.raw.HTMLElement = js.native + var base: org.scalajs.dom.raw.HTMLBaseElement = js.native + var bdi: org.scalajs.dom.raw.HTMLElement = js.native + var bdo: org.scalajs.dom.raw.HTMLElement = js.native + var blockquote: org.scalajs.dom.raw.HTMLQuoteElement = js.native + var body: org.scalajs.dom.raw.HTMLBodyElement = js.native + var br: org.scalajs.dom.raw.HTMLBRElement = js.native + var button: org.scalajs.dom.raw.HTMLButtonElement = js.native + var canvas: org.scalajs.dom.raw.HTMLCanvasElement = js.native + var cite: org.scalajs.dom.raw.HTMLElement = js.native + var code: org.scalajs.dom.raw.HTMLElement = js.native + var col: org.scalajs.dom.raw.HTMLTableColElement = js.native + var colgroup: org.scalajs.dom.raw.HTMLTableColElement = js.native + var data: org.scalajs.dom.raw.Element = js.native + var datalist: org.scalajs.dom.raw.HTMLDataListElement = js.native + var dd: org.scalajs.dom.raw.HTMLElement = js.native + var del: org.scalajs.dom.raw.HTMLModElement = js.native + var dfn: org.scalajs.dom.raw.HTMLElement = js.native + var dialog: org.scalajs.dom.raw.Element = js.native + var div: org.scalajs.dom.raw.HTMLDivElement = js.native + var dl: org.scalajs.dom.raw.HTMLDListElement = js.native + var dt: org.scalajs.dom.raw.HTMLElement = js.native + var em: org.scalajs.dom.raw.HTMLElement = js.native + var embed: org.scalajs.dom.raw.HTMLEmbedElement = js.native + var fieldset: org.scalajs.dom.raw.HTMLFieldSetElement = js.native + var figcaption: org.scalajs.dom.raw.HTMLElement = js.native + var figure: org.scalajs.dom.raw.HTMLElement = js.native + var footer: org.scalajs.dom.raw.HTMLElement = js.native + var form: org.scalajs.dom.raw.HTMLFormElement = js.native + var h1: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h2: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h3: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h4: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h5: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var h6: org.scalajs.dom.raw.HTMLHeadingElement = js.native + var head: org.scalajs.dom.raw.HTMLHeadElement = js.native + var header: org.scalajs.dom.raw.HTMLElement = js.native + var hgroup: org.scalajs.dom.raw.HTMLElement = js.native + var hr: org.scalajs.dom.raw.HTMLHRElement = js.native + var html: org.scalajs.dom.raw.HTMLHtmlElement = js.native + var i: org.scalajs.dom.raw.HTMLElement = js.native + var iframe: org.scalajs.dom.raw.HTMLIFrameElement = js.native + var img: org.scalajs.dom.raw.HTMLImageElement = js.native + var input: org.scalajs.dom.raw.HTMLInputElement = js.native + var ins: org.scalajs.dom.raw.HTMLModElement = js.native + var kbd: org.scalajs.dom.raw.HTMLElement = js.native + var label: org.scalajs.dom.raw.HTMLLabelElement = js.native + var legend: org.scalajs.dom.raw.HTMLLegendElement = js.native + var li: org.scalajs.dom.raw.HTMLLIElement = js.native + var link: org.scalajs.dom.raw.HTMLLinkElement = js.native + var main: org.scalajs.dom.raw.HTMLElement = js.native + var map: org.scalajs.dom.raw.HTMLMapElement = js.native + var mark: org.scalajs.dom.raw.HTMLElement = js.native + var meta: org.scalajs.dom.raw.HTMLMetaElement = js.native + var nav: org.scalajs.dom.raw.HTMLElement = js.native + var noscript: org.scalajs.dom.raw.HTMLElement = js.native + var `object`: org.scalajs.dom.raw.HTMLObjectElement = js.native + var ol: org.scalajs.dom.raw.HTMLOListElement = js.native + var optgroup: org.scalajs.dom.raw.HTMLOptGroupElement = js.native + var option: org.scalajs.dom.raw.HTMLOptionElement = js.native + var p: org.scalajs.dom.raw.HTMLParagraphElement = js.native + var param: org.scalajs.dom.raw.HTMLParamElement = js.native + var pre: org.scalajs.dom.raw.HTMLPreElement = js.native + var progress: org.scalajs.dom.raw.HTMLProgressElement = js.native + var q: org.scalajs.dom.raw.HTMLQuoteElement = js.native + var rp: org.scalajs.dom.raw.HTMLElement = js.native + var rt: org.scalajs.dom.raw.HTMLElement = js.native + var ruby: org.scalajs.dom.raw.HTMLElement = js.native + var s: org.scalajs.dom.raw.HTMLElement = js.native + var samp: org.scalajs.dom.raw.HTMLElement = js.native + var script: org.scalajs.dom.raw.HTMLScriptElement = js.native + var section: org.scalajs.dom.raw.HTMLElement = js.native + var select: org.scalajs.dom.raw.HTMLSelectElement = js.native + var small: org.scalajs.dom.raw.HTMLElement = js.native + var source: org.scalajs.dom.raw.HTMLSourceElement = js.native + var span: org.scalajs.dom.raw.HTMLSpanElement = js.native + var strong: org.scalajs.dom.raw.HTMLElement = js.native + var style: org.scalajs.dom.raw.HTMLStyleElement = js.native + var sub: org.scalajs.dom.raw.HTMLElement = js.native + var summary: org.scalajs.dom.raw.HTMLElement = js.native + var sup: org.scalajs.dom.raw.HTMLElement = js.native + var table: org.scalajs.dom.raw.HTMLTableElement = js.native + var tbody: org.scalajs.dom.raw.HTMLTableSectionElement = js.native + var td: org.scalajs.dom.raw.Element = js.native + var template: org.scalajs.dom.raw.Element = js.native + var textarea: org.scalajs.dom.raw.HTMLTextAreaElement = js.native + var tfoot: org.scalajs.dom.raw.HTMLTableSectionElement = js.native + var th: org.scalajs.dom.raw.Element = js.native + var thead: org.scalajs.dom.raw.HTMLTableSectionElement = js.native + var title: org.scalajs.dom.raw.HTMLTitleElement = js.native + var tr: org.scalajs.dom.raw.HTMLTableRowElement = js.native + var track: org.scalajs.dom.raw.HTMLTrackElement = js.native + var u: org.scalajs.dom.raw.HTMLElement = js.native + var ul: org.scalajs.dom.raw.HTMLUListElement = js.native + var `var`: org.scalajs.dom.raw.HTMLElement = js.native + var video: org.scalajs.dom.raw.HTMLVideoElement = js.native + var wbr: org.scalajs.dom.raw.HTMLElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: org.scalajs.dom.raw.HTMLAnchorElement, + abbr: org.scalajs.dom.raw.HTMLElement, + address: org.scalajs.dom.raw.HTMLElement, + area: org.scalajs.dom.raw.HTMLAreaElement, + article: org.scalajs.dom.raw.HTMLElement, + aside: org.scalajs.dom.raw.HTMLElement, + audio: org.scalajs.dom.raw.HTMLAudioElement, + b: org.scalajs.dom.raw.HTMLElement, + base: org.scalajs.dom.raw.HTMLBaseElement, + bdi: org.scalajs.dom.raw.HTMLElement, + bdo: org.scalajs.dom.raw.HTMLElement, + blockquote: org.scalajs.dom.raw.HTMLQuoteElement, + body: org.scalajs.dom.raw.HTMLBodyElement, + br: org.scalajs.dom.raw.HTMLBRElement, + button: org.scalajs.dom.raw.HTMLButtonElement, + canvas: org.scalajs.dom.raw.HTMLCanvasElement, + cite: org.scalajs.dom.raw.HTMLElement, + code: org.scalajs.dom.raw.HTMLElement, + col: org.scalajs.dom.raw.HTMLTableColElement, + colgroup: org.scalajs.dom.raw.HTMLTableColElement, + data: org.scalajs.dom.raw.Element, + datalist: org.scalajs.dom.raw.HTMLDataListElement, + dd: org.scalajs.dom.raw.HTMLElement, + del: org.scalajs.dom.raw.HTMLModElement, + dfn: org.scalajs.dom.raw.HTMLElement, + dialog: org.scalajs.dom.raw.Element, + div: org.scalajs.dom.raw.HTMLDivElement, + dl: org.scalajs.dom.raw.HTMLDListElement, + dt: org.scalajs.dom.raw.HTMLElement, + em: org.scalajs.dom.raw.HTMLElement, + embed: org.scalajs.dom.raw.HTMLEmbedElement, + fieldset: org.scalajs.dom.raw.HTMLFieldSetElement, + figcaption: org.scalajs.dom.raw.HTMLElement, + figure: org.scalajs.dom.raw.HTMLElement, + footer: org.scalajs.dom.raw.HTMLElement, + form: org.scalajs.dom.raw.HTMLFormElement, + h1: org.scalajs.dom.raw.HTMLHeadingElement, + h2: org.scalajs.dom.raw.HTMLHeadingElement, + h3: org.scalajs.dom.raw.HTMLHeadingElement, + h4: org.scalajs.dom.raw.HTMLHeadingElement, + h5: org.scalajs.dom.raw.HTMLHeadingElement, + h6: org.scalajs.dom.raw.HTMLHeadingElement, + head: org.scalajs.dom.raw.HTMLHeadElement, + header: org.scalajs.dom.raw.HTMLElement, + hgroup: org.scalajs.dom.raw.HTMLElement, + hr: org.scalajs.dom.raw.HTMLHRElement, + html: org.scalajs.dom.raw.HTMLHtmlElement, + i: org.scalajs.dom.raw.HTMLElement, + iframe: org.scalajs.dom.raw.HTMLIFrameElement, + img: org.scalajs.dom.raw.HTMLImageElement, + input: org.scalajs.dom.raw.HTMLInputElement, + ins: org.scalajs.dom.raw.HTMLModElement, + kbd: org.scalajs.dom.raw.HTMLElement, + label: org.scalajs.dom.raw.HTMLLabelElement, + legend: org.scalajs.dom.raw.HTMLLegendElement, + li: org.scalajs.dom.raw.HTMLLIElement, + link: org.scalajs.dom.raw.HTMLLinkElement, + main: org.scalajs.dom.raw.HTMLElement, + map: org.scalajs.dom.raw.HTMLMapElement, + mark: org.scalajs.dom.raw.HTMLElement, + meta: org.scalajs.dom.raw.HTMLMetaElement, + nav: org.scalajs.dom.raw.HTMLElement, + noscript: org.scalajs.dom.raw.HTMLElement, + `object`: org.scalajs.dom.raw.HTMLObjectElement, + ol: org.scalajs.dom.raw.HTMLOListElement, + optgroup: org.scalajs.dom.raw.HTMLOptGroupElement, + option: org.scalajs.dom.raw.HTMLOptionElement, + p: org.scalajs.dom.raw.HTMLParagraphElement, + param: org.scalajs.dom.raw.HTMLParamElement, + pre: org.scalajs.dom.raw.HTMLPreElement, + progress: org.scalajs.dom.raw.HTMLProgressElement, + q: org.scalajs.dom.raw.HTMLQuoteElement, + rp: org.scalajs.dom.raw.HTMLElement, + rt: org.scalajs.dom.raw.HTMLElement, + ruby: org.scalajs.dom.raw.HTMLElement, + s: org.scalajs.dom.raw.HTMLElement, + samp: org.scalajs.dom.raw.HTMLElement, + script: org.scalajs.dom.raw.HTMLScriptElement, + section: org.scalajs.dom.raw.HTMLElement, + select: org.scalajs.dom.raw.HTMLSelectElement, + small: org.scalajs.dom.raw.HTMLElement, + source: org.scalajs.dom.raw.HTMLSourceElement, + span: org.scalajs.dom.raw.HTMLSpanElement, + strong: org.scalajs.dom.raw.HTMLElement, + style: org.scalajs.dom.raw.HTMLStyleElement, + sub: org.scalajs.dom.raw.HTMLElement, + summary: org.scalajs.dom.raw.HTMLElement, + sup: org.scalajs.dom.raw.HTMLElement, + table: org.scalajs.dom.raw.HTMLTableElement, + tbody: org.scalajs.dom.raw.HTMLTableSectionElement, + td: org.scalajs.dom.raw.Element, + template: org.scalajs.dom.raw.Element, + textarea: org.scalajs.dom.raw.HTMLTextAreaElement, + tfoot: org.scalajs.dom.raw.HTMLTableSectionElement, + th: org.scalajs.dom.raw.Element, + thead: org.scalajs.dom.raw.HTMLTableSectionElement, + title: org.scalajs.dom.raw.HTMLTitleElement, + tr: org.scalajs.dom.raw.HTMLTableRowElement, + track: org.scalajs.dom.raw.HTMLTrackElement, + u: org.scalajs.dom.raw.HTMLElement, + ul: org.scalajs.dom.raw.HTMLUListElement, + `var`: org.scalajs.dom.raw.HTMLElement, + video: org.scalajs.dom.raw.HTMLVideoElement, + wbr: org.scalajs.dom.raw.HTMLElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any]) + __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) + __obj.updateDynamic("var")(`var`.asInstanceOf[js.Any]) + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..644d20df08 --- /dev/null +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala @@ -0,0 +1,26 @@ +package typingsSlinky.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: org.scalajs.dom.raw.SVGCircleElement = js.native + var clipPath: org.scalajs.dom.raw.SVGClipPathElement = js.native + var defs: org.scalajs.dom.raw.SVGDefsElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply( + circle: org.scalajs.dom.raw.SVGCircleElement, + clipPath: org.scalajs.dom.raw.SVGClipPathElement, + defs: org.scalajs.dom.raw.SVGDefsElement + ): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any], clipPath = clipPath.asInstanceOf[js.Any], defs = defs.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala b/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala index 53bdebcd77..f65d85b899 100644 --- a/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala +++ b/importer/src/test/resources/react-integration-test/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala @@ -92,7 +92,7 @@ package object std { /** * Construct a type with a set of properties K of type T */ - type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[K] + type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[T] type SVGCircleElement = org.scalajs.dom.raw.SVGElement type SVGClipPathElement = org.scalajs.dom.raw.SVGElement type SVGDefsElement = org.scalajs.dom.raw.SVGElement diff --git a/importer/src/test/resources/react-integration-test/check/c/componentstest/build.sbt b/importer/src/test/resources/react-integration-test/check/c/componentstest/build.sbt index 71fef6559b..9ff01472d6 100644 --- a/importer/src/test/resources/react-integration-test/check/c/componentstest/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/c/componentstest/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "componentstest" -version := "0.0-unknown-969b2a" +version := "0.0-unknown-a43bcb" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-902b24", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "react" % "16.9.2-59b62d", + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/r/react-bootstrap/build.sbt b/importer/src/test/resources/react-integration-test/check/r/react-bootstrap/build.sbt index d25fb26b45..05ab2e19d1 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react-bootstrap/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/r/react-bootstrap/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-bootstrap" -version := "0.32-e40074" +version := "0.32-62366a" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-902b24", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "react" % "16.9.2-59b62d", + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/r/react-contextmenu/build.sbt b/importer/src/test/resources/react-integration-test/check/r/react-contextmenu/build.sbt index fd5dbeba93..e9dcf085fa 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react-contextmenu/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/r/react-contextmenu/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-contextmenu" -version := "2.13.0-6c9f33" +version := "2.13.0-7d56b6" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-902b24", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "react" % "16.9.2-59b62d", + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/build.sbt b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/build.sbt index 4979a83a1a..af1bc53ecc 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-dropzone" -version := "10.1.10-8a9d32" +version := "10.1.10-f76e60" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-902b24", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "react" % "16.9.2-59b62d", + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala deleted file mode 100644 index 9ca085d1da..0000000000 --- a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/DropzonePropsRefAttributesDropzoneRef.scala +++ /dev/null @@ -1,132 +0,0 @@ -package typings.reactDropzone - -import typings.react.mod.DragEvent -import typings.react.mod.DragEventHandler -import typings.react.mod.Key -import typings.react.mod.Ref -import typings.react.mod._Global_.JSX.Element -import typings.reactDropzone.mod.DropEvent -import typings.reactDropzone.mod.DropzoneRef -import typings.reactDropzone.mod.DropzoneState -import typings.std.HTMLElement -import scala.scalajs.js -import scala.scalajs.js.`|` -import scala.scalajs.js.annotation._ - -/* Inlined react-dropzone.react-dropzone.DropzoneProps & react.react.RefAttributes */ -@js.native -trait DropzonePropsRefAttributesDropzoneRef extends js.Object { - var accept: js.UndefOr[String | js.Array[String]] = js.native - var children: js.UndefOr[js.Function1[/* state */ DropzoneState, Element]] = js.native - var disabled: js.UndefOr[Boolean] = js.native - var getFilesFromEvent: js.UndefOr[ - js.Function1[ - /* event */ DropEvent, - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ - ] - ] = js.native - var key: js.UndefOr[Key] = js.native - var maxSize: js.UndefOr[Double] = js.native - var minSize: js.UndefOr[Double] = js.native - var multiple: js.UndefOr[Boolean] = js.native - var noClick: js.UndefOr[Boolean] = js.native - var noDrag: js.UndefOr[Boolean] = js.native - var noDragEventsBubbling: js.UndefOr[Boolean] = js.native - var noKeyboard: js.UndefOr[Boolean] = js.native - var onDragEnter: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragLeave: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragOver: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDrop: js.UndefOr[ - js.Function3[ - /* acceptedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* rejectedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropAccepted: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropRejected: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onFileDialogCancel: js.UndefOr[js.Function0[Unit]] = js.native - var preventDropOnDocument: js.UndefOr[Boolean] = js.native - var ref: js.UndefOr[Ref[DropzoneRef]] = js.native -} - -object DropzonePropsRefAttributesDropzoneRef { - @scala.inline - def apply( - accept: String | js.Array[String] = null, - children: /* state */ DropzoneState => Element = null, - disabled: js.UndefOr[Boolean] = js.undefined, - getFilesFromEvent: /* event */ DropEvent => /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ = null, - key: Key = null, - maxSize: Int | Double = null, - minSize: Int | Double = null, - multiple: js.UndefOr[Boolean] = js.undefined, - noClick: js.UndefOr[Boolean] = js.undefined, - noDrag: js.UndefOr[Boolean] = js.undefined, - noDragEventsBubbling: js.UndefOr[Boolean] = js.undefined, - noKeyboard: js.UndefOr[Boolean] = js.undefined, - onDragEnter: DragEvent[HTMLElement] => Unit = null, - onDragLeave: DragEvent[HTMLElement] => Unit = null, - onDragOver: DragEvent[HTMLElement] => Unit = null, - onDrop: (/* acceptedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], /* rejectedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], /* event */ DropEvent) => Unit = null, - onDropAccepted: (/* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], /* event */ DropEvent) => Unit = null, - onDropRejected: (/* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], /* event */ DropEvent) => Unit = null, - onFileDialogCancel: () => Unit = null, - preventDropOnDocument: js.UndefOr[Boolean] = js.undefined, - ref: Ref[DropzoneRef] = null - ): DropzonePropsRefAttributesDropzoneRef = { - val __obj = js.Dynamic.literal() - if (accept != null) __obj.updateDynamic("accept")(accept.asInstanceOf[js.Any]) - if (children != null) __obj.updateDynamic("children")(js.Any.fromFunction1(children)) - if (!js.isUndefined(disabled)) __obj.updateDynamic("disabled")(disabled.asInstanceOf[js.Any]) - if (getFilesFromEvent != null) __obj.updateDynamic("getFilesFromEvent")(js.Any.fromFunction1(getFilesFromEvent)) - if (key != null) __obj.updateDynamic("key")(key.asInstanceOf[js.Any]) - if (maxSize != null) __obj.updateDynamic("maxSize")(maxSize.asInstanceOf[js.Any]) - if (minSize != null) __obj.updateDynamic("minSize")(minSize.asInstanceOf[js.Any]) - if (!js.isUndefined(multiple)) __obj.updateDynamic("multiple")(multiple.asInstanceOf[js.Any]) - if (!js.isUndefined(noClick)) __obj.updateDynamic("noClick")(noClick.asInstanceOf[js.Any]) - if (!js.isUndefined(noDrag)) __obj.updateDynamic("noDrag")(noDrag.asInstanceOf[js.Any]) - if (!js.isUndefined(noDragEventsBubbling)) __obj.updateDynamic("noDragEventsBubbling")(noDragEventsBubbling.asInstanceOf[js.Any]) - if (!js.isUndefined(noKeyboard)) __obj.updateDynamic("noKeyboard")(noKeyboard.asInstanceOf[js.Any]) - if (onDragEnter != null) __obj.updateDynamic("onDragEnter")(js.Any.fromFunction1(onDragEnter)) - if (onDragLeave != null) __obj.updateDynamic("onDragLeave")(js.Any.fromFunction1(onDragLeave)) - if (onDragOver != null) __obj.updateDynamic("onDragOver")(js.Any.fromFunction1(onDragOver)) - if (onDrop != null) __obj.updateDynamic("onDrop")(js.Any.fromFunction3(onDrop)) - if (onDropAccepted != null) __obj.updateDynamic("onDropAccepted")(js.Any.fromFunction2(onDropAccepted)) - if (onDropRejected != null) __obj.updateDynamic("onDropRejected")(js.Any.fromFunction2(onDropRejected)) - if (onFileDialogCancel != null) __obj.updateDynamic("onFileDialogCancel")(js.Any.fromFunction0(onFileDialogCancel)) - if (!js.isUndefined(preventDropOnDocument)) __obj.updateDynamic("preventDropOnDocument")(preventDropOnDocument.asInstanceOf[js.Any]) - if (ref != null) __obj.updateDynamic("ref")(ref.asInstanceOf[js.Any]) - __obj.asInstanceOf[DropzonePropsRefAttributesDropzoneRef] - } -} - diff --git a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/mod/DropzoneProps.scala b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/mod/DropzoneProps.scala index c29eb56e99..3b3740aabb 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/mod/DropzoneProps.scala +++ b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/mod/DropzoneProps.scala @@ -1,67 +1,15 @@ package typings.reactDropzone.mod import typings.react.mod.DragEvent -import typings.react.mod.DragEventHandler import typings.react.mod._Global_.JSX.Element import typings.std.HTMLElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ -/* Inlined parent react-dropzone.react-dropzone.DropzoneOptions */ @js.native -trait DropzoneProps extends js.Object { - var accept: js.UndefOr[String | js.Array[String]] = js.native +trait DropzoneProps extends DropzoneOptions { var children: js.UndefOr[js.Function1[/* state */ DropzoneState, Element]] = js.native - var disabled: js.UndefOr[Boolean] = js.native - var getFilesFromEvent: js.UndefOr[ - js.Function1[ - /* event */ DropEvent, - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify Promise> */ _ - ] - ] = js.native - var maxSize: js.UndefOr[Double] = js.native - var minSize: js.UndefOr[Double] = js.native - var multiple: js.UndefOr[Boolean] = js.native - var noClick: js.UndefOr[Boolean] = js.native - var noDrag: js.UndefOr[Boolean] = js.native - var noDragEventsBubbling: js.UndefOr[Boolean] = js.native - var noKeyboard: js.UndefOr[Boolean] = js.native - var onDragEnter: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragLeave: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDragOver: js.UndefOr[DragEventHandler[HTMLElement]] = js.native - var onDrop: js.UndefOr[ - js.Function3[ - /* acceptedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* rejectedFiles */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropAccepted: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onDropRejected: js.UndefOr[ - js.Function2[ - /* files */ js.Array[ - /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify File */ _ - ], - /* event */ DropEvent, - Unit - ] - ] = js.native - var onFileDialogCancel: js.UndefOr[js.Function0[Unit]] = js.native - var preventDropOnDocument: js.UndefOr[Boolean] = js.native } object DropzoneProps { diff --git a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/mod/default.scala b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/mod/default.scala index c945acdcda..4f67534420 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/mod/default.scala +++ b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/mod/default.scala @@ -1,7 +1,7 @@ package typings.reactDropzone.mod +import typings.react.mod.RefAttributes import typings.react.mod._Global_.JSX.Element -import typings.reactDropzone.DropzonePropsRefAttributesDropzoneRef import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -9,6 +9,6 @@ import scala.scalajs.js.annotation._ @JSImport("react-dropzone", JSImport.Default) @js.native object default extends js.Object { - def apply(props: DropzonePropsRefAttributesDropzoneRef): Element = js.native + def apply(props: DropzoneProps with RefAttributes[DropzoneRef]): Element = js.native } diff --git a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/reactDropzoneComponents.scala b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/reactDropzoneComponents.scala index da29f7e131..c4968d6c55 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/reactDropzoneComponents.scala +++ b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/reactDropzoneComponents.scala @@ -1,12 +1,16 @@ package typings.reactDropzone import typings.react.mod.ComponentType +import typings.react.mod.RefAttributes +import typings.reactDropzone.mod.DropzoneProps +import typings.reactDropzone.mod.DropzoneRef import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ object reactDropzoneComponents extends reactDropzoneProps { @scala.inline - def ReactDropzone: ComponentType[ReactDropzoneProps] = typings.reactDropzone.mod.default.asInstanceOf[typings.react.mod.ComponentType[ReactDropzoneProps]] + def ReactDropzone: ComponentType[DropzoneProps with RefAttributes[DropzoneRef]] = typings.reactDropzone.mod.default.asInstanceOf[typings.react.mod.ComponentType[ + typings.reactDropzone.mod.DropzoneProps with typings.react.mod.RefAttributes[typings.reactDropzone.mod.DropzoneRef]]] } diff --git a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/reactDropzoneProps.scala b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/reactDropzoneProps.scala index 77ca7736b4..2b069a17cb 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/reactDropzoneProps.scala +++ b/importer/src/test/resources/react-integration-test/check/r/react-dropzone/src/main/scala/typings/reactDropzone/reactDropzoneProps.scala @@ -4,9 +4,5 @@ import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ -trait reactDropzoneProps { - @scala.inline - def ReactDropzoneProps: DropzonePropsRefAttributesDropzoneRef.type = typings.reactDropzone.DropzonePropsRefAttributesDropzoneRef - type ReactDropzoneProps = DropzonePropsRefAttributesDropzoneRef -} +trait reactDropzoneProps diff --git a/importer/src/test/resources/react-integration-test/check/r/react-select/build.sbt b/importer/src/test/resources/react-integration-test/check/r/react-select/build.sbt index eb22303557..38e627e42e 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react-select/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/r/react-select/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-select" -version := "0.0-unknown-fcca8b" +version := "0.0-unknown-34f1f8" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-902b24", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "react" % "16.9.2-59b62d", + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/r/react/build.sbt b/importer/src/test/resources/react-integration-test/check/r/react/build.sbt index 4c26279ded..61af3162ca 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/r/react/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "react" -version := "16.9.2-902b24" +version := "16.9.2-59b62d" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/r/react/src/main/scala/typings/react/AnonDefaultPropsD.scala b/importer/src/test/resources/react-integration-test/check/r/react/src/main/scala/typings/react/Anon0.scala similarity index 77% rename from importer/src/test/resources/react-integration-test/check/r/react/src/main/scala/typings/react/AnonDefaultPropsD.scala rename to importer/src/test/resources/react-integration-test/check/r/react/src/main/scala/typings/react/Anon0.scala index f1ec1993e8..73d3a9a135 100644 --- a/importer/src/test/resources/react-integration-test/check/r/react/src/main/scala/typings/react/AnonDefaultPropsD.scala +++ b/importer/src/test/resources/react-integration-test/check/r/react/src/main/scala/typings/react/Anon0.scala @@ -5,18 +5,18 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonDefaultPropsD extends js.Object { +trait Anon0 extends js.Object { var defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any = js.native } -object AnonDefaultPropsD { +object Anon0 { @scala.inline def apply( defaultProps: /* import warning: importer.ImportType#apply Failed type conversion: infer D */ js.Any - ): AnonDefaultPropsD = { + ): Anon0 = { val __obj = js.Dynamic.literal(defaultProps = defaultProps.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonDefaultPropsD] + __obj.asInstanceOf[Anon0] } } diff --git a/importer/src/test/resources/react-integration-test/check/s/semantic-ui-react/build.sbt b/importer/src/test/resources/react-integration-test/check/s/semantic-ui-react/build.sbt index 92e76c2186..53f1396bb9 100644 --- a/importer/src/test/resources/react-integration-test/check/s/semantic-ui-react/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/s/semantic-ui-react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "semantic-ui-react" -version := "0.0-unknown-3a77d8" +version := "0.0-unknown-a19e59" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-902b24", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "react" % "16.9.2-59b62d", + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/build.sbt b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/build.sbt index 742f372229..344c7405f9 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/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-2dc415" +version := "0.38.0-40711a" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-902b24", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "react" % "16.9.2-59b62d", + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/AnonCaptureListener.scala b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/AnonListener.scala similarity index 87% rename from importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/AnonCaptureListener.scala rename to importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/AnonListener.scala index a536e429c0..44919293f1 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/AnonCaptureListener.scala +++ b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/AnonListener.scala @@ -5,27 +5,27 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonCaptureListener extends js.Object { +trait AnonListener extends js.Object { var capture: js.UndefOr[scala.Nothing] = js.native var listener: js.UndefOr[scala.Nothing] = js.native var targetRef: js.UndefOr[scala.Nothing] = js.native var `type`: js.UndefOr[scala.Nothing] = js.native } -object AnonCaptureListener { +object AnonListener { @scala.inline def apply( capture: js.UndefOr[scala.Nothing] = js.undefined, listener: js.UndefOr[scala.Nothing] = js.undefined, targetRef: js.UndefOr[scala.Nothing] = js.undefined, `type`: js.UndefOr[scala.Nothing] = js.undefined - ): AnonCaptureListener = { + ): AnonListener = { val __obj = js.Dynamic.literal() if (!js.isUndefined(capture)) __obj.updateDynamic("capture")(capture.asInstanceOf[js.Any]) if (!js.isUndefined(listener)) __obj.updateDynamic("listener")(listener.asInstanceOf[js.Any]) if (!js.isUndefined(targetRef)) __obj.updateDynamic("targetRef")(targetRef.asInstanceOf[js.Any]) if (!js.isUndefined(`type`)) __obj.updateDynamic("type")(`type`.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonCaptureListener] + __obj.asInstanceOf[AnonListener] } } diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/eventListenerMod.scala b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/eventListenerMod.scala index ecffeb9900..aa3fef7615 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/eventListenerMod.scala +++ b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/eventListenerMod.scala @@ -12,7 +12,7 @@ object eventListenerMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonCapture | AnonCaptureListener = js.native + var propTypes: AnonCapture | AnonListener = js.native def apply[T /* <: EventTypes */](props: EventListenerOptions[T]): js.Any = js.native @js.native object defaultProps extends js.Object { diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/mod.scala b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/mod.scala index dcd606cd2c..4e54f17c83 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/mod.scala +++ b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-event-listener/src/main/scala/typings/stardustUiReactComponentEventListener/mod.scala @@ -16,7 +16,7 @@ object mod extends js.Object { @js.native object EventListener extends js.Object { var displayName: String = js.native - var propTypes: AnonCapture | AnonCaptureListener = js.native + var propTypes: AnonCapture | AnonListener = js.native def apply[T /* <: EventTypes */](props: EventListenerOptions[T]): js.Any = js.native @js.native object defaultProps extends js.Object { diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/build.sbt b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/build.sbt index ed53ecaa76..5305b8ae3e 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/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-8a254d" +version := "0.38.0-8fdd06" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "16.9.2-902b24", - "org.scalablytyped" %%% "std" % "0.0-unknown-d75406") + "org.scalablytyped" %%% "react" % "16.9.2-59b62d", + "org.scalablytyped" %%% "std" % "0.0-unknown-b0247b") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/AnonChildrenInnerRef.scala b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/AnonInnerRef.scala similarity index 80% rename from importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/AnonChildrenInnerRef.scala rename to importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/AnonInnerRef.scala index fb21681205..3b4a515c86 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/AnonChildrenInnerRef.scala +++ b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/AnonInnerRef.scala @@ -5,21 +5,21 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonChildrenInnerRef extends js.Object { +trait AnonInnerRef extends js.Object { var children: js.UndefOr[scala.Nothing] = js.native var innerRef: js.UndefOr[scala.Nothing] = js.native } -object AnonChildrenInnerRef { +object AnonInnerRef { @scala.inline def apply( children: js.UndefOr[scala.Nothing] = js.undefined, innerRef: js.UndefOr[scala.Nothing] = js.undefined - ): AnonChildrenInnerRef = { + ): AnonInnerRef = { val __obj = js.Dynamic.literal() if (!js.isUndefined(children)) __obj.updateDynamic("children")(children.asInstanceOf[js.Any]) if (!js.isUndefined(innerRef)) __obj.updateDynamic("innerRef")(innerRef.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonChildrenInnerRef] + __obj.asInstanceOf[AnonInnerRef] } } diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/mod.scala b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/mod.scala index 1783d1c1dc..be74368d27 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/mod.scala +++ b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/mod.scala @@ -35,14 +35,14 @@ object mod extends js.Object { @js.native object RefFindNode extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } /* static members */ @js.native object RefForward extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/refFindNodeMod.scala b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/refFindNodeMod.scala index 67db616131..b75f73482a 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/refFindNodeMod.scala +++ b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/refFindNodeMod.scala @@ -28,7 +28,7 @@ object refFindNodeMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/refForwardMod.scala b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/refForwardMod.scala index 1e6221230a..c101e7c948 100644 --- a/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/refForwardMod.scala +++ b/importer/src/test/resources/react-integration-test/check/s/stardust-ui__react-component-ref/src/main/scala/typings/stardustUiReactComponentRef/refForwardMod.scala @@ -23,7 +23,7 @@ object refForwardMod extends js.Object { @js.native object default extends js.Object { var displayName: String = js.native - var propTypes: AnonChildren | AnonChildrenInnerRef = js.native + var propTypes: AnonChildren | AnonInnerRef = js.native } } diff --git a/importer/src/test/resources/react-integration-test/check/s/std/build.sbt b/importer/src/test/resources/react-integration-test/check/s/std/build.sbt index ea34b09f1e..b8007b0073 100644 --- a/importer/src/test/resources/react-integration-test/check/s/std/build.sbt +++ b/importer/src/test/resources/react-integration-test/check/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-d75406" +version := "0.0-unknown-b0247b" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..bb1fd6f57a --- /dev/null +++ b/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala @@ -0,0 +1,229 @@ +package typings.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: HTMLAnchorElement = js.native + var abbr: HTMLElement = js.native + var address: HTMLElement = js.native + var area: HTMLAreaElement = js.native + var article: HTMLElement = js.native + var aside: HTMLElement = js.native + var audio: HTMLAudioElement = js.native + var b: HTMLElement = js.native + var base: HTMLBaseElement = js.native + var bdi: HTMLElement = js.native + var bdo: HTMLElement = js.native + var blockquote: HTMLQuoteElement = js.native + var body: HTMLBodyElement = js.native + var br: HTMLBRElement = js.native + var button: HTMLButtonElement = js.native + var canvas: HTMLCanvasElement = js.native + var cite: HTMLElement = js.native + var code: HTMLElement = js.native + var col: HTMLTableColElement = js.native + var colgroup: HTMLTableColElement = js.native + var data: HTMLDataElement = js.native + var datalist: HTMLDataListElement = js.native + var dd: HTMLElement = js.native + var del: HTMLModElement = js.native + var dfn: HTMLElement = js.native + var dialog: HTMLDialogElement = js.native + var div: HTMLDivElement = js.native + var dl: HTMLDListElement = js.native + var dt: HTMLElement = js.native + var em: HTMLElement = js.native + var embed: HTMLEmbedElement = js.native + var fieldset: HTMLFieldSetElement = js.native + var figcaption: HTMLElement = js.native + var figure: HTMLElement = js.native + var footer: HTMLElement = js.native + var form: HTMLFormElement = js.native + var h1: HTMLHeadingElement = js.native + var h2: HTMLHeadingElement = js.native + var h3: HTMLHeadingElement = js.native + var h4: HTMLHeadingElement = js.native + var h5: HTMLHeadingElement = js.native + var h6: HTMLHeadingElement = js.native + var head: HTMLHeadElement = js.native + var header: HTMLElement = js.native + var hgroup: HTMLElement = js.native + var hr: HTMLHRElement = js.native + var html: HTMLHtmlElement = js.native + var i: HTMLElement = js.native + var iframe: HTMLIFrameElement = js.native + var img: HTMLImageElement = js.native + var input: HTMLInputElement = js.native + var ins: HTMLModElement = js.native + var kbd: HTMLElement = js.native + var label: HTMLLabelElement = js.native + var legend: HTMLLegendElement = js.native + var li: HTMLLIElement = js.native + var link: HTMLLinkElement = js.native + var main: HTMLElement = js.native + var map: HTMLMapElement = js.native + var mark: HTMLElement = js.native + var meta: HTMLMetaElement = js.native + var nav: HTMLElement = js.native + var noscript: HTMLElement = js.native + var `object`: HTMLObjectElement = js.native + var ol: HTMLOListElement = js.native + var optgroup: HTMLOptGroupElement = js.native + var option: HTMLOptionElement = js.native + var p: HTMLParagraphElement = js.native + var param: HTMLParamElement = js.native + var pre: HTMLPreElement = js.native + var progress: HTMLProgressElement = js.native + var q: HTMLQuoteElement = js.native + var rp: HTMLElement = js.native + var rt: HTMLElement = js.native + var ruby: HTMLElement = js.native + var s: HTMLElement = js.native + var samp: HTMLElement = js.native + var script: HTMLScriptElement = js.native + var section: HTMLElement = js.native + var select: HTMLSelectElement = js.native + var small: HTMLElement = js.native + var source: HTMLSourceElement = js.native + var span: HTMLSpanElement = js.native + var strong: HTMLElement = js.native + var style: HTMLStyleElement = js.native + var sub: HTMLElement = js.native + var summary: HTMLElement = js.native + var sup: HTMLElement = js.native + var table: HTMLTableElement = js.native + var tbody: HTMLTableSectionElement = js.native + var td: HTMLTableDataCellElement = js.native + var template: HTMLTemplateElement = js.native + var textarea: HTMLTextAreaElement = js.native + var tfoot: HTMLTableSectionElement = js.native + var th: HTMLTableHeaderCellElement = js.native + var thead: HTMLTableSectionElement = js.native + var title: HTMLTitleElement = js.native + var tr: HTMLTableRowElement = js.native + var track: HTMLTrackElement = js.native + var u: HTMLElement = js.native + var ul: HTMLUListElement = js.native + var `var`: HTMLElement = js.native + var video: HTMLVideoElement = js.native + var wbr: HTMLElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: HTMLAnchorElement, + abbr: HTMLElement, + address: HTMLElement, + area: HTMLAreaElement, + article: HTMLElement, + aside: HTMLElement, + audio: HTMLAudioElement, + b: HTMLElement, + base: HTMLBaseElement, + bdi: HTMLElement, + bdo: HTMLElement, + blockquote: HTMLQuoteElement, + body: HTMLBodyElement, + br: HTMLBRElement, + button: HTMLButtonElement, + canvas: HTMLCanvasElement, + cite: HTMLElement, + code: HTMLElement, + col: HTMLTableColElement, + colgroup: HTMLTableColElement, + data: HTMLDataElement, + datalist: HTMLDataListElement, + dd: HTMLElement, + del: HTMLModElement, + dfn: HTMLElement, + dialog: HTMLDialogElement, + div: HTMLDivElement, + dl: HTMLDListElement, + dt: HTMLElement, + em: HTMLElement, + embed: HTMLEmbedElement, + fieldset: HTMLFieldSetElement, + figcaption: HTMLElement, + figure: HTMLElement, + footer: HTMLElement, + form: HTMLFormElement, + h1: HTMLHeadingElement, + h2: HTMLHeadingElement, + h3: HTMLHeadingElement, + h4: HTMLHeadingElement, + h5: HTMLHeadingElement, + h6: HTMLHeadingElement, + head: HTMLHeadElement, + header: HTMLElement, + hgroup: HTMLElement, + hr: HTMLHRElement, + html: HTMLHtmlElement, + i: HTMLElement, + iframe: HTMLIFrameElement, + img: HTMLImageElement, + input: HTMLInputElement, + ins: HTMLModElement, + kbd: HTMLElement, + label: HTMLLabelElement, + legend: HTMLLegendElement, + li: HTMLLIElement, + link: HTMLLinkElement, + main: HTMLElement, + map: HTMLMapElement, + mark: HTMLElement, + meta: HTMLMetaElement, + nav: HTMLElement, + noscript: HTMLElement, + `object`: HTMLObjectElement, + ol: HTMLOListElement, + optgroup: HTMLOptGroupElement, + option: HTMLOptionElement, + p: HTMLParagraphElement, + param: HTMLParamElement, + pre: HTMLPreElement, + progress: HTMLProgressElement, + q: HTMLQuoteElement, + rp: HTMLElement, + rt: HTMLElement, + ruby: HTMLElement, + s: HTMLElement, + samp: HTMLElement, + script: HTMLScriptElement, + section: HTMLElement, + select: HTMLSelectElement, + small: HTMLElement, + source: HTMLSourceElement, + span: HTMLSpanElement, + strong: HTMLElement, + style: HTMLStyleElement, + sub: HTMLElement, + summary: HTMLElement, + sup: HTMLElement, + table: HTMLTableElement, + tbody: HTMLTableSectionElement, + td: HTMLTableDataCellElement, + template: HTMLTemplateElement, + textarea: HTMLTextAreaElement, + tfoot: HTMLTableSectionElement, + th: HTMLTableHeaderCellElement, + thead: HTMLTableSectionElement, + title: HTMLTitleElement, + tr: HTMLTableRowElement, + track: HTMLTrackElement, + u: HTMLElement, + ul: HTMLUListElement, + `var`: HTMLElement, + video: HTMLVideoElement, + wbr: HTMLElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any], b = b.asInstanceOf[js.Any], base = base.asInstanceOf[js.Any], bdi = bdi.asInstanceOf[js.Any], bdo = bdo.asInstanceOf[js.Any], blockquote = blockquote.asInstanceOf[js.Any], body = body.asInstanceOf[js.Any], br = br.asInstanceOf[js.Any], button = button.asInstanceOf[js.Any], canvas = canvas.asInstanceOf[js.Any], cite = cite.asInstanceOf[js.Any], code = code.asInstanceOf[js.Any], col = col.asInstanceOf[js.Any], colgroup = colgroup.asInstanceOf[js.Any], data = data.asInstanceOf[js.Any], datalist = datalist.asInstanceOf[js.Any], dd = dd.asInstanceOf[js.Any], del = del.asInstanceOf[js.Any], dfn = dfn.asInstanceOf[js.Any], dialog = dialog.asInstanceOf[js.Any], div = div.asInstanceOf[js.Any], dl = dl.asInstanceOf[js.Any], dt = dt.asInstanceOf[js.Any], em = em.asInstanceOf[js.Any], embed = embed.asInstanceOf[js.Any], fieldset = fieldset.asInstanceOf[js.Any], figcaption = figcaption.asInstanceOf[js.Any], figure = figure.asInstanceOf[js.Any], footer = footer.asInstanceOf[js.Any], form = form.asInstanceOf[js.Any], h1 = h1.asInstanceOf[js.Any], h2 = h2.asInstanceOf[js.Any], h3 = h3.asInstanceOf[js.Any], h4 = h4.asInstanceOf[js.Any], h5 = h5.asInstanceOf[js.Any], h6 = h6.asInstanceOf[js.Any], head = head.asInstanceOf[js.Any], header = header.asInstanceOf[js.Any], hgroup = hgroup.asInstanceOf[js.Any], hr = hr.asInstanceOf[js.Any], html = html.asInstanceOf[js.Any], i = i.asInstanceOf[js.Any], iframe = iframe.asInstanceOf[js.Any], img = img.asInstanceOf[js.Any], input = input.asInstanceOf[js.Any], ins = ins.asInstanceOf[js.Any], kbd = kbd.asInstanceOf[js.Any], label = label.asInstanceOf[js.Any], legend = legend.asInstanceOf[js.Any], li = li.asInstanceOf[js.Any], link = link.asInstanceOf[js.Any], main = main.asInstanceOf[js.Any], map = map.asInstanceOf[js.Any], mark = mark.asInstanceOf[js.Any], meta = meta.asInstanceOf[js.Any], nav = nav.asInstanceOf[js.Any], noscript = noscript.asInstanceOf[js.Any], ol = ol.asInstanceOf[js.Any], optgroup = optgroup.asInstanceOf[js.Any], option = option.asInstanceOf[js.Any], p = p.asInstanceOf[js.Any], param = param.asInstanceOf[js.Any], pre = pre.asInstanceOf[js.Any], progress = progress.asInstanceOf[js.Any], q = q.asInstanceOf[js.Any], rp = rp.asInstanceOf[js.Any], rt = rt.asInstanceOf[js.Any], ruby = ruby.asInstanceOf[js.Any], s = s.asInstanceOf[js.Any], samp = samp.asInstanceOf[js.Any], script = script.asInstanceOf[js.Any], section = section.asInstanceOf[js.Any], select = select.asInstanceOf[js.Any], small = small.asInstanceOf[js.Any], source = source.asInstanceOf[js.Any], span = span.asInstanceOf[js.Any], strong = strong.asInstanceOf[js.Any], style = style.asInstanceOf[js.Any], sub = sub.asInstanceOf[js.Any], summary = summary.asInstanceOf[js.Any], sup = sup.asInstanceOf[js.Any], table = table.asInstanceOf[js.Any], tbody = tbody.asInstanceOf[js.Any], td = td.asInstanceOf[js.Any], template = template.asInstanceOf[js.Any], textarea = textarea.asInstanceOf[js.Any], tfoot = tfoot.asInstanceOf[js.Any], th = th.asInstanceOf[js.Any], thead = thead.asInstanceOf[js.Any], title = title.asInstanceOf[js.Any], tr = tr.asInstanceOf[js.Any], track = track.asInstanceOf[js.Any], u = u.asInstanceOf[js.Any], ul = ul.asInstanceOf[js.Any], video = video.asInstanceOf[js.Any], wbr = wbr.asInstanceOf[js.Any]) + __obj.updateDynamic("object")(`object`.asInstanceOf[js.Any]) + __obj.updateDynamic("var")(`var`.asInstanceOf[js.Any]) + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala b/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..d19fef0bfe --- /dev/null +++ b/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala @@ -0,0 +1,22 @@ +package typings.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: SVGCircleElement = js.native + var clipPath: SVGClipPathElement = js.native + var defs: SVGDefsElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply(circle: SVGCircleElement, clipPath: SVGClipPathElement, defs: SVGDefsElement): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any], clipPath = clipPath.asInstanceOf[js.Any], defs = defs.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/package.scala b/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/package.scala index a83a87db62..c6760df4e8 100644 --- a/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/package.scala +++ b/importer/src/test/resources/react-integration-test/check/s/std/src/main/scala/typings/std/package.scala @@ -92,7 +92,7 @@ package object std { /** * Construct a type with a set of properties K of type T */ - type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[K] + type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[T] type SVGCircleElement = typings.std.SVGElement type SVGClipPathElement = typings.std.SVGElement type SVGDefsElement = typings.std.SVGElement diff --git a/importer/src/test/resources/react-integration-test/in/stdlib.d.ts b/importer/src/test/resources/react-integration-test/in/stdlib.d.ts index 79634c176d..123086f109 100644 --- a/importer/src/test/resources/react-integration-test/in/stdlib.d.ts +++ b/importer/src/test/resources/react-integration-test/in/stdlib.d.ts @@ -166,3 +166,117 @@ type Pick = { type Record = { [P in K]: T; }; + + +interface HTMLElementTagNameMap { + "a": HTMLAnchorElement; + "abbr": HTMLElement; + "address": HTMLElement; + "area": HTMLAreaElement; + "article": HTMLElement; + "aside": HTMLElement; + "audio": HTMLAudioElement; + "b": HTMLElement; + "base": HTMLBaseElement; + "bdi": HTMLElement; + "bdo": HTMLElement; + "blockquote": HTMLQuoteElement; + "body": HTMLBodyElement; + "br": HTMLBRElement; + "button": HTMLButtonElement; + "canvas": HTMLCanvasElement; + "cite": HTMLElement; + "code": HTMLElement; + "col": HTMLTableColElement; + "colgroup": HTMLTableColElement; + "data": HTMLDataElement; + "datalist": HTMLDataListElement; + "dd": HTMLElement; + "del": HTMLModElement; + "dfn": HTMLElement; + "dialog": HTMLDialogElement; + "div": HTMLDivElement; + "dl": HTMLDListElement; + "dt": HTMLElement; + "em": HTMLElement; + "embed": HTMLEmbedElement; + "fieldset": HTMLFieldSetElement; + "figcaption": HTMLElement; + "figure": HTMLElement; + "footer": HTMLElement; + "form": HTMLFormElement; + "h1": HTMLHeadingElement; + "h2": HTMLHeadingElement; + "h3": HTMLHeadingElement; + "h4": HTMLHeadingElement; + "h5": HTMLHeadingElement; + "h6": HTMLHeadingElement; + "head": HTMLHeadElement; + "header": HTMLElement; + "hgroup": HTMLElement; + "hr": HTMLHRElement; + "html": HTMLHtmlElement; + "i": HTMLElement; + "iframe": HTMLIFrameElement; + "img": HTMLImageElement; + "input": HTMLInputElement; + "ins": HTMLModElement; + "kbd": HTMLElement; + "label": HTMLLabelElement; + "legend": HTMLLegendElement; + "li": HTMLLIElement; + "link": HTMLLinkElement; + "main": HTMLElement; + "map": HTMLMapElement; + "mark": HTMLElement; + "meta": HTMLMetaElement; + "nav": HTMLElement; + "noscript": HTMLElement; + "object": HTMLObjectElement; + "ol": HTMLOListElement; + "optgroup": HTMLOptGroupElement; + "option": HTMLOptionElement; + "p": HTMLParagraphElement; + "param": HTMLParamElement; + "pre": HTMLPreElement; + "progress": HTMLProgressElement; + "q": HTMLQuoteElement; + "rp": HTMLElement; + "rt": HTMLElement; + "ruby": HTMLElement; + "s": HTMLElement; + "samp": HTMLElement; + "script": HTMLScriptElement; + "section": HTMLElement; + "select": HTMLSelectElement; + "small": HTMLElement; + "source": HTMLSourceElement; + "span": HTMLSpanElement; + "strong": HTMLElement; + "style": HTMLStyleElement; + "sub": HTMLElement; + "summary": HTMLElement; + "sup": HTMLElement; + "table": HTMLTableElement; + "tbody": HTMLTableSectionElement; + "td": HTMLTableDataCellElement; + "template": HTMLTemplateElement; + "textarea": HTMLTextAreaElement; + "tfoot": HTMLTableSectionElement; + "th": HTMLTableHeaderCellElement; + "thead": HTMLTableSectionElement; + "title": HTMLTitleElement; + "tr": HTMLTableRowElement; + "track": HTMLTrackElement; + "u": HTMLElement; + "ul": HTMLUListElement; + "var": HTMLElement; + "video": HTMLVideoElement; + "wbr": HTMLElement; +} + +interface SVGElementTagNameMap { + "circle": SVGCircleElement; + "clipPath": SVGClipPathElement; + "defs": SVGDefsElement; +} diff --git a/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/build.sbt b/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/build.sbt index 2c7182536c..202e375324 100644 --- a/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/build.sbt +++ b/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-transition-group" -version := "2.0-92f1f6" +version := "2.0-577273" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "0.0-unknown-32fc3d", - "org.scalablytyped" %%% "std" % "0.0-unknown-6ba6b2") + "org.scalablytyped" %%% "react" % "0.0-unknown-8b7c30", + "org.scalablytyped" %%% "std" % "0.0-unknown-fe6ecf") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/AnonChild.scala b/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/AnonChildFactory.scala similarity index 81% rename from importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/AnonChild.scala rename to importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/AnonChildFactory.scala index 089db34797..7b4d35e181 100644 --- a/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/AnonChild.scala +++ b/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/AnonChildFactory.scala @@ -7,16 +7,16 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonChild extends js.Object { +trait AnonChildFactory extends js.Object { var childFactory: js.UndefOr[js.Function1[/* child */ Element, Element]] = js.native } -object AnonChild { +object AnonChildFactory { @scala.inline - def apply(childFactory: /* child */ Element => CallbackTo[Element] = null): AnonChild = { + def apply(childFactory: /* child */ Element => CallbackTo[Element] = null): AnonChildFactory = { val __obj = js.Dynamic.literal() if (childFactory != null) __obj.updateDynamic("childFactory")(js.Any.fromFunction1((t0: /* child */ japgolly.scalajs.react.raw.React.Element) => childFactory(t0).runNow())) - __obj.asInstanceOf[AnonChild] + __obj.asInstanceOf[AnonChildFactory] } } diff --git a/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/transitionGroupMod/package.scala b/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/transitionGroupMod/package.scala index 82e2f04a51..26bdf52b5c 100644 --- a/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/transitionGroupMod/package.scala +++ b/importer/src/test/resources/react-transition-group/check-japgolly/r/react-transition-group/src/main/scala/typingsJapgolly/reactTransitionGroup/transitionGroupMod/package.scala @@ -9,5 +9,5 @@ package object transitionGroupMod { (typingsJapgolly.reactTransitionGroup.transitionGroupMod.TransitionGroupProps[typingsJapgolly.reactTransitionGroup.reactTransitionGroupStrings.abbr, js.Any]) with js.Object, js.Object ] - type TransitionGroupProps[T /* <: typingsJapgolly.reactTransitionGroup.reactTransitionGroupStrings.abbr | typingsJapgolly.reactTransitionGroup.reactTransitionGroupStrings.animate */, V /* <: typingsJapgolly.react.mod.ReactType[_] */] = (typingsJapgolly.reactTransitionGroup.transitionGroupMod.IntrinsicTransitionGroupProps[T] with (/* import warning: importer.ImportType#apply Failed type conversion: react.react._Global_.JSX.IntrinsicElements[T] */ js.Any)) | (typingsJapgolly.reactTransitionGroup.transitionGroupMod.ComponentTransitionGroupProps[V] with typingsJapgolly.reactTransitionGroup.AnonChild) + type TransitionGroupProps[T /* <: typingsJapgolly.reactTransitionGroup.reactTransitionGroupStrings.abbr | typingsJapgolly.reactTransitionGroup.reactTransitionGroupStrings.animate */, V /* <: typingsJapgolly.react.mod.ReactType[_] */] = (typingsJapgolly.reactTransitionGroup.transitionGroupMod.IntrinsicTransitionGroupProps[T] with (/* import warning: importer.ImportType#apply Failed type conversion: react.react._Global_.JSX.IntrinsicElements[T] */ js.Any)) | (typingsJapgolly.reactTransitionGroup.transitionGroupMod.ComponentTransitionGroupProps[V] with typingsJapgolly.reactTransitionGroup.AnonChildFactory) } diff --git a/importer/src/test/resources/react-transition-group/check-japgolly/r/react/build.sbt b/importer/src/test/resources/react-transition-group/check-japgolly/r/react/build.sbt index 1b521f33ae..bb78823c66 100644 --- a/importer/src/test/resources/react-transition-group/check-japgolly/r/react/build.sbt +++ b/importer/src/test/resources/react-transition-group/check-japgolly/r/react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-32fc3d" +version := "0.0-unknown-8b7c30" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.github.japgolly.scalajs-react" %%% "core" % "1.5.0", "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-6ba6b2") + "org.scalablytyped" %%% "std" % "0.0-unknown-fe6ecf") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-transition-group/check-japgolly/s/std/build.sbt b/importer/src/test/resources/react-transition-group/check-japgolly/s/std/build.sbt index 49433ab611..da63a31a5a 100644 --- a/importer/src/test/resources/react-transition-group/check-japgolly/s/std/build.sbt +++ b/importer/src/test/resources/react-transition-group/check-japgolly/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-6ba6b2" +version := "0.0-unknown-fe6ecf" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..154708d327 --- /dev/null +++ b/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/HTMLElementTagNameMap.scala @@ -0,0 +1,34 @@ +package typingsJapgolly.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: org.scalajs.dom.raw.HTMLAnchorElement = js.native + var abbr: org.scalajs.dom.raw.HTMLElement = js.native + var address: org.scalajs.dom.raw.HTMLElement = js.native + var area: org.scalajs.dom.raw.HTMLAreaElement = js.native + var article: org.scalajs.dom.raw.HTMLElement = js.native + var aside: org.scalajs.dom.raw.HTMLElement = js.native + var audio: org.scalajs.dom.raw.HTMLAudioElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: org.scalajs.dom.raw.HTMLAnchorElement, + abbr: org.scalajs.dom.raw.HTMLElement, + address: org.scalajs.dom.raw.HTMLElement, + area: org.scalajs.dom.raw.HTMLAreaElement, + article: org.scalajs.dom.raw.HTMLElement, + aside: org.scalajs.dom.raw.HTMLElement, + audio: org.scalajs.dom.raw.HTMLAudioElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any]) + + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala b/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..a05b5c1a4b --- /dev/null +++ b/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/SVGElementTagNameMap.scala @@ -0,0 +1,20 @@ +package typingsJapgolly.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: org.scalajs.dom.raw.SVGCircleElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply(circle: org.scalajs.dom.raw.SVGCircleElement): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala b/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala index d90156ec3f..4ee6f08b0b 100644 --- a/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala +++ b/importer/src/test/resources/react-transition-group/check-japgolly/s/std/src/main/scala/typingsJapgolly/std/package.scala @@ -6,7 +6,11 @@ import scala.scalajs.js.annotation._ package object std { type AnimationEvent = org.scalajs.dom.raw.Event + type HTMLAnchorElement = org.scalajs.dom.raw.HTMLElement + type HTMLAreaElement = org.scalajs.dom.raw.HTMLElement + type HTMLAudioElement = org.scalajs.dom.raw.HTMLElement type HTMLElement = org.scalajs.dom.raw.Element type Partial[T] = T + type SVGCircleElement = org.scalajs.dom.raw.SVGElement type SVGElement = org.scalajs.dom.raw.Element } diff --git a/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/build.sbt b/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/build.sbt index 47a1b7c00f..7a4e7636a4 100644 --- a/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/build.sbt +++ b/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "react-transition-group" -version := "2.0-62f032" +version := "2.0-180a21" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "react" % "0.0-unknown-1fc958", - "org.scalablytyped" %%% "std" % "0.0-unknown-dac7b3") + "org.scalablytyped" %%% "react" % "0.0-unknown-f405d4", + "org.scalablytyped" %%% "std" % "0.0-unknown-e61d7f") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/AnonChild.scala b/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/AnonChildFactory.scala similarity index 78% rename from importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/AnonChild.scala rename to importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/AnonChildFactory.scala index dc3c458132..bc2003bcc2 100644 --- a/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/AnonChild.scala +++ b/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/AnonChildFactory.scala @@ -6,16 +6,16 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonChild extends js.Object { +trait AnonChildFactory extends js.Object { var childFactory: js.UndefOr[js.Function1[/* child */ ReactElement, ReactElement]] = js.native } -object AnonChild { +object AnonChildFactory { @scala.inline - def apply(childFactory: /* child */ ReactElement => ReactElement = null): AnonChild = { + def apply(childFactory: /* child */ ReactElement => ReactElement = null): AnonChildFactory = { val __obj = js.Dynamic.literal() if (childFactory != null) __obj.updateDynamic("childFactory")(js.Any.fromFunction1(childFactory)) - __obj.asInstanceOf[AnonChild] + __obj.asInstanceOf[AnonChildFactory] } } diff --git a/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/components/TransitionGroup.scala b/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/components/TransitionGroup.scala index 1a11d74786..29b4960e34 100644 --- a/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/components/TransitionGroup.scala +++ b/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/components/TransitionGroup.scala @@ -8,7 +8,7 @@ import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ -/* This component has complicated props, you'll have to assemble `props` yourself using js.Dynamic.literal(...) or similar. QualifiedName(IArray(Name(typingsSlinky), Name(reactTransitionGroup), Name(transitionGroupMod), Name(TransitionGroupProps))) was not a @ScalaJSDefined trait */ +/* This component has complicated props, you'll have to assemble `props` yourself using js.Dynamic.literal(...) or similar. Couldn't find props for TypeRef(QualifiedName(IArray(Name())),IArray(TypeRef(QualifiedName(IArray(Name(typingsSlinky), Name(reactTransitionGroup), Name(transitionGroupMod), Name(IntrinsicTransitionGroupProps))),IArray(TypeRef(QualifiedName(IArray(Name(typingsSlinky), Name(reactTransitionGroup), Name(reactTransitionGroupStrings), Name(abbr))),IArray(),Comments(0))),NoComments), TypeRef(QualifiedName(IArray(Name(scala), Name(scalajs), Name(js), Name(Any))),IArray(),Comments(1))),NoComments) because: Could't extract props from TypeRef(QualifiedName(IArray(Name(scala), Name(scalajs), Name(js), Name(Any))),IArray(),Comments(1)) because couldn't resolve ClassTree. */ object TransitionGroup extends ExternalComponentWithAttributesWithRefType[tag.type, typingsSlinky.reactTransitionGroup.mod.TransitionGroup] { @JSImport("react-transition-group", "TransitionGroup") diff --git a/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/transitionGroupMod/package.scala b/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/transitionGroupMod/package.scala index 463f85783c..c09426a617 100644 --- a/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/transitionGroupMod/package.scala +++ b/importer/src/test/resources/react-transition-group/check-slinky/r/react-transition-group/src/main/scala/typingsSlinky/reactTransitionGroup/transitionGroupMod/package.scala @@ -8,5 +8,5 @@ package object transitionGroupMod { type TransitionGroup = slinky.core.ReactComponentClass[ typingsSlinky.reactTransitionGroup.transitionGroupMod.TransitionGroupProps[typingsSlinky.reactTransitionGroup.reactTransitionGroupStrings.abbr, js.Any] ] - type TransitionGroupProps[T /* <: typingsSlinky.reactTransitionGroup.reactTransitionGroupStrings.abbr | typingsSlinky.reactTransitionGroup.reactTransitionGroupStrings.animate */, V /* <: slinky.core.ReactComponentClass[_] */] = (typingsSlinky.reactTransitionGroup.transitionGroupMod.IntrinsicTransitionGroupProps[T] with (/* import warning: importer.ImportType#apply Failed type conversion: react.react._Global_.JSX.IntrinsicElements[T] */ js.Any)) | (typingsSlinky.reactTransitionGroup.transitionGroupMod.ComponentTransitionGroupProps[V] with typingsSlinky.reactTransitionGroup.AnonChild) + type TransitionGroupProps[T /* <: typingsSlinky.reactTransitionGroup.reactTransitionGroupStrings.abbr | typingsSlinky.reactTransitionGroup.reactTransitionGroupStrings.animate */, V /* <: slinky.core.ReactComponentClass[_] */] = (typingsSlinky.reactTransitionGroup.transitionGroupMod.IntrinsicTransitionGroupProps[T] with (/* import warning: importer.ImportType#apply Failed type conversion: react.react._Global_.JSX.IntrinsicElements[T] */ js.Any)) | (typingsSlinky.reactTransitionGroup.transitionGroupMod.ComponentTransitionGroupProps[V] with typingsSlinky.reactTransitionGroup.AnonChildFactory) } diff --git a/importer/src/test/resources/react-transition-group/check-slinky/r/react/build.sbt b/importer/src/test/resources/react-transition-group/check-slinky/r/react/build.sbt index 2a9c07b2ac..778fa8ffd5 100644 --- a/importer/src/test/resources/react-transition-group/check-slinky/r/react/build.sbt +++ b/importer/src/test/resources/react-transition-group/check-slinky/r/react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-1fc958" +version := "0.0-unknown-f405d4" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.4", - "org.scalablytyped" %%% "std" % "0.0-unknown-dac7b3") + "org.scalablytyped" %%% "std" % "0.0-unknown-e61d7f") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-transition-group/check-slinky/s/std/build.sbt b/importer/src/test/resources/react-transition-group/check-slinky/s/std/build.sbt index b228e1add3..6364e57fec 100644 --- a/importer/src/test/resources/react-transition-group/check-slinky/s/std/build.sbt +++ b/importer/src/test/resources/react-transition-group/check-slinky/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-dac7b3" +version := "0.0-unknown-e61d7f" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..1e76b4da18 --- /dev/null +++ b/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/HTMLElementTagNameMap.scala @@ -0,0 +1,34 @@ +package typingsSlinky.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: org.scalajs.dom.raw.HTMLAnchorElement = js.native + var abbr: org.scalajs.dom.raw.HTMLElement = js.native + var address: org.scalajs.dom.raw.HTMLElement = js.native + var area: org.scalajs.dom.raw.HTMLAreaElement = js.native + var article: org.scalajs.dom.raw.HTMLElement = js.native + var aside: org.scalajs.dom.raw.HTMLElement = js.native + var audio: org.scalajs.dom.raw.HTMLAudioElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: org.scalajs.dom.raw.HTMLAnchorElement, + abbr: org.scalajs.dom.raw.HTMLElement, + address: org.scalajs.dom.raw.HTMLElement, + area: org.scalajs.dom.raw.HTMLAreaElement, + article: org.scalajs.dom.raw.HTMLElement, + aside: org.scalajs.dom.raw.HTMLElement, + audio: org.scalajs.dom.raw.HTMLAudioElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any]) + + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala b/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..904ccf916f --- /dev/null +++ b/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/SVGElementTagNameMap.scala @@ -0,0 +1,20 @@ +package typingsSlinky.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: org.scalajs.dom.raw.SVGCircleElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply(circle: org.scalajs.dom.raw.SVGCircleElement): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala b/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala index dc15e90fd5..929430f6ba 100644 --- a/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala +++ b/importer/src/test/resources/react-transition-group/check-slinky/s/std/src/main/scala/typingsSlinky/std/package.scala @@ -6,7 +6,11 @@ import scala.scalajs.js.annotation._ package object std { type AnimationEvent = org.scalajs.dom.raw.Event + type HTMLAnchorElement = org.scalajs.dom.raw.HTMLElement + type HTMLAreaElement = org.scalajs.dom.raw.HTMLElement + type HTMLAudioElement = org.scalajs.dom.raw.HTMLElement type HTMLElement = org.scalajs.dom.raw.Element type Partial[T] = T + type SVGCircleElement = org.scalajs.dom.raw.SVGElement type SVGElement = org.scalajs.dom.raw.Element } diff --git a/importer/src/test/resources/react-transition-group/check/r/react-transition-group/build.sbt b/importer/src/test/resources/react-transition-group/check/r/react-transition-group/build.sbt index 23af328f1d..d8af90f27d 100644 --- a/importer/src/test/resources/react-transition-group/check/r/react-transition-group/build.sbt +++ b/importer/src/test/resources/react-transition-group/check/r/react-transition-group/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-transition-group" -version := "2.0-c3069e" +version := "2.0-361c42" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "react" % "0.0-unknown-815f87", - "org.scalablytyped" %%% "std" % "0.0-unknown-6a59f8") + "org.scalablytyped" %%% "react" % "0.0-unknown-f6b6bb", + "org.scalablytyped" %%% "std" % "0.0-unknown-40b83e") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/AnonChild.scala b/importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/AnonChildFactory.scala similarity index 77% rename from importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/AnonChild.scala rename to importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/AnonChildFactory.scala index e1ce29c56c..7b06e4f613 100644 --- a/importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/AnonChild.scala +++ b/importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/AnonChildFactory.scala @@ -6,16 +6,16 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonChild extends js.Object { +trait AnonChildFactory extends js.Object { var childFactory: js.UndefOr[js.Function1[/* child */ ReactElement, ReactElement]] = js.native } -object AnonChild { +object AnonChildFactory { @scala.inline - def apply(childFactory: /* child */ ReactElement => ReactElement = null): AnonChild = { + def apply(childFactory: /* child */ ReactElement => ReactElement = null): AnonChildFactory = { val __obj = js.Dynamic.literal() if (childFactory != null) __obj.updateDynamic("childFactory")(js.Any.fromFunction1(childFactory)) - __obj.asInstanceOf[AnonChild] + __obj.asInstanceOf[AnonChildFactory] } } diff --git a/importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/transitionGroupMod/package.scala b/importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/transitionGroupMod/package.scala index 70add6f1cb..2037786a6d 100644 --- a/importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/transitionGroupMod/package.scala +++ b/importer/src/test/resources/react-transition-group/check/r/react-transition-group/src/main/scala/typings/reactTransitionGroup/transitionGroupMod/package.scala @@ -9,5 +9,5 @@ package object transitionGroupMod { typings.reactTransitionGroup.transitionGroupMod.TransitionGroupProps[typings.reactTransitionGroup.reactTransitionGroupStrings.abbr, js.Any], js.Object ] - type TransitionGroupProps[T /* <: typings.reactTransitionGroup.reactTransitionGroupStrings.abbr | typings.reactTransitionGroup.reactTransitionGroupStrings.animate */, V /* <: typings.react.mod.ReactType[_] */] = (typings.reactTransitionGroup.transitionGroupMod.IntrinsicTransitionGroupProps[T] with (/* import warning: importer.ImportType#apply Failed type conversion: react.react._Global_.JSX.IntrinsicElements[T] */ js.Any)) | (typings.reactTransitionGroup.transitionGroupMod.ComponentTransitionGroupProps[V] with typings.reactTransitionGroup.AnonChild) + type TransitionGroupProps[T /* <: typings.reactTransitionGroup.reactTransitionGroupStrings.abbr | typings.reactTransitionGroup.reactTransitionGroupStrings.animate */, V /* <: typings.react.mod.ReactType[_] */] = (typings.reactTransitionGroup.transitionGroupMod.IntrinsicTransitionGroupProps[T] with (/* import warning: importer.ImportType#apply Failed type conversion: react.react._Global_.JSX.IntrinsicElements[T] */ js.Any)) | (typings.reactTransitionGroup.transitionGroupMod.ComponentTransitionGroupProps[V] with typings.reactTransitionGroup.AnonChildFactory) } diff --git a/importer/src/test/resources/react-transition-group/check/r/react/build.sbt b/importer/src/test/resources/react-transition-group/check/r/react/build.sbt index 957a7bc5af..927512e7bc 100644 --- a/importer/src/test/resources/react-transition-group/check/r/react/build.sbt +++ b/importer/src/test/resources/react-transition-group/check/r/react/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-815f87" +version := "0.0-unknown-f6b6bb" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-6a59f8") + "org.scalablytyped" %%% "std" % "0.0-unknown-40b83e") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/react-transition-group/check/s/std/build.sbt b/importer/src/test/resources/react-transition-group/check/s/std/build.sbt index 5e2669c2cd..27edf886b3 100644 --- a/importer/src/test/resources/react-transition-group/check/s/std/build.sbt +++ b/importer/src/test/resources/react-transition-group/check/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-6a59f8" +version := "0.0-unknown-40b83e" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala b/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala new file mode 100644 index 0000000000..e88544bdd0 --- /dev/null +++ b/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/HTMLElementTagNameMap.scala @@ -0,0 +1,34 @@ +package typings.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait HTMLElementTagNameMap extends js.Object { + var a: HTMLAnchorElement = js.native + var abbr: HTMLElement = js.native + var address: HTMLElement = js.native + var area: HTMLAreaElement = js.native + var article: HTMLElement = js.native + var aside: HTMLElement = js.native + var audio: HTMLAudioElement = js.native +} + +object HTMLElementTagNameMap { + @scala.inline + def apply( + a: HTMLAnchorElement, + abbr: HTMLElement, + address: HTMLElement, + area: HTMLAreaElement, + article: HTMLElement, + aside: HTMLElement, + audio: HTMLAudioElement + ): HTMLElementTagNameMap = { + val __obj = js.Dynamic.literal(a = a.asInstanceOf[js.Any], abbr = abbr.asInstanceOf[js.Any], address = address.asInstanceOf[js.Any], area = area.asInstanceOf[js.Any], article = article.asInstanceOf[js.Any], aside = aside.asInstanceOf[js.Any], audio = audio.asInstanceOf[js.Any]) + + __obj.asInstanceOf[HTMLElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala b/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala new file mode 100644 index 0000000000..6148083e33 --- /dev/null +++ b/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/SVGElementTagNameMap.scala @@ -0,0 +1,20 @@ +package typings.std + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait SVGElementTagNameMap extends js.Object { + var circle: SVGCircleElement = js.native +} + +object SVGElementTagNameMap { + @scala.inline + def apply(circle: SVGCircleElement): SVGElementTagNameMap = { + val __obj = js.Dynamic.literal(circle = circle.asInstanceOf[js.Any]) + + __obj.asInstanceOf[SVGElementTagNameMap] + } +} + diff --git a/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/package.scala b/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/package.scala index 65d43ebc6b..31eb7769d1 100644 --- a/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/package.scala +++ b/importer/src/test/resources/react-transition-group/check/s/std/src/main/scala/typings/std/package.scala @@ -6,7 +6,11 @@ import scala.scalajs.js.annotation._ package object std { type AnimationEvent = typings.std.Event + type HTMLAnchorElement = typings.std.HTMLElement + type HTMLAreaElement = typings.std.HTMLElement + type HTMLAudioElement = typings.std.HTMLElement type HTMLElement = typings.std.Element type Partial[T] = T + type SVGCircleElement = typings.std.SVGElement type SVGElement = typings.std.Element } diff --git a/importer/src/test/resources/react-transition-group/in/stdlib.d.ts b/importer/src/test/resources/react-transition-group/in/stdlib.d.ts index 3420c9d88e..8698ab88a0 100644 --- a/importer/src/test/resources/react-transition-group/in/stdlib.d.ts +++ b/importer/src/test/resources/react-transition-group/in/stdlib.d.ts @@ -1,6 +1,6 @@ -declare interface Array { +/// -} +declare interface Array { } declare type Partial = T; @@ -9,4 +9,23 @@ interface AnimationEvent extends Event { } interface EventTarget { } interface Element { } interface HTMLElement extends Element { } +interface HTMLAnchorElement extends HTMLElement { } +interface HTMLAreaElement extends HTMLElement { } +interface HTMLAudioElement extends HTMLElement { } +interface HTMLAudioElement extends HTMLElement { } interface SVGElement extends Element { } +interface SVGCircleElement extends SVGElement { } + +interface HTMLElementTagNameMap { + "a": HTMLAnchorElement; + "abbr": HTMLElement; + "address": HTMLElement; + "area": HTMLAreaElement; + "article": HTMLElement; + "aside": HTMLElement; + "audio": HTMLAudioElement; +} + +interface SVGElementTagNameMap { + "circle": SVGCircleElement; +} diff --git a/importer/src/test/resources/type-mappings/check/s/std/build.sbt b/importer/src/test/resources/type-mappings/check/s/std/build.sbt index fc3dbeed98..c0e8d4d1fb 100644 --- a/importer/src/test/resources/type-mappings/check/s/std/build.sbt +++ b/importer/src/test/resources/type-mappings/check/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-a0fa89" +version := "0.0-unknown-3b61b9" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/type-mappings/check/s/std/src/main/scala/typings/std/package.scala b/importer/src/test/resources/type-mappings/check/s/std/src/main/scala/typings/std/package.scala index 7c74429e63..f394286f38 100644 --- a/importer/src/test/resources/type-mappings/check/s/std/src/main/scala/typings/std/package.scala +++ b/importer/src/test/resources/type-mappings/check/s/std/src/main/scala/typings/std/package.scala @@ -45,7 +45,7 @@ package object std { /** * Construct a type with a set of properties K of type T */ - type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[K] + type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[T] /** * Make all properties in T required */ diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/build.sbt b/importer/src/test/resources/type-mappings/check/t/type-mappings/build.sbt index d71db65452..c45f2a5978 100644 --- a/importer/src/test/resources/type-mappings/check/t/type-mappings/build.sbt +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "type-mappings" -version := "0.0-unknown-b2fc95" +version := "0.0-unknown-7717b8" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-a0fa89") + "org.scalablytyped" %%% "std" % "0.0-unknown-3b61b9") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonGet.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonGet.scala new file mode 100644 index 0000000000..d4838bedcd --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonGet.scala @@ -0,0 +1,13 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait AnonGet extends js.Object { + def get(): js.UndefOr[Double | Null] = js.native + def set(): Unit = js.native + def set(v: Double): Unit = js.native +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonSet.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonSet.scala new file mode 100644 index 0000000000..03e7964776 --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonSet.scala @@ -0,0 +1,21 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +@js.native +trait AnonSet extends js.Object { + def get(): String = js.native + def set(v: String): Unit = js.native +} + +object AnonSet { + @scala.inline + def apply(get: () => String, set: String => Unit): AnonSet = { + val __obj = js.Dynamic.literal(get = js.Any.fromFunction0(get), set = js.Any.fromFunction1(set)) + + __obj.asInstanceOf[AnonSet] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/Excluded.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/Excluded.scala new file mode 100644 index 0000000000..325503f534 --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/Excluded.scala @@ -0,0 +1,33 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined type-mappings.Omit */ +@js.native +trait Excluded extends js.Object { + var fontFamily: String = js.native + var fontSize: String = js.native + var fontWeight: String = js.native + var letterSpacing: String = js.native + var lineHeight: String = js.native + var textTransform: String = js.native +} + +object Excluded { + @scala.inline + def apply( + fontFamily: String, + fontSize: String, + fontWeight: String, + letterSpacing: String, + lineHeight: String, + textTransform: String + ): Excluded = { + val __obj = js.Dynamic.literal(fontFamily = fontFamily.asInstanceOf[js.Any], fontSize = fontSize.asInstanceOf[js.Any], fontWeight = fontWeight.asInstanceOf[js.Any], letterSpacing = letterSpacing.asInstanceOf[js.Any], lineHeight = lineHeight.asInstanceOf[js.Any], textTransform = textTransform.asInstanceOf[js.Any]) + + __obj.asInstanceOf[Excluded] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/IProxiedPerson.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/IProxiedPerson.scala new file mode 100644 index 0000000000..7eadd9038d --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/IProxiedPerson.scala @@ -0,0 +1,22 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined parent type-mappings.Proxify */ +@js.native +trait IProxiedPerson extends js.Object { + var age: AnonGet = js.native + var name: AnonSet = js.native +} + +object IProxiedPerson { + @scala.inline + def apply(age: AnonGet, name: AnonSet): IProxiedPerson = { + val __obj = js.Dynamic.literal(age = age.asInstanceOf[js.Any], name = name.asInstanceOf[js.Any]) + + __obj.asInstanceOf[IProxiedPerson] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/NamePerson.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/NamePerson.scala new file mode 100644 index 0000000000..fc3c8946ef --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/NamePerson.scala @@ -0,0 +1,21 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined std.Pick */ +@js.native +trait NamePerson extends js.Object { + var name: String = js.native +} + +object NamePerson { + @scala.inline + def apply(name: String): NamePerson = { + val __obj = js.Dynamic.literal(name = name.asInstanceOf[js.Any]) + + __obj.asInstanceOf[NamePerson] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/PartialPerson.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/PartialPerson.scala new file mode 100644 index 0000000000..bea105f8b2 --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/PartialPerson.scala @@ -0,0 +1,23 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined std.Partial */ +@js.native +trait PartialPerson extends js.Object { + var age: js.UndefOr[Double] = js.native + var name: js.UndefOr[String] = js.native +} + +object PartialPerson { + @scala.inline + def apply(age: Int | Double = null, name: String = null): PartialPerson = { + val __obj = js.Dynamic.literal() + if (age != null) __obj.updateDynamic("age")(age.asInstanceOf[js.Any]) + if (name != null) __obj.updateDynamic("name")(name.asInstanceOf[js.Any]) + __obj.asInstanceOf[PartialPerson] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/PersonRecord.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/PersonRecord.scala new file mode 100644 index 0000000000..31baf07fb8 --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/PersonRecord.scala @@ -0,0 +1,22 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined std.Record<'name' | 'age', string> */ +@js.native +trait PersonRecord extends js.Object { + var age: String = js.native + var name: String = js.native +} + +object PersonRecord { + @scala.inline + def apply(age: String, name: String): PersonRecord = { + val __obj = js.Dynamic.literal(age = age.asInstanceOf[js.Any], name = name.asInstanceOf[js.Any]) + + __obj.asInstanceOf[PersonRecord] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/ProxiedPerson.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/ProxiedPerson.scala new file mode 100644 index 0000000000..7f4c510b51 --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/ProxiedPerson.scala @@ -0,0 +1,22 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined type-mappings.Proxify */ +@js.native +trait ProxiedPerson extends js.Object { + var age: AnonGet = js.native + var name: AnonSet = js.native +} + +object ProxiedPerson { + @scala.inline + def apply(age: AnonGet, name: AnonSet): ProxiedPerson = { + val __obj = js.Dynamic.literal(age = age.asInstanceOf[js.Any], name = name.asInstanceOf[js.Any]) + + __obj.asInstanceOf[ProxiedPerson] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/ReadonlyPerson.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/ReadonlyPerson.scala new file mode 100644 index 0000000000..e88cdd713d --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/ReadonlyPerson.scala @@ -0,0 +1,22 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined std.Readonly */ +@js.native +trait ReadonlyPerson extends js.Object { + val age: js.UndefOr[Double] = js.native + val name: String = js.native +} + +object ReadonlyPerson { + @scala.inline + def apply(name: String, age: Int | Double = null): ReadonlyPerson = { + val __obj = js.Dynamic.literal(name = name.asInstanceOf[js.Any]) + if (age != null) __obj.updateDynamic("age")(age.asInstanceOf[js.Any]) + __obj.asInstanceOf[ReadonlyPerson] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/RequiredPerson.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/RequiredPerson.scala new file mode 100644 index 0000000000..1812dd4de4 --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/RequiredPerson.scala @@ -0,0 +1,22 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined std.Required */ +@js.native +trait RequiredPerson extends js.Object { + var age: Double = js.native + var name: String = js.native +} + +object RequiredPerson { + @scala.inline + def apply(age: Double, name: String): RequiredPerson = { + val __obj = js.Dynamic.literal(age = age.asInstanceOf[js.Any], name = name.asInstanceOf[js.Any]) + + __obj.asInstanceOf[RequiredPerson] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/TypographyStyle.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/TypographyStyle.scala new file mode 100644 index 0000000000..7c25b6558b --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/TypographyStyle.scala @@ -0,0 +1,37 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined std.Required> & std.Partial> */ +@js.native +trait TypographyStyle extends js.Object { + var color: String = js.native + var fontFamily: String = js.native + var fontSize: String = js.native + var fontWeight: String = js.native + var letterSpacing: js.UndefOr[String] = js.native + var lineHeight: js.UndefOr[String] = js.native + var textTransform: js.UndefOr[String] = js.native +} + +object TypographyStyle { + @scala.inline + def apply( + color: String, + fontFamily: String, + fontSize: String, + fontWeight: String, + letterSpacing: String = null, + lineHeight: String = null, + textTransform: String = null + ): TypographyStyle = { + val __obj = js.Dynamic.literal(color = color.asInstanceOf[js.Any], fontFamily = fontFamily.asInstanceOf[js.Any], fontSize = fontSize.asInstanceOf[js.Any], fontWeight = fontWeight.asInstanceOf[js.Any]) + if (letterSpacing != null) __obj.updateDynamic("letterSpacing")(letterSpacing.asInstanceOf[js.Any]) + if (lineHeight != null) __obj.updateDynamic("lineHeight")(lineHeight.asInstanceOf[js.Any]) + if (textTransform != null) __obj.updateDynamic("textTransform")(textTransform.asInstanceOf[js.Any]) + __obj.asInstanceOf[TypographyStyle] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/TypographyStyleOptions.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/TypographyStyleOptions.scala new file mode 100644 index 0000000000..a3ba69862e --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/TypographyStyleOptions.scala @@ -0,0 +1,41 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined std.Partial */ +@js.native +trait TypographyStyleOptions extends js.Object { + var color: js.UndefOr[String] = js.native + var fontFamily: js.UndefOr[String] = js.native + var fontSize: js.UndefOr[String] = js.native + var fontWeight: js.UndefOr[String] = js.native + var letterSpacing: js.UndefOr[String] = js.native + var lineHeight: js.UndefOr[String] = js.native + var textTransform: js.UndefOr[String] = js.native +} + +object TypographyStyleOptions { + @scala.inline + def apply( + color: String = null, + fontFamily: String = null, + fontSize: String = null, + fontWeight: String = null, + letterSpacing: String = null, + lineHeight: String = null, + textTransform: String = null + ): TypographyStyleOptions = { + val __obj = js.Dynamic.literal() + if (color != null) __obj.updateDynamic("color")(color.asInstanceOf[js.Any]) + if (fontFamily != null) __obj.updateDynamic("fontFamily")(fontFamily.asInstanceOf[js.Any]) + if (fontSize != null) __obj.updateDynamic("fontSize")(fontSize.asInstanceOf[js.Any]) + if (fontWeight != null) __obj.updateDynamic("fontWeight")(fontWeight.asInstanceOf[js.Any]) + if (letterSpacing != null) __obj.updateDynamic("letterSpacing")(letterSpacing.asInstanceOf[js.Any]) + if (lineHeight != null) __obj.updateDynamic("lineHeight")(lineHeight.asInstanceOf[js.Any]) + if (textTransform != null) __obj.updateDynamic("textTransform")(textTransform.asInstanceOf[js.Any]) + __obj.asInstanceOf[TypographyStyleOptions] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonAgeName.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/U.scala similarity index 63% rename from importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonAgeName.scala rename to importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/U.scala index 8bca91d9d3..789740bec1 100644 --- a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/AnonAgeName.scala +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/U.scala @@ -4,18 +4,19 @@ import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ +/* Inlined std.Pick<{ name :string, age :number}, 'name' | 'age'> */ @js.native -trait AnonAgeName extends js.Object { +trait U extends js.Object { var age: Double = js.native var name: String = js.native } -object AnonAgeName { +object U { @scala.inline - def apply(age: Double, name: String): AnonAgeName = { + def apply(age: Double, name: String): U = { val __obj = js.Dynamic.literal(age = age.asInstanceOf[js.Any], name = name.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonAgeName] + __obj.asInstanceOf[U] } } diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/V.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/V.scala new file mode 100644 index 0000000000..095857d294 --- /dev/null +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/V.scala @@ -0,0 +1,21 @@ +package typings.typeMappings + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined std.Pick<{ name :string, age :number}, 'age'> */ +@js.native +trait V extends js.Object { + var age: Double = js.native +} + +object V { + @scala.inline + def apply(age: Double): V = { + val __obj = js.Dynamic.literal(age = age.asInstanceOf[js.Any]) + + __obj.asInstanceOf[V] + } +} + diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/package.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/package.scala index 3a347ad843..6de7c51651 100644 --- a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/package.scala +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/package.scala @@ -5,44 +5,16 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ package object typeMappings { - type Excluded = typings.typeMappings.Omit[typings.typeMappings.CSSProperties, typings.typeMappings.typeMappingsStrings.color] type IPersonRecord = typings.typeMappings.PersonRecord - type IProxiedPerson = typings.typeMappings.Proxify[typings.typeMappings.Person] - type NamePerson = typings.std.Pick[typings.typeMappings.Person, typings.typeMappings.typeMappingsStrings.name] type NewedPerson = typings.std.InstanceType[org.scalablytyped.runtime.Instantiable0[typings.typeMappings.Person]] type NonNullablePerson = typings.std.NonNullable[typings.typeMappings.Person] type Omit[T, K /* <: java.lang.String */] = typings.std.Pick[T, typings.std.Exclude[java.lang.String, K]] - type PartialPerson = typings.std.Partial[typings.typeMappings.Person] - type PersonRecord = typings.std.Record[ - typings.typeMappings.typeMappingsStrings.name | typings.typeMappings.typeMappingsStrings.age, - java.lang.String - ] - type ProxiedPerson = typings.typeMappings.Proxify[typings.typeMappings.Person] type Proxify[T] = /* import warning: importer.ImportType#apply c Unsupported type mapping: {[ P in keyof T ]: {get (): T[P], set (v : T[P]): void}} */ typings.typeMappings.typeMappingsStrings.Proxify with js.Any - type ReadonlyPerson = typings.typeMappings.Person - type RequiredPerson = typings.std.Required[typings.typeMappings.Person] type ReturnedPerson = typings.std.ReturnType[js.Function0[typings.typeMappings.Person]] type T = typings.std.Pick[ typings.typeMappings.AnonName | typings.typeMappings.AnonAge, typings.typeMappings.typeMappingsStrings.name with typings.typeMappings.typeMappingsStrings.age ] - type TypographyStyle = (typings.std.Required[ - typings.std.Pick[ - typings.typeMappings.CSSProperties, - typings.typeMappings.typeMappingsStrings.fontFamily | typings.typeMappings.typeMappingsStrings.fontSize | typings.typeMappings.typeMappingsStrings.fontWeight | typings.typeMappings.typeMappingsStrings.color - ] - ]) with (typings.std.Partial[ - typings.std.Pick[ - typings.typeMappings.CSSProperties, - typings.typeMappings.typeMappingsStrings.letterSpacing | typings.typeMappings.typeMappingsStrings.lineHeight | typings.typeMappings.typeMappingsStrings.textTransform - ] - ]) - type TypographyStyleOptions = /* InlineNestedIdentityAlias: typings.std.Partial*/ typings.typeMappings.TypographyStyle - type U = typings.std.Pick[ - typings.typeMappings.AnonAgeName, - typings.typeMappings.typeMappingsStrings.name | typings.typeMappings.typeMappingsStrings.age - ] - type V = typings.std.Pick[typings.typeMappings.AnonAgeName, typings.typeMappings.typeMappingsStrings.age] } diff --git a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/typeMappingsStrings.scala b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/typeMappingsStrings.scala index 5b7dc91634..16eebce3be 100644 --- a/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/typeMappingsStrings.scala +++ b/importer/src/test/resources/type-mappings/check/t/type-mappings/src/main/scala/typings/typeMappings/typeMappingsStrings.scala @@ -11,49 +11,14 @@ object typeMappingsStrings { @js.native sealed trait age extends js.Object - @js.native - sealed trait color extends js.Object - - @js.native - sealed trait fontFamily extends js.Object - - @js.native - sealed trait fontSize extends js.Object - - @js.native - sealed trait fontWeight extends js.Object - - @js.native - sealed trait letterSpacing extends js.Object - - @js.native - sealed trait lineHeight extends js.Object - @js.native sealed trait name extends js.Object - @js.native - sealed trait textTransform extends js.Object - @scala.inline def Proxify: Proxify = "Proxify".asInstanceOf[Proxify] @scala.inline def age: age = "age".asInstanceOf[age] @scala.inline - def color: color = "color".asInstanceOf[color] - @scala.inline - def fontFamily: fontFamily = "fontFamily".asInstanceOf[fontFamily] - @scala.inline - def fontSize: fontSize = "fontSize".asInstanceOf[fontSize] - @scala.inline - def fontWeight: fontWeight = "fontWeight".asInstanceOf[fontWeight] - @scala.inline - def letterSpacing: letterSpacing = "letterSpacing".asInstanceOf[letterSpacing] - @scala.inline - def lineHeight: lineHeight = "lineHeight".asInstanceOf[lineHeight] - @scala.inline def name: name = "name".asInstanceOf[name] - @scala.inline - def textTransform: textTransform = "textTransform".asInstanceOf[textTransform] } diff --git a/importer/src/test/resources/void-elements/check/s/std/build.sbt b/importer/src/test/resources/void-elements/check/s/std/build.sbt index 24aa0ec389..25bba37075 100644 --- a/importer/src/test/resources/void-elements/check/s/std/build.sbt +++ b/importer/src/test/resources/void-elements/check/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-05e66e" +version := "0.0-unknown-e2f8ec" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/void-elements/check/s/std/src/main/scala/typings/std/package.scala b/importer/src/test/resources/void-elements/check/s/std/src/main/scala/typings/std/package.scala index 3fdf737c3e..9c58c47d9a 100644 --- a/importer/src/test/resources/void-elements/check/s/std/src/main/scala/typings/std/package.scala +++ b/importer/src/test/resources/void-elements/check/s/std/src/main/scala/typings/std/package.scala @@ -8,5 +8,5 @@ package object std { type Partial[T] = /* import warning: importer.ImportType#apply c Unsupported type mapping: {[ P in keyof T ]:? T[P]} */ typings.std.stdStrings.Partial with T - type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[K] + type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[T] } diff --git a/importer/src/test/resources/void-elements/check/v/void-elements/build.sbt b/importer/src/test/resources/void-elements/check/v/void-elements/build.sbt index 1cbf91de04..1bac0c95be 100644 --- a/importer/src/test/resources/void-elements/check/v/void-elements/build.sbt +++ b/importer/src/test/resources/void-elements/check/v/void-elements/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "void-elements" -version := "3.1-7db42e" +version := "3.1-b6d9a3" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-05e66e") + "org.scalablytyped" %%% "std" % "0.0-unknown-e2f8ec") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/vue/check/s/std/build.sbt b/importer/src/test/resources/vue/check/s/std/build.sbt index 8b0be27783..3745d018e3 100644 --- a/importer/src/test/resources/vue/check/s/std/build.sbt +++ b/importer/src/test/resources/vue/check/s/std/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "std" -version := "0.0-unknown-16b1df" +version := "0.0-unknown-a660db" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/importer/src/test/resources/vue/check/s/std/src/main/scala/typings/std/package.scala b/importer/src/test/resources/vue/check/s/std/src/main/scala/typings/std/package.scala index 1ef6b36566..ab4c5f2495 100644 --- a/importer/src/test/resources/vue/check/s/std/src/main/scala/typings/std/package.scala +++ b/importer/src/test/resources/vue/check/s/std/src/main/scala/typings/std/package.scala @@ -10,5 +10,5 @@ package object std { type Readonly[T] = /* import warning: importer.ImportType#apply c Unsupported type mapping: {readonly [ P in keyof T ]: T[P]} */ typings.std.stdStrings.Readonly with T - type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[K] + type Record[K /* <: java.lang.String */, T] = org.scalablytyped.runtime.StringDictionary[T] } diff --git a/importer/src/test/resources/vue/check/s/storybook__vue/build.sbt b/importer/src/test/resources/vue/check/s/storybook__vue/build.sbt index d9b42fbc28..195ec3cbb6 100644 --- a/importer/src/test/resources/vue/check/s/storybook__vue/build.sbt +++ b/importer/src/test/resources/vue/check/s/storybook__vue/build.sbt @@ -1,13 +1,13 @@ organization := "org.scalablytyped" name := "storybook__vue" -version := "3.3-005a05" +version := "3.3-c3d2eb" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-16b1df", - "org.scalablytyped" %%% "vue" % "2.5.13-157c85", - "org.scalablytyped" %%% "webpack-env" % "1.13-b3cada") + "org.scalablytyped" %%% "std" % "0.0-unknown-a660db", + "org.scalablytyped" %%% "vue" % "2.5.13-c38e2c", + "org.scalablytyped" %%% "webpack-env" % "1.13-63a4e2") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/vue/check/v/vue-resource/build.sbt b/importer/src/test/resources/vue/check/v/vue-resource/build.sbt index 3c7d47df4f..c5c414361f 100644 --- a/importer/src/test/resources/vue/check/v/vue-resource/build.sbt +++ b/importer/src/test/resources/vue/check/v/vue-resource/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "vue-resource" -version := "0.9.3-9d9743" +version := "0.9.3-dc7fd5" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-16b1df") + "org.scalablytyped" %%% "std" % "0.0-unknown-a660db") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonDelete.scala b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonCall.scala similarity index 98% rename from importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonDelete.scala rename to importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonCall.scala index a57225dcf6..0c3104fe6e 100644 --- a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonDelete.scala +++ b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonCall.scala @@ -8,7 +8,7 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonDelete extends js.Object { +trait AnonCall extends js.Object { @JSName("delete") var delete_Original: http = js.native @JSName("get") diff --git a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonHeaders.scala b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonHeaders.scala deleted file mode 100644 index b7b2e211b7..0000000000 --- a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonHeaders.scala +++ /dev/null @@ -1,24 +0,0 @@ -package typings.vueResource - -import org.scalablytyped.runtime.StringDictionary -import typings.vueResource.vuejs.HttpHeaders -import scala.scalajs.js -import scala.scalajs.js.`|` -import scala.scalajs.js.annotation._ - -@js.native -trait AnonHeaders - extends /* key */ StringDictionary[js.Any] { - var headers: js.UndefOr[HttpHeaders] = js.native -} - -object AnonHeaders { - @scala.inline - def apply(StringDictionary: /* key */ StringDictionary[js.Any] = null, headers: HttpHeaders = null): AnonHeaders = { - val __obj = js.Dynamic.literal() - if (StringDictionary != null) js.Dynamic.global.Object.assign(__obj, StringDictionary) - if (headers != null) __obj.updateDynamic("headers")(headers.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonHeaders] - } -} - diff --git a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonRoot.scala b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonRoot.scala deleted file mode 100644 index 73ae2ba28c..0000000000 --- a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/AnonRoot.scala +++ /dev/null @@ -1,20 +0,0 @@ -package typings.vueResource - -import scala.scalajs.js -import scala.scalajs.js.`|` -import scala.scalajs.js.annotation._ - -@js.native -trait AnonRoot extends js.Object { - var root: String = js.native -} - -object AnonRoot { - @scala.inline - def apply(root: String): AnonRoot = { - val __obj = js.Dynamic.literal(root = root.asInstanceOf[js.Any]) - - __obj.asInstanceOf[AnonRoot] - } -} - diff --git a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/HttpOptionsrootstring.scala b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/HttpOptionsrootstring.scala new file mode 100644 index 0000000000..a52e22d82d --- /dev/null +++ b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/HttpOptionsrootstring.scala @@ -0,0 +1,52 @@ +package typings.vueResource + +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined vue-resource.vuejs.HttpOptions & { root :string} */ +@js.native +trait HttpOptionsrootstring extends js.Object { + var before: js.UndefOr[js.Function1[/* request */ js.Any, _]] = js.native + var body: js.UndefOr[js.Any] = js.native + var credentials: js.UndefOr[Boolean] = js.native + var emulateHTTP: js.UndefOr[Boolean] = js.native + var emulateJSON: js.UndefOr[Boolean] = js.native + var headers: js.UndefOr[js.Any] = js.native + var method: js.UndefOr[String] = js.native + var params: js.UndefOr[js.Any] = js.native + var progress: js.UndefOr[js.Function1[/* event */ js.Any, _]] = js.native + var root: String = js.native + var url: js.UndefOr[String] = js.native +} + +object HttpOptionsrootstring { + @scala.inline + def apply( + root: String, + before: /* request */ js.Any => _ = null, + body: js.Any = null, + credentials: js.UndefOr[Boolean] = js.undefined, + emulateHTTP: js.UndefOr[Boolean] = js.undefined, + emulateJSON: js.UndefOr[Boolean] = js.undefined, + headers: js.Any = null, + method: String = null, + params: js.Any = null, + progress: /* event */ js.Any => _ = null, + url: String = null + ): HttpOptionsrootstring = { + val __obj = js.Dynamic.literal(root = root.asInstanceOf[js.Any]) + if (before != null) __obj.updateDynamic("before")(js.Any.fromFunction1(before)) + if (body != null) __obj.updateDynamic("body")(body.asInstanceOf[js.Any]) + if (!js.isUndefined(credentials)) __obj.updateDynamic("credentials")(credentials.asInstanceOf[js.Any]) + if (!js.isUndefined(emulateHTTP)) __obj.updateDynamic("emulateHTTP")(emulateHTTP.asInstanceOf[js.Any]) + if (!js.isUndefined(emulateJSON)) __obj.updateDynamic("emulateJSON")(emulateJSON.asInstanceOf[js.Any]) + if (headers != null) __obj.updateDynamic("headers")(headers.asInstanceOf[js.Any]) + if (method != null) __obj.updateDynamic("method")(method.asInstanceOf[js.Any]) + if (params != null) __obj.updateDynamic("params")(params.asInstanceOf[js.Any]) + if (progress != null) __obj.updateDynamic("progress")(js.Any.fromFunction1(progress)) + if (url != null) __obj.updateDynamic("url")(url.asInstanceOf[js.Any]) + __obj.asInstanceOf[HttpOptionsrootstring] + } +} + diff --git a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/headersHttpHeaderskeystri.scala b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/headersHttpHeaderskeystri.scala new file mode 100644 index 0000000000..445928fa5b --- /dev/null +++ b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/headersHttpHeaderskeystri.scala @@ -0,0 +1,55 @@ +package typings.vueResource + +import org.scalablytyped.runtime.StringDictionary +import typings.vueResource.vuejs.HttpHeaders +import scala.scalajs.js +import scala.scalajs.js.`|` +import scala.scalajs.js.annotation._ + +/* Inlined { headers ? :vue-resource.vuejs.HttpHeaders, [key: string] : any} & vue-resource.vuejs.HttpOptions */ +@js.native +trait headersHttpHeaderskeystri + extends /* key */ StringDictionary[js.Any] { + var before: js.UndefOr[js.Function1[/* request */ js.Any, _]] = js.native + var body: js.UndefOr[js.Any] = js.native + var credentials: js.UndefOr[Boolean] = js.native + var emulateHTTP: js.UndefOr[Boolean] = js.native + var emulateJSON: js.UndefOr[Boolean] = js.native + var headers: js.UndefOr[HttpHeaders with js.Any] = js.native + var method: js.UndefOr[String] = js.native + var params: js.UndefOr[js.Any] = js.native + var progress: js.UndefOr[js.Function1[/* event */ js.Any, _]] = js.native + var url: js.UndefOr[String] = js.native +} + +object headersHttpHeaderskeystri { + @scala.inline + def apply( + StringDictionary: /* key */ StringDictionary[js.Any] = null, + before: /* request */ js.Any => _ = null, + body: js.Any = null, + credentials: js.UndefOr[Boolean] = js.undefined, + emulateHTTP: js.UndefOr[Boolean] = js.undefined, + emulateJSON: js.UndefOr[Boolean] = js.undefined, + headers: HttpHeaders with js.Any = null, + method: String = null, + params: js.Any = null, + progress: /* event */ js.Any => _ = null, + url: String = null + ): headersHttpHeaderskeystri = { + val __obj = js.Dynamic.literal() + if (StringDictionary != null) js.Dynamic.global.Object.assign(__obj, StringDictionary) + if (before != null) __obj.updateDynamic("before")(js.Any.fromFunction1(before)) + if (body != null) __obj.updateDynamic("body")(body.asInstanceOf[js.Any]) + if (!js.isUndefined(credentials)) __obj.updateDynamic("credentials")(credentials.asInstanceOf[js.Any]) + if (!js.isUndefined(emulateHTTP)) __obj.updateDynamic("emulateHTTP")(emulateHTTP.asInstanceOf[js.Any]) + if (!js.isUndefined(emulateJSON)) __obj.updateDynamic("emulateJSON")(emulateJSON.asInstanceOf[js.Any]) + if (headers != null) __obj.updateDynamic("headers")(headers.asInstanceOf[js.Any]) + if (method != null) __obj.updateDynamic("method")(method.asInstanceOf[js.Any]) + if (params != null) __obj.updateDynamic("params")(params.asInstanceOf[js.Any]) + if (progress != null) __obj.updateDynamic("progress")(js.Any.fromFunction1(progress)) + if (url != null) __obj.updateDynamic("url")(url.asInstanceOf[js.Any]) + __obj.asInstanceOf[headersHttpHeaderskeystri] + } +} + diff --git a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/ComponentOption.scala b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/ComponentOption.scala index 9c1a138eaf..ef5442085c 100644 --- a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/ComponentOption.scala +++ b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/ComponentOption.scala @@ -1,18 +1,18 @@ package typings.vueResource.vuejs -import typings.vueResource.AnonHeaders +import typings.vueResource.headersHttpHeaderskeystri import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native trait ComponentOption extends js.Object { - var http: js.UndefOr[AnonHeaders with HttpOptions] = js.native + var http: js.UndefOr[headersHttpHeaderskeystri] = js.native } object ComponentOption { @scala.inline - def apply(http: AnonHeaders with HttpOptions = null): ComponentOption = { + def apply(http: headersHttpHeaderskeystri = null): ComponentOption = { val __obj = js.Dynamic.literal() if (http != null) __obj.updateDynamic("http")(http.asInstanceOf[js.Any]) __obj.asInstanceOf[ComponentOption] diff --git a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/Http_.scala b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/Http_.scala index da25daefbe..f908b39c93 100644 --- a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/Http_.scala +++ b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/Http_.scala @@ -1,6 +1,6 @@ package typings.vueResource.vuejs -import typings.vueResource.AnonRoot +import typings.vueResource.HttpOptionsrootstring import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -15,7 +15,7 @@ trait Http_ extends js.Object { var interceptors: js.Array[HttpInterceptor | js.Function0[HttpInterceptor]] = js.native @JSName("jsonp") var jsonp_Original: http = js.native - var options: HttpOptions with AnonRoot = js.native + var options: HttpOptionsrootstring = js.native @JSName("patch") var patch_Original: http = js.native @JSName("post") diff --git a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/Vue.scala b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/Vue.scala index 2eeb77f882..3ac35d03b5 100644 --- a/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/Vue.scala +++ b/importer/src/test/resources/vue/check/v/vue-resource/src/main/scala/typings/vueResource/vuejs/Vue.scala @@ -1,6 +1,6 @@ package typings.vueResource.vuejs -import typings.vueResource.AnonDelete +import typings.vueResource.AnonCall import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -8,7 +8,7 @@ import scala.scalajs.js.annotation._ @js.native trait Vue extends js.Object { @JSName("$http") - var $http_Original: AnonDelete = js.native + var $http_Original: AnonCall = js.native @JSName("$resource") var $resource_Original: resource = js.native @JSName("$http") diff --git a/importer/src/test/resources/vue/check/v/vue-scrollto/build.sbt b/importer/src/test/resources/vue/check/v/vue-scrollto/build.sbt index 01376692cf..f957c1a13d 100644 --- a/importer/src/test/resources/vue/check/v/vue-scrollto/build.sbt +++ b/importer/src/test/resources/vue/check/v/vue-scrollto/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "vue-scrollto" -version := "2.7-1d7a7a" +version := "2.7-e9145e" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-16b1df", - "org.scalablytyped" %%% "vue" % "2.5.13-157c85") + "org.scalablytyped" %%% "std" % "0.0-unknown-a660db", + "org.scalablytyped" %%% "vue" % "2.5.13-c38e2c") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/vue/check/v/vue/build.sbt b/importer/src/test/resources/vue/check/v/vue/build.sbt index 98974b6ad3..2914e53260 100644 --- a/importer/src/test/resources/vue/check/v/vue/build.sbt +++ b/importer/src/test/resources/vue/check/v/vue/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "vue" -version := "2.5.13-157c85" +version := "2.5.13-c38e2c" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-16b1df") + "org.scalablytyped" %%% "std" % "0.0-unknown-a660db") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonArgs.scala b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonInstantiable.scala similarity index 90% rename from importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonArgs.scala rename to importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonInstantiable.scala index 9de0c4caeb..74eb4109a4 100644 --- a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonArgs.scala +++ b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonInstantiable.scala @@ -6,6 +6,6 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonArgs[T] +trait AnonInstantiable[T] extends Instantiable1[/* args (repeated) */ js.Any, T with js.Object] diff --git a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonCreateElement.scala b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonStaticRenderFns.scala similarity index 76% rename from importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonCreateElement.scala rename to importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonStaticRenderFns.scala index 7f7512e4ce..5453032ac9 100644 --- a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonCreateElement.scala +++ b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/AnonStaticRenderFns.scala @@ -7,17 +7,17 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait AnonCreateElement extends js.Object { +trait AnonStaticRenderFns extends js.Object { var staticRenderFns: js.Array[js.Function0[VNode]] = js.native def render(createElement: CreateElement): VNode = js.native } -object AnonCreateElement { +object AnonStaticRenderFns { @scala.inline - def apply(render: CreateElement => VNode, staticRenderFns: js.Array[js.Function0[VNode]]): AnonCreateElement = { + def apply(render: CreateElement => VNode, staticRenderFns: js.Array[js.Function0[VNode]]): AnonStaticRenderFns = { val __obj = js.Dynamic.literal(render = js.Any.fromFunction1(render), staticRenderFns = staticRenderFns.asInstanceOf[js.Any]) - __obj.asInstanceOf[AnonCreateElement] + __obj.asInstanceOf[AnonStaticRenderFns] } } diff --git a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnArray.scala b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnCall.scala similarity index 88% rename from importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnArray.scala rename to importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnCall.scala index 9e7af6200a..06b516c23f 100644 --- a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnArray.scala +++ b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnCall.scala @@ -5,7 +5,7 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait FnArray extends js.Object { +trait FnCall extends js.Object { def apply[T](array: js.Array[T], key: Double, value: T): T = js.native def apply[T](`object`: js.Object, key: String, value: T): T = js.native } diff --git a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnArrayKey.scala b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnCallObjectKey.scala similarity index 85% rename from importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnArrayKey.scala rename to importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnCallObjectKey.scala index 8e1bac2521..2e7c85efb4 100644 --- a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnArrayKey.scala +++ b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/FnCallObjectKey.scala @@ -5,7 +5,7 @@ import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait FnArrayKey extends js.Object { +trait FnCallObjectKey extends js.Object { def apply(`object`: js.Object, key: String): Unit = js.native def apply[T](array: js.Array[T], key: Double): Unit = js.native } diff --git a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/optionsMod/package.scala b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/optionsMod/package.scala index c62df9f556..45abccd6da 100644 --- a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/optionsMod/package.scala +++ b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/optionsMod/package.scala @@ -38,7 +38,7 @@ package object optionsMod { ] type InjectKey = java.lang.String | js.Symbol type InjectOptions = (org.scalablytyped.runtime.StringDictionary[typings.vue.optionsMod.InjectKey | typings.vue.AnonDefault]) | js.Array[java.lang.String] - type Prop[T] = js.Function0[T] | typings.vue.AnonArgs[T] + type Prop[T] = js.Function0[T] | typings.vue.AnonInstantiable[T] type PropValidator[T] = typings.vue.optionsMod.PropOptions[T] | typings.vue.optionsMod.Prop[T] | js.Array[typings.vue.optionsMod.Prop[T]] type PropsDefinition[T] = typings.vue.optionsMod.ArrayPropsDefinition[T] | typings.vue.optionsMod.RecordPropsDefinition[T] type RecordPropsDefinition[T] = /* import warning: importer.ImportType#apply c Unsupported type mapping: diff --git a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/vueMod/Vue.scala b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/vueMod/Vue.scala index ab38b81565..ff54bb8585 100644 --- a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/vueMod/Vue.scala +++ b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/vueMod/Vue.scala @@ -5,8 +5,8 @@ import org.scalablytyped.runtime.TopLevel import typings.std.Element import typings.std.HTMLElement import typings.std.Record -import typings.vue.FnArray -import typings.vue.FnArrayKey +import typings.vue.FnCall +import typings.vue.FnCallObjectKey import typings.vue.optionsMod.AsyncComponent import typings.vue.optionsMod.Component import typings.vue.optionsMod.ComponentOptions @@ -35,7 +35,7 @@ trait Vue extends js.Object { @JSName("$data") val $data: Record[String, _] = js.native @JSName("$delete") - var $delete_Original: FnArrayKey = js.native + var $delete_Original: FnCallObjectKey = js.native @JSName("$el") val $el: HTMLElement = js.native @JSName("$isServer") @@ -61,7 +61,7 @@ trait Vue extends js.Object { @JSName("$scopedSlots") val $scopedSlots: StringDictionary[ScopedSlot] = js.native @JSName("$set") - var $set_Original: FnArray = js.native + var $set_Original: FnCall = js.native @JSName("$slots") val $slots: StringDictionary[js.Array[VNode]] = js.native @JSName("$ssrContext") diff --git a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/vueMod/VueConstructor.scala b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/vueMod/VueConstructor.scala index b43b1a7d7e..c53da4935f 100644 --- a/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/vueMod/VueConstructor.scala +++ b/importer/src/test/resources/vue/check/v/vue/src/main/scala/typings/vue/vueMod/VueConstructor.scala @@ -3,7 +3,7 @@ package typings.vue.vueMod import org.scalablytyped.runtime.Instantiable0 import org.scalablytyped.runtime.Instantiable1 import typings.std.Record -import typings.vue.AnonCreateElement +import typings.vue.AnonStaticRenderFns import typings.vue.optionsMod.AsyncComponent import typings.vue.optionsMod.ComponentOptions import typings.vue.optionsMod.DefaultComputed @@ -32,7 +32,7 @@ Instantiable0[CombinedVueInstance[V, js.Object, js.Object, js.Object, Record[Str CombinedVueInstance[V, js.Object, js.Object, js.Object, Record[String, js.Any]] ] { var config: VueConfiguration = js.native - def compile(template: String): AnonCreateElement = js.native + def compile(template: String): AnonStaticRenderFns = js.native def component(id: String): ExtendedVue[V, js.Object, js.Object, js.Object, js.Object] = js.native def component( id: String, diff --git a/importer/src/test/resources/vue/check/w/webpack-env/build.sbt b/importer/src/test/resources/vue/check/w/webpack-env/build.sbt index d352c13491..2133821002 100644 --- a/importer/src/test/resources/vue/check/w/webpack-env/build.sbt +++ b/importer/src/test/resources/vue/check/w/webpack-env/build.sbt @@ -1,11 +1,11 @@ organization := "org.scalablytyped" name := "webpack-env" -version := "1.13-b3cada" +version := "1.13-63a4e2" scalaVersion := "2.13.1" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", - "org.scalablytyped" %%% "std" % "0.0-unknown-16b1df") + "org.scalablytyped" %%% "std" % "0.0-unknown-a660db") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-g:notailcalls", "-P:scalajs:sjsDefinedByDefault") licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/importer/src/test/scala/org/scalablytyped/converter/internal/importer/ImporterHarness.scala b/importer/src/test/scala/org/scalablytyped/converter/internal/importer/ImporterHarness.scala index 7ee59fc3fd..d4a5fc9a6a 100644 --- a/importer/src/test/scala/org/scalablytyped/converter/internal/importer/ImporterHarness.scala +++ b/importer/src/test/scala/org/scalablytyped/converter/internal/importer/ImporterHarness.scala @@ -13,7 +13,7 @@ import org.scalablytyped.converter.internal.importer.build.{BloopCompiler, Publi import org.scalablytyped.converter.internal.importer.documentation.Npmjs import org.scalablytyped.converter.internal.phases.{PhaseListener, PhaseRes, PhaseRunner, RecPhase} import org.scalablytyped.converter.internal.scalajs.{Name, Versions} -import org.scalablytyped.converter.internal.scalajs.flavours.FlavourImpl +import org.scalablytyped.converter.internal.scalajs.flavours.{FlavourImpl, SlinkyFlavour} import org.scalablytyped.converter.internal.ts._ import org.scalatest.Assertion import org.scalatest.funsuite.AnyFunSuite @@ -83,9 +83,10 @@ trait ImporterHarness extends AnyFunSuite { publishUser = "oyvindberg", publishFolder = publishFolder, metadataFetcher = Npmjs.No, - softWrites = false, + softWrites = true, flavour = flavour, generateScalaJsBundlerFile = true, + ensureSourceFilesWritten = true, ), "build", ) @@ -122,7 +123,7 @@ trait ImporterHarness extends AnyFunSuite { val targetFolder = os.Path(Files.createTempDirectory("scalablytyped-test-")) val checkFolder = testFolder.path / (flavour match { case _: FlavourImpl.Normal => "check" - case _: FlavourImpl.Slinky => "check-slinky" + case _: SlinkyFlavour => "check-slinky" case _: FlavourImpl.SlinkyNative => "check-slinky-native" case _: FlavourImpl.Japgolly => "check-japgolly" }) diff --git a/importer/src/test/scala/org/scalablytyped/converter/internal/importer/ImporterTest.scala b/importer/src/test/scala/org/scalablytyped/converter/internal/importer/ImporterTest.scala index d2ac38aae1..6ce1f5f3f2 100644 --- a/importer/src/test/scala/org/scalablytyped/converter/internal/importer/ImporterTest.scala +++ b/importer/src/test/scala/org/scalablytyped/converter/internal/importer/ImporterTest.scala @@ -2,13 +2,13 @@ package org.scalablytyped.converter.internal package importer import org.scalablytyped.converter.internal.scalajs.Name -import org.scalablytyped.converter.internal.scalajs.flavours.FlavourImpl +import org.scalablytyped.converter.internal.scalajs.flavours.{FlavourImpl, SlinkyFlavour} import org.scalatest.ParallelTestExecution import org.scalatest.funsuite.AnyFunSuite class ImporterTest extends AnyFunSuite with ImporterHarness with ParallelTestExecution { val update = !constants.isCi - val Slinky = FlavourImpl.Slinky(Name("typingsSlinky")) + val Slinky = SlinkyFlavour(Name("typingsSlinky")) val Japgolly = FlavourImpl.Japgolly(Name("typingsJapgolly")) test("augment-module")(assertImportsOk("augment-module", pedantic = false, update = update)) diff --git a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/LexerTests.scala b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/LexerTests.scala index 9743f788d1..dd0a564c16 100644 --- a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/LexerTests.scala +++ b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/LexerTests.scala @@ -19,9 +19,22 @@ final class LexerTests extends AnyFunSuite with Matchers { TsLexer.CommentLineToken("//A\n"), ) } + test("string literal") { shouldParseAs("`a`", TsLexer.stringLiteral)( TsLexer.StringLit("a"), ) } + + test("-readonly") { + shouldParseAs("-readonly", TsLexer.token)( + TsLexer.Keyword("-readonly"), + ) + } + + test("...") { + shouldParseAs("...", TsLexer.token)( + TsLexer.Keyword("..."), + ) + } } diff --git a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/ParserTests.scala b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/ParserTests.scala index cad31399eb..c9e2c796c2 100644 --- a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/ParserTests.scala +++ b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/ParserTests.scala @@ -1202,7 +1202,7 @@ final class ParserTests extends AnyFunSuite { TsMemberTypeMapped( NoComments, level = ProtectionLevel.Default, - isReadOnly = false, + readonly = ReadonlyModifier.Noop, key = TsIdent("P"), from = TsTypeKeyOf(TsTypeRef(NoComments, TsQIdent.of("T"), Empty)), optionalize = OptionalModifier.Optionalize, @@ -1239,7 +1239,7 @@ final class ParserTests extends AnyFunSuite { TsMemberTypeMapped( comments = NoComments, level = ProtectionLevel.Default, - isReadOnly = false, + readonly = ReadonlyModifier.Noop, key = TsIdent("P"), from = TsTypeRef(NoComments, TsQIdent.of("K"), Empty), optionalize = OptionalModifier.Noop, @@ -1268,7 +1268,7 @@ final class ParserTests extends AnyFunSuite { TsMemberTypeMapped( NoComments, level = ProtectionLevel.Default, - isReadOnly = false, + readonly = ReadonlyModifier.Noop, key = TsIdent("P"), from = TsTypeKeyOf(T), optionalize = OptionalModifier.Noop, @@ -1337,7 +1337,7 @@ type Readonly = { TsMemberTypeMapped( comments = NoComments, level = ProtectionLevel.Default, - isReadOnly = true, + readonly = ReadonlyModifier.Yes, key = TsIdentSimple("P"), from = TsTypeKeyOf(T), optionalize = Noop, @@ -2142,7 +2142,7 @@ type Readonly = { TsMemberTypeMapped( NoComments, ProtectionLevel.Default, - isReadOnly = false, + ReadonlyModifier.Noop, TsIdentSimple("P"), TsTypeKeyOf(T), OptionalModifier.Deoptionalize, @@ -2349,7 +2349,7 @@ type Readonly = { IArray( TsTypeRef(NoComments, TsQIdent.number, Empty), TsTypeRef(NoComments, TsQIdent.number, Empty), - TsTypeRepeated(TsTypeRef(NoComments, TsQIdent.of("T"), Empty)), + TsTypeRepeated(TsTypeRef(NoComments, TsQIdent.Array, IArray(TsTypeRef(NoComments, TsQIdent.of("T"), Empty)))), ), ), ) @@ -2516,7 +2516,7 @@ export {}; TsMemberTypeMapped( NoComments, ProtectionLevel.Default, - isReadOnly = false, + ReadonlyModifier.Noop, TsIdentSimple("key"), T, OptionalModifier.Optionalize, @@ -2525,12 +2525,74 @@ export {}; ) } + test("-readonly") { + shouldParseAs("""{-readonly [P in keyof T]: number}""", TsParser.tsMembers)( + IArray( + TsMemberTypeMapped( + NoComments, + ProtectionLevel.Default, + ReadonlyModifier.No, + TsIdentSimple("P"), + TsTypeKeyOf(T), + Noop, + TsTypeRef.number, + ), + ), + ) + } + test("asserts types") { shouldParseAs("""asserts assertion""", TsParser.tsType)( - TsTypeAsserts(TsIdent("assertion")), + TsTypeAsserts(TsIdent("assertion"), None), + ) + shouldParseAs("""asserts actual is T""".stripMargin, TsParser.tsType)(TsTypeAsserts(TsIdent("actual"), Some(T))) + } + + test("[string, ...PrimitiveArray]") { + shouldParseAs("""[string, ...PrimitiveArray]""", TsParser.tsTypeTuple)( + TsTypeTuple(IArray(TsTypeRef.string, TsTypeRepeated(TsTypeRef.of(TsIdentSimple("PrimitiveArray"))))), + ) + } + + test("expr with parents") { + shouldParseAs("""(1 << 2)""", TsParser.expr)( + TsExpr.BinaryOp(TsExpr.Literal(TsLiteralNumber("1")), "<<", TsExpr.Literal(TsLiteralNumber("2"))), ) } + test("stray ;") { + shouldParseAs( + """|class A { + | ; + | public operator: string + |}""".stripMargin, + TsParser.tsDecl, + )( + TsDeclClass( + NoComments, + declared = false, + isAbstract = false, + TsIdentSimple("A"), + IArray(), + None, + IArray(), + IArray( + TsMemberProperty( + NoComments, + ProtectionLevel.Default, + TsIdentSimple("operator"), + Some(TsTypeRef(NoComments, TsQIdent.string, IArray())), + None, + isStatic = false, + isReadOnly = false, + isOptional = false, + ), + ), + Zero, + CodePath.NoPath, + ), + ) + } test("expr") { shouldParseAs( """export declare const start = ActionTypes.Start""", @@ -2574,7 +2636,7 @@ export {}; TsExpr.Ref(TsTypeRef(NoComments, TsQIdent(IArray(TsIdentSimple("WARNING"))), Empty)), ), ) - shouldParseAs("""(LoggingLevel.ERROR)(6 + 7)""", TsParser.expr)( + shouldParseAs("""LoggingLevel.ERROR(6 + 7)""", TsParser.expr)( TsExpr.Call( TsExpr.Ref( TsTypeRef(NoComments, TsQIdent(IArray(TsIdentSimple("LoggingLevel"), TsIdentSimple("ERROR"))), Empty), @@ -2603,10 +2665,27 @@ export {}; ), ) - shouldParseAs("""1e-7""", TsParser.expr)(TsExpr.Literal(TsLiteralNumber("1e-7"))) + shouldParseAs("""1e-7""", TsParser.expr)( + TsExpr.Literal(TsLiteralNumber("1e-7")), + ) + + shouldParseAs("""(0x000FFFF2 + 2)""", TsParser.expr)( + TsExpr.BinaryOp(TsExpr.Literal(TsLiteralNumber("0x000FFFF2")), "+", TsExpr.Literal(TsLiteralNumber("2"))), + ) + shouldParseAs("""(4)""", TsParser.expr)( + TsExpr.Literal(TsLiteralNumber("4")), + ) -// shouldParseAs("""(0x000FFFFF + 1) >> 1""", TsParser.expr)( -// null -// ) + shouldParseAs("""(4) >> 2""", TsParser.expr)( + TsExpr.BinaryOp(TsExpr.Literal(TsLiteralNumber("4")), ">>", TsExpr.Literal(TsLiteralNumber("2"))), + ) + + shouldParseAs("""(0x000FFFFF + 1) >> 2""", TsParser.expr)( + TsExpr.BinaryOp( + TsExpr.BinaryOp(TsExpr.Literal(TsLiteralNumber("0x000FFFFF")), "+", TsExpr.Literal(TsLiteralNumber("1"))), + ">>", + TsExpr.Literal(TsLiteralNumber("2")), + ), + ) } } diff --git a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/SuchTestMuchFail.scala b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/SuchTestMuchFail.scala index 701052fcd6..02528f404e 100644 --- a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/SuchTestMuchFail.scala +++ b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/SuchTestMuchFail.scala @@ -16,7 +16,7 @@ object SuchTestMuchFail extends App { DTUpToDate(new Cmd(logger, None), args.contains("-offline"), defaultCacheFolder, constants.DefinitelyTypedRepo) val criterion: Double = - 99.5 + 100.0 def banner(): Unit = println(s"\n${"*" * 80}\n") @@ -34,7 +34,7 @@ object SuchTestMuchFail extends App { .filter(_.toString.endsWith(".d.ts")) .toSeq - val parser = PersistingParser(Some(parseTempFolder.toNIO), IArray(dtFolder), logger.void) + val parser = PersistingParser(None, IArray(dtFolder), logger.void) val parsed: Seq[(os.Path, Either[String, TsParsedFile])] = allFiles.par.map { path: os.Path => diff --git a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/TypeExpansion.scala b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/TypeExpansion.scala deleted file mode 100644 index cd00441495..0000000000 --- a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/TypeExpansion.scala +++ /dev/null @@ -1,51 +0,0 @@ -package org.scalablytyped.converter.internal -package ts -package parser - -import org.scalatest.funsuite.AnyFunSuite -import org.scalatest.matchers.should.Matchers - -class TypeExpansion extends AnyFunSuite with Matchers with TypeExpansionHarness { - - test("Partial") { - - val out = run(s""" -type Partial = { - [P in keyof T]?: T[P]; -}; -interface A { - a: number - b: number | null, - c: number | null | undefined, - d?: number - e?: number | null, - f?: number | null | undefined -} -type AA = Partial -""").extract[TsDeclInterface]("AA") - - val isOptionals = out.members.collect[java.lang.Boolean] { - case TsMemberProperty(_, _, _, _, _, _, _, isOptional) => isOptional - } - - isOptionals.shouldBe(IArray[java.lang.Boolean](true, true, true, true, true, true)) - } - - test("OptionalKey") { - pending - val out = run(s""" - type OptionalKey = { [K in keyof T]-?: undefined extends T[K] ? K : never }[keyof T]; - interface A { - a: number - b: number | null, - c: number | null | undefined, - d?: number - e?: number | null, - f?: number | null | undefined - } - type Ta = OptionalKey -""").extract[TsDeclTypeAlias]("Ta") - - out.alias.shouldBe(TsTypeUnion(IArray("c", "d", "e", "f").map(str => TsTypeLiteral(TsLiteralString(str))))) - } -} diff --git a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/TypeExpansionTest.scala b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/TypeExpansionTest.scala new file mode 100644 index 0000000000..a098d1edce --- /dev/null +++ b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/TypeExpansionTest.scala @@ -0,0 +1,100 @@ +package org.scalablytyped.converter.internal +package ts +package parser + +import org.scalatest.funsuite.AnyFunSuite +import org.scalatest.matchers.should.Matchers + +class TypeExpansionTest extends AnyFunSuite with Matchers with TypeExpansionHarness { + + test("Partial") { + + val out = run(s""" +type Partial = { + [P in keyof T]?: T[P]; +}; +interface A { + a: number + b: number | null, + c: number | null | undefined, + d?: number + e?: number | null, + f?: number | null | undefined +} +type AA = Partial +""").extract[TsDeclInterface]("AA") + + val isOptionals = out.members.collect[java.lang.Boolean] { + case TsMemberProperty(_, _, _, _, _, _, _, isOptional) => isOptional + } + + isOptionals.shouldBe(IArray[java.lang.Boolean](true, true, true, true, true, true)) + } + + test("OptionalKey") { + pending + val out = run(s""" + type OptionalKey = { [K in keyof T]-?: undefined extends T[K] ? K : never }[keyof T]; + interface A { + a: number + b: number | null, + c: number | null | undefined, + d?: number + e?: number | null, + f?: number | null | undefined + } + type Ta = OptionalKey +""").extract[TsDeclTypeAlias]("Ta") + + out.alias.shouldBe(TsTypeUnion(IArray("c", "d", "e", "f").map(str => TsTypeLiteral(TsLiteralString(str))))) + } + + test("Except from union type") { + val out = run(s""" +type Exclude = T extends U ? never : T; +export declare type PanelMode = 'time' | 'date' | 'week' | 'month' | 'year' | 'decade'; +export declare type PickerMode = Exclude; +""").extract[TsDeclEnum]("PickerMode") + + val expected = Set("time", "date", "week", "month", "year") + + out.members.map(_.name.value).toSet.shouldBe(expected) + } + + test("circular") { + val out = run(s""" + + interface ToJsonOutput { + children?: Array; + } + + interface Array{} +""").extract[TsDeclInterface]("ToJsonOutput") + + val expected = + TsMemberProperty( + NoComments, + ProtectionLevel.Default, + TsIdentSimple("children"), + Some( + TsTypeRef( + NoComments, + TsQIdent(IArray(TsIdentLibrarySimple("testing"), TsIdentSimple("Array"))), + IArray( + TsTypeRef( + NoComments, + TsQIdent(IArray(TsIdentLibrarySimple("testing"), TsIdentSimple("ToJsonOutputnamestringName"))), + IArray(), + ), + ), + ), + ), + None, + false, + false, + true, + ) + + out.membersByName(TsIdent("children")).shouldBe(IArray(expected)) + } +} diff --git a/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/Deps.scala b/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/Deps.scala index 368a9f3186..353e1791dd 100644 --- a/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/Deps.scala +++ b/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/Deps.scala @@ -1,4 +1,4 @@ -package scala.org.scalablytyped.converter.internal +package org.scalablytyped.converter.internal import org.scalablytyped.converter.internal.scalajs.{Dep, Versions} import sbt.librarymanagement.ModuleID diff --git a/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/ImportTypings.scala b/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/ImportTypings.scala index 1beffd46fc..495e6f7930 100644 --- a/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/ImportTypings.scala +++ b/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/ImportTypings.scala @@ -98,6 +98,7 @@ object ImportTypings { resolve = fromNodeModules.libraryResolver, softWrites = true, generateScalaJsBundlerFile = false, + ensureSourceFilesWritten = false, ), "build", ) diff --git a/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/ZincCompiler.scala b/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/ZincCompiler.scala index 6f670a8e83..b46fd5b257 100644 --- a/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/ZincCompiler.scala +++ b/sbt-converter06/src/main/scala/org/scalablytyped/converter/internal/ZincCompiler.scala @@ -19,8 +19,6 @@ import sbt.librarymanagement.DependencyResolution import xsbti.CompileFailed import xsbti.compile.{CompileOrder => _, _} -import scala.org.scalablytyped.converter.internal.Deps - class ZincCompiler(inputs: Inputs, logger: Logger[Unit], versions: Versions, resolve: Dep => Array[File]) extends Compiler { private lazy val incCompiler: IncrementalCompiler = ZincUtil.defaultIncrementalCompiler @@ -60,12 +58,6 @@ class ZincCompiler(inputs: Inputs, logger: Logger[Unit], versions: Versions, res } object ZincCompiler { - private val classLoaderCacheKey = AttributeKey[ClassLoaderCache]( - "class-loader-cache", - "Caches class loaders based on the classpath entries and last modified times.", - 10, - ) - val task = Def.task { import Keys._ import org.scalablytyped.converter.plugin.ScalablyTypedPluginBase.autoImport._ @@ -127,7 +119,7 @@ object ZincCompiler { dependencyResolution = resolver, compilerBridgeSource = scalaCompilerBridgeSource.value, scalaJarsTarget = zincDir, - classLoaderCache = st.get(classLoaderCacheKey), + classLoaderCache = None, log = sbtLogger, ) diff --git a/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterExternalNpmPlugin.scala b/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterExternalNpmPlugin.scala index 90caef9c55..3dce06ea5b 100644 --- a/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterExternalNpmPlugin.scala +++ b/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterExternalNpmPlugin.scala @@ -6,14 +6,22 @@ import java.time.Instant import com.olvind.logging import com.olvind.logging.{Formatter, LogLevel} import org.scalablytyped.converter.internal.importer.jsonCodecs.PackageJsonDepsDecoder -import org.scalablytyped.converter.internal.importer.{Json, SharedInput} +import org.scalablytyped.converter.internal.importer.SharedInput import org.scalablytyped.converter.internal.scalajs.{Dep, Name, Versions} import org.scalablytyped.converter.internal.ts.{PackageJsonDeps, TsIdentLibrary} -import org.scalablytyped.converter.internal.{BuildInfo, Digest, IArray, ImportTypings, InFolder, WrapSbtLogger} +import org.scalablytyped.converter.internal.{ + BuildInfo, + Deps, + Digest, + IArray, + ImportTypings, + InFolder, + Json, + WrapSbtLogger, +} import sbt.Keys._ import sbt._ -import scala.org.scalablytyped.converter.internal.Deps import scala.util.Try object ScalablyTypedConverterExternalNpmPlugin extends AutoPlugin { @@ -43,7 +51,7 @@ object ScalablyTypedConverterExternalNpmPlugin extends AutoPlugin { else WrapSbtLogger(sbtLog, Instant.now).filter(LogLevel.warn).void.withContext("project", projectName) val wantedLibs: Set[TsIdentLibrary] = - Json[PackageJsonDeps](packageJsonFile).dependencies.getOrElse(Map()).keys.to[Set].map(TsIdentLibrary.apply) + Json.force[PackageJsonDeps](packageJsonFile).dependencies.getOrElse(Map()).keys.to[Set].map(TsIdentLibrary.apply) val versions = Versions( Versions.Scala( @@ -82,7 +90,7 @@ object ScalablyTypedConverterExternalNpmPlugin extends AutoPlugin { type InOut = (ImportTypings.Input, ImportTypings.Output) val result: Set[Dep] = - Try(Json[InOut](runCache)).toOption match { + Try(Json.force[InOut](runCache)).toOption match { case Some((`input`, output)) if output.allJars.forall(os.exists) => stLogger.withContext(runCache).info(s"Using cached result :)") output.deps diff --git a/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterPlugin.scala b/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterPlugin.scala index d4ac13f2f3..8d36545f97 100644 --- a/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterPlugin.scala +++ b/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterPlugin.scala @@ -6,15 +6,23 @@ import java.time.Instant import com.olvind.logging import com.olvind.logging.{Formatter, LogLevel} -import org.scalablytyped.converter.internal.importer.{Json, SharedInput} +import org.scalablytyped.converter.internal.importer.SharedInput import org.scalablytyped.converter.internal.scalajs.{Name, Versions} import org.scalablytyped.converter.internal.ts.TsIdentLibrary -import org.scalablytyped.converter.internal.{BuildInfo, Digest, IArray, ImportTypings, InFolder, WrapSbtLogger} +import org.scalablytyped.converter.internal.{ + BuildInfo, + Deps, + Digest, + IArray, + ImportTypings, + InFolder, + Json, + WrapSbtLogger, +} import sbt.Keys._ import sbt._ import scalajsbundler.sbtplugin.{NpmUpdateTasks, PackageJsonTasks, ScalaJSBundlerPlugin} -import scala.org.scalablytyped.converter.internal.Deps import scala.util.Try object ScalablyTypedConverterPlugin extends AutoPlugin { @@ -89,7 +97,7 @@ object ScalablyTypedConverterPlugin extends AutoPlugin { type InOut = (ImportTypings.Input, ImportTypings.Output) - val result = Try(Json[InOut](runCache)).toOption match { + val result = Try(Json.force[InOut](runCache)).toOption match { case Some((`input`, output)) if output.allJars.forall(os.exists) => stLogger.withContext(runCache).info(s"Using cached result :)") output.deps diff --git a/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala b/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala index 4f317924a3..33a1030285 100644 --- a/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala +++ b/sbt-converter06/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala @@ -5,7 +5,7 @@ import java.io.File import org.portablescala.sbtplatformdeps.PlatformDepsPlugin import org.scalablytyped.converter import org.scalablytyped.converter.internal.importer.EnabledTypeMappingExpansion -import org.scalablytyped.converter.internal.{ZincCompiler, constants} +import org.scalablytyped.converter.internal.{constants, ZincCompiler} import sbt.Tags.Tag import sbt._ import sbt.librarymanagement.ModuleID @@ -107,10 +107,18 @@ object ScalablyTypedPluginBase extends AutoPlugin { import autoImport._ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport.scalaJSVersion + /* work around private[sbt] */ + def cleanIvyHack = { + import scala.language.reflectiveCalls + (Keys: { val cleanIvy: TaskKey[Unit] }).cleanIvy + } + override lazy val projectSettings = Seq( /* This is where we add our generated artifacts to the project for compilation */ Keys.allDependencies ++= stImport.value.toSeq, + /* This originally ended up calling `allDependencies`, which is inconvenient */ + cleanIvyHack := {}, Keys.scalacOptions ++= { val isScalaJs1 = !scalaJSVersion.startsWith("0.6") diff --git a/scalajs/src/main/resources/html.json b/scalajs/src/main/resources/html.json new file mode 100644 index 0000000000..6dd652f9f5 --- /dev/null +++ b/scalajs/src/main/resources/html.json @@ -0,0 +1,2801 @@ +{ + "tags" : [ + { + "tagName" : "a", + "scalaJSType": "org.scalajs.dom.html.Anchor", + "docLines" : [ + "The HTML <a> element (or anchor element) creates a hyperlink to other web pages, files, locations within the same page, email addresses, or any other URL." + ] + }, + { + "tagName" : "abbr", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <abbr> element represents an abbreviation and optionally provides a full description for it. If present, the title attribute must contain this full description and nothing else." + ] + }, + { + "tagName" : "address", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <address> element supplies contact information for its nearest element represents a self-contained composition in a document, page, application, or site, which is intended to be independently distributable or reusable (e.g., in syndication). Examples include: a forum post, a magazine or newspaper article, or a blog entry.\" href=\"/en-US/docs/Web/HTML/Element/article\"><article> or Element represents the content of an HTML document. There can be only one element in a document.\" href=\"/en-US/docs/Web/HTML/Element/body\"><body> ancestor; in the latter case, it applies to the whole document." + ] + }, + { + "tagName" : "area", + "scalaJSType": "org.scalajs.dom.html.Area", + "docLines" : [ + "The HTML <area> element defines a hot-spot region on an image, and optionally associates it with a elements define hyperlinks from a spot on a webpage (like a text string or image) to another spot on some other webpage (or even on the same page).\" class=\"glossaryLink\" href=\"/en-US/docs/Glossary/Hyperlink\">hypertext link. This element is used only within a element is used with elements to define an image map (a clickable link area).\" href=\"/en-US/docs/Web/HTML/Element/map\"><map> element." + ] + }, + { + "tagName" : "article", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <article> element represents a self-contained composition in a document, page, application, or site, which is intended to be independently distributable or reusable (e.g., in syndication). Examples include: a forum post, a magazine or newspaper article, or a blog entry." + ] + }, + { + "tagName" : "aside", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <aside> element represents a section of a document with content connected tangentially to the main content of the document (often presented as a sidebar)." + ] + }, + { + "tagName" : "audio", + "scalaJSType": "org.scalajs.dom.html.Audio", + "docLines" : [ + "The HTML <audio> element is used to embed sound content in documents. It may contain one or more audio sources, represented using the src attribute or the element specifies multiple media resources for either the , the element: the browser will choose the most suitable one. It can also be the destination for streamed media, using a MediaStream." + ] + }, + { + "tagName" : "b", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <b> element represents a span of text stylistically different from normal text, without conveying any special importance or relevance, and that is typically rendered in boldface." + ] + }, + { + "tagName" : "base", + "scalaJSType": "org.scalajs.dom.html.Base", + "docLines" : [ + "The HTML <base> element specifies the base URL to use for all relative URLs contained within a document. There can be only one <base> element in a document. " + ] + }, + { + "tagName" : "bdi", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <bdi> element (bidirectional isolation) isolates a span of text that might be formatted in a different direction from other text outside it." + ] + }, + { + "tagName" : "bdo", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <bdo> element (bidirectional override) is used to override the current directionality of text. It causes the directionality of the characters to be ignored in favor of the specified directionality." + ] + }, + { + "tagName" : "big", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML Big Element (<big>) makes the text font size one size bigger (for example, from small to medium, or from large to x-large) up to the browser's maximum font size." + ] + }, + { + "tagName" : "blockquote", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <blockquote> Element (or HTML Block Quotation Element) indicates that the enclosed text is an extended quotation. Usually, this is rendered visually by indentation (see Notes for how to change it). A URL for the source of the quotation may be given using the cite attribute, while a text representation of the source can be given using the element represents a reference to a creative work. It must include the title of a work or a URL reference, which may be in an abbreviated form according to the conventions used for the addition of citation metadata.\" href=\"/en-US/docs/Web/HTML/Element/cite\"><cite> element." + ] + }, + { + "tagName" : "body", + "scalaJSType": "org.scalajs.dom.html.Body", + "docLines" : [ + "The HTML <body> Element represents the content of an HTML document. There can be only one <body> element in a document." + ] + }, + { + "tagName" : "br", + "scalaJSType": "org.scalajs.dom.html.BR", + "docLines" : [ + "The HTML <br> element produces a line break in text (carriage-return). It is useful for writing a poem or an address, where the division of lines is significant." + ] + }, + { + "tagName" : "button", + "scalaJSType": "org.scalajs.dom.html.Button", + "docLines" : [ + "The HTML <button> element represents a clickable button." + ] + }, + { + "tagName" : "canvas", + "scalaJSType": "org.scalajs.dom.html.Canvas", + "docLines" : [ + "Use the HTML <canvas> element with the canvas scripting API to draw graphics and animations." + ] + }, + { + "tagName" : "caption", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <caption> element represents the title of a table. Though it is always the first descendant of a element represents tabular data — that is, information expressed via a two-dimensional data table.\" href=\"/en-US/docs/Web/HTML/Element/table\"><table>, its styling, using CSS, may place it elsewhere, relative to the table." + ] + }, + { + "tagName" : "cite", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <cite> element represents a reference to a creative work. It must include the title of a work or a URL reference, which may be in an abbreviated form according to the conventions used for the addition of citation metadata." + ] + }, + { + "tagName" : "code", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <code> element represents a fragment of computer code. By default, it is displayed in the browser's default monospace font." + ] + }, + { + "tagName" : "col", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <col> element defines a column within a table and is used for defining common semantics on all common cells. It is generally found within a element defines a group of columns within a table.\" href=\"/en-US/docs/Web/HTML/Element/colgroup\"><colgroup> element." + ] + }, + { + "tagName" : "colgroup", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <colgroup> element defines a group of columns within a table." + ] + }, + { + "tagName" : "data", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <data> element links a given content with a machine-readable translation. If the content is time- or date-related, the element represents either a time on a 24-hour clock or a precise date in the Gregorian calendar (with optional time and timezone information).\" href=\"/en-US/docs/Web/HTML/Element/time\"><time> element must be used." + ] + }, + { + "tagName" : "datalist", + "scalaJSType": "org.scalajs.dom.html.DataList", + "docLines" : [ + "The HTML <datalist> element contains a set of element is used to define an item contained in a element.\" href=\"/en-US/docs/Web/HTML/Element/optgroup\"><optgroup>, or a element contains a set of  element. As such, <option> can represent menu items in popups and other lists of items in an HTML document." + ] + }, + { + "tagName" : "output", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <output> element represents the result of a calculation or user action." + ] + }, + { + "tagName" : "p", + "scalaJSType": "org.scalajs.dom.html.Paragraph", + "docLines" : [ + "The HTML <p> element represents a paragraph of text. Paragraphs are usually represented in visual media as blocks of text that are separated from adjacent blocks by vertical blank space and/or first-line indentation. Paragraphs are block-level elements." + ] + }, + { + "tagName" : "param", + "scalaJSType": "org.scalajs.dom.html.Param", + "docLines" : [ + "The HTML <param> element defines parameters for an element represents an external resource, which can be treated as an image, a nested browsing context, or a resource to be handled by a plugin.\" href=\"/en-US/docs/Web/HTML/Element/object\"><object> element." + ] + }, + { + "tagName" : "picture", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <picture> element is a container used to specify multiple element specifies multiple media resources for either the , the elements for a specific element represents an image in the document.\" href=\"/en-US/docs/Web/HTML/Element/img\"><img> contained in it. The browser will choose the most suitable source according to the current layout of the page (the constraints of the box the image will appear in) and the device it will be displayed on (e.g. a normal or hiDPI device.)" + ] + }, + { + "tagName" : "pre", + "scalaJSType": "org.scalajs.dom.html.Pre", + "docLines" : [ + "The HTML <pre> element represents preformatted text. Text within this element is typically displayed in a non-proportional (\"monospace\") font exactly as it is laid out in the file. Whitespace inside this element is displayed as typed." + ] + }, + { + "tagName" : "progress", + "scalaJSType": "org.scalajs.dom.html.Progress", + "docLines" : [ + "The HTML <progress> element represents the completion progress of a task, typically displayed as a progress bar." + ] + }, + { + "tagName" : "q", + "scalaJSType": "org.scalajs.dom.html.Quote", + "docLines" : [ + "The HTML <q> element indicates that the enclosed text is a short inline quotation. This element is intended for short quotations that don't require paragraph breaks; for long quotations use the Element (or HTML Block Quotation Element) indicates that the enclosed text is an extended quotation. Usually, this is rendered visually by indentation (see Notes for how to change it). A URL for the source of the quotation may be given using the cite attribute, while a text representation of the source can be given using the element.\" href=\"/en-US/docs/Web/HTML/Element/blockquote\"><blockquote> element." + ] + }, + { + "tagName" : "rp", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <rp> element is used to provide fall-back parentheses for browsers that do not support display of ruby annotations using the element represents a ruby annotation. Ruby annotations are for showing pronunciation of East Asian characters.\" href=\"/en-US/docs/Web/HTML/Element/ruby\"><ruby> element." + ] + }, + { + "tagName" : "rt", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <rt> element embraces pronunciation of characters presented in a ruby annotations, which are used to describe the pronunciation of East Asian characters. This element is always used inside a element represents a ruby annotation. Ruby annotations are for showing pronunciation of East Asian characters.\" href=\"/en-US/docs/Web/HTML/Element/ruby\"><ruby> element." + ] + }, + { + "tagName" : "ruby", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <ruby> element represents a ruby annotation. Ruby annotations are for showing pronunciation of East Asian characters." + ] + }, + { + "tagName" : "s", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <s> element renders text with a strikethrough, or a line through it. Use the <s> element to represent things that are no longer relevant or no longer accurate. However, <s> is not appropriate when indicating document edits; for that, use the element represents a range of text that has been deleted from a document. This element is often (but need not be) rendered with strike-through text.\" href=\"/en-US/docs/Web/HTML/Element/del\"><del> and element represents a range of text that has been added to a document.\" href=\"/en-US/docs/Web/HTML/Element/ins\"><ins> elements, as appropriate." + ] + }, + { + "tagName" : "samp", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <samp> element is an element intended to identify sample output from a computer program. It is usually displayed in the browser's default monotype font (such as Lucida Console)." + ] + }, + { + "tagName" : "script", + "scalaJSType": "org.scalajs.dom.html.Script", + "docLines" : [ + "The HTML <script> element is used to embed or reference an executable script." + ] + }, + { + "tagName" : "section", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <section> element represents a standalone section of functionality contained within an HTML document, typically with a heading, which doesn't have a more specific semantic element to represent it." + ] + }, + { + "tagName" : "select", + "scalaJSType": "org.scalajs.dom.html.Select", + "docLines" : [ + "The HTML <select> element represents a control that provides a menu of options:" + ] + }, + { + "tagName" : "small", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <small> element makes the text font size one size smaller (for example, from large to medium, or from small to x-small) down to the browser's minimum font size.  In HTML5, this element is repurposed to represent side-comments and small print, including copyright and legal text, independent of its styled presentation." + ] + }, + { + "tagName" : "source", + "scalaJSType": "org.scalajs.dom.html.Source", + "docLines" : [ + "The HTML <source> element specifies multiple media resources for either the element is a container used to specify multiple elements for a specific contained in it. The browser will choose the most suitable source according to the current layout of the page (the constraints of the box the image will appear in) and the device it will be displayed on (e.g. a normal or hiDPI device.)\" href=\"/en-US/docs/Web/HTML/Element/picture\"><picture>, the element is used to embed sound content in documents. It may contain one or more audio sources, represented using the src attribute or the element: the browser will choose the most suitable one. It can also be the destination for streamed media, using a MediaStream.\" href=\"/en-US/docs/Web/HTML/Element/audio\"><audio> or the element to embed video content in a document.\" href=\"/en-US/docs/Web/HTML/Element/video\"><video> element. It is an empty element. It is commonly used to serve the same media content in multiple formats supported by different browsers." + ] + }, + { + "tagName" : "span", + "scalaJSType": "org.scalajs.dom.html.Span", + "docLines" : [ + "The HTML <span> element is a generic inline container for phrasing content, which does not inherently represent anything. It can be used to group elements for styling purposes (using the class or id attributes), or because they share attribute values, such as lang. It should be used only when no other semantic element is appropriate. <span> is very much like a element is the generic container for flow content and does not inherently represent anything. Use it to group elements for purposes such as styling (using the class or id attributes), marking a section of a document in a different language (using the lang attribute), and so on.\" href=\"/en-US/docs/Web/HTML/Element/div\"><div> element, but element is the generic container for flow content and does not inherently represent anything. Use it to group elements for purposes such as styling (using the class or id attributes), marking a section of a document in a different language (using the lang attribute), and so on.\" href=\"/en-US/docs/Web/HTML/Element/div\"><div> is a block-level element whereas a <span> is an inline element." + ] + }, + { + "tagName" : "strong", + "scalaJSType": "org.scalajs.dom.Element", + "docLines" : [ + "The HTML <strong> element gives text strong importance, and is typically displayed in bold." + ] + }, + { + "tagName" : "style", + "scalaJSType": "org.scalajs.dom.html.Style", + "docLines" : [ + "The HTML <style> element contains style information for a document, or part of a document. By default, the style instructions written inside that element are expected to be CSS." + ] + }, + { + "tagName" : "sub", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <sub> element defines a span of text that should be displayed, for typographic reasons, lower, and often smaller, than the main span of text." + ] + }, + { + "tagName" : "summary", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <summary> element is used as a summary, caption, or legend for the content of a element is used as a disclosure widget from which the user can retrieve additional information.\" href=\"/en-US/docs/Web/HTML/Element/details\"><details> element." + ] + }, + { + "tagName" : "sup", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <sup> element defines a span of text that should be displayed, for typographic reasons, higher, and often smaller, than the main span of text." + ] + }, + { + "tagName" : "table", + "scalaJSType": "org.scalajs.dom.html.Table", + "docLines" : [ + "The HTML <table> element represents tabular data — that is, information expressed via a two-dimensional data table." + ] + }, + { + "tagName" : "tbody", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <tbody> element groups one or more element specifies that the markup contained inside the block comprises one row of a table, inside which the and elements create header and data cells, respectively, within the row.\" href=\"/en-US/docs/Web/HTML/Element/tr\"><tr> elements as the body of a element represents tabular data — that is, information expressed via a two-dimensional data table.\" href=\"/en-US/docs/Web/HTML/Element/table\"><table> element." + ] + }, + { + "tagName" : "td", + "scalaJSType": "org.scalajs.dom.html.TableDataCell", + "docLines" : [ + "The HTML <td> element defines a cell of a table that contains data. It participates in the table model." + ] + }, + { + "tagName" : "textarea", + "scalaJSType": "org.scalajs.dom.html.TextArea", + "docLines" : [ + "The HTML <textarea> element represents a multi-line plain-text editing control." + ] + }, + { + "tagName" : "tfoot", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <tfoot> element defines a set of rows summarizing the columns of the table." + ] + }, + { + "tagName" : "th", + "scalaJSType": "org.scalajs.dom.html.TableHeaderCell", + "docLines" : [ + "The HTML <th> element defines a cell as header of a group of table cells. The exact nature of this group is defined by the scope and headers attributes." + ] + }, + { + "tagName" : "thead", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <thead> element defines a set of rows defining the head of the columns of the table." + ] + }, + { + "tagName" : "time", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <time> element represents either a time on a 24-hour clock or a precise date in the Gregorian calendar (with optional time and timezone information)." + ] + }, + { + "tagName" : "title", + "scalaJSType": "org.scalajs.dom.html.Title", + "docLines" : [ + "The HTML <title> element defines the title of the document, shown in a browser's title bar or on the page's tab. It can only contain text, and any contained tags are ignored." + ] + }, + { + "tagName" : "tr", + "scalaJSType": "org.scalajs.dom.html.TableRow", + "docLines" : [ + "The HTML <tr> element defines a row of cells in a table. Those can be a mix of element defines a cell of a table that contains data. It participates in the table model.\" href=\"/en-US/docs/Web/HTML/Element/td\"><td> and element defines a cell as header of a group of table cells. The exact nature of this group is defined by the scope and headers attributes.\" href=\"/en-US/docs/Web/HTML/Element/th\"><th> elements." + ] + }, + { + "tagName" : "track", + "scalaJSType": "org.scalajs.dom.html.Track", + "docLines" : [ + "The HTML <track> element is used as a child of the media elements element is used to embed sound content in documents. It may contain one or more audio sources, represented using the src attribute or the element: the browser will choose the most suitable one. It can also be the destination for streamed media, using a MediaStream.\" href=\"/en-US/docs/Web/HTML/Element/audio\"><audio> and element to embed video content in a document.\" href=\"/en-US/docs/Web/HTML/Element/video\"><video>. It lets you specify timed text tracks (or time-based data), for example to automatically handle subtitles. The tracks are formatted in WebVTT format (.vtt files) — Web Video Text Tracks." + ] + }, + { + "tagName" : "u", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <u> element renders text with an underline, a line under the baseline of its content. In HTML5, this element represents a span of text with an unarticulated, though explicitly rendered, non-textual annotation, such as labeling the text as being a proper name in Chinese text (a Chinese proper name mark), or labeling the text as being misspelled." + ] + }, + { + "tagName" : "ul", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <ul> element represents an unordered list of items, typically rendered as a bulleted list." + ] + }, + { + "tagName" : "var", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <var> element represents a variable in a mathematical expression or a programming context." + ] + }, + { + "tagName" : "video", + "scalaJSType": "org.scalajs.dom.html.Video", + "docLines" : [ + "Use the HTML <video> element to embed video content in a document." + ] + }, + { + "tagName" : "wbr", + "scalaJSType": "org.scalajs.dom.html.Element", + "docLines" : [ + "The HTML <wbr> element represents a word break opportunity—a position within text where the browser may optionally break a line, though its line-breaking rules would not otherwise create a break at that location." + ] + } + ], + "attributes" : [ + { + "attributeName" : "preload", + "attributeType" : "String", + "docLines" : [ + "audio - This enumerated attribute is intended to provide a hint to the browser about what the author thinks will lead to the best user experience. It may have one of the following values:
  • none: indicates that the audio should not be preloaded;
  • metadata: indicates that only audio metadata (e.g. length) is fetched;
  • auto: indicates that the whole audio file could be downloaded, even if the user is not expected to use it;
  • the empty string: synonym of the auto value.

If not set, its default value is browser-defined (i.e. each browser may have its own default value). The spec advises it to be set to metadata.

Usage notes:
  • The autoplay attribute has precedence over preload. If autoplay is specified, the browser would obviously need to start downloading the audio for playback.
  • The browser is not forced by the specification to follow the value of this attribute; it is a mere hint.
", + "video - This enumerated attribute is intended to provide a hint to the browser about what the author thinks will lead to the best user experience. It may have one of the following values:
  • none: indicates that the video should not be preloaded.
  • metadata: indicates that only video metadata (e.g. length) is fetched.
  • auto: indicates that the whole video file could be downloaded, even if the user is not expected to use it.
  • the empty string: synonym of the auto value.

If not set, its default value is browser-defined (i.e. each browser may have its default value). The spec advises it to be set to metadata.

Usage notes:
  • The autoplay attribute has precedence over preload. If autoplay is specified, the browser would obviously need to start downloading the video for playback.
  • The specification does not force the browser to follow the value of this attribute; it is a mere hint.
" + ], + "compatibleTags" : [ + "audio", + "video" + ], + "withDash" : false + }, + { + "attributeName" : "download", + "attributeType" : "Boolean", + "docLines" : [ + "area - This attribute, if present, indicates that the author intends the hyperlink to be used for downloading a resource. See element (or anchor element) creates a hyperlink to other web pages, files, locations within the same page, email addresses, or any other URL.\" href=\"/en-US/docs/Web/HTML/Element/a\"><a> for a full description of the download attribute.", + "a - This attribute instructs browsers to download a URL instead of navigating to it, so the user will be prompted to save it as a local file. If the attribute has a value, it is used as the pre-filled file name in the Save prompt (the user can still change the file name if they want). There are no restrictions on allowed values, though / and \\ are converted to underscores. Most file systems limit some punctuation in file names, and browsers will adjust the suggested name accordingly.
Notes:
  • This attribute only works for same-origin URLs.
  • This attribute can be used with blob: URLs and data: URLs to download content generated by JavaScript, such as pictures created in an image-editor Web app.
  • If the HTTP header Content-Disposition: gives a different filename than this attribute, the HTTP header takes priority over this attribute.
  • If Content-Disposition: is set to inline, Firefox prioritizes Content-Disposition, like the filename case, while Chrome prioritizes the download attribute.
" + ], + "compatibleTags" : [ + "a", + "area" + ], + "withDash" : false + }, + { + "attributeName" : "src", + "attributeType" : "String", + "docLines" : [ + "track - Address of the track (.vtt file). Must be a valid URL. This attribute must be defined.", + "source - Required for element is used to embed sound content in documents. It may contain one or more audio sources, represented using the src attribute or the element: the browser will choose the most suitable one. It can also be the destination for streamed media, using a MediaStream.\" href=\"/en-US/docs/Web/HTML/Element/audio\"><audio> and element to embed video content in a document.\" href=\"/en-US/docs/Web/HTML/Element/video\"><video>, address of the media resource. The value of this attribute is ignored when the <source> element is placed inside a element is a container used to specify multiple elements for a specific contained in it. The browser will choose the most suitable source according to the current layout of the page (the constraints of the box the image will appear in) and the device it will be displayed on (e.g. a normal or hiDPI device.)\" href=\"/en-US/docs/Web/HTML/Element/picture\"><picture> element.", + "video - The URL of the video to embed. This is optional; you may instead use the element specifies multiple media resources for either the , the element within the video block to specify the video to embed.", + "audio - The URL of the audio to embed. This is subject to HTTP access controls. This is optional; you may instead use the element specifies multiple media resources for either the , the element within the audio block to specify the audio to embed.", + "img - The image URL. This attribute is mandatory for the <img> element. On browsers supporting srcset, src is treated like a candidate image with a pixel density descriptor 1x unless an image with this pixel density descriptor is already defined in srcset, or unless srcset contains 'w' descriptors.", + "input - If the value of the type attribute is image, this attribute specifies a URI for the location of an image to display on the graphical submit button, otherwise it is ignored.", + "iframe - The URL of the page to embed. Use 'about:blank' for empty pages that conform to Same-Origin Policy.", + "embed - The URL of the resource being embedded.", + "script - This attribute specifies the URI of an external script; this can be used as an alternative to embedding a script directly within a document. If a script element has a src attribute specified, it should not have a script embedded inside its tags." + ], + "compatibleTags" : [ + "audio", + "embed", + "iframe", + "img", + "input", + "script", + "source", + "track", + "video" + ], + "withDash" : false + }, + { + "attributeName" : "action", + "attributeType" : "String", + "docLines" : [ + "The URI of a program that processes the form information. This value can be overridden by a formaction attribute on a element represents a clickable button.\" href=\"/en-US/docs/Web/HTML/Element/button\"><button> or element is used to create interactive controls for web-based forms in order to accept data from the user.\" href=\"/en-US/docs/Web/HTML/Element/input\"><input> element." + ], + "compatibleTags" : [ + "form" + ], + "withDash" : false + }, + { + "attributeName" : "poster", + "attributeType" : "String", + "docLines" : [ + "A URL indicating a poster frame to show until the user plays or seeks. If this attribute isn't specified, nothing is displayed until the first frame is available; then the first frame is shown as the poster frame." + ], + "compatibleTags" : [ + "video" + ], + "withDash" : false + }, + { + "attributeName" : "step", + "attributeType" : "String", + "docLines" : [ + "Works with the min and max attributes to limit the increments at which a numeric or date-time value can be set. It can be the string any or a positive floating point number. If this attribute is not set to any, the control accepts only values at multiples of the step value greater than the minimum." + ], + "compatibleTags" : [ + "input" + ], + "withDash" : false + }, + { + "attributeName" : "default", + "attributeType" : "Boolean", + "docLines" : [ + "menuitem - This Boolean attribute indicates use of the same command as the menu's subject element (such as a button or input).", + "track - This attribute indicates that the track should be enabled unless the user's preferences indicate that another track is more appropriate. This may only be used on one track element per media element." + ], + "compatibleTags" : [ + "menuitem", + "track" + ], + "withDash" : false + }, + { + "attributeName" : "type", + "attributeType" : "String", + "docLines" : [ + "style - This attribute defines the styling language as a MIME type (charset should not be specified). This attribute is optional and defaults to text/css if it's missing.", + "object - The content type of the resource specified by data. At least one of data and type must be defined.", + "li - This character attribute indicates the numbering type:
  • a: lowercase letters
  • A: uppercase letters
  • i: lowercase Roman numerals
  • I: uppercase Roman numerals
  • 1: numbers
This type overrides the one used by its parent element represents an ordered list of items, typically rendered as a numbered list.\" href=\"/en-US/docs/Web/HTML/Element/ol\"><ol> element, if any.
Usage note: This attribute has been deprecated: use the CSS list-style-type property instead.
", + "param - Only used if the valuetype is set to \"ref\". Specifies the MIME type of values found at the URI specified by value.", + "source - The MIME-type of the resource, optionally with a codecs parameter. See RFC 4281 for information about how to specify codecs.", + "button - The type of the button. Possible values are:
  • submit: The button submits the form data to the server. This is the default if the attribute is not specified, or if the attribute is dynamically changed to an empty or invalid value.
  • reset: The button resets all the controls to their initial values.
  • button: The button has no default behavior. It can have client-side scripts associated with the element's events, which are triggered when the events occur.
", + "script -

Indicates the type of script represented. The value of this attribute will be in one of the following categories:

  • Omitted or a JavaScript MIME type: For HTML5-compliant browsers this indicates the script is JavaScript. HTML5 spec urges authors to omit the attribute rather than provided a redundant MIME type. In earlier browsers, this identified the scripting language of the embedded or imported (via the src attribute) code. JavaScript MIME types are listed in the specification.
  • module: HTML5 For HTML5-compliant browsers the code is treated as a JavaScript module. Processing of the script contents are not affected by the charset and defer attributes. For information on using module, see ES6 in Depth: Modules. 
  • Any other value or MIME type: Embedded content is treated as a data block which won't be processed by the browser. The src attribute will be ignored.

Note that in Firefox you can use advanced features such as let statements and other features in later JS versions, by using type=application/javascript;version=1.8  . Beware, however, that as this is a non-standard feature, this will most likely break support for other browsers, in particular Chromium-based browsers.

For how to include exotic programming languages, read about Rosetta.

", + "link - This attribute is used to define the type of the content linked to. The value of the attribute should be a MIME type such as text/html, text/css, and so on. The common use of this attribute is to define the type of style sheet linked and the most common current value is text/css, which indicates a Cascading Style Sheet format. It is also used on rel=\"preload\" link types, to make sure the browser only downloads file types that it supports.", + "embed - The MIME type to use to select the plug-in to instantiate.", + "ul - Used to set the bullet style for the list. The values defined under HTML3.2 and the transitional version of HTML 4.0/4.01 are:
  • circle,
  • disc,
  • and square.

A fourth bullet type has been defined in the WebTV interface, but not all browsers support it: triangle.

If not present and if no CSS list-style-type property does apply to the element, the user agent decide to use a kind of bullets depending on the nesting level of the list.

Usage note: Do not use this attribute, as it has been deprecated; use the CSS list-style-type property instead.
", + "a - Specifies the media type in the form of a MIME type for the linked URL. It is purely advisory, with no built-in functionality.", + "input - The type of control to render. See _types\">Form <input> types for the individual types, with links to more information about each.", + "area - This attribute specifies the media type in the form of a MIME type for the link target. Generally, this is provided strictly as advisory information; however, in the future a browser might add a small icon for multimedia types. For example, a browser might add a small speaker icon when type is set to audio/wav. For a complete list of recognized MIME types, see https://www.w3.org/TR/html4/references.html#ref-MIMETYPES. Use this attribute only if the href attribute is present.", + "ol - Indicates the numbering type:
  • 'a' indicates lowercase letters,
  • 'A' indicates uppercase letters,
  • 'i' indicates lowercase Roman numerals,
  • 'I' indicates uppercase Roman numerals,
  • and '1' indicates numbers (default).

The type set is used for the entire list unless a different type attribute is used within an enclosed element is used to represent an item in a list. It must be contained in a parent element: an ordered list (

    ), an unordered list (