Separate parsing from writing in node constructors

ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/Toml.kt

@@ -60,7 +60,7 @@ public open class Toml(
     }
 
     override fun <T> encodeToString(serializer: SerializationStrategy<T>, value: T): String {
-        val toml = TomlMainEncoder.encode(serializer, value, inputConfig, outputConfig, serializersModule)
+        val toml = TomlMainEncoder.encode(serializer, value, outputConfig, serializersModule)
 
         return tomlWriter.writeToString(file = toml)
     }
@@ -195,7 +195,7 @@ public open class Toml(
             )
 
         // adding a fake file node to restore the structure and parse only the part of te toml
-        val fakeFileNode = TomlFile(config)
+        val fakeFileNode = TomlFile()
         parsedToml.children.forEach {
             fakeFileNode.appendChild(it)
         }

ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/decoders/TomlAbstractDecoder.kt

@@ -68,7 +68,7 @@ public abstract class TomlAbstractDecoder : AbstractDecoder() {
             }
         } catch (e: ClassCastException) {
             throw IllegalTypeException(
-                "Cannot decode the key [${keyValue.key.content}] with the value [${keyValue.value.content}]" +
+                "Cannot decode the key [${keyValue.key.last()}] with the value [${keyValue.value.content}]" +
                         " with the provided type [${T::class}]. Please check the type in your Serializable class or it's nullability",
                 keyValue.lineNo
             )
@@ -112,7 +112,7 @@ public abstract class TomlAbstractDecoder : AbstractDecoder() {
         throw IllegalTypeException(
             "<$typeName> type is not allowed by toml specification," +
                     " use <$requiredType> instead" +
-                    " (key = ${keyValue.key.content}; value = ${keyValue.value.content})", keyValue.lineNo
+                    " (key = ${keyValue.key.last()}; value = ${keyValue.value.content})", keyValue.lineNo
         )
     }
 }

ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/decoders/TomlArrayDecoder.kt

@@ -57,8 +57,6 @@ public class TomlArrayDecoder(
                 rootNode.lineNo,
                 comments = emptyList(),
                 inlineComment = "",
-                rootNode.key.content,
-                config
             )
         )
         return nextElementIndex++

ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/decoders/TomlMainDecoder.kt

@@ -237,14 +237,14 @@ public class TomlMainDecoder(
                     is TomlTablePrimitive -> {
                         val firstTableChild = nextProcessingNode.getFirstChild() ?: throw InternalDecodingException(
                             "Decoding process failed due to invalid structure of parsed AST tree: missing children" +
-                                    " in a table <${nextProcessingNode.fullTableName}>"
+                                    " in a table <${nextProcessingNode.fullTableKey}>"
                         )
                         checkMissingRequiredProperties(firstTableChild.getNeighbourNodes(), descriptor)
                         TomlMainDecoder(firstTableChild, config)
                     }
                     else -> throw InternalDecodingException(
                         "Incorrect decoding state in the beginStructure()" +
-                                " with $nextProcessingNode (${nextProcessingNode.content})[${nextProcessingNode.name}]"
+                                " with $nextProcessingNode ($nextProcessingNode)[${nextProcessingNode.name}]"
                     )
                 }
             }

ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/encoders/TomlAbstractEncoder.kt

@@ -1,6 +1,5 @@
 package com.akuleshov7.ktoml.encoders
 
-import com.akuleshov7.ktoml.TomlInputConfig
 import com.akuleshov7.ktoml.TomlOutputConfig
 import com.akuleshov7.ktoml.exceptions.InternalEncodingException
 import com.akuleshov7.ktoml.exceptions.UnsupportedEncodingFeatureException
@@ -23,15 +22,13 @@ import kotlinx.serialization.modules.SerializersModule
  *
  * @property elementIndex The current element index.
  * @property attributes The current attributes.
- * @property inputConfig The input config, used for constructing nodes.
  * @property outputConfig The output config.
  * @property serializersModule
  */
 @OptIn(ExperimentalSerializationApi::class)
 public abstract class TomlAbstractEncoder protected constructor(
     protected var elementIndex: Int,
     protected val attributes: TomlEncoderAttributes,
-    protected val inputConfig: TomlInputConfig,
     protected val outputConfig: TomlOutputConfig,
     override val serializersModule: SerializersModule,
 ) : AbstractEncoder() {
@@ -82,13 +79,13 @@ public abstract class TomlAbstractEncoder protected constructor(
 
     override fun encodeBoolean(value: Boolean) {
         if (!encodeAsKey(value, "Boolean")) {
-            appendValue(TomlBoolean(value, elementIndex))
+            appendValue(TomlBoolean(value))
         }
     }
 
     override fun encodeDouble(value: Double) {
         if (!encodeAsKey(value, "Double")) {
-            appendValue(TomlDouble(value, elementIndex))
+            appendValue(TomlDouble(value))
         }
     }
 
@@ -104,12 +101,12 @@ public abstract class TomlAbstractEncoder protected constructor(
         }
 
         if (!encodeAsKey(value, "Long")) {
-            appendValue(TomlLong(value, elementIndex))
+            appendValue(TomlLong(value))
         }
     }
 
     override fun encodeNull() {
-        appendValue(TomlNull(elementIndex))
+        appendValue(TomlNull())
     }
 
     override fun encodeString(value: String) {
@@ -122,9 +119,9 @@ public abstract class TomlAbstractEncoder protected constructor(
         if (!encodeAsKey(value)) {
             appendValue(
                 if (attributes.isLiteral) {
-                    TomlLiteralString(value as Any, elementIndex)
+                    TomlLiteralString(value)
                 } else {
-                    TomlBasicString(value as Any, elementIndex)
+                    TomlBasicString(value)
                 }
             )
         }
@@ -135,7 +132,7 @@ public abstract class TomlAbstractEncoder protected constructor(
             instantDescriptor,
             localDateTimeDescriptor,
             localDateDescriptor -> if (!encodeAsKey(value as Any, desc.serialName)) {
-                appendValue(TomlDateTime(value as Any, elementIndex))
+                appendValue(TomlDateTime(value))
             }
             else -> when (val kind = desc.kind) {
                 is StructureKind,
@@ -262,7 +259,6 @@ public abstract class TomlAbstractEncoder protected constructor(
                 parent = this,
                 elementIndex,
                 attributes,
-                inputConfig,
                 outputConfig,
                 serializersModule
             )
@@ -279,7 +275,6 @@ public abstract class TomlAbstractEncoder protected constructor(
                 parent = this,
                 elementIndex,
                 attributes.child(),
-                inputConfig,
                 outputConfig,
                 serializersModule
             )
@@ -295,7 +290,6 @@ public abstract class TomlAbstractEncoder protected constructor(
                 rootNode,
                 elementIndex,
                 attributes.child(),
-                inputConfig,
                 outputConfig,
                 serializersModule
             )

ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/encoders/TomlArrayEncoder.kt

@@ -1,6 +1,5 @@
 package com.akuleshov7.ktoml.encoders
 
-import com.akuleshov7.ktoml.TomlInputConfig
 import com.akuleshov7.ktoml.TomlOutputConfig
 import com.akuleshov7.ktoml.exceptions.InternalEncodingException
 import com.akuleshov7.ktoml.exceptions.UnsupportedEncodingFeatureException
@@ -11,7 +10,6 @@ import com.akuleshov7.ktoml.tree.nodes.TomlNode
 import com.akuleshov7.ktoml.tree.nodes.pairs.keys.TomlKey
 import com.akuleshov7.ktoml.tree.nodes.pairs.values.TomlArray
 import com.akuleshov7.ktoml.tree.nodes.pairs.values.TomlValue
-
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.descriptors.PolymorphicKind
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -28,13 +26,11 @@ public class TomlArrayEncoder internal constructor(
     private val parent: TomlAbstractEncoder?,
     elementIndex: Int,
     attributes: TomlEncoderAttributes,
-    inputConfig: TomlInputConfig,
     outputConfig: TomlOutputConfig,
     serializersModule: SerializersModule
 ) : TomlAbstractEncoder(
     elementIndex,
     attributes,
-    inputConfig,
     outputConfig,
     serializersModule
 ) {
@@ -52,15 +48,13 @@ public class TomlArrayEncoder internal constructor(
         rootNode: TomlNode,
         elementIndex: Int,
         attributes: TomlEncoderAttributes,
-        inputConfig: TomlInputConfig,
         outputConfig: TomlOutputConfig,
         serializersModule: SerializersModule
     ) : this(
         rootNode,
         parent = null,
         elementIndex,
         attributes,
-        inputConfig,
         outputConfig,
         serializersModule
     )
@@ -107,8 +101,7 @@ public class TomlArrayEncoder internal constructor(
         val element = TomlArrayOfTablesElement(
             elementIndex,
             attributes.comments,
-            attributes.inlineComment,
-            inputConfig
+            attributes.inlineComment
         )
 
         tables += element
@@ -117,15 +110,14 @@ public class TomlArrayEncoder internal constructor(
             element,
             nextElementIndex(),
             attributes,
-            inputConfig,
             outputConfig,
             serializersModule
         )
     }
 
     override fun endStructure(descriptor: SerialDescriptor) {
         if (attributes.isInline) {
-            val array = TomlArray(values, "", elementIndex)
+            val array = TomlArray(values)
 
             parent?.let {
                 appendValueTo(array, parent)
@@ -139,9 +131,7 @@ public class TomlArrayEncoder internal constructor(
                         array,
                         elementIndex,
                         attributes.comments,
-                        attributes.inlineComment,
-                        key,
-                        inputConfig
+                        attributes.inlineComment
                     )
                 )
             }
@@ -171,9 +161,8 @@ public class TomlArrayEncoder internal constructor(
         }
 
         val tableArray = TomlArrayOfTables(
-            "[[${attributes.parent!!.getFullKey()}]]",
+            TomlKey(attributes.parent!!.getFullKey(), elementIndex),
             elementIndex,
-            inputConfig,
             isSynthetic
         )
 

ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/encoders/TomlInlineTableEncoder.kt

@@ -1,6 +1,5 @@
 package com.akuleshov7.ktoml.encoders
 
-import com.akuleshov7.ktoml.TomlInputConfig
 import com.akuleshov7.ktoml.TomlOutputConfig
 import com.akuleshov7.ktoml.exceptions.InternalEncodingException
 import com.akuleshov7.ktoml.tree.nodes.TomlInlineTable
@@ -10,7 +9,6 @@ import com.akuleshov7.ktoml.tree.nodes.TomlNode
 import com.akuleshov7.ktoml.tree.nodes.pairs.keys.TomlKey
 import com.akuleshov7.ktoml.tree.nodes.pairs.values.TomlArray
 import com.akuleshov7.ktoml.tree.nodes.pairs.values.TomlValue
-
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.SerialKind
@@ -29,13 +27,11 @@ public class TomlInlineTableEncoder internal constructor(
     private val parent: TomlAbstractEncoder?,
     elementIndex: Int,
     attributes: TomlEncoderAttributes,
-    inputConfig: TomlInputConfig,
     outputConfig: TomlOutputConfig,
     serializersModule: SerializersModule
 ) : TomlAbstractEncoder(
     elementIndex,
     attributes,
-    inputConfig,
     outputConfig,
     serializersModule
 ) {
@@ -52,15 +48,13 @@ public class TomlInlineTableEncoder internal constructor(
         rootNode: TomlNode,
         elementIndex: Int,
         attributes: TomlEncoderAttributes,
-        inputConfig: TomlInputConfig,
         outputConfig: TomlOutputConfig,
         serializersModule: SerializersModule
     ) : this(
         rootNode,
         parent = null,
         elementIndex,
         attributes,
-        inputConfig,
         outputConfig,
         serializersModule
     )
@@ -79,18 +73,14 @@ public class TomlInlineTableEncoder internal constructor(
                 elementIndex,
                 comments = emptyList(),
                 inlineComment = "",
-                name,
-                inputConfig
             )
         } else {
             TomlKeyValuePrimitive(
                 key,
                 value,
                 elementIndex,
                 comments = emptyList(),
-                inlineComment = "",
-                name,
-                inputConfig
+                inlineComment = ""
             )
         }
 
@@ -108,13 +98,11 @@ public class TomlInlineTableEncoder internal constructor(
         val name = attributes.keyOrThrow()
 
         val inlineTable = TomlInlineTable(
-            "",
-            elementIndex,
-            name,
+            TomlKey(name, elementIndex),
             pairs,
+            elementIndex,
             comments,
-            inlineComment,
-            inputConfig
+            inlineComment
         )
 
         when (parent) {
@@ -148,27 +136,21 @@ public class TomlInlineTableEncoder internal constructor(
                 child.value,
                 child.lineNo,
                 child.comments,
-                child.inlineComment,
-                name,
-                inputConfig
+                child.inlineComment
             )
             is TomlKeyValueArray -> TomlKeyValueArray(
                 TomlKey(name, child.lineNo),
                 child.value,
                 child.lineNo,
                 child.comments,
-                child.inlineComment,
-                name,
-                inputConfig
+                child.inlineComment
             )
             is TomlInlineTable -> TomlInlineTable(
-                "",
-                child.lineNo,
-                name,
+                TomlKey(name, elementIndex),
                 child.tomlKeyValues,
+                child.lineNo,
                 child.comments,
-                child.inlineComment,
-                inputConfig
+                child.inlineComment
             )
             else -> throw InternalEncodingException("Not a pair")
         }