From ba18ed9176af89d22c144aacc1b68834e8ab36b7 Mon Sep 17 00:00:00 2001
From: Brandon <brandon@tendency.me>
Date: Tue, 26 Mar 2024 08:37:05 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20parsing=20when=20using=20t?=
 =?UTF-8?q?he=20`@image`=20directive=20(Fixes=20#135,=20Fixes=20#117)=20?=
 =?UTF-8?q?=E2=99=BB=20Refactor=20directives=20into=20classes=20?=
 =?UTF-8?q?=F0=9F=8E=A8=20Improve=20directive=20registration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Contracts/Directives.php          |   11 +
 src/Directives/Acf.php                |  525 ++++++-----
 src/Directives/Directives.php         |  155 ++++
 src/Directives/Helpers.php            |  566 ++++++------
 src/Directives/WordPress.php          | 1164 ++++++++++++-------------
 src/SageDirectivesServiceProvider.php |   32 +-
 src/Util.php                          |  176 ----
 7 files changed, 1299 insertions(+), 1330 deletions(-)
 create mode 100644 src/Contracts/Directives.php
 create mode 100644 src/Directives/Directives.php
 delete mode 100644 src/Util.php

diff --git a/src/Contracts/Directives.php b/src/Contracts/Directives.php
new file mode 100644
index 0000000..8551d88
--- /dev/null
+++ b/src/Contracts/Directives.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Log1x\SageDirectives\Contracts;
+
+interface Directives
+{
+    /**
+     * The directives to register.
+     */
+    public function directives(): array;
+}
diff --git a/src/Directives/Acf.php b/src/Directives/Acf.php
index 5c1ee4c..90ba37c 100644
--- a/src/Directives/Acf.php
+++ b/src/Directives/Acf.php
@@ -2,305 +2,300 @@
 
 namespace Log1x\SageDirectives\Directives;
 
-use Illuminate\Support\Str;
-use Log1x\SageDirectives\Util;
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | ACF Directives
-    |--------------------------------------------------------------------------
-    |
-    | Directives specific to Advanced Custom Fields.
-    |
-    */
-
-    /*
-    |---------------------------------------------------------------------
-    | @fields / @endfields / @hasfields / @endhasfields
-    |---------------------------------------------------------------------
-    */
-
-    'fields' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (have_rows({$expression->get(0)}, {$expression->get(1)})) : ?>".
-                   "<?php while (have_rows({$expression->get(0)}, {$expression->get(1)})) : the_row(); ?>";
-        }
-
-        return "<?php if (have_rows({$expression})) : ?>".
-               "<?php while (have_rows({$expression})) : the_row(); ?>";
-    },
-
-    'endfields' => function () {
-        return '<?php endwhile; endif; ?>';
-    },
-
-    'hasfields' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (have_rows({$expression->get(0)}, {$expression->get(1)})) : ?>";
-        }
-
-        return "<?php if (have_rows({$expression})) : ?>";
-    },
-
-    'endhasfields' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @field / @hasfield / @isfield / @endfield
-    |---------------------------------------------------------------------
-    */
-
-    'field' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            if (Util::isIdentifier($expression->get(2))) {
-                if (empty($expression->get(3))) {
-                    $expression->put(3, 'true');
+class Acf extends Directives
+{
+    /**
+     * The Advanced Custom Fields directives.
+     */
+    public function directives(): array
+    {
+        return [
+            /*
+            |---------------------------------------------------------------------
+            | @fields / @endfields / @hasfields / @endhasfields
+            |---------------------------------------------------------------------
+            */
+
+            'fields' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (have_rows({$expression->get(0)}, {$expression->get(1)})) : ?>".
+                        "<?php while (have_rows({$expression->get(0)}, {$expression->get(1)})) : the_row(); ?>";
                 }
 
-                return "<?php echo get_field({$expression->get(0)}, {$expression->get(2)}, {$expression->get(3)})[{$expression->get(1)}]; ?>";
-            }
+                return "<?php if (have_rows({$expression})) : ?>".
+                    "<?php while (have_rows({$expression})) : the_row(); ?>";
+            },
 
-            if (Util::isIdentifier($expression->get(1))) {
-                if (empty($expression->get(2))) {
-                    $expression->put(2, 'true');
+            'endfields' => function () {
+                return '<?php endwhile; endif; ?>';
+            },
+
+            'hasfields' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (have_rows({$expression->get(0)}, {$expression->get(1)})) : ?>";
+                }
+
+                return "<?php if (have_rows({$expression})) : ?>";
+            },
+
+            'endhasfields' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @field / @hasfield / @isfield / @endfield
+            |---------------------------------------------------------------------
+            */
+
+            'field' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    if ($this->isToken($expression->get(2))) {
+                        if (empty($expression->get(3))) {
+                            $expression->put(3, 'true');
+                        }
+
+                        return "<?php echo get_field({$expression->get(0)}, {$expression->get(2)}, {$expression->get(3)})[{$expression->get(1)}]; ?>";
+                    }
+
+                    if ($this->isToken($expression->get(1))) {
+                        if (empty($expression->get(2))) {
+                            $expression->put(2, 'true');
+                        }
+
+                        return "<?php echo get_field({$expression->get(0)}, {$expression->get(1)}, {$expression->get(2)}); ?>";
+                    }
+
+                    if (empty($expression->get(2))) {
+                        $expression->put(2, 'true');
+                    }
+
+                    return "<?php echo get_field({$expression->get(0)}, null, {$expression->get(2)})[{$expression->get(1)}]; ?>";
                 }
 
-                return "<?php echo get_field({$expression->get(0)}, {$expression->get(1)}, {$expression->get(2)}); ?>";
-            }
+                return "<?php echo get_field({$expression}); ?>";
+            },
 
-            if (empty($expression->get(2))) {
-                $expression->put(2, 'true');
-            }
+            'hasfield' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
 
-            return "<?php echo get_field({$expression->get(0)}, null, {$expression->get(2)})[{$expression->get(1)}]; ?>";
-        }
+                    if ($this->isToken($expression->get(2))) {
+                        return "<?php if (get_field({$expression->get(0)}, {$expression->get(2)})[{$expression->get(1)}]) : ?>";
+                    }
 
-        return "<?php echo get_field({$expression}); ?>";
-    },
+                    if ($this->isToken($expression->get(1))) {
+                        return "<?php if (get_field({$expression->get(0)}, {$expression->get(1)})) : ?>";
+                    }
 
-    'hasfield' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
+                    return "<?php if (get_field({$expression->get(0)})[{$expression->get(1)}]) : ?>";
+                }
 
-            if (Util::isIdentifier($expression->get(2))) {
-                return "<?php if (get_field({$expression->get(0)}, {$expression->get(2)})[{$expression->get(1)}]) : ?>";
-            }
+                return "<?php if (get_field({$expression})) : ?>";
+            },
 
-            if (Util::isIdentifier($expression->get(1))) {
-                return "<?php if (get_field({$expression->get(0)}, {$expression->get(1)})) : ?>";
-            }
+            'isfield' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
 
-            return "<?php if (get_field({$expression->get(0)})[{$expression->get(1)}]) : ?>";
-        }
+                    if ($this->isToken($expression->get(3))) {
+                        return "<?php if (get_field({$expression->get(0)}, {$expression->get(3)})[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
+                    }
 
-        return "<?php if (get_field({$expression})) : ?>";
-    },
+                    if ($this->isToken($expression->get(2))) {
+                        return "<?php if (get_field({$expression->get(0)}, {$expression->get(2)}) === {$expression->get(1)}) : ?>"; // phpcs:ignore
+                    }
 
-    'isfield' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
+                    if (! empty($expression->get(2)) && ! $this->isToken($expression->get(2))) {
+                        return "<?php if (get_field({$expression->get(0)})[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
+                    }
 
-            if (Util::isIdentifier($expression->get(3))) {
-                return "<?php if (get_field({$expression->get(0)}, {$expression->get(3)})[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
-            }
+                    return "<?php if (get_field({$expression->get(0)}) === {$expression->get(1)}) : ?>";
+                }
+            },
 
-            if (Util::isIdentifier($expression->get(2))) {
-                return "<?php if (get_field({$expression->get(0)}, {$expression->get(2)}) === {$expression->get(1)}) : ?>"; // phpcs:ignore
-            }
+            'endfield' => function () {
+                return '<?php endif; ?>';
+            },
 
-            if (! empty($expression->get(2)) && ! Util::isIdentifier($expression->get(2))) {
-                return "<?php if (get_field({$expression->get(0)})[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
-            }
+            /*
+            |---------------------------------------------------------------------
+            | @sub / @hassub / @issub / @endsub
+            |---------------------------------------------------------------------
+            */
 
-            return "<?php if (get_field({$expression->get(0)}) === {$expression->get(1)}) : ?>";
-        }
-    },
+            'sub' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
 
-    'endfield' => function () {
-        return '<?php endif; ?>';
-    },
+                    if (! empty($expression->get(2))) {
+                        return "<?php echo get_sub_field({$expression->get(0)})[{$expression->get(1)}][{$expression->get(2)}]; ?>";
+                    }
 
-    /*
-    |---------------------------------------------------------------------
-    | @sub / @hassub / @issub / @endsub
-    |---------------------------------------------------------------------
-    */
+                    return "<?php echo get_sub_field({$expression->get(0)})[{$expression->get(1)}]; ?>";
+                }
 
-    'sub' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
+                return "<?php echo get_sub_field({$expression}); ?>";
+            },
 
-            if (! empty($expression->get(2))) {
-                return "<?php echo get_sub_field({$expression->get(0)})[{$expression->get(1)}][{$expression->get(2)}]; ?>";
-            }
+            'hassub' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
 
-            return "<?php echo get_sub_field({$expression->get(0)})[{$expression->get(1)}]; ?>";
-        }
+                    if (! empty($expression->get(2))) {
+                        return "<?php if (get_sub_field({$expression->get(0)})[{$expression->get(1)}][{$expression->get(2)}]) : ?>"; // phpcs:ignore
+                    }
 
-        return "<?php echo get_sub_field({$expression}); ?>";
-    },
+                    return "<?php if (get_sub_field({$expression->get(0)})[{$expression->get(1)}]) : ?>";
+                }
 
-    'hassub' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
+                return "<?php if (get_sub_field({$expression})) : ?>";
+            },
 
-            if (! empty($expression->get(2))) {
-                return "<?php if (get_sub_field({$expression->get(0)})[{$expression->get(1)}][{$expression->get(2)}]) : ?>"; // phpcs:ignore
-            }
+            'issub' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
 
-            return "<?php if (get_sub_field({$expression->get(0)})[{$expression->get(1)}]) : ?>";
-        }
+                    if (! empty($expression->get(2))) {
+                        return "<?php if (get_sub_field({$expression->get(0)})[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
+                    }
 
-        return "<?php if (get_sub_field({$expression})) : ?>";
-    },
+                    return "<?php if (get_sub_field({$expression->get(0)}) === {$expression->get(1)}) : ?>";
+                }
+            },
+
+            'endsub' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @layouts / @endlayouts
+            |---------------------------------------------------------------------
+            */
 
-    'issub' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
+            'layouts' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (have_rows({$expression->get(0)}, {$expression->get(1)})) : ?>".
+                        "<?php while (have_rows({$expression->get(0)}, {$expression->get(1)})) : the_row(); ?>";
+                }
 
-            if (! empty($expression->get(2))) {
-                return "<?php if (get_sub_field({$expression->get(0)})[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
-            }
+                return "<?php if (have_rows({$expression})) : ?>".
+                    "<?php while (have_rows({$expression})) : the_row(); ?>";
+            },
 
-            return "<?php if (get_sub_field({$expression->get(0)}) === {$expression->get(1)}) : ?>";
-        }
-    },
-
-    'endsub' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @layouts / @endlayouts
-    |---------------------------------------------------------------------
-    */
-
-    'layouts' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (have_rows({$expression->get(0)}, {$expression->get(1)})) : ?>".
-                   "<?php while (have_rows({$expression->get(0)}, {$expression->get(1)})) : the_row(); ?>";
-        }
-
-        return "<?php if (have_rows({$expression})) : ?>".
-               "<?php while (have_rows({$expression})) : the_row(); ?>";
-    },
-
-    'endlayouts' => function () {
-        return '<?php endwhile; endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @layout / @endlayout
-    |---------------------------------------------------------------------
-    */
-
-    'layout' => function ($expression) {
-        return "<?php if (get_row_layout() === {$expression}) : ?>";
-    },
-
-    'endlayout' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @group / @endgroup
-    |---------------------------------------------------------------------
-    */
+            'endlayouts' => function () {
+                return '<?php endwhile; endif; ?>';
+            },
 
-    'group' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
+            /*
+            |---------------------------------------------------------------------
+            | @layout / @endlayout
+            |---------------------------------------------------------------------
+            */
 
-            return "<?php if (have_rows({$expression->get(0)}, {$expression->get(1)})) : ?>".
-                   "<?php while (have_rows({$expression->get(0)}, {$expression->get(1)})) : the_row(); ?>";
-        }
+            'layout' => function ($expression) {
+                return "<?php if (get_row_layout() === {$expression}) : ?>";
+            },
 
-        return "<?php if (have_rows({$expression})) : ?>".
-               "<?php while (have_rows({$expression})) : the_row(); ?>";
-    },
+            'endlayout' => function () {
+                return '<?php endif; ?>';
+            },
 
-    'endgroup' => function () {
-        return '<?php endwhile; endif; ?>';
-    },
+            /*
+            |---------------------------------------------------------------------
+            | @group / @endgroup
+            |---------------------------------------------------------------------
+            */
 
-    /*
-    |---------------------------------------------------------------------
-    | @options / @endoptions / @hasoptions / @endhasoptions
-    |---------------------------------------------------------------------
-    */
+            'group' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
 
-    'options' => function ($expression) {
-        return "<?php if (have_rows({$expression}, 'option')) : ?>".
-               "<?php while (have_rows({$expression}, 'option')) : the_row(); ?>";
-    },
-
-    'endoptions' => function () {
-        return '<?php endwhile; endif; ?>';
-    },
-
-    'hasoptions' => function ($expression) {
-        return "<?php if (have_rows({$expression}, 'option')) : ?>";
-    },
-
-    'endhasoptions' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @option / @hasoption / @isoption / @endoption
-    |---------------------------------------------------------------------
-    */
-
-    'option' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php echo get_field({$expression->get(0)}, 'option')[{$expression->get(1)}]; ?>";
-        }
-
-        return "<?php echo get_field({$expression}, 'option'); ?>";
-    },
-
-    'hasoption' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (get_field({$expression->get(0)}, 'option')[{$expression->get(1)}]) : ?>";
-        }
-
-        return "<?php if (get_field({$expression}, 'option')) : ?>";
-    },
-
-    'isoption' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            if (! empty($expression->get(2))) {
-                return "<?php if (get_field({$expression->get(0)}, 'option')[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
-            }
-
-            return "<?php if (get_field({$expression->get(0)}, 'option') === {$expression->get(1)}) : ?>";
-        }
-    },
-
-    'endoption' => function () {
-        return '<?php endif; ?>';
-    },
-
-];
+                    return "<?php if (have_rows({$expression->get(0)}, {$expression->get(1)})) : ?>".
+                        "<?php while (have_rows({$expression->get(0)}, {$expression->get(1)})) : the_row(); ?>";
+                }
+
+                return "<?php if (have_rows({$expression})) : ?>".
+                    "<?php while (have_rows({$expression})) : the_row(); ?>";
+            },
+
+            'endgroup' => function () {
+                return '<?php endwhile; endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @options / @endoptions / @hasoptions / @endhasoptions
+            |---------------------------------------------------------------------
+            */
+
+            'options' => function ($expression) {
+                return "<?php if (have_rows({$expression}, 'option')) : ?>".
+                    "<?php while (have_rows({$expression}, 'option')) : the_row(); ?>";
+            },
+
+            'endoptions' => function () {
+                return '<?php endwhile; endif; ?>';
+            },
+
+            'hasoptions' => function ($expression) {
+                return "<?php if (have_rows({$expression}, 'option')) : ?>";
+            },
+
+            'endhasoptions' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @option / @hasoption / @isoption / @endoption
+            |---------------------------------------------------------------------
+            */
+
+            'option' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php echo get_field({$expression->get(0)}, 'option')[{$expression->get(1)}]; ?>";
+                }
+
+                return "<?php echo get_field({$expression}, 'option'); ?>";
+            },
+
+            'hasoption' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (get_field({$expression->get(0)}, 'option')[{$expression->get(1)}]) : ?>";
+                }
+
+                return "<?php if (get_field({$expression}, 'option')) : ?>";
+            },
+
+            'isoption' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    if (! empty($expression->get(2))) {
+                        return "<?php if (get_field({$expression->get(0)}, 'option')[{$expression->get(1)}] === {$expression->get(2)}) : ?>"; // phpcs:ignore
+                    }
+
+                    return "<?php if (get_field({$expression->get(0)}, 'option') === {$expression->get(1)}) : ?>";
+                }
+            },
+
+            'endoption' => function () {
+                return '<?php endif; ?>';
+            },
+        ];
+    }
+}
diff --git a/src/Directives/Directives.php b/src/Directives/Directives.php
new file mode 100644
index 0000000..c6c1989
--- /dev/null
+++ b/src/Directives/Directives.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace Log1x\SageDirectives\Directives;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Str;
+use Log1x\SageDirectives\Contracts\Directives as DirectivesContract;
+
+abstract class Directives implements DirectivesContract
+{
+    /**
+     * The register state.
+     */
+    protected bool $registered = false;
+
+    /**
+     * Make an instance of the Directives.
+     */
+    public static function make(): self
+    {
+        return new static();
+    }
+
+    /**
+     * Register the Directives.
+     */
+    public function register(): void
+    {
+        if ($this->registered) {
+            return;
+        }
+
+        foreach ($this->directives() as $function => $directive) {
+            Blade::directive($function, $directive);
+        }
+
+        $this->registered = true;
+    }
+
+    /**
+     * Parse the expression into a collection.
+     */
+    public function parse(string $expression, int $limit = PHP_INT_MAX, string $delimiter = '__comma__'): Collection
+    {
+        $expression = preg_replace_callback(
+            '/\'(.*?)\'|"(.*?)"/',
+            fn ($matches) => str_replace(',', $delimiter, $matches[0]),
+            $expression
+        );
+
+        return Collection::make(explode(',', $expression, $limit))
+            ->map(function ($item) use ($delimiter) {
+                $item = Str::of($item)
+                    ->replace($delimiter, ',')
+                    ->trim()
+                    ->toString();
+
+                return ! is_numeric($item) ? $item : (int) $item;
+            });
+    }
+
+    /**
+     * Determine if the expression should be parsed.
+     */
+    public function shouldParse(?string $expression = ''): bool
+    {
+        return Str::contains($expression, ',');
+    }
+
+    /**
+     * Determine if the expression is a potential token.
+     */
+    public function isToken(?string $expression = ''): bool
+    {
+        $expression = $this->strip($expression);
+
+        return ! empty($expression) && (is_numeric($expression) || Str::startsWith($expression, ['$', 'get_']));
+    }
+
+    /**
+     * Strip single quotes from the expression.
+     */
+    public function strip(?string $expression = '', array $characters = ["'", '"']): string
+    {
+        return str_replace($characters, '', $expression ?? '');
+    }
+
+    /**
+     * Wraps the passed string in single quotes if they are not already present.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    public function wrap($value)
+    {
+        $value = Str::start($value, "'");
+        $value = Str::finish($value, "'");
+
+        return $value;
+    }
+
+    /**
+     * Unwraps the passed string from the passed delimiter.
+     */
+    public function unwrap(?string $value = '', string $delimiter = "'"): string
+    {
+        if (Str::startsWith($value, $delimiter)) {
+            $value = Str::replaceFirst($delimiter, '', $value);
+        }
+
+        if (Str::endsWith($value, $delimiter)) {
+            $value = Str::replaceLast($delimiter, '', $value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Convert an array expression to a string.
+     */
+    public function toString(string|array|null $expression = '', bool $single = false): string
+    {
+        if (! is_array($expression)) {
+            return $this->wrap($expression);
+        }
+
+        $keys = '';
+
+        foreach ($expression as $key => $value) {
+            $keys .= $single ?
+                $this->wrap($value).',' :
+                $this->wrap($key).' => '.$this->wrap($value).', ';
+        }
+
+        $keys = trim(Str::replaceLast(',', '', $keys));
+
+        if (! $single) {
+            $keys = Str::start($keys, '[');
+            $keys = Str::finish($keys, ']');
+        }
+
+        return $keys;
+    }
+
+    /**
+     * Determine if the expression looks like an array.
+     */
+    public function isArray(?string $expression = ''): bool
+    {
+        $expression = $this->unwrap($expression);
+
+        return Str::startsWith($expression, '[') && Str::endsWith($expression, ']');
+    }
+}
diff --git a/src/Directives/Helpers.php b/src/Directives/Helpers.php
index 6d06829..8a96db1 100644
--- a/src/Directives/Helpers.php
+++ b/src/Directives/Helpers.php
@@ -3,287 +3,285 @@
 namespace Log1x\SageDirectives\Directives;
 
 use Illuminate\Support\Str;
-use Log1x\SageDirectives\Util;
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Helper Directives
-    |--------------------------------------------------------------------------
-    |
-    | Simple helper directives for various functions used in views.
-    |
-    */
-
-    /*
-    |---------------------------------------------------------------------
-    | @istrue / @isfalse
-    |---------------------------------------------------------------------
-    */
-
-    'istrue' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (isset({$expression->get(0)}) && (bool) {$expression->get(0)} === true) : ?>".
-                   "<?php echo {$expression->get(1)}; ?>".
-                   '<?php endif; ?>';
-        }
-
-        return "<?php if (isset({$expression}) && (bool) {$expression} === true) : ?>";
-    },
-
-    'endistrue' => function () {
-        return '<?php endif; ?>';
-    },
-
-    'isfalse' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (isset({$expression->get(0)}) && (bool) {$expression->get(0)} === false) : ?>".
-                   "<?php echo {$expression->get(1)}; ?>".
-                   '<?php endif; ?>';
-        }
-
-        return "<?php if (isset({$expression}) && (bool) {$expression} === false) : ?>";
-    },
-
-    'endisfalse' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @isnull / @endisnull / @isnotnull / @endisnotnull
-    |---------------------------------------------------------------------
-    */
-
-    'isnull' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (is_null({$expression->get(0)})) : ?>".
-                   "<?php echo {$expression->get(1)}; ?>".
-                   '<?php endif; ?>';
-        }
-
-        return "<?php if (is_null({$expression})) : ?>";
-    },
-
-    'endisnull' => function () {
-        return '<?php endif; ?>';
-    },
-
-    'isnotnull' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (! is_null({$expression->get(0)})) : ?>".
-                   "<?php echo {$expression->get(1)}; ?>".
-                   '<?php endif; ?>';
-        }
-
-        return "<?php if (! is_null({$expression})) : ?>";
-    },
-
-    'endisnotnull' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @notempty / @endnotempty
-    |---------------------------------------------------------------------
-    */
-
-    'notempty' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (! empty({$expression->get(0)})) : ?>".
-                   "<?php echo {$expression->get(1)}; ?>".
-                   '<?php endif; ?>';
-        }
-
-        return "<?php if (! empty({$expression})) : ?>";
-    },
-
-    'endnotempty' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @instanceof / @endinstanceof
-    |---------------------------------------------------------------------
-    */
-
-    'instanceof' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (is_a({$expression->get(0)}, {$expression->get(1)})) : ?>";
-        }
-    },
-
-    'endinstanceof' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @typeof / @endtypeof
-    |---------------------------------------------------------------------
-    */
-
-    'typeof' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php if (gettype({$expression->get(0)}) === {$expression->get(1)}) : ?>";
-        }
-    },
-
-    'endtypeof' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @global
-    |---------------------------------------------------------------------
-    */
-
-    'global' => function ($expression) {
-        return "<?php global {$expression}; ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @set / @unset
-    |---------------------------------------------------------------------
-    */
-
-    'set' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression, 2);
-
-            return "<?php {$expression->get(0)} = {$expression->get(1)}; ?>";
-        }
-    },
-
-    'unset' => function ($expression) {
-        return "<?php unset({$expression}); ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @extract / @implode
-    |---------------------------------------------------------------------
-    */
-
-    'extract' => function ($expression) {
-        return "<?php extract({$expression}); ?>";
-    },
-
-    'implode' => function ($expression) {
-        if (Str::contains($expression, ',')) {
-            $expression = Util::parse($expression);
-
-            return "<?php echo implode({$expression->get(0)}, {$expression->get(1)}); ?>";
-        }
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @repeat / @endrepeat
-    |---------------------------------------------------------------------
-    */
-
-    'repeat' => function ($expression) {
-        $initLoop = "\$__currentLoopData = range(1, {$expression}); \$__env->addLoop(\$__currentLoopData);";
-        $iterateLoop = '$__env->incrementLoopIndices(); $loop = $__env->getLastLoop();';
-
-        return "<?php {$initLoop} foreach(\$__currentLoopData as \$__i) : {$iterateLoop} ?>";
-    },
-
-    'endrepeat' => function () {
-        return '<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @stylesheet / @endstylesheet
-    |---------------------------------------------------------------------
-    */
-
-    'stylesheet' => function ($expression) {
-        if (! empty($expression)) {
-            return '<link rel="stylesheet" href="'.Util::strip($expression).'">';
-        }
-
-        return '<style>';
-    },
-
-    'endstylesheet' => function () {
-        return '</style>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @script / @endscript
-    |---------------------------------------------------------------------
-    */
-
-    'script' => function ($expression) {
-        if (! empty($expression)) {
-            return '<script src="'.Util::strip($expression).'"></script>';
-        }
-
-        return '<script>';
-    },
-
-    'endscript' => function () {
-        return '</script>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @js
-    |---------------------------------------------------------------------
-    */
-
-    'js' => function ($expression) {
-        $expression = Util::parse($expression);
-        $variable = Util::strip($expression->get(0));
-
-        return "<script>\n".
-               "window.{$variable} = <?php echo is_array({$expression->get(1)}) ? json_encode({$expression->get(1)}) : '\'' . {$expression->get(1)} . '\''; ?>;\n". // phpcs:ignore
-               '</script>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @inline
-    |---------------------------------------------------------------------
-    */
-
-    'inline' => function ($expression) {
-        $path = Util::strip($expression);
-
-        $output = "<?php include get_theme_file_path({$expression}) ?>";
-
-        if (Str::endsWith($path, '.css')) {
-            return "<style>{$output}</style>";
-        }
-
-        if (Str::endsWith($path, '.js')) {
-            return "<script>{$output}</script>";
-        }
-
-        return $output;
-    },
-
-];
+
+class Helpers extends Directives
+{
+    /**
+     * The Helper directives.
+     */
+    public function directives(): array
+    {
+        return [
+            /*
+            |---------------------------------------------------------------------
+            | @istrue / @isfalse
+            |---------------------------------------------------------------------
+            */
+
+            'istrue' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (isset({$expression->get(0)}) && (bool) {$expression->get(0)} === true) : ?>".
+                        "<?php echo {$expression->get(1)}; ?>".
+                        '<?php endif; ?>';
+                }
+
+                return "<?php if (isset({$expression}) && (bool) {$expression} === true) : ?>";
+            },
+
+            'endistrue' => function () {
+                return '<?php endif; ?>';
+            },
+
+            'isfalse' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (isset({$expression->get(0)}) && (bool) {$expression->get(0)} === false) : ?>".
+                        "<?php echo {$expression->get(1)}; ?>".
+                        '<?php endif; ?>';
+                }
+
+                return "<?php if (isset({$expression}) && (bool) {$expression} === false) : ?>";
+            },
+
+            'endisfalse' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @isnull / @endisnull / @isnotnull / @endisnotnull
+            |---------------------------------------------------------------------
+            */
+
+            'isnull' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (is_null({$expression->get(0)})) : ?>".
+                        "<?php echo {$expression->get(1)}; ?>".
+                        '<?php endif; ?>';
+                }
+
+                return "<?php if (is_null({$expression})) : ?>";
+            },
+
+            'endisnull' => function () {
+                return '<?php endif; ?>';
+            },
+
+            'isnotnull' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (! is_null({$expression->get(0)})) : ?>".
+                        "<?php echo {$expression->get(1)}; ?>".
+                        '<?php endif; ?>';
+                }
+
+                return "<?php if (! is_null({$expression})) : ?>";
+            },
+
+            'endisnotnull' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @notempty / @endnotempty
+            |---------------------------------------------------------------------
+            */
+
+            'notempty' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (! empty({$expression->get(0)})) : ?>".
+                        "<?php echo {$expression->get(1)}; ?>".
+                        '<?php endif; ?>';
+                }
+
+                return "<?php if (! empty({$expression})) : ?>";
+            },
+
+            'endnotempty' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @instanceof / @endinstanceof
+            |---------------------------------------------------------------------
+            */
+
+            'instanceof' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (is_a({$expression->get(0)}, {$expression->get(1)})) : ?>";
+                }
+            },
+
+            'endinstanceof' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @typeof / @endtypeof
+            |---------------------------------------------------------------------
+            */
+
+            'typeof' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php if (gettype({$expression->get(0)}) === {$expression->get(1)}) : ?>";
+                }
+            },
+
+            'endtypeof' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @global
+            |---------------------------------------------------------------------
+            */
+
+            'global' => function ($expression) {
+                return "<?php global {$expression}; ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @set / @unset
+            |---------------------------------------------------------------------
+            */
+
+            'set' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression, 2);
+
+                    return "<?php {$expression->get(0)} = {$expression->get(1)}; ?>";
+                }
+            },
+
+            'unset' => function ($expression) {
+                return "<?php unset({$expression}); ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @extract / @implode
+            |---------------------------------------------------------------------
+            */
+
+            'extract' => function ($expression) {
+                return "<?php extract({$expression}); ?>";
+            },
+
+            'implode' => function ($expression) {
+                if ($this->shouldParse($expression)) {
+                    $expression = $this->parse($expression);
+
+                    return "<?php echo implode({$expression->get(0)}, {$expression->get(1)}); ?>";
+                }
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @repeat / @endrepeat
+            |---------------------------------------------------------------------
+            */
+
+            'repeat' => function ($expression) {
+                $initLoop = "\$__currentLoopData = range(1, {$expression}); \$__env->addLoop(\$__currentLoopData);";
+                $iterateLoop = '$__env->incrementLoopIndices(); $loop = $__env->getLastLoop();';
+
+                return "<?php {$initLoop} foreach(\$__currentLoopData as \$__i) : {$iterateLoop} ?>";
+            },
+
+            'endrepeat' => function () {
+                return '<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @stylesheet / @endstylesheet
+            |---------------------------------------------------------------------
+            */
+
+            'stylesheet' => function ($expression) {
+                if (! empty($expression)) {
+                    return '<link rel="stylesheet" href="'.$this->strip($expression).'">';
+                }
+
+                return '<style>';
+            },
+
+            'endstylesheet' => function () {
+                return '</style>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @script / @endscript
+            |---------------------------------------------------------------------
+            */
+
+            'script' => function ($expression) {
+                if (! empty($expression)) {
+                    return '<script src="'.$this->strip($expression).'"></script>';
+                }
+
+                return '<script>';
+            },
+
+            'endscript' => function () {
+                return '</script>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @js
+            |---------------------------------------------------------------------
+            */
+
+            'js' => function ($expression) {
+                $expression = $this->parse($expression);
+                $variable = $this->strip($expression->get(0));
+
+                return "<script>\n".
+                    "window.{$variable} = <?php echo is_array({$expression->get(1)}) ? json_encode({$expression->get(1)}) : '\'' . {$expression->get(1)} . '\''; ?>;\n". // phpcs:ignore
+                    '</script>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @inline
+            |---------------------------------------------------------------------
+            */
+
+            'inline' => function ($expression) {
+                $path = $this->strip($expression);
+
+                $output = "<?php include get_theme_file_path({$expression}) ?>";
+
+                if (Str::endsWith($path, '.css')) {
+                    return "<style>{$output}</style>";
+                }
+
+                if (Str::endsWith($path, '.js')) {
+                    return "<script>{$output}</script>";
+                }
+
+                return $output;
+            },
+
+        ];
+    }
+}
diff --git a/src/Directives/WordPress.php b/src/Directives/WordPress.php
index fc518a5..1622f01 100644
--- a/src/Directives/WordPress.php
+++ b/src/Directives/WordPress.php
@@ -3,638 +3,634 @@
 namespace Log1x\SageDirectives\Directives;
 
 use Illuminate\Support\Str;
-use Log1x\SageDirectives\Util;
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | WordPress Directives
-    |--------------------------------------------------------------------------
-    |
-    | Directives for various WordPress use-cases.
-    |
-    */
-
-    /*
-    |---------------------------------------------------------------------
-    | @query / @posts / @endposts
-    |---------------------------------------------------------------------
-    */
-
-    'query' => function ($expression) {
-        return '<?php global $query; ?>'.
-               "<?php \$query = new WP_Query({$expression}); ?>";
-    },
-
-    'posts' => function ($expression) {
-        $iterateLoop = '$__env->incrementLoopIndices(); $loop = $__env->getLastLoop();';
-
-        if (! empty($expression)) {
-            return '<?php $posts = collect(); ?>'.
-
-                   "<?php if (is_a({$expression}, 'WP_Post') || is_numeric({$expression})) : ?>".
-                   "<?php \$posts->put('p', is_a({$expression}, 'WP_Post') ? ({$expression})->ID : {$expression}); ?>".
-                   '<?php endif; ?>'.
-
-                   "<?php if (is_array({$expression})) : ?>".
-                   "<?php \$posts
-                       ->put('ignore_sticky_posts', true)
-                       ->put('posts_per_page', -1)
-                       ->put('post__in', collect({$expression})
-                           ->map(function (\$post) {
-                               return is_a(\$post, 'WP_Post') ? \$post->ID : \$post;
-                           })->all())
-                       ->put('orderby', 'post__in');
-                   ?>".
-                   '<?php endif; ?>'.
-
-                   "<?php \$query = \$posts->isNotEmpty() ? new WP_Query(\$posts->all()) : {$expression}; ?>".
-                   "<?php if (\$query->have_posts()) : \$__currentLoopData = range(1, \$query->post_count); \$__env->addLoop(\$__currentLoopData); while (\$query->have_posts()) : {$iterateLoop} \$query->the_post(); ?>";
-        }
-
-        $handleQuery = '<?php if (empty($query)) : ?>'.
-               '<?php global $wp_query; ?>'.
-               '<?php $query = $wp_query; ?>'.
-               '<?php endif; ?>';
-
-        return "{$handleQuery} <?php if (\$query->have_posts()) : ?>".
-            "<?php \$__currentLoopData = range(1, \$query->post_count); \$__env->addLoop(\$__currentLoopData); while (\$query->have_posts()) : {$iterateLoop} \$query->the_post(); ?>";
-    },
-
-    'endposts' => function () {
-        return '<?php endwhile; wp_reset_postdata(); $__env->popLoop(); $loop = $__env->getLastLoop(); endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @hasposts / @endhasposts / @noposts / @endnoposts
-    |---------------------------------------------------------------------
-    */
-
-    'hasposts' => function ($expression) {
-        if (! empty($expression)) {
-            return '<?php $posts = collect(); ?>'.
-
-                   "<?php if (is_a({$expression}, 'WP_Post') || is_numeric({$expression})) : ?>".
-                   "<?php \$posts->put('p', is_a({$expression}, 'WP_Post') ? ({$expression})->ID : {$expression}); ?>".
-                   '<?php endif; ?>'.
-
-                   "<?php if (is_array({$expression})) : ?>".
-                   "<?php \$posts
-                       ->put('ignore_sticky_posts', true)
-                       ->put('posts_per_page', -1)
-                       ->put('post__in', collect({$expression})
-                           ->map(function (\$post) {
-                               return is_a(\$post, 'WP_Post') ? \$post->ID : \$post;
-                           })->all())
-                       ->put('orderby', 'post__in');
-                   ?>".
-                   '<?php endif; ?>'.
-
-                   "<?php \$query = \$posts->isNotEmpty() ? new WP_Query(\$posts->all()) : {$expression}; ?>".
-                   '<?php if ($query->have_posts()) : ?>';
-        }
-
-        return '<?php if (empty($query)) : ?>'.
-               '<?php global $wp_query; ?>'.
-               '<?php $query = $wp_query; ?>'.
-               '<?php endif; ?>'.
-
-               '<?php if ($query->have_posts()) : ?>';
-    },
-
-    'endhasposts' => function () {
-        return '<?php wp_reset_postdata(); endif; ?>';
-    },
-
-    'noposts' => function ($expression) {
-        if (! empty($expression)) {
-            return '<?php $posts = collect(); ?>'.
-
-                   "<?php if (is_a({$expression}, 'WP_Post') || is_numeric({$expression})) : ?>".
-                   "<?php \$posts->put('p', is_a({$expression}, 'WP_Post') ? ({$expression})->ID : {$expression}); ?>".
-                   '<?php endif; ?>'.
-
-                   "<?php if (is_array({$expression})) : ?>".
-                   "<?php \$posts
-                       ->put('ignore_sticky_posts', true)
-                       ->put('posts_per_page', -1)
-                       ->put('post__in', collect({$expression})
-                           ->map(function (\$post) {
-                               return is_a(\$post, 'WP_Post') ? \$post->ID : \$post;
-                           })->all())
-                       ->put('orderby', 'post__in');
-                   ?>".
-                   '<?php endif; ?>'.
-
-                   "<?php \$query = \$posts->isNotEmpty() ? new WP_Query(\$posts->all()) : {$expression}; ?>".
-                   '<?php if (! $query->have_posts()) : ?>';
-        }
-
-        return '<?php if (empty($query)) : ?>'.
-               '<?php global $wp_query; ?>'.
-               '<?php $query = $wp_query; ?>'.
-               '<?php endif; ?>'.
-
-               '<?php if (! $query->have_posts()) : ?>';
-    },
-
-    'endnoposts' => function () {
-        return '<?php wp_reset_postdata(); endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @postmeta
-    |---------------------------------------------------------------------
-    */
-
-    'postmeta' => function ($expression) {
-        if (! empty($expression)) {
-            $expression = Util::parse($expression);
-
-            if (Util::isIdentifier($expression->get(0))) {
-                if (empty($expression->get(1))) {
-                    return "<?php echo get_post_meta({$expression->get(0)}); ?>";
+
+class WordPress extends Directives
+{
+    /**
+     * The WordPress directives.
+     */
+    public function directives(): array
+    {
+        return [
+            /*
+            |---------------------------------------------------------------------
+            | @query / @posts / @endposts
+            |---------------------------------------------------------------------
+            */
+
+            'query' => function ($expression) {
+                return '<?php global $query; ?>'.
+                    "<?php \$query = new WP_Query({$expression}); ?>";
+            },
+
+            'posts' => function ($expression) {
+                $iterateLoop = '$__env->incrementLoopIndices(); $loop = $__env->getLastLoop();';
+
+                if (! empty($expression)) {
+                    return '<?php $posts = collect(); ?>'.
+
+                        "<?php if (is_a({$expression}, 'WP_Post') || is_numeric({$expression})) : ?>".
+                        "<?php \$posts->put('p', is_a({$expression}, 'WP_Post') ? ({$expression})->ID : {$expression}); ?>".
+                        '<?php endif; ?>'.
+
+                        "<?php if (is_array({$expression})) : ?>".
+                        "<?php \$posts
+                            ->put('ignore_sticky_posts', true)
+                            ->put('posts_per_page', -1)
+                            ->put('post__in', collect({$expression})
+                                ->map(fn (\$post) => is_a(\$post, 'WP_Post') ? \$post->ID : \$post)->all()
+                            )
+                            ->put('orderby', 'post__in');
+                        ?>".
+                        '<?php endif; ?>'.
+
+                        "<?php \$query = \$posts->isNotEmpty() ? new WP_Query(\$posts->all()) : {$expression}; ?>".
+                        "<?php if (\$query->have_posts()) : \$__currentLoopData = range(1, \$query->post_count); \$__env->addLoop(\$__currentLoopData); while (\$query->have_posts()) : {$iterateLoop} \$query->the_post(); ?>";
+                }
+
+                $handleQuery = '<?php if (empty($query)) : ?>'.
+                    '<?php global $wp_query; ?>'.
+                    '<?php $query = $wp_query; ?>'.
+                    '<?php endif; ?>';
+
+                return "{$handleQuery} <?php if (\$query->have_posts()) : ?>".
+                    "<?php \$__currentLoopData = range(1, \$query->post_count); \$__env->addLoop(\$__currentLoopData); while (\$query->have_posts()) : {$iterateLoop} \$query->the_post(); ?>";
+            },
+
+            'endposts' => function () {
+                return '<?php endwhile; wp_reset_postdata(); $__env->popLoop(); $loop = $__env->getLastLoop(); endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @hasposts / @endhasposts / @noposts / @endnoposts
+            |---------------------------------------------------------------------
+            */
+
+            'hasposts' => function ($expression) {
+                if (! empty($expression)) {
+                    return '<?php $posts = collect(); ?>'.
+
+                        "<?php if (is_a({$expression}, 'WP_Post') || is_numeric({$expression})) : ?>".
+                        "<?php \$posts->put('p', is_a({$expression}, 'WP_Post') ? ({$expression})->ID : {$expression}); ?>".
+                        '<?php endif; ?>'.
+
+                        "<?php if (is_array({$expression})) : ?>".
+                        "<?php \$posts
+                            ->put('ignore_sticky_posts', true)
+                            ->put('posts_per_page', -1)
+                            ->put('post__in', collect({$expression})
+                                ->map(fn (\$post) => is_a(\$post, 'WP_Post') ? \$post->ID : \$post)->all()
+                            )
+                            ->put('orderby', 'post__in');
+                        ?>".
+                        '<?php endif; ?>'.
+
+                        "<?php \$query = \$posts->isNotEmpty() ? new WP_Query(\$posts->all()) : {$expression}; ?>".
+                        '<?php if ($query->have_posts()) : ?>';
+                }
+
+                return '<?php if (empty($query)) : ?>'.
+                    '<?php global $wp_query; ?>'.
+                    '<?php $query = $wp_query; ?>'.
+                    '<?php endif; ?>'.
+
+                    '<?php if ($query->have_posts()) : ?>';
+            },
+
+            'endhasposts' => function () {
+                return '<?php wp_reset_postdata(); endif; ?>';
+            },
+
+            'noposts' => function ($expression) {
+                if (! empty($expression)) {
+                    return '<?php $posts = collect(); ?>'.
+
+                        "<?php if (is_a({$expression}, 'WP_Post') || is_numeric({$expression})) : ?>".
+                        "<?php \$posts->put('p', is_a({$expression}, 'WP_Post') ? ({$expression})->ID : {$expression}); ?>".
+                        '<?php endif; ?>'.
+
+                        "<?php if (is_array({$expression})) : ?>".
+                        "<?php \$posts
+                            ->put('ignore_sticky_posts', true)
+                            ->put('posts_per_page', -1)
+                            ->put('post__in', collect({$expression})
+                                ->map(fn (\$post) => is_a(\$post, 'WP_Post') ? \$post->ID : \$post)->all()
+                            )
+                            ->put('orderby', 'post__in');
+                        ?>".
+                        '<?php endif; ?>'.
+
+                        "<?php \$query = \$posts->isNotEmpty() ? new WP_Query(\$posts->all()) : {$expression}; ?>".
+                        '<?php if (! $query->have_posts()) : ?>';
+                }
+
+                return '<?php if (empty($query)) : ?>'.
+                    '<?php global $wp_query; ?>'.
+                    '<?php $query = $wp_query; ?>'.
+                    '<?php endif; ?>'.
+
+                    '<?php if (! $query->have_posts()) : ?>';
+            },
+
+            'endnoposts' => function () {
+                return '<?php wp_reset_postdata(); endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @postmeta
+            |---------------------------------------------------------------------
+            */
+
+            'postmeta' => function ($expression) {
+                if (! empty($expression)) {
+                    $expression = $this->parse($expression);
+
+                    if ($this->isToken($expression->get(0))) {
+                        if (empty($expression->get(1))) {
+                            return "<?php echo get_post_meta({$expression->get(0)}); ?>";
+                        }
+
+                        if (empty($expression->get(2))) {
+                            $expression->put(2, 'false');
+                        }
+
+                        return "<?php echo get_post_meta({$expression->get(0)}, {$expression->get(1)}, {$expression->get(2)}); ?>";
+                    }
+
+                    if ($this->isToken($expression->get(1))) {
+                        if (empty($expression->get(2))) {
+                            $expression->put(2, 'false');
+                        }
+
+                        return "<?php echo get_post_meta({$expression->get(1)}, {$expression->get(0)}, {$expression->get(2)}); ?>";
+                    }
+
+                    if (empty($expression->get(1))) {
+                        $expression->put(1, 'false');
+                    }
+
+                    if (! $this->isToken($expression->get(0))) {
+                        return "<?php echo get_post_meta(get_the_ID(), {$expression->get(0)}, {$expression->get(1)}); ?>";
+                    }
+
+                    return "<?php echo get_post_meta(get_the_ID(), {$expression->get(0)}, {$expression->get(1)}); ?>";
                 }
 
-                if (empty($expression->get(2))) {
-                    $expression->put(2, 'false');
+                return '<?php echo get_post_meta(get_the_ID()); ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @title / @content / @excerpt / @permalink / @thumbnail
+            |---------------------------------------------------------------------
+            */
+
+            'title' => function ($expression) {
+                if (! empty($expression)) {
+                    return "<?php echo get_the_title({$expression}); ?>";
                 }
 
-                return "<?php echo get_post_meta({$expression->get(0)}, {$expression->get(1)}, {$expression->get(2)}); ?>";
-            }
+                return '<?php echo get_the_title(); ?>';
+            },
+
+            'content' => function () {
+                return '<?php the_content(); ?>';
+            },
+
+            'excerpt' => function () {
+                return '<?php the_excerpt(); ?>';
+            },
+
+            'permalink' => function ($expression) {
+                return "<?php echo get_permalink({$expression}); ?>";
+            },
+
+            'thumbnail' => function ($expression) {
+                if (! empty($expression)) {
+                    $expression = $this->parse($expression);
+
+                    if (! empty($expression->get(2))) {
+                        if ($expression->get(2) === 'false') {
+                            return "<?php echo get_the_post_thumbnail_url({$expression->get(0)}, is_numeric({$expression->get(1)}) ? [{$expression->get(1)}, {$expression->get(1)}] : {$expression->get(1)}); ?>"; // phpcs:ignore
+                        }
 
-            if (Util::isIdentifier($expression->get(1))) {
-                if (empty($expression->get(2))) {
-                    $expression->put(2, 'false');
+                        return "<?php echo get_the_post_thumbnail({$expression->get(0)}, is_numeric({$expression->get(1)}) ? [{$expression->get(1)}, {$expression->get(1)}] : {$expression->get(1)}); ?>"; // phpcs:ignore
+                    }
+
+                    if (! empty($expression->get(1))) {
+                        if ($expression->get(1) === 'false') {
+                            if ($this->isToken($expression->get(0))) {
+                                return "<?php echo get_the_post_thumbnail_url({$expression->get(0)}, 'thumbnail'); ?>";
+                            }
+
+                            return "<?php echo get_the_post_thumbnail_url(get_the_ID(), {$expression->get(0)}); ?>";
+                        }
+
+                        return "<?php echo get_the_post_thumbnail({$expression->get(0)}, is_numeric({$expression->get(1)}) ? [{$expression->get(1)}, {$expression->get(1)}] : {$expression->get(1)}); ?>"; // phpcs:ignore
+                    }
+
+                    if (! empty($expression->get(0))) {
+                        if ($expression->get(0) === 'false') {
+                            return "<?php echo get_the_post_thumbnail_url(get_the_ID(), 'thumbnail'); ?>";
+                        }
+
+                        if ($this->isToken($expression->get(0))) {
+                            return "<?php echo get_the_post_thumbnail({$expression->get(0)}, 'thumbnail'); ?>";
+                        }
+
+                        return "<?php echo get_the_post_thumbnail(get_the_ID(), {$expression->get(0)}); ?>";
+                    }
                 }
 
-                return "<?php echo get_post_meta({$expression->get(1)}, {$expression->get(0)}, {$expression->get(2)}); ?>";
-            }
+                return "<?php echo get_the_post_thumbnail(get_the_ID(), 'thumbnail'); ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @author / @authorurl / @published / @modified
+            |---------------------------------------------------------------------
+            */
 
-            if (empty($expression->get(1))) {
-                $expression->put(1, 'false');
-            }
+            'author' => function ($expression) {
+                if (! empty($expression)) {
+                    return "<?php echo get_the_author_meta('display_name', {$expression}); ?>";
+                }
 
-            if (! Util::isIdentifier($expression->get(0))) {
-                return "<?php echo get_post_meta(get_the_ID(), {$expression->get(0)}, {$expression->get(1)}); ?>";
-            }
+                return "<?php echo get_the_author_meta('display_name'); ?>";
+            },
 
-            return "<?php echo get_post_meta(get_the_ID(), {$expression->get(0)}, {$expression->get(1)}); ?>";
-        }
+            'authorurl' => function ($expression) {
+                if (! empty($expression)) {
+                    return "<?php echo get_author_posts_url({$expression}, get_the_author_meta('user_nicename', {$expression})); ?>";
+                }
 
-        return '<?php echo get_post_meta(get_the_ID()); ?>';
-    },
+                return "<?php echo get_author_posts_url(get_the_author_meta('ID'), get_the_author_meta('user_nicename')); ?>";
+            },
 
-    /*
-    |---------------------------------------------------------------------
-    | @title / @content / @excerpt / @permalink / @thumbnail
-    |---------------------------------------------------------------------
-    */
+            'published' => function ($expression) {
+                if (! empty($expression)) {
+                    $expression = $this->parse($expression);
 
-    'title' => function ($expression) {
-        if (! empty($expression)) {
-            return "<?php echo get_the_title({$expression}); ?>";
-        }
+                    if ($this->isToken($expression->get(0))) {
+                        return "<?php echo get_the_date('', {$expression->get(0)}); ?>";
+                    }
+
+                    if (! $this->isToken($expression->get(0)) && empty($expression->get(1))) {
+                        return "<?php echo get_the_date({$expression->get(0)}); ?>";
+                    }
 
-        return '<?php echo get_the_title(); ?>';
-    },
+                    return "<?php echo get_the_date({$expression->get(0)}, {$expression->get(1)}); ?>";
+                }
 
-    'content' => function () {
-        return '<?php the_content(); ?>';
-    },
+                return '<?php echo get_the_date(); ?>';
+            },
 
-    'excerpt' => function () {
-        return '<?php the_excerpt(); ?>';
-    },
+            'modified' => function ($expression) {
+                if (! empty($expression)) {
+                    $expression = $this->parse($expression);
 
-    'permalink' => function ($expression) {
-        return "<?php echo get_permalink({$expression}); ?>";
-    },
+                    if ($this->isToken($expression->get(0))) {
+                        return "<?php echo get_the_modified_date('', {$expression->get(0)}); ?>";
+                    }
 
-    'thumbnail' => function ($expression) {
-        if (! empty($expression)) {
-            $expression = Util::parse($expression);
+                    if ($this->isToken($expression->get(1))) {
+                        return "<?php echo get_the_modified_date({$expression->get(0)}, {$expression->get(1)}); ?>";
+                    }
 
-            if (! empty($expression->get(2))) {
-                if ($expression->get(2) === 'false') {
-                    return "<?php echo get_the_post_thumbnail_url({$expression->get(0)}, is_numeric({$expression->get(1)}) ? [{$expression->get(1)}, {$expression->get(1)}] : {$expression->get(1)}); ?>"; // phpcs:ignore
+                    return "<?php echo get_the_modified_date({$expression->get(0)}); ?>";
                 }
 
-                return "<?php echo get_the_post_thumbnail({$expression->get(0)}, is_numeric({$expression->get(1)}) ? [{$expression->get(1)}, {$expression->get(1)}] : {$expression->get(1)}); ?>"; // phpcs:ignore
-            }
+                return '<?php echo get_the_modified_date(); ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @category / @categories / @term / @terms
+            |---------------------------------------------------------------------
+            */
+
+            'category' => function ($expression) {
+                $expression = $this->parse($expression);
 
-            if (! empty($expression->get(1))) {
-                if ($expression->get(1) === 'false') {
-                    if (Util::isIdentifier($expression->get(0))) {
-                        return "<?php echo get_the_post_thumbnail_url({$expression->get(0)}, 'thumbnail'); ?>";
+                if ($expression->get(1) === 'true') {
+                    return "<?php if (collect(get_the_category({$expression->get(0)}))->isNotEmpty()) : ?>".
+                        "<a href=\"<?php echo get_category_link(collect(get_the_category({$expression->get(0)}))->shift()->cat_ID); ?>\">". // phpcs:ignore
+                        "<?php echo collect(get_the_category({$expression->get(0)}))->shift()->name; ?>".
+                        '</a>'.
+                        '<?php endif; ?>';
+                }
+
+                if (! empty($expression->get(0))) {
+                    if ($expression->get(0) === 'true') {
+                        return '<?php if (collect(get_the_category())->isNotEmpty()) : ?>'.
+                            '<a href="<?php echo get_category_link(collect(get_the_category())->shift()->cat_ID); ?>">'.
+                            '<?php echo collect(get_the_category())->shift()->name; ?>'.
+                            '</a>'.
+                            '<?php endif; ?>';
                     }
 
-                    return "<?php echo get_the_post_thumbnail_url(get_the_ID(), {$expression->get(0)}); ?>";
+                    return "<?php if (collect(get_the_category({$expression->get(0)}))->isNotEmpty()) : ?>".
+                        "<?php echo collect(get_the_category({$expression->get(0)}))->shift()->name; ?>".
+                        '<?php endif; ?>';
+                }
+
+                return '<?php if (collect(get_the_category())->isNotEmpty()) : ?>'.
+                    '<?php echo collect(get_the_category())->shift()->name; ?>'.
+                    '<?php endif; ?>';
+            },
+
+            'categories' => function ($expression) {
+                $expression = $this->parse($expression);
+
+                if ($expression->get(1) === 'true') {
+                    return "<?php echo get_the_category_list(', ', '', {$expression->get(0)}); ?>";
+                }
+
+                if ($expression->get(0) === 'true') {
+                    return "<?php echo get_the_category_list(', ', '', get_the_ID()); ?>";
+                }
+
+                if (is_numeric($expression->get(0))) {
+                    return "<?php echo strip_tags(get_the_category_list(', ', '', {$expression->get(0)})); ?>";
+                }
+
+                return "<?php echo strip_tags(get_the_category_list(', ', '', get_the_ID())); ?>";
+            },
+
+            'term' => function ($expression) {
+                $expression = $this->parse($expression);
+
+                if (! empty($expression->get(2)) && $expression->get(2) === 'true') {
+                    return "<?php if (get_the_terms({$expression->get(1)}, {$expression->get(0)})) : ?>". // phpcs:ignore
+                        "<a href=\"<?php echo get_term_link(collect(get_the_terms({$expression->get(1)}, {$expression->get(0)}))->shift()->term_id); ?>\">". // phpcs:ignore
+                        "<?php echo collect(get_the_terms({$expression->get(1)}, {$expression->get(0)}))->shift()->name; ?>".
+                        '</a>'.
+                        '<?php endif; ?>';
                 }
 
-                return "<?php echo get_the_post_thumbnail({$expression->get(0)}, is_numeric({$expression->get(1)}) ? [{$expression->get(1)}, {$expression->get(1)}] : {$expression->get(1)}); ?>"; // phpcs:ignore
-            }
+                if (! empty($expression->get(1))) {
+                    if ($expression->get(1) === 'true') {
+                        return "<?php if (get_the_terms(get_the_ID(), {$expression->get(0)})) : ?>".
+                            "<a href=\"<?php echo get_term_link(collect(get_the_terms(get_the_ID(), {$expression->get(0)}))->shift()->term_id); ?>\">". // phpcs:ignore
+                            "<?php echo collect(get_the_terms(get_the_ID(), {$expression->get(0)}))->shift()->name; ?>".
+                            '</a>'.
+                            '<?php endif; ?>';
+                    }
 
-            if (! empty($expression->get(0))) {
-                if ($expression->get(0) === 'false') {
-                    return "<?php echo get_the_post_thumbnail_url(get_the_ID(), 'thumbnail'); ?>";
+                    return "<?php if (get_the_terms({$expression->get(1)}, {$expression->get(0)})) : ?>". // phpcs:ignore
+                        "<?php echo collect(get_the_terms({$expression->get(1)}, {$expression->get(0)}))->shift()->name; ?>".
+                        '<?php endif; ?>';
                 }
 
-                if (Util::isIdentifier($expression->get(0))) {
-                    return "<?php echo get_the_post_thumbnail({$expression->get(0)}, 'thumbnail'); ?>";
+                if (! empty($expression->get(0))) {
+                    return "<?php if (get_the_terms(get_the_ID(), {$expression->get(0)})) : ?>".
+                        "<?php echo collect(get_the_terms(get_the_ID(), {$expression->get(0)}))->shift()->name; ?>".
+                        '<?php endif; ?>';
                 }
+            },
 
-                return "<?php echo get_the_post_thumbnail(get_the_ID(), {$expression->get(0)}); ?>";
-            }
-        }
+            'terms' => function ($expression) {
+                $expression = $this->parse($expression);
 
-        return "<?php echo get_the_post_thumbnail(get_the_ID(), 'thumbnail'); ?>";
-    },
+                if ($expression->get(2) === 'true') {
+                    return "<?php echo get_the_term_list({$expression->get(1)}, {$expression->get(0)}, '', ', '); ?>";
+                }
 
-    /*
-    |---------------------------------------------------------------------
-    | @author / @authorurl / @published / @modified
-    |---------------------------------------------------------------------
-    */
+                if (! empty($expression->get(1))) {
+                    if ($expression->get(1) === 'true') {
+                        return "<?php echo get_the_term_list(get_the_ID(), {$expression->get(0)}, '', ', '); ?>";
+                    }
 
-    'author' => function ($expression) {
-        if (! empty($expression)) {
-            return "<?php echo get_the_author_meta('display_name', {$expression}); ?>";
-        }
+                    return "<?php echo strip_tags(get_the_term_list({$expression->get(1)}, {$expression->get(0)}, '', ', ')); ?>";
+                }
 
-        return "<?php echo get_the_author_meta('display_name'); ?>";
-    },
+                if (! empty($expression->get(0))) {
+                    return "<?php echo strip_tags(get_the_term_list(get_the_ID(), {$expression->get(0)}, '', ', ')); ?>";
+                }
+            },
 
-    'authorurl' => function ($expression) {
-        if (! empty($expression)) {
-            return "<?php echo get_author_posts_url({$expression}, get_the_author_meta('user_nicename', {$expression})); ?>";
-        }
+            /*
+            |---------------------------------------------------------------------
+            | @image
+            |---------------------------------------------------------------------
+            */
 
-        return "<?php echo get_author_posts_url(get_the_author_meta('ID'), get_the_author_meta('user_nicename')); ?>";
-    },
+            'image' => function ($expression) {
+                $expression = $this->parse($expression);
+                $output = "<?php \$__imageDirective = {$expression->get(0)}; ?>";
 
-    'published' => function ($expression) {
-        if (! empty($expression)) {
-            $expression = Util::parse($expression);
+                if (! $this->isToken($expression->get(0))) {
+                    $output .= "<?php \$__imageDirective = function_exists('acf') \n
+                        ? (get_field(\$__imageDirective) ?? get_sub_field(\$__imageDirective) ?? get_field(\$__imageDirective, 'option') ?? \$__imageDirective)
+                        : \$__imageDirective; ?>";
 
-            if (Util::isIdentifier($expression->get(0))) {
-                return "<?php echo get_the_date('', {$expression->get(0)}); ?>";
-            }
+                    $output .= "<?php \$__imageDirective = is_array(\$__imageDirective) && ! empty(\$__imageDirective['id']) ? \$__imageDirective['id'] : \$__imageDirective; ?>";
+                }
 
-            if (! Util::isIdentifier($expression->get(0)) && empty($expression->get(1))) {
-                return "<?php echo get_the_date({$expression->get(0)}); ?>";
-            }
+                if ($this->strip($expression->get(1)) == 'raw') {
+                    return $output.'<?php echo wp_get_attachment_url($__imageDirective); ?>';
+                }
 
-            return "<?php echo get_the_date({$expression->get(0)}, {$expression->get(1)}); ?>";
-        }
+                if (! empty($expression->get(3))) {
+                    $expression = $expression->put(2, $this->unwrap($this->toString($expression->slice(2)->all(), true)));
+                }
 
-        return '<?php echo get_the_date(); ?>';
-    },
+                if (! empty($expression->get(2)) && ! $this->isArray($expression->get(2))) {
+                    $expression = $expression->put(2, $this->toString(['alt' => $this->strip($expression->get(2))]));
+                }
 
-    'modified' => function ($expression) {
-        if (! empty($expression)) {
-            $expression = Util::parse($expression);
+                if ($expression->get(1)) {
+                    if ($expression->get(2)) {
+                        return $output."<?php echo wp_get_attachment_image(
+                            \$__imageDirective,
+                            {$expression->get(1)},
+                            false,
+                            {$expression->get(2)}
+                        ); ?>";
+                    }
 
-            if (Util::isIdentifier($expression->get(0))) {
-                return "<?php echo get_the_modified_date('', {$expression->get(0)}); ?>";
-            }
+                    return $output."<?php echo wp_get_attachment_image(\$__imageDirective, {$expression->get(1)}, false); ?>";
+                }
 
-            if (Util::isIdentifier($expression->get(1))) {
-                return "<?php echo get_the_modified_date({$expression->get(0)}, {$expression->get(1)}); ?>";
-            }
+                if ($expression->get(2)) {
+                    return $output."<?php echo wp_get_attachment_image(
+                        \$__imageDirective,
+                        'full',
+                        false,
+                        {$expression->get(2)}
+                    ); ?>";
+                }
 
-            return "<?php echo get_the_modified_date({$expression->get(0)}); ?>";
-        }
+                return $output."<?php echo wp_get_attachment_image(\$__imageDirective, 'thumbnail', false); ?>";
+            },
 
-        return '<?php echo get_the_modified_date(); ?>';
-    },
+            /*
+            |---------------------------------------------------------------------
+            | @role / @endrole / @user / @enduser / @guest / @endguest
+            |---------------------------------------------------------------------
+            */
 
-    /*
-    |---------------------------------------------------------------------
-    | @category / @categories / @term / @terms
-    |---------------------------------------------------------------------
-    */
+            'role' => function ($expression) {
+                $expression = $this->parse($expression);
+                $condition = [];
 
-    'category' => function ($expression) {
-        $expression = Util::parse($expression);
+                foreach ($expression as $value) {
+                    $condition[] = "in_array(strtolower({$value}), (array) wp_get_current_user()->roles) ||";
+                }
 
-        if ($expression->get(1) === 'true') {
-            return "<?php if (collect(get_the_category({$expression->get(0)}))->isNotEmpty()) : ?>".
-                   "<a href=\"<?php echo get_category_link(collect(get_the_category({$expression->get(0)}))->shift()->cat_ID); ?>\">". // phpcs:ignore
-                   "<?php echo collect(get_the_category({$expression->get(0)}))->shift()->name; ?>".
-                   '</a>'.
-                   '<?php endif; ?>';
-        }
+                $conditions = implode(' ', $condition);
+
+                $conditions = Str::beforeLast($conditions, ' ||');
+
+                return "<?php if (is_user_logged_in() && ({$conditions})) : ?>";
+            },
+
+            'endrole' => function () {
+                return '<?php endif; ?>';
+            },
+
+            'user' => function () {
+                return '<?php if (is_user_logged_in()) : ?>';
+            },
+
+            'enduser' => function () {
+                return '<?php endif; ?>';
+            },
+
+            'guest' => function () {
+                return '<?php if (! is_user_logged_in()) : ?>';
+            },
+
+            'endguest' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @shortcode
+            |---------------------------------------------------------------------
+            */
+
+            'shortcode' => function ($expression) {
+                return "<?php echo do_shortcode({$expression}); ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @wpautop / @wpautokp
+            |---------------------------------------------------------------------
+            */
+
+            'wpautop' => function ($expression) {
+                return "<?php echo wpautop({$expression}); ?>";
+            },
+
+            'wpautokp' => function ($expression) {
+                return "<?php echo wpautop(wp_kses_post({$expression})); ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @action / @filter
+            |---------------------------------------------------------------------
+            */
+
+            'action' => function ($expression) {
+                return "<?php do_action({$expression}); ?>";
+            },
+
+            'filter' => function ($expression) {
+                return "<?php echo apply_filters({$expression}); ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @wphead / @wpfooter
+            |---------------------------------------------------------------------
+            */
+
+            'wphead' => function () {
+                return '<?php wp_head(); ?>';
+            },
+
+            'wpfooter' => function () {
+                return '<?php wp_footer(); ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @bodyclass / @wpbodyopen
+            |---------------------------------------------------------------------
+            */
+
+            'bodyclass' => function ($expression) {
+                return "<?php body_class({$expression}); ?>";
+            },
+
+            'wpbodyopen' => function () {
+                return "<?php if (function_exists('wp_body_open')) { wp_body_open(); } else { do_action('wp_body_open'); } ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @postclass
+            |---------------------------------------------------------------------
+            */
+
+            'postclass' => function ($expression) {
+                return "<?php post_class({$expression}); ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @sidebar / @hassidebar / @endhassidebar
+            |---------------------------------------------------------------------
+            */
+
+            'sidebar' => function ($expression) {
+                return "<?php dynamic_sidebar($expression); ?>";
+            },
+
+            'hassidebar' => function ($expression) {
+                return "<?php if (is_active_sidebar($expression)) : ?>";
+            },
+
+            'endhassidebar' => function () {
+                return '<?php endif; ?>';
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @__
+            |---------------------------------------------------------------------
+            */
+
+            '__' => function ($expression) {
+                $expression = $this->parse($expression);
+
+                return "<?php _e({$expression[0]}, {$expression[1]}); ?>";
+            },
+
+            /*
+            |---------------------------------------------------------------------
+            | @thememod
+            |---------------------------------------------------------------------
+            */
+
+            'thememod' => function ($expression) {
+                $expression = $this->parse($expression);
+
+                $mod = $expression->get(0);
+                $default = $expression->get(1);
+
+                if (! empty($default)) {
+                    return "<?php echo get_theme_mod({$mod}, {$default}); ?>";
+                }
 
-        if (! empty($expression->get(0))) {
-            if ($expression->get(0) === 'true') {
-                return '<?php if (collect(get_the_category())->isNotEmpty()) : ?>'.
-                       '<a href="<?php echo get_category_link(collect(get_the_category())->shift()->cat_ID); ?>">'.
-                       '<?php echo collect(get_the_category())->shift()->name; ?>'.
-                       '</a>'.
-                       '<?php endif; ?>';
-            }
-
-            return "<?php if (collect(get_the_category({$expression->get(0)}))->isNotEmpty()) : ?>".
-                   "<?php echo collect(get_the_category({$expression->get(0)}))->shift()->name; ?>".
-                   '<?php endif; ?>';
-        }
-
-        return '<?php if (collect(get_the_category())->isNotEmpty()) : ?>'.
-               '<?php echo collect(get_the_category())->shift()->name; ?>'.
-               '<?php endif; ?>';
-    },
-
-    'categories' => function ($expression) {
-        $expression = Util::parse($expression);
-
-        if ($expression->get(1) === 'true') {
-            return "<?php echo get_the_category_list(', ', '', {$expression->get(0)}); ?>";
-        }
-
-        if ($expression->get(0) === 'true') {
-            return "<?php echo get_the_category_list(', ', '', get_the_ID()); ?>";
-        }
-
-        if (is_numeric($expression->get(0))) {
-            return "<?php echo strip_tags(get_the_category_list(', ', '', {$expression->get(0)})); ?>";
-        }
-
-        return "<?php echo strip_tags(get_the_category_list(', ', '', get_the_ID())); ?>";
-    },
-
-    'term' => function ($expression) {
-        $expression = Util::parse($expression);
-
-        if (! empty($expression->get(2)) && $expression->get(2) === 'true') {
-            return "<?php if (get_the_terms({$expression->get(1)}, {$expression->get(0)})) : ?>". // phpcs:ignore
-                   "<a href=\"<?php echo get_term_link(collect(get_the_terms({$expression->get(1)}, {$expression->get(0)}))->shift()->term_id); ?>\">". // phpcs:ignore
-                   "<?php echo collect(get_the_terms({$expression->get(1)}, {$expression->get(0)}))->shift()->name; ?>".
-                   '</a>'.
-                   '<?php endif; ?>';
-        }
-
-        if (! empty($expression->get(1))) {
-            if ($expression->get(1) === 'true') {
-                return "<?php if (get_the_terms(get_the_ID(), {$expression->get(0)})) : ?>".
-                       "<a href=\"<?php echo get_term_link(collect(get_the_terms(get_the_ID(), {$expression->get(0)}))->shift()->term_id); ?>\">". // phpcs:ignore
-                       "<?php echo collect(get_the_terms(get_the_ID(), {$expression->get(0)}))->shift()->name; ?>".
-                       '</a>'.
-                       '<?php endif; ?>';
-            }
-
-            return "<?php if (get_the_terms({$expression->get(1)}, {$expression->get(0)})) : ?>". // phpcs:ignore
-                   "<?php echo collect(get_the_terms({$expression->get(1)}, {$expression->get(0)}))->shift()->name; ?>".
-                   '<?php endif; ?>';
-        }
-
-        if (! empty($expression->get(0))) {
-            return "<?php if (get_the_terms(get_the_ID(), {$expression->get(0)})) : ?>".
-                   "<?php echo collect(get_the_terms(get_the_ID(), {$expression->get(0)}))->shift()->name; ?>".
-                   '<?php endif; ?>';
-        }
-    },
-
-    'terms' => function ($expression) {
-        $expression = Util::parse($expression);
-
-        if ($expression->get(2) === 'true') {
-            return "<?php echo get_the_term_list({$expression->get(1)}, {$expression->get(0)}, '', ', '); ?>";
-        }
-
-        if (! empty($expression->get(1))) {
-            if ($expression->get(1) === 'true') {
-                return "<?php echo get_the_term_list(get_the_ID(), {$expression->get(0)}, '', ', '); ?>";
-            }
-
-            return "<?php echo strip_tags(get_the_term_list({$expression->get(1)}, {$expression->get(0)}, '', ', ')); ?>";
-        }
-
-        if (! empty($expression->get(0))) {
-            return "<?php echo strip_tags(get_the_term_list(get_the_ID(), {$expression->get(0)}, '', ', ')); ?>";
-        }
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @image
-    |---------------------------------------------------------------------
-    */
-
-    'image' => function ($expression) {
-        $expression = Util::parse($expression);
-        $image = Util::strip($expression->get(0));
-
-        if (
-            ! Util::isIdentifier($image) &&
-            $image = Util::field($image)
-        ) {
-            $expression = $expression->put(0, is_array($image) && ! empty($image['id']) ? $image['id'] : $image);
-        }
-
-        if (Util::strip($expression->get(1)) == 'raw') {
-            return "<?php echo wp_get_attachment_url({$expression->get(0)}); ?>";
-        }
-
-        if (! empty($expression->get(3))) {
-            $expression = $expression->put(2, Util::clean($expression->slice(2)->all()));
-        }
-
-        if (! empty($expression->get(2)) && ! Util::isArray($expression->get(2))) {
-            $expression = $expression->put(2, Util::toString(['alt' => $expression->get(2)]));
-        }
-
-        if ($expression->get(1)) {
-            if ($expression->get(2)) {
-                return "<?php echo wp_get_attachment_image(
-                    {$expression->get(0)},
-                    {$expression->get(1)},
-                    false,
-                    {$expression->get(2)}
-                ); ?>";
-            }
-
-            return "<?php echo wp_get_attachment_image({$expression->get(0)}, {$expression->get(1)}, false); ?>";
-        }
-
-        if ($expression->get(2)) {
-            return "<?php echo wp_get_attachment_image(
-                {$expression->get(0)},
-                'full',
-                false,
-                {$expression->get(2)}
-            ); ?>";
-        }
-
-        return "<?php echo wp_get_attachment_image({$expression->get(0)}, 'thumbnail', false); ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @role / @endrole / @user / @enduser / @guest / @endguest
-    |---------------------------------------------------------------------
-    */
-
-    'role' => function ($expression) {
-        $expression = Util::parse($expression);
-        $condition = [];
-
-        foreach ($expression as $value) {
-            $condition[] = "in_array(strtolower({$value}), (array) wp_get_current_user()->roles) ||";
-        }
-
-        $conditions = implode(' ', $condition);
-
-        $conditions = Str::beforeLast($conditions, ' ||');
-
-        return "<?php if (is_user_logged_in() && ({$conditions})) : ?>";
-    },
-
-    'endrole' => function () {
-        return '<?php endif; ?>';
-    },
-
-    'user' => function () {
-        return '<?php if (is_user_logged_in()) : ?>';
-    },
-
-    'enduser' => function () {
-        return '<?php endif; ?>';
-    },
-
-    'guest' => function () {
-        return '<?php if (! is_user_logged_in()) : ?>';
-    },
-
-    'endguest' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @shortcode
-    |---------------------------------------------------------------------
-    */
-
-    'shortcode' => function ($expression) {
-        return "<?php echo do_shortcode({$expression}); ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @wpautop / @wpautokp
-    |---------------------------------------------------------------------
-    */
-
-    'wpautop' => function ($expression) {
-        return "<?php echo wpautop({$expression}); ?>";
-    },
-
-    'wpautokp' => function ($expression) {
-        return "<?php echo wpautop(wp_kses_post({$expression})); ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @action / @filter
-    |---------------------------------------------------------------------
-    */
-
-    'action' => function ($expression) {
-        return "<?php do_action({$expression}); ?>";
-    },
-
-    'filter' => function ($expression) {
-        return "<?php echo apply_filters({$expression}); ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @wphead / @wpfooter
-    |---------------------------------------------------------------------
-    */
-
-    'wphead' => function () {
-        return '<?php wp_head(); ?>';
-    },
-
-    'wpfooter' => function () {
-        return '<?php wp_footer(); ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @bodyclass / @wpbodyopen
-    |---------------------------------------------------------------------
-    */
-
-    'bodyclass' => function ($expression) {
-        return "<?php body_class({$expression}); ?>";
-    },
-
-    'wpbodyopen' => function () {
-        return "<?php if (function_exists('wp_body_open')) { wp_body_open(); } else { do_action('wp_body_open'); } ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @postclass
-    |---------------------------------------------------------------------
-    */
-
-    'postclass' => function ($expression) {
-        return "<?php post_class({$expression}); ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @sidebar / @hassidebar / @endhassidebar
-    |---------------------------------------------------------------------
-    */
-
-    'sidebar' => function ($expression) {
-        return "<?php dynamic_sidebar($expression); ?>";
-    },
-
-    'hassidebar' => function ($expression) {
-        return "<?php if (is_active_sidebar($expression)) : ?>";
-    },
-
-    'endhassidebar' => function () {
-        return '<?php endif; ?>';
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @__
-    |---------------------------------------------------------------------
-    */
-
-    '__' => function ($expression) {
-        $expression = Util::parse($expression);
-
-        return "<?php _e({$expression[0]}, {$expression[1]}); ?>";
-    },
-
-    /*
-    |---------------------------------------------------------------------
-    | @thememod
-    |---------------------------------------------------------------------
-    */
-
-    'thememod' => function ($expression) {
-        $expression = Util::parse($expression);
-
-        $mod = $expression->get(0);
-        $default = $expression->get(1);
-
-        if (! empty($default)) {
-            return "<?php echo get_theme_mod({$mod}, {$default}); ?>";
-        }
-
-        return "<?php echo get_theme_mod({$mod}); ?>";
-    },
-];
+                return "<?php echo get_theme_mod({$mod}); ?>";
+            },
+        ];
+    }
+}
diff --git a/src/SageDirectivesServiceProvider.php b/src/SageDirectivesServiceProvider.php
index c4f2d69..7e608ec 100644
--- a/src/SageDirectivesServiceProvider.php
+++ b/src/SageDirectivesServiceProvider.php
@@ -2,36 +2,26 @@
 
 namespace Log1x\SageDirectives;
 
-use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 
 class SageDirectivesServiceProvider extends ServiceProvider
 {
     /**
-     * Bootstrap any application services.
-     *
-     * @return void
+     * The directive providers.
      */
-    public function boot()
-    {
-        $this->directives()
-            ->each(function ($directive, $function) {
-                Blade::directive($function, $directive);
-            });
-    }
+    protected array $directives = [
+        Directives\Acf::class,
+        Directives\Helpers::class,
+        Directives\WordPress::class,
+    ];
 
     /**
-     * Get the Blade directives.
-     *
-     * @return array
+     * Bootstrap any application services.
      */
-    public function directives()
+    public function boot(): void
     {
-        return collect(['Acf', 'Helpers', 'WordPress'])
-            ->flatMap(function ($directive) {
-                if (file_exists($directives = __DIR__.'/Directives/'.$directive.'.php')) {
-                    return require_once $directives;
-                }
-            });
+        collect($this->directives)
+            ->filter(fn ($directive) => is_subclass_of($directive, Directives\Directives::class))
+            ->each(fn ($directive) => $directive::make()->register());
     }
 }
diff --git a/src/Util.php b/src/Util.php
deleted file mode 100644
index 831500b..0000000
--- a/src/Util.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace Log1x\SageDirectives;
-
-use Illuminate\Support\Str;
-
-class Util
-{
-    /**
-     * Parse expression passed to directive.
-     *
-     * @param  string  $expression
-     * @param  int  $limit
-     * @param  string  $delimiter
-     * @return \Illuminate\Support\Collection
-     */
-    public static function parse($expression, $limit = PHP_INT_MAX, $delimiter = '__comma__')
-    {
-        $expression = preg_replace_callback('/\'(.*?)\'|"(.*?)"/', function ($matches) use ($delimiter) {
-            return str_replace(',', $delimiter, $matches[0]);
-        }, $expression);
-
-        return collect(explode(',', $expression, $limit))
-            ->map(function ($item) use ($delimiter) {
-                $item = str_replace($delimiter, ',', $item);
-                $item = trim($item);
-
-                if (is_numeric($item)) {
-                    return (int) $item;
-                }
-
-                return $item;
-            });
-    }
-
-    /**
-     * Determine if the string is a valid identifier.
-     *
-     * @param  string  $expression
-     * @return bool
-     */
-    public static function isIdentifier($expression = null)
-    {
-        return ! empty($expression) && (is_numeric($expression) || Str::startsWith($expression, '$') || Str::startsWith($expression, 'get_'));
-    }
-
-    /**
-     * Strip single quotes from expression.
-     *
-     * @param  string  $expression
-     * @return string
-     */
-    public static function strip($expression = null)
-    {
-        return ! empty($expression) ? str_replace(["'", '"'], '', $expression) : $expression;
-    }
-
-    /**
-     * Wraps the passed string in single quotes if they are not already present.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    public static function wrap($value)
-    {
-        $value = Str::start($value, "'");
-        $value = Str::finish($value, "'");
-
-        return $value;
-    }
-
-    /**
-     * Unwraps the passed string from the passed delimiter.
-     *
-     * @param  string  $value
-     * @param  string  $delimiter
-     * @return string
-     */
-    public static function unwrap($value, $delimiter = "'")
-    {
-        if (Str::startsWith($value, $delimiter)) {
-            $value = Str::replaceFirst($delimiter, '', $value);
-        }
-
-        if (Str::endsWith($value, $delimiter)) {
-            $value = Str::replaceLast($delimiter, '', $value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Combine and clean a malformed array formed from a parsed expression.
-     *
-     * @param  array  $expression
-     * @return string
-     */
-    public static function clean($expression)
-    {
-        return Util::unwrap(
-            Util::toString($expression, true)
-        );
-    }
-
-    /**
-     * Dives for an ACF field or sub field and returns the value if it exists.
-     *
-     * @param  string  $field
-     * @param  int  $id
-     * @return mixed
-     */
-    public static function field($field, $id = null)
-    {
-        if (! function_exists('acf')) {
-            return;
-        }
-
-        if (! empty(get_field($field, $id))) {
-            return get_field($field, $id);
-        }
-
-        if (! empty(get_sub_field($field))) {
-            return get_sub_field($field);
-        }
-
-        if (! empty(get_field($field, 'option'))) {
-            return get_field($field, 'option');
-        }
-
-        return false;
-    }
-
-    /**
-     * Convert expression to a string.
-     *
-     * @param  mixed  $expression
-     * @param  bool  $single
-     * @return string
-     */
-    public static function toString($expression, $single = false)
-    {
-        if (! is_array($expression)) {
-            return self::wrap($expression);
-        }
-
-        $keys = '';
-
-        foreach ($expression as $key => $value) {
-            $keys .= $single ?
-                self::wrap($value).',' :
-                self::wrap($key).' => '.self::wrap($value).', ';
-        }
-
-        $keys = trim(Str::replaceLast(',', '', $keys));
-
-        if (! $single) {
-            $keys = Str::start($keys, '[');
-            $keys = Str::finish($keys, ']');
-        }
-
-        return $keys;
-    }
-
-    /**
-     * Determine if the expression looks like an array.
-     *
-     * @param  mixed  $expression
-     * @return bool
-     */
-    public static function isArray($expression)
-    {
-        $expression = self::strip($expression);
-
-        return Str::startsWith($expression, '[') && Str::endsWith($expression, ']');
-    }
-}