Support for generics in TypeScript target

core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt

@@ -558,7 +558,7 @@ object RustModelBuilder {
                                 childLfName = container.name,
                                 lfName = variable.name,
                                 isInput = variable is Input,
-                                dataType = container.reactor.instantiateType(formalType, it.container.typeArgs),
+                                dataType = container.instantiateType(formalType),
                                 widthSpecMultiport = variable.widthSpec?.toRustExpr(),
                                 widthSpecChild = container.widthSpec?.toRustExpr(),
                             )
@@ -692,8 +692,9 @@ val Reactor.globalId: ReactorId
  * would be `generic.typeOfPort("port", listOf("String"))`.
  *
  */
-fun Reactor.instantiateType(formalType: TargetCode, typeArgs: List<Type>): TargetCode {
-    val typeParams = typeParms
+fun Instantiation.instantiateType(formalType: TargetCode): TargetCode {
+    val typeArgs = this.typeArgs
+    val typeParams = reactor.typeParms
     assert(typeArgs.size == typeParams.size)
 
     return if (typeArgs.isEmpty()) formalType

core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt

@@ -16,13 +16,7 @@ import java.util.*
 class TSInstanceGenerator(
     reactor: Reactor
 ) {
-    private val childReactors: List<Instantiation>
-
-    init {
-        // Next handle child reactors instantiations.
-        // instantiate all the child reactors.
-        childReactors = reactor.instantiations
-    }
+    private val childReactors: List<Instantiation> = reactor.instantiations
 
     private fun getTypeParams(typeParms: List<Type>): String =
         if (typeParms.isEmpty()) ""

core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt

@@ -3,6 +3,7 @@ package org.lflang.generator.ts
 import org.lflang.MessageReporter
 import org.lflang.ast.ASTUtils
 import org.lflang.generator.PrependOperator
+import org.lflang.generator.rust.instantiateType
 import org.lflang.isBank
 import org.lflang.isMultiport
 import org.lflang.joinWithCommas
@@ -143,10 +144,12 @@ class TSReactionGenerator(
             }
         }
 
+        val concreteDt = trigOrSource.container?.instantiateType(reactSignatureElementType) ?: reactSignatureElementType
+
         val portClassType = if (trigOrSource.variable.isMultiport) {
-            "__InMultiPort<$reactSignatureElementType>"
+            "__InMultiPort<$concreteDt>"
         } else {
-            "Read<$reactSignatureElementType>"
+            "Read<$concreteDt>"
         }
         return if (trigOrSource.container != null && trigOrSource.container.isBank) {
             "${generateArg(trigOrSource)}: Array<$portClassType>"
@@ -157,10 +160,13 @@ class TSReactionGenerator(
 
     private fun generateReactionSignatureElementForPortEffect(effect: VarRef, isMutation: Boolean): String {
         val outputPort = effect.variable as Port
+        val portDty = (effect.variable as Port).tsPortType.let {
+            effect.container?.instantiateType(it) ?: it
+        }
         val portClassType = if (outputPort.isMultiport) {
-            (if (isMutation) "__WritableMultiPort" else "MultiReadWrite") + "<${(effect.variable as Port).tsPortType}>"
+            (if (isMutation) "__WritableMultiPort" else "MultiReadWrite") + "<$portDty>"
         } else {
-            (if (isMutation) "__WritablePort" else "ReadWrite") + "<${(effect.variable as Port).tsPortType}>"
+            (if (isMutation) "__WritablePort" else "ReadWrite") + "<$portDty>"
         }
 
         return if (effect.container != null && effect.container.isBank) {

test/TypeScript/src/target/GenericDelay.lf

@@ -0,0 +1,24 @@
+target TypeScript {
+  fast: false,
+  timeout: 3 sec
+}
+
+import Test from "../DelayInt.lf"
+
+reactor Delay<T>(delay: time = 0) {
+  output out: T
+  input inp: T
+  logical action a(delay): T
+
+  reaction(a) -> out {= out = a; =}
+
+  reaction(inp) -> a {= if (inp != undefined) actions.a.schedule(delay, inp); =}
+}
+
+main reactor {
+  d = new Delay<number>(delay = 100 msec)
+  test = new Test()
+  d.out -> test.x
+
+  reaction(startup) -> d.inp {= d.inp = 42; =}
+}