Add more tests and fix corner cases.

Author: vmihailenco

consumer.go

@@ -2,7 +2,6 @@ package sourcemap
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/url"
 	"path"
@@ -24,7 +23,10 @@ func Parse(mapURL string, b []byte) (*Consumer, error) {
 	}
 
 	if smap.Version != 3 {
-		return nil, errors.New("sourcemap: only 3rd version is supported")
+		return nil, fmt.Errorf(
+			"sourcemap: got version=%d, but only 3rd version is supported",
+			smap.Version,
+		)
 	}
 
 	var sourceRootURL *url.URL
@@ -82,22 +84,25 @@ func (c *Consumer) Source(genLine, genCol int) (source, name string, line, col i
 	match := &c.mappings[i]
 
 	// Fuzzy match.
-	if match.genCol > genCol && i > 0 {
+	if match.genLine > genLine || match.genCol > genCol {
+		if i == 0 {
+			return
+		}
 		match = &c.mappings[i-1]
 	}
 
 	if match.sourcesInd >= 0 {
 		source = c.absSource(c.smap.Sources[match.sourcesInd])
 	}
 	if match.namesInd >= 0 {
-		iv := c.smap.Names[match.namesInd]
-		switch v := iv.(type) {
+		v := c.smap.Names[match.namesInd]
+		switch v := v.(type) {
 		case string:
 			name = v
 		case float64:
 			name = strconv.FormatFloat(v, 'f', -1, 64)
 		default:
-			name = fmt.Sprint(iv)
+			name = fmt.Sprint(v)
 		}
 	}
 	line = match.sourceLine

consumer_test.go

@@ -1,6 +1,7 @@
 package sourcemap_test
 
 import (
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -20,11 +21,10 @@ func init() {
 	}
 	defer resp.Body.Close()
 
-	b, err := ioutil.ReadAll(resp.Body)
+	jqSourceMapBytes, err = ioutil.ReadAll(resp.Body)
 	if err != nil {
 		panic(err)
 	}
-	jqSourceMapBytes = b
 }
 
 type sourceMapTest struct {
@@ -36,22 +36,32 @@ type sourceMapTest struct {
 	wantedCol    int
 }
 
+func (test *sourceMapTest) String() string {
+	return fmt.Sprintf("line=%d col=%d in file=%s", test.genLine, test.genCol, test.wantedSource)
+}
+
 func (test *sourceMapTest) assert(t *testing.T, smap *sourcemap.Consumer) {
 	source, name, line, col, ok := smap.Source(test.genLine, test.genCol)
 	if !ok {
-		t.Fatalf("Source not found for %d, %d", test.genLine, test.genCol)
+		if test.wantedSource == "" &&
+			test.wantedName == "" &&
+			test.wantedLine == 0 &&
+			test.wantedCol == 0 {
+			return
+		}
+		t.Fatalf("Source not found for %s", test)
 	}
 	if source != test.wantedSource {
-		t.Fatalf("got %q, wanted %q", source, test.wantedSource)
+		t.Fatalf("file: got %q, wanted %q (%s)", source, test.wantedSource, test)
 	}
 	if name != test.wantedName {
-		t.Fatalf("got %q, wanted %q", name, test.wantedName)
+		t.Fatalf("func: got %q, wanted %q (%s)", name, test.wantedName, test)
 	}
 	if line != test.wantedLine {
-		t.Fatalf("got %q, wanted %q", line, test.wantedLine)
+		t.Fatalf("line: got %d, wanted %d (%s)", line, test.wantedLine, test)
 	}
 	if col != test.wantedCol {
-		t.Fatalf("got %q, wanted %q", col, test.wantedCol)
+		t.Fatalf("column: got %d, wanted %d (%s)", col, test.wantedCol, test)
 	}
 }
 
@@ -162,9 +172,14 @@ func TestJQuerySourceMap(t *testing.T) {
 	}
 
 	tests := []*sourceMapTest{
+		{1, 1, "", "", 0, 0},
+		{4, 0, "", "", 0, 0},
+		{4, 1, "http://code.jquery.com/jquery-2.0.3.js", "", 14, 0},
+		{4, 10, "http://code.jquery.com/jquery-2.0.3.js", "window", 14, 11},
 		{5, 6789, "http://code.jquery.com/jquery-2.0.3.js", "apply", 4360, 27},
 		{5, 10006, "http://code.jquery.com/jquery-2.0.3.js", "apply", 4676, 8},
 		{4, 553, "http://code.jquery.com/jquery-2.0.3.js", "ready", 93, 9},
+		{999999, 0, "", "", 0, 0},
 	}
 	for _, test := range tests {
 		test.assert(t, smap)

sourcemap.go

@@ -31,27 +31,21 @@ type mappings struct {
 	rd  *strings.Reader
 	dec *base64vlq.Decoder
 
-	genLine    int
-	genCol     int
-	sourcesInd int
-	sourceLine int
-	sourceCol  int
-	namesInd   int
+	hasName bool
+	value   mapping
 
 	values []mapping
-	value  *mapping
 }
 
 func parseMappings(s string) ([]mapping, error) {
 	rd := strings.NewReader(s)
 	m := &mappings{
 		rd:  rd,
 		dec: base64vlq.NewDecoder(rd),
-
-		genLine:    1,
-		sourceLine: 1,
 	}
-	m.pushValue()
+	m.value.genLine = 1
+	m.value.sourceLine = 1
+
 	err := m.parse()
 	if err != nil {
 		return nil, err
@@ -60,24 +54,27 @@ func parseMappings(s string) ([]mapping, error) {
 }
 
 func (m *mappings) parse() error {
-	next := parseGenCol
+	var prev, next fn
+	next = parseGenCol
 	for {
 		c, err := m.rd.ReadByte()
 		if err == io.EOF {
+			m.pushValue(prev)
 			return nil
-		} else if err != nil {
+		}
+		if err != nil {
 			return err
 		}
 
 		switch c {
 		case ',':
-			m.pushValue()
+			m.pushValue(prev)
 			next = parseGenCol
 		case ';':
-			m.pushValue()
+			m.pushValue(prev)
 
-			m.genLine++
-			m.genCol = 0
+			m.value.genLine++
+			m.value.genCol = 0
 
 			next = parseGenCol
 		default:
@@ -86,6 +83,7 @@ func (m *mappings) parse() error {
 				return err
 			}
 
+			prev = next
 			next, err = next(m)
 			if err != nil {
 				return err
@@ -99,8 +97,7 @@ func parseGenCol(m *mappings) (fn, error) {
 	if err != nil {
 		return nil, err
 	}
-	m.genCol += n
-	m.value.genCol = m.genCol
+	m.value.genCol += n
 	return parseSourcesInd, nil
 }
 
@@ -109,8 +106,7 @@ func parseSourcesInd(m *mappings) (fn, error) {
 	if err != nil {
 		return nil, err
 	}
-	m.sourcesInd += n
-	m.value.sourcesInd = m.sourcesInd
+	m.value.sourcesInd += n
 	return parseSourceLine, nil
 }
 
@@ -119,8 +115,7 @@ func parseSourceLine(m *mappings) (fn, error) {
 	if err != nil {
 		return nil, err
 	}
-	m.sourceLine += n
-	m.value.sourceLine = m.sourceLine
+	m.value.sourceLine += n
 	return parseSourceCol, nil
 }
 
@@ -129,8 +124,7 @@ func parseSourceCol(m *mappings) (fn, error) {
 	if err != nil {
 		return nil, err
 	}
-	m.sourceCol += n
-	m.value.sourceCol = m.sourceCol
+	m.value.sourceCol += n
 	return parseNamesInd, nil
 }
 
@@ -139,19 +133,27 @@ func parseNamesInd(m *mappings) (fn, error) {
 	if err != nil {
 		return nil, err
 	}
-	m.namesInd += n
-	m.value.namesInd = m.namesInd
+	m.hasName = true
+	m.value.namesInd += n
 	return parseGenCol, nil
 }
 
-func (m *mappings) pushValue() {
-	m.values = append(m.values, mapping{
-		genLine:    m.genLine,
-		genCol:     0,
-		sourcesInd: -1,
-		sourceLine: 0,
-		sourceCol:  0,
-		namesInd:   -1,
-	})
-	m.value = &m.values[len(m.values)-1]
+func (m *mappings) pushValue(prev fn) {
+	if m.value.sourceLine == 1 && m.value.sourceCol == 0 {
+		return
+	}
+
+	if m.hasName {
+		m.values = append(m.values, m.value)
+		m.hasName = false
+	} else {
+		m.values = append(m.values, mapping{
+			genLine:    m.value.genLine,
+			genCol:     m.value.genCol,
+			sourcesInd: m.value.sourcesInd,
+			sourceLine: m.value.sourceLine,
+			sourceCol:  m.value.sourceCol,
+			namesInd:   -1,
+		})
+	}
 }