Fix: read app_folder variable from laravel-modules (#146)

Closing #127

Author: coolsam726

src/Commands/ModuleMakeFilamentWidgetCommand.php

@@ -107,7 +107,8 @@ public function handle(): int
 
         if (! $panel) {
             $namespace = $module->appNamespace('Livewire');
-            $path = $module->appPath((string) str($namespace)->after('App\\')->replace('\\', '/'));
+            $prefix = str(config('modules.paths.app_folder', 'app'))->ltrim(DIRECTORY_SEPARATOR, '\\')->studly();
+            $path = $module->appPath((string) str($namespace)->after("{$prefix}\\")->replace('\\', '/'));
         } elseif ($resource === null) {
             $widgetDirectories = collect($panel->getWidgetDirectories())->filter(fn ($dir) => str($dir)->contains($module->appPath()))->values()->all();
             $widgetNamespaces = collect($panel->getWidgetNamespaces())->filter(fn ($dir) => str($dir)->contains($module->appNamespace()))->values()->all();

src/Concerns/GeneratesModularFiles.php

@@ -44,7 +44,8 @@ protected function rootNamespace(): string
 
     protected function getPath($name): string
     {
-        $name = Str::replaceFirst($this->rootNamespace(), 'app', $name);
+        $appFolder = str(config('modules.paths.app_folder', 'app'));
+        $name = Str::replaceFirst($this->rootNamespace(), $appFolder, $name);
 
         return $this->getModule()->getExtraPath(str_replace('\\', DIRECTORY_SEPARATOR, $name) . '.php');
     }

src/ModulesPlugin.php

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

src/ModulesServiceProvider.php

@@ -222,8 +222,10 @@ protected function registerModuleMacros(): void
         Module::macro('appNamespace', function (string $relativeNamespace = '') {
             $prefix = str(config('modules.paths.app_folder', 'app'))->ltrim(DIRECTORY_SEPARATOR, '\\')->studly();
             $relativeNamespace = trim($relativeNamespace, '\\');
-            $relativeNamespace = str_replace($prefix . '\\', '', $relativeNamespace);
-            $relativeNamespace = str_replace($prefix, '', $relativeNamespace);
+            if ($prefix != '') {
+                $relativeNamespace = str_replace($prefix . '\\', '', $relativeNamespace);
+                $relativeNamespace = str_replace($prefix, '', $relativeNamespace);
+            }
             $relativeNamespace = trim($relativeNamespace, '\\');
             $relativeNamespace = '\\' . $relativeNamespace;