Merge pull request #3 from philandstuff/unmarshal-should-fetch-imports

[unmarshal] Actually fetch imports in Unmarshal

CHANGELOG.md

@@ -9,9 +9,10 @@
    - removed `core.AppValue` from public interface
    - renamed various types to remove `-Val` and `-Term` suffixes
 
-### Changed
+### Fixed
 
- - `dhall.Unmarshal()` now typechecks before evaluating
+ - `dhall.Unmarshal()` now resolves imports and typechecks before
+   evaluating
 
 ### Added
 

testdata/unmarshal-test.dhall

@@ -0,0 +1 @@
+{ Port = 5050, Name = "inetd" }

unmarshal.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/philandstuff/dhall-golang/core"
+	"github.com/philandstuff/dhall-golang/imports"
 	"github.com/philandstuff/dhall-golang/parser"
 )
 
@@ -18,18 +19,23 @@ func isMapEntryType(recordType core.RecordType) bool {
 	return false
 }
 
-// Unmarshal takes dhall input as a byte array and parses it,
-// evaluates it, and unmarshals it into the given variable.
+// Unmarshal takes dhall input as a byte array and parses it, resolves
+// imports, typechecks, evaluates, and unmarshals it into the given
+// variable.
 func Unmarshal(b []byte, out interface{}) error {
 	term, err := parser.Parse("-", b)
 	if err != nil {
 		return err
 	}
-	_, err = core.TypeOf(term)
+	resolved, err := imports.Load(term)
+	if err != nil {
+		return err
+	}
+	_, err = core.TypeOf(resolved)
 	if err != nil {
 		return err
 	}
-	Decode(core.Eval(term), out)
+	Decode(core.Eval(resolved), out)
 	return nil
 }
 

unmarshal_test.go

@@ -202,12 +202,23 @@ var _ = Describe("Decode", func() {
 var _ = Describe("Unmarshal", func() {
 	It("Parses 1 + 2", func() {
 		var actual uint
-		Unmarshal([]byte("1 + 2"), &actual)
+		err := Unmarshal([]byte("1 + 2"), &actual)
+		Expect(err).ToNot(HaveOccurred())
 		Expect(actual).To(Equal(uint(3)))
 	})
 	It("Throws a type error for `1 + -2`", func() {
 		var actual uint
 		err := Unmarshal([]byte("1 + -2"), &actual)
 		Expect(err).To(HaveOccurred())
 	})
+	It("Fetches imports", func() {
+		type Config struct {
+			Port int
+			Name string
+		}
+		var actual Config
+		err := Unmarshal([]byte("./testdata/unmarshal-test.dhall"), &actual)
+		Expect(err).ToNot(HaveOccurred())
+		Expect(actual).To(Equal(Config{Port: 5050, Name: "inetd"}))
+	})
 })