Skip to content

Commit

Permalink
Merge pull request #800 from lf-lang/ts-docker
Browse files Browse the repository at this point in the history
add docker file generation for TS
  • Loading branch information
housengw authored Dec 15, 2021
2 parents bc63e22 + 51b13c2 commit d386a4d
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 1 deletion.
10 changes: 10 additions & 0 deletions org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ public TypeScriptTest() {
super(Target.TS);
}

@Override
protected boolean supportsDockerOption() {
return true;
}

@Test
@Override
public void runGenericTests() {
Expand Down Expand Up @@ -56,4 +61,9 @@ public void runFederatedTests() {
super.runFederatedTests();
}

@Test
@Override
public void runDockerTests() {
super.runDockerTests();
}
}
2 changes: 1 addition & 1 deletion org.lflang/src/org/lflang/TargetProperty.java
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public enum TargetProperty {
* true or false, or a dictionary of options.
*/
DOCKER("docker", UnionType.DOCKER_UNION,
Arrays.asList(Target.C, Target.CCPP, Target.Python), (config, value, err) -> {
Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS), (config, value, err) -> {
if (value.getLiteral() != null) {
if (ASTUtils.toBoolean(value)) {
config.dockerOptions = new DockerOptions();
Expand Down
20 changes: 20 additions & 0 deletions org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.lflang.generator.ts

import java.util.StringJoiner

/**
* Generate parameters for TypeScript target.
*/
class TSDockerGenerator (
private val tsFileName: String
) {
fun generateDockerFileContent(): String {
val dockerFileContent = """
|FROM node:alpine
|WORKDIR /linguafranca/$tsFileName
|COPY . .
|ENTRYPOINT ["node", "dist/$tsFileName.js"]
"""
return dockerFileContent.trimMargin()
}
}
7 changes: 7 additions & 0 deletions org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,13 @@ class TSGenerator(
tsCode.append(reactorGenerator.generateReactorInstanceAndStart(this.mainDef, mainParameters))
fsa.generateFile(fileConfig.srcGenBasePath.relativize(tsFilePath).toString(),
tsCode.toString())

if (targetConfig.dockerOptions != null) {
val dockerFilePath = fileConfig.srcGenPath.resolve("$tsFileName.Dockerfile");
val dockerGenerator = TSDockerGenerator(tsFileName)
println("docker file written to $dockerFilePath")
fsa.generateFile(fileConfig.srcGenBasePath.relativize(dockerFilePath).toString(), dockerGenerator.generateDockerFileContent())
}
}
// The following check is omitted for Mode.LSP_FAST because this code is unreachable in LSP_FAST mode.
if (!targetConfig.noCompile && fileConfig.compilerMode != Mode.LSP_MEDIUM) compile(resource, context)
Expand Down
9 changes: 9 additions & 0 deletions test/TypeScript/src/docker/HelloWorldContainerized.lf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
target TypeScript {
docker: true
};

import HelloWorldInside from "../HelloWorld.lf"

main reactor HelloWorldContainerized {
a = new HelloWorldInside();
}

0 comments on commit d386a4d

Please sign in to comment.