Uncompleted 7th step

Author: alexvitayu

gendiff.cast

@@ -19,7 +19,7 @@
 [5.303537, "o", "\r\u001b[0m\u001b[27m\u001b[24m\u001b[J\u001b[0m\u001b[49m\u001b[39m\u001b[0m\u001b[49m\u001b[38;5;31m\u001b[1m\u001b[38;5;31m\u001b[38;5;39m~\u001b[0m\u001b[38;5;39m\u001b[49m\u001b[38;5;31m/\u001b[1m\u001b[38;5;31m\u001b[38;5;39mgo-project-244\u001b[0m\u001b[38;5;39m\u001b[49m\u001b[38;5;31m\u001b[0m\u001b[38;5;31m\u001b[49m\u001b[38;5;31m\u001b[0m\u001b[38;5;31m\u001b[49m \u001b[0m\u001b[38;5;31m\u001b[49m\u001b[38;5;178m\u001b[39mon \u001b[0m\u001b[49m\u001b[38;5;178m\u001b[38;5;76mmain \u001b[38;5;178m!5 \u001b[38;5;39m?1\u001b[0m\u001b[38;5;39m\u001b[49m\u001b[38;5;178m\u001b[0m\u001b[38;5;178m\u001b[49m \u001b[0m\u001b[38;5;178m\u001b[49m\u001b[38;5;76m❯\u001b[0m\u001b[38;5;76m\u001b[49m\u001b[38;5;76m\u001b[0m\u001b[38;5;76m\u001b[49m\u001b[30m\u001b[0m\u001b[30m\u001b[49m\u001b[39m \u001b[0m\u001b[49m\u001b[39m\u001b[K\u001b[101C\u001b[0m\u001b[49m\u001b[38;5;66m\u001b[39mat \u001b[0m\u001b[49m\u001b[38;5;66m21:00:17\u001b[0m\u001b[38;5;66m\u001b[49m\u001b[38;5;66m\u001b[0m\u001b[38;5;66m\u001b[49m\u001b[38;5;66m\u001b[0m\u001b[38;5;66m\u001b[49m\u001b[39m\u001b[112D\u001b[?1h\u001b="]
 [5.304445, "o", "\u001b[?2004h"]
 [6.862786, "o", "b"]
-[6.864874, "o", "\bb\u001b[90min/gendiff testdata/file1.json testdata/file2.json\u001b[39m\u001b[50D"]
+[6.864874, "o", "\bb\u001b[90min/gendiff testres1/file1.json testdata/file2.json\u001b[39m\u001b[50D"]
 [7.07186, "o", "\bb\u001b[39mi"]
 [7.880969, "o", "\u001b[39mn\u001b[39m/\u001b[39mg\u001b[39me\u001b[39mn\u001b[39md\u001b[39mi\u001b[39mf\u001b[39mf\u001b[39m \u001b[39mt\u001b[39me\u001b[39ms\u001b[39mt\u001b[39md\u001b[39ma\u001b[39mt\u001b[39ma\u001b[39m/\u001b[39mf\u001b[39mi\u001b[39ml\u001b[39me\u001b[39m1\u001b[39m.\u001b[39mj\u001b[39ms\u001b[39mo\u001b[39mn\u001b[39m \u001b[39mt\u001b[39me\u001b[39ms\u001b[39mt\u001b[39md\u001b[39ma\u001b[39mt\u001b[39ma\u001b[39m/\u001b[39mf\u001b[39mi\u001b[39ml\u001b[39me\u001b[39m2\u001b[39m.\u001b[39mj\u001b[39ms\u001b[39mo\u001b[39mn"]
 [10.474883, "o", "\u001b[?1l\u001b>"]

go.mod

@@ -5,10 +5,10 @@ go 1.24
 require (
 	github.com/stretchr/testify v1.11.1
 	github.com/urfave/cli/v3 v3.4.1
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

src/compare.go

@@ -0,0 +1,115 @@
+package src
+
+import (
+	"fmt"
+	"sort"
+)
+
+type Diff struct {
+	Difference string
+	Message    string
+}
+
+func Compare(obj1, obj2 map[string]interface{}, basePath string) []Diff {
+	var diffs []Diff
+
+	// Создаём множество ключей из обеих map
+	uniqueKeys := make(map[string]struct{}) // Убираю дубликаты ключей
+	for key := range obj1 {
+		uniqueKeys[key] = struct{}{}
+	}
+	for key := range obj2 {
+		uniqueKeys[key] = struct{}{}
+	}
+	commonKeys := make([]string, 0, len(uniqueKeys)) //Сразу аллоцирую память под известное количество элементов
+	for key := range uniqueKeys {
+		commonKeys = append(commonKeys, key)
+	}
+	// Сортируем ключи в алфавитном порядке
+	sort.Slice(commonKeys, func(i, j int) bool {
+		return commonKeys[i] < commonKeys[j]
+	})
+	repeatedKeys := make(map[string]bool) //для обработки повторяющихся ключей
+	for _, key := range commonKeys {
+		if repeatedKeys[key] {
+			continue
+		}
+
+		value1, ok := obj1[key]
+		value2, yes := obj2[key]
+		currentPath := buildPath(basePath, key)
+
+		if isObject(value2) && isObject(value1) {
+			o1 := value1.(map[string]interface{})
+			o2 := value2.(map[string]interface{})
+			childDiff := Compare(o1, o2, currentPath) // рекурсивный шаг
+			diffs = append(diffs, childDiff...)
+			repeatedKeys[key] = true
+			continue
+		}
+		switch {
+		case !ok && yes:
+			strData2 := fmt.Sprintf(" + %v: %v", key, value2)
+			diffs = append(diffs, Diff{Difference: strData2, Message: "# Добавлена"})
+		case ok && !yes:
+			strData1 := fmt.Sprintf(" - %v: %v", key, value1)
+			diffs = append(diffs, Diff{Difference: strData1, Message: "# Удалена"})
+
+		default:
+			isSimple1 := simpleType(value1)
+			isSimple2 := simpleType(value2)
+			// Оба простых типа и значения не равны
+			if isSimple1 && isSimple2 && value1 != value2 {
+				strData1 := fmt.Sprintf(" - %v: %v", key, value1)
+				diffs = append(diffs, Diff{Difference: strData1, Message: "# Старое значение"})
+				strData2 := fmt.Sprintf(" + %v: %v", key, value2)
+				diffs = append(diffs, Diff{Difference: strData2, Message: "# Новое значение"})
+				// Оба простых типа и значения равны
+			} else if isSimple1 && isSimple2 && value1 == value2 {
+				strData1 := fmt.Sprintf("   %v: %v", key, value1)
+				diffs = append(diffs, Diff{Difference: strData1, Message: ""})
+				// Если оба типа и не простые типы и не объекты
+			} else {
+				strData1 := fmt.Sprintf(" - %v: %v", key, value1)
+				diffs = append(diffs, Diff{Difference: strData1, Message: "# Старое значение"})
+				strData2 := fmt.Sprintf(" + %v: %v", key, value2)
+				diffs = append(diffs, Diff{Difference: strData2, Message: "# Новое значение"})
+			}
+		}
+	}
+	return diffs
+}
+
+func buildPath(basePath, key string) string {
+	if basePath == "" {
+		return key
+	}
+	return basePath + "." + key
+}
+
+func simpleType(value interface{}) bool {
+	switch value.(type) {
+	case string, int, int8, int16, int32, int64, float32, float64, bool:
+		return true
+	default:
+		return false
+	}
+}
+
+func isArray(value interface{}) bool {
+	_, ok := value.([]interface{})
+	if ok {
+		return true
+	} else {
+		return false
+	}
+}
+
+func isObject(value interface{}) bool {
+	_, ok := value.(map[string]interface{})
+	if ok {
+		return true
+	} else {
+		return false
+	}
+}

src/compare_test.go

@@ -0,0 +1,19 @@
+package src
+
+import (
+	"code/src/parsers"
+	"fmt"
+	"path/filepath"
+	"testing"
+)
+
+func TestCompare(t *testing.T) {
+	path1 := filepath.Join("../testdata/fixture/complicated/file1-1.yaml") //фикстура №1
+	path2 := filepath.Join("../testdata/fixture/complicated/file2-1.yaml") //фикстура №2
+	//path1 := filepath.Join("../testdata/fixture/file1.yml")
+	//path2 := filepath.Join("../testdata/fixture/file2.yml")
+	obj1, obj2, _ := parsers.ParseDataFromFiles(path1, path2)
+
+	res := Compare(obj1, obj2, "")
+	fmt.Println(res)
+}

src/formatter/stylish.go

@@ -0,0 +1,10 @@
+package formatter
+
+import "code/src"
+
+type Stylish struct{}
+
+func (st *Stylish) Format(diff *[]src.Diff) string {
+
+	return ""
+}

src/gendiff.go

@@ -1,4 +1,4 @@
-package code
+package src
 
 import (
 	"code/src/parsers"
@@ -15,6 +15,7 @@ func GenDiff(path1, path2, format string) (string, error) {
 		return "", fmt.Errorf("parseDataFromFiles: %w", err)
 	}
 	str := genDiff(data1, data2)
+	//str := compareTreeStructures(data1, data2)
 	return str, nil
 }
 

src/gendiff_test.go

@@ -1,4 +1,4 @@
-package code
+package src
 
 import (
 	"os"

src/parsers/parsers.go

@@ -3,9 +3,10 @@ package parsers
 import (
 	"encoding/json"
 	"errors"
-	"gopkg.in/yaml.v3"
 	"os"
 	"path/filepath"
+
+	"gopkg.in/yaml.v3"
 )
 
 func ParseDataFromFiles(path1, path2 string) (res1, res2 map[string]interface{}, err error) {

src/parsers/parsers_test.go

@@ -2,6 +2,7 @@ package parsers
 
 import (
 	"errors"
+	"fmt"
 	"path/filepath"
 	"testing"
 
@@ -24,8 +25,8 @@ func TestParseDataFromFiles(t *testing.T) {
 		},
 		{
 			name:      "BothFilesAreYaml",
-			filename1: filepath.Join("../../testdata/fixture/file1.yml"),
-			filename2: filepath.Join("../../testdata/fixture/file2.yml"),
+			filename1: filepath.Join("../../testdata/fixture/file1-1.yaml"),
+			filename2: filepath.Join("../../testdata/fixture/file2-1.yaml"),
 			expected: [3]interface{}{map[string]interface{}{"follow": false, "host": "hexlet.io", "proxy": "123.234.53.22", "timeout": 50},
 				map[string]interface{}{"host": "hexlet.io", "timeout": 20, "verbose": true}, nil},
 		},
@@ -45,6 +46,7 @@ func TestParseDataFromFiles(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			got1, got2, err := ParseDataFromFiles(tc.filename1, tc.filename2)
+			fmt.Println(got1, got2)
 			if got1 != nil && got2 != nil {
 				assert.Equal(t, got1, tc.expected[0])
 				assert.Equal(t, got2, tc.expected[1])

testdata/fixture/complicated/expected.diff

@@ -0,0 +1,42 @@
+common: {
+    + follow: false # Добавлена
+      setting1: Value 1
+    - setting2: 200 # Удалена
+    - setting3: true # Старое значение
+    + setting3: null # Новое значение
+    + setting4: blah blah
+    + setting5: {
+          key5: value5
+      }
+      setting6: {
+          doge: {
+            - wow: # значения нет, но пробел после : есть
+            + wow: so much
+          }
+          key: value
+        + ops: vops
+      }
+  }
+  group1: {
+    - baz: bas
+    + baz: bars
+      foo: bar
+    - nest: {
+          key: value
+      }
+    + nest: str
+  }
+- group2: {
+      abc: 12345
+      deep: {
+          id: 45
+      }
+  }
++ group3: {
+      deep: {
+          id: {
+              number: 45
+          }
+      }
+      fee: 100500
+  }