Fix incorrect diff for mixing types in a list

Bump `neat` to include fix for quoting numbers.

Include scalar tag in hash calculation to differentiate between types.

Simplify variables declarations.

Move `createLookUpMap` function into `simpleLists` to avoid unnecessary
method on `compare`, since it's only used in one function.

Author: HeavyWombat

assets/issues/issue-580/from.yml

@@ -0,0 +1,3 @@
+list:
+  - 123
+  - 123

assets/issues/issue-580/to.yml

@@ -0,0 +1,3 @@
+list:
+  - "123"
+  - 123

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/caarlos0/env/v11 v11.4.0
 	github.com/gonvenience/bunt v1.4.3
 	github.com/gonvenience/idem v0.0.3
-	github.com/gonvenience/neat v1.3.17
+	github.com/gonvenience/neat v1.3.18
 	github.com/gonvenience/term v1.0.5
 	github.com/gonvenience/text v1.0.10
 	github.com/gonvenience/ytbx v1.4.8

go.sum

@@ -29,6 +29,8 @@ github.com/gonvenience/idem v0.0.3 h1:rZ2f17JU5GHa3b5M5R2fClz0dYN3EFGhHHGo3AZz/1
 github.com/gonvenience/idem v0.0.3/go.mod h1:ChZ+RP8e30+uCBcCIzN/0di6lTO2PucjemgKfzQUQEw=
 github.com/gonvenience/neat v1.3.17 h1:S/F0XNE4sc/b3APfLDqC9xM476Or55WhXZ7F/Sy07QY=
 github.com/gonvenience/neat v1.3.17/go.mod h1:h+b8M0LFDZUKS5D4xaoPd2qTLrVpX+bDRlDJphOAS/s=
+github.com/gonvenience/neat v1.3.18 h1:WxWoXhsTHA6CStNrGgSEjGTt5MwIm+7Xs+VZmQIuXZA=
+github.com/gonvenience/neat v1.3.18/go.mod h1:DTaEyHIOjSkMa066EoZZl3k5KCG/rFGE67n0cjm/9qk=
 github.com/gonvenience/term v1.0.5 h1:PYfBH7FB1V+tuuJl4KYrqG/tzAOUnvTy8IFa9YqYrJY=
 github.com/gonvenience/term v1.0.5/go.mod h1:CYvcU7H3nE6eOP0gvGfYz4BjGJzM1GeNp+fx4IBWKLs=
 github.com/gonvenience/text v1.0.10 h1:QRqtC/KMk57K7y4jHi4HjLxf8u+tg+/tIRCS5afywNE=

internal/cmd/cmds_test.go

@@ -326,7 +326,7 @@ type-change-1
 
 type-change-2
   ± type change from string to int
-    - 12
+    - "12"
     + 12
 
 whitespaces

pkg/dyff/compare_test.go

@@ -937,7 +937,7 @@ b: bar
 			})
 		})
 
-		Context("checking known issues of compare", func() {
+		Context("checking known/reported compare issues", func() {
 			It("should not return order change differences in case the named-entry list does not have unique identifiers", func() {
 				from, to, err := ytbx.LoadFiles("../../assets/issues/issue-38/from.yml", "../../assets/issues/issue-38/to.yml")
 				Expect(err).To(BeNil())
@@ -1025,7 +1025,6 @@ b: bar
 			})
 
 			It("should work with non-standard identifier containing dots and slashes in named entry lists", func() {
-				assets()
 				from, to, err := ytbx.LoadFiles(assets("issues/issue-605/from.yml"), assets("issues/issue-605/to.yml"))
 				Expect(err).ToNot(HaveOccurred())
 				Expect(from).ToNot(BeNil())
@@ -1036,6 +1035,18 @@ b: bar
 				Expect(results).ToNot(BeNil())
 				Expect(results.Diffs).To(HaveLen(0))
 			})
+
+			It("should differentiate correctly between number as string and number", func() {
+				from, to, err := ytbx.LoadFiles(assets("issues/issue-580/from.yml"), assets("issues/issue-580/to.yml"))
+				Expect(err).ToNot(HaveOccurred())
+				Expect(from).ToNot(BeNil())
+				Expect(to).ToNot(BeNil())
+
+				results, err := dyff.CompareInputFiles(from, to)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(results).ToNot(BeNil())
+				Expect(results.Diffs).To(HaveLen(1))
+			})
 		})
 
 		Context("input files containing Kubernetes resources", func() {

pkg/dyff/core.go

@@ -523,11 +523,8 @@ func (compare *compare) sequenceNodes(path ytbx.Path, from *yamlv3.Node, to *yam
 }
 
 func (compare *compare) simpleLists(path ytbx.Path, from *yamlv3.Node, to *yamlv3.Node) ([]Diff, error) {
-	removals := make([]*yamlv3.Node, 0)
-	additions := make([]*yamlv3.Node, 0)
-
-	fromLength := len(from.Content)
-	toLength := len(to.Content)
+	var removals, additions []*yamlv3.Node
+	var fromLength, toLength = len(from.Content), len(to.Content)
 
 	// Special case if both lists only contain one entry, then directly compare
 	// the two entries with each other
@@ -539,12 +536,25 @@ func (compare *compare) simpleLists(path ytbx.Path, from *yamlv3.Node, to *yamlv
 		)
 	}
 
-	fromLookup := compare.createLookUpMap(from)
-	toLookup := compare.createLookUpMap(to)
+	var createLookUpMap = func(sequenceNode *yamlv3.Node) map[uint64][]int {
+		var result = make(map[uint64][]int, len(sequenceNode.Content))
+		for idx, entry := range sequenceNode.Content {
+			var hash = compare.calcNodeHash(entry)
+			if _, ok := result[hash]; !ok {
+				result[hash] = []int{}
+			}
+
+			result[hash] = append(result[hash], idx)
+		}
+
+		return result
+	}
+
+	fromLookup := createLookUpMap(from)
+	toLookup := createLookUpMap(to)
 
 	// Fill two lists with the hashes of the entries of each list
-	fromCommon := make([]*yamlv3.Node, 0, fromLength)
-	toCommon := make([]*yamlv3.Node, 0, toLength)
+	var fromCommon, toCommon []*yamlv3.Node
 
 	for idxPos, fromValue := range from.Content {
 		hash := compare.calcNodeHash(fromValue)
@@ -1038,20 +1048,6 @@ func isEmptyDocument(node *yamlv3.Node) bool {
 	return false
 }
 
-func (compare *compare) createLookUpMap(sequenceNode *yamlv3.Node) map[uint64][]int {
-	result := make(map[uint64][]int, len(sequenceNode.Content))
-	for idx, entry := range sequenceNode.Content {
-		hash := compare.calcNodeHash(entry)
-		if _, ok := result[hash]; !ok {
-			result[hash] = []int{}
-		}
-
-		result[hash] = append(result[hash], idx)
-	}
-
-	return result
-}
-
 func (compare *compare) basicType(node *yamlv3.Node) interface{} {
 	switch node.Kind {
 	case yamlv3.DocumentNode:
@@ -1098,7 +1094,7 @@ func (compare *compare) calcNodeHash(node *yamlv3.Node) (hash uint64) {
 		hash, err = hashstructure.Hash(compare.basicType(node), nil)
 
 	case yamlv3.ScalarNode:
-		hash, err = hashstructure.Hash(node.Value, nil)
+		hash, err = hashstructure.Hash(node.Tag+"/"+node.Value, nil)
 
 	case yamlv3.AliasNode:
 		hash = compare.calcNodeHash(followAlias(node))