Skip to content

Commit 23f4fb6

Browse files
github-actions[bot]github-actions[bot]
committed
Automated commit of generated code
1 parent 63be9a8 commit 23f4fb6

28 files changed

+67
-1866
lines changed

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/generateCode.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jetbrains.kotlinx.dataframe.api
22

3-
import org.jetbrains.dataframe.impl.codeGen.CodeGenerator
43
import org.jetbrains.kotlinx.dataframe.DataFrame
4+
import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenerator
55
import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
66
import org.jetbrains.kotlinx.dataframe.codeGen.NameNormalizer
77
import org.jetbrains.kotlinx.dataframe.impl.codeGen.from

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/CodeGenerator.kt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
package org.jetbrains.dataframe.impl.codeGen
1+
package org.jetbrains.kotlinx.dataframe.codeGen
22

3-
import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
4-
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
5-
import org.jetbrains.kotlinx.dataframe.codeGen.ExtensionsCodeGenerator
6-
import org.jetbrains.kotlinx.dataframe.codeGen.Marker
7-
import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
8-
import org.jetbrains.kotlinx.dataframe.codeGen.MarkersExtractor
9-
import org.jetbrains.kotlinx.dataframe.codeGen.NameNormalizer
103
import org.jetbrains.kotlinx.dataframe.impl.codeGen.CodeGeneratorImpl
114
import org.jetbrains.kotlinx.dataframe.impl.codeGen.FullyQualifiedNames
125
import org.jetbrains.kotlinx.dataframe.impl.codeGen.ShortNames

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/CodeWithConverter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package org.jetbrains.kotlinx.dataframe.codeGen
22

3-
import org.jetbrains.kotlinx.jupyter.api.Code
4-
import org.jetbrains.kotlinx.jupyter.api.VariableName
5-
63
/**
74
* Class representing generated code declarations for a [Marker].
85
*
@@ -28,3 +25,6 @@ public data class CodeWithConverter(val declarations: Code, val converter: (Vari
2825
else -> declarations + "\n" + converter(name)
2926
}
3027
}
28+
29+
public typealias Code = String
30+
public typealias VariableName = String

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/Utils.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,16 @@ internal fun <C : Comparable<C>> Sequence<C?>.indexOfMax(): Int {
270270
return maxIndex
271271
}
272272

273-
internal fun KClass<*>.createStarProjectedType(nullable: Boolean): KType =
274-
if (this == Nothing::class) {
273+
internal fun createStarProjectedType(klass: KClass<*>, nullable: Boolean): KType =
274+
if (klass == Nothing::class) {
275275
nothingType(nullable) // would be Void otherwise
276276
} else {
277-
this.starProjectedType.let { if (nullable) it.withNullability(true) else it }
277+
klass.starProjectedType.let { if (nullable) it.withNullability(true) else it }
278278
}
279279

280+
@JvmName("createStarProjectedTypeExt")
281+
internal fun KClass<*>.createStarProjectedType(nullable: Boolean): KType = createStarProjectedType(this, nullable)
282+
280283
internal fun KType.isSubtypeWithNullabilityOf(type: KType) =
281284
this.isSubtypeOf(type) && (!this.isMarkedNullable || type.isMarkedNullable)
282285

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
package org.jetbrains.kotlinx.dataframe.impl.codeGen
22

33
import com.squareup.kotlinpoet.buildCodeBlock
4-
import org.jetbrains.dataframe.impl.codeGen.CodeGenResult
5-
import org.jetbrains.dataframe.impl.codeGen.CodeGenerator
6-
import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode
7-
import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.Enum
8-
import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.NoFields
9-
import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.None
10-
import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.TypeAlias
11-
import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.WithFields
12-
import org.jetbrains.dataframe.keywords.HardKeywords
13-
import org.jetbrains.dataframe.keywords.ModifierKeywords
144
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
155
import org.jetbrains.kotlinx.dataframe.ColumnsScope
166
import org.jetbrains.kotlinx.dataframe.DataColumn
@@ -20,10 +10,19 @@ import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
2010
import org.jetbrains.kotlinx.dataframe.api.ColumnSelectionDsl
2111
import org.jetbrains.kotlinx.dataframe.api.DataSchemaEnum
2212
import org.jetbrains.kotlinx.dataframe.codeGen.BaseField
13+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
14+
import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenResult
15+
import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenerator
2316
import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
2417
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
2518
import org.jetbrains.kotlinx.dataframe.codeGen.ExtensionsCodeGenerator
2619
import org.jetbrains.kotlinx.dataframe.codeGen.FieldType
20+
import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode
21+
import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.Enum
22+
import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.NoFields
23+
import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.None
24+
import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.TypeAlias
25+
import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.WithFields
2726
import org.jetbrains.kotlinx.dataframe.codeGen.IsolatedMarker
2827
import org.jetbrains.kotlinx.dataframe.codeGen.Marker
2928
import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
@@ -33,8 +32,9 @@ import org.jetbrains.kotlinx.dataframe.codeGen.ValidFieldName
3332
import org.jetbrains.kotlinx.dataframe.codeGen.toNullable
3433
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
3534
import org.jetbrains.kotlinx.dataframe.impl.toSnakeCase
35+
import org.jetbrains.kotlinx.dataframe.keywords.HardKeywords
36+
import org.jetbrains.kotlinx.dataframe.keywords.ModifierKeywords
3637
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
37-
import org.jetbrains.kotlinx.jupyter.api.Code
3838

3939
private fun renderNullability(nullable: Boolean) = if (nullable) "?" else ""
4040

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ReplCodeGenerator.kt‎ renamed to ‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/ReplCodeGenerator.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package org.jetbrains.dataframe.impl.codeGen
1+
package org.jetbrains.kotlinx.dataframe.impl.codeGen
22

33
import org.jetbrains.kotlinx.dataframe.AnyFrame
44
import org.jetbrains.kotlinx.dataframe.AnyRow
5+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
56
import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
6-
import org.jetbrains.kotlinx.dataframe.impl.codeGen.ReplCodeGeneratorImpl
7-
import org.jetbrains.kotlinx.jupyter.api.Code
87
import kotlin.reflect.KClass
98
import kotlin.reflect.KProperty
109

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/ReplCodeGeneratorImpl.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package org.jetbrains.kotlinx.dataframe.impl.codeGen
22

3-
import org.jetbrains.dataframe.impl.codeGen.CodeGenerator
4-
import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode
5-
import org.jetbrains.dataframe.impl.codeGen.ReplCodeGenerator
63
import org.jetbrains.kotlinx.dataframe.AnyFrame
74
import org.jetbrains.kotlinx.dataframe.AnyRow
85
import org.jetbrains.kotlinx.dataframe.DataFrame
96
import org.jetbrains.kotlinx.dataframe.DataRow
107
import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
118
import org.jetbrains.kotlinx.dataframe.api.schema
9+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
10+
import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenerator
1211
import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
12+
import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode
1313
import org.jetbrains.kotlinx.dataframe.codeGen.Marker
1414
import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
1515
import org.jetbrains.kotlinx.dataframe.codeGen.MarkersExtractor
1616
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
17-
import org.jetbrains.kotlinx.jupyter.api.Code
1817
import kotlin.reflect.KClass
1918
import kotlin.reflect.KProperty
2019
import kotlin.reflect.KType

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaReader.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.jetbrains.kotlinx.dataframe.impl.codeGen
22

3-
import org.jetbrains.dataframe.impl.codeGen.CodeGenerator
43
import org.jetbrains.kotlinx.dataframe.AnyFrame
54
import org.jetbrains.kotlinx.dataframe.DataFrame
65
import org.jetbrains.kotlinx.dataframe.api.schema
6+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
7+
import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenerator
78
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
89
import org.jetbrains.kotlinx.dataframe.io.SupportedCodeGenerationFormat
910
import org.jetbrains.kotlinx.dataframe.io.SupportedDataFrameFormat
@@ -12,7 +13,6 @@ import org.jetbrains.kotlinx.dataframe.io.guessFormat
1213
import org.jetbrains.kotlinx.dataframe.io.read
1314
import org.jetbrains.kotlinx.dataframe.io.readCodeForGeneration
1415
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
15-
import org.jetbrains.kotlinx.jupyter.api.Code
1616
import java.net.URL
1717

1818
/**

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/writeJson.kt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ import kotlinx.serialization.json.JsonArray
88
import kotlinx.serialization.json.JsonElement
99
import kotlinx.serialization.json.JsonObject
1010
import kotlinx.serialization.json.JsonPrimitive
11+
import kotlinx.serialization.json.addAll
1112
import kotlinx.serialization.json.buildJsonArray
1213
import kotlinx.serialization.json.buildJsonObject
1314
import kotlinx.serialization.json.encodeToJsonElement
15+
import kotlinx.serialization.json.put
1416
import kotlinx.serialization.json.putJsonArray
1517
import kotlinx.serialization.json.putJsonObject
1618
import org.jetbrains.kotlinx.dataframe.AnyCol
@@ -401,3 +403,15 @@ internal fun encodeDataFrameWithMetadata(
401403
),
402404
)
403405
}
406+
407+
@OptIn(ExperimentalSerializationApi::class)
408+
internal fun encodeFrameNoDynamicNestedTables(df: AnyFrame, limit: Int): JsonObject =
409+
buildJsonObject {
410+
put(NROW, df.rowsCount())
411+
put(NCOL, df.columnsCount())
412+
putJsonArray(COLUMNS) { addAll(df.columnNames()) }
413+
put(
414+
KOTLIN_DATAFRAME,
415+
encodeFrame(df.take(limit)),
416+
)
417+
}

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/guess.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import org.jetbrains.kotlinx.dataframe.DataRow
99
import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
1010
import org.jetbrains.kotlinx.dataframe.annotations.ImportDataSchema
1111
import org.jetbrains.kotlinx.dataframe.api.single
12+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
1213
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
13-
import org.jetbrains.kotlinx.jupyter.api.Code
1414
import java.io.BufferedInputStream
1515
import java.io.File
1616
import java.io.FileNotFoundException

0 commit comments

Comments
 (0)