Perf: use JsArray for combinators; eliminate individual{1..N} combina…

…tor classes
raquo · Jan 4, 2023 · f775175 · f775175
1 parent 9890f7c
commit f775175
Show file tree

Hide file tree

Showing 32 changed files with 578 additions and 1,076 deletions.
diff --git a/build.sbt b/build.sbt
@@ -80,26 +80,6 @@ val generateTupleCombinatorsTo = 9
 
 Compile / sourceGenerators += Def.task {
   Seq.concat(
-    GenerateCombineStreams(
-      (Compile / sourceDirectory).value,
-      from = generateTupleCombinatorsFrom,
-      to = generateTupleCombinatorsTo
-    ).run,
-    GenerateCombineSignals(
-      (Compile / sourceDirectory).value,
-      from = generateTupleCombinatorsFrom,
-      to = generateTupleCombinatorsTo
-    ).run,
-    GenerateSampleCombineStreams(
-      (Compile / sourceDirectory).value,
-      from = generateTupleCombinatorsFrom,
-      to = generateTupleCombinatorsTo
-    ).run,
-    GenerateSampleCombineSignals(
-      (Compile / sourceDirectory).value,
-      from = generateTupleCombinatorsFrom,
-      to = generateTupleCombinatorsTo
-    ).run,
     GenerateTupleStreams(
       (Compile / sourceDirectory).value,
       from = generateTupleCombinatorsFrom,

diff --git a/project/GenerateCombinableSignal.scala b/project/GenerateCombinableSignal.scala
@@ -14,8 +14,10 @@ case class GenerateCombinableSignal(
     line("package com.raquo.airstream.combine.generated")
     line()
     line("import app.tulz.tuplez.Composition")
+    line("import com.raquo.airstream.combine.SampleCombineSignalN")
     line("import com.raquo.airstream.core.Signal")
     line("import com.raquo.airstream.core.Source.SignalSource")
+    line("import com.raquo.ew.JsArray")
     line()
     line("// #Warning do not edit this file directly, it is generated by GenerateCombinableSignal.scala")
     line()
@@ -40,22 +42,29 @@ case class GenerateCombinableSignal(
           line(s"combinator: (A, ${tupleType(n)}) => Out")
         }
         enter(s"): Signal[Out] = {", "}") {
-          line(s"new CombineSignal${n + 1}(signal, ${tupleType(n, "s")}, combinator)")
+          line(s"StaticSignalCombineOps.combineWithFn(signal, ${tupleType(n, "s")})(combinator)")
         }
         line()
         enter(s"def withCurrentValueOf[${tupleType(n)}](") {
           line((1 to n).map(i => s"s${i}: SignalSource[T${i}]").mkString(", "))
         }
         enter(s")(implicit c: Composition[A, (${tupleType(n)})]): Signal[c.Composed] = {", "}") {
-          line(s"val combinator = (a: A, ${(1 to n).map(i => s"v${i}: T${i}").mkString(", ")}) => c.compose(a, (${tupleType(n, "v")}))")
-          line(s"new SampleCombineSignal${n + 1}(signal, ${tupleType(n, "s")}, combinator)")
+          line(s"val combinator = (arr: JsArray[Any]) => c.compose(arr(0).asInstanceOf[A], (${(1 to n).map(i => s"arr(${i}).asInstanceOf[T${i}]").mkString(", ")}))")
+          line(s"val sampledSignals = JsArray[Signal[Any]](${tupleType(n, "s", ".toObservable")})")
+          enter(s"new SampleCombineSignalN(", ")") {
+            line("signal, sampledSignals, combinator")
+          }
         }
         line()
         enter(s"def sample[${tupleType(n)}](") {
           line((1 to n).map(i => s"s${i}: SignalSource[T${i}]").mkString(", "))
         }
         enter(s"): Signal[(${tupleType(n)})] = {", "}") {
-          line(s"new SampleCombineSignal${n + 1}[A, ${tupleType(n)}, (${tupleType(n)})](signal, ${tupleType(n, "s")}, (_, ${tupleType(n, "v")}) => (${tupleType(n, "v")}))")
+          line(s"val combinator = (arr: JsArray[Any]) => (${(1 to n).map(i => s"arr(${i}).asInstanceOf[T${i}]").mkString(", ")})")
+          line(s"val sampledSignals = JsArray[Signal[Any]](${tupleType(n, "s", ".toObservable")})")
+          enter(s"new SampleCombineSignalN[Any, (${tupleType(n)})](", ")") {
+            line("signal, sampledSignals, combinator")
+          }
         }
         line()
         line("// --")

diff --git a/project/GenerateCombinableStream.scala b/project/GenerateCombinableStream.scala
@@ -14,8 +14,10 @@ case class GenerateCombinableStream(
     line("package com.raquo.airstream.combine.generated")
     line()
     line("import app.tulz.tuplez.Composition")
-    line("import com.raquo.airstream.core.EventStream")
+    line("import com.raquo.airstream.combine.SampleCombineStreamN")
+    line("import com.raquo.airstream.core.{EventStream, Signal}")
     line("import com.raquo.airstream.core.Source.{EventSource, SignalSource}")
+    line("import com.raquo.ew.JsArray")
     line()
     line("// #Warning do not edit this file directly, it is generated by GenerateCombinableStream.scala")
     line()
@@ -40,22 +42,29 @@ case class GenerateCombinableStream(
           line(s"combinator: (A, ${tupleType(n)}) => Out")
         }
         enter(s"): EventStream[Out] = {", "}") {
-          line(s"new CombineStream${n + 1}(stream, ${tupleType(n, "s")}, combinator)")
+          line(s"StaticStreamCombineOps.combineWithFn(stream, ${tupleType(n, "s")})(combinator)")
         }
         line()
         enter(s"def withCurrentValueOf[${tupleType(n)}](") {
           line((1 to n).map(i => s"s${i}: SignalSource[T${i}]").mkString(", "))
         }
         enter(s")(implicit c: Composition[A, (${tupleType(n)})]): EventStream[c.Composed] = {", "}") {
-          line(s"val combinator = (a: A, ${(1 to n).map(i => s"v${i}: T${i}").mkString(", ")}) => c.compose(a, (${tupleType(n, "v")}))")
-          line(s"new SampleCombineStream${n + 1}(stream, ${tupleType(n, "s")}, combinator)")
+          line(s"val combinator = (arr: JsArray[Any]) => c.compose(arr(0).asInstanceOf[A], (${(1 to n).map(i => s"arr(${i}).asInstanceOf[T${i}]").mkString(", ")}))")
+          line(s"val sampledSignals = JsArray[Signal[Any]](${tupleType(n, "s", ".toObservable")})")
+          enter(s"new SampleCombineStreamN(", ")") {
+            line("stream, sampledSignals, combinator")
+          }
         }
         line()
         enter(s"def sample[${tupleType(n)}](") {
           line((1 to n).map(i => s"s${i}: SignalSource[T${i}]").mkString(", "))
         }
         enter(s"): EventStream[(${tupleType(n)})] = {", "}") {
-          line(s"new SampleCombineStream${n + 1}[A, ${tupleType(n)}, (${tupleType(n)})](stream, ${tupleType(n, "s")}, (_, ${tupleType(n, "v")}) => (${tupleType(n, "v")}))")
+          line(s"val combinator = (arr: JsArray[Any]) => (${(1 to n).map(i => s"arr(${i}).asInstanceOf[T${i}]").mkString(", ")})")
+          line(s"val sampledSignals = JsArray[Signal[Any]](${tupleType(n, "s", ".toObservable")})")
+          enter(s"new SampleCombineStreamN[Any, (${tupleType(n)})](", ")") {
+            line("stream, sampledSignals, combinator")
+          }
         }
         line()
         line("// --")

diff --git a/project/GenerateCombineSignals.scala b/project/GenerateCombineSignals.scala
diff --git a/project/GenerateCombineStreams.scala b/project/GenerateCombineStreams.scala
diff --git a/project/GenerateSampleCombineSignals.scala b/project/GenerateSampleCombineSignals.scala
diff --git a/project/GenerateSampleCombineStreams.scala b/project/GenerateSampleCombineStreams.scala
diff --git a/project/GenerateStaticSignalCombineOps.scala b/project/GenerateStaticSignalCombineOps.scala
@@ -13,8 +13,10 @@ case class GenerateStaticSignalCombineOps(
   override def apply(): Unit = {
     line("package com.raquo.airstream.combine.generated")
     line()
+    line("import com.raquo.airstream.combine.CombineSignalN")
     line("import com.raquo.airstream.core.Signal")
     line("import com.raquo.airstream.core.Source.SignalSource")
+    line("import com.raquo.ew.JsArray")
     line()
     line("// #Warning do not edit this file directly, it is generated by GenerateStaticSignalCombineOps.scala")
     line()
@@ -39,7 +41,19 @@ case class GenerateStaticSignalCombineOps(
           line(s"combinator: (${tupleType(n)}) => Out")
         }
         enter(s"): Signal[Out] = {", "}") {
-          line(s"new CombineSignal${n}(${tupleType(n, "s")}, combinator)")
+          // line(s"val parents = JsArray(${tupleType(n, "s", ".toObservable")})")
+          // line(s"val arrCombinator = (arr: JsArray[Any]) => combinator(${(0 until n).map(i => s"arr(${i}).asInstanceOf[T${i + 1}]").mkString(", ")})")
+          // enter("new CombineSignalN(", ")") {
+          //   line("parents, arrCombinator")
+          // }
+          enter("new CombineSignalN[Any, Out](", ")") {
+            line(s"parents = JsArray(${tupleType(n, "s", ".toObservable")}),")
+            enter(s"combinator = arr => combinator(", ")") {
+              for (i <- 0 until n) {
+                line(s"arr(${i}).asInstanceOf[T${i+1}],")
+              }
+            }
+          }
         }
         line()
         line("// --")

diff --git a/project/GenerateStaticStreamCombineOps.scala b/project/GenerateStaticStreamCombineOps.scala
@@ -13,8 +13,10 @@ case class GenerateStaticStreamCombineOps(
   override def apply(): Unit = {
     line("package com.raquo.airstream.combine.generated")
     line()
+    line("import com.raquo.airstream.combine.CombineStreamN")
     line("import com.raquo.airstream.core.EventStream")
     line("import com.raquo.airstream.core.Source.EventSource")
+    line("import com.raquo.ew.JsArray")
     line()
     line("// #Warning do not edit this file directly, it is generated by GenerateStaticStreamCombineOps.scala")
     line()
@@ -39,7 +41,19 @@ case class GenerateStaticStreamCombineOps(
           line(s"combinator: (${tupleType(n)}) => Out")
         }
         enter(s"): EventStream[Out] = {", "}") {
-          line(s"new CombineStream${n}(${tupleType(n, "s")}, combinator)")
+          // line(s"val arrCombinator = (arr: JsArray[Any]) => combinator(${(0 until n).map(i => s"arr(${i}).asInstanceOf[T${i + 1}]").mkString(", ")})")
+          // line(s"val streams = JsArray[EventStream[Any]](${tupleType(n, "s", ".toObservable")})")
+          // enter("new CombineStreamN(", ")") {
+          //   line("streams, arrCombinator")
+          // }
+          enter("new CombineStreamN[Any, Out](", ")") {
+            line(s"parentStreams = JsArray(${tupleType(n, "s", ".toObservable")}),")
+            enter(s"combinator = arr => combinator(", ")") {
+              for (i <- 0 until n) {
+                line(s"arr(${i}).asInstanceOf[T${i + 1}],")
+              }
+            }
+          }
         }
         line()
         line("// --")

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -10,7 +10,7 @@ object Versions {
 
   val Tuplez = "0.3.7"
 
-  val Ew = "0.1.1"
+  val Ew = "0.1.2-SNAPSHOT"
 
   // Used in test only: