Add some stuff

Author: rubenvanassche

src/Actions/ConnectReferencesAction.php

@@ -14,7 +14,6 @@ class ConnectReferencesAction
 {
     public function __construct(
         protected TypeScriptTransformerConfig $config,
-        public TypeScriptTransformerLog $log,
     ) {
     }
 
@@ -28,32 +27,31 @@ public function execute(TransformedCollection $collection): ReferenceMap
             }
         }
 
-        $visitor = Visitor::create()->before(function (TypeReference $typeReference, array $metadata) use ($referenceMap, &$references) {
+        $visitor = Visitor::create()->before(function (TypeReference $typeReference, array &$metadata) use ($referenceMap) {
             $reference = $typeReference->reference;
 
             if (! $referenceMap->has($reference)) {
                 /** @var Transformed $transformed */
                 $transformed = $metadata['transformed'];
 
-                $this->log->warning("Tried replacing reference to `{$reference->humanFriendlyName()}` in `{$transformed->reference->humanFriendlyName()}` but it was not found in the transformed types");
+                TypeScriptTransformerLog::resolve()->warning("Tried replacing reference to `{$reference->humanFriendlyName()}` in `{$transformed->reference->humanFriendlyName()}` but it was not found in the transformed types");
 
                 return;
             }
 
-            $references[] = $reference;
+            $metadata['references'][] = $reference;
             $typeReference->connect($referenceMap->get($reference));
         }, [TypeReference::class]);
 
         foreach ($collection as $transformed) {
-            $references = [];
-
             $metadata = [
                 'transformed' => $transformed,
+                'references' => [],
             ];
 
             $visitor->execute($transformed->typeScriptNode, $metadata);
 
-            $transformed->references = $references;
+            $transformed->references = $metadata['references'];
         }
 
         return $referenceMap;

src/Actions/FormatFilesAction.php

@@ -10,21 +10,20 @@ class FormatFilesAction
 {
     public function __construct(
         public TypeScriptTransformerConfig $config,
-        public TypeScriptTransformerLog $log,
     ) {
     }
 
     /**
-     * @param  array<WrittenFile>  $writtenFiles
+     * @param array<WrittenFile> $writtenFiles
      */
     public function execute(array $writtenFiles): void
     {
         if ($this->config->formatter === null) {
             return;
         }
 
-        foreach ($writtenFiles as $writtenFile) {
-            $this->config->formatter->format($writtenFile->path);
-        }
+        $this->config->formatter->format(
+            array_map(fn (WrittenFile $writtenFile) => $writtenFile->path, $writtenFiles)
+        );
     }
 }

src/Actions/ProvideTypesAction.php

@@ -11,7 +11,6 @@ class ProvideTypesAction
 {
     public function __construct(
         protected TypeScriptTransformerConfig $config,
-        public TypeScriptTransformerLog $log,
     ) {
     }
 
@@ -24,7 +23,6 @@ public function execute(TransformedCollection $collection): void
 
             $defaultTypeProvider->provide(
                 $this->config,
-                $this->log,
                 $collection
             );
         }

src/Actions/SplitTransformedPerLocationAction.php

@@ -30,7 +30,7 @@ public function execute(TransformedCollection $collection): array
         ksort($split);
 
         foreach ($split as $splitConstruct) {
-            usort($splitConstruct->transformed, fn (Transformed $a, Transformed $b) => $a->name <=> $b->name);
+            usort($splitConstruct->transformed, fn (Transformed $a, Transformed $b) => $a->getName() <=> $b->getName());
         }
 
         return array_values($split);

src/Actions/WriteTypesAction.php

@@ -12,7 +12,6 @@ class WriteTypesAction
 {
     public function __construct(
         public TypeScriptTransformerConfig $config,
-        public TypeScriptTransformerLog $log,
     ) {
     }
 

src/Formatters/EslintFormatter.php

@@ -7,9 +7,9 @@
 
 class EslintFormatter implements Formatter
 {
-    public function format(string $file): void
+    public function format(array $files): void
     {
-        $process = new Process(['npx', '--yes', 'eslint', '--fix', '--no-ignore', $file]);
+        $process = new Process(['npx', '--yes', 'eslint', '--fix', '--no-ignore', ...$files]);
         $process->run();
 
         if (! $process->isSuccessful()) {

src/Formatters/Formatter.php

@@ -4,5 +4,5 @@
 
 interface Formatter
 {
-    public function format(string $file): void;
+    public function format(array $files): void;
 }

src/Formatters/PrettierFormatter.php

@@ -7,9 +7,9 @@
 
 class PrettierFormatter implements Formatter
 {
-    public function format(string $file): void
+    public function format(array $files): void
     {
-        $process = new Process(['npx', '--yes', 'prettier', '--write', $file]);
+        $process = new Process(['npx', '--yes', 'prettier', '--write', ...$files]);
         $process->run();
 
         if (! $process->isSuccessful()) {

src/Laravel/Commands/TransformTypeScriptCommand.php

@@ -3,6 +3,7 @@
 namespace Spatie\TypeScriptTransformer\Laravel\Commands;
 
 use Illuminate\Console\Command;
+use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
 use Spatie\TypeScriptTransformer\TypeScriptTransformer;
 
 class TransformTypeScriptCommand extends Command
@@ -14,7 +15,9 @@ class TransformTypeScriptCommand extends Command
     public function handle(
         TypeScriptTransformer $typeScriptTransformer
     ): int {
-        $log = $typeScriptTransformer->execute();
+        $typeScriptTransformer->execute();
+
+        $log = TypeScriptTransformerLog::resolve();
 
         if (! empty($log->infoMessages)) {
             foreach ($log->infoMessages as $infoMessage) {

src/Laravel/LaravelNamedRouteTypesProvider.php

@@ -47,7 +47,7 @@ public function __construct(
     ) {
     }
 
-    public function provide(TypeScriptTransformerConfig $config, TypeScriptTransformerLog $log, TransformedCollection $types): void
+    public function provide(TypeScriptTransformerConfig $config, TransformedCollection $types): void
     {
         $routeCollection = $this->resolveLaravelRoutControllerCollectionsAction->execute(
             defaultNamespace: null,
@@ -61,8 +61,7 @@ public function provide(TypeScriptTransformerConfig $config, TypeScriptTransform
                 $this->parseRouteCollection($routeCollection),
             ),
             $routesListReference = new CustomReference('laravel_named_routes', 'routes_list'),
-            'NamedRouteList',
-            $this->location,
+            $this->location, true,
         );
 
         $jsonEncodedRoutes = $this->routeCollectionToJson($routeCollection);
@@ -109,8 +108,7 @@ public function provide(TypeScriptTransformerConfig $config, TypeScriptTransform
                 )
             ),
             new CustomReference('laravel_named_routes', 'route_function'),
-            'route',
-            $this->location,
+            $this->location, true,
         );
 
         $types->add($transformedRoutes, $transformedRoute);