Scan provided path for all available FQCNs in paths within and outside app folder

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+=======
 ## [v3.2.6] - UNRELEASED
 ### New Features
 - Add configurable wire:model for filters by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1699

src/Commands/MakeCommand.php

@@ -127,9 +127,14 @@ public function getModelImport(): string
         }
 
         if (isset($this->modelPath)) {
-            if (File::exists(rtrim($this->modelPath, '/').'/'.$this->model.'.php')) {
-
-                return Str::studly(str_replace('/', '\\', $this->modelPath)).$this->model;
+            $filename = rtrim($this->modelPath, '/').'/'.$this->model.'.php';
+            if (File::exists($filename)) {
+                //In case the file has more than one class which is highly unlikely but still possible
+                $classes = array_filter($this->getClassesList($filename), function($class) {
+                    return substr($class,strrpos($class,'\\')+1) == $this->model;
+                });
+                if(count($classes) == 1)
+                    return $classes[0];
             }
         }
 
@@ -138,6 +143,42 @@ public function getModelImport(): string
         return 'App\Models\\'.$this->model;
     }
 
+    /*
+    * Credits to Harm Smits: https://stackoverflow.com/a/67099502/2263114
+    */
+    private function getClassesList($file): array
+    {
+        $classes   = [];
+        $namespace = '';
+        $tokens    = \PhpToken::tokenize(file_get_contents($file));
+
+        for ($i = 0; $i < count($tokens); $i++) {
+            if ($tokens[$i]->getTokenName() === 'T_NAMESPACE') {
+                for ($j = $i + 1; $j < count($tokens); $j++) {
+                    if ($tokens[$j]->getTokenName() === 'T_NAME_QUALIFIED') {
+                        $namespace = $tokens[$j]->text;
+                        break;
+                    }
+                }
+            }
+
+            if ($tokens[$i]->getTokenName() === 'T_CLASS') {
+                for ($j = $i + 1; $j < count($tokens); $j++) {
+                    if ($tokens[$j]->getTokenName() === 'T_WHITESPACE') {
+                        continue;
+                    }
+
+                    if ($tokens[$j]->getTokenName() === 'T_STRING') {
+                        $classes[] = $namespace . '\\' . $tokens[$j]->text;
+                    } else {
+                        break;
+                    }
+                }
+            }
+        }
+        return $classes;
+    }
+
     /**
      * @throws \Exception
      */