Skip to content

Commit 8775465

Browse files
koperagenkoperagen
committed
clean up
1 parent 5179987 commit 8775465

File tree

6 files changed

+149
-364
lines changed

6 files changed

+149
-364
lines changed

‎core/build.gradle.kts

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ repositories {
3434
maven(jupyterApiTCRepo)
3535
}
3636

37-
//val testWithOutputs by configurations.creating {
38-
// extendsFrom(configurations.kotlinCompilerPluginClasspathTest.get())
39-
//}
40-
4137
kotlin.sourceSets {
4238
main {
4339
kotlin.srcDir("build/generated/ksp/main/kotlin/")
@@ -53,6 +49,29 @@ sourceSets {
5349
}
5450
}
5551

52+
dependencies {
53+
val kotlinCompilerPluginClasspathMyTest by configurations.getting
54+
55+
api(libs.kotlin.reflect)
56+
implementation(libs.kotlin.stdlib)
57+
kotlinCompilerPluginClasspathMyTest(project(":plugins:expressions-converter"))
58+
implementation(libs.kotlin.stdlib.jdk8)
59+
60+
api(libs.commonsCsv)
61+
implementation(libs.klaxon)
62+
implementation(libs.fuel)
63+
64+
api(libs.kotlin.datetimeJvm)
65+
implementation(libs.kotlinpoet)
66+
67+
testImplementation(libs.junit)
68+
testImplementation(libs.kotestAssertions) {
69+
exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
70+
}
71+
testImplementation(libs.kotlin.scriptingJvm)
72+
testImplementation(libs.jsoup)
73+
}
74+
5675
val myTestImplementation by configurations.getting {
5776
extendsFrom(configurations.testImplementation.get())
5877
}
@@ -99,33 +118,9 @@ val customTest = tasks.register<Test>("customTest") {
99118
classpath = files("$buildDir/classes/testWithOutputs/kotlin") + configurations["myTestRuntimeClasspath"] + sourceSets["main"].runtimeClasspath
100119
}
101120

102-
//val kotlinCompilerPluginClasspathTest by configurations.getting
103-
val kotlinCompilerPluginClasspathMyTest by configurations.getting
104-
105-
dependencies {
106-
api(libs.kotlin.reflect)
107-
implementation(libs.kotlin.stdlib)
108-
kotlinCompilerPluginClasspathMyTest(project(":plugins:expressions-converter"))
109-
implementation(libs.kotlin.stdlib.jdk8)
110-
111-
api(libs.commonsCsv)
112-
implementation(libs.klaxon)
113-
implementation(libs.fuel)
114-
115-
api(libs.kotlin.datetimeJvm)
116-
implementation(libs.kotlinpoet)
117-
118-
testImplementation(libs.junit)
119-
testImplementation(libs.kotestAssertions) {
120-
exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
121-
}
122-
testImplementation(libs.kotlin.scriptingJvm)
123-
testImplementation(libs.jsoup)
124-
}
125-
126121
val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
127122
group = "documentation"
128-
mainClass.set("org.jetbrains.kotlinx.dataframe.explainer.PluginCallbackKt")
123+
mainClass.set("org.jetbrains.kotlinx.dataframe.explainer.SampleAggregatorKt")
129124

130125
doFirst {
131126
delete {

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/PluginCallback.kt

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ private fun convertToHTML(dataframeLike: Any): DataFrameHtmlData {
4747
is SplitWithTransform<*, *, *> -> dataframeLike.into().toHTML()
4848
is Merge<*, *, *> -> dataframeLike.into("merged").toHTML()
4949
is Gather<*, *, *, *> -> dataframeLike.into("key", "value").toHTML()
50-
// is Update<*, *> -> DataFrameHtmlData(body = "<p>${dataframeLike::class}</p>")
5150
is Update<*, *> -> dataframeLike.df.let {
5251
var it = it.format(dataframeLike.columns as ColumnsSelectionDsl<Any?>.(it: ColumnsSelectionDsl<Any?>) -> ColumnSet<*>)
5352
if (dataframeLike.filter != null) {
@@ -98,33 +97,12 @@ private fun convertToDescription(dataframeLike: Any): String {
9897
is GroupBy<*, *> -> "GroupBy"
9998
is DataRow<*> -> "DataRow"
10099
else -> "TODO"
101-
}.escapeHTML()
100+
}.escapeHtmlForIFrame()
102101
}
103102

104103
annotation class TransformDataFrameExpressions
105104

106-
fun main() {
107-
File("build/dataframes")
108-
.walkTopDown()
109-
.filter {
110-
it.nameWithoutExtension.startsWith("org.jetbrains")
111-
}
112-
// org.ClassName.functionName_properties
113-
// <dataFrame src="org.jetbrains.kotlinx.dataframe.samples.api.Modify.addDfs.html"/>
114-
.groupBy {
115-
it.nameWithoutExtension.substringBefore("_")
116-
}
117-
.mapValues { (name, files) ->
118-
val target = File("../docs/StardustDocs/snippets")
119-
val original = files
120-
.firstOrNull { it.nameWithoutExtension.contains("properties") }
121-
?: files.first()
122-
original.copyTo(File(target, "$name.html"), overwrite = true)
123-
}
124-
}
125-
126105
object PluginCallback {
127-
// var i = AtomicInteger(0)
128106
val names = mutableMapOf<String, List<String>>()
129107
val expressionsByStatement = mutableMapOf<Int, List<Expression>>()
130108

@@ -140,7 +118,7 @@ object PluginCallback {
140118
}
141119

142120
fun save() {
143-
// if (i.get() == 0) return
121+
// ensure stable table ids across test invocation
144122
sessionId = 0
145123
tableInSessionId = 0
146124
var output = DataFrameHtmlData.tableDefinitions() + DataFrameHtmlData(
@@ -188,7 +166,7 @@ object PluginCallback {
188166
.also {
189167
if (it.length > 95) TODO("expression is too long ${it.length}. better to split sample in multiple snippets")
190168
}
191-
.escapeHTML()}</summary>
169+
.escapeHtmlForIFrame()}</summary>
192170
${details.body}
193171
</details>
194172
<br>
@@ -262,7 +240,6 @@ object PluginCallback {
262240

263241
var action: (String, String, Any, String, String?, String?, String?, Int) -> Unit =
264242
{ source, name, df, id, receiverId, containingClassFqName, containingFunName, statementIndex ->
265-
// i.incrementAndGet()
266243
expressionsByStatement.compute(statementIndex) { _, list ->
267244
val element = Expression(source, containingClassFqName, containingFunName, df)
268245
list?.plus(element) ?: listOf(element)
@@ -304,6 +281,7 @@ object PluginCallback {
304281
// convertToHTML(df).writeHTML(File("build/dataframes/$path"))
305282
}
306283

284+
@Suppress("unused")
307285
fun doAction(
308286
string: String,
309287
name: String,
@@ -318,7 +296,7 @@ object PluginCallback {
318296
}
319297
}
320298

321-
internal fun String.escapeHTML(): String {
299+
internal fun String.escapeHtmlForIFrame(): String {
322300
val str = this
323301
return buildString {
324302
for (c in str) {
@@ -328,12 +306,9 @@ internal fun String.escapeHTML(): String {
328306
append(c.code)
329307
append(';')
330308
}
331-
// c == '<' -> append("&lt;")
332-
// c == '>' -> append("&gt;")
333309
c == '"' -> append("&quot;")
334310
c == '<' -> append("&amp;lt;")
335311
c == '>' -> append("&amp;gt;")
336-
// c == '"' -> append("&amp;quot;")
337312
c == '&' -> append("&amp;")
338313
else -> {
339314
append(c)

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/SampleAggregator.kt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package org.jetbrains.kotlinx.dataframe.explainer
2+
3+
import java.io.File
4+
5+
fun main() {
6+
File("build/dataframes")
7+
.walkTopDown()
8+
.filter {
9+
it.nameWithoutExtension.startsWith("org.jetbrains")
10+
}
11+
// org.ClassName.functionName_properties
12+
// <dataFrame src="org.jetbrains.kotlinx.dataframe.samples.api.Modify.addDfs.html"/>
13+
.groupBy {
14+
it.nameWithoutExtension.substringBefore("_")
15+
}
16+
.mapValues { (name, files) ->
17+
val target = File("../docs/StardustDocs/snippets")
18+
val original = files
19+
.firstOrNull { it.nameWithoutExtension.contains("properties") }
20+
?: files.first()
21+
original.copyTo(File(target, "$name.html"), overwrite = true)
22+
}
23+
}

0 commit comments

Comments
 (0)