wip

README.md

@@ -567,7 +567,7 @@ $config->replaceType(DateTimeInterface::class, new TypeScriptString());
 Or use a closure to define the replacement:
 
 ```php
-use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeReference;
 
 $config->replaceType(DateTimeInterface::class, function (TypeReference $reference) {
     return new TypeScriptString();
@@ -582,7 +582,7 @@ types and it is possible to create your own nodes.
 For example, a TypeScript alias is representing a User object looks like this:
 
 ```php
-use Spatie\TypeScriptTransformer\TypeScript;
+use Spatie\TypeScriptTransformer\TypeScriptNodes;
 
 new TypeScriptAlias(
     new TypeScriptIdentifier('User'),
@@ -1012,8 +1012,8 @@ A TypeScript node is a regular PHP class that implements the `TypeScriptNode` in
 
 ```php
 use Spatie\TypeScriptTransformer\Support\WritingContext;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNamedNode;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNamedNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNode;
 
 class PickNode implements TypeScriptNode, TypeScriptNamedNode
 {

composer.json

@@ -20,7 +20,7 @@
         "phpstan/phpdoc-parser": "^1.13",
         "spatie/file-system-watcher": "^1.1",
         "spatie/laravel-package-tools": "^1.14.0",
-        "spatie/php-structure-discoverer": "^2.1",
+        "spatie/php-structure-discoverer": "^2.2",
         "spatie/temporary-directory": "^2.1"
     },
     "require-dev": {

src/Actions/ConnectReferencesAction.php

@@ -6,7 +6,7 @@
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Support\TypeScriptTransformerLog;
 use Spatie\TypeScriptTransformer\Transformed\Transformed;
-use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeReference;
 use Spatie\TypeScriptTransformer\Visitor\Visitor;
 
 class ConnectReferencesAction

src/Actions/DiscoverTypesAction.php

@@ -14,8 +14,6 @@ class DiscoverTypesAction
     public function execute(
         array $directories = [],
     ): array {
-        // Idea / TODO : make it possible for other packages to hook in to find types in other directories, like their vendor dir
-
         return Discover::in(...$directories)
             ->types(
                 DiscoveredStructureType::ClassDefinition,

src/Actions/FindClassNameFqcnAction.php

@@ -4,12 +4,18 @@
 
 use ReflectionClass;
 use Spatie\StructureDiscoverer\Collections\UsageCollection;
+use Spatie\StructureDiscoverer\Support\UseDefinitionsResolver;
 
 class FindClassNameFqcnAction
 {
     /** @var array<string, UsageCollection> */
     protected static array $cache = [];
 
+    public function __construct(
+        protected UseDefinitionsResolver $useDefinitionsResolver = new UseDefinitionsResolver()
+    ) {
+    }
+
     public function execute(ReflectionClass $reflectionClass, string $className): ?string
     {
         $usages = $this->loadUsages($reflectionClass);
@@ -38,7 +44,7 @@ protected function loadUsages(ReflectionClass $reflectionClass): UsageCollection
         $filename = $reflectionClass->getFileName();
 
         if (! array_key_exists($filename, static::$cache)) {
-            static::$cache[$filename] = (new ParseUseDefinitionsAction())->execute($filename);
+            static::$cache[$filename] = $this->useDefinitionsResolver->execute($filename);
         }
 
         return static::$cache[$filename];

src/Actions/ParseUserDefinedTypeAction.php

@@ -8,7 +8,7 @@
 use PHPStan\PhpDocParser\Parser\TypeParser;
 use ReflectionClass;
 use Spatie\TypeScriptTransformer\Support\Concerns\Instanceable;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNode;
 
 class ParseUserDefinedTypeAction
 {

src/Actions/TranspilePhpStanTypeToTypeScriptNodeAction.php

@@ -16,23 +16,23 @@
 use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
 use ReflectionClass;
 use Spatie\TypeScriptTransformer\References\ClassStringReference;
-use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAny;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptArray;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptBoolean;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptFunction;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptGeneric;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIdentifier;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIntersection;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNull;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNumber;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptObject;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptString;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnknown;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptVoid;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptAny;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptArray;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptBoolean;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptFunction;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptGeneric;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptIdentifier;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptIntersection;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNull;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNumber;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptObject;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptProperty;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptString;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptUnion;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptUnknown;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptVoid;
 
 class TranspilePhpStanTypeToTypeScriptNodeAction
 {

src/Actions/TranspileReflectionTypeToTypeScriptNodeAction.php

@@ -8,20 +8,20 @@
 use ReflectionType;
 use ReflectionUnionType;
 use Spatie\TypeScriptTransformer\References\ClassStringReference;
-use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAny;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptArray;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptBoolean;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIntersection;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNull;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNumber;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptObject;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptString;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUndefined;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnknown;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptVoid;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptAny;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptArray;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptBoolean;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptIntersection;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNull;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNumber;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptObject;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptString;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptUndefined;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptUnion;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptUnknown;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptVoid;
 
 class TranspileReflectionTypeToTypeScriptNodeAction
 {

src/Attributes/LiteralTypeScriptType.php

@@ -4,10 +4,10 @@
 
 use Attribute;
 use ReflectionClass;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptObject;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptRaw;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptObject;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptProperty;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptRaw;
 
 #[Attribute]
 class LiteralTypeScriptType implements TypeScriptTypeAttributeContract

src/Attributes/TypeScriptType.php

@@ -6,9 +6,9 @@
 use ReflectionClass;
 use Spatie\TypeScriptTransformer\Actions\TranspilePhpStanTypeToTypeScriptNodeAction;
 use Spatie\TypeScriptTransformer\TypeResolvers\DocTypeResolver;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptObject;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptObject;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptProperty;
 
 #[Attribute]
 class TypeScriptType implements TypeScriptTypeAttributeContract

src/Attributes/TypeScriptTypeAttributeContract.php

@@ -3,7 +3,7 @@
 namespace Spatie\TypeScriptTransformer\Attributes;
 
 use ReflectionClass;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNode;
 
 interface TypeScriptTypeAttributeContract
 {

src/ClassPropertyProcessors/FixArrayLikeStructuresClassPropertyProcessor.php

@@ -6,13 +6,13 @@
 use ReflectionProperty;
 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\TypeScriptNodes\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptArray;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptGeneric;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptIdentifier;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptProperty;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptString;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptUnion;
 use Spatie\TypeScriptTransformer\Visitor\Visitor;
 use Spatie\TypeScriptTransformer\Visitor\VisitorOperation;
 

src/Collections/ImportsCollection.php

@@ -6,7 +6,7 @@
 use Spatie\TypeScriptTransformer\Data\ImportLocation;
 use Spatie\TypeScriptTransformer\References\Reference;
 use Spatie\TypeScriptTransformer\Support\ImportName;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptImport;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptImport;
 use Traversable;
 
 class ImportsCollection implements IteratorAggregate

src/Data/ImportLocation.php

@@ -4,7 +4,7 @@
 
 use Spatie\TypeScriptTransformer\References\Reference;
 use Spatie\TypeScriptTransformer\Support\ImportName;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptImport;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptImport;
 
 class ImportLocation
 {

src/Laravel/ClassPropertyProcessors/DataClassPropertyProcessor.php

@@ -8,10 +8,10 @@
 use Spatie\LaravelData\Support\DataConfig;
 use Spatie\TypeScriptTransformer\References\ClassStringReference;
 use Spatie\TypeScriptTransformer\Transformers\ClassPropertyProcessors\ClassPropertyProcessor;
-use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIdentifier;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptIdentifier;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptProperty;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptUnion;
 
 class DataClassPropertyProcessor implements ClassPropertyProcessor
 {

src/Laravel/LaravelDataTypesProvider.php

@@ -10,10 +10,10 @@
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Transformed\Transformed;
 use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
-use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAlias;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptGeneric;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIdentifier;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptAlias;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptGeneric;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptIdentifier;
 use Spatie\TypeScriptTransformer\TypeScriptTransformerConfig;
 
 class LaravelDataTypesProvider implements TypesProvider

src/Laravel/LaravelNamedRouteTypesProvider.php

@@ -15,22 +15,22 @@
 use Spatie\TypeScriptTransformer\Support\TransformedCollection;
 use Spatie\TypeScriptTransformer\Transformed\Transformed;
 use Spatie\TypeScriptTransformer\TypeProviders\TypesProvider;
-use Spatie\TypeScriptTransformer\TypeScript\TypeReference;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptAlias;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptFunctionDefinition;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptGeneric;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptGenericTypeVariable;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIdentifier;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptIndexedAccess;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNode;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptNumber;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptObject;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptOperator;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptParameter;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptProperty;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptRaw;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptString;
-use Spatie\TypeScriptTransformer\TypeScript\TypeScriptUnion;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeReference;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptAlias;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptFunctionDefinition;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptGeneric;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptGenericTypeVariable;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptIdentifier;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptIndexedAccess;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNode;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptNumber;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptObject;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptOperator;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptParameter;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptProperty;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptRaw;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptString;
+use Spatie\TypeScriptTransformer\TypeScriptNodes\TypeScriptUnion;
 use Spatie\TypeScriptTransformer\TypeScriptTransformerConfig;
 
 class LaravelNamedRouteTypesProvider implements TypesProvider
@@ -41,7 +41,7 @@ class LaravelNamedRouteTypesProvider implements TypesProvider
      */
     public function __construct(
         protected ResolveLaravelRoutControllerCollectionsAction $resolveLaravelRoutControllerCollectionsAction = new ResolveLaravelRoutControllerCollectionsAction(),
-        protected array $location = [],
+        protected array $location = ['App'],
         protected array $filters = [],
     ) {
     }