Merge pull request #52 from roc-lang/upgrade-syntax

Upgrade module syntax and fix import warnings

ci/expect_scripts/file.exp

@@ -10,7 +10,7 @@ spawn $env(EXAMPLES_DIR)file
 expect "Listening on <http://localhost:8000>\r\n" {
     set curlOutput [exec curl -sS localhost:8000]
 
-    if { [string match "Source code of current program:\n\napp \"file\"*" $curlOutput] } {
+    if { [string match "Source code of current program:\n\napp *" $curlOutput] } {
         exit 0
     } else {
         puts "Error: curl output was different than expected: $curlOutput"

examples/command.roc

@@ -1,12 +1,9 @@
-app "command"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-        pf.Command,
-        pf.Utc,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
+import pf.Command
+import pf.Utc
 
 main : Request -> Task Response []
 main = \req ->
@@ -22,7 +19,7 @@ main = \req ->
     when result is
         Ok {} -> respond "Command succeeded\n"
         Err (ExitCode code) -> respond "Command exited with code $(Num.toStr code)\n"
-        Err (KilledBySignal) -> respond "Command was killed by signal\n"
+        Err KilledBySignal -> respond "Command was killed by signal\n"
         Err (IOError str) -> respond "IO Error: $(str)\n"
 
 respond = \str -> Task.ok { status: 200, headers: [], body: Str.toUtf8 str }

examples/dir.roc

@@ -1,15 +1,12 @@
-app "dir"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Stdout,
-        pf.Stderr,
-        pf.Dir,
-        pf.Env,
-        pf.Path,
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Stdout
+import pf.Stderr
+import pf.Dir
+import pf.Env
+import pf.Path
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
 
 main : Request -> Task Response []
 main = \_ ->

examples/echo.roc

@@ -1,12 +1,9 @@
-app "echo"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Stdout,
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-        pf.Utc,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Stdout
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
+import pf.Utc
 
 main : Request -> Task Response []
 main = \req ->

examples/env.roc

@@ -1,11 +1,8 @@
-app "env"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-        pf.Env,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
+import pf.Env
 
 main : Request -> Task Response []
 main = \_ ->

examples/error-handling.roc

@@ -1,15 +1,12 @@
 # This example demonstrates error handling and fetching content from another website.
-app "error-handling"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Stdout,
-        pf.Stderr,
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-        pf.Utc,
-        pf.Env,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Stdout
+import pf.Stderr
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
+import pf.Utc
+import pf.Env
 
 main : Request -> Task Response []
 main = \req ->
@@ -43,7 +40,7 @@ logRequest = \req ->
 
 readEnvVar : Str -> Task Str [EnvVarNotSet Str]
 readEnvVar = \envVarName ->
-    Env.var envVarName 
+    Env.var envVarName
     |> Task.mapErr \_ -> EnvVarNotSet envVarName
 
 fetchContent : Str -> Task Str [HttpError Http.Error]

examples/file.roc

@@ -1,12 +1,9 @@
-app "file"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.File,
-        pf.Path,
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.File
+import pf.Path
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
 
 main : Request -> Task Response []
 main = \_ ->
@@ -30,4 +27,4 @@ okHttp = \bodyStr ->
 
 internalErrHttp : Str -> Task Response []
 internalErrHttp = \bodyStr ->
-    Task.ok { status: 500, headers: [], body: Str.toUtf8 bodyStr }
+    Task.ok { status: 500, headers: [], body: Str.toUtf8 bodyStr }

examples/hello-web.roc

@@ -1,12 +1,9 @@
-app "hello-web"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Stdout,
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-        pf.Utc,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Stdout
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
+import pf.Utc
 
 main : Request -> Task Response []
 main = \req ->

examples/result.roc

@@ -1,10 +1,7 @@
-app "result"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
 
 # This example demonstrates the use of `Task.result`.
 # It transforms a task that can either succeed with `ok`, or fail with `err`, into
@@ -15,13 +12,13 @@ main = \_ ->
     when checkFile "good" |> Task.result! is
         Ok Good -> Task.ok { status: 200, headers: [], body: Str.toUtf8 "GOOD" }
         Ok Bad -> Task.ok { status: 200, headers: [], body: Str.toUtf8 "BAD" }
-        Err IOError -> Task.ok { status: 500, headers: [], body: Str.toUtf8 "ERROR: IoError when executing checkFile." }     
+        Err IOError -> Task.ok { status: 500, headers: [], body: Str.toUtf8 "ERROR: IoError when executing checkFile." }
 
 checkFile : Str -> Task [Good, Bad] [IOError]
 checkFile = \str ->
-    if str == "good" then 
-        Task.ok Good 
-    else if str == "bad" then 
-        Task.ok Bad 
-    else 
+    if str == "good" then
+        Task.ok Good
+    else if str == "bad" then
+        Task.ok Bad
+    else
         Task.err IOError

examples/sleep.roc

@@ -1,12 +1,9 @@
-app "echo"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Stdout,
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-        pf.Sleep,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Stdout
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
+import pf.Sleep
 
 main : Request -> Task Response []
 main = \_ ->

examples/sqlite3.roc

@@ -1,13 +1,10 @@
-app "echo"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Stdout,
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-        pf.SQLite3,
-        pf.Env,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Stdout
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
+import pf.SQLite3
+import pf.Env
 
 main : Request -> Task Response []
 main = \_ ->

examples/todos.roc

@@ -1,19 +1,15 @@
 # Webapp for todos using a SQLite 3 database
-app "todos"
-    packages { pf: "../platform/main.roc" }
-    imports [
-        pf.Stdout,
-        pf.Stderr,
-        pf.Task.{ Task },
-        pf.Http.{ Request, Response },
-        pf.Command,
-        pf.Env,
-        pf.Url,
-        pf.Utc,
-        Dict,
-        "todos.html" as todoHtml : List U8,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "../platform/main.roc" }
+
+import pf.Stdout
+import pf.Stderr
+import pf.Task exposing [Task]
+import pf.Http exposing [Request, Response]
+import pf.Command
+import pf.Env
+import pf.Url
+import pf.Utc
+import "todos.html" as todoHtml : List U8
 
 main : Request -> Task Response []
 main = \req ->
@@ -136,10 +132,10 @@ isSqliteInstalled =
         |> Command.status
         |> Task.attempt
 
-    when sqlite3Res is 
+    when sqlite3Res is
         Ok {} -> Task.ok {}
         Err _ -> Task.err Sqlite3NotInstalled
-    
+
 logRequest : Request -> Task {} *
 logRequest = \req ->
     datetime <- Utc.now |> Task.map Utc.toIso8601Str |> Task.await
@@ -148,7 +144,7 @@ logRequest = \req ->
 
 readEnvVar : Str -> Task Str [EnvVarNotSet Str]_
 readEnvVar = \envVarName ->
-    Env.var envVarName 
+    Env.var envVarName
     |> Task.mapErr \_ -> EnvVarNotSet envVarName
 
 handleErr : AppError -> Task Response *

platform/Base64.roc

@@ -1,6 +1,4 @@
-interface Base64
-    exposes [toBytes, toStr]
-    imports []
+module [toBytes, toStr]
 
 ## Base64-encodes a [Str] into another [Str].
 toStr : Str -> Str

platform/Command.roc

@@ -1,22 +1,20 @@
-interface Command
-    exposes [
-        Command,
-        Output,
-        new,
-        arg,
-        args,
-        env,
-        envs,
-        clearEnvs,
-        status,
-        output,
-    ]
-    imports [
-        Task.{ Task },
-        InternalTask,
-        InternalCommand,
-        Effect,
-    ]
+module [
+    Command,
+    Output,
+    new,
+    arg,
+    args,
+    env,
+    envs,
+    clearEnvs,
+    status,
+    output,
+]
+
+import Task exposing [Task]
+import InternalTask
+import InternalCommand
+import Effect
 
 ## Represents a command to be executed in a child process.
 ## ```

platform/Dir.roc

@@ -1,6 +1,11 @@
-interface Dir
-    exposes [deleteEmptyDir, deleteRecursive, list]
-    imports [Effect, Task.{ Task }, InternalTask, Path.{ Path }, InternalPath, InternalError]
+module [deleteEmptyDir, deleteRecursive, list]
+
+import Effect
+import Task exposing [Task]
+import InternalTask
+import Path exposing [Path]
+import InternalPath
+import InternalError
 
 ReadErr : InternalError.InternalDirReadErr