Feature: Support Generation of Filament classes for custom Module classes (#147)

- Refactored the code to support proper generation of resources,
clusters and plugins for custom module paths

Author: coolsam726

src/Commands/ModuleFilamentInstallCommand.php

@@ -144,7 +144,7 @@ private function makeDirectory(string $dir): void
     protected function createDefaultFilamentPlugin(): void
     {
         $module = $this->getModule();
-        $this->call('module:make:filament-plugin', [
+        $this->call('module:filament:plugin', [
             'name' => $module->getStudlyName() . 'Plugin',
             'module' => $module->getStudlyName(),
         ]);
@@ -153,7 +153,7 @@ protected function createDefaultFilamentPlugin(): void
     protected function createDefaultFilamentCluster(): void
     {
         $module = $this->getModule();
-        $this->call('module:make:filament-cluster', [
+        $this->call('module:filament:cluster', [
             'name' => $module->getStudlyName(),
             'module' => $module->getStudlyName(),
             '--panel' => filament()->getDefaultPanel()->getId(),

src/Commands/ModuleMakeFilamentPluginCommand.php

@@ -5,6 +5,8 @@
 use Coolsam\Modules\Concerns\GeneratesModularFiles;
 use Illuminate\Console\GeneratorCommand;
 
+use function Laravel\Prompts\select;
+
 class ModuleMakeFilamentPluginCommand extends GeneratorCommand
 {
     use GeneratesModularFiles;
@@ -37,4 +39,19 @@ protected function stubReplacements(): array
             'pluginId' => str($this->argument('name'))->replace('Plugin', '')->studly()->lower()->toString(),
         ];
     }
+
+    public function handle(): ?bool
+    {
+        $this->ensureModule();
+
+        return parent::handle(); // TODO: Change the autogenerated stub
+    }
+
+    public function ensureModule()
+    {
+        if (! $this->argument('module')) {
+            $module = select('Please select the module to create the plugin in:', \Nwidart\Modules\Facades\Module::allEnabled());
+            $this->input->setArgument('module', $module);
+        }
+    }
 }

src/Commands/ModuleMakeFilamentResourceCommand.php

@@ -71,15 +71,15 @@ public function ensureModelNamespace(): void
             } else {
                 $modelName = select('Please select the model within this module for the resource:', $this->possibleFqnModels());
             }
-            $modelNamespace = $this->rootNamespace() . '\\Models';
-            // Ask to select model namespace
+
+            $modelClass = class_basename($modelName);
+            $modelNamespace = str(trim($modelName, '\\'))->rtrim("\\{$modelClass}")->toString();
 
             if (! $modelName) {
                 $this->error('No model namespace selected. Aborting resource creation.');
                 exit(1);
             }
-
-            $modelName = class_basename($modelName);
+            $modelName = $modelClass;
 
             $this->input->setOption('model-namespace', $modelNamespace);
             $this->input->setArgument('model', $modelName);
@@ -96,6 +96,11 @@ public function ensurePanel()
             $this->panel = $defaultPanel;
         } else {
             $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(),

src/Concerns/GeneratesModularFiles.php

@@ -44,15 +44,15 @@ protected function rootNamespace(): string
 
     protected function getPath($name): string
     {
-        $appFolder = str(config('modules.paths.app_folder', 'app'));
+        $appFolder = trim(config('modules.paths.app_folder', 'app/'), '/\\');
         $name = Str::replaceFirst($this->rootNamespace(), $appFolder, $name);
 
         return $this->getModule()->getExtraPath(str_replace('\\', DIRECTORY_SEPARATOR, $name) . '.php');
     }
 
     protected function possibleModels()
     {
-        $modelPath = $this->getModule()->appPath('Models');
+        $modelPath = $this->getModule()->appPath(config('modules.paths.generator.model.path', 'Models'));
 
         return collect(Finder::create()->files()->depth(0)->in($modelPath))
             ->map(fn ($file) => $file->getBasename('.php'))
@@ -64,7 +64,7 @@ protected function possibleModels()
     public function possibleFqnModels(): array
     {
         return collect($this->possibleModels())
-            ->map(fn ($model) => $this->getModule()->appNamespace("Models\\{$model}"))
+            ->map(fn ($model) => str($this->getModule()->appNamespace('Models'))->trim('\\')->append("\\{$model}")->toString())
             ->all();
     }
 

src/ModulesPlugin.php

@@ -85,8 +85,9 @@ protected function getModulePlugins(): array
         }
         // get a glob of all Filament plugins
         $basePath = str(config('modules.paths.modules', 'Modules'));
-        $appFolder = str(config('modules.paths.app_folder', 'app'));
-        $pattern = $basePath . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $appFolder . DIRECTORY_SEPARATOR . 'Filament' . DIRECTORY_SEPARATOR . '*Plugin.php';
+        $appFolder = trim(config('modules.paths.app_folder', 'app'), '/\\');
+        $appPath = $appFolder . DIRECTORY_SEPARATOR;
+        $pattern = str($basePath . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $appPath . 'Filament' . DIRECTORY_SEPARATOR . '*Plugin.php')->replace('//', '/')->toString();
         $pluginPaths = glob($pattern);
 
         return collect($pluginPaths)->map(fn ($path) => FilamentModules::convertPathToNamespace($path))->toArray();

src/ModulesServiceProvider.php

@@ -212,23 +212,21 @@ protected function registerModuleMacros(): void
             $relativeNamespace = trim($relativeNamespace, '\\');
             $studlyName = $this->getStudlyName();
 
-            return trim("{$base}\\{$studlyName}\\{$relativeNamespace}", '\\');
+            return str($base)->append('\\')->append($studlyName)->append('\\')->append($relativeNamespace)->replace('\\\\', '\\')->toString();
+            //            return trim("{$base}\\{$studlyName}\\{$relativeNamespace}", '\\');
         });
 
         Module::macro('getTitle', function () {
             return str($this->getStudlyName())->kebab()->title()->replace('-', ' ')->toString();
         });
 
         Module::macro('appNamespace', function (string $relativeNamespace = '') {
-            $prefix = str(config('modules.paths.app_folder', 'app'))->ltrim(DIRECTORY_SEPARATOR, '\\')->studly();
+            $prefix = str(config('modules.paths.app_folder', 'app'))->ltrim(DIRECTORY_SEPARATOR, '\\')->studly()->toString();
             $relativeNamespace = trim($relativeNamespace, '\\');
-            if ($prefix != '') {
+            if (filled($prefix)) {
                 $relativeNamespace = str_replace($prefix . '\\', '', $relativeNamespace);
                 $relativeNamespace = str_replace($prefix, '', $relativeNamespace);
             }
-            $relativeNamespace = trim($relativeNamespace, '\\');
-            $relativeNamespace = '\\' . $relativeNamespace;
-
             return $this->namespace($relativeNamespace);
         });
         Module::macro('appPath', function (string $relativePath = '') {