Collections replacer

Author: rubenvanassche

src/Actions/ConnectReferencesAction.php

@@ -9,14 +9,12 @@
 use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
 use Spatie\TypeScriptTransformer\TypeScriptTransformerConfig;
 use Spatie\TypeScriptTransformer\Visitor\Visitor;
-use Spatie\TypeScriptTransformer\Visitor\VisitTypeScriptTreeAction;
 
 class ConnectReferencesAction
 {
     public function __construct(
         protected TypeScriptTransformerConfig $config,
         public TypeScriptTransformerLog $log,
-        protected VisitTypeScriptTreeAction $visitTypeScriptTreeAction = new VisitTypeScriptTreeAction(),
     ) {
     }
 

src/Laravel/ClassPropertyProcessors/ReplaceLaravelCollectionByArrayClassPropertyProcessor.php

@@ -8,25 +8,23 @@
 use Spatie\TypeScriptTransformer\References\ClassStringReference;
 use Spatie\TypeScriptTransformer\Transformers\ClassPropertyProcessors\ClassPropertyProcessor;
 use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScript\TypeScriptArray;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptGeneric;
+use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIdentifier;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptString;
 use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;
+use Spatie\TypeScriptTransformer\Visitor\Visitor;
+use Spatie\TypeScriptTransformer\Visitor\VisitorOperation;
 use Spatie\TypeScriptTransformer\Visitor\VisitTypeScriptTreeAction;
 
 class ReplaceLaravelCollectionByArrayClassPropertyProcessor implements ClassPropertyProcessor
 {
-    public function __construct(
-        protected VisitTypeScriptTreeAction $visitTypeScriptTreeAction = new VisitTypeScriptTreeAction(),
-    ) {
-    }
+    protected Visitor $visitor;
 
-    public function execute(
-        ReflectionProperty $reflection,
-        ?TypeNode $annotation,
-        TypeScriptProperty $property
-    ): ?TypeScriptProperty {
-        $this->visitTypeScriptTreeAction->execute($property->type, function (TypeScriptGeneric $generic) {
+    public function __construct()
+    {
+        $this->visitor = Visitor::create()->before(function (TypeScriptGeneric $generic) {
             $isCollection = $generic->type instanceof TypeReference
                 && $generic->type->reference instanceof ClassStringReference
                 && is_a($generic->type->reference->classString, Collection::class, true);
@@ -42,12 +40,26 @@ public function execute(
 
             $isRecord = $generic->genericTypes[0] instanceof TypeScriptUnion || $generic->genericTypes[0] instanceof TypeScriptString;
 
-//            $generic->type = new
-
-            if ($isCollection) {
-//                $generic->type = new TypeReference(new TypeScriptArray());
+            if($isRecord){
+                return VisitorOperation::replace(new TypeScriptGeneric(
+                    new TypeScriptIdentifier('Record'),
+                    [
+                        $generic->genericTypes[0],
+                        $generic->genericTypes[1]
+                    ]
+                ));
             }
+
+            return VisitorOperation::replace(new TypeScriptArray([$generic->genericTypes[1]]));
         }, [TypeScriptGeneric::class]);
+    }
+
+    public function execute(
+        ReflectionProperty $reflection,
+        ?TypeNode $annotation,
+        TypeScriptProperty $property
+    ): ?TypeScriptProperty {
+        $property->type = $this->visitor->execute($property->type);
 
         return $property;
     }

src/TypeScript/TypeScriptUnion.php

@@ -9,7 +9,7 @@
 class TypeScriptUnion implements TypeScriptNode, TypeScriptVisitableNode
 {
     /**
-     * @param  array<TypeScriptNode>  $types
+     * @param array<TypeScriptNode> $types
      */
     public function __construct(
         public array $types,

src/Visitor/Visitor.php

@@ -45,8 +45,7 @@ public function after(
     public function execute(
         TypeScriptNode $node,
         array &$metadata = [],
-    ): ?TypeScriptNode
-    {
+    ): ?TypeScriptNode {
         foreach ($this->beforeClosures as $beforeClosure) {
             if ($beforeClosure->shouldRun($node)) {
                 $operation = $beforeClosure->run($node, $metadata);
@@ -65,7 +64,13 @@ public function execute(
             $profile = $node->visitorProfile();
 
             foreach ($profile->singleNodes as $singleNodeName) {
-                $visited = $this->execute($node->$singleNodeName, $metadata);
+                $subNode = $node->$singleNodeName;
+
+                if ($subNode === null) {
+                    continue;
+                }
+
+                $visited = $this->execute($subNode, $metadata);
 
                 try {
                     $node->$singleNodeName = $visited;
@@ -75,8 +80,8 @@ public function execute(
             }
 
             foreach ($profile->iterableNodes as $iterableNodeName) {
-                for ($i = 0; $i < count($node->$iterableNodeName); $i++) {
-                    $node->$iterableNodeName[$i] = $this->execute($node->$iterableNodeName[$i], $metadata);
+                foreach ($node->$iterableNodeName as $key => $subNode) {
+                    $node->$iterableNodeName[$key] = $this->execute($subNode, $metadata);
                 }
 
                 $node->$iterableNodeName = array_values(array_filter($node->$iterableNodeName));