fix resource generation command not parsing passed model class properly (#163)

When starting to use this package in a project I'm working on I noticed
the model argument wasn't being used properly
It would parse the FQDN of `Module\Foo\Bar` as `Bar\Bar` because it
replaced the entire FQDN with the class basename

In addition removing the string `Resource` from the basename seems to be
somewhat counter intuitive, if wanted I could roll those changes back

I also took the liberty of adding an early return and simplify the code
I worked on a bit

Author: coolsam726

src/Commands/ModuleMakeFilamentResourceCommand.php

@@ -62,60 +62,55 @@ public function ensureModuleArgument(): void
 
     public function ensureModelNamespace(): void
     {
-        $modelNamespace = $this->input->getOption('model-namespace');
-        if (! $modelNamespace) {
-            // try to get from name
-            $name = $this->input->getArgument('model');
-            if ($name) {
-                $modelName = str_replace('Resource', '', class_basename($name));
-            } else {
-                $modelName = select('Please select the model within this module for the resource:', $this->possibleFqnModels());
-            }
+        if ($this->input->hasOption('model-namespace')) {
+            return;
+        }
+        // try to get from name
+        $name = $this->input->getArgument('model')
+            ?: select('Please select the model within this module for the resource:', $this->possibleFqnModels());
 
-            $modelClass = class_basename($modelName);
-            $modelNamespace = str(trim($modelName, '\\'))->beforeLast("\\{$modelClass}")->toString();
+        $modelClass = class_basename($name);
+        $modelNamespace = str(trim($name, '\\'))->beforeLast("\\{$modelClass}")->toString();
 
-            if (! $modelName) {
-                $this->error('No model namespace selected. Aborting resource creation.');
-                exit(1);
-            }
-            $modelName = $modelClass;
+        if (! $modelNamespace) {
+            $this->error('No model namespace selected. Aborting resource creation.');
+            exit(1);
+        }
 
-            $this->input->setOption('model-namespace', $modelNamespace);
-            $this->input->setArgument('model', $modelName);
+        $this->input->setOption('model-namespace', $modelNamespace);
+        $this->input->setArgument('model', $modelClass);
 
-            $this->output->info("Using model namespace: {$modelNamespace}");
-            $this->output->info("Using model name: {$modelName}");
-        }
+        $this->output->info("Using model namespace: {$modelNamespace}");
+        $this->output->info("Using model name: {$modelClass}");
     }
 
     public function ensurePanel()
     {
         $defaultPanel = filament()->getDefaultPanel();
         if (! FilamentModules::getMode()->shouldRegisterPanels()) {
             $this->panel = $defaultPanel;
-        } else {
-            $modulePanels = FilamentModules::getModulePanels($this->getModule());
-            if (count($modulePanels) === 0) {
-                $this->panel = $defaultPanel;
+            return;
+        }
+        $modulePanels = FilamentModules::getModulePanels($this->getModule());
+        if (count($modulePanels) === 0) {
+            $this->panel = $defaultPanel;
 
-                return;
-            }
-            $options = [
-                $defaultPanel->getId(),
-                ...collect($modulePanels)->map(fn ($panel) => $panel->getId())->values()->all(),
-            ];
-            $panelId = select(
-                label: 'Please select the Filament panel to create the resource in:',
-                options: $options,
-                default: $defaultPanel->getId(),
-            );
-            $this->input->setOption('panel', $panelId);
-            $this->panel = filament()->getPanel($panelId, isStrict: false);
-            if (! $this->panel) {
-                $this->error("Panel [{$panelId}] not found. Aborting resource creation.");
-                exit(1);
-            }
+            return;
+        }
+        $options = [
+            $defaultPanel->getId(),
+            ...collect($modulePanels)->map(fn ($panel) => $panel->getId())->values()->all(),
+        ];
+        $panelId = select(
+            label: 'Please select the Filament panel to create the resource in:',
+            options: $options,
+            default: $defaultPanel->getId(),
+        );
+        $this->input->setOption('panel', $panelId);
+        $this->panel = filament()->getPanel($panelId, isStrict: false);
+        if (! $this->panel) {
+            $this->error("Panel [{$panelId}] not found. Aborting resource creation.");
+            exit(1);
         }
     }