fix(modelql): renamed mapLocal2 to buildLocalMapping

Author: slisson

docs/global/modules/core/pages/howto/modelql.adoc

@@ -118,7 +118,7 @@ The body of `mapLocal` is executed on the client after receiving the result from
 That's why you only have access to the output of the `zip` operation
 and still have to use `first`, `second` and `third` inside the query.
 
-To make this even more readable there is a `mapLocal2` operation,
+To make this even more readable there is a `buildLocalMapping` operation,
 which provides a different syntax for the `zip`-`mapLocal` chain.
 
 [source,kotlin]
@@ -127,6 +127,7 @@ data class MyProduct(val id: Int, val title: String, val images: List<MyImage>)
 data class MyImage(val url: String)
 
 val result: List<MyProduct> = query { db ->
+    db.products.buildLocalMapping {
         val id = it.id.request()
         val title = it.title.request()
         val images = it.images.mapLocal { MyImage(it) }.toList().request()
@@ -138,7 +139,7 @@ val result: List<MyProduct> = query { db ->
 result.forEach { println("ID: ${it.id}, Title: ${it.title}, Images: ${it.images}") }
 --
 
-At the beginning of the `mapLocal2` body you invoke `request()` on all the values you need to assemble your object.
+At the beginning of the `buildLocalMapping` body you invoke `request()` on all the values you need to assemble your object.
 This basically ads the operand to the internal `zip` operation and returns an object that gives you access to the value
 after receiving it from the server.
 Inside the `onSuccess` block you assemble the local object using the previously requested values.
@@ -185,5 +186,5 @@ val html = query {
 }
 --
 
-`buildHtmlQuery` and the `requestFragment` operation are similar to the `mapLocal2` operation,
+`buildHtmlQuery` and the `requestFragment` operation are similar to the `buildLocalMapping` operation,
 but inside the `onSuccess` block you use the Kotlin HTML DSL.

modelql-core/src/commonMain/kotlin/org/modelix/modelql/core/LocalMappingStep.kt

@@ -107,14 +107,24 @@ class ExecuteLocalStep<In, Out>(transformation: (In) -> Out) : LocalMappingStep<
     }
 }
 
+@Deprecated("renamed to buildLocalMapping", ReplaceWith("buildLocalMapping(body)"))
 fun <In, Out> IFluxStep<In>.mapLocal2(body: ILocalMappingBuilder<In, Out>.(IMonoStep<In>) -> Unit): IFluxStep<Out> {
-    return map { it.mapLocal2(body) }
+    return buildLocalMapping(body)
 }
 
+fun <In, Out> IFluxStep<In>.buildLocalMapping(body: ILocalMappingBuilder<In, Out>.(IMonoStep<In>) -> Unit): IFluxStep<Out> {
+    return map { it.buildLocalMapping(body) }
+}
+
+@Deprecated("renamed to buildLocalMapping", ReplaceWith("buildLocalMapping(body)"))
 fun <In, Out> IMonoStep<In>.mapLocal2(body: ILocalMappingBuilder<In, Out>.(IMonoStep<In>) -> Unit): IMonoStep<Out> {
+    return buildLocalMapping(body)
+}
+
+fun <In, Out> IMonoStep<In>.buildLocalMapping(body: ILocalMappingBuilder<In, Out>.(IMonoStep<In>) -> Unit): IMonoStep<Out> {
     val builder = LocalMappingBuilder<In, Out>()
     builder.apply {
-        body(this@mapLocal2)
+        body(this@buildLocalMapping)
     }
     return builder.compileProcessingOutputStep()
 }

modelql-core/src/commonTest/kotlin/org/modelix/modelql/core/ModelQLTest.kt

@@ -250,7 +250,7 @@ class ModelQLTest {
     @Test
     fun testMapLocal2_unusedInput() = runTestWithTimeout {
         val result = remoteProductDatabaseQuery { db ->
-            db.products.mapLocal2 {
+            db.products.buildLocalMapping {
                 val title = "xxx".asMono().getLater()
                 onSuccess {
                     "Title: " + title.get()
@@ -262,9 +262,9 @@ class ModelQLTest {
     }
 
     @Test
-    fun testMapLocal2() = runTestWithTimeout {
+    fun testLocalMappingBuilder() = runTestWithTimeout {
         val result = remoteProductDatabaseQuery { db ->
-            db.products.mapLocal2 {
+            db.products.buildLocalMapping {
                 val title = it.title.getLater()
                 onSuccess {
                     "Title: " + title.get()
@@ -278,7 +278,7 @@ class ModelQLTest {
     @Test
     fun testZipOrder() = runTestWithTimeout {
         val result = remoteProductDatabaseQuery { db ->
-            db.products.flatMap { it.zip(it.images.assertNotEmpty()) }.mapLocal2 {
+            db.products.flatMap { it.zip(it.images.assertNotEmpty()) }.buildLocalMapping {
                 val product = it.first.getLater()
                 val image = it.second.getLater()
                 onSuccess {