0.1.1

Author: joetannenbaum

app/Commands/ParseCommand.php renamed to app/Commands/AutocompleteCommand.php

@@ -6,11 +6,11 @@
 use Illuminate\Support\Facades\File;
 use LaravelZero\Framework\Commands\Command;
 
-class ParseCommand extends Command
+class AutocompleteCommand extends Command
 {
-    protected $signature = 'parse {code} {--debug} {--from-file=}';
+    protected $signature = 'autocomplete {code} {--debug} {--from-file=}';
 
-    protected $description = 'Parse the given PHP code';
+    protected $description = 'Parse the given PHP code and return the autocomplete results';
 
     public function handle(): void
     {
@@ -23,20 +23,21 @@ public function handle(): void
         $walker = new Walker($code, (bool) $this->option('debug'));
         $result = $walker->walk();
 
+        $autocompleting = $result->findAutocompleting();
+
         if (app()->isLocal()) {
-            $dir = 'local-results/parse';
+            $dir = 'local-results/autocomplete';
             File::ensureDirectoryExists(storage_path($dir));
             $now = now()->format('Y-m-d-H-i-s');
 
-            File::put(storage_path("{$dir}/result-{$now}.json"), $result->toJson(JSON_PRETTY_PRINT));
+            File::put(storage_path("{$dir}/full-{$now}.json"), $result->toJson(JSON_PRETTY_PRINT));
+            File::put(storage_path("{$dir}/autocomplete-{$now}.json"), json_encode($autocompleting->flip(), JSON_PRETTY_PRINT));
 
             if (!$this->option('from-file')) {
-                File::put(storage_path("{$dir}/result-{$now}.php"), $code);
+                File::put(storage_path("{$dir}/autocomplete-{$now}.php"), $code);
             }
         }
 
-        $autocompleting = $result->findAutocompleting();
-
         echo json_encode($autocompleting->flip(), $this->option('debug') ? JSON_PRETTY_PRINT : 0);
 
         // dd($autocompleting->flip(), 'Autocompleting');

app/Commands/CompileBinaryCommand.php

@@ -31,6 +31,8 @@ public function handle(): void
             confirm('Continue?', true);
         }
 
+        exec('mv ' . base_path('.env') . ' ' . base_path('.env.bak'));
+
         $extensions = collect([
             'bcmath',
             'calendar',
@@ -75,5 +77,7 @@ public function handle(): void
                 echo $output;
             });
         });
+
+        exec('mv ' . base_path('.env.bak') . ' ' . base_path('.env'));
     }
 }

app/Commands/ContextTypeScriptGeneratorCommand.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Commands;
+
+use App\Parser\DetectWalker;
+use Illuminate\Support\Facades\File;
+use LaravelZero\Framework\Commands\Command;
+
+use function Laravel\Prompts\info;
+
+class ContextTypeScriptGeneratorCommand extends Command
+{
+    protected $signature = 'generate-ts';
+
+    protected $description = 'Generate TS for Context classes';
+
+    public function handle(): void
+    {
+        $this->line('namespace AutocompleteParsingResult {');
+
+        $classes = collect(glob(base_path('app/Contexts/*.php')))
+            ->filter(fn($file) => !str_contains($file, 'Abstract'));
+
+        $this->line("type Result = " . $classes->map(fn($file) => pathinfo($file, PATHINFO_FILENAME))->join(' | ') . ';');
+
+        $this->newLine();
+
+        $classes->each(function ($file) {
+            $className = pathinfo($file, PATHINFO_FILENAME);
+            $namespace = 'App\\Contexts\\' . $className;
+
+            $this->line("export interface {$className} {");
+
+            $inst = new $namespace;
+
+            $reflection = new \ReflectionClass($inst);
+
+            $this->line("type: '{$inst->type()}';");
+            $this->line("parent: Result | null;");
+
+            if ($reflection->getProperty('hasChildren')->getValue($inst)) {
+                $this->line("children: Result[];");
+            }
+
+            $properties = collect($reflection->getProperties(\ReflectionProperty::IS_PUBLIC))
+                ->filter(fn($prop) => !in_array($prop->getName(), [
+                    'children',
+                    'autocompleting',
+                    'freshObject',
+                    'hasChildren',
+                    'parent',
+                    'label'
+                ]))
+                ->map(fn($prop) => [
+                    'name' => $prop->getName(),
+                    'type' => str_replace('App\Contexts\\', '', $prop->getType()?->getName() ?? 'any'),
+                    'default' => $prop->getValue($inst)
+                ])
+                ->each(function ($prop) {
+                    $addon = ($prop['default'] === null) ? ' | null' : '';
+                    $this->line("{$prop['name']}: {$prop['type']}{$addon};");
+                });
+
+
+
+            $this->line("}");
+            $this->newLine();
+        });
+
+        $this->line('}');
+    }
+}

app/Commands/DetectCommand.php

@@ -20,8 +20,6 @@ public function handle(): void
             $code = file_get_contents(__DIR__ . '/../../tests/snippets/detect/' . $this->option('from-file') . '.php');
         }
 
-        // file_put_contents(__DIR__ . '/code.txt', $this->argument('code'));
-
         $walker = new DetectWalker($code, (bool) $this->option('debug'));
         $result = $walker->walk();
 

app/Contexts/Argument.php

@@ -4,19 +4,28 @@
 
 class Argument extends AbstractContext
 {
+    public ?string $name = null;
+
     public function type(): string
     {
         return 'argument';
     }
 
+    public function castToArray(): array
+    {
+        return [
+            'name' => $this->name,
+        ];
+    }
+
     public function isAutoCompleting(): bool
     {
         if ($this->autocompleting) {
             return true;
         }
 
         return collect($this->children)->first(
-            fn ($child) => $child->autocompleting
+            fn($child) => $child->autocompleting
         ) !== null;
     }
 }

app/Parser/DetectWalker.php

@@ -7,6 +7,7 @@
 use Microsoft\PhpParser\MissingToken;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\Node\Expression\AnonymousFunctionCreationExpression;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
 use Microsoft\PhpParser\Node\Expression\ArrayCreationExpression;
 use Microsoft\PhpParser\Node\Expression\ArrowFunctionCreationExpression;
 use Microsoft\PhpParser\Node\Expression\CallExpression;
@@ -66,10 +67,15 @@ public function walk(?Node $node = null)
                 $this->debug('CALL EXPRESSION', $child::class, $child->getText());
                 $this->parseCallExpression($child);
             }
+
+            if ($child instanceof ObjectCreationExpression) {
+                $this->debug('OBJECT CREATION EXPRESSION', $child::class, $child->getText());
+                $this->parseObjectCreationExpression($child);
+            }
         }
 
         // TODO: These results are not unique maybe?
-        return collect($this->items)->unique(fn ($item) => json_encode($item))->values();
+        return collect($this->items)->unique(fn($item) => json_encode($item))->values();
     }
 
     protected function parsePotentialBlade(InlineHtml $node)
@@ -197,6 +203,21 @@ protected function parseCallExpression(CallExpression $node)
         }
     }
 
+    protected function parseObjectCreationExpression(ObjectCreationExpression $node)
+    {
+        $item = new DetectedItem;
+
+        $item->classUsed = (string) $node->classTypeDesignator->getResolvedName();
+
+        foreach ($node->argumentExpressionList->getElements() as $child) {
+            foreach ($child->getChildNodes() as $argument) {
+                $item->params[] = $this->parseArgument($argument);
+            }
+        }
+
+        $this->items[] = $item->toArray();
+    }
+
     protected function parseQualifiedCallExpression(CallExpression $node)
     {
         $item = new DetectedItem;
@@ -400,7 +421,7 @@ protected function parseArgument($argument)
             return [
                 'type'  => 'string',
                 'value' => $argument->getStringContentsText(),
-                // 'index' => $this->context->paramIndex,
+                'name' =>  $argument->parent instanceof ArgumentExpression ? $argument->parent->name?->getText($this->sourceFile->getFullText()) : null,
                 'start' => [
                     'line'   => $range->start->line,
                     'column' => $range->start->character,

app/Parsers/ArgumentExpressionParser.php

@@ -10,12 +10,14 @@
 class ArgumentExpressionParser extends AbstractParser
 {
     /**
-     * @var MethodCall
+     * @var Argument
      */
     protected AbstractContext $context;
 
     public function parse(ArgumentExpression $node)
     {
+        $this->context->name = $node->name?->getText($node->getFileContents());
+
         return $this->context;
     }
 

bin/php-parser-0.1.1

@@ -11,7 +11,7 @@
     "homepage": "https://laravel-zero.com",
     "type": "project",
     "license": "MIT",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "support": {
         "issues": "https://github.com/laravel-zero/laravel-zero/issues",
         "source": "https://github.com/laravel-zero/laravel-zero"