move inner workings into .core package, so the API is a bit nicer to use (#16)

aSemy · web-flow · commit d5a1ef67d49b · 2022-04-04T23:04:00.000+02:00
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/KxsTsConfig.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/KxsTsConfig.kt
@@ -1,6 +1,7 @@
 package dev.adamko.kxstsgen
 
-import dev.adamko.kxstsgen.util.MutableMapWithDefaultPut
+import dev.adamko.kxstsgen.core.UnimplementedKxTsGenApi
+import dev.adamko.kxstsgen.core.util.MutableMapWithDefaultPut
 import kotlin.jvm.JvmInline
 import kotlin.reflect.KClass
 import kotlinx.serialization.DeserializationStrategy
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/KxsTsGenerator.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/KxsTsGenerator.kt
@@ -1,5 +1,12 @@
 package dev.adamko.kxstsgen
 
+import dev.adamko.kxstsgen.core.KxsTsSourceCodeGenerator
+import dev.adamko.kxstsgen.core.SerializerDescriptorsExtractor
+import dev.adamko.kxstsgen.core.TsDeclaration
+import dev.adamko.kxstsgen.core.TsElementConverter
+import dev.adamko.kxstsgen.core.TsElementIdConverter
+import dev.adamko.kxstsgen.core.TsMapTypeConverter
+import dev.adamko.kxstsgen.core.TsTypeRefConverter
 import kotlinx.serialization.KSerializer
 
 
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/KxsTsSourceCodeGenerator.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/KxsTsSourceCodeGenerator.kt
@@ -1,4 +1,6 @@
-package dev.adamko.kxstsgen
+package dev.adamko.kxstsgen.core
+
+import dev.adamko.kxstsgen.KxsTsConfig
 
 
 /**
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/SerializerDescriptorsExtractor.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/SerializerDescriptorsExtractor.kt
@@ -1,6 +1,6 @@
-package dev.adamko.kxstsgen
+package dev.adamko.kxstsgen.core
 
-import dev.adamko.kxstsgen.util.MutableMapWithDefaultPut
+import dev.adamko.kxstsgen.core.util.MutableMapWithDefaultPut
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PolymorphicKind
 import kotlinx.serialization.descriptors.PrimitiveKind
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsElementConverter.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsElementConverter.kt
@@ -1,4 +1,4 @@
-package dev.adamko.kxstsgen
+package dev.adamko.kxstsgen.core
 
 import kotlinx.serialization.descriptors.PolymorphicKind
 import kotlinx.serialization.descriptors.PrimitiveKind
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsElementIdConverter.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsElementIdConverter.kt
@@ -1,4 +1,4 @@
-package dev.adamko.kxstsgen
+package dev.adamko.kxstsgen.core
 
 import kotlinx.serialization.descriptors.SerialDescriptor
 
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsMapTypeConverter.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsMapTypeConverter.kt
@@ -1,4 +1,4 @@
-package dev.adamko.kxstsgen
+package dev.adamko.kxstsgen.core
 
 import kotlinx.serialization.descriptors.PolymorphicKind
 import kotlinx.serialization.descriptors.PrimitiveKind
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsTypeRefConverter.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsTypeRefConverter.kt
@@ -1,4 +1,4 @@
-package dev.adamko.kxstsgen
+package dev.adamko.kxstsgen.core
 
 import kotlinx.serialization.descriptors.PolymorphicKind
 import kotlinx.serialization.descriptors.PrimitiveKind
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/_annotations.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/_annotations.kt
@@ -1,4 +1,4 @@
-package dev.adamko.kxstsgen
+package dev.adamko.kxstsgen.core
 
 
 @Target(
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/experiments/serializerExtractors.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/experiments/serializerExtractors.kt
@@ -1,6 +1,6 @@
 @file:OptIn(InternalSerializationApi::class)
 
-package dev.adamko.kxstsgen.experiments
+package dev.adamko.kxstsgen.core.experiments
 
 import dev.adamko.kxstsgen.KxsTsConfig
 import kotlinx.serialization.ContextualSerializer
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/tsElements.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/tsElements.kt
@@ -1,7 +1,5 @@
-package dev.adamko.kxstsgen
+package dev.adamko.kxstsgen.core
 
-import dev.adamko.kxstsgen.TsProperty.Optional
-import dev.adamko.kxstsgen.TsProperty.Required
 import kotlin.jvm.JvmInline
 import kotlinx.serialization.descriptors.SerialDescriptor
 
@@ -143,7 +141,8 @@ sealed interface TsTypeRef {
 /**
  * A property within an [interface][TsDeclaration.TsInterface]
  *
- *  In  property may be [Required] or [Optional]. See the TypeScript docs:
+ *  In  property may be [required][TsProperty.Required] or [optional][TsProperty.Optional].
+ *  See the TypeScript docs:
  *  ['Optional Properties'](https://www.typescriptlang.org/docs/handbook/2/objects.html#optional-properties)
  */
 sealed interface TsProperty {
diff --git a/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/util/mapWithDefaultDelegate.kt b/modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/util/mapWithDefaultDelegate.kt
@@ -1,4 +1,4 @@
-package dev.adamko.kxstsgen.util
+package dev.adamko.kxstsgen.core.util
 
 import kotlin.jvm.JvmName
 import kotlin.properties.ReadWriteProperty
diff --git a/modules/kxs-ts-gen-core/src/jvmMain/kotlin/dev/adamko/kxstsgen/core/experiments/serializerExtractorsJvm.kt b/modules/kxs-ts-gen-core/src/jvmMain/kotlin/dev/adamko/kxstsgen/core/experiments/serializerExtractorsJvm.kt
@@ -1,11 +1,10 @@
 @file:OptIn(InternalSerializationApi::class) // TODO make GitHub issue
-package dev.adamko.kxstsgen.experiments
+package dev.adamko.kxstsgen.core.experiments
 
 import kotlin.reflect.KClass
 import kotlin.reflect.*
 import kotlin.reflect.full.declaredMemberFunctions
 import kotlin.reflect.full.declaredMemberProperties
-import kotlin.reflect.full.functions
 import kotlin.reflect.jvm.isAccessible
 import kotlinx.serialization.ContextualSerializer
 import kotlinx.serialization.InternalSerializationApi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.adamko.kxstsgen`
	`1`	`+package dev.adamko.kxstsgen.core`
`2`	`2`
`3`	`3`	`import kotlinx.serialization.descriptors.PolymorphicKind`
`4`	`4`	`import kotlinx.serialization.descriptors.PrimitiveKind`