Shorter way to do blocks and JavaScript plus tests. All tests pass

Author: egonSchiele

app/Main.hs

@@ -33,7 +33,7 @@ convertToJsFile infile outfile = do
 printHelp = do
     putStrLn "Usage: `salty test.salt` prints to stdout"
     putStrLn "Usage: `salty` reads from stdin and prints to stdout"
-    putStrLn "Usage: `salty debug <filename>` reads file and prints tree to stdout"
+    putStrLn "Usage: `salty -d <filename>` reads file and prints tree to stdout"
 
 debugFile :: String -> IO ()
 debugFile infile = do

src/ToJs.hs

@@ -184,8 +184,6 @@ instance ConvertToJs Salty where
 
   -- functions called without an object (bare)
   toJs (FunctionCall Nothing (Right var) args Nothing) = print2 "%(%)" (varNameToFunc var) (intercalate ", " . map toJs $ args)
-  toJs (FunctionCall Nothing (Right var) args (Just block@(Braces arr))) = print2 "%(%)" (varNameToFunc var) args_
-    where args_ = join ", " $ (map toJs (args ++ (map stripNewline arr)))
 
   toJs (FunctionCall Nothing (Right var) args (Just block@(LambdaFunction _ _))) = print2 "%(%)" (varNameToFunc var) args_
     where args_ = join ", " $ (map toJs args) ++ [(addReturn block)]
@@ -212,8 +210,7 @@ instance ConvertToJs Salty where
   -- functions called on an obj
   -- toJs (FunctionCall (Just (Variable (ClassVar obj) _)) (Right funcName) args Nothing) = print3 "%.%(%)" obj (simpleVarName funcName) (intercalate ", " . map toJs $ args)
   toJs (FunctionCall (Just var@(Variable _ _)) (Right funcName) args Nothing) = print3 "%.%(%)" (toJs var) (simpleVarName funcName) (intercalate ", " . map toJs $ args)
-  toJs (FunctionCall (Just var@(Variable _ _)) (Right funcName) args (Just block@(Braces arr))) = print3 "%.%(%)" (toJs var) (simpleVarName funcName) args_
-    where args_ = join ", " $ (map toJs $ args ++ (map stripNewline arr))
+  toJs (FunctionCall varOrNothing (Right funcName) args (Just braces@(Braces arr))) = toJs (FunctionCall varOrNothing (Right funcName) args (Just (LambdaFunction [] braces)))
 
   toJs (FunctionCall (Just var@(Variable _ _)) (Right funcName) args (Just block@(LambdaFunction _ _))) = print3 "%.%(%)" (toJs var) (simpleVarName funcName) args_
     where args_ = join ", " $ (map toJs args) ++ [(addReturn block)]

test/JsSpec.hs

@@ -274,6 +274,13 @@ doFuncResult = [r|const constructor = (props) => {
   });
 }|]
 
+doFuncImplicit = [r|constructor props := {
+  React.useEffect() do
+    window.localStorage.setItem('step', @@activeItem)
+  end
+}|]
+
+
 funcTest = [r|
 export default class TodoList extends React.Component where
   makeTodos := @props.todos.map(\t -> @makeTodo(t))
@@ -285,6 +292,29 @@ funcTestResult = [r| export default class TodoList extends React.Component {
   }
 }|]
 
+newDo = [r|constructor props := {
+  Form.new() do
+    window.localStorage.setItem('step', @@activeItem)
+  end
+}|]
+
+newDoResult = [r|const constructor = (props) => {
+  return (<Form>{window.localStorage.setItem("step", this.state.activeItem)}</Form>);
+}|]
+
+
+newDoFunc = [r|constructor props := {
+  Form.new() do \_ ->
+    window.localStorage.setItem('step', @@activeItem)
+  end
+}|]
+
+newDoFuncResult = [r|const constructor = (props) => {
+  return (<Form>{() => {
+    return window.localStorage.setItem("step", this.state.activeItem);
+  }}</Form>);
+}|]
+
 jsTests = [
     multiLineEachTest,
     multiLineMapTest,
@@ -300,7 +330,10 @@ jsTests = [
     guardTestAsSwitch `matches` guardTestAsSwitchResult,
     longClass `matches` longClassResult,
     doFunc `matches` doFuncResult,
+    doFuncImplicit `matches` doFuncResult,
     funcTest `matches` funcTestResult,
+    newDo `matches` newDoResult,
+    newDoFunc `matches` newDoFuncResult,
     -- operations
     "foo = 1" `matches` "foo = 1;",
     "bar = 'adit'" `matches` "bar = \"adit\";",