Update package

src/main/kotlin/dsl/AnnotationBuilder.kt → src/main/kotlin/me/deotime/kpoetdsl/AnnotationBuilder.kt

@@ -1,12 +1,12 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.asClassName
-import dsl.utils.Assembler
-import dsl.utils.buildWith
-import dsl.utils.required
-import dsl.utils.withRequired
+import me.deotime.kpoetdsl.utils.Assembler
+import me.deotime.kpoetdsl.utils.buildWith
+import me.deotime.kpoetdsl.utils.required
+import me.deotime.kpoetdsl.utils.withRequired
 
 class AnnotationBuilder private constructor(private val cozy: Cozy<AnnotationBuilder>) :
     Attributes.Sourced<AnnotationSpec.Builder>,
@@ -20,10 +20,13 @@ class AnnotationBuilder private constructor(private val cozy: Cozy<AnnotationBui
     }
 
     fun target(selector: Target.Companion.() -> Target) {
-        source.useSiteTarget(selector(Target.Companion).source)
+        source.useSiteTarget(selector(Target).source)
+    }
+
+    fun type(type: ClassName) {
+        this.type = type
     }
 
-    fun type(type: ClassName) { this.type = type }
     inline fun <reified T> type() = type(T::class.asClassName())
 
     @JvmInline

src/main/kotlin/dsl/Attributes.kt → src/main/kotlin/me/deotime/kpoetdsl/Attributes.kt

@@ -1,4 +1,4 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
@@ -10,12 +10,12 @@ import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.TypeVariableName
 import com.squareup.kotlinpoet.asTypeName
-import dsl.utils.Assembler
-import dsl.utils.CollectionAssembler
-import dsl.utils.Uses
-import dsl.utils.buildCollectionTo
-import dsl.utils.buildWith
-import dsl.utils.requiredByCozy
+import me.deotime.kpoetdsl.utils.Assembler
+import me.deotime.kpoetdsl.utils.CollectionAssembler
+import me.deotime.kpoetdsl.utils.Uses
+import me.deotime.kpoetdsl.utils.buildCollectionTo
+import me.deotime.kpoetdsl.utils.buildWith
+import me.deotime.kpoetdsl.utils.requiredByCozy
 import kotlin.reflect.KClass
 
 interface Attributes {

src/main/kotlin/dsl/CodeBuilder.kt → src/main/kotlin/me/deotime/kpoetdsl/CodeBuilder.kt

@@ -1,4 +1,4 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import com.squareup.kotlinpoet.CodeBlock
 

src/main/kotlin/dsl/Cozy.kt → src/main/kotlin/me/deotime/kpoetdsl/Cozy.kt

@@ -1,4 +1,4 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import kotlin.reflect.KProperty
 

src/main/kotlin/dsl/FileBuilder.kt → src/main/kotlin/me/deotime/kpoetdsl/FileBuilder.kt

@@ -1,11 +1,11 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import com.squareup.kotlinpoet.FileSpec
-import dsl.utils.Assembler
-import dsl.utils.Uses
-import dsl.utils.buildWith
-import dsl.utils.required
-import dsl.utils.withRequired
+import me.deotime.kpoetdsl.utils.Assembler
+import me.deotime.kpoetdsl.utils.Uses
+import me.deotime.kpoetdsl.utils.buildWith
+import me.deotime.kpoetdsl.utils.required
+import me.deotime.kpoetdsl.utils.withRequired
 import kotlin.reflect.KClass
 
 class FileBuilder private constructor(private val cozy: Cozy<FileBuilder>) :

src/main/kotlin/dsl/FunctionBuilder.kt → src/main/kotlin/me/deotime/kpoetdsl/FunctionBuilder.kt

@@ -1,14 +1,14 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.TypeVariableName
 import com.squareup.kotlinpoet.asTypeName
 import com.squareup.kotlinpoet.jvm.jvmStatic
-import dsl.utils.Assembler
-import dsl.utils.buildWith
-import dsl.utils.withRequired
+import me.deotime.kpoetdsl.utils.Assembler
+import me.deotime.kpoetdsl.utils.buildWith
+import me.deotime.kpoetdsl.utils.withRequired
 import java.lang.reflect.Modifier
 import kotlin.reflect.KClass
 
@@ -63,7 +63,7 @@ class FunctionBuilder private constructor(private val cozy: Cozy<FunctionBuilder
 
 
     fun operator(op: Operator.Companion.() -> Operator) {
-        name(op(Operator.Companion).name)
+        name(op(Operator).name)
         modifiers { +KModifier.OPERATOR }
     }
 

src/main/kotlin/dsl/ParameterBuilder.kt → src/main/kotlin/me/deotime/kpoetdsl/ParameterBuilder.kt

@@ -1,9 +1,9 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import com.squareup.kotlinpoet.ParameterSpec
-import dsl.utils.Assembler
-import dsl.utils.buildWith
-import dsl.utils.withRequired
+import me.deotime.kpoetdsl.utils.Assembler
+import me.deotime.kpoetdsl.utils.buildWith
+import me.deotime.kpoetdsl.utils.withRequired
 
 class ParameterBuilder private constructor(private val cozy: Cozy<ParameterBuilder>) :
     Attributes.Sourced<ParameterSpec.Builder>,

src/main/kotlin/dsl/PropertyBuilder.kt → src/main/kotlin/me/deotime/kpoetdsl/PropertyBuilder.kt

@@ -1,11 +1,11 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.jvm.transient
 import com.squareup.kotlinpoet.jvm.volatile
-import dsl.utils.Assembler
-import dsl.utils.buildWith
-import dsl.utils.withRequired
+import me.deotime.kpoetdsl.utils.Assembler
+import me.deotime.kpoetdsl.utils.buildWith
+import me.deotime.kpoetdsl.utils.withRequired
 
 class PropertyBuilder private constructor(private val cozy: Cozy<PropertyBuilder>) :
     Attributes.Sourced<PropertySpec.Builder>,

src/main/kotlin/dsl/TypeBuilder.kt → src/main/kotlin/me/deotime/kpoetdsl/TypeBuilder.kt

@@ -1,10 +1,11 @@
-package dsl
+package me.deotime.kpoetdsl
 
 import com.squareup.kotlinpoet.TypeSpec
-import dsl.utils.Assembler
-import dsl.utils.buildWith
-import dsl.utils.required
-import dsl.utils.withRequired
+import me.deotime.kpoetdsl.utils.Assembler
+import me.deotime.kpoetdsl.utils.buildWith
+import me.deotime.kpoetdsl.utils.required
+import me.deotime.kpoetdsl.utils.withRequired
+import kotlin.contracts.contract
 import kotlin.reflect.KClass
 
 class TypeBuilder private constructor(private val cozy: Cozy<TypeBuilder>) :

src/main/kotlin/me/deotime/kpoetdsl/test/DslTesting.kt

@@ -0,0 +1,42 @@
+package me.deotime.kpoetdsl.test
+
+import me.deotime.kpoetdsl.invoke
+import me.deotime.kpoetdsl.kotlin
+import me.deotime.kpoetdsl.type
+import me.deotime.kpoetdsl.utils.typeParameter
+
+fun main() {
+
+    val dsl = kotlin {
+        name("Calculator") packaged "idk"
+
+        val typeParam = typeParameter<Number>("T")
+        type("Calculator") {
+            kind { Class }
+            property {
+                name("glitch")
+                type<String>()
+                initializer {
+                    +"%T().toString()"(Any::class)
+                }
+            }
+            typeParameters {
+                +typeParam
+            }
+            function {
+                operator { Plus }
+                receiver(typeParam)
+                returns(typeParam)
+                parameter("other") { type(typeParam) }
+                comment("This function will add two numbers")
+                comment("together, and then return that value.")
+                code {
+                    +"return this + other"
+                }
+
+
+            }
+        }
+    }
+    dsl.writeTo(System.out)
+}

src/main/kotlin/dsl/utils/CollectionBuilder.kt → src/main/kotlin/me/deotime/kpoetdsl/utils/CollectionBuilder.kt

@@ -1,4 +1,4 @@
-package dsl.utils
+package me.deotime.kpoetdsl.utils
 
 interface CollectionBuilder<T> {
     operator fun T.unaryPlus()

src/main/kotlin/dsl/utils/Required.kt → src/main/kotlin/me/deotime/kpoetdsl/utils/Required.kt

@@ -1,6 +1,6 @@
-package dsl.utils
+package me.deotime.kpoetdsl.utils
 
-import dsl.Cozy
+import me.deotime.kpoetdsl.Cozy
 import java.util.IdentityHashMap
 import kotlin.properties.Delegates
 import kotlin.reflect.KProperty

src/main/kotlin/dsl/utils/Uses.kt → src/main/kotlin/me/deotime/kpoetdsl/utils/Uses.kt

@@ -1,4 +1,4 @@
-package dsl.utils
+package me.deotime.kpoetdsl.utils
 
 sealed interface Uses {
     object Name : Uses

src/main/kotlin/dsl/utils/typeVariables.kt → src/main/kotlin/me/deotime/kpoetdsl/utils/typeVariables.kt

@@ -1,4 +1,4 @@
-package dsl.utils
+package me.deotime.kpoetdsl.utils
 
 import com.squareup.kotlinpoet.TypeVariableName
 import com.squareup.kotlinpoet.asTypeName

src/main/kotlin/dsl/utils/utils.kt → src/main/kotlin/me/deotime/kpoetdsl/utils/utils.kt

@@ -1,6 +1,6 @@
-package dsl.utils
+package me.deotime.kpoetdsl.utils
 
-import dsl.Attributes
+import me.deotime.kpoetdsl.Attributes
 
 typealias Assembler<T> = T.() -> Unit