Proxied a few Collection methods through the packge

Author: ringunger

src/LaravelSelectableServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace RingleSoft\LaravelSelectable;
 
+use Closure;
 use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
 
@@ -18,8 +19,8 @@ public function boot(): void
         $this->mergeConfigFrom(
             __DIR__ . '/../config/laravel_selectable.php', 'laravel_selectable'
         );
-        Collection::macro('toSelectOptions', function ( $text = null, $value = null, $selected = null) {
-            return Selectable::collectionToSelectOptions($this, $text, $value, $selected);
+        Collection::macro('toSelectOptions', function ( string|Closure|null $label = null, string|Closure|null $value = null, mixed $selected = null) {
+            return Selectable::collectionToSelectOptions($this, $label, $value, $selected);
         });
         Collection::macro('toSelectable', function () {
             return Selectable::fromCollection($this);

src/Selectable.php

@@ -109,14 +109,46 @@ private function _shouldDisable(object $item, int|null $index = null): bool
     private function _getDataAttributes(mixed $item, int|null $index = null): array
     {
         $dataAttributes = [];
-        if(count($this->_dataAttributes) > 0){
-            foreach($this->_dataAttributes as $attribute => $value){
+        if (count($this->_dataAttributes) > 0) {
+            foreach ($this->_dataAttributes as $attribute => $value) {
                 $dataAttributes[$attribute] = ($value instanceof Closure) ? $value($item) : ($item->{$value} ?? '');
             }
         }
         return $dataAttributes;
     }
 
+    private function _generateOptions(Collection $collection): string
+    {
+        $html = "";
+        foreach ($collection as $index => $item) {
+            if (($item instanceof Collection)) { // Grouped options
+                $html .= "<optgroup label=\"{$index}\">";
+                $html .= $this->_generateOptions($item);
+                $html .= "</optgroup>";
+            } else {
+                $optionLabel = ($this->_label instanceof Closure) ? call_user_func($this->_label, $item, $index) : $item->{$this->_label} ?? "N/A";
+                $optionValue = ($this->_value instanceof Closure) ? call_user_func($this->_value, $item, $index) : $item->{$this->_value} ?? "";
+                $html .= "<option value=\"{$optionValue}\"";
+                if ($this->_shouldSelect($item, $index)) {
+                    $html .= " selected";
+                }
+                if ($this->_shouldDisable($item, $index)) {
+                    $html .= " disabled";
+                }
+                if (count($this->_dataAttributes) > 0) {
+                    foreach ($this->_getDataAttributes($item, $index) as $key => $value) {
+                        $html .= " data-{$key}=\"{$value}\"";
+                    }
+                }
+                if (count($this->_classes) > 0) {
+                    $html .= " class=\"" . (implode(' ', $this->_classes)) . "\"";
+                }
+                $html .= " >{$optionLabel}</option>";
+            }
+        }
+        return $html;
+    }
+
     /**
      * Generate select options from a Collection instance
      * @param Collection $collection the collection instance to be used
@@ -128,8 +160,8 @@ private function _getDataAttributes(mixed $item, int|null $index = null): array
      */
     public static function collectionToSelectOptions(
         Collection  $collection,
-        string|null $label = null,
-        string|null $value = null,
+        string|Closure|null $label = null,
+        string|Closure|null $value = null,
         mixed       $selected = null,
         mixed       $disabled = null,
     ): string
@@ -153,28 +185,7 @@ public static function fromCollection(Collection $collection): self
      */
     public function toSelectOptions(): string
     {
-        $html = "";
-        foreach ($this->_collection as $index => $item) {
-            $optionLabel = ($this->_label instanceof Closure) ? call_user_func($this->_label, $item, $index) : $item->{$this->_label} ?? "N/A";
-            $optionValue = ($this->_value instanceof Closure) ? call_user_func($this->_value, $item, $index) : $item->{$this->_value} ?? "";
-            $html .= "<option value=\"{$optionValue}\"";
-            if ($this->_shouldSelect($item, $index)) {
-                $html .= " selected";
-            }
-            if ($this->_shouldDisable($item, $index)) {
-                $html .= " disabled";
-            }
-            if(count($this->_dataAttributes) > 0){
-                foreach($this->_getDataAttributes($item, $index) as $key => $value){
-                    $html .= " data-{$key}=\"{$value}\"";
-                }
-            }
-            if(count($this->_classes) > 0){
-                $html .= " class=\"". (implode(' ', $this->_classes)) ."\"";
-            }
-            $html .= " >{$optionLabel}</option>";
-        }
-        return $html;
+        return $this->_generateOptions($this->_collection);
     }
 
     /**
@@ -195,7 +206,6 @@ public function toSelectItems(): Collection
         });
     }
 
-
     /**
      * Specify the label for the selectable items
      * @param string|Closure $label name of the field to be used as label
@@ -254,7 +264,7 @@ public function withDataAttribute(string $attribute, string|Closure $value): sel
 
     public function withClass(string $class): self
     {
-        $this->_classes = array_unique([ ...$this->_classes, ...explode(' ', $class)]);
+        $this->_classes = array_unique([...$this->_classes, ...explode(' ', $class)]);
         return $this;
     }
 
@@ -267,4 +277,21 @@ public function toCollection(): Collection
         return $this->_collection;
     }
 
+    public function __call(string $name, array $arguments)
+    {
+        $allowedMethods = [
+            'groupBy', 'add', 'zip', 'unique', 'range',
+            'diff', 'diffUsing', 'diffAssoc', 'diffAssocUsing',
+            'diffKeys', 'diffKeysUsing', 'forget'
+        ];
+
+        if (in_array($name, $allowedMethods) && method_exists($this->_collection, $name)) {
+            $res = $this->_collection->{$name}(...$arguments);
+            if ($res instanceof Collection) {
+                $this->_collection = $res;
+            }
+        }
+        return $this;
+    }
+
 }