Clean

t-regx · Nov 24, 2023 · 45e6c57 · 45e6c57
1 parent e3af598
commit 45e6c57
Showing 1 changed file with 42 additions and 9 deletions.
diff --git a/src/Internal/View/ReindexedKeysDataFrame.php b/src/Internal/View/ReindexedKeysDataFrame.php
@@ -29,19 +29,21 @@ public function dataset(): array
      */
     private function reindexedRows(array $dataRows): array
     {
-        for ($i = 0; $i < $this->widestRowWidth($dataRows); $i++) {
-            $sequence = 0;
-            foreach ($dataRows as $row) {
-                if (isset($row->keys[$i])) {
-                    if (!$row->isAssociative($i)) {
-                        $row->keys[$i] = $sequence++;
-                    }
-                }
-            }
+        foreach ($this->columnIndices($dataRows) as $columnIndex) {
+            $this->reindexColumn($dataRows, $columnIndex);
         }
         return $dataRows;
     }
 
+    /**
+     * @param DataRow[] $dataRows
+     * @return \Iterator
+     */
+    private function columnIndices(array $dataRows): iterable
+    {
+        return \range(0, $this->widestRowWidth($dataRows));
+    }
+
     /**
      * @param DataRow[] $dataRows
      * @return int
@@ -52,4 +54,35 @@ private function widestRowWidth(array $dataRows): int
             return \count($row->keys);
         }, $dataRows));
     }
+
+    /**
+     * @param DataRow[] $dataRows
+     * @param int $columnIndex
+     * @return void
+     */
+    private function reindexColumn(array $dataRows, int $columnIndex): void
+    {
+        $sequence = 0;
+        foreach ($this->rowsWithSequentialKeyAt($dataRows, $columnIndex) as $row) {
+            $row->keys[$columnIndex] = $sequence++;
+        }
+    }
+
+    /**
+     * @param DataRow[] $dataRows
+     * @param int $index
+     * @return \Iterator
+     */
+    private function rowsWithSequentialKeyAt(array $dataRows, int $index): \Iterator
+    {
+        foreach ($dataRows as $row) {
+            if (!isset($row->keys[$index])) {
+                continue;
+            }
+            if ($row->isAssociative($index)) {
+                continue;
+            }
+            yield $row;
+        }
+    }
 }