More Syntax Changes

core/source/Array.mint

@@ -26,8 +26,7 @@ module Array {
     Array.firstWithDefault("a", ["b", "x"]) == "b"
   */
   fun firstWithDefault (item : a, array : Array(a)) : a {
-    first(array)
-    |> Maybe.withDefault(item)
+    array.first().withDefault(item)
   }
 
   /*
@@ -56,8 +55,7 @@ module Array {
     Array.lastWithDefault("a", ["x", "b"]) == "b"
   */
   fun lastWithDefault (item : a, array : Array(a)) : a {
-    last(array)
-    |> Maybe.withDefault(item)
+    array.last().withDefault(item)
   }
 
   /*

core/source/Clipboard.mint

@@ -1,7 +1,7 @@
 /* This module has functions for manipulating the clipboard. */
 module Clipboard {
   /* Sets the clipboards content to the given value. */
-  fun set (value : String) : Promise(Never, String) {
+  fun set (value : String) : Promise(String) {
     `
     (() => {
       // Create a textarea element

core/source/Dom.mint

@@ -152,18 +152,15 @@ module Dom {
     |> Dom.focus
     |> Dom.getElementById()
   */
-  fun focus (maybeElement : Maybe(Dom.Element)) : Promise(Never, Void) {
+  fun focus (maybeElement : Maybe(Dom.Element)) : Promise(Void) {
     case (maybeElement) {
       Maybe::Just(element) =>
-        sequence {
+        {
           focusWhenVisible(element)
-
-          Promise.never()
-        } catch {
-          Promise.never()
+          Promise.resolve(void)
         }
 
-      Maybe::Nothing => Promise.never()
+      Maybe::Nothing => Promise.resolve(void)
     }
   }
 
@@ -174,14 +171,14 @@ module Dom {
     |> Dom.getElementById
     |> Dom.focusWhenVisible()
   */
-  fun focusWhenVisible (element : Dom.Element) : Promise(String, Void) {
+  fun focusWhenVisible (element : Dom.Element) : Promise(Result(String, Void)) {
     `
-    new Promise((resolve, reject) => {
+    new Promise((resolve) => {
       let counter = 0
 
       let focus = () => {
         if (counter > 15) {
-          reject('Could not focus the element in 150ms. Is it visible?')
+          resolve(#{Result::Err("Could not focus the element in 150ms. Is it visible?")})
         }
 
         #{element}.focus()
@@ -190,7 +187,7 @@ module Dom {
           counter++
           setTimeout(focus, 10)
         } else {
-          resolve(#{void})
+          resolve(#{Result::Ok(void)})
         }
       }
 
@@ -212,13 +209,12 @@ module Dom {
   Returns if the given base element contains the given element (as a maybe).
 
     case (Dom.getElementBySelector("body")) {
-      Maybe::Just(body) =>
-        try {
-          div =
-            Dom.getElementBySelector("div")
+      Maybe::Just(body) => {
+        div =
+          Dom.getElementBySelector("div")
 
-          Dom.contains(div, body) == true
-        }
+        Dom.contains(div, body) == true
+      }
 
       => false
     }
@@ -228,7 +224,7 @@ module Dom {
     base : Dom.Element
   ) : Bool {
     maybeElement
-    |> Maybe.map(Dom.contains(base))
+    |> Maybe.map((item : Dom.Element) { Dom.contains(item, base) })
     |> Maybe.withDefault(false)
   }
 
@@ -255,14 +251,12 @@ module Dom {
   /*
   If the attribute is present, it will return its value on the given element.
 
-    try {
-    	outcome =
-      	Dom.getElementById("my-div")
+    outcome =
+      Dom.getElementById("my-div")
 
-      case (outcome) {
-        Maybe::Just(element) => Dom.getAttribute("id", element) == "my-div"
-        Maybe::Nothing => false
-      }
+    case (outcome) {
+      Maybe::Just(element) => Dom.getAttribute("id", element) == "my-div"
+      Maybe::Nothing => false
     }
   */
   fun getAttribute (name : String, element : Dom.Element) : Maybe(String) {
@@ -382,7 +376,7 @@ module Dom {
 
     Dom.blurActiveElement()
   */
-  fun blurActiveElement : Promise(Never, Void) {
+  fun blurActiveElement : Promise(Void) {
     `document.activeElement && document.activeElement.blur()`
   }
 
@@ -452,7 +446,7 @@ module Dom {
   }
 
   /* Focuses the first focusable descendant of the given element. */
-  fun focusFirst (element : Dom.Element) : Promise(Never, Void) {
+  fun focusFirst (element : Dom.Element) : Promise(Void) {
     element
     |> getFocusableElements
     |> Array.first
@@ -464,7 +458,7 @@ module Dom {
 
     Dom.smoothScrollTo(element, 10, 10)
   */
-  fun smoothScrollTo (element : Dom.Element, left : Number, top : Number) : Promise(Never, Void) {
+  fun smoothScrollTo (element : Dom.Element, left : Number, top : Number) : Promise(Void) {
     `#{element}.scrollTo({
         behavior: 'smooth',
         left: #{left},
@@ -477,7 +471,7 @@ module Dom {
 
     Dom.scrollTo(element, 10, 10)
   */
-  fun scrollTo (element : Dom.Element, left : Number, top : Number) : Promise(Never, Void) {
+  fun scrollTo (element : Dom.Element, left : Number, top : Number) : Promise(Void) {
     `#{element}.scrollTo({
         left: #{left},
         top: #{top}
@@ -552,20 +546,18 @@ module Dom {
     |> getElementsBySelector(selector)
     |> Array.map(
       (item : Dom.Element) : Tuple(String, String, String) {
-        try {
-          tag =
-            item
-            |> getTagName()
-            |> String.toLowerCase()
+        tag =
+          item
+          |> getTagName()
+          |> String.toLowerCase()
 
-          text =
-            getTextContent(item)
+        text =
+          getTextContent(item)
 
-          hash =
-            String.parameterize(text)
+        hash =
+          String.parameterize(text)
 
-          {tag, text, hash}
-        }
+        {tag, text, hash}
       })
   }
 }

core/source/File.mint

@@ -45,14 +45,14 @@ module File {
   * The mime type can be restricted to the given one.
   * It might not resolve if the user cancels the dialog.
 
-    sequence {
+    {
       files =
-        File.selectMultiple("application/json")
+        await File.selectMultiple("application/json")
 
       Debug.log(files)
     }
   */
-  fun selectMultiple (accept : String) : Promise(Never, Array(File)) {
+  fun selectMultiple (accept : String) : Promise(Array(File)) {
     `
     (() => {
       let input = document.createElement('input')
@@ -69,7 +69,7 @@ module File {
 
       document.body.appendChild(input)
 
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         input.addEventListener('change', () => {
           resolve(Array.from(input.files))
         })
@@ -86,14 +86,14 @@ module File {
   * The mime type can be restricted to the given one.
   * It might not resolve if the user cancels the dialog.
 
-    sequence {
+    {
       file =
-        File.select("application/json")
+        await File.select("application/json")
 
       Debug.log(file)
     }
   */
-  fun select (accept : String) : Promise(Never, File) {
+  fun select (accept : String) : Promise(File) {
     `
     (() => {
       let input = document.createElement('input')
@@ -109,7 +109,7 @@ module File {
 
       document.body.appendChild(input)
 
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         input.addEventListener('change', () => {
           resolve(input.files[0])
         })
@@ -123,21 +123,21 @@ module File {
   /*
   Reads the contents of the given file as a Data URL.
 
-    sequence {
+    {
       file =
-        File.fromString("Some content...", "test.txt", "text/plain")
+        await File.fromString("Some content...", "test.txt", "text/plain")
 
       url =
         File.readAsDataURL(file)
 
       url == "data:text/plain;...."
     }
   */
-  fun readAsDataURL (file : File) : Promise(Never, String) {
+  fun readAsDataURL (file : File) : Promise(String) {
     `
     (() => {
       let reader = new FileReader();
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         reader.addEventListener('load', (event) => {
           resolve(reader.result)
         })
@@ -150,21 +150,21 @@ module File {
   /*
   Reads the contents of the given file as a String.
 
-    sequence {
+    {
       file =
-        File.create("Some content...", "test.txt", "text/plain")
+        await File.create("Some content...", "test.txt", "text/plain")
 
       url =
         File.readAsString(file)
 
       url == "Some content..."
     }
   */
-  fun readAsString (file : File) : Promise(Never, String) {
+  fun readAsString (file : File) : Promise(String) {
     `
     (() => {
       let reader = new FileReader();
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         reader.addEventListener('load', (event) => {
           resolve(reader.result)
         })
@@ -177,28 +177,26 @@ module File {
   /*
   Prompts a save dialog for the given file.
 
-    sequence {
+    {
       file =
-        File.select(*)
+        await File.select(*)
 
       File.download(file)
     }
   */
-  fun download (file : File) : Promise(Never, Void) {
-    sequence {
-      url =
-        Url.createObjectUrlFromFile(file)
-
-      `
-      (() => {
-        const anchor = document.createElement('a');
-        anchor.download = #{file}.name;
-        anchor.href = #{url};
-        anchor.click();
-      })()
-      `
-
-      Url.revokeObjectUrl(url)
-    }
+  fun download (file : File) : Void {
+    url =
+      Url.createObjectUrlFromFile(file)
+
+    `
+    (() => {
+      const anchor = document.createElement('a');
+      anchor.download = #{file}.name;
+      anchor.href = #{url};
+      anchor.click();
+    })()
+    `
+
+    Url.revokeObjectUrl(url)
   }
 }

core/source/Html.Event.mint

@@ -194,10 +194,8 @@ module Html.Event {
   /*
   Stops the propagation of the given event.
 
-    try {
-      Html.Event.stopPropagation(event)
-      doSomethingElse()
-    }
+    Html.Event.stopPropagation(event)
+    doSomethingElse()
   */
   fun stopPropagation (event : Html.Event) : Void {
     `#{event.event}.stopPropagation()`
@@ -215,10 +213,8 @@ module Html.Event {
   /*
   Prevents the default action of the event from happening.
 
-    try {
-      Html.Event.preventDefault(event)
-      doSomethingElse()
-    }
+    Html.Event.preventDefault(event)
+    doSomethingElse()
   */
   fun preventDefault (event : Html.Event) : Void {
     `#{event.event}.preventDefault()`