FEATURE: API Version support

src/common/common/src/main/kotlin/kiit/common/Source.kt

@@ -1,5 +1,7 @@
 package kiit.common
 
+import java.util.*
+
 /**
  * Used to represent the source / origin of a request/item being processed
  */
@@ -91,9 +93,10 @@ sealed class Source(val id: String) {
     companion object {
 
         fun parse(name:String): Source {
-            return when(name) {
+            return when(name.lowercase(Locale.getDefault())) {
                 Parent.id -> Parent
                 All.id    -> All
+                "all"     -> All
                 API.id    -> API
                 Auto.id   -> Auto
                 Bot.id    -> Bot

src/common/requests/src/main/kotlin/kiit/requests/CommonRequest.kt

@@ -28,7 +28,7 @@ data class CommonRequest(
     override val raw: Any? = null,
     override val output: String? = "",
     override val tag: String = "",
-    override val version: String = "1.0",
+    override val version: String = "0",
     override val timestamp: DateTime = DateTime.now()
 ) : Request {
 
@@ -101,7 +101,8 @@ data class CommonRequest(
             verb: String,
             opts: Map<String, Any>,
             args: Map<String, Any>,
-            raw: Any? = null
+            raw: Any? = null,
+            version: String = "0"
         ): Request {
             val path = if (area.isNullOrEmpty()) "$api.$action" else "$area.$api.$action"
             return CommonRequest(
@@ -111,7 +112,8 @@ data class CommonRequest(
                 verb,
                 InputArgs(args),
                 meta = InputArgs(opts),
-                raw = raw
+                raw = raw,
+                version = version
             )
         }
 
@@ -160,13 +162,14 @@ data class CommonRequest(
             verb: String,
             opts: Map<String, Any>,
             args: Map<String, Any>,
-            raw: Any? = null
+            raw: Any? = null,
+            version: String = "0"
         ): Request {
             val parts = path.split(".")
             val area = parts[0]
             val api = parts[1]
             val action = parts[2]
-            return cli(area, api, action, verb, opts, args, raw)
+            return cli(area, api, action, verb, opts, args, raw, version)
         }
     }
 }

src/connectors/connectors-cli/src/main/kotlin/kiit/connectors/cli/CliApi.kt

@@ -16,6 +16,7 @@ package kiit.connectors.cli
 import kiit.apis.ApiServer
 import kiit.apis.routes.Api
 import kiit.apis.core.Part
+import kiit.apis.routes.VersionAreas
 import kiit.cli.CLI
 import kiit.cli.CliRequest
 import kiit.cli.CliResponse
@@ -54,12 +55,12 @@ open class CliApi(
     val ctx: Context,
     val auth: kiit.apis.core.Auth,
     settings: CliSettings = CliSettings(),
-    apiItems: List<Api> = listOf(),
+    routes: List<VersionAreas> = listOf(),
     serializer: (Any?, ContentType) -> Content,
     val metaTransform: ((Map<String, Any>) -> List<Pair<String, String>>)? = null
 ) : CLI(settings, ctx.info, ctx.dirs, serializer = serializer) {
     // api container holding all the apis.
-    val apis = ApiServer.of(ctx, apiItems, auth, Source.CLI)
+    val apis = ApiServer.of(ctx, routes, auth, Source.CLI)
 
     /**
      * executes a line of text by handing it off to the executor

src/internal/meta/src/main/kotlin/kiit/meta/JSONTransformer.kt

@@ -29,7 +29,6 @@ interface JSONTransformer<S> : Transformer<S, JSONObject, String> {
 }
 
 
-
 interface JSONRestoreWithContext<S> : Transformer<S, JSONObject, String> {
 
     /**

src/lib/kotlin/kiit/src/main/kotlin/kiit/Kiit.kt

@@ -1,5 +1,6 @@
 package kiit
 
+import kiit.apis.setup.routes
 import kiit.apis.support.Authenticator
 import kiit.app.App
 import kiit.app.AppOptions
@@ -170,7 +171,7 @@ class Kiit(ctx: Context) : App<Context>(ctx, AppOptions(showWelcome = false, sho
                 ctx = ctx,
                 auth = auth,
                 settings = CliSettings(enableLogging = true, enableOutput = true),
-                apiItems = apis,
+                routes = routes(apis),
                 metaTransform = {
                     listOf("api-key" to keys.first().key)
                 },

src/lib/kotlin/kiit/src/main/kotlin/kiit/KiitServices.kt

@@ -2,6 +2,8 @@ package kiit
 
 import kiit.apis.SetupType
 import kiit.apis.routes.Api
+import kiit.apis.setup.GlobalVersion
+import kiit.apis.setup.api
 import kiit.apis.tools.code.CodeGenApi
 import kiit.common.conf.Conf
 import kiit.context.Context
@@ -12,15 +14,18 @@ interface KiitServices {
 
     val ctx: Context
 
-    fun apis(settings:Conf): List<Api> {
+    fun apis(settings:Conf): List<GlobalVersion> {
         // APIs
         val toolSettings = ToolSettings(settings.getString("kiit.version"), settings.getString("kiit.version.beta"), "logs/logback.log")
         val buildSettings = BuildSettings(settings.getString("kotlin.version"))
         val logger = ctx.logs.getLogger("gen")
+        val generator = GeneratorApi(ctx, GeneratorService(ctx, settings, Kiit::class.java, GeneratorSettings(toolSettings, buildSettings), logger = logger))
         return listOf(
-                Api(GeneratorApi(ctx, GeneratorService(ctx, settings, Kiit::class.java, GeneratorSettings(toolSettings, buildSettings), logger = logger)), declaredOnly = true, setup = SetupType.Annotated),
-                Api(DocApi(ctx), declaredOnly = true, setup = SetupType.Annotated),
-                Api(CodeGenApi(), declaredOnly = true, setup = SetupType.Annotated)
-        )
+            GlobalVersion("0", listOf(
+                api(GeneratorApi::class, generator),
+                api(DocApi::class, DocApi(ctx)),
+                api(CodeGenApi::class, CodeGenApi())
+            )
+        ))
     }
 }

src/lib/kotlin/kiit/src/main/kotlin/kiit/Server.kt

@@ -9,7 +9,10 @@ import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
 import kiit.apis.*
 import kiit.apis.core.Auth
-import kiit.apis.routes.Api
+import kiit.apis.core.Meta
+import kiit.apis.setup.GlobalVersion
+import kiit.apis.setup.api
+import kiit.apis.setup.routes
 
 // Slate Kit - Common Utilities
 import kiit.common.*
@@ -20,7 +23,7 @@ import kiit.results.*
 // Slate Kit - App ( provides args, help, life-cycle methods, etc )
 import kiit.requests.toResponse
 import kiit.context.Context
-import kiit.core.common.FileUtils
+import kiit.requests.Request
 
 // Slate Kit - Server ( Ktor support )
 import kiit.server.ServerSettings
@@ -39,7 +42,7 @@ class Server(val ctx: Context)  {
     suspend fun execute(): Try<Any> {
 
         // 1. Settings
-        val settings = ServerSettings(port = 5000, prefix = "/api/", docs = true, docKey = "abc123", formatJson = true)
+        val settings = ServerSettings(port = 5200, prefix = "/api/", docs = true, docKey = "abc123", formatJson = true)
 
         // 2. APIs ( these are Slate Kit Universal APIs )
         val apis = apis()
@@ -48,7 +51,8 @@ class Server(val ctx: Context)  {
         val auth: Auth? = null //SampleAuth()
 
         // 4. API host
-        val apiHost = ApiServer.of( ctx, apis, auth = null)
+        val routes = routes(apis)
+        val apiHost = ApiServer.of( ctx, routes, auth = null)
 
         // Ktor response handler
         val responder = KtorResponse(settings)
@@ -89,10 +93,9 @@ class Server(val ctx: Context)  {
     }
 
 
-    fun apis(): List<Api> {
-        return listOf(
-                Api(klass = SampleFiles3Api::class, singleton = SampleFiles3Api(), setup = SetupType.Annotated)
-        )
+    fun apis(): List<GlobalVersion> {
+        val apis = listOf(GlobalVersion("0", listOf(api(SampleFiles3Api::class, SampleFiles3Api()))))
+        return apis
     }
 
 
@@ -114,9 +117,15 @@ class SampleFiles3Api {
     val sampleCSV = "user1,u1@a.com,true,1234\r\nuser2,u2@a.com,true,1234"
     val sampleCSVData = sampleCSV.toByteArray()
 
+    @Action()
+    fun getRequest(request: Request) : String {
+        return "got inputs"
+    }
 
     @Action(desc = "test getting content as xml")
-    fun getData(): String = DateTime.now().toStringMySql()
+    fun getData(request: Request): String {
+        return DateTime.now().toStringMySql()
+    }
 
     @Action(desc = "test getting content as xml")
     fun getContentCsv(): Content = Contents.csv("user1,u1@a.com,true,1234\r\nuser2,u2@a.com,true,1234")

src/lib/kotlin/kiit/src/main/kotlin/kiit/run.kt

@@ -33,13 +33,13 @@ import kiit.results.Success
  * java -jar ${app.name}.jar -env=dev -log.level=info -conf.dir = "file://./conf-sample-shell"
  * java -jar ${app.name}.jar -env=dev -log.level=info -conf.dir = "file://./conf-sample-server"
  *
- * slatekit new app -name="MyApp1" -packageName="company1.apps"
- * slatekit new api -name="MyAPI1" -packageName="company1.apis"
- * slatekit new cli -name="MyCLI1" -packageName="company1.apps"
- * slatekit new env -name="MyApp2" -packageName="company1.apps"
- * slatekit new job -name="MyJob1" -packageName="company1.jobs"
- * slatekit new lib -name="MyLib1" -packageName="company1.libs"
- * slatekit new orm -name="MyApp1" -packageName="company1.apps"
+ * kiit new app -name="MyApp1" -packageName="company1.apps"
+ * kiit new api -name="MyAPI1" -packageName="company1.apis"
+ * kiit new cli -name="MyCLI1" -packageName="company1.apps"
+ * kiit new env -name="MyApp2" -packageName="company1.apps"
+ * kiit new job -name="MyJob1" -packageName="company1.jobs"
+ * kiit new lib -name="MyLib1" -packageName="company1.libs"
+ * kiit new orm -name="MyApp1" -packageName="company1.apps"
  *
  * -job.name=queued
  *
@@ -63,8 +63,8 @@ fun main(args: Array<String>) {
                 help.show()
             }
             else {
-                run(args)
-                //api(args)
+                //run(args)
+                api(args)
             }
         }
         is Failure -> {
@@ -84,7 +84,7 @@ fun api(args: Array<String>) {
 }
 
 
-fun run(args:Array<String>){
+fun run(args:Array<String>) {
     /**
      * DOCS : https://www.kiit.dev/arch/app/
      *

src/lib/kotlin/slatekit-tests/src/test/kotlin/test/apis/ApiTestsBase.kt

@@ -15,13 +15,13 @@ package test.apis
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import kiit.apis.*
-import kiit.apis.routes.Api
 import kiit.apis.core.Auth
-import kiit.apis.SetupType
+import kiit.apis.routes.VersionAreas
 import kiit.requests.CommonRequest
 import kiit.common.Source
 import kiit.common.args.Args
 import kiit.common.conf.Config
+import kiit.common.crypto.Encryptor
 import kiit.common.data.DbConString
 import kiit.common.data.Connections
 import kiit.common.data.Connections.Companion.of
@@ -36,9 +36,9 @@ import kiit.entities.Entities
 import kiit.policy.hooks.Middleware
 import kiit.connectors.entities.AppEntContext
 import kiit.results.Try
+import kiit.serialization.deserializer.Deserializer
 import test.TestApp
 import test.setup.MyAuthProvider
-import test.setup.UserApi
 import test.setup.MyEncryptor
 
 /**
@@ -87,15 +87,15 @@ open class ApiTestsBase {
 
     fun getApis(source: Source,
                 auth: Auth? = null,
-                apis: List<Api> = listOf()): ApiServer {
+                apis: List<VersionAreas> = listOf()): ApiServer {
 
         // 2. apis
         val container = ApiServer.of(ctx, apis, auth, source)
         return container
     }
 
 
-    fun ensureCall(apis: List<Api> = listOf(),
+    fun ensureCall(apis: List<VersionAreas> = listOf(),
                    protocolCt: String,
                    protocol: String,
                    authMode: String,
@@ -124,28 +124,30 @@ open class ApiTestsBase {
     }
 
 
-    fun buildUserApiRegSingleton(ctx: AppEntContext): Api {
-        return Api(UserApi(ctx), setup = SetupType.Annotated)
-    }
+//    fun buildUserApiRegSingleton(ctx: AppEntContext): Api {
+//        return Api(UserApi(ctx), setup = SetupType.Annotated)
+//    }
 
 
-    fun ensure(
-            protocol: Source,
-            middleware: List<Middleware> = listOf(),
-            apis: List<Api>,
-            user: Credentials?,
-            request: Request,
-            response: Response<*>,
-            checkFailMsg:Boolean = false) {
+    fun checkCall(
+        protocol: Source,
+        middleware: List<Middleware> = listOf(),
+        routes: List<VersionAreas>,
+        user: Credentials?,
+        request: Request,
+        response: Response<*>,
+        checkFailMsg:Boolean = false,
+        decoder: ((Request, Encryptor?) -> Deserializer)? = null
+        ) {
 
         // Optional auth
         val auth = user?.let { u -> MyAuthProvider(u.name, u.roles, buildKeys()) }
 
         // Host
         val host = ApiServer(ctx,
-                apis = apis,
+                routes = routes,
                 auth = auth,
-                settings = Settings(protocol))
+                settings = Settings(protocol, decoder = decoder))
 
         // Get result
         val actual = runBlocking {