Merge pull request #131 from modelix/modelql2

MODELIX-443 ModelQL v2

Author: slisson

.idea/copyright/Modelix.xml

@@ -15,8 +15,13 @@ module.exports = {
         "model-client",
         "model-server",
         "model-sync-lib",
+        "modelql",
+        "mps-model-adapters",
+        "mps-model-server",
+        "mps-model-server-plugin",
         "ts-model-api",
       ],
     ],
+    "subject-case": [0, 'never']
   },
 };

.idea/copyright/profiles_settings.xml

@@ -29,6 +29,7 @@ apacheCxf="3.5.5"
 [libraries]
 
 kotlin-stdlib-common = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-common", version.ref = "kotlin" }
+kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
 kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinSerialization" }
 kotlin-serialization-yaml = { group = "com.charleskorn.kaml", name = "kaml", version = "0.55.0" }
 kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }

commitlint.config.js

@@ -23,10 +23,15 @@ kotlin {
                 implementation(project(":model-api"))
                 implementation(project(":model-api-gen-runtime"))
                 implementation(project(":model-server-api"))
+                implementation(project(":modelql-core"))
+                implementation(project(":modelql-untyped"))
+                implementation(project(":modelql-client"))
+
                 implementation(libs.ktor.client.websockets)
                 implementation(libs.kotlin.stdlib.common)
                 implementation(libs.kotlin.logging)
                 implementation(libs.kotlin.coroutines.core)
+                implementation(libs.kotlin.serialization.json)
 
 //                implementation("io.ktor:ktor-client-core:$ktorVersion")
 //                implementation("io.ktor:ktor-client-cio:$ktorVersion")
@@ -50,10 +55,12 @@ kotlin {
         val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test"))
-                implementation(kotlin("test-junit"))
 
-                implementation(project(":model-server"))
                 implementation(project(":authorization"))
+//                implementation(project(":model-client"))
+                implementation(project(":model-server"))
+                implementation(project(":model-server-lib"))
+
                 implementation(libs.ktor.server.core)
                 implementation(libs.ktor.server.cors)
                 implementation(libs.ktor.server.netty)

gradle/libs.versions.toml

@@ -1,12 +1,52 @@
 package org.modelix.client.light
 
-import io.ktor.client.*
-import io.ktor.client.engine.*
-import io.ktor.client.plugins.websocket.*
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.engine.HttpClientEngineFactory
+import io.ktor.client.plugins.websocket.WebSockets
 import kotlinx.coroutines.delay
-import org.modelix.model.api.*
-import org.modelix.model.area.*
-import org.modelix.model.server.api.*
+import org.modelix.model.api.ConceptReference
+import org.modelix.model.api.IBranch
+import org.modelix.model.api.IConcept
+import org.modelix.model.api.IConceptReference
+import org.modelix.model.api.INode
+import org.modelix.model.api.INodeEx
+import org.modelix.model.api.INodeReference
+import org.modelix.model.api.INodeReferenceSerializer
+import org.modelix.model.api.INodeReferenceSerializerEx
+import org.modelix.model.api.NodeReferenceById
+import org.modelix.model.api.SerializedNodeReference
+import org.modelix.model.api.getAncestors
+import org.modelix.model.api.resolve
+import org.modelix.model.area.IArea
+import org.modelix.model.area.IAreaChangeEvent
+import org.modelix.model.area.IAreaChangeList
+import org.modelix.model.area.IAreaListener
+import org.modelix.model.area.IAreaReference
+import org.modelix.model.server.api.AddNewChildNodeOpData
+import org.modelix.model.server.api.ChangeSetId
+import org.modelix.model.server.api.DeleteNodeOpData
+import org.modelix.model.server.api.ExceptionData
+import org.modelix.model.server.api.MessageFromClient
+import org.modelix.model.server.api.MessageFromServer
+import org.modelix.model.server.api.ModelQuery
+import org.modelix.model.server.api.MoveNodeOpData
+import org.modelix.model.server.api.NodeData
+import org.modelix.model.server.api.NodeId
+import org.modelix.model.server.api.NodeUpdateData
+import org.modelix.model.server.api.OperationData
+import org.modelix.model.server.api.QueryRootNode
+import org.modelix.model.server.api.SetPropertyOpData
+import org.modelix.model.server.api.SetReferenceOpData
+import org.modelix.model.server.api.VersionData
+import org.modelix.model.server.api.merge
+import org.modelix.model.server.api.replaceChildren
+import org.modelix.model.server.api.replaceContainment
+import org.modelix.model.server.api.replaceId
+import org.modelix.model.server.api.replaceReferences
+import org.modelix.modelql.client.ModelQLClient
+import org.modelix.modelql.core.IQueryExecutor
+import org.modelix.modelql.untyped.ISupportsModelQL
 import kotlin.jvm.JvmStatic
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
@@ -18,7 +58,8 @@ class LightModelClient internal constructor(
     val connection: IConnection,
     private val transactionManager: ITransactionManager,
     val autoFilterNonLoadedNodes: Boolean,
-    val debugName: String = ""
+    val debugName: String = "",
+    val modelQLClient: ModelQLClient? = null
 ) {
 
     private val nodes: MutableMap<NodeId, NodeData> = HashMap()
@@ -324,7 +365,7 @@ class LightModelClient internal constructor(
         }
     }
 
-    inner class NodeAdapter(var nodeId: NodeId) : INodeEx {
+    inner class NodeAdapter(var nodeId: NodeId) : INodeEx, ISupportsModelQL {
         fun getData() = requiresRead { getNodeData(nodeId) }
 
         override fun usesRoleIds(): Boolean = usesRoleIds
@@ -562,6 +603,11 @@ class LightModelClient internal constructor(
         override fun toString(): String {
             return nodeId
         }
+
+        override fun createQueryExecutor(): IQueryExecutor<INode> {
+            val client = modelQLClient ?: throw UnsupportedOperationException("Connection doesn't support ModelQL: $connection")
+            return client.getNode(SerializedNodeReference(nodeId))
+        }
     }
 
     inner class Area : IArea {
@@ -732,6 +778,7 @@ abstract class LightModelClientBuilder {
     private var debugName: String = ""
     private var transactionManager: ITransactionManager = ReadWriteLockTransactionManager()
     private var autoFilterNonLoadedNodes: Boolean = false
+    private var modelQLClient: ModelQLClient? = null
 
     protected abstract fun getDefaultEngineFactory(): HttpClientEngineFactory<*>
 
@@ -749,7 +796,8 @@ abstract class LightModelClientBuilder {
             ),
             transactionManager,
             autoFilterNonLoadedNodes = autoFilterNonLoadedNodes,
-            debugName = debugName
+            debugName = debugName,
+            modelQLClient = modelQLClient
         )
     }
     fun autoFilterNonLoadedNodes(value: Boolean = true): LightModelClientBuilder {
@@ -795,6 +843,10 @@ abstract class LightModelClientBuilder {
         this.httpEngineFactory = httpEngineFactory
         return this
     }
+    fun modelQLClient(c: ModelQLClient): LightModelClientBuilder {
+        this.modelQLClient = c
+        return this
+    }
 }
 
 class LightClientNodeReference(val nodeId: NodeId) : INodeReference {

light-model-client/build.gradle.kts

@@ -1,16 +1,3 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /*
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

light-model-client/src/commonMain/kotlin/org/modelix/client/light/LightModelClient.kt

@@ -16,18 +16,22 @@
 
 package org.modelix.client.light
 
-import io.ktor.client.*
-import io.ktor.client.plugins.websocket.*
-import io.ktor.websocket.*
+import io.ktor.client.HttpClient
+import io.ktor.client.plugins.websocket.webSocket
+import io.ktor.websocket.CloseReason
+import io.ktor.websocket.Frame
+import io.ktor.websocket.WebSocketSession
+import io.ktor.websocket.close
+import io.ktor.websocket.readText
+import io.ktor.websocket.send
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import kotlinx.coroutines.launch
 import org.modelix.model.server.api.MessageFromClient
 import org.modelix.model.server.api.MessageFromServer
+import org.modelix.modelql.client.ModelQLClient
 
 class WebsocketConnection(val httpClient: HttpClient, val url: String) : LightModelClient.IConnection {
     val coroutineScope = CoroutineScope(Dispatchers.Default)
@@ -73,5 +77,4 @@ class WebsocketConnection(val httpClient: HttpClient, val url: String) : LightMo
             }
         }
     }
-
 }

light-model-client/src/commonMain/kotlin/org/modelix/client/light/ServerSideException.kt

@@ -38,16 +38,39 @@ val mpsDir = buildDir.resolve("mps")
 
 val modelixCoreVersion: String = projectDir.resolve("../version.txt").readText()
 
+val kotlinGenDir = buildDir.resolve("metamodel/kotlin_gen")
+
 dependencies {
     mps("com.jetbrains:mps:2021.1.4")
     implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
+    implementation("org.modelix:modelql-typed:$modelixCoreVersion")
+    implementation("org.modelix:modelql-untyped:$modelixCoreVersion")
+
+    testImplementation(kotlin("test-common"))
+    testImplementation(kotlin("test-annotations-common"))
     testImplementation(kotlin("test"))
+    testImplementation(kotlin("reflect"))
+
     testImplementation("org.modelix:model-api:$modelixCoreVersion")
     testImplementation("org.modelix:model-client:$modelixCoreVersion")
-    testImplementation(files("$buildDir/metamodel/kotlin_gen") {
+    testImplementation("org.modelix:model-server-lib:$modelixCoreVersion")
+    testImplementation("org.modelix:modelql-client:$modelixCoreVersion")
+
+    testImplementation(libs.ktor.server.core)
+    testImplementation(libs.ktor.server.cors)
+    testImplementation(libs.ktor.server.netty)
+    testImplementation(libs.ktor.server.html.builder)
+    testImplementation(libs.ktor.server.auth)
+    testImplementation(libs.ktor.server.auth.jwt)
+    testImplementation(libs.ktor.server.status.pages)
+    testImplementation(libs.ktor.server.forwarded.header)
+    testImplementation(libs.ktor.server.websockets)
+    testImplementation(libs.ktor.server.test.host)
+    testImplementation(libs.logback.classic)
+
+    testImplementation(files(kotlinGenDir) {
         builtBy("generateMetaModelSources")
     })
-    testImplementation(kotlin("reflect"))
 }
 
 tasks.test {
@@ -59,7 +82,6 @@ val resolveMps by tasks.registering(Sync::class) {
     into(mpsDir)
 }
 
-val kotlinGenDir = buildDir.resolve("metamodel/kotlin_gen")
 sourceSets["main"].kotlin {
     srcDir(kotlinGenDir)
 }
@@ -80,6 +102,7 @@ metamodel {
         typedNode.prefix = ""
         typedNodeImpl.suffix = "Impl"
     }
+    registrationHelperName = "org.modelix.apigen.test.ApigenTestLanguages"
 }
 
 node {