status check 1

Author: webDevWay

bin/gendiff

@@ -19,42 +19,17 @@ Options:
   -v --version                  Show version
   --format <fmt>                Report format [default: stylish]
 DOC;
-
-function main(): void
-{
-    global $doc;
 
-    try {
-        $handler = new Handler();
-        $response = $handler->handle($doc);
-        
-        if ($response['--help']) {
-            echo $doc . "\n";
-            exit(0);
-        }
-        
-        if ($response['--version']) {
-            echo "gendiff 1.0.0\n";
-            exit(0);
-        }
-        
-        if (!$response['<firstFile>'] || !$response['<secondFile>']) {
-            echo "Error: two files required\n";
-            echo $doc . "\n";
-            exit(1);
-        }
-        
-        $file1 = $response['<firstFile>'];
-        $file2 = $response['<secondFile>'];
-        $format = $response['--format'];
-        
-        $diff = genDiff($file1, $file2, $format);
-        echo $diff . "\n";
-        
-    } catch (Exception $e) {
-        echo "Error: " . $e->getMessage() . "\n";
-        exit(1);
-    }
-}
+try {
+    $response = Docopt::handle($doc, ['version' => 'gendiff 1.0.0']);
 
-main();
+    $file1 = $response['<firstFile>'];
+    $file2 = $response['<secondFile>'];
+    $format = $response['--format'];
+    
+    $diff = genDiff($file1, $file2, $format);
+    echo $diff . "\n";    
+} catch (Exception $e) {
+    echo "Error: " . $e->getMessage() . "\n";
+    exit(1);
+}

composer.json

@@ -7,7 +7,6 @@
               "Differ\\": "src/"
         },
         "files": [
-            "src/DiffBuilder.php",
             "src/Parsers.php",
             "src/Formatters.php",
             "src/Differ.php",

file1.json

@@ -2,20 +2,23 @@
 
 namespace Differ\Differ;
 
-use function Differ\Parsers\{getFileFormat, parse};
-use function Differ\DiffBuilder\buildDiff;
-use function Differ\Formatters\format;
+use function Differ\Parsers\parse;
+use function Differ\Formatters\render;
+use function Functional\sort;
 
 function genDiff(string $filePath1, string $filePath2, string $format = 'stylish'): string
 {
-    $data1 = getDataFromFile($filePath1);
-    $data2 = getDataFromFile($filePath2);
+    $content1 = getFileContent($filePath1);
+    $content2 = getFileContent($filePath2);
+
+    $data1 = parse($content1, getFileFormat($filePath1));
+    $data2 = parse($content2, getFileFormat($filePath2));
 
     $diff = buildDiff($data1, $data2);
-    return format($diff, $format);
+    return render($diff, $format);
 }
 
-function getDataFromFile(string $filePath): object
+function getFileContent(string $filePath): string
 {
     if (!file_exists($filePath)) {
         throw new \Exception("File '{$filePath}' does not exist");
@@ -26,6 +29,118 @@ function getDataFromFile(string $filePath): object
         throw new \Exception("Failed to read file '{$filePath}'");
     }
 
-    $fileFormat = getFileFormat($filePath);
-    return parse($content, $fileFormat);
+    return $content;
+}
+
+function getFileFormat(string $filePath): string
+{
+    $extension = pathinfo($filePath, PATHINFO_EXTENSION);
+
+    return match ($extension) {
+        'json' => 'json',
+        'yaml', 'yml' => 'yaml',
+        default => throw new \Exception("Unsupported file format: {$extension}")
+    };
+}
+
+function buildDiff(object $data1, object $data2): array
+{
+    $keys1 = array_keys(get_object_vars($data1));
+    $keys2 = array_keys(get_object_vars($data2));
+    $allKeys = array_unique(array_merge($keys1, $keys2));
+    $sortedKeys = sortKeys($allKeys);
+
+    return array_map(function ($key) use ($data1, $data2) {
+        return buildNode($key, $data1, $data2);
+    }, $sortedKeys);
+}
+
+function buildNode(string $key, object $data1, object $data2): array
+{
+    $value1 = getValue($data1, $key);
+    $value2 = getValue($data2, $key);
+
+    $hasInFirst = property_exists($data1, $key);
+    $hasInSecond = property_exists($data2, $key);
+
+    if (!$hasInFirst) {
+        return buildAddedNode($key, $value2);
+    }
+
+    if (!$hasInSecond) {
+        return buildRemovedNode($key, $value1);
+    }
+
+    if (isObject($value1) && isObject($value2)) {
+        return buildNestedNode($key, $value1, $value2);
+    }
+
+    if ($value1 === $value2) {
+        return buildUnchangedNode($key, $value1);
+    }
+
+    return buildChangedNode($key, $value1, $value2);
+}
+
+function buildAddedNode(string $key, mixed $value): array
+{
+    return [
+        'type' => 'added',
+        'key' => $key,
+        'value' => $value
+    ];
+}
+
+function buildRemovedNode(string $key, mixed $value): array
+{
+    return [
+        'type' => 'removed',
+        'key' => $key,
+        'value' => $value
+    ];
+}
+
+function buildUnchangedNode(string $key, mixed $value): array
+{
+    return [
+        'type' => 'unchanged',
+        'key' => $key,
+        'value' => $value
+    ];
+}
+
+function buildChangedNode(string $key, mixed $oldValue, mixed $newValue): array
+{
+    return [
+        'type' => 'changed',
+        'key' => $key,
+        'oldValue' => $oldValue,
+        'newValue' => $newValue
+    ];
+}
+
+function buildNestedNode(string $key, object $oldValue, object $newValue): array
+{
+    return [
+        'type' => 'nested',
+        'key' => $key,
+        'children' => buildDiff($oldValue, $newValue)
+    ];
+}
+
+function getValue(object $data, string $key): mixed
+{
+    return property_exists($data, $key) ? $data->$key : null;
+}
+
+function isObject(mixed $value): bool
+{
+    return is_object($value);
+}
+
+function sortKeys(array $keys): array
+{
+    return sort($keys, function ($a, $b) {
+        return strcmp($a, $b);
+    });
 }