From 1023fe6c1eff6135944c6ac99109a497f06594aa Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 9 Jan 2023 17:14:19 -0800
Subject: [PATCH] TSFileConfig fixes.

---
 org.lflang/src/org/lflang/generator/ts/TSFileConfig.kt | 4 ++--
 org.lflang/src/org/lflang/generator/ts/TSGenerator.kt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/ts/TSFileConfig.kt b/org.lflang/src/org/lflang/generator/ts/TSFileConfig.kt
index 65f8d3f365..42ec2c1348 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSFileConfig.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSFileConfig.kt
@@ -68,12 +68,12 @@ class TSFileConfig(
     }
 
     override fun getExecutable(): Path {
-        return binPath.resolve(name + executableExtension)
+        return srcGenPath.resolve("dist").resolve(name + executableExtension)
     }
 
     /**
      * Path to TypeScript source code.
      */
-    override fun getSrcGenPath(): Path = srcGenPath.resolve("src")
+    override fun getSrcGenPath(): Path = srcGenPath
 
 }
diff --git a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
index b20712a35d..04f3dfea2f 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
@@ -240,7 +240,7 @@ class TSGenerator(
     ) {
         val tsFileName = fileConfig.name
 
-        val tsFilePath = context.fileConfig.srcGenPath.resolve("$tsFileName.ts")
+        val tsFilePath = context.fileConfig.srcGenPath.resolve("src").resolve("$tsFileName.ts")
 
         val tsCode = StringBuilder()