Merge pull request #61 from furey/enable-shortcut-for-empty-tables

Patched various "tableless_models" issues.

Author: furey

resources/views/includes.blade.php

@@ -130,20 +130,39 @@ function tinx_query($class, ...$args)
     try {
         ${!! $name !!} = {!! $class !!}::first() ?: app('{!! $class !!}');
         ${!! $name !!}_ = {!! $class !!}::latest($latestColumn)->first() ?: app('{!! $class !!}');
-        if (!function_exists('{!! $name !!}')) {
-            function {!! $name !!}(...$args) {
-                return tinx_query('{!! $class !!}', ...$args);
-            }
-        }
+        array_set($GLOBALS, 'tinx.shortcuts.{!! $name !!}', ${!! $name !!});
+        array_set($GLOBALS, 'tinx.shortcuts.{!! $name !!}_', ${!! $name !!}_);
     } catch (Throwable $e) {
         @include('tinx::on-name-error')
     } catch (Exception $e) {
         @include('tinx::on-name-error')
     }
+    if (!function_exists('{!! $name !!}')) {
+        function {!! $name !!}(...$args) {
+            return tinx_query('{!! $class !!}', ...$args);
+        }
+    }
 @endforeach
 unset($latestColumn);
 
 /**
- * Quick reference array.
+ * Quick names reference array.
  * */
 $names = array_get($GLOBALS, 'tinx.names');
+
+/**
+ * Define shortcuts for "names()" table, and also set quick shortcuts reference array.
+ * */
+$shortcuts = collect($names)->map(function ($name, $class) {
+    $shortcuts = [];
+    if (array_has($GLOBALS, "tinx.shortcuts.$name")) $shortcuts[] = "\${$name}";
+    if (array_has($GLOBALS, "tinx.shortcuts.{$name}_")) $shortcuts[] = "\${$name}_";
+    if (function_exists($name)) $shortcuts[] = "{$name}()";
+    return implode(', ', $shortcuts);
+})->all();
+array_set($GLOBALS, 'tinx.names', $shortcuts);
+
+/**
+ * Conditionally render the "Class/Shortcuts" names table.
+ * */
+event('tinx.names.conditional');

resources/views/on-name-error.blade.php

@@ -1,17 +1,19 @@
-@if ((bool) array_get($config, 'tableless_models'))
+@if ((bool) array_get($config, 'tableless_models') === true)
     try {
         ${!! $name !!} = app('{!! $class !!}');
         ${!! $name !!}_ = app('{!! $class !!}');
-        if (!function_exists('{!! $name !!}')) {
-            function {!! $name !!}(...$args) {
-                return '{!! $class !!}';
-            }
-        }
+        array_set($GLOBALS, 'tinx.shortcuts.{!! $name !!}', ${!! $name !!});
+        array_set($GLOBALS, 'tinx.shortcuts.{!! $name !!}_', ${!! $name !!}_);
     } catch (Throwable $e) {
         tinx_forget_name('{!! $class !!}');
     } catch (Exception $e) {
         tinx_forget_name('{!! $class !!}');
     }
+    if (!function_exists('{!! $name !!}')) {
+        function {!! $name !!}(...$args) {
+            return '{!! $class !!}';
+        }
+    }
 @else
     tinx_forget_name('{!! $class !!}');
 @endif

src/Console/NamesTable.php

@@ -20,7 +20,7 @@ public static function make(TinxCommand $command)
     private function __construct(TinxCommand $command)
     {
         $this->command = $command;
-        $this->names = $this->command->getNames();
+        $this->names = array_get($GLOBALS, 'tinx.names');
     }
 
     /**
@@ -102,8 +102,8 @@ private function getHeaders()
      * */
     private function getRows()
     {
-        return collect($this->names)->map(function ($name, $class) {
-            return [$class, "\${$name}, \${$name}_, {$name}()"];
+        return collect($this->names)->map(function ($shortcuts, $class) {
+            return [$class, $shortcuts];
         });
     }
 

src/Console/TinxCommand.php

@@ -47,7 +47,6 @@ public function handle()
             $this->rebootConfig();
             $this->setNames();
             $this->createTinxIncludes();
-            $this->conditionallyRenderNamesTable();
             $this->callTinker();
         } while (State::shouldRestart() && !$this->info("Reloading your tinker session..."));
 
@@ -70,20 +69,12 @@ private function setNames()
         $this->names = StrategyFactory::makeDefault()->getNames();
     }
 
-    /**
-     * @return array
-     * */
-    public function getNames()
-    {
-        return $this->names;
-    }
-
     /**
      * @return void
      * */
     private function createTinxIncludes()
     {
-        with(new IncludeManager)->generateIncludesFile($this->getNames());
+        with(new IncludeManager)->generateIncludesFile($this->names);
     }
 
     /**
@@ -94,14 +85,10 @@ private function listenForNamesTable()
         app('events')->listen('tinx.names', function (...$args) {
             NamesTable::make($this)->render(...$args);
         });
-    }
 
-    /**
-     * @return void
-     * */
-    private function conditionallyRenderNamesTable()
-    {
-        NamesTable::make($this)->conditionallyRender();
+        app('events')->listen('tinx.names.conditional', function (...$args) {
+            NamesTable::make($this)->conditionallyRender();
+        });
     }
 
     /**