Update examples, fix routes generation in Ktor DSL parser

JetBrains · Feb 8, 2020 · 609587c · 609587c
1 parent 360623e
commit 609587c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 33 deletions.
diff --git a/dsl/common/lang-parser-common/src/main/kotlin/io/kotless/parser/utils/psi/Expression.kt b/dsl/common/lang-parser-common/src/main/kotlin/io/kotless/parser/utils/psi/Expression.kt
@@ -34,7 +34,11 @@ inline fun <reified Desc : DeclarationDescriptorWithSource, reified Elem : PsiEl
     }
 }
 
-/** Gather all expressions inside current — recursively */
+/**
+ * Gather all expressions inside current — recursively
+ *
+ * Previous is sorted from the nearest element (at the start) to the most distant
+ */
 fun KtElement.visit(context: BindingContext, body: (element: KtElement, previous: List<KtElement>) -> Boolean) {
     val stack = Stack<KtElement>()
     val previous = Stack<KtElement>()

diff --git a/...g-parser/src/main/kotlin/io/kotless/parser/ktor/processor/route/DynamicRoutesProcessor.kt b/...g-parser/src/main/kotlin/io/kotless/parser/ktor/processor/route/DynamicRoutesProcessor.kt
@@ -65,7 +65,7 @@ internal object DynamicRoutesProcessor : SubTypesProcessor<Unit>() {
         val routeCalls = previous.filter { it is KtCallExpression && it.getFqName(binding) == "io.ktor.routing.route" }
         val path = routeCalls.map {
             (it as KtCallExpression).getArgumentOrNull("path", binding)?.asString(binding) ?: ""
-        }
+        }.filter { it.isNotBlank() }.reversed()
         return URIPath(path.joinToString(separator = "/"))
     }
 }
diff --git a/...ng-parser/src/main/kotlin/io/kotless/parser/ktor/processor/route/StaticRoutesProcessor.kt b/...ng-parser/src/main/kotlin/io/kotless/parser/ktor/processor/route/StaticRoutesProcessor.kt
@@ -63,7 +63,7 @@ internal object StaticRoutesProcessor : SubTypesProcessor<Unit>() {
         val staticCalls = previous.filter { it is KtCallExpression && it.getFqName(binding) == "io.ktor.http.content.static" }
         val path = staticCalls.map {
             (it as KtCallExpression).getArgumentOrNull("remotePath", binding)?.asString(binding) ?: ""
-        }
+        }.filter { it.isNotBlank() }.reversed()
         return URIPath(path.joinToString(separator = "/"))
     }
 

diff --git a/examples/kotless-shortener/build.gradle.kts b/examples/kotless-shortener/build.gradle.kts
@@ -1,9 +1,7 @@
-import io.kotless.DSLType
-import io.kotless.plugin.gradle.dsl.KotlessConfig
 import io.kotless.plugin.gradle.dsl.Webapp.Route53
 import io.kotless.plugin.gradle.dsl.kotless
 
-group = "io.kotless"
+group = "io.kotless.examples"
 version = "0.1.0"
 
 plugins {
@@ -45,16 +43,14 @@ kotless {
     }
 
     webapp {
-        lambda {
-            kotless {
-                packages = setOf("io.kotless.examples")
-            }
-        }
-
         route53 = Route53("short", "kotless.io")
     }
 
     extensions {
+        local {
+            useAWSEmulation = true
+        }
+
         terraform {
             files {
                 add(file("src/main/tf/extensions.tf"))

diff --git a/examples/kotless-site/build.gradle.kts b/examples/kotless-site/build.gradle.kts
@@ -1,8 +1,7 @@
-import io.kotless.DSLType
 import io.kotless.plugin.gradle.dsl.Webapp.Route53
 import io.kotless.plugin.gradle.dsl.kotless
 
-group = "io.kotless"
+group = "io.kotless.examples"
 version = "0.1.3"
 
 plugins {
@@ -40,19 +39,7 @@ kotless {
     }
 
     webapp {
-        lambda {
-            kotless {
-                packages = setOf("io.kotless.examples")
-            }
-        }
-
         route53 = Route53("site", "kotless.io")
     }
-
-    extensions {
-        local {
-            useAWSEmulation = false
-        }
-    }
 }
 
diff --git a/examples/ktor-shortener/build.gradle.kts b/examples/ktor-shortener/build.gradle.kts
@@ -51,6 +51,10 @@ kotless {
     }
 
     extensions {
+        local {
+            useAWSEmulation = true
+        }
+
         terraform {
             files {
                 add(file("src/main/tf/extensions.tf"))

diff --git a/examples/ktor-site/build.gradle.kts b/examples/ktor-site/build.gradle.kts
@@ -1,4 +1,3 @@
-import io.kotless.DSLType
 import io.kotless.plugin.gradle.dsl.Webapp.Route53
 import io.kotless.plugin.gradle.dsl.kotless
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
@@ -47,11 +46,5 @@ kotless {
     webapp {
         route53 = Route53("ktor.site", "kotless.io")
     }
-
-    extensions {
-        local {
-            useAWSEmulation = false
-        }
-    }
 }