Merge pull request #94 from Kotlin/nullability

Nullability + Datetime

Author: devcrocod

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/Aes.kt

@@ -46,15 +46,15 @@ public interface NonScalablePositionalAes : PositionalAes
 /**
  * Non-positional aesthetic attribute.
  */
-public interface NonPositionalAes<in T : Any> : Aes
+public interface NonPositionalAes<in T> : Aes
 
 /**
  * Non-positional aesthetic attribute that can be mapped with an explicit scale.
  */
-public interface ScalableNonPositionalAes<in T : Any> : NonPositionalAes<T>, ScalableAes
+public interface ScalableNonPositionalAes<in T> : NonPositionalAes<T>, ScalableAes
 
 
 /**
  * Non-positional aesthetic attribute that can be mapped but without an explicit scale.
  */
-public interface NonScalableNonPositionalAes<in T : Any> :  NonPositionalAes<T>, MappableAes
+public interface NonScalableNonPositionalAes<in T> :  NonPositionalAes<T>, MappableAes

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/NamedData.kt

@@ -18,7 +18,7 @@ public data class NamedData(override val nameToValues: Map<String, TypedList>) :
     }
     public companion object {
         @PublishedApi
-        internal fun fromUntyped(untypedMap: Map<String, List<Any>>): NamedData = NamedData(untypedMap.toTyped())
+        internal fun fromUntyped(untypedMap: Map<String, List<*>>): NamedData = NamedData(untypedMap.toTyped())
     }
 }
 

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/column/columnPointer.kt

@@ -16,7 +16,7 @@ import kotlin.reflect.KProperty
  * @param T the type of the column
  * @param id the name of the column
  */
-public  fun <T : Any> columnPointer(id: String): ColumnPointer<T> =
+public  fun <T> columnPointer(id: String): ColumnPointer<T> =
     ColumnPointer(id)
 
 /**
@@ -27,7 +27,7 @@ public  fun <T : Any> columnPointer(id: String): ColumnPointer<T> =
  * @param T the type of the column
  * @receiver the name of the column
  */
-public inline operator fun <reified T : Any> String.invoke(): ColumnPointer<T> =
+public inline operator fun <reified T> String.invoke(): ColumnPointer<T> =
     ColumnPointer(this)
 
 
@@ -45,7 +45,7 @@ public inline operator fun <reified T : Any> String.invoke(): ColumnPointer<T> =
  *
  * @property T the type of the column.
  */
-public class UnnamedColumnPointer<T : Any> @PublishedApi internal constructor(){
+public class UnnamedColumnPointer<T> @PublishedApi internal constructor(){
     /**
      * Creates a [ColumnPointer] with `T` type and property name as a column name.
      */
@@ -67,8 +67,8 @@ public class UnnamedColumnPointer<T : Any> @PublishedApi internal constructor(){
  *
  * @param T the type of the column
  */
-public inline fun <reified T : Any> columnPointer(): UnnamedColumnPointer<T> =
+public inline fun <reified T> columnPointer(): UnnamedColumnPointer<T> =
     UnnamedColumnPointer()
 
 @PublishedApi
-internal fun<T: Any> String.toColumnPointer(): ColumnPointer<T> = ColumnPointer(this)
+internal fun<T> String.toColumnPointer(): ColumnPointer<T> = ColumnPointer(this)

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/columnScaled.kt

@@ -19,7 +19,7 @@ import org.jetbrains.kotlinx.ggdsl.ir.scale.PositionalUnspecifiedScale
  * @param DomainType type of the domain.
  * @return scaled source.
  */
-public fun <DomainType : Any> ColumnPointer<DomainType>.scaled(): ColumnScaledUnspecifiedDefault<DomainType> =
+public fun <DomainType> ColumnPointer<DomainType>.scaled(): ColumnScaledUnspecifiedDefault<DomainType> =
     ColumnScaledUnspecifiedDefault(this)
 
 /**
@@ -30,7 +30,7 @@ public fun <DomainType : Any> ColumnPointer<DomainType>.scaled(): ColumnScaledUn
  * @param scale positional default scale.
  * @return scaled source.
  */
-public fun <DomainType : Any> ColumnPointer<DomainType>.scaled(scale: PositionalUnspecifiedScale):
+public fun <DomainType> ColumnPointer<DomainType>.scaled(scale: PositionalUnspecifiedScale):
         ColumnScaledPositionalUnspecified<DomainType> =
     ColumnScaledPositionalUnspecified(this, scale)
 
@@ -42,7 +42,7 @@ public fun <DomainType : Any> ColumnPointer<DomainType>.scaled(scale: Positional
  * @param scale non-positional default scale.
  * @return scaled source.
  */
-public fun <DomainType : Any> ColumnPointer<DomainType>.scaled(scale: NonPositionalUnspecifiedScale):
+public fun <DomainType> ColumnPointer<DomainType>.scaled(scale: NonPositionalUnspecifiedScale):
         ColumnScaledNonPositionalUnspecified<DomainType> =
     ColumnScaledNonPositionalUnspecified(this, scale)
 
@@ -53,7 +53,7 @@ public fun <DomainType : Any> ColumnPointer<DomainType>.scaled(scale: NonPositio
  * @param scale positional scale.
  * @return scaled source.
  */
-public fun <DomainType : Any> ColumnPointer<DomainType>.scaled(
+public fun <DomainType> ColumnPointer<DomainType>.scaled(
     scale: PositionalScale<DomainType>
 ): ColumnScaledPositional<DomainType> = ColumnScaledPositional(this, scale)
 
@@ -64,6 +64,6 @@ public fun <DomainType : Any> ColumnPointer<DomainType>.scaled(
  * @param scale non-positional scale.
  * @return scaled source.
  */
-public fun <DomainType : Any, RangeType : Any> ColumnPointer<DomainType>.scaled(
+public fun <DomainType, RangeType> ColumnPointer<DomainType>.scaled(
     scale: NonPositionalScale<DomainType, RangeType>
 ): ColumnScaledNonPositional<DomainType, RangeType> = ColumnScaledNonPositional(this, scale)

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/data.kt

@@ -18,7 +18,7 @@ public class NamedDataBuilder {
      * @receiver a new column name.
      * @param list a new column values.
      */
-    public inline infix fun <reified T : Any> String.to(list: List<T>) {
+    public inline infix fun <reified T> String.to(list: List<T>) {
         buffer[this] = TypedList(typeOf<T>(), list)
     }
     // TODO iterable and arrays

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/freeScales.kt

@@ -16,7 +16,7 @@ import kotlin.reflect.typeOf
  * @param scale positional scale.
  * @return [FreePositionalScale]
  */
-public inline operator fun <reified DomainType : Any> ScalablePositionalAes.invoke(
+public inline operator fun <reified DomainType> ScalablePositionalAes.invoke(
     scale: PositionalScale<DomainType>
 ): FreePositionalScale<DomainType> {
     val freeScale = FreePositionalScale<DomainType>(
@@ -35,7 +35,7 @@ public inline operator fun <reified DomainType : Any> ScalablePositionalAes.invo
  * @param scale positional unspecified scale.
  * @return [FreePositionalScale]
  */
-public inline operator fun <reified DomainType : Any> ScalablePositionalAes.invoke(
+public inline operator fun <reified DomainType> ScalablePositionalAes.invoke(
     scale: PositionalUnspecifiedScale
 ): FreePositionalScale<DomainType> {
     val freeScale = FreePositionalScale<DomainType>(

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/internal/contextsMutable.kt

@@ -38,7 +38,7 @@ public interface TableBindingContextInterfaceMutable : TableDataContext {
  * @param iterable converting [Iterable] that will be added as a column to context dataset.
  * @return [ColumnPointer] to a new column
  */
-public inline fun <reified T : Any> TableBindingContextInterfaceMutable.toColumnPointer(iterable: Iterable<T>)
+public inline fun <reified T> TableBindingContextInterfaceMutable.toColumnPointer(iterable: Iterable<T>)
         : ColumnPointer<T> = toColumnPointer(iterable, generateID())
 
 /**
@@ -50,7 +50,7 @@ public inline fun <reified T : Any> TableBindingContextInterfaceMutable.toColumn
  * @param id name of a new column.
  * @return [ColumnPointer] to a new column
  */
-public inline fun <reified T : Any> TableBindingContextInterfaceMutable.toColumnPointer(
+public inline fun <reified T> TableBindingContextInterfaceMutable.toColumnPointer(
     iterable: Iterable<T>,
     id: String
 ): ColumnPointer<T> {
@@ -82,7 +82,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param DomainType type of the domain.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any> Iterable<DomainType>.scaled(): ColumnScaledUnspecifiedDefault<DomainType> =
+    public inline fun <reified DomainType> Iterable<DomainType>.scaled(): ColumnScaledUnspecifiedDefault<DomainType> =
         ColumnScaledUnspecifiedDefault(toColumnPointer(this))
 
     /**
@@ -96,7 +96,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param DomainType type of the domain.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any> Pair<Iterable<DomainType>, String>.scaled()
+    public inline fun <reified DomainType> Pair<Iterable<DomainType>, String>.scaled()
             : ColumnScaledUnspecifiedDefault<DomainType> =
         ColumnScaledUnspecifiedDefault(toColumnPointer(first, second))
 
@@ -110,7 +110,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param scale applying positional unspecified scale.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any> Iterable<DomainType>.scaled(
+    public inline fun <reified DomainType> Iterable<DomainType>.scaled(
         scale: PositionalUnspecifiedScale
     ): ColumnScaledPositionalUnspecified<DomainType> = ColumnScaledPositionalUnspecified(toColumnPointer(this), scale)
 
@@ -125,7 +125,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param scale applying positional unspecified scale.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any> Pair<Iterable<DomainType>, String>.scaled(
+    public inline fun <reified DomainType> Pair<Iterable<DomainType>, String>.scaled(
         scale: PositionalUnspecifiedScale
     ): ColumnScaledPositionalUnspecified<DomainType> =
         ColumnScaledPositionalUnspecified(toColumnPointer(first, second), scale)
@@ -140,7 +140,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param scale applying non-positional unspecified scale.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any> Iterable<DomainType>.scaled(
+    public inline fun <reified DomainType> Iterable<DomainType>.scaled(
         scale: NonPositionalUnspecifiedScale
     ): ColumnScaledNonPositionalUnspecified<DomainType> =
         ColumnScaledNonPositionalUnspecified(toColumnPointer(this), scale)
@@ -156,7 +156,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param scale applying non-positional unspecified scale.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any> Pair<Iterable<DomainType>, String>.scaled(
+    public inline fun <reified DomainType> Pair<Iterable<DomainType>, String>.scaled(
         scale: NonPositionalUnspecifiedScale
     ): ColumnScaledNonPositionalUnspecified<DomainType> =
         ColumnScaledNonPositionalUnspecified(toColumnPointer(first, second), scale)
@@ -170,7 +170,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param scale applying positional scale.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any> Iterable<DomainType>.scaled(
+    public inline fun <reified DomainType> Iterable<DomainType>.scaled(
         scale: PositionalScale<DomainType>
     ): ColumnScaledPositional<DomainType> = ColumnScaledPositional(toColumnPointer(this), scale)
 
@@ -184,7 +184,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param scale applying positional scale.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any> Pair<Iterable<DomainType>, String>.scaled(
+    public inline fun <reified DomainType> Pair<Iterable<DomainType>, String>.scaled(
         scale: PositionalScale<DomainType>
     ): ColumnScaledPositional<DomainType> = ColumnScaledPositional(toColumnPointer(first, second), scale)
 
@@ -197,7 +197,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param scale applying non-positional scale.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any, RangeType : Any> Iterable<DomainType>.scaled(
+    public inline fun <reified DomainType, RangeType> Iterable<DomainType>.scaled(
         scale: NonPositionalScale<DomainType, RangeType>
     ): ColumnScaledNonPositional<DomainType, RangeType> =
         ColumnScaledNonPositional(toColumnPointer(this), scale)
@@ -212,7 +212,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      * @param scale applying non-positional scale.
      * @return scaled added column.
      */
-    public inline fun <reified DomainType : Any, RangeType : Any> Pair<Iterable<DomainType>, String>.scaled(
+    public inline fun <reified DomainType, RangeType> Pair<Iterable<DomainType>, String>.scaled(
         scale: NonPositionalScale<DomainType, RangeType>
     ): ColumnScaledNonPositional<DomainType, RangeType> =
         ColumnScaledNonPositional(toColumnPointer(first, second), scale)
@@ -223,7 +223,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      *
      * @param iterable [Iterable] that will be added as a column.
      */
-    public inline operator fun <reified DomainType : Any> NonScalablePositionalAes.invoke(
+    public inline operator fun <reified DomainType> NonScalablePositionalAes.invoke(
         iterable: Iterable<DomainType>
     ) {
         context.bindingCollector.mappings[this.name] =
@@ -236,7 +236,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      *
      * @param dataToName [Pair] of [Iterable] that will be added as a column to the name of a new column.
      */
-    public inline operator fun <reified DomainType : Any> NonScalablePositionalAes.invoke(
+    public inline operator fun <reified DomainType> NonScalablePositionalAes.invoke(
         dataToName: Pair<Iterable<DomainType>, String>
     ) {
         context.bindingCollector.mappings[this.name] =
@@ -251,7 +251,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      *
      * @param iterable [Iterable] that will be added as a column.
      */
-    public inline operator fun <reified DomainType : Any, RangeType: Any>
+    public inline operator fun <reified DomainType, RangeType>
             NonScalableNonPositionalAes<RangeType>.invoke(
         iterable: Iterable<DomainType>
     ) {
@@ -267,7 +267,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      *
      * @param dataToName [Pair] of [Iterable] that will be added as a column to the name of a new column.
      */
-    public inline operator fun <reified DomainType : Any, RangeType: Any>
+    public inline operator fun <reified DomainType, RangeType>
             NonScalableNonPositionalAes<RangeType>.invoke(
         dataToName: Pair<Iterable<DomainType>, String>
     ) {
@@ -284,7 +284,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      *
      * @param iterable [Iterable] that will be added as a column.
      */
-    public inline operator fun <reified DomainType : Any> ScalablePositionalAes.invoke(
+    public inline operator fun <reified DomainType> ScalablePositionalAes.invoke(
         iterable: Iterable<DomainType>
     ): ScaledUnspecifiedDefaultPositionalMapping<DomainType> {
         val mapping = ScaledUnspecifiedDefaultPositionalMapping(
@@ -303,7 +303,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      *
      * @param dataToName [Pair] of [Iterable] that will be added as a column to the name of a new column.
      */
-    public inline operator fun <reified DomainType : Any> ScalablePositionalAes.invoke(
+    public inline operator fun <reified DomainType> ScalablePositionalAes.invoke(
         dataToName: Pair<Iterable<DomainType>, String>
     ): ScaledUnspecifiedDefaultPositionalMapping<DomainType> {
         val mapping = ScaledUnspecifiedDefaultPositionalMapping(
@@ -322,7 +322,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      *
      * @param iterable [Iterable] that will be added as a column.
      */
-    public inline operator fun <reified DomainType : Any, RangeType : Any>
+    public inline operator fun <reified DomainType, RangeType>
             ScalableNonPositionalAes<RangeType>.invoke(
         iterable: Iterable<DomainType>
     ): ScaledUnspecifiedDefaultNonPositionalMapping<DomainType, RangeType> {
@@ -342,7 +342,7 @@ public abstract class TableContextMutableBase : TableBindingContextInterfaceMuta
      *
      * @param dataToName [Pair] of [Iterable] that will be added as a column to the name of a new column.
      */
-    public inline operator fun <reified DomainType : Any, RangeType : Any>
+    public inline operator fun <reified DomainType, RangeType>
             ScalableNonPositionalAes<RangeType>.invoke(
         dataToName: Pair<Iterable<DomainType>, String>
     ): ScaledUnspecifiedDefaultNonPositionalMapping<DomainType, RangeType> {

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/internal/mapToNamedData.kt

@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.ggdsl.dsl.internal
 import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.LocalTime
 import org.jetbrains.kotlinx.ggdsl.ir.data.TypedList
 import kotlin.reflect.typeOf
 
@@ -11,7 +12,7 @@ import kotlin.reflect.typeOf
  *
  * @return [Map] with the same keys but with [TypedList] instead of untyped lists values.
  */
-public fun Map<String, List<Any>>.toTyped(): Map<String, TypedList> {
+public fun Map<String, List<*>>.toTyped(): Map<String, TypedList> {
     return map { (key, list)-> key to list.toTypedList() }.toMap()
 }
 
@@ -20,7 +21,7 @@ public fun Map<String, List<Any>>.toTyped(): Map<String, TypedList> {
  *
  * @return [TypedList] with the same values (with dynamic type inference).
  */
-public fun List<Any>.toTypedList(): TypedList {
+public fun List<*>.toTypedList(): TypedList {
     val type = when {
         all { it is Int } -> typeOf<Int>()
         all { it is Long } -> typeOf<Long>()
@@ -32,7 +33,19 @@ public fun List<Any>.toTypedList(): TypedList {
         all { it is Instant } -> typeOf<Instant>()
         all { it is LocalDateTime } -> typeOf<LocalDateTime>()
         all { it is LocalDate } -> typeOf<LocalDate>()
-        else -> typeOf<Any>() // todo
+        all { it is LocalTime } -> typeOf<LocalTime>()
+        all { it is Int? } -> typeOf<Int?>()
+        all { it is Long? } -> typeOf<Long?>()
+        all { it is Double? } -> typeOf<Double?>()
+        all { it is Float? } -> typeOf<Float?>()
+        all { it is Char? } -> typeOf<Char?>()
+        all { it is Boolean? } -> typeOf<Boolean?>()
+        all { it is String? } -> typeOf<String?>()
+        all { it is Instant? } -> typeOf<Instant?>()
+        all { it is LocalDateTime? } -> typeOf<LocalDateTime?>()
+        all { it is LocalDate? } -> typeOf<LocalDate?>()
+        all { it is LocalTime? } -> typeOf<LocalTime?>()
+        else -> typeOf<Any?>() // todo
     }
     return TypedList(type, this)
 }

ggdsl-api/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/dsl/internal/typed.kt

@@ -10,7 +10,7 @@ import kotlin.reflect.typeOf
  *
  * @return [TypedValue] with the given value and obtained [KType].
  */
-public inline fun<reified T: Any> T.typed(): TypedValue{
+public inline fun<reified T> T.typed(): TypedValue{
     return TypedValue(typeOf<T>(), this)
 }
 
@@ -19,7 +19,7 @@ public inline fun<reified T: Any> T.typed(): TypedValue{
  *
  * @return [Pair] of [TypedValue] with the given values and obtained [KType].
  */
-public inline fun<reified T: Any> Pair<T, T>.typedPair(): Pair<TypedValue, TypedValue>{
+public inline fun<reified T> Pair<T, T>.typedPair(): Pair<TypedValue, TypedValue>{
     return TypedValue(typeOf<T>(), this.first) to TypedValue(typeOf<T>(), this.second)
 }
 
@@ -28,6 +28,6 @@ public inline fun<reified T: Any> Pair<T, T>.typedPair(): Pair<TypedValue, Typed
  *
  * @return [TypedList] with the given values and obtained [KType].
  */
-public inline fun<reified T: Any> List<T>.typedList(): TypedList{
+public inline fun<reified T> List<T>.typedList(): TypedList{
     return TypedList(typeOf<T>(), this)
 }