Prevent over-eager merging of Scalars of same type into Varied kind (#205)

Author: fritzgrabo

runner/shape.go

@@ -267,6 +267,13 @@ func shapeMerge(a Shape, b Shape) Shape {
 		Logln(`Missing type equality condition for %s merge: [%#v] and [%#v].`, b.Kind, a, b)
 	}
 
+	// Both scalars of same type; nothing to merge here
+	if b.Kind == a.Kind && b.Kind == ScalarKind {
+		if a.ScalarShape.Name == b.ScalarShape.Name {
+			return a
+		}
+	}
+
 	// Otherwise is a scalar or dissimilar kind so becomes varied
 	return addUniqueVaried(a, b)
 }

runner/shape_test.go

@@ -108,6 +108,33 @@ func TestGetShape(t *testing.T) {
 				},
 			},
 		},
+		{
+			`[{"a": "9", "b": 1}, {"a": "2", "b": 2}, {"a": 1, "b": 3}]`,
+			Shape{
+				Kind: ArrayKind,
+				ArrayShape: &ArrayShape{
+					Children: Shape{
+						Kind: ObjectKind,
+						ObjectShape: &ObjectShape{
+							Children: map[string]Shape{
+								"a": {
+									Kind: VariedKind,
+									VariedShape: &VariedShape{
+										Children: []Shape{
+											{Kind: ScalarKind, ScalarShape: &ScalarShape{Name: StringScalar}},
+											{Kind: ScalarKind, ScalarShape: &ScalarShape{Name: NumberScalar}},
+										},
+									},
+								},
+								"b": {
+									Kind: ScalarKind, ScalarShape: &ScalarShape{Name: NumberScalar},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
 		{
 			`[{"a": {"b": 1}, "c": "2"}]`,
 			Shape{