.

Author: edenchazard

resources/js/models/index.d.ts

@@ -0,0 +1,3 @@
+declare namespace App.Interfaces {
+  export type AnimalInterface = "App\\Models\\Cat" | "App\\Models\\Dog";
+}

src/Commands/ExportAllTypesCommand.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace SynergiTech\ExportTypes\Commands;
+
+use Illuminate\Console\Command;
+
+class ExportAllTypesCommand extends Command
+{
+    protected $signature = 'synergi-types:all
+         {--form-input=app/Http/Requests}
+         {--form-output=resources/js/form-requests}
+         {--model-input=app/Models}
+         {--model-output=resources/js/models}
+         {--format}
+         {--prettier=}';
+
+    protected $description = 'Export all types.';
+
+    public function handle()
+    {
+        $this->call(GenerateFormRequestsCommand::class, [
+            '--input' => $this->option('form-input'),
+            '--output' => $this->option('form-output'),
+            '--format' => $this->option('format'),
+            '--prettier' => $this->option('prettier'),
+        ]);
+
+        $this->call(GenerateInterfaceUnionsCommand::class, [
+            '--input' => $this->option('model-input'),
+            '--output' => $this->option('model-output'),
+            '--format' => $this->option('format'),
+            '--prettier' => $this->option('prettier'),
+        ]);
+    }
+}

src/Commands/GenerateFormRequestsCommand.php

@@ -10,13 +10,13 @@
 
 class GenerateFormRequestsCommand extends BaseCommand
 {
-    protected $signature = 'export-form-requests:generate
+    protected $signature = 'synergi-types:requests
         {--input=app/Http/Requests}
         {--output=resources/js/form-requests}
         {--format}
         {--prettier=}';
 
-    protected $description = 'Export models that implement an interface to your frontend.';
+    protected $description = 'Export Form Requests as TypeScript types.';
 
     public function __construct(
         protected Filesystem $files
@@ -184,7 +184,7 @@ protected function parseRules(FormRequest $formRequest) {
     protected function readFormRequests(string $path)
     {
         $classes = collect(iterator_to_array(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path))))
-            ->reject(fn ($i) => $i->isDir() || str_ends_with($i->getRealPath(), '/..'))
+            ->reject(fn ($i) => !$i->isFile() || !str_ends_with($i->getRealPath(), '.php'))
             ->map(fn ($item) => $this->fqcnFromPath($item->getRealPath()))
             ->filter( fn($class) => is_subclass_of($class, FormRequest::class)) 
             ->values();

src/Commands/GenerateInterfaceUnionsCommand.php

@@ -9,13 +9,13 @@
 
 class GenerateInterfaceUnionsCommand extends BaseCommand
 {
-    protected $signature = 'export-interface-unions:generate
+    protected $signature = 'synergi-types:interface-unions
         {--input=app/Models}
         {--output=resources/js/models}
         {--format}
         {--prettier=}';
 
-    protected $description = 'Export models that implement an interface to your frontend.';
+    protected $description = 'Export models that implement an interface as TypeScript union types.';
 
     public function __construct(
         protected Filesystem $files
@@ -29,21 +29,19 @@ protected function process(): void
 
         $interfaces = $this->readInterfaces(
             path: $this->base(),
-            interfaces: config('export-types.interfaces', [])
+            interfaces: config('synergi-types.interfaces', [])
         );
 
-        $tsContent = collect($interfaces)
-            ->map(function ($classes, $interface) {
-                $shortInterface = Str::afterLast($interface, '\\');
-                $classNames = collect($classes)
-                    ->map(fn ($class) => '"'. addslashes($class) . '"')
-                    ->implode(' | ');
-
-                return "export type {$shortInterface} = {$classNames};";
-            })
-            ->implode("\n\n");
-
-        $tsContent .= "\n\nexport {};\n";
+        // All interface unions should be exported under App.Interfaces
+        $tsContent = "declare namespace App.Interfaces {\n";
+        foreach ($interfaces as $interface => $classes) {
+            $shortInterface = Str::afterLast($interface, '\\');
+            $classNames = collect($classes)
+                ->map(fn ($class) => '"' . addslashes($class) . '"')
+                ->implode(' | ');
+            $tsContent .= "  export type {$shortInterface} = {$classNames};\n";
+        }
+        $tsContent .= "}\n";
 
         $this->files->put($this->tsFilePath($path), $tsContent);
     }
@@ -56,11 +54,11 @@ protected function readInterfaces(string $path, array $interfaces)
         $paths = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
 
         $rootNamespace = $this->determineRootNamespace($interfaces);
-
+ 
         return collect($interfaces)
             ->mapWithKeys(fn ($interface) => [
                 $this->chopStart($interface, $rootNamespace) => collect($paths)
-                    ->reject(fn ($i) => $i->isDir() || str_ends_with($i->getRealPath(), '/..'))
+                    ->reject(fn ($i) => !$i->isFile() || !str_ends_with($i->getRealPath(), '.php'))
                     ->map(fn ($item) => $this->fqcnFromPath($item->getRealPath()))
                     ->filter(fn ($i) => is_subclass_of($i, $interface))
                     ->values()

src/ExportTypesServiceProvider.php

@@ -3,6 +3,7 @@
 namespace SynergiTech\ExportTypes;
 
 use Illuminate\Support\ServiceProvider;
+use SynergiTech\ExportTypes\Commands\ExportAllTypesCommand;
 use SynergiTech\ExportTypes\Commands\GenerateFormRequestsCommand;
 use SynergiTech\ExportTypes\Commands\GenerateInterfaceUnionsCommand;
 
@@ -13,6 +14,7 @@ public function boot(): void
         if ($this->app->runningInConsole()) {
             $this->commands(
                 [
+                    ExportAllTypesCommand::class,
                     GenerateInterfaceUnionsCommand::class,
                     GenerateFormRequestsCommand::class,
                 ]

workbench/app/Interfaces/AnimalInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Interfaces;
+
+interface AnimalInterface
+{ 
+}

workbench/app/Models/Cat.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+use App\Interfaces\AnimalInterface;
+
+class Cat implements AnimalInterface
+{ 
+}

workbench/app/Models/Dog.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+use App\Interfaces\AnimalInterface;
+
+class Dog implements AnimalInterface
+{ 
+}

workbench/config/synergi-types.php

@@ -0,0 +1,9 @@
+<?php
+
+use App\Interfaces\AnimalInterface;
+
+return [ 
+    'interfaces' => [
+        AnimalInterface::class,
+    ],
+];