Skip to content

Commit e6a4bac

Browse files
aSemyaSemy
committed
move inner workings into .core package, so the API is a bit nicer to use
1 parent ae84d7d commit e6a4bac

File tree

13 files changed

+25
-17
lines changed

13 files changed

+25
-17
lines changed

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/KxsTsConfig.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.adamko.kxstsgen
22

3-
import dev.adamko.kxstsgen.util.MutableMapWithDefaultPut
3+
import dev.adamko.kxstsgen.core.UnimplementedKxTsGenApi
4+
import dev.adamko.kxstsgen.core.util.MutableMapWithDefaultPut
45
import kotlin.jvm.JvmInline
56
import kotlin.reflect.KClass
67
import kotlinx.serialization.DeserializationStrategy

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/KxsTsGenerator.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
package dev.adamko.kxstsgen
22

3+
import dev.adamko.kxstsgen.core.KxsTsSourceCodeGenerator
4+
import dev.adamko.kxstsgen.core.SerializerDescriptorsExtractor
5+
import dev.adamko.kxstsgen.core.TsDeclaration
6+
import dev.adamko.kxstsgen.core.TsElementConverter
7+
import dev.adamko.kxstsgen.core.TsElementIdConverter
8+
import dev.adamko.kxstsgen.core.TsMapTypeConverter
9+
import dev.adamko.kxstsgen.core.TsTypeRefConverter
310
import kotlinx.serialization.KSerializer
411

512

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/KxsTsSourceCodeGenerator.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/KxsTsSourceCodeGenerator.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package dev.adamko.kxstsgen
1+
package dev.adamko.kxstsgen.core
2+
3+
import dev.adamko.kxstsgen.KxsTsConfig
24

35

46
/**

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/SerializerDescriptorsExtractor.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/SerializerDescriptorsExtractor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package dev.adamko.kxstsgen
1+
package dev.adamko.kxstsgen.core
22

3-
import dev.adamko.kxstsgen.util.MutableMapWithDefaultPut
3+
import dev.adamko.kxstsgen.core.util.MutableMapWithDefaultPut
44
import kotlinx.serialization.KSerializer
55
import kotlinx.serialization.descriptors.PolymorphicKind
66
import kotlinx.serialization.descriptors.PrimitiveKind

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/TsElementConverter.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsElementConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.adamko.kxstsgen
1+
package dev.adamko.kxstsgen.core
22

33
import kotlinx.serialization.descriptors.PolymorphicKind
44
import kotlinx.serialization.descriptors.PrimitiveKind

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/TsElementIdConverter.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsElementIdConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.adamko.kxstsgen
1+
package dev.adamko.kxstsgen.core
22

33
import kotlinx.serialization.descriptors.SerialDescriptor
44

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/TsMapTypeConverter.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsMapTypeConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.adamko.kxstsgen
1+
package dev.adamko.kxstsgen.core
22

33
import kotlinx.serialization.descriptors.PolymorphicKind
44
import kotlinx.serialization.descriptors.PrimitiveKind

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/TsTypeRefConverter.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/TsTypeRefConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.adamko.kxstsgen
1+
package dev.adamko.kxstsgen.core
22

33
import kotlinx.serialization.descriptors.PolymorphicKind
44
import kotlinx.serialization.descriptors.PrimitiveKind

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/_annotations.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/_annotations.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.adamko.kxstsgen
1+
package dev.adamko.kxstsgen.core
22

33

44
@Target(

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/experiments/serializerExtractors.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/experiments/serializerExtractors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:OptIn(InternalSerializationApi::class)
22

3-
package dev.adamko.kxstsgen.experiments
3+
package dev.adamko.kxstsgen.core.experiments
44

55
import dev.adamko.kxstsgen.KxsTsConfig
66
import kotlinx.serialization.ContextualSerializer

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/tsElements.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/tsElements.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package dev.adamko.kxstsgen
1+
package dev.adamko.kxstsgen.core
22

3-
import dev.adamko.kxstsgen.TsProperty.Optional
4-
import dev.adamko.kxstsgen.TsProperty.Required
53
import kotlin.jvm.JvmInline
64
import kotlinx.serialization.descriptors.SerialDescriptor
75

@@ -143,7 +141,8 @@ sealed interface TsTypeRef {
143141
/**
144142
* A property within an [interface][TsDeclaration.TsInterface]
145143
*
146-
* In property may be [Required] or [Optional]. See the TypeScript docs:
144+
* In property may be [required][TsProperty.Required] or [optional][TsProperty.Optional].
145+
* See the TypeScript docs:
147146
* ['Optional Properties'](https://www.typescriptlang.org/docs/handbook/2/objects.html#optional-properties)
148147
*/
149148
sealed interface TsProperty {

‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/util/mapWithDefaultDelegate.kt renamed to ‎modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/core/util/mapWithDefaultDelegate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.adamko.kxstsgen.util
1+
package dev.adamko.kxstsgen.core.util
22

33
import kotlin.jvm.JvmName
44
import kotlin.properties.ReadWriteProperty

‎modules/kxs-ts-gen-core/src/jvmMain/kotlin/dev/adamko/kxstsgen/experiments/serializerExtractorsJvm.kt renamed to ‎modules/kxs-ts-gen-core/src/jvmMain/kotlin/dev/adamko/kxstsgen/core/experiments/serializerExtractorsJvm.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
@file:OptIn(InternalSerializationApi::class) // TODO make GitHub issue
2-
package dev.adamko.kxstsgen.experiments
2+
package dev.adamko.kxstsgen.core.experiments
33

44
import kotlin.reflect.KClass
55
import kotlin.reflect.*
66
import kotlin.reflect.full.declaredMemberFunctions
77
import kotlin.reflect.full.declaredMemberProperties
8-
import kotlin.reflect.full.functions
98
import kotlin.reflect.jvm.isAccessible
109
import kotlinx.serialization.ContextualSerializer
1110
import kotlinx.serialization.InternalSerializationApi

0 commit comments

Comments
 (0)