detect now uses parse

Author: joetannenbaum

app/Contexts/AbstractContext.php

@@ -3,6 +3,7 @@
 namespace App\Contexts;
 
 use Illuminate\Support\Arr;
+use Microsoft\PhpParser\Range;
 
 abstract class AbstractContext
 {
@@ -16,6 +17,10 @@ abstract class AbstractContext
 
     protected ?AbstractContext $parent = null;
 
+    public array $start = [];
+
+    public array $end = [];
+
     abstract public function type(): string;
 
     public function castToArray(): array
@@ -138,6 +143,8 @@ public function toArray(): array
             $this->autocompleting ? ['autocompleting' => true] : [],
             $this->castToArray(),
             ($this->label !== '') ? ['label' => $this->label] : [],
+            (count($this->start) > 0) ? ['start' => $this->start] : [],
+            (count($this->end) > 0) ? ['end' => $this->end] : [],
             ($this->hasChildren)
                 ? ['children' => array_map(fn ($child) => $child->toArray(), $this->children)]
                 : [],
@@ -148,4 +155,17 @@ public function toJson($flags = 0)
     {
         return json_encode($this->toArray(), $flags);
     }
+
+    public function setPosition(Range $range)
+    {
+        $this->start = [
+            'line'   => $range->start->line,
+            'column' => $range->start->character,
+        ];
+
+        $this->end = [
+            'line'   => $range->end->line,
+            'column' => $range->end->character,
+        ];
+    }
 }

app/Parser/DetectWalker.php

@@ -2,7 +2,9 @@
 
 namespace App\Parser;
 
+use App\Contexts\AbstractContext;
 use App\Support\Debugs;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Microsoft\PhpParser\MissingToken;
 use Microsoft\PhpParser\Node;
@@ -53,8 +55,32 @@ public function __construct(protected string $document, $debug = false)
         $this->context = new DetectContext;
     }
 
+    protected function handleContext(Node $node, AbstractContext $context)
+    {
+        $nodesToDetect = [
+            CallExpression::class,
+            ObjectCreationExpression::class,
+        ];
+
+        foreach ($nodesToDetect as $nodeClass) {
+            if ($node instanceof $nodeClass) {
+                $this->items[] = $context;
+            }
+        }
+    }
+
     public function walk(?Node $node = null)
     {
+        SourceFile::$sourceFile = $this->sourceFile;
+        Settings::$capturePosition = true;
+
+        Parse::parse(
+            node: $this->sourceFile,
+            callback: $this->handleContext(...),
+        );
+
+        return collect($this->items)->map(fn ($item) => Arr::except($item->toArray(), 'children'));
+
         $node = $this->nextNodeToWalk ?? $node ?? $this->sourceFile;
         $this->nextNodeToWalk = null;
 
@@ -85,11 +111,11 @@ protected function parsePotentialBlade(InlineHtml $node)
                 $this->parseBladeDirective($node);
             }
 
-            // if ($node instanceof EchoNode) {
-            //     $walker = new static('<?php ' . $node->innerContent);
-            //     TODO: Parse this and re-calc the offsets
-            //     var_dump($walker->walk());
-            // }
+            if ($node instanceof EchoNode) {
+                $walker = new static('<?php ' . $node->innerContent);
+                // TODO: Parse this and re-calc the offsets
+                dd($node, $walker->walk());
+            }
 
             $this->debug('potential blade node', $node::class);
         }

app/Parser/Parse.php

@@ -10,7 +10,7 @@ class Parse
 {
     public static $debug = false;
 
-    public static function parse(Node $node, $depth = 0, ?AbstractContext $currentContext = null)
+    public static function parse(Node $node, $depth = 0, ?AbstractContext $currentContext = null, ?callable $callback = null)
     {
         if ($currentContext === null) {
             self::debugBreak();
@@ -44,10 +44,14 @@ public static function parse(Node $node, $depth = 0, ?AbstractContext $currentCo
             self::debugBreak();
 
             $context = $parser->parseNode($node);
+
+            if ($callback) {
+                $callback($node, $context);
+            }
         }
 
         foreach ($node->getChildNodes() as $child) {
-            self::parse($child, $depth + 1, $context);
+            self::parse($child, $depth + 1, $context, $callback);
         }
 
         return $context;

app/Parser/Settings.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Parser;
+
+class Settings
+{
+    public static bool $capturePosition = false;
+}

app/Parsers/StringLiteralParser.php

@@ -4,7 +4,10 @@
 
 use App\Contexts\AbstractContext;
 use App\Contexts\StringValue;
+use App\Parser\Settings;
+use App\Parser\SourceFile;
 use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\PositionUtilities;
 
 class StringLiteralParser extends AbstractParser
 {
@@ -17,6 +20,16 @@ public function parse(StringLiteral $node)
     {
         $this->context->value = $node->getStringContentsText();
 
+        if (Settings::$capturePosition) {
+            $this->context->setPosition(
+                PositionUtilities::getRangeFromPosition(
+                    $node->getStartPosition(),
+                    mb_strlen($node->getStringContentsText()),
+                    SourceFile::fullText(),
+                ),
+            );
+        }
+
         return $this->context;
     }