Skip to content

Commit e4d7b2b

Browse files
AndreiKingsleyAndreiKingsley
committed
Merge branch 'website_docs_examples_dev' into website_docs_kotlin_notebook
# Conflicts: # docs/StardustDocs/d.tree
2 parents 175b946 + b67707d commit e4d7b2b

File tree

91 files changed

+690
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+690
-603
lines changed

‎core/api/core.api

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,6 +1535,8 @@ public final class org/jetbrains/kotlinx/dataframe/api/ConvertKt {
15351535
public static final fun convertToStringFromT (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
15361536
public static final fun convertToURL (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
15371537
public static final fun convertToURLFromStringNullable (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
1538+
public static final fun convertToUrl (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
1539+
public static final fun convertToUrlFromStringNullable (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
15381540
public static final fun to (Lorg/jetbrains/kotlinx/dataframe/api/Convert;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
15391541
public static final fun to (Lorg/jetbrains/kotlinx/dataframe/api/Convert;Lkotlin/reflect/KType;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
15401542
public static final fun toBigDecimal (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
@@ -1610,6 +1612,8 @@ public final class org/jetbrains/kotlinx/dataframe/api/ConvertKt {
16101612
public static final fun toLongTAny (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
16111613
public static final fun toStr (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
16121614
public static final fun toStrTAny (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
1615+
public static final fun toURLFromString (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
1616+
public static final fun toURLFromStringNullable (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
16131617
public static final fun toUrlFromString (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
16141618
public static final fun toUrlFromStringNullable (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
16151619
}
@@ -2221,10 +2225,10 @@ public final class org/jetbrains/kotlinx/dataframe/api/FormattedFrame {
22212225
public fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function3;)V
22222226
public synthetic fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
22232227
public final fun getDisplayConfiguration (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;
2224-
public final fun toHTML (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
2225-
public static synthetic fun toHTML$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
2226-
public final fun toStandaloneHTML (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
2227-
public static synthetic fun toStandaloneHTML$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
2228+
public final fun toHtml (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
2229+
public static synthetic fun toHtml$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
2230+
public final fun toStandaloneHtml (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
2231+
public static synthetic fun toStandaloneHtml$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
22282232
}
22292233

22302234
public final class org/jetbrains/kotlinx/dataframe/api/FormattingDSL {
@@ -5459,7 +5463,7 @@ public final class org/jetbrains/kotlinx/dataframe/exceptions/CellConversionExce
54595463
public final fun getRow ()Ljava/lang/Integer;
54605464
}
54615465

5462-
public final class org/jetbrains/kotlinx/dataframe/exceptions/ColumnNotFoundException : java/lang/RuntimeException {
5466+
public final class org/jetbrains/kotlinx/dataframe/exceptions/ColumnNotFoundException : java/lang/RuntimeException, org/jetbrains/kotlinx/dataframe/exceptions/DataFrameException {
54635467
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
54645468
public final fun getColumnName ()Ljava/lang/String;
54655469
public fun getMessage ()Ljava/lang/String;
@@ -5470,7 +5474,11 @@ public final class org/jetbrains/kotlinx/dataframe/exceptions/ColumnTypeMismatch
54705474
public final fun getColumn ()Lorg/jetbrains/kotlinx/dataframe/DataColumn;
54715475
}
54725476

5473-
public final class org/jetbrains/kotlinx/dataframe/exceptions/DuplicateColumnNamesException : java/lang/IllegalArgumentException {
5477+
public abstract interface class org/jetbrains/kotlinx/dataframe/exceptions/DataFrameException {
5478+
public abstract fun getMessage ()Ljava/lang/String;
5479+
}
5480+
5481+
public final class org/jetbrains/kotlinx/dataframe/exceptions/DuplicateColumnNamesException : java/lang/IllegalArgumentException, org/jetbrains/kotlinx/dataframe/exceptions/DataFrameException {
54745482
public fun <init> (Ljava/util/List;)V
54755483
public final fun getAllColumnNames ()Ljava/util/List;
54765484
public final fun getDuplicatedNames ()Ljava/util/List;
@@ -6087,6 +6095,9 @@ public final class org/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData {
60876095
public final fun writeHTML (Ljava/io/File;)V
60886096
public final fun writeHTML (Ljava/lang/String;)V
60896097
public final fun writeHTML (Ljava/nio/file/Path;)V
6098+
public final fun writeHtml (Ljava/io/File;)V
6099+
public final fun writeHtml (Ljava/lang/String;)V
6100+
public final fun writeHtml (Ljava/nio/file/Path;)V
60906101
}
60916102

60926103
public final class org/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData$Companion {
@@ -6163,8 +6174,12 @@ public final class org/jetbrains/kotlinx/dataframe/io/GuessKt {
61636174
public final class org/jetbrains/kotlinx/dataframe/io/HtmlKt {
61646175
public static final fun toHTML (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
61656176
public static synthetic fun toHTML$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
6177+
public static final fun toHtml (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
6178+
public static synthetic fun toHtml$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
61666179
public static final fun toStandaloneHTML (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
61676180
public static synthetic fun toStandaloneHTML$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
6181+
public static final fun toStandaloneHtml (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
6182+
public static synthetic fun toStandaloneHtml$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
61686183
public static final fun toStaticHtml (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;ZZ)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
61696184
public static synthetic fun toStaticHtml$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;ZZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
61706185
}

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

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@ import org.jetbrains.kotlinx.dataframe.impl.io.FastDoubleParser
4242
import org.jetbrains.kotlinx.dataframe.io.toDataFrame
4343
import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO
4444
import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_REPLACE
45+
import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_URL
46+
import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_URL_REPLACE
47+
import org.jetbrains.kotlinx.dataframe.util.TO_URL
48+
import org.jetbrains.kotlinx.dataframe.util.TO_URL_REPLACE
4549
import java.math.BigDecimal
4650
import java.math.BigInteger
51+
import java.net.URI
4752
import java.net.URL
4853
import java.util.Locale
4954
import kotlin.reflect.KProperty
@@ -242,7 +247,7 @@ internal interface ConvertDocs {
242247
* `| `__`.`__[**`toInstant`**][Convert.toInstant]`()`
243248
*
244249
* &nbsp;&nbsp;&nbsp;&nbsp;
245-
* `| `__`.`__[**`toURL`**][Convert.toURL]`()`
250+
* `| `__`.`__[**`toUrl`**][Convert.toUrl]`()`
246251
*
247252
* &nbsp;&nbsp;&nbsp;&nbsp;
248253
* `| `__`.`__[**`toIFrame`**][Convert.toIFrame]`()`
@@ -464,7 +469,7 @@ public inline fun <T, C, reified R> Convert<T, C?>.notNull(
464469
* - [toStr], [toInt], [toLong], [toDouble], [toFloat], [toBigDecimal],
465470
* [toBigInteger], [toBoolean] – convert to standard types.
466471
* - [toLocalDateTime], [toLocalDate], [toLocalTime], [toInstant] – convert to kotlinx.datetime types.
467-
* - [toURL], [toIFrame], [toImg] – convert to special types.
472+
* - [toUrl], [toIFrame], [toImg] – convert to special types.
468473
* - [toDataFrames] – converts a column of lists into separate DataFrames.
469474
*
470475
* See [Grammar][ConvertDocs.Grammar] for more details.
@@ -1109,20 +1114,34 @@ public fun <T, R : URL?> Convert<T, URL>.toImg(width: Int? = null, height: Int?
11091114

11101115
// region toURL
11111116

1117+
@Deprecated(CONVERT_TO_URL, ReplaceWith(CONVERT_TO_URL_REPLACE), DeprecationLevel.ERROR)
1118+
public fun DataColumn<String>.convertToURL(): DataColumn<URL> = convertToUrl()
1119+
11121120
/**
11131121
* Converts values in this [String] column to an [URL].
11141122
*
11151123
* @return A new [DataColumn] with an [URL] values.
11161124
*/
1117-
public fun DataColumn<String>.convertToURL(): DataColumn<URL> = map { URL(it) }
1125+
public fun DataColumn<String>.convertToUrl(): DataColumn<URL> = map { URI(it).toURL() }
1126+
1127+
@Deprecated(CONVERT_TO_URL, ReplaceWith(CONVERT_TO_URL_REPLACE), DeprecationLevel.ERROR)
1128+
@JvmName("convertToURLFromStringNullable")
1129+
public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = convertToUrl()
11181130

11191131
/**
11201132
* Converts values in this [String] column to an [URL]. Preserves null values.
11211133
*
11221134
* @return A new [DataColumn] with an [URL] nullable values.
11231135
*/
1124-
@JvmName("convertToURLFromStringNullable")
1125-
public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = map { it?.let { URL(it) } }
1136+
@JvmName("convertToUrlFromStringNullable")
1137+
public fun DataColumn<String?>.convertToUrl(): DataColumn<URL?> = map { it?.let { URI(it).toURL() } }
1138+
1139+
@Deprecated(TO_URL, ReplaceWith(TO_URL_REPLACE), DeprecationLevel.ERROR)
1140+
@JvmName("toURLFromStringNullable")
1141+
@Refine
1142+
@Converter(URL::class, nullable = true)
1143+
@Interpretable("ToSpecificType")
1144+
public fun <T> Convert<T, String?>.toURL(): DataFrame<T> = asColumn { it.convertToUrl() }
11261145

11271146
/**
11281147
* Converts values in the [String] columns previously selected with [convert] to an [URL],
@@ -1133,7 +1152,7 @@ public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = map { it?.let
11331152
*
11341153
* ### Examples:
11351154
* ```kotlin
1136-
* df.convert { webAddress }.toURL()
1155+
* df.convert { webAddress }.toUrl()
11371156
* ```
11381157
*
11391158
* @return A new [DataFrame] with the values converted to an [URL].
@@ -1142,7 +1161,14 @@ public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = map { it?.let
11421161
@Refine
11431162
@Converter(URL::class, nullable = true)
11441163
@Interpretable("ToSpecificType")
1145-
public fun <T> Convert<T, String?>.toURL(): DataFrame<T> = asColumn { it.convertToURL() }
1164+
public fun <T> Convert<T, String?>.toUrl(): DataFrame<T> = asColumn { it.convertToUrl() }
1165+
1166+
@Deprecated(TO_URL, ReplaceWith(TO_URL_REPLACE), DeprecationLevel.ERROR)
1167+
@JvmName("toURLFromString")
1168+
@Refine
1169+
@Converter(URL::class, nullable = false)
1170+
@Interpretable("ToSpecificType")
1171+
public fun <T> Convert<T, String>.toURL(): DataFrame<T> = toUrl()
11461172

11471173
/**
11481174
* Converts values in the [String] columns previously selected with [convert] to an [URL],
@@ -1152,7 +1178,7 @@ public fun <T> Convert<T, String?>.toURL(): DataFrame<T> = asColumn { it.convert
11521178
*
11531179
* ### Examples:
11541180
* ```kotlin
1155-
* df.convert { webAddress }.toURL()
1181+
* df.convert { webAddress }.toUrl()
11561182
* ```
11571183
*
11581184
* @return A new [DataFrame] with the values converted to an [URL].
@@ -1161,7 +1187,7 @@ public fun <T> Convert<T, String?>.toURL(): DataFrame<T> = asColumn { it.convert
11611187
@Refine
11621188
@Converter(URL::class, nullable = false)
11631189
@Interpretable("ToSpecificType")
1164-
public fun <T> Convert<T, String>.toURL(): DataFrame<T> = asColumn { it.convertToURL() }
1190+
public fun <T> Convert<T, String>.toUrl(): DataFrame<T> = asColumn { it.convertToUrl() }
11651191

11661192
// endregion
11671193

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import org.jetbrains.kotlinx.dataframe.impl.api.formatImpl
1515
import org.jetbrains.kotlinx.dataframe.impl.api.linearGradient
1616
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
1717
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
18-
import org.jetbrains.kotlinx.dataframe.io.toHTML
19-
import org.jetbrains.kotlinx.dataframe.io.toStandaloneHTML
18+
import org.jetbrains.kotlinx.dataframe.io.toHtml
19+
import org.jetbrains.kotlinx.dataframe.io.toStandaloneHtml
2020
import kotlin.reflect.KProperty
2121

2222
// region DataFrame
@@ -126,14 +126,14 @@ public class FormattedFrame<T>(internal val df: DataFrame<T>, internal val forma
126126
/**
127127
* @return DataFrameHtmlData without additional definitions. Can be rendered in Jupyter kernel environments
128128
*/
129-
public fun toHTML(configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT): DataFrameHtmlData =
130-
df.toHTML(getDisplayConfiguration(configuration))
129+
public fun toHtml(configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT): DataFrameHtmlData =
130+
df.toHtml(getDisplayConfiguration(configuration))
131131

132132
/**
133133
* @return DataFrameHtmlData with table script and css definitions. Can be saved as an *.html file and displayed in the browser
134134
*/
135-
public fun toStandaloneHTML(configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT): DataFrameHtmlData =
136-
df.toStandaloneHTML(getDisplayConfiguration(configuration))
135+
public fun toStandaloneHtml(configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT): DataFrameHtmlData =
136+
df.toStandaloneHtml(getDisplayConfiguration(configuration))
137137

138138
public fun getDisplayConfiguration(configuration: DisplayConfiguration): DisplayConfiguration =
139139
configuration.copy(cellFormatter = formatter as RowColFormatter<*, *>?)

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/exceptions/ColumnNotFoundException.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package org.jetbrains.kotlinx.dataframe.exceptions
22

33
public class ColumnNotFoundException(public val columnName: String, public override val message: String) :
4-
RuntimeException()
4+
RuntimeException(),
5+
DataFrameException

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/exceptions/DataFrameException.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.jetbrains.kotlinx.dataframe.exceptions
2+
3+
/**
4+
* If DataFrame function used by compiler plugin as implementation detail throws this exception, [message] will be reported as warning
5+
*/
6+
public interface DataFrameException {
7+
public val message: String
8+
}

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/exceptions/DuplicateColumnNamesException.kt

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

3-
public class DuplicateColumnNamesException(public val allColumnNames: List<String>) : IllegalArgumentException() {
3+
public class DuplicateColumnNamesException(public val allColumnNames: List<String>) :
4+
IllegalArgumentException(),
5+
DataFrameException {
46

57
public val duplicatedNames: List<String> = allColumnNames
68
.groupBy { it }

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import org.jetbrains.kotlinx.dataframe.io.isUrl
4141
import org.jetbrains.kotlinx.dataframe.values
4242
import java.math.BigDecimal
4343
import java.math.BigInteger
44+
import java.net.URI
4445
import java.net.URL
4546
import java.text.ParsePosition
4647
import java.time.format.DateTimeFormatter
@@ -240,7 +241,7 @@ internal object Parsers : GlobalParserOptions {
240241
toJavaLocalDateTimeOrNull(formatter) // since we accept a Java DateTimeFormatter
241242
?.toKotlinLocalDateTime()
242243

243-
private fun String.toUrlOrNull(): URL? = if (isUrl(this)) catchSilent { URL(this) } else null
244+
private fun String.toUrlOrNull(): URL? = if (isUrl(this)) catchSilent { URI(this).toURL() } else null
244245

245246
private fun String.toBooleanOrNull() =
246247
when (uppercase(Locale.getDefault())) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.util.IS_URL_REPLACE
1111
import java.io.File
1212
import java.io.InputStream
1313
import java.net.HttpURLConnection
14+
import java.net.URI
1415
import java.net.URL
1516

1617
/**
@@ -110,7 +111,7 @@ public fun isProtocolSupported(url: URL): Boolean = url.protocol in setOf("http"
110111
*/
111112
public fun asUrl(fileOrUrl: String): URL =
112113
if (isUrl(fileOrUrl)) {
113-
URL(fileOrUrl).toURI()
114+
URI(fileOrUrl)
114115
} else {
115116
File(fileOrUrl).also {
116117
require(it.exists()) { "File not found: \"$fileOrUrl\"" }

0 commit comments

Comments
 (0)