Improve imports (google#66)

* Improve imports

* Nonexistent file is now a runtime error (used to be ignored)
* Permission denied is a runtime error (used to be an internal error)
* Basic tests added for imports
* Renamed tests from .input to .jsonnet
	* It's standard
	* It's compatible with C++ test suite
	* Editors enable syntax highlighting based on extension
	* Importing .input looks weird

imports.go

@@ -68,19 +68,18 @@ func (cache *ImportCache) importData(key importCacheKey) *ImportCacheValue {
 	return &val
 }
 
-func (cache *ImportCache) ImportString(codeDir, importedPath string) (*valueString, error) {
+func (cache *ImportCache) ImportString(codeDir, importedPath string, e *evaluator) (*valueString, error) {
 	data := cache.importData(importCacheKey{codeDir, importedPath})
 	if data.data.err != nil {
-		return nil, data.data.err
+		return nil, e.Error(data.data.err.Error())
 	}
-	// TODO(sbarzowski) wrap error in runtime error
 	return makeValueString(data.data.content), nil
 }
 
 func (cache *ImportCache) ImportCode(codeDir, importedPath string, e *evaluator) (value, error) {
 	cached := cache.importData(importCacheKey{codeDir, importedPath})
 	if cached.data.err != nil {
-		return nil, cached.data.err
+		return nil, e.Error(cached.data.err.Error())
 	}
 	if cached.asCode == nil {
 		node, err := snippetToAST(cached.data.foundHere, cached.data.content)
@@ -141,6 +140,11 @@ func (importer *FileImporter) Import(dir, importedPath string) *ImportedData {
 		}
 	}
 
+	if !found {
+		return &ImportedData{
+			err: fmt.Errorf("Couldn't open import %#v: No match locally or in the Jsonnet library paths.", importedPath),
+		}
+	}
 	return &ImportedData{content: string(content), foundHere: foundHere}
 }
 

interpreter.go

@@ -370,14 +370,12 @@ func (i *interpreter) evaluate(a ast.Node, context *TraceContext) (value, error)
 		return nil, e.Error(fmt.Sprintf("Value non indexable: %v", reflect.TypeOf(targetValue)))
 
 	case *ast.Import:
-		// TODO(sbarzowski) put this information in AST instead of getting it out of tracing data...
-		codeDir := path.Dir(e.trace.loc.FileName)
+		codeDir := path.Dir(ast.Loc().FileName)
 		return i.importCache.ImportCode(codeDir, ast.File, e)
 
 	case *ast.ImportStr:
-		// TODO(sbarzowski) put this information in AST instead of getting it out of tracing data...
-		codeDir := path.Dir(e.trace.loc.FileName)
-		return i.importCache.ImportString(codeDir, ast.File)
+		codeDir := path.Dir(ast.Loc().FileName)
+		return i.importCache.ImportString(codeDir, ast.File, e)
 
 	case *ast.LiteralBoolean:
 		return makeValueBoolean(ast.Value), nil

main_test.go

@@ -62,15 +62,15 @@ func removeExcessiveWhitespace(s string) string {
 func TestMain(t *testing.T) {
 	flag.Parse()
 	var mainTests []mainTest
-	match, err := filepath.Glob("testdata/*.input")
+	match, err := filepath.Glob("testdata/*.jsonnet")
 	if err != nil {
 		t.Fatal(err)
 	}
 	for _, input := range match {
 		golden := input
 		name := input
-		if strings.HasSuffix(input, ".input") {
-			name = input[:len(input)-len(".input")]
+		if strings.HasSuffix(input, ".jsonnet") {
+			name = input[:len(input)-len(".jsonnet")]
 			golden = name + ".golden"
 		}
 		mainTests = append(mainTests, mainTest{name: name, input: input, golden: golden})
@@ -106,12 +106,12 @@ func TestMain(t *testing.T) {
 				// TODO(sbarzowski) better reporting of differences in whitespace
 				// missing newline issues can be very subtle now
 				t.Fail()
-				t.Errorf("Mismatch when running %s.input. Golden: %s\n", test.name, test.golden)
+				t.Errorf("Mismatch when running %s.jsonnet. Golden: %s\n", test.name, test.golden)
 				data := diff(output, string(golden))
 				if err != nil {
 					t.Errorf("computing diff: %s", err)
 				}
-				t.Errorf("diff %s jsonnet %s.input\n", test.golden, test.name)
+				t.Errorf("diff %s jsonnet %s.jsonnet\n", test.golden, test.name)
 				t.Errorf(string(data))
 
 			}

testdata/false.golden

@@ -0,0 +1 @@
+false

testdata/false.jsonnet

@@ -0,0 +1 @@
+false

testdata/import.golden

@@ -0,0 +1 @@
+true

testdata/import.jsonnet

@@ -0,0 +1 @@
+import "true.jsonnet"

testdata/import2.golden

@@ -0,0 +1 @@
+false

testdata/import2.jsonnet

@@ -0,0 +1 @@
+import "false.jsonnet"

testdata/import3.golden

@@ -0,0 +1 @@
+"true\n"

testdata/import3.jsonnet

@@ -0,0 +1 @@
+importstr "true.jsonnet"

testdata/import4.golden

@@ -0,0 +1 @@
+"false\n"

testdata/import4.jsonnet

@@ -0,0 +1 @@
+importstr "false.jsonnet"

testdata/import_failure_directory.golden

@@ -0,0 +1 @@
+RUNTIME ERROR: read testdata: is a directory

testdata/import_failure_directory.jsonnet

@@ -0,0 +1,3 @@
+// Test for the case when the imported thing exists, but there
+// is an error. In this case it's not even a file.
+import '.'

testdata/nonexistent_import.golden

@@ -0,0 +1 @@
+RUNTIME ERROR: Couldn't open import "no chance a file with this name exists": No match locally or in the Jsonnet library paths.

testdata/nonexistent_import.jsonnet

@@ -0,0 +1 @@
+importstr 'no chance a file with this name exists'

testdata/nonexistent_import_crazy.golden

@@ -0,0 +1 @@
+RUNTIME ERROR: Couldn't open import "ąęółńśćźż \\\" \\' \\n\\n\\t\\t": No match locally or in the Jsonnet library paths.

testdata/nonexistent_import_crazy.jsonnet

@@ -0,0 +1 @@
+importstr "ąęółńśćźż \" \' \n\n\t\t"

testdata/true.golden

@@ -0,0 +1 @@
+true

testdata/true.jsonnet

@@ -0,0 +1 @@
+true