Misc fixes (#80)

ionide · Mar 10, 2021 · aaaf95b · aaaf95b
1 parent 827f77c
commit aaaf95b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/samples/generators/index.fsx b/samples/generators/index.fsx
@@ -38,7 +38,7 @@ let generate' (ctx : SiteContents) (_: string) =
         |> List.map (fun p -> span [] [!! p.link] )
 
     let siteModel = ctx.TryGetValue<Customloader.CustomConfig> ()
-    let gv = siteModel |> Option.map (fun s -> s.SomeGlobalValue) |> Option.defaultValue "NO DEAFULT"
+    let gv = siteModel |> Option.map (fun s -> s.SomeGlobalValue) |> Option.defaultValue "NO DEFAULT"
 
     html [] [
         div [] psts

diff --git a/samples/generators/post.fsx b/samples/generators/post.fsx
@@ -39,7 +39,7 @@ let generate' (ctx : SiteContents) (page: string) =
         |> List.map (fun p -> span [] [!! p.link] )
 
     let siteModel = ctx.TryGetValue<Customloader.CustomConfig> ()
-    let gv = siteModel |> Option.map (fun s -> s.SomeGlobalValue) |> Option.defaultValue "NO DEAFULT"
+    let gv = siteModel |> Option.map (fun s -> s.SomeGlobalValue) |> Option.defaultValue "NO DEFAULT"
 
     html [] [
         div [] [

diff --git a/src/Fornax/Generator.fs b/src/Fornax/Generator.fs
@@ -458,13 +458,13 @@ let generateFolder (projectRoot : string) (isWatch: bool) =
         if File.Exists configPath then
             match ConfigEvaluator.evaluate fsi sc configPath with
             | Ok cfg -> Some cfg
-            | _ -> None
+            | Error error -> raise (FornaxGeneratorException error)
         else
             None
 
     match config with
     | None ->
-        raise (FornaxGeneratorException "Couldn't find or load config")
+        raise (FornaxGeneratorException "Couldn't find config.fsx")
     | Some config ->
         let loaders = Directory.GetFiles(Path.Combine(projectRoot, "loaders"), "*.fsx")
         let sc =
@@ -478,7 +478,6 @@ let generateFolder (projectRoot : string) (isWatch: bool) =
                     state)
         sc.Errors() |> List.iter (fun er -> printfn "BAD FILE: %s" er.Path)
 
-
         let logResult (result : GeneratorResult) =
             match result with
             | GeneratorIgnored -> ()