Merge pull request #89 from player-ui/feat/better-dsl-expressions

Better DSL Expression Compilation

cli/src/commands/dsl/compile.ts

@@ -181,9 +181,8 @@ export default class DSLCompile extends BaseCommand {
         results.exitCode = 100;
         this.log("");
         this.log(
-          chalk.red(`${logSymbols.error} Error compiling ${file}: ${e.message}`)
+          chalk.red(`${logSymbols.error} Error compiling ${file}: ${e.stack}`)
         );
-        this.debug(e);
         compilerResults.push({
           state: "completed",
           error: e,

language/dsl/src/string-templates/__tests__/expression.test.ts

@@ -7,3 +7,12 @@ test("works with nested expressions", () => {
 
   expect(exp2.toString()).toBe(`@[conditional(foo() == bar())]@`);
 });
+
+test("throws errors for syntactically wrong expressions", () => {
+  expect(() => {
+    const exp = e`something(1,2`;
+  }).toThrowErrorMatchingInlineSnapshot(`
+    [Error: Error: Expected ) at character 13 in expression: 
+     something(1,2█]
+  `);
+});

language/dsl/src/string-templates/index.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { parseExpression } from "@player-ui/player";
+import { parseExpression, isErrorWithLocation } from "@player-ui/player";
 
 export type TemplateInstanceRefStringContext = "binding" | "expression";
 export interface TemplateRefStringOptions {
@@ -74,9 +74,22 @@ const createTemplateInstance = (
 
   /** Try to parse the expression as valid */
   if (options.nestedContext === "expression") {
-    const parsedExpression = parseExpression(value, { strict: false });
-    if (parsedExpression.error) {
-      throw parsedExpression.error;
+    try {
+      parseExpression(value);
+    } catch (e) {
+      if (e instanceof Error) {
+        let message: string;
+        if (isErrorWithLocation(e)) {
+          message = `${e} in expression: \r\n ${
+            value.slice(0, e.index + 1) + "\u2588" + value.slice(e.index + 1)
+          }`;
+        } else {
+          message = `${e} in expression ${value}`;
+        }
+        throw new Error(message);
+      }
+
+      throw new Error(`Unknown problem parsing expression ${e}`);
     }
   }
 

package.json

@@ -39,8 +39,8 @@
     "@oclif/core": "1.9.0",
     "@oclif/plugin-legacy": "^1.2.7",
     "@oclif/plugin-plugins": "^1.9.0",
-    "@player-ui/player": "0.7.1-next.0",
-    "@player-ui/types": "0.7.1-next.0",
+    "@player-ui/player": "0.7.2-next.4",
+    "@player-ui/types": "0.7.2-next.4",
     "@reduxjs/toolkit": "^1.6.1",
     "@rollup/plugin-image": "^2.1.1",
     "@rollup/plugin-json": "^4.1.0",