Fix issues with app path and namespace

config/config.php

@@ -70,7 +70,8 @@
                 'AUTHOR_EMAIL',
                 'MODULE_NAMESPACE',
                 'PROVIDER_NAMESPACE',
-                'APP_FOLDER_NAME',
+                'APP_PATH_NAMESPACE',
+                'APP_PATH',
             ],
         ],
         'gitkeep' => true,
@@ -85,7 +86,7 @@
         | This path will also be added automatically to the list of scanned folders.
         |
         */
-        'modules' => base_path('Modules'),
+        'modules' => base_path('modules'),
 
         /*
         |--------------------------------------------------------------------------
@@ -110,13 +111,17 @@
 
         /*
         |--------------------------------------------------------------------------
-        | The app path
+        | app/ path
         |--------------------------------------------------------------------------
         |
-        | app folder name
-        | for example can change it to 'src' or 'App'
+        | Specifies the path for the app/ directory.
+        |
+        | Examples:
+        |   'app/'  = (default Laravel directory),
+        |   'src/'  = (custom directory),
+        |   '/'     = (root directory).
         */
-        'app_folder' => 'app/',
+        'app' => 'app/',
 
         /*
         |--------------------------------------------------------------------------
@@ -147,7 +152,7 @@
             'policies' => ['path' => 'app/Policies', 'generate' => false],
             'provider' => ['path' => 'app/Providers', 'generate' => true],
             'repository' => ['path' => 'app/Repositories', 'generate' => false],
-            'resource' => ['path' => 'app/Transformers', 'generate' => false],
+            'resource' => ['path' => 'app/Resources', 'generate' => false],
             'route-provider' => ['path' => 'app/Providers', 'generate' => true],
             'rules' => ['path' => 'app/Rules', 'generate' => false],
             'services' => ['path' => 'app/Services', 'generate' => false],

src/Commands/Actions/ModelShowCommand.php

@@ -42,10 +42,8 @@ private function formatModuleNamespace(string $path): string
         return
             Str::of($path)
                 ->after(base_path().DIRECTORY_SEPARATOR)
-                ->replace(
-                    [config('modules.paths.app_folder'), '/', '.php'],
-                    ['', '\\', ''],
-                )->toString();
+                ->replace(['/', '.php'], ['\\', ''])
+                ->toString();
     }
 
     public function findModels(string $model): Collection

src/Commands/BaseCommand.php

@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 use Illuminate\Support\Collection;
 use Nwidart\Modules\Contracts\ConfirmableCommand;
+use Nwidart\Modules\Traits\PathNamespace;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -18,6 +19,7 @@
 abstract class BaseCommand extends Command implements PromptsForMissingInput
 {
     use ConfirmableTrait;
+    use PathNamespace;
     use Prohibitable;
 
     public const ALL = 'All';

src/Commands/Make/ActionMakeCommand.php

@@ -23,7 +23,7 @@ public function getDestinationFilePath(): string
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
 
-        $filePath = GenerateConfigReader::read('actions')->getPath() ?? config('modules.paths.app_folder').'Actions';
+        $filePath = GenerateConfigReader::read('actions')->getPath() ?? config('modules.paths.app').'Actions';
 
         return $path.$filePath.'/'.$this->getActionName().'.php';
     }
@@ -66,7 +66,7 @@ private function getClassNameWithoutNamespace(): array|string
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.actions.namespace', 'Actions');
+        return $this->default_namespace('actions');
     }
 
     protected function getStubName(): string

src/Commands/Make/CastMakeCommand.php

@@ -23,7 +23,7 @@ public function getDestinationFilePath(): string
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
 
-        $filePath = GenerateConfigReader::read('casts')->getPath() ?? config('modules.paths.app_folder').'Casts';
+        $filePath = GenerateConfigReader::read('casts')->getPath() ?? config('modules.paths.app').'Casts';
 
         return $path.$filePath.'/'.$this->getCastName().'.php';
     }
@@ -65,7 +65,7 @@ private function getClassNameWithoutNamespace(): array|string
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.casts.namespace', 'Casts');
+        return $this->default_namespace('casts');
     }
 
     protected function getStubName(): string

src/Commands/Make/ChannelMakeCommand.php

@@ -30,8 +30,7 @@ final class ChannelMakeCommand extends GeneratorCommand
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.channels.namespace')
-            ?? ltrim(config('modules.paths.generator.channels.path', 'Broadcasting'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('channels');
     }
 
     /**

src/Commands/Make/ClassMakeCommand.php

@@ -46,7 +46,7 @@ public function getDestinationFilePath(): string
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
 
-        $filePath = GenerateConfigReader::read('class')->getPath() ?? config('modules.paths.app_folder').'Classes';
+        $filePath = GenerateConfigReader::read('class')->getPath() ?? config('modules.paths.app').'Classes';
 
         return $this->typePath($path.$filePath.'/'.$this->getFileName().'.php');
     }
@@ -84,8 +84,6 @@ public function typeClass(): string
 
     public function getDefaultNamespace(): string
     {
-        $type = $this->type();
-
-        return config("modules.paths.generator.{$type}.namespace", 'Classes');
+        return $this->default_namespace($this->type(), $this->app_path("app/{$this->type()}"));
     }
 }

src/Commands/Make/CommandMakeCommand.php

@@ -36,8 +36,7 @@ class CommandMakeCommand extends GeneratorCommand
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.command.namespace')
-            ?? ltrim(config('modules.paths.generator.command.path', 'Console'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('command');
     }
 
     /**

src/Commands/Make/ComponentClassMakeCommand.php

@@ -55,8 +55,7 @@ protected function writeComponentViewTemplate()
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.component-class.namespace')
-            ?? ltrim(config('modules.paths.generator.component-class.path', 'View/Component'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('component-class');
     }
 
     /**

src/Commands/Make/ControllerMakeCommand.php

@@ -118,8 +118,7 @@ private function getControllerNameWithoutNamespace()
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.controller.namespace')
-            ?? ltrim(config('modules.paths.generator.controller.path', 'Http/Controllers'), config('modules.paths.app_folder'));
+        return $this->default_namespace('controller');
     }
 
     /**

src/Commands/Make/EnumMakeCommand.php

@@ -23,7 +23,7 @@ public function getDestinationFilePath(): string
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
 
-        $filePath = GenerateConfigReader::read('enums')->getPath() ?? config('modules.paths.app_folder').'Enums';
+        $filePath = GenerateConfigReader::read('enums')->getPath() ?? config('modules.paths.app').'Enums';
 
         return $path.$filePath.'/'.$this->getEnumName().'.php';
     }
@@ -65,7 +65,7 @@ private function getClassNameWithoutNamespace(): array|string
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.enums.namespace', 'Enums');
+        return $this->default_namespace('enums');
     }
 
     protected function getStubName(): string

src/Commands/Make/EventMakeCommand.php

@@ -57,8 +57,7 @@ protected function getFileName()
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.event.namespace')
-            ?? ltrim(config('modules.paths.generator.event.path', 'Events'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('event');
     }
 
     /**

src/Commands/Make/EventProviderMakeCommand.php

@@ -64,8 +64,7 @@ private function getClassNameWithoutNamespace(): array|string
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.provider.namespace')
-            ?? ltrim(config('modules.paths.generator.provider.path', 'Providers'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('provider');
     }
 
     protected function getStubName(): string

src/Commands/Make/ExceptionMakeCommand.php

@@ -23,7 +23,7 @@ public function getDestinationFilePath(): string
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
 
-        $filePath = GenerateConfigReader::read('exceptions')->getPath() ?? config('modules.paths.app_folder').'Exceptions';
+        $filePath = GenerateConfigReader::read('exceptions')->getPath() ?? config('modules.paths.app').'Exceptions';
 
         return $path.$filePath.'/'.$this->getExceptionName().'.php';
     }
@@ -67,7 +67,7 @@ private function getClassNameWithoutNamespace(): array|string
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.exceptions.namespace', 'Exceptions');
+        return $this->default_namespace('exceptions');
     }
 
     protected function getStubName(): string

src/Commands/Make/FactoryMakeCommand.php

@@ -93,19 +93,14 @@ private function getModelName()
      */
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.factory.namespace')
-            ?? ltrim(config('modules.paths.generator.factory.path', 'Database/Factories'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('factory');
     }
 
     /**
      * Get model namespace.
      */
     public function getModelNamespace(): string
     {
-        $path = ltrim(config('modules.paths.generator.model.path', 'Entities'), config('modules.paths.app_folder', ''));
-
-        $path = str_replace('/', '\\', $path);
-
-        return $this->laravel['modules']->config('namespace').'\\'.$this->laravel['modules']->findOrFail($this->getModuleName()).'\\'.$path;
+        return $this->module_namespace($this->argument('module'), $this->default_namespace('model'));
     }
 }

src/Commands/Make/GeneratorCommand.php

@@ -78,6 +78,14 @@ public function getDefaultNamespace(): string
         return '';
     }
 
+    /**
+     * Get a default namespace from config.
+     */
+    public function default_namespace(string $key, string $default = ''): string
+    {
+        return config("modules.paths.generator.{$key}.namespace") ?? $this->namespace(config("modules.paths.generator.{$key}.path") ?? $default);
+    }
+
     /**
      * Get class namespace.
      *

src/Commands/Make/HelperMakeCommand.php

@@ -23,7 +23,7 @@ public function getDestinationFilePath(): string
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
 
-        $filePath = GenerateConfigReader::read('helpers')->getPath() ?? config('modules.paths.app_folder').'Helpers';
+        $filePath = GenerateConfigReader::read('helpers')->getPath() ?? config('modules.paths.app').'Helpers';
 
         return $path.$filePath.'/'.$this->getHelperName().'.php';
     }
@@ -66,7 +66,7 @@ private function getClassNameWithoutNamespace(): array|string
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.helpers.namespace', 'Helpers');
+        return $this->default_namespace('helpers');
     }
 
     protected function getStubName(): string

src/Commands/Make/InterfaceMakeCommand.php

@@ -23,7 +23,7 @@ public function getDestinationFilePath(): string
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
 
-        $filePath = GenerateConfigReader::read('interfaces')->getPath() ?? config('modules.paths.app_folder').'Interfaces';
+        $filePath = GenerateConfigReader::read('interfaces')->getPath() ?? config('modules.paths.app').'Interfaces';
 
         return $path.$filePath.'/'.$this->getInterfaceName().'.php';
     }
@@ -65,7 +65,7 @@ private function getClassNameWithoutNamespace(): array|string
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.interfaces.namespace', 'Interfaces');
+        return $this->default_namespace('interfaces');
     }
 
     protected function getStubName(): string

src/Commands/Make/JobMakeCommand.php

@@ -31,8 +31,7 @@ class JobMakeCommand extends GeneratorCommand
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.jobs.namespace')
-            ?? ltrim(config('modules.paths.generator.jobs.path', 'Jobs'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('jobs');
     }
 
     /**

src/Commands/Make/ListenerMakeCommand.php

@@ -70,8 +70,7 @@ protected function getTemplateContents()
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.listener.namespace')
-            ?? ltrim(config('modules.paths.generator.listener.path', 'Listeners'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('listener');
     }
 
     protected function getEventName(Module $module)

src/Commands/Make/MailMakeCommand.php

@@ -30,8 +30,7 @@ class MailMakeCommand extends GeneratorCommand
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.emails.namespace')
-            ?? ltrim(config('modules.paths.generator.emails.path', 'Emails'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('emails');
     }
 
     /**

src/Commands/Make/MiddlewareMakeCommand.php

@@ -35,8 +35,7 @@ class MiddlewareMakeCommand extends GeneratorCommand
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.filter.namespace')
-            ?? ltrim(config('modules.paths.generator.filter.path', 'Http/Middleware'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('filter');
     }
 
     /**

src/Commands/Make/ModelMakeCommand.php

@@ -242,7 +242,6 @@ private function getFillable(): string
      */
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.model.namespace')
-            ?? ltrim(config('modules.paths.generator.model.path', 'Models'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('model');
     }
 }

src/Commands/Make/NotificationMakeCommand.php

@@ -30,8 +30,7 @@ final class NotificationMakeCommand extends GeneratorCommand
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.notifications.namespace')
-            ?? ltrim(config('modules.paths.generator.notifications.path', 'Notifications'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('notifications');
     }
 
     /**

src/Commands/Make/ObserverMakeCommand.php

@@ -123,7 +123,6 @@ public function handle(): int
      */
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.observer.namespace')
-            ?? ltrim(config('modules.paths.generator.observer.path', 'Observers'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('observer');
     }
 }

src/Commands/Make/PolicyMakeCommand.php

@@ -35,8 +35,7 @@ class PolicyMakeCommand extends GeneratorCommand
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.policies.namespace')
-            ?? ltrim(config('modules.paths.generator.policies.path', 'Policies'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('policies');
     }
 
     /**

src/Commands/Make/ProviderMakeCommand.php

@@ -37,8 +37,7 @@ class ProviderMakeCommand extends GeneratorCommand
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.provider.namespace')
-            ?? ltrim(config('modules.paths.generator.provider.path', 'Providers'), config('modules.paths.app_folder', ''));
+        return $this->default_namespace('provider');
     }
 
     /**