Improve lodash structure and code style

akalongman · akalongman · commit 122de08ec62f · 2025-10-15T17:40:32.000+04:00
diff --git a/composer.lock b/composer.lock
diff --git a/src/Lodash/Http/Requests/RestrictsExtraAttributes.php b/src/Lodash/Http/Requests/RestrictsExtraAttributes.php
@@ -60,7 +60,8 @@ private function checkForNotAllowedProperties(): void
         // Ignore marked properties
         if (! empty($this->ignoreExtraProperties)) {
             foreach ($this->ignoreExtraProperties as $deleleValue) {
-                if (($key = array_search($deleleValue, $validationData)) !== false) {
+                $key = array_search($deleleValue, $validationData);
+                if ($key !== false) {
                     unset($validationData[$key]);
                 }
             }
diff --git a/src/Lodash/Http/Resources/JsonResource.php b/src/Lodash/Http/Resources/JsonResource.php
@@ -36,16 +36,39 @@ abstract class JsonResource extends BaseResource
     public function getTransformed(): array
     {
         if ($this->resource instanceof TransformableContract) {
-            return $this->transformToApi($this->resource);
+            return static::transformToApi($this->resource);
         }
 
         return [];
     }
 
+    public function setWith(array $data): self
+    {
+        $this->with = $data;
+
+        return $this;
+    }
+
+    public function getWith(): array
+    {
+        return $this->with;
+    }
+
+    public function appendWith(array $data): self
+    {
+        $this->with = array_merge_recursive($this->with, $data);
+
+        return $this;
+    }
+
     public function toArray($request): array
     {
         $data = $this->getResourceData();
 
+        if (! empty($this->with)) {
+            $data += Arr::except($this->with, ['id', 'type', 'attributes']);
+        }
+
         $relationsData = $this->getRelationsData();
 
         if (! empty($relationsData)) {
diff --git a/src/Lodash/ServiceProvider.php b/src/Lodash/ServiceProvider.php
@@ -18,15 +18,11 @@
 use Longman\LaravelLodash\Validation\StrictTypeValidator;
 use Longman\LaravelLodash\Validation\Validator;
 
-use function app;
 use function array_keys;
-use function array_pad;
 use function config;
 use function config_path;
-use function preg_split;
 use function resource_path;
 use function str_replace;
-use function trim;
 
 class ServiceProvider extends LaravelServiceProvider
 {
@@ -75,8 +71,6 @@ function (Translator $translator, array $data, array $rules, array $messages): V
                 },
             );
 
-        $this->registerBladeDirectives();
-
         $this->loadTranslations();
         //$this->loadValidations();
     }
@@ -103,28 +97,6 @@ protected function registerCommands(): void
         $this->commands(array_keys($this->commands));
     }
 
-    protected function registerBladeDirectives(): void
-    {
-        if (! config('lodash.register.blade_directives')) {
-            return;
-        }
-
-        // Display relative time
-        app('blade.compiler')->directive('datetime', static function ($expression) {
-            return "<?php echo '<time datetime=\'' . with($expression)->toIso8601String()
-                . '\' title=\'' . $expression . '\'>'
-                . with($expression)->diffForHumans() . '</time>' ?>";
-        });
-
-        // Pluralization helper
-        app('blade.compiler')->directive('plural', static function ($expression) {
-            $expression = trim($expression, '()');
-            [$count, $str, $spacer] = array_pad(preg_split('/,\s*/', $expression), 3, "' '");
-
-            return "<?php echo $count . $spacer . str_plural($str, $count) ?>";
-        });
-    }
-
     protected function registerRequestMacros(): void
     {
         if (! config('lodash.register.request_macros')) {
diff --git a/src/Lodash/Testing/Attributes.php b/src/Lodash/Testing/Attributes.php
@@ -10,6 +10,7 @@
 
 use function array_key_exists;
 use function array_replace_recursive;
+use function count;
 use function explode;
 use function str_starts_with;
 
diff --git a/src/Lodash/Testing/DataStructuresProvider.php b/src/Lodash/Testing/DataStructuresProvider.php
@@ -10,7 +10,6 @@
 use function array_shift;
 use function call_user_func_array;
 use function explode;
-use function get_called_class;
 use function is_callable;
 use function lcfirst;
 use function property_exists;
@@ -20,20 +19,6 @@
 
 abstract class DataStructuresProvider
 {
-    public static function __callStatic(string $name, array $arguments): mixed
-    {
-        $property = lcfirst(Str::substr($name, 3));
-        if (! property_exists(get_called_class(), $property)) {
-            throw new InvalidArgumentException('Property "' . $property . '" does not exists');
-        }
-        $structure = static::$$property;
-
-        $parameters = [&$structure, $arguments[0] ?? []];
-        call_user_func_array([get_called_class(), 'includeNestedRelations'], $parameters);
-
-        return $structure;
-    }
-
     protected static function includeNestedRelations(array &$item, array $relations): void
     {
         if (empty($relations)) {
@@ -90,4 +75,18 @@ protected static function getItemStructure(string $relationItem): array
 
         return static::$method();
     }
+
+    public static function __callStatic(string $name, array $arguments): mixed
+    {
+        $property = lcfirst(Str::substr($name, 3));
+        if (! property_exists(static::class, $property)) {
+            throw new InvalidArgumentException('Property "' . $property . '" does not exists');
+        }
+        $structure = static::$$property;
+
+        $parameters = [&$structure, $arguments[0] ?? []];
+        call_user_func_array([static::class, 'includeNestedRelations'], $parameters);
+
+        return $structure;
+    }
 }
diff --git a/src/config/config.php b/src/config/config.php
@@ -34,7 +34,6 @@
     ],
 
     'register' => [
-        'blade_directives' => false,
         'request_macros'   => false,
         'translations'     => true,
         'validation_rules' => true,

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ private function checkForNotAllowedProperties(): void`
`60`	`60`	`// Ignore marked properties`
`61`	`61`	`if (! empty($this->ignoreExtraProperties)) {`
`62`	`62`	`foreach ($this->ignoreExtraProperties as $deleleValue) {`
`63`		`- if (($key = array_search($deleleValue, $validationData)) !== false) {`
	`63`	`+ $key = array_search($deleleValue, $validationData);`
	`64`	`+ if ($key !== false) {`
`64`	`65`	`unset($validationData[$key]);`
`65`	`66`	`}`
`66`	`67`	`}`