Merge pull request #63 from maicol07/patch-1

feat: Add multiple imports handling

Author: joetannenbaum

.eslintrc.json

@@ -0,0 +1,16 @@
+{
+    "env": {
+        "es2022": true,
+        "node": true
+    },
+    "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": ["@typescript-eslint", "import"],
+    "rules": {
+        "import/no-duplicates": "error"
+    }
+}

package.json

@@ -1,11 +1,17 @@
 {
     "type": "module",
     "scripts": {
-        "test": "vitest run && npm run test-routes-cached",
-        "test-routes-cached": "WAYFINDER_CACHE_ROUTES=1 vitest run"
+        "test": "vitest run && npm run lint && npm run test-routes-cached && npm run lint",
+        "test-routes-cached": "WAYFINDER_CACHE_ROUTES=1 vitest run",
+        "lint": "eslint ./workbench/resources/js --ext .ts,.tsx",
+        "lint:fix": "eslint ./workbench/resources/js --ext .ts,.tsx --fix"
     },
     "devDependencies": {
         "@types/node": "^22.7.5",
+        "@typescript-eslint/eslint-plugin": "^7.0.0",
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0",
+        "eslint-plugin-import": "^2.29.1",
         "happy-dom": "^15.11.7",
         "vitest": "^2.1.3"
     }

src/GenerateCommand.php

@@ -29,6 +29,14 @@ class GenerateCommand extends Command
 
     private $content = [];
 
+    /**
+     * Imports array where the key is the generated file path and the value is an array of imports.
+     * Each import is an array where the first element is the import path and the second element is an array of imported items.
+     *
+     * @var array<string, array<string, string[]>>
+     */
+    private $imports = [];
+
     public function __construct(
         private Filesystem $files,
         private Router $router,
@@ -115,6 +123,12 @@ private function writeContent(): void
         foreach ($this->content as $path => $content) {
             $this->files->ensureDirectoryExists(dirname($path));
             $this->files->put($path, TypeScript::cleanUp(implode(PHP_EOL, $content)));
+
+            // Prepend the imports to the file
+            if (isset($this->imports[$path])) {
+                $importLines = collect($this->imports[$path])->map(fn ($imports, $key) => 'import { '.implode(', ', array_unique($imports))." } from '{$key}'")->implode(PHP_EOL);
+                $this->files->prepend($path, $importLines.PHP_EOL);
+            }
         }
 
         $this->content = [];
@@ -215,8 +229,13 @@ private function appendCommonImports(Collection $routes, string $path, string $n
         }
 
         $importBase = str_repeat('/..', substr_count($namespace, '.') + 1);
+        $pathKey = ".{$importBase}/wayfinder";
 
-        $this->appendContent($path, 'import { '.implode(', ', $imports)." } from '.{$importBase}/wayfinder'".PHP_EOL);
+        $this->imports[$path] ??= [];
+        $this->imports[$path][$pathKey] = [
+            ...($this->imports[$path][$pathKey] ?? []),
+            ...$imports,
+        ];
     }
 
     private function writeNamedMethodExport(Route $route, string $path): void

workbench/routes/web.php

@@ -41,7 +41,7 @@
     return 'Home';
 })->name('home');
 
-Route::post('/optional/{parameter?}', [OptionalController::class, 'optional']);
+Route::post('/optional/{parameter?}', [OptionalController::class, 'optional'])->name('optional');
 Route::post('/many-optional/{one?}/{two?}/{three?}', [OptionalController::class, 'manyOptional']);
 
 Route::post('/users/{user}', [ModelBindingController::class, 'show']);