From 44bbb71f5b16f995bfbe92ff0c3998c1d685e51f Mon Sep 17 00:00:00 2001 From: Mohammed Essam Helewa Date: Wed, 19 Mar 2025 11:09:17 +0200 Subject: [PATCH 1/4] Add -types to the name of generated types file --- src/CommandRouteGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CommandRouteGenerator.php b/src/CommandRouteGenerator.php index cfa359ad..64330a88 100644 --- a/src/CommandRouteGenerator.php +++ b/src/CommandRouteGenerator.php @@ -42,7 +42,7 @@ public function handle(Filesystem $filesystem) if ($this->option('types') || $this->option('types-only')) { $types = config('ziggy.output.types', Types::class); - $filesystem->put(base_path("{$name}.d.ts"), new $types($ziggy)); + $filesystem->put(base_path("{$name}-types.d.ts"), new $types($ziggy)); } $this->info('Files generated!'); From 61749d3cdac48ad13b71c75084e8a61deb96a964 Mon Sep 17 00:00:00 2001 From: Mohammed Essam Helewa Date: Wed, 19 Mar 2025 11:13:34 +0200 Subject: [PATCH 2/4] Rename ziggy.d.ts to ziggy-types.d.ts in unit tests --- tests/Unit/CommandRouteGeneratorTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Unit/CommandRouteGeneratorTest.php b/tests/Unit/CommandRouteGeneratorTest.php index 12956a9d..2d466624 100644 --- a/tests/Unit/CommandRouteGeneratorTest.php +++ b/tests/Unit/CommandRouteGeneratorTest.php @@ -119,18 +119,18 @@ if (windows_os()) { // `json_encode` always uses Unix line endings file_put_contents( - base_path('resources/js/ziggy.d.ts'), - preg_replace('/\r?\n/', "\r\n", file_get_contents(base_path('resources/js/ziggy.d.ts'))), + base_path('resources/js/ziggy-types.d.ts'), + preg_replace('/\r?\n/', "\r\n", file_get_contents(base_path('resources/js/ziggy-types.d.ts'))), ); } - expect(base_path('resources/js/ziggy.d.ts'))->toEqualFile('./tests/fixtures/ziggy.d.ts'); + expect(base_path('resources/js/ziggy-types.d.ts'))->toEqualFile('./tests/fixtures/ziggy-types.d.ts'); }); test('generate dts file without generating routes file', function () { artisan('ziggy:generate --types-only'); - expect(base_path('resources/js/ziggy.d.ts'))->toBeFile(); + expect(base_path('resources/js/ziggy-types.d.ts'))->toBeFile(); expect(base_path('resources/js/ziggy.js'))->not->toBeFile(); }); @@ -140,7 +140,7 @@ artisan('ziggy:generate --types-only'); expect(base_path('resources/js/custom.d.ts'))->toBeFile(); - expect(base_path('resources/js/ziggy.d.ts'))->not->toBeFile(); + expect(base_path('resources/js/ziggy-types.d.ts'))->not->toBeFile(); }); test('generate correct routes and dts files based on provided arguments', function (string $args, array $files) { @@ -157,7 +157,7 @@ ['resources/js/y.ts --types', ['resources/js/y.js', 'resources/js/y.d.ts']], ['resources/js/z.d.ts --types', ['resources/js/z.js', 'resources/js/z.d.ts']], ['resources/scripts/foo --types', ['resources/scripts/foo.js', 'resources/scripts/foo.d.ts']], - ['resources/js --types', ['resources/js/ziggy.js', 'resources/js/ziggy.d.ts']], + ['resources/js --types', ['resources/js/ziggy.js', 'resources/js/ziggy-types.d.ts']], ]); class CustomFile extends File From 8a2bce7e4470b2b506ba8f822f09d03724059942 Mon Sep 17 00:00:00 2001 From: Mohammed Essam Helewa Date: Wed, 19 Mar 2025 11:19:58 +0200 Subject: [PATCH 3/4] Change paths of generated files inside unit test CommandRouteGeneratorTest by adding -type --- tests/Unit/CommandRouteGeneratorTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Unit/CommandRouteGeneratorTest.php b/tests/Unit/CommandRouteGeneratorTest.php index 2d466624..fbec0a8a 100644 --- a/tests/Unit/CommandRouteGeneratorTest.php +++ b/tests/Unit/CommandRouteGeneratorTest.php @@ -139,7 +139,7 @@ artisan('ziggy:generate --types-only'); - expect(base_path('resources/js/custom.d.ts'))->toBeFile(); + expect(base_path('resources/js/custom-types.d.ts'))->toBeFile(); expect(base_path('resources/js/ziggy-types.d.ts'))->not->toBeFile(); }); @@ -153,10 +153,10 @@ expect(array_map(base_path(...), $files))->each->toBeFile(); })->with([ - ['resources/js/x.js --types', ['resources/js/x.js', 'resources/js/x.d.ts']], - ['resources/js/y.ts --types', ['resources/js/y.js', 'resources/js/y.d.ts']], - ['resources/js/z.d.ts --types', ['resources/js/z.js', 'resources/js/z.d.ts']], - ['resources/scripts/foo --types', ['resources/scripts/foo.js', 'resources/scripts/foo.d.ts']], + ['resources/js/x.js --types', ['resources/js/x.js', 'resources/js/x-types.d.ts']], + ['resources/js/y.ts --types', ['resources/js/y.js', 'resources/js/y-types.d.ts']], + ['resources/js/z.d.ts --types', ['resources/js/z.js', 'resources/js/z-types.d.ts']], + ['resources/scripts/foo --types', ['resources/scripts/foo.js', 'resources/scripts/foo-types.d.ts']], ['resources/js --types', ['resources/js/ziggy.js', 'resources/js/ziggy-types.d.ts']], ]); From 8e99cd2fe3bad834adb72dd83affe0de8216fe5f Mon Sep 17 00:00:00 2001 From: Mohammed Essam Helewa Date: Wed, 19 Mar 2025 11:29:14 +0200 Subject: [PATCH 4/4] Fix error of renaming fixture file ziggy.d.ts --- tests/Unit/CommandRouteGeneratorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/CommandRouteGeneratorTest.php b/tests/Unit/CommandRouteGeneratorTest.php index fbec0a8a..15e365be 100644 --- a/tests/Unit/CommandRouteGeneratorTest.php +++ b/tests/Unit/CommandRouteGeneratorTest.php @@ -124,7 +124,7 @@ ); } - expect(base_path('resources/js/ziggy-types.d.ts'))->toEqualFile('./tests/fixtures/ziggy-types.d.ts'); + expect(base_path('resources/js/ziggy-types.d.ts'))->toEqualFile('./tests/fixtures/ziggy.d.ts'); }); test('generate dts file without generating routes file', function () {