Query: parse as AST

src/Query/Query.php

@@ -11,6 +11,10 @@
 use Kirby\Cms\User;
 use Kirby\Image\QrCode;
 use Kirby\Toolkit\I18n;
+use Kirby\Toolkit\Query\Runner;
+use Kirby\Toolkit\Query\Runners\Interpreted;
+use Kirby\Toolkit\Query\Runners\Transpiled;
+use Kirby\Toolkit\Query\Visitor;
 
 /**
  * The Query class can be used to query arrays and objects,
@@ -60,24 +64,16 @@
 	/**
 	 * Method to help classes that extend Query
 	 * to intercept a segment's result.
+	 *
+	 * @deprecated 5.0.0 Will be removed in 6.0.0
 	 */
 	public function intercept(mixed $result): mixed
 	{
 		return $result;
 	}
 
-	/**
-	 * Returns the query result if anything
-	 * can be found, otherwise returns null
-	 *
-	 * @throws \Kirby\Exception\BadMethodCallException If an invalid method is accessed by the query
-	 */
-	public function resolve(array|object $data = []): mixed
+	private function resolve_legacy(array|object $data = []): mixed
 	{
-		if (empty($this->query) === true) {
-			return $data;
-		}
-
 		// merge data with default entries
 		if (is_array($data) === true) {
 			$data = [...static::$entries, ...$data];
@@ -99,6 +95,26 @@
 
 		// loop through all segments to resolve query
 		return Expression::factory($this->query, $this)->resolve($data);
+
+	}
+
+	/**
+	 * Returns the query result if anything
+	 * can be found, otherwise returns null
+	 *
+	 * @throws \Kirby\Exception\BadMethodCallException If an invalid method is accessed by the query
+	 */
+	public function resolve(array|object $data = []): mixed
+	{
+		if (empty($this->query) === true) {
+			return $data;
+		}
+
+		return match(option('query.runner', 'interpreted')) {
+			'transpiled' => (new Transpiled(static::$entries))->run($this->query, $data),
+			'interpreted' => (new Interpreted(static::$entries))->run($this->query, $data),
+			default => $this->resolve_legacy($data)
+		};
 	}
 }
 

src/Toolkit/Query/AST/ArgumentList.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class ArgumentList extends Node {
+	public function __construct(
+		public array $arguments,
+	) {}
+}

src/Toolkit/Query/AST/ArrayList.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class ArrayList extends Node {
+	public function __construct(
+		public array $elements,
+	) {}
+}

src/Toolkit/Query/AST/Closure.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class Closure extends Node
+{
+	public function __construct(
+		public ArgumentList $arguments,
+		public Node $body,
+	) {
+	}
+}

src/Toolkit/Query/AST/Coalesce.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class Coalesce extends Node {
+	public function __construct(
+		public Node $left,
+		public Node $right,
+	) {}
+}

src/Toolkit/Query/AST/GlobalFunction.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class GlobalFunction extends Node {
+	public function __construct(
+		public string $name,
+		public ArgumentList $arguments,
+	) {}
+}

src/Toolkit/Query/AST/Literal.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class Literal extends Node {
+	public function __construct(
+		public mixed $value,
+	) {}
+}

src/Toolkit/Query/AST/MemberAccess.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class MemberAccess extends Node {
+	public function __construct(
+		public Node $object,
+		public string $member,
+		public ?ArgumentList $arguments = null,
+		public bool $nullSafe = false,
+	) {}
+}

src/Toolkit/Query/AST/Node.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+use Kirby\Toolkit\Query\Visitor;
+
+class Node {
+	public function accept(Visitor $visitor) {
+		return $visitor->visitNode($this);
+	}
+}

src/Toolkit/Query/AST/Ternary.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class Ternary extends Node {
+	public function __construct(
+		public Node $condition,
+		public ?Node $trueBranch,
+		public Node $falseBranch,
+
+		public bool $trueBranchIsDefault = false,
+	) {}
+}

src/Toolkit/Query/AST/Variable.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Kirby\Toolkit\Query\AST;
+
+class Variable extends Node {
+	public function __construct(
+		public string $name,
+	) {}
+}

src/Toolkit/Query/BaseParser.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Kirby\Toolkit\Query;
+
+use Iterator;
+
+abstract class BaseParser {
+	protected ?Token $previous;
+	protected Token $current;
+
+	/**
+	 * @var Iterator<Token>
+	 */
+	protected Iterator $tokens;
+
+
+	public function __construct(
+		Tokenizer|Iterator $source,
+	) {
+		if($source instanceof Tokenizer) {
+			$this->tokens = $source->tokenize();
+		} else {
+			$this->tokens = $source;
+		}
+
+		$first = $this->tokens->current();
+
+		if ($first === null) {
+			throw new \Exception('No tokens found.');
+		}
+
+		$this->current = $first;
+	}
+
+	protected function consume(TokenType $type, string $message): Token {
+		if ($this->check($type)) {
+			return $this->advance();
+		}
+
+		throw new \Exception($message);
+	}
+
+	protected function check(TokenType $type): bool {
+		if ($this->isAtEnd()) {
+			return false;
+		}
+
+		return $this->current->type === $type;
+	}
+
+	protected function advance(): ?Token {
+		if (!$this->isAtEnd()) {
+			$this->previous = $this->current;
+			$this->tokens->next();
+			$this->current = $this->tokens->current();
+		}
+
+		return $this->previous;
+	}
+
+	protected function isAtEnd(): bool {
+		return $this->current->type === TokenType::EOF;
+	}
+
+
+	protected function match(TokenType $type): Token|false {
+		if ($this->check($type)) {
+			return $this->advance();
+		}
+
+		return false;
+	}
+
+	protected function matchAny(array $types): Token|false {
+		foreach ($types as $type) {
+			if ($this->check($type)) {
+				return $this->advance();
+			}
+		}
+
+		return false;
+	}
+}