Merge pull request #13 from michaelnabil230/main

Fix: Convert Hyphenated File Names to Camel Case

Author: joetannenbaum

src/GenerateCommand.php

@@ -250,7 +250,9 @@ private function writeBarrelFiles(array|Collection $children, string $parent): v
             return;
         }
 
-        $children->each(function ($grandkids, $child) use ($parent) {
+        $normalizeToCamelCase = fn ($value) => str_contains($value, '-') ? Str::camel($value) : $value;
+
+        $children->each(function ($grandkids, $child) use ($parent, $normalizeToCamelCase) {
             $grandkids = collect($grandkids);
 
             if (array_is_list($grandkids->all())) {
@@ -259,17 +261,15 @@ private function writeBarrelFiles(array|Collection $children, string $parent): v
 
             $directory = join_paths($this->base(), $parent, $child);
 
-            $imports = $grandkids->keys()->map(fn ($grandkid) => "import * as {$grandkid} from './{$grandkid}'")->implode(PHP_EOL);
+            $grandKidKeys = $grandkids->keys()->mapWithKeys(fn ($grandkid) => [$normalizeToCamelCase($grandkid) => $grandkid]);
 
-            $this->appendContent(join_paths($directory, 'index.ts'), $imports);
+            $imports = $grandKidKeys->map(fn ($grandkid, $key) => "import * as {$key} from './{$grandkid}'")->implode(PHP_EOL);
 
-            $keys = $grandkids->keys()->map(fn ($k) => str_repeat(' ', 4).$k)->implode(', '.PHP_EOL);
+            $this->appendContent(join_paths($directory, 'index.ts'), $imports);
 
-            $varExport = $child;
+            $keys = $grandKidKeys->keys()->map(fn ($key) => str_repeat(' ', 4).$key)->implode(', '.PHP_EOL);
 
-            if (str_contains($varExport, '-')) {
-                $varExport = Str::camel($varExport);
-            }
+            $varExport = $normalizeToCamelCase($child);
 
             $this->appendContent(join_paths($directory, 'index.ts'), <<<JAVASCRIPT
 

tests/PathNameNormalization.test.ts

@@ -0,0 +1,10 @@
+import { expect, it } from "vitest";
+import v1 from "../workbench/resources/js/routes/api/v1/index";
+
+it('can normalize to camel case', () => {
+    expect(v1.taskStatus.index(1).url).toBe("/api/v1/tasks/1/task-status");
+    expect(v1.taskStatus.index(1)).toEqual({
+        url: "/api/v1/tasks/1/task-status",
+        method: "get",
+    });
+});

vite.config.js

@@ -1,11 +1,11 @@
 import { defineConfig } from 'vite'
 
 export default defineConfig({
-  test: {
-      include: ['tests/*.test.ts'],
-      environment: 'happy-dom',
-      globalSetup: 'build.ts',
-  },
+    test: {
+        include: ['tests/*.test.ts'],
+        environment: 'happy-dom',
+        globalSetup: 'build.ts',
+    },
     resolve: {
         alias: {
             '@actions/': './workbench/resources/js/actions'

workbench/routes/web.php

@@ -57,3 +57,11 @@
 Route::get('/disallowed/404', [DisallowedMethodNameController::class, '404']);
 
 Route::get('/anonymous-middleware', [AnonymousMiddlewareController::class, 'show']);
+
+Route::prefix('/api/v1')->name('api.v1.')->group(function () {
+    Route::get('/tasks', fn () => 'ok')->name('tasks');
+
+    Route::prefix('/tasks/{task}/task-status')->name('task-status.')->group(function () {
+        Route::get('/', fn () => 'ok')->name('index');
+    });
+});