Remove DataCollection

src/Data/BreadcrumbData.php

@@ -8,8 +8,8 @@
 final class BreadcrumbData extends Data
 {
     public function __construct(
-        /** @var DataCollection<BreadcrumbItemData> */
-        public DataCollection $items,
+        /** @var BreadcrumbItemData[] */
+        public array $items,
     ) {}
 
     public static function from(array $breadcrumb): self

src/Data/Commands/CommandFormData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Commands;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Form\Fields\FormFieldData;
 use Code16\Sharp\Data\Form\FormLayoutData;
 use Code16\Sharp\Data\PageAlertData;
@@ -18,8 +17,8 @@ public function __construct(
         #[LiteralTypeScriptType('{ [key:string]: FormFieldData["value"] }')]
         public ?array $data,
         public CommandFormConfigData $config,
-        /** @var DataCollection<string,FormFieldData> */
-        public ?DataCollection $fields = null,
+        /** @var array<string,FormFieldData> */
+        public ?array $fields = null,
         public ?FormLayoutData $layout = null,
         /** @var array<string> */
         public ?array $locales = null,

src/Data/Dashboard/DashboardData.php

@@ -4,7 +4,6 @@
 
 use Code16\Sharp\Data\Dashboard\Widgets\WidgetData;
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Filters\FilterValuesData;
 use Code16\Sharp\Data\PageAlertData;
 
@@ -14,8 +13,8 @@
 final class DashboardData extends Data
 {
     public function __construct(
-        /** @var DataCollection<WidgetData> */
-        public DataCollection $widgets,
+        /** @var WidgetData[] */
+        public array $widgets,
         public DashboardConfigData $config,
         public DashboardLayoutData $layout,
         /** @var array<string,mixed> */

src/Data/Dashboard/DashboardLayoutData.php

@@ -3,16 +3,15 @@
 namespace Code16\Sharp\Data\Dashboard;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 
 /**
  * @internal
  */
 final class DashboardLayoutData extends Data
 {
     public function __construct(
-        /** @var DataCollection<DashboardLayoutSectionData> */
-        public DataCollection $sections,
+        /** @var DashboardLayoutSectionData[] */
+        public array $sections,
     ) {}
 
     public static function from(array $layout): self

src/Data/Dashboard/DashboardLayoutSectionData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Dashboard;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 
 /**
  * @internal
@@ -13,7 +12,7 @@ final class DashboardLayoutSectionData extends Data
     public function __construct(
         public ?string $key,
         public string $title,
-        /** @var array<DataCollection<DashboardLayoutWidgetData>> */
+        /** @var array<DashboardLayoutWidgetData[]> */
         public array $rows,
     ) {}
 

src/Data/Data.php

@@ -6,16 +6,19 @@
 use ReflectionClass;
 use ReflectionParameter;
 
+/**
+ * @internal
+ */
 abstract class Data implements Arrayable
 {
     /** @var ReflectionParameter[][] */
     protected static array $constructorParameterCache = [];
 
     protected array $additionalAttributes = [];
 
-    public static function collection($payload): DataCollection
+    public static function collection($payload): array
     {
-        return DataCollection::make($payload)
+        return collect($payload)
             ->map(function ($item) {
                 if (is_array($item)) {
                     if (method_exists(static::class, 'from')) {
@@ -26,7 +29,8 @@ public static function collection($payload): DataCollection
                 }
 
                 return $item;
-            });
+            })
+            ->all();
     }
 
     public static function optional(mixed $payload): ?static
@@ -86,6 +90,10 @@ protected function transformValues(array $values): array
                     return $value->value;
                 }
 
+                if (is_array($value)) {
+                    return collect($value)->toArray();
+                }
+
                 return $value;
             })
             ->toArray();

src/Data/Embeds/EmbedData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Embeds;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Form\Fields\FormFieldData;
 use Code16\Sharp\Data\IconData;
 use Spatie\TypeScriptTransformer\Attributes\LiteralTypeScriptType;
@@ -25,8 +24,8 @@ public function __construct(
         public ?IconData $icon,
         /** @var string[] */
         public array $attributes,
-        /** @var DataCollection<string,FormFieldData> */
-        public DataCollection $fields,
+        /** @var array<string,FormFieldData> */
+        public array $fields,
     ) {}
 
     public static function from(array $embed): self

src/Data/Embeds/EmbedFormData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Embeds;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Form\Fields\FormFieldData;
 use Code16\Sharp\Data\Form\FormLayoutData;
 use Spatie\TypeScriptTransformer\Attributes\LiteralTypeScriptType;
@@ -16,8 +15,8 @@ final class EmbedFormData extends Data
     public function __construct(
         #[LiteralTypeScriptType('{ [key:string]: FormFieldData["value"] }')]
         public ?array $data,
-        /** @var DataCollection<string,FormFieldData> */
-        public DataCollection $fields,
+        /** @var array<string,FormFieldData> */
+        public array $fields,
         public ?FormLayoutData $layout,
     ) {}
 

src/Data/EntityList/EntityListData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\EntityList;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\EntityListAuthorizationsData;
 use Code16\Sharp\Data\Filters\FilterValuesData;
 use Code16\Sharp\Data\PageAlertData;
@@ -18,14 +17,14 @@ final class EntityListData extends Data
     public function __construct(
         public EntityListAuthorizationsData $authorizations,
         public EntityListConfigData $config,
-        /** @var DataCollection<EntityListFieldData> */
-        public DataCollection $fields,
+        /** @var EntityListFieldData[] */
+        public array $fields,
         #[LiteralTypeScriptType('Array<{ [key: string]: any }>')]
         public array $data,
         public FilterValuesData $filterValues,
         public ?EntityListQueryParamsData $query,
-        /** @var DataCollection<string, EntityListMultiformData> */
-        public ?DataCollection $forms = null,
+        /** @var array<string, EntityListMultiformData>|null */
+        public ?array $forms = null,
         public ?PaginatorMetaData $meta = null,
         public ?PageAlertData $pageAlert = null,
     ) {}

src/Data/EntityStateData.php

@@ -9,8 +9,8 @@ final class EntityStateData extends Data
 {
     public function __construct(
         public string $attribute,
-        /** @var DataCollection<EntityStateValueData> */
-        public DataCollection $values,
+        /** @var EntityStateValueData[] */
+        public array $values,
         /** @var bool|array<string|int> */
         public mixed $authorization,
     ) {}

src/Data/Form/Fields/FormAutocompleteLocalFieldData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Form\Fields;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Form\Fields\Common\FormConditionalDisplayData;
 use Code16\Sharp\Data\Form\Fields\Common\FormDynamicAttributeData;
 use Code16\Sharp\Enums\FormFieldType;
@@ -36,8 +35,8 @@ public function __construct(
         /** @var array<string> */
         public ?array $searchKeys = null,
         public ?bool $localized = null,
-        /** @var DataCollection<FormDynamicAttributeData> */
-        public ?DataCollection $dynamicAttributes = null,
+        /** @var FormDynamicAttributeData[]|null */
+        public ?array $dynamicAttributes = null,
         public ?string $label = null,
         public ?bool $readOnly = null,
         public ?FormConditionalDisplayData $conditionalDisplay = null,

src/Data/Form/Fields/FormAutocompleteRemoteFieldData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Form\Fields;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Form\Fields\Common\FormConditionalDisplayData;
 use Code16\Sharp\Data\Form\Fields\Common\FormDynamicAttributeData;
 use Code16\Sharp\Enums\FormFieldType;
@@ -32,8 +31,8 @@ public function __construct(
         /** @var string[]|null */
         public ?array $callbackLinkedFields = null,
         public ?string $placeholder = null,
-        /** @var DataCollection<FormDynamicAttributeData> */
-        public ?DataCollection $dynamicAttributes = null,
+        /** @var FormDynamicAttributeData[]|null */
+        public ?array $dynamicAttributes = null,
         public ?string $label = null,
         public ?bool $readOnly = null,
         public ?FormConditionalDisplayData $conditionalDisplay = null,

src/Data/Form/Fields/FormSelectFieldData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Form\Fields;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Form\Fields\Common\FormConditionalDisplayData;
 use Code16\Sharp\Data\Form\Fields\Common\FormDynamicAttributeData;
 use Code16\Sharp\Enums\FormFieldType;
@@ -31,8 +30,8 @@ public function __construct(
         #[LiteralTypeScriptType('"list" | "dropdown"')]
         public string $display,
         public bool $inline,
-        /** @var DataCollection<FormDynamicAttributeData> */
-        public ?DataCollection $dynamicAttributes = null,
+        /** @var FormDynamicAttributeData[]|null */
+        public ?array $dynamicAttributes = null,
         public ?int $maxSelected = null,
         public ?bool $localized = null,
         public ?string $label = null,

src/Data/Form/FormData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Form;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Form\Fields\FormFieldData;
 use Code16\Sharp\Data\InstanceAuthorizationsData;
 use Code16\Sharp\Data\PageAlertData;
@@ -19,8 +18,8 @@ public function __construct(
         public FormConfigData $config,
         #[LiteralTypeScriptType('{ [key:string]: FormFieldData["value"] }')]
         public ?array $data,
-        /** @var DataCollection<string,FormFieldData> */
-        public DataCollection $fields,
+        /** @var array<string,FormFieldData> */
+        public array $fields,
         public FormLayoutData $layout,
         /** @var array<string> */
         public array $locales,

src/Data/Form/FormLayoutData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Form;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 
 /**
  * @internal
@@ -12,8 +11,8 @@ final class FormLayoutData extends Data
 {
     public function __construct(
         public bool $tabbed,
-        /** @var DataCollection<FormLayoutTabData> */
-        public DataCollection $tabs,
+        /** @var FormLayoutTabData[] */
+        public array $tabs,
     ) {}
 
     public static function from(array $config): self

src/Data/Form/FormLayoutTabData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Form;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 
 /**
  * @internal
@@ -12,8 +11,8 @@ final class FormLayoutTabData extends Data
 {
     public function __construct(
         public string $title,
-        /** @var DataCollection<FormLayoutColumnData> */
-        public DataCollection $columns,
+        /** @var FormLayoutColumnData[] */
+        public array $columns,
     ) {}
 
     public static function from(array $tab): self

src/Data/MenuData.php

@@ -11,8 +11,8 @@
 final class MenuData extends Data
 {
     public function __construct(
-        /** @var DataCollection<MenuItemData> */
-        public DataCollection $items,
+        /** @var MenuItemData[] */
+        public array $items,
         public UserMenuData $userMenu,
         public bool $isVisible,
     ) {}

src/Data/MenuItemData.php

@@ -19,8 +19,8 @@ public function __construct(
         public ?string $entityKey = null,
         public bool $isSeparator = false,
         public bool $current = false,
-        /** @var DataCollection<MenuItemData> */
-        public ?DataCollection $children = null,
+        /** @var MenuItemData[]|null */
+        public ?array $children = null,
         public bool $isCollapsible = false,
     ) {}
 

src/Data/SearchResultSetData.php

@@ -10,7 +10,7 @@ final class SearchResultSetData extends Data
     public function __construct(
         public string $label,
         /** @var SearchResultLinkData[] */
-        public DataCollection $resultLinks,
+        public array $resultLinks,
         public ?IconData $icon,
         public ?string $emptyStateLabel = null,
         /** @var string[] */

src/Data/Show/Fields/ShowListFieldData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Show\Fields;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Enums\ShowFieldType;
 use Spatie\TypeScriptTransformer\Attributes\LiteralTypeScriptType;
 use Spatie\TypeScriptTransformer\Attributes\Optional;
@@ -23,8 +22,8 @@ public function __construct(
         public ShowFieldType $type,
         public bool $emptyVisible,
         public ?string $label,
-        /** @var DataCollection<string,ShowFieldData> */
-        public DataCollection $itemFields,
+        /** @var array<string,ShowFieldData> */
+        public array $itemFields,
     ) {}
 
     public static function from(array $list): self

src/Data/Show/Fields/ShowTextFieldData.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Data\Show\Fields;
 
 use Code16\Sharp\Data\Data;
-use Code16\Sharp\Data\DataCollection;
 use Code16\Sharp\Data\Embeds\EmbedData;
 use Code16\Sharp\Data\Form\Fields\FormEditorFieldData;
 use Code16\Sharp\Enums\ShowFieldType;
@@ -27,8 +26,8 @@ public function __construct(
         public bool $html,
         public ?bool $localized = null,
         public ?int $collapseToWordCount = null,
-        /** @var DataCollection<string, EmbedData> */
-        public ?DataCollection $embeds = null,
+        /** @var array<string, EmbedData> */
+        public ?array $embeds = null,
         public ?string $label = null,
     ) {}