Merge pull request #293 from NASA-AMMOS/deps/AERIE-1988--update-user-…

…code-runner-version [AERIE-1988] Update user code runner to 0.3.1
NASA-AMMOS · Aug 18, 2022 · f767471 · f767471
2 parents e700cea + 7a65c6c
commit f767471
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/command-expansion-server/package-lock.json b/command-expansion-server/package-lock.json
diff --git a/command-expansion-server/package.json b/command-expansion-server/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@js-temporal/polyfill": "^0.4.0",
     "@nasa-jpl/aerie-ampcs": "^1.0.0",
-    "@nasa-jpl/aerie-ts-user-code-runner": "^0.3.0",
+    "@nasa-jpl/aerie-ts-user-code-runner": "^0.3.1",
     "body-parser": "^1.19.2",
     "dataloader": "^2.0.0",
     "express": "^5.0.0-beta.1",

diff --git a/merlin-server/constraints-dsl-compiler/package-lock.json b/merlin-server/constraints-dsl-compiler/package-lock.json
diff --git a/merlin-server/constraints-dsl-compiler/package.json b/merlin-server/constraints-dsl-compiler/package.json
@@ -11,7 +11,7 @@
   },
   "author": "",
   "dependencies": {
-    "@nasa-jpl/aerie-ts-user-code-runner": "^0.2.6",
+    "@nasa-jpl/aerie-ts-user-code-runner": "^0.3.1",
     "prettier": "^2.6.2",
     "source-map": "^0.7.3",
     "typescript": "^4.5.5",

diff --git a/...er/src/main/java/gov/nasa/jpl/aerie/merlin/server/models/ConstraintsCompilationError.java b/...er/src/main/java/gov/nasa/jpl/aerie/merlin/server/models/ConstraintsCompilationError.java
@@ -22,15 +22,14 @@ public class ConstraintsCompilationError {
       productP
           .field("message", stringP)
           .field("stack", stringP)
-          .field("sourceContext", stringP)
           .field("location", codeLocationP)
           .map(Iso.of(
               untuple(UserCodeError::new),
-              $ -> tuple($.message, $.stack, $.sourceContext, $.location)));
+              $ -> tuple($.message, $.stack, $.location)));
 
   public static final JsonParser<List<UserCodeError>> constraintsErrorJsonP = listP(userCodeErrorP);
 
   public record CodeLocation(Integer line, Integer column) {}
 
-  public record UserCodeError(String message, String stack, String sourceContext, CodeLocation location) {}
+  public record UserCodeError(String message, String stack, CodeLocation location) {}
 }
diff --git a/scheduler-server/scheduling-dsl-compiler/package-lock.json b/scheduler-server/scheduling-dsl-compiler/package-lock.json
diff --git a/scheduler-server/scheduling-dsl-compiler/package.json b/scheduler-server/scheduling-dsl-compiler/package.json
@@ -10,7 +10,7 @@
   },
   "author": "",
   "dependencies": {
-    "@nasa-jpl/aerie-ts-user-code-runner": "^0.2.7",
+    "@nasa-jpl/aerie-ts-user-code-runner": "^0.3.1",
     "source-map": "^0.7.3",
     "typescript": "^4.5.5",
     "typescript-json-schema": "^0.53.0"

diff --git a/.../src/main/java/gov/nasa/jpl/aerie/scheduler/server/models/SchedulingCompilationError.java b/.../src/main/java/gov/nasa/jpl/aerie/scheduler/server/models/SchedulingCompilationError.java
@@ -25,15 +25,14 @@ public class SchedulingCompilationError {
       productP
           .field("message", stringP)
           .field("stack", stringP)
-          .field("sourceContext", stringP)
           .field("location", codeLocationP)
           .map(Iso.of(
               untuple(UserCodeError::new),
-              $ -> tuple($.message, $.stack, $.sourceContext, $.location)));
+              $ -> tuple($.message, $.stack, $.location)));
 
   public static final JsonParser<List<UserCodeError>> schedulingErrorJsonP = listP(userCodeErrorP);
 
   public record CodeLocation(Integer line, Integer column) {}
 
-  public record UserCodeError(String message, String stack, String sourceContext, CodeLocation location) {}
+  public record UserCodeError(String message, String stack, CodeLocation location) {}
 }
diff --git a/...va/gov/nasa/jpl/aerie/scheduler/server/services/SchedulingDSLCompilationServiceTests.java b/...va/gov/nasa/jpl/aerie/scheduler/server/services/SchedulingDSLCompilationServiceTests.java
@@ -335,7 +335,7 @@ export default function() {
     if (result instanceof SchedulingDSLCompilationService.SchedulingDSLCompilationResult.Error r) {
       assertEquals(r.errors().size(), 1);
       assertEquals(
-          "TypeError: TS2741 Incorrect return type. Property '__astNode' is missing in type 'FakeGoal' but required in type 'Goal'.",
+          "TypeError: TS2741 Incorrect return type. Expected: 'Goal', Actual: 'FakeGoal'.",
           r.errors().get(0).message()
       );
     }