New Table/Factory option: inclIndex (true)

Author: bkdotcom

src/Debug/Framework/Laravel/LogViews.php

@@ -100,7 +100,7 @@ protected function logView(View $view)
                     ? 'blade'
                     : \pathinfo($path, PATHINFO_EXTENSION)),
         ));
-        $this->viewChannel->log('view', $info, $this->viewChannel->meta('detectFiles'));
+        $this->viewChannel->log('view', $info);
     }
 
     /**

src/Debug/Framework/Laravel/ServiceProvider.php

@@ -21,6 +21,7 @@
 use bdk\ErrorHandler\Error;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
+use ReflectionClass;
 
 /**
  * PhpDebugConsole
@@ -31,6 +32,7 @@ class ServiceProvider extends BaseServiceProvider
     protected $modelCounts = array();
     private $isLumen = false;
     private $logViews;
+    private $logDb;
 
     /**
      * Register services.
@@ -103,16 +105,18 @@ public function onOutput()
             'nested' => false,
         );
         $debug = $this->debug->getChannel($channelKey, $channelOptions);
-        $tableInfoRows = array();
-        $modelCounts = $this->buildModelCountTable($tableInfoRows);
+        $modelCounts = $this->buildModelCountTable();
         $debug->table('Model Usage', $modelCounts, $debug->meta(array(
-            'columnLabels' => array(
-                \bdk\Table\Factory::KEY_INDEX => 'model',
-                \bdk\Table\Factory::KEY_SCALAR => 'count',
+            'columnMeta' => array(
+                'model' => array(
+                    'attribs' => array(
+                        'scope' => 'row',
+                    ),
+                    'tagName' => 'th',
+                ),
             ),
-            'detectFiles' => true,
-            'sortable' => true,
-            'totalCols' => [\bdk\Table\Factory::KEY_SCALAR],
+            'inclIndex' => false,
+            'totalCols' => ['count'],
         )));
     }
 
@@ -132,25 +136,22 @@ public function shouldCollect($name, $default = false)
     /**
      * Process the stored model counts for outputting as table
      *
-     * @param array $tableInfoRows gets updated with tableInfo.rows for table
-     *
      * @return array
      */
-    private function buildModelCountTable(&$tableInfoRows)
+    private function buildModelCountTable()
     {
         $modelCounts = array();
-        $tableInfoRows = array();
         foreach ($this->modelCounts as $class => $count) {
-            $ref = new \ReflectionClass($class);
-            $modelCounts[] = $count;
-            $tableInfoRows[] = array(
-                'key' => $this->debug->abstracter->crateWithVals($class, array(
+            $ref = new ReflectionClass($class);
+            $modelCounts[] = array(
+                'model' => $this->debug->abstracter->crateWithVals($class, array(
                     'attribs' => array(
                         'data-file' => $ref->getFileName(),
                     ),
                     'type' => Type::TYPE_IDENTIFIER,
                     'typeMore' => Type::TYPE_IDENTIFIER_CLASSNAME,
                 )),
+                'count' => $count,
             );
         }
         return $modelCounts;

src/Debug/Plugin/Method/Table.php

@@ -36,6 +36,7 @@ class Table implements SubscriberInterface
         'columnLabels' => 'option', // key => label
         'columnMeta' => 'option', // key => meta array
         'columns' => 'option', // list of keys
+        'inclIndex' => 'option',
         'sortable' => 'meta',
         'totalCols' => 'option',
     ];

src/Table/Factory.php

@@ -37,6 +37,7 @@ class Factory
         ), // key => meta array
         'columns' => [], // list of keys
         'getValInfo' => null, // callable to get type info
+        'inclIndex' => true,
         'totalCols' => [],
     );
 
@@ -181,15 +182,12 @@ private static function colKeysMerge(array $curRowKeys, array $colKeys)
      */
     private function columnKeys()
     {
+        $colsIncl = \array_filter([
+            $this->options['inclIndex'] ? self::KEY_INDEX : null,
+            $this->meta['haveObjectRow'] ? self::KEY_CLASS_NAME : null,
+        ]);
         if ($this->options['columns']) {
-            $indexAndClassKeys = \array_filter([
-                self::KEY_INDEX,
-                $this->meta['haveObjectRow'] ? self::KEY_CLASS_NAME : null,
-            ]);
-            return \array_merge(
-                $indexAndClassKeys,
-                $this->options['columns']
-            );
+            return \array_merge($colsIncl, $this->options['columns']);
         }
         $colKeys = array();
         foreach ($this->data as $row) {
@@ -198,10 +196,11 @@ private function columnKeys()
                 $colKeys = self::colKeysMerge($curRowKeys, $colKeys);
             }
         }
-        if (!$this->meta['haveObjectRow']) {
-            $colKeys = \array_diff($colKeys, [self::KEY_CLASS_NAME]);
-        }
-        return $colKeys;
+        $colsRemove = \array_diff([
+            self::KEY_INDEX,
+            self::KEY_CLASS_NAME,
+        ], $colsIncl);
+        return \array_diff($colKeys, $colsRemove);
     }
 
     /**

tests/Table/FactoryTest.php

@@ -750,4 +750,44 @@ public function testColumnConsistencyAcrossRows()
             self::assertCount($cellCount, $row->getCells());
         }
     }
+
+    /**
+     * Test inclIndex = false option excludes index column
+     */
+    public function testInclIndexFalse()
+    {
+        $factory = new Factory();
+        $data = [
+            ['name' => 'John', 'age' => 30],
+            ['name' => 'Jane', 'age' => 25],
+        ];
+
+        $table = $factory->create($data, ['inclIndex' => false]);
+
+        self::assertInstanceOf(self::CLASS_TABLE, $table);
+
+        // Check header cells - should not include index column
+        $header = $table->getHeader();
+        $headerCells = $header->getCells();
+        self::assertCount(2, $headerCells); // Only 'name' and 'age'
+
+        // Check that first cell is not an index column
+        $firstCell = $headerCells[0];
+        self::assertNotEquals('', $firstCell->getValue()); // Index column label is empty string by default
+
+        // Check row cells - should also not include index column
+        $rows = $table->getRows();
+        self::assertCount(2, $rows);
+
+        foreach ($rows as $row) {
+            $cells = $row->getCells();
+            self::assertCount(2, $cells); // Only 'name' and 'age' columns
+        }
+
+        // Verify meta columns don't include KEY_INDEX
+        $meta = $table->getMeta();
+        $columnKeys = \array_column($meta['columns'], 'key');
+        self::assertNotContains(Factory::KEY_INDEX, $columnKeys);
+    }
 }
+