Bug Fix: Wrong Path appFilament when generating resources with the default config

Author: coolsam726

src/Commands/ModuleMakeFilamentPluginCommand.php

@@ -44,7 +44,7 @@ public function handle(): ?bool
     {
         $this->ensureModule();
 
-        return parent::handle(); // TODO: Change the autogenerated stub
+        return parent::handle();
     }
 
     public function ensureModule()

src/Concerns/GeneratesModularFiles.php

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

src/ModulesServiceProvider.php

@@ -75,7 +75,6 @@ public function attemptToRegisterModuleProviders(): void
         ) . '/*' . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . 'Providers' . DIRECTORY_SEPARATOR . 'Filament' . DIRECTORY_SEPARATOR . '*Provider.php';
         $serviceProviders = glob($pattern1);
         $panelProviders = glob($pattern2);
-        //        dd($panelProviders);
         $providers = array_merge($serviceProviders, $panelProviders);
 
         foreach ($providers as $provider) {
@@ -207,13 +206,12 @@ protected function getMigrations(): array
 
     protected function registerModuleMacros(): void
     {
-        Module::macro('namespace', function (string $relativeNamespace = '') {
+        Module::macro('namespace', function (?string $relativeNamespace = '') {
+            $relativeNamespace = $relativeNamespace ?? '';
             $base = trim($this->app['config']->get('modules.namespace', 'Modules'), '\\');
             $relativeNamespace = trim($relativeNamespace, '\\');
             $studlyName = $this->getStudlyName();
-
             return str($base)->append('\\')->append($studlyName)->append('\\')->append($relativeNamespace)->replace('\\\\', '\\')->toString();
-            //            return trim("{$base}\\{$studlyName}\\{$relativeNamespace}", '\\');
         });
 
         Module::macro('getTitle', function () {
@@ -233,37 +231,39 @@ protected function registerModuleMacros(): void
         Module::macro('appPath', function (string $relativePath = '') {
             $appPath = $this->getExtraPath(config('modules.paths.app_folder', 'app'));
 
-            return $appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : '');
+            return str($appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : ''))->replace(DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR)->toString();
         });
 
         Module::macro('databasePath', function (string $relativePath = '') {
             $appPath = $this->getExtraPath('database');
 
-            return $appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : '');
+            return str($appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : ''))->replace(DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR)->toString();
         });
 
         Module::macro('resourcesPath', function (string $relativePath = '') {
             $appPath = $this->getExtraPath('resources');
 
-            return $appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : '');
+            return str($appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : ''))
+                ->replace(DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR)->toString();
         });
 
         Module::macro('migrationsPath', function (string $relativePath = '') {
             $appPath = $this->databasePath('migrations');
 
-            return $appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : '');
+            return str($appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : ''))
+                ->replace(DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR)->toString();
         });
 
         Module::macro('seedersPath', function (string $relativePath = '') {
             $appPath = $this->databasePath('seeders');
 
-            return $appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : '');
+            return str($appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : ''))->replace(DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR)->toString();
         });
 
         Module::macro('factoriesPath', function (string $relativePath = '') {
             $appPath = $this->databasePath('factories');
 
-            return $appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : '');
+            return str($appPath . ($relativePath ? DIRECTORY_SEPARATOR . $relativePath : ''))->replace(DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR)->toString();
         });
     }
 }