Merge pull request #28 from laravel/original-method-exports

Allow chaining of reserved JavaScript words from controllers

Author: joetannenbaum

src/GenerateCommand.php

@@ -138,8 +138,12 @@ private function writeControllerFile(Collection $routes, string $namespace): voi
         $defaultExport = $invokable->isNotEmpty() ? $invokable->first()->jsMethod() : last(explode('.', $namespace));
 
         if ($invokable->isEmpty()) {
+            $exportedMethods = $methods->map(fn (Route $route) => $route->jsMethod());
+            $reservedMethods = $methods->filter(fn (Route $route) => $route->originalJsMethod() !== $route->jsMethod())->map(fn (Route $route) => $route->originalJsMethod().': '.$route->jsMethod());
+            $exportedMethods = $exportedMethods->merge($reservedMethods);
+
             $methodProps = "const {$defaultExport} = { ";
-            $methodProps .= $methods->map(fn (Route $route) => $route->jsMethod())->unique()->implode(', ');
+            $methodProps .= $exportedMethods->unique()->implode(', ');
             $methodProps .= ' }';
         } else {
             $methodProps = $methods->map(fn (Route $route) => $defaultExport.'.'.$route->jsMethod().' = '.$route->jsMethod())->unique()->implode(PHP_EOL);

tests/DisallowedMethodNames.test.ts

@@ -1,16 +1,14 @@
 import { expect, test } from "vitest";
-import {
+import DisallowedMethodNameController, {
     deleteMethod,
     method404,
 } from "../workbench/resources/js/actions/App/Http/Controllers/DisallowedMethodNameController";
 
 test("will append `method` to invalid methods", () => {
     expect(method404.url()).toBe("/disallowed/404");
     expect(deleteMethod.url()).toBe("/disallowed/delete");
-    // expect(DisallowedMethodNameController.delete.url()).toBe(
-    //     "/disallowed/delete",
-    // );
-    // expect(DisallowedMethodNameController.method404.url()).toBe(
-    //     "/disallowed/404",
-    // );
+    expect(DisallowedMethodNameController.delete.url()).toBe(
+        "/disallowed/delete",
+    );
+    expect(DisallowedMethodNameController[404].url()).toBe("/disallowed/404");
 });