auto-fill columns from db

Admin · Admin · commit 8da4a365d299 · 2025-04-01T20:33:29.000+03:00
fix singular and plural for multiword resources
diff --git a/README.md b/README.md
@@ -20,9 +20,12 @@ Library for [laravel-crud-wizard-free](https://github.com/macropay-solutions/lar
 
 ## Usage
 
-``` php artisan make:api-resource {resourceName} {--decorated}```
+``` php artisan make:api-resource {resourceName} {--decorated} {--table=} {connectionName?}```
 
-This will create a template for **controller**, **service** and **model** (optionally, with the --decorated flag it will create also a **decorator** and **middleware**) and will print instructions on what is left to be done manually.
+This will create a template for **controller**, **service** and **model (with prepopulated fillable from DB)** (optionally, with the --decorated flag it will create also a **decorator** and **middleware**) and will print instructions on what is left to be done manually.
+If connection is not the default one, it can be specified in the command argument.
+If table is not the plural snake cased resourceName, then it can be specified in the table argument.
+Run just **php artisan make:api-resource** for interactive mode that will try to guess the tableName and use default connectionName (except --decorated).
 
 Example:
 ```
diff --git a/src/Console/MakeLaravelCrudWizard.php b/src/Console/MakeLaravelCrudWizard.php
@@ -8,6 +8,8 @@
 use MacropaySolutions\LaravelCrudWizardGenerator\Services\MakeMiddlewareService;
 use MacropaySolutions\LaravelCrudWizardGenerator\Services\MakeModelService;
 use MacropaySolutions\LaravelCrudWizardGenerator\Services\MakeServiceService;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class MakeLaravelCrudWizard extends Command
 {
@@ -16,7 +18,7 @@ class MakeLaravelCrudWizard extends Command
      *
      * @var string
      */
-    protected $signature = 'make:api-resource {resourceName} {--decorated}';
+    protected $signature = 'make:api-resource {resourceName} {--decorated} {--table=} {connectionName?}';
 
     /**
      * The console command description.
@@ -25,6 +27,11 @@ class MakeLaravelCrudWizard extends Command
      */
     protected $description = 'Make a resource template for laravel-crud-wizard';
 
+    private bool $ignoreError = false;
+    private ?string $resourceName = null;
+    private ?string $connection = null;
+    private ?string $table = null;
+
     public function __construct(
         protected MakeControllerService $makeControllerService,
         protected MakeModelService $makeModelService,
@@ -38,18 +45,68 @@ public function __construct(
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(int $try = 0): void
     {
-        $resourceName = $this->argument('resourceName');
-        $this->makeModelService->makeCompleteModelFile($resourceName, $ns = $this->laravel->getNamespace());
-        $this->makeServiceService->makeCompleteServiceFile($resourceName, $ns);
-        $this->makeControllerService->makeCompleteControllerFile($resourceName, $ns);
+        $this->resourceName ??= $this->argument('resourceName');
+        $this->connection ??= $this->argument('connectionName');
+        $this->table ??= $this->option('table');
+        $columns = [];
+
+        try {
+            $columns = $this->makeModelService->makeCompleteModelFile(
+                $this->resourceName,
+                $ns = $this->laravel->getNamespace(),
+                $this->connection,
+                $this->table,
+                $this->ignoreError
+            );
+        } catch (\Throwable $e) {
+            $this->resourceName ??= $this->ask('resourceName ?');
+            $this->table ??= $this->ask('tableName ?');
+
+            if ($try === 2) {
+                $this->connection ??= $this->ask('connectionName (blank for default) ?');
+            }
+
+            if ($try <= 2) {
+                $this->handle(++$try);
+
+                return;
+            }
+
+            $this->error($e->getMessage());
+
+            if (!$this->ignoreError) {
+                if ('n' === $this->ask($e->getMessage() . ', do you want to continue y/n?', 'n')) {
+                    return;
+                }
+
+                $this->ignoreError = true;
+                $this->handle(2);
+
+                return;
+            }
+        }
+
+        $this->makeServiceService->makeCompleteServiceFile($this->resourceName, $ns);
+        $this->makeControllerService->makeCompleteControllerFile(
+            $this->resourceName,
+            $ns,
+            \array_diff($columns, ['created_at', 'updated_at', 'id'])
+        );
 
         if (!$this->option('decorated')) {
             return;
         }
 
-        $this->makeDecoratorService->makeCompleteDecoratorFile($resourceName, $ns);
-        $this->makeMiddlewareService->makeCompleteMiddlewareFile($resourceName, $ns);
+        $this->makeDecoratorService->makeCompleteDecoratorFile($this->resourceName, $ns, $columns);
+        $this->makeMiddlewareService->makeCompleteMiddlewareFile($this->resourceName, $ns);
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output): void
+    {
+        if (!\is_string($input->getArgument('resourceName'))) {
+            $input->setArgument('resourceName', $this->ask('resourceName ?'));
+        }
     }
 }
diff --git a/src/Services/MakeControllerService.php b/src/Services/MakeControllerService.php
@@ -20,24 +20,37 @@ public function __construct(
         $this->output = $consoleOutput;
     }
 
-    public function makeCompleteControllerFile(string $resourceName, string $laravelNamespace): void
+    public function makeCompleteControllerFile(string $resourceName, string $laravelNamespace, array $columns): void
     {
         $this->createControllerFile(
-            $this->replaceContentControllerStub($resourceName, $laravelNamespace),
+            $this->replaceContentControllerStub($resourceName, $laravelNamespace, $columns),
             $resourceName
         );
     }
 
-    protected function replaceContentControllerStub(string $resourceName, string $laravelNamespace): string
-    {
+    protected function replaceContentControllerStub(
+        string $resourceName,
+        string $laravelNamespace,
+        array $columns
+    ): string {
         return \str_replace([
             'DummyNamespace',
             'DummyService',
             'DummyClass',
+            'DummyMapCreate',
+            'DummyMapUpdate',
         ], [
             \trim($laravelNamespace, '\\'),
-            ($plural = \ucfirst(Str::camel(Str::plural($resourceName)))) . 'Service',
+            ($plural = $this->pathsAndNamespacesService->pluralUcFirstCamelCase($resourceName)) . 'Service',
             $plural . 'Controller',
+            '            ' . \implode(",\n            ", \array_map(
+                fn(string $val): string => "'" . $val . "' => 'required'",
+                $columns
+            )),
+            '            ' . \implode(",\n            ", \array_map(
+                fn(string $val): string => "'" . $val . "' => 'sometimes|required'",
+                $columns
+            ))
         ], File::get($this->pathsAndNamespacesService->getControllerStubPath()));
     }
 
diff --git a/src/Services/MakeDecoratorService.php b/src/Services/MakeDecoratorService.php
@@ -18,19 +18,30 @@ public function __construct(
         $this->output = $consoleOutput;
     }
 
-    public function makeCompleteDecoratorFile(string $resourceName, string $laravelNamespace): void
+    public function makeCompleteDecoratorFile(string $resourceName, string $laravelNamespace, array $columns): void
     {
-        $this->createDecoratorFile($this->replaceContentDecoratorStub($resourceName, $laravelNamespace), $resourceName);
+        $this->createDecoratorFile(
+            $this->replaceContentDecoratorStub($resourceName, $laravelNamespace, $columns),
+            $resourceName
+        );
     }
 
-    protected function replaceContentDecoratorStub(string $resourceName, string $laravelNamespace): string
-    {
+    protected function replaceContentDecoratorStub(
+        string $resourceName,
+        string $laravelNamespace,
+        array $columns
+    ): string {
         return \str_replace([
             'DummyNamespace',
             'DummyClass',
+            'DummyMap',
         ], [
             \trim($laravelNamespace, '\\'),
-            \ucfirst(Str::camel(Str::singular($resourceName))) . 'Decorator',
+            $this->pathsAndNamespacesService->singularUcFirstCamelCase($resourceName) . 'Decorator',
+            '            ' . \implode(",\n            ", \array_map(
+                fn(string $val): string => "'" . $val . "' => '" . Str::camel($val) . "'",
+                $columns
+            ))
         ], File::get($this->pathsAndNamespacesService->getDecoratorStubPath()));
     }
 
diff --git a/src/Services/MakeMiddlewareService.php b/src/Services/MakeMiddlewareService.php
@@ -5,7 +5,6 @@
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\Facades\File;
-use Illuminate\Support\Str;
 use Symfony\Component\Console\Output\ConsoleOutput;
 
 class MakeMiddlewareService
@@ -36,8 +35,8 @@ protected function replaceContentMiddlewareStub(string $resourceName, string $la
             'DummyClass',
         ], [
             \trim($laravelNamespace, '\\'),
-            \ucfirst(Str::camel(Str::singular($resourceName))),
-            \ucfirst(Str::camel(Str::plural($resourceName))) . 'Middleware',
+            $this->pathsAndNamespacesService->singularUcFirstCamelCase($resourceName),
+            $this->pathsAndNamespacesService->pluralUcFirstCamelCase($resourceName) . 'Middleware',
         ], File::get($this->pathsAndNamespacesService->getMiddlewareStubPath()));
     }
 
diff --git a/src/Services/MakeModelService.php b/src/Services/MakeModelService.php
@@ -11,30 +11,75 @@ class MakeModelService
 {
     use InteractsWithIO;
 
+    private array $columns = [];
+
     public function __construct(
         protected PathsAndNamespacesService $pathsAndNamespacesService,
         ConsoleOutput $consoleOutput,
     ) {
         $this->output = $consoleOutput;
     }
 
-    public function makeCompleteModelFile(string $resourceName, string $laravelNamespace): void
-    {
-        $this->createModelFile($resourceName, $this->replaceContentModelStub($laravelNamespace, $resourceName));
+    /**
+     * @throws \Throwable
+     */
+    public function makeCompleteModelFile(
+        string $resourceName,
+        string $laravelNamespace,
+        ?string $connection,
+        ?string $table,
+        bool $ignoreError,
+    ): array {
+        $this->createModelFile(
+            $resourceName,
+            $this->replaceContentModelStub($laravelNamespace, $resourceName, $connection, $table, $ignoreError)
+        );
+
+        return $this->columns;
     }
 
-    protected function replaceContentModelStub(string $laravelNamespace, string $resourceName): string
-    {
+    /**
+     * @throws \Throwable
+     */
+    protected function replaceContentModelStub(
+        string $laravelNamespace,
+        string $resourceName,
+        ?string $connection,
+        ?string $table,
+        bool $ignoreError,
+    ): string {
+        $table ??= Str::snake(Str::camel($resourceName));
+
+        try {
+            $fillable = '        ' . \implode(",\n        ", \array_map(
+                fn(string $val): string => "'" . $val . "'",
+                $this->columns =
+                    \Illuminate\Support\Facades\Schema::connection($connection ?? \config('database.default'))
+                        ->getColumnListing($table)
+            ));
+        } catch (\Throwable $e) {
+            $this->error($e->getMessage());
+            $fillable = "\n        'created_at',\n        'updated_at',";
+        }
+
+        if (!$ignoreError && $fillable === '        ') {
+            throw new \Exception('Could not auto-populate fillable');
+        }
+
         return \str_replace([
             'DummyNamespace',
             'DummyResourceName',
             'DummyTableName',
             'DummyClass',
+            'DummyFillable',
+            'DummyConnection',
         ], [
             \trim($laravelNamespace, '\\'),
-            Str::snake(Str::plural($resourceName), '-'),
-            Str::snake(Str::plural($resourceName)),
-            \ucfirst(Str::camel(Str::singular($resourceName))),
+            $resourceName,
+            $table,
+            $this->pathsAndNamespacesService->singularUcFirstCamelCase($resourceName),
+            $fillable,
+            (string)$connection !== '' ? '    protected $connection = \'' . $connection . '\';' : '',
         ], File::get($this->pathsAndNamespacesService->getModelStubPath()));
     }
 
diff --git a/src/Services/MakeServiceService.php b/src/Services/MakeServiceService.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Support\Facades\File;
-use Illuminate\Support\Str;
 use Symfony\Component\Console\Output\ConsoleOutput;
 
 class MakeServiceService
@@ -31,8 +30,8 @@ protected function replaceContentServiceStub(string $resourceName, string $larav
             'DummyClass',
         ], [
             \trim($laravelNamespace, '\\'),
-            \ucfirst(Str::camel(Str::singular($resourceName))),
-            \ucfirst(Str::camel(Str::plural($resourceName))) . 'Service',
+            $this->pathsAndNamespacesService->singularUcFirstCamelCase($resourceName),
+            $this->pathsAndNamespacesService->pluralUcFirstCamelCase($resourceName) . 'Service',
         ], File::get($this->pathsAndNamespacesService->getServiceStubPath()));
     }
 
diff --git a/src/Services/PathsAndNamespacesService.php b/src/Services/PathsAndNamespacesService.php
@@ -49,7 +49,7 @@ public function getRealpathBaseModel(): string
     public function getRealpathBaseCustomModel(string $resourceName): string
     {
         return $this->getRealpathBaseModel() . DIRECTORY_SEPARATOR .
-            \ucfirst(Str::camel(Str::singular($resourceName))) . '.php';
+            $this->singularUcFirstCamelCase($resourceName) . '.php';
     }
 
     public function getRealpathBaseService(): string
@@ -60,7 +60,7 @@ public function getRealpathBaseService(): string
     public function getRealpathBaseCustomService(string $resourceName): string
     {
         return $this->getRealpathBaseService() . DIRECTORY_SEPARATOR .
-            \ucfirst(Str::camel(Str::plural($resourceName))) . 'Service.php';
+            $this->pluralUcFirstCamelCase($resourceName) . 'Service.php';
     }
 
     public function getRealpathBaseController(): string
@@ -71,7 +71,7 @@ public function getRealpathBaseController(): string
     public function getRealpathBaseCustomController(string $resourceName): string
     {
         return $this->getRealpathBaseController() . DIRECTORY_SEPARATOR .
-            \ucfirst(Str::camel(Str::plural($resourceName))) . 'Controller.php';
+            $this->pluralUcFirstCamelCase($resourceName) . 'Controller.php';
     }
 
     public function getRealpathBaseDecorator(): string
@@ -82,7 +82,7 @@ public function getRealpathBaseDecorator(): string
     public function getRealpathBaseCustomDecorator(string $resourceName): string
     {
         return $this->getRealpathBaseDecorator() . DIRECTORY_SEPARATOR .
-            \ucfirst(Str::camel(Str::singular($resourceName))) . 'Decorator.php';
+            $this->singularUcFirstCamelCase($resourceName) . 'Decorator.php';
     }
 
     public function getRealpathBaseMiddleware(): string
@@ -94,6 +94,23 @@ public function getRealpathBaseMiddleware(): string
     public function getRealpathBaseCustomMiddleware(string $resourceName): string
     {
         return $this->getRealpathBaseMiddleware() . DIRECTORY_SEPARATOR .
-            \ucfirst(Str::camel(Str::plural($resourceName))) . 'Middleware.php';
+            $this->pluralUcFirstCamelCase($resourceName) . 'Middleware.php';
+    }
+
+    public function singularUcFirstCamelCase(string $resourceName): string
+    {
+        static $result;
+
+        return $result[$resourceName] ??= \ucfirst(Str::camel(\implode(
+            '-',
+            \array_map(fn(string $value): string => Str::singular($value), \explode('-', $resourceName))
+        )));
+    }
+
+    public function pluralUcFirstCamelCase(string $resourceName): string
+    {
+        static $result;
+
+        return $result[$resourceName] ??= \ucfirst(Str::camel($resourceName));
     }
 }
diff --git a/src/stubs/Controller.stub b/src/stubs/Controller.stub
diff --git a/src/stubs/Decorator.stub b/src/stubs/Decorator.stub
diff --git a/src/stubs/Model.stub b/src/stubs/Model.stub
diff --git a/src/stubs/Service.stub b/src/stubs/Service.stub

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function getRealpathBaseModel(): string`
`49`	`49`	`public function getRealpathBaseCustomModel(string $resourceName): string`
`50`	`50`	`{`
`51`	`51`	`return $this->getRealpathBaseModel() . DIRECTORY_SEPARATOR .`
`52`		`- \ucfirst(Str::camel(Str::singular($resourceName))) . '.php';`
	`52`	`+ $this->singularUcFirstCamelCase($resourceName) . '.php';`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public function getRealpathBaseService(): string`
`@@ -60,7 +60,7 @@ public function getRealpathBaseService(): string`
`60`	`60`	`public function getRealpathBaseCustomService(string $resourceName): string`
`61`	`61`	`{`
`62`	`62`	`return $this->getRealpathBaseService() . DIRECTORY_SEPARATOR .`
`63`		`- \ucfirst(Str::camel(Str::plural($resourceName))) . 'Service.php';`
	`63`	`+ $this->pluralUcFirstCamelCase($resourceName) . 'Service.php';`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public function getRealpathBaseController(): string`
`@@ -71,7 +71,7 @@ public function getRealpathBaseController(): string`
`71`	`71`	`public function getRealpathBaseCustomController(string $resourceName): string`
`72`	`72`	`{`
`73`	`73`	`return $this->getRealpathBaseController() . DIRECTORY_SEPARATOR .`
`74`		`- \ucfirst(Str::camel(Str::plural($resourceName))) . 'Controller.php';`
	`74`	`+ $this->pluralUcFirstCamelCase($resourceName) . 'Controller.php';`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public function getRealpathBaseDecorator(): string`
`@@ -82,7 +82,7 @@ public function getRealpathBaseDecorator(): string`
`82`	`82`	`public function getRealpathBaseCustomDecorator(string $resourceName): string`
`83`	`83`	`{`
`84`	`84`	`return $this->getRealpathBaseDecorator() . DIRECTORY_SEPARATOR .`
`85`		`- \ucfirst(Str::camel(Str::singular($resourceName))) . 'Decorator.php';`
	`85`	`+ $this->singularUcFirstCamelCase($resourceName) . 'Decorator.php';`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public function getRealpathBaseMiddleware(): string`
`@@ -94,6 +94,23 @@ public function getRealpathBaseMiddleware(): string`
`94`	`94`	`public function getRealpathBaseCustomMiddleware(string $resourceName): string`
`95`	`95`	`{`
`96`	`96`	`return $this->getRealpathBaseMiddleware() . DIRECTORY_SEPARATOR .`
`97`		`- \ucfirst(Str::camel(Str::plural($resourceName))) . 'Middleware.php';`
	`97`	`+ $this->pluralUcFirstCamelCase($resourceName) . 'Middleware.php';`
	`98`	`+ }`
	`99`	`+`
	`100`	`+ public function singularUcFirstCamelCase(string $resourceName): string`
	`101`	`+ {`
	`102`	`+ static $result;`
	`103`	`+`
	`104`	`+ return $result[$resourceName] ??= \ucfirst(Str::camel(\implode(`
	`105`	`+ '-',`
	`106`	`+ \array_map(fn(string $value): string => Str::singular($value), \explode('-', $resourceName))`
	`107`	`+ )));`
	`108`	`+ }`
	`109`	`+`
	`110`	`+ public function pluralUcFirstCamelCase(string $resourceName): string`
	`111`	`+ {`
	`112`	`+ static $result;`
	`113`	`+`
	`114`	`+ return $result[$resourceName] ??= \ucfirst(Str::camel($resourceName));`
`98`	`115`	`}`
`99`	`116`	`}`