Folder changes only

programadorthi · Nov 13, 2024 · a7d5969 · a7d5969
1 parent 0657ef8
commit a7d5969
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 23 deletions.
diff --git a/ksp-annotations/.gitignore b/ksp-annotations/.gitignore
diff --git a/ksp-processor/.gitignore b/ksp-processor/.gitignore
diff --git a/ksp/core-annotations/.gitignore b/ksp/core-annotations/.gitignore
@@ -0,0 +1 @@
+../../ksp-annotations/build
diff --git a/ksp-annotations/build.gradle.kts → ksp/core-annotations/build.gradle.kts b/ksp-annotations/build.gradle.kts → ksp/core-annotations/build.gradle.kts
diff --git a/...programadorthi/routing/annotation/Body.kt → ...programadorthi/routing/annotation/Body.kt b/...programadorthi/routing/annotation/Body.kt → ...programadorthi/routing/annotation/Body.kt
diff --git a/...programadorthi/routing/annotation/Path.kt → ...programadorthi/routing/annotation/Path.kt b/...programadorthi/routing/annotation/Path.kt → ...programadorthi/routing/annotation/Path.kt
diff --git a/...rogramadorthi/routing/annotation/Route.kt → ...rogramadorthi/routing/annotation/Route.kt b/...rogramadorthi/routing/annotation/Route.kt → ...rogramadorthi/routing/annotation/Route.kt
diff --git a/ksp-annotations/gradle.properties → ksp/core-annotations/gradle.properties b/ksp-annotations/gradle.properties → ksp/core-annotations/gradle.properties
diff --git a/ksp/core-processor/.gitignore b/ksp/core-processor/.gitignore
@@ -0,0 +1 @@
+../../ksp-processor/build
diff --git a/ksp-processor/build.gradle.kts → ksp/core-processor/build.gradle.kts b/ksp-processor/build.gradle.kts → ksp/core-processor/build.gradle.kts
@@ -11,7 +11,7 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation(projects.core)
-                implementation(projects.kspAnnotations)
+                implementation(projects.ksp.coreAnnotations)
                 implementation(libs.kotlin.poet)
                 implementation(libs.kotlin.poet.ksp)
                 implementation(libs.ksp.api)

diff --git a/ksp-processor/gradle.properties → ksp/core-processor/gradle.properties b/ksp-processor/gradle.properties → ksp/core-processor/gradle.properties
diff --git a/...ls.ksp.processing.SymbolProcessorProvider → ...ls.ksp.processing.SymbolProcessorProvider b/...ls.ksp.processing.SymbolProcessorProvider → ...ls.ksp.processing.SymbolProcessorProvider
diff --git a/...amadorthi/routing/ksp/RoutingProcessor.kt → ...amadorthi/routing/ksp/RoutingProcessor.kt b/...amadorthi/routing/ksp/RoutingProcessor.kt → ...amadorthi/routing/ksp/RoutingProcessor.kt
@@ -7,7 +7,6 @@ import com.google.devtools.ksp.getVisibility
 import com.google.devtools.ksp.processing.CodeGenerator
 import com.google.devtools.ksp.processing.Dependencies
 import com.google.devtools.ksp.processing.KSBuiltIns
-import com.google.devtools.ksp.processing.KSPLogger
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
@@ -31,16 +30,12 @@ import dev.programadorthi.routing.annotation.Route
 
 public class RoutingProcessorProvider : SymbolProcessorProvider {
     override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
-        return RoutingProcessor(
-            codeGenerator = environment.codeGenerator,
-            logger = environment.logger
-        )
+        return RoutingProcessor(codeGenerator = environment.codeGenerator)
     }
 }
 
 private class RoutingProcessor(
     private val codeGenerator: CodeGenerator,
-    private val logger: KSPLogger
 ) : SymbolProcessor {
     private var invoked = false
 
@@ -99,11 +94,23 @@ private class RoutingProcessor(
         if (isRegexRoute) {
             if (routeAnnotation.method.isBlank()) {
                 configureSpec
-                    .beginControlFlow("%M(path = %T(%S))", handle, Regex::class, routeAnnotation.regex)
+                    .beginControlFlow(
+                        "%M(path = %T(%S))",
+                        handle,
+                        Regex::class,
+                        routeAnnotation.regex
+                    )
             } else {
-                val template = """%M(path = %T(%S), method = %M(value = "${routeAnnotation.method}"))"""
+                val template =
+                    """%M(path = %T(%S), method = %M(value = "${routeAnnotation.method}"))"""
                 configureSpec
-                    .beginControlFlow(template, handle, Regex::class, routeAnnotation.regex, routeMethod)
+                    .beginControlFlow(
+                        template,
+                        handle,
+                        Regex::class,
+                        routeAnnotation.regex,
+                        routeMethod
+                    )
             }
         } else {
             val named = when {
@@ -114,7 +121,8 @@ private class RoutingProcessor(
                 configureSpec
                     .beginControlFlow("%M(path = %S, $named)", handle, routeAnnotation.path)
             } else {
-                val template = """%M(path = %S, $named, method = %M(value = "${routeAnnotation.method}"))"""
+                val template =
+                    """%M(path = %S, $named, method = %M(value = "${routeAnnotation.method}"))"""
                 configureSpec
                     .beginControlFlow(template, handle, routeAnnotation.path, routeMethod)
             }
@@ -206,7 +214,14 @@ private class RoutingProcessor(
             else -> resolver.builtIns.requiredParse(type.resolve())
         }
         when {
-            hasZeroOrOneParameter -> builder.add(PATH_TEMPLATE, paramName, call, customName, literal)
+            hasZeroOrOneParameter -> builder.add(
+                PATH_TEMPLATE,
+                paramName,
+                call,
+                customName,
+                literal
+            )
+
             else -> builder.addStatement(PATH_TEMPLATE, paramName, call, customName, "$literal,")
         }
     }
@@ -233,9 +248,10 @@ private class RoutingProcessor(
         check(paramType.declaration == listDeclaration) {
             "TailCard parameter must be a List<String>?"
         }
-        val genericArgument = checkNotNull(type.element?.typeArguments?.firstOrNull()?.type?.resolve()) {
-            "No <String> type found at tailcard parameter"
-        }
+        val genericArgument =
+            checkNotNull(type.element?.typeArguments?.firstOrNull()?.type?.resolve()) {
+                "No <String> type found at tailcard parameter"
+            }
         check(genericArgument == resolver.builtIns.stringType) {
             "TailCard list item type must be non nullable String"
         }
@@ -318,7 +334,8 @@ private class RoutingProcessor(
         private val routeMethod = MemberName("dev.programadorthi.routing.core", "RouteMethod")
         private val call = MemberName("dev.programadorthi.routing.core.application", "call")
         private val receive = MemberName("dev.programadorthi.routing.core.application", "receive")
-        private val receiveNullable = MemberName("dev.programadorthi.routing.core.application", "receiveNullable")
+        private val receiveNullable =
+            MemberName("dev.programadorthi.routing.core.application", "receiveNullable")
 
         private const val BODY_TEMPLATE = "%L = %M.%M()%L"
         private const val FUN_INVOKE_END = ")"

diff --git a/samples/ksp-sample/build.gradle.kts b/samples/ksp-sample/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     implementation(projects.core)
-    implementation(projects.kspAnnotations)
-    implementation(projects.kspProcessor)
-    ksp(projects.kspProcessor)
+    implementation(projects.ksp.coreAnnotations)
+    implementation(projects.ksp.coreProcessor)
+    ksp(projects.ksp.coreProcessor)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -25,8 +25,8 @@ include(":call-logging")
 include(":core")
 include(":events")
 include(":events-resources")
-include(":ksp-annotations")
-include(":ksp-processor")
+include(":ksp:core-annotations")
+include(":ksp:core-processor")
 include(":resources")
 include(":sessions")
 include(":status-pages")