feat: check recipe compatibility and min_version

app/Liquid/Filters/StandardFilters.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Liquid\Filters;
+
+class StandardFilters extends \Keepsuit\Liquid\Filters\StandardFilters
+{
+    /**
+     * Converts any URL-unsafe characters in a string to the
+     * [percent-encoded](https://developer.mozilla.org/en-US/docs/Glossary/percent-encoding) equivalent.
+     */
+    public function urlEncode(string|int|float|array|null $input): string
+    {
+
+        if (is_array($input)) {
+            $input = json_encode($input);
+        }
+
+        return parent::urlEncode($input);
+    }
+}

app/Models/Plugin.php

@@ -7,6 +7,7 @@ use App\Liquid\Filters\Data;
 use App\Liquid\Filters\Date;
 use App\Liquid\Filters\Localization;
 use App\Liquid\Filters\Numbers;
+use App\Liquid\Filters\StandardFilters;
 use App\Liquid\Filters\StringMarkup;
 use App\Liquid\Filters\Uniqueness;
 use App\Liquid\Tags\TemplateTag;
@@ -18,6 +19,7 @@ use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
+use Keepsuit\LaravelLiquid\LaravelLiquidExtension;
 use Keepsuit\Liquid\Exceptions\LiquidException;
 use Keepsuit\Liquid\Extensions\StandardExtension;
 
@@ -264,6 +266,7 @@ class Plugin extends Model
 
         // Use the Liquid template engine to resolve variables
         $environment = App::make('liquid.environment');
+        $environment->filterRegistry->register(StandardFilters::class);
         $liquidTemplate = $environment->parseString($template);
         $context = $environment->newRenderContext(data: $variables);
 
@@ -285,7 +288,7 @@ class Plugin extends Model
                 $inlineFileSystem = new InlineTemplatesFileSystem();
                 $environment = new \Keepsuit\Liquid\Environment(
                     fileSystem: $inlineFileSystem,
-                    extensions: [new StandardExtension()]
+                    extensions: [new StandardExtension(), new LaravelLiquidExtension()]
                 );
 
                 // Register all custom filters

resources/views/livewire/catalog/index.blade.php

@@ -2,6 +2,7 @@
 
 use App\Services\PluginImportService;
 use Livewire\Volt\Component;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
@@ -26,21 +27,40 @@ new class extends Component {
                 $catalogContent = $response->body();
                 $catalog = Yaml::parse($catalogContent);
 
-                return collect($catalog)->map(function ($plugin, $key) {
+                $currentVersion = config('app.version');
-                    return [
+
-                        'id' => $key,
+                return collect($catalog)
-                        'name' => $plugin['name'] ?? 'Unknown Plugin',
+                    ->filter(function ($plugin) use ($currentVersion) {
-                        'description' => $plugin['author_bio']['description'] ?? '',
+                        // Check if Laravel compatibility is true
-                        'author' => $plugin['author']['name'] ?? 'Unknown Author',
+                        if (!Arr::get($plugin, 'byos.byos_laravel.compatibility', false)) {
-                        'github' => $plugin['author']['github'] ?? null,
+                            return false;
-                        'license' => $plugin['license'] ?? null,
+                        }
-                        'zip_url' => $plugin['trmnlp']['zip_url'] ?? null,
+
-                        'repo_url' => $plugin['trmnlp']['repo'] ?? null,
+                        // Check minimum version if specified
-                        'logo_url' => $plugin['logo_url'] ?? null,
+                        $minVersion = Arr::get($plugin, 'byos.byos_laravel.min_version');
-                        'screenshot_url' => $plugin['screenshot_url'] ?? null,
+                        if ($minVersion && $currentVersion && version_compare($currentVersion, $minVersion, '<')) {
-                        'learn_more_url' => $plugin['author_bio']['learn_more_url'] ?? null,
+                            return false;
-                    ];
+                        }
-                })->toArray();
+
+                        return true;
+                    })
+                    ->map(function ($plugin, $key) {
+                        return [
+                            'id' => $key,
+                            'name' => Arr::get($plugin, 'name', 'Unknown Plugin'),
+                            'description' => Arr::get($plugin, 'author_bio.description', ''),
+                            'author' => Arr::get($plugin, 'author.name', 'Unknown Author'),
+                            'github' => Arr::get($plugin, 'author.github'),
+                            'license' => Arr::get($plugin, 'license'),
+                            'zip_url' => Arr::get($plugin, 'trmnlp.zip_url'),
+                            'repo_url' => Arr::get($plugin, 'trmnlp.repo'),
+                            'logo_url' => Arr::get($plugin, 'logo_url'),
+                            'screenshot_url' => Arr::get($plugin, 'screenshot_url'),
+                            'learn_more_url' => Arr::get($plugin, 'author_bio.learn_more_url'),
+                        ];
+                    })
+                    ->sortBy('name')
+                    ->toArray();
             } catch (\Exception $e) {
                 Log::error('Failed to load catalog from URL: ' . $e->getMessage());
                 return [];

resources/views/livewire/plugins/index.blade.php

@@ -38,10 +38,7 @@ new class extends Component {
 
     public function refreshPlugins(): void
     {
-        $userPlugins = auth()->user()?->plugins?->map(function ($plugin) {
+        $userPlugins = auth()->user()?->plugins?->makeHidden(['render_markup', 'data_payload'])->toArray();
-            return $plugin->toArray();
-        })->toArray();
-
         $this->plugins = array_merge($this->native_plugins, $userPlugins ?? []);
     }
 

resources/views/livewire/plugins/recipe.blade.php

@@ -133,7 +133,7 @@ new class extends Component {
                     $this->addError('polling_url', 'The polling URL must be a valid URL after resolving configuration variables.');
                 }
             } catch (\Exception $e) {
-                $this->addError('polling_url', 'Error resolving Liquid variables: ' . $e->getMessage());
+                $this->addError('polling_url', 'Error resolving Liquid variables: ' . $e->getMessage() . $e->getPrevious()?->getMessage());
             }
         }
     }
@@ -148,7 +148,7 @@ new class extends Component {
                 $this->data_payload_updated_at = $this->plugin->data_payload_updated_at;
 
             } catch (\Exception $e) {
-                $this->dispatch('data-update-error', message: $e->getMessage());
+                $this->dispatch('data-update-error', message: $e->getMessage() . $e->getPrevious()?->getMessage());
             }
         }
     }
@@ -690,7 +690,10 @@ HTML;
                                                                     <flux:checkbox label="{{ $label }}" value="{{ $value }}"/>
                                                                 @endforeach
                                                             @else
-                                                                <flux:checkbox label="{{ $option }}" value="{{ $option }}"/>
+                                                                @php
+                                                                    $key = mb_strtolower(str_replace(' ', '_', $option));
+                                                                @endphp
+                                                                <flux:checkbox label="{{ $option }}" value="{{ $key }}"/>
                                                             @endif
                                                         @endforeach
                                                     @endif

tests/Feature/Livewire/Catalog/IndexTest.php

@@ -38,6 +38,11 @@ it('loads plugins from catalog URL', function () {
             'trmnlp' => [
                 'zip_url' => 'https://example.com/plugin.zip',
             ],
+            'byos' => [
+              'byos_laravel' => [
+                  'compatibility' => true,
+              ]
+            ],
             'logo_url' => 'https://example.com/logo.png',
         ],
     ];

tests/Feature/PluginLiquidFilterTest.php

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
+use App\Liquid\Filters\StandardFilters;
 use App\Models\Plugin;
+use Keepsuit\Liquid\Environment;
 
 /**
  * Tests for the Liquid where filter functionality
@@ -92,3 +94,31 @@ LIQUID
     // Should not contain the low tide data
     $this->assertStringNotContainsString('"type":"L"', $result);
 });
+
+it('encodes arrays for url_encode as JSON with spaces after commas and then percent-encodes', function () {
+    /** @var Environment $env */
+    $env = app('liquid.environment');
+    $env->filterRegistry->register(StandardFilters::class);
+
+    $template = $env->parseString('{{ categories | url_encode }}');
+
+    $output = $template->render($env->newRenderContext([
+        'categories' => ['common', 'obscure'],
+    ]));
+
+    expect($output)->toBe('%5B%22common%22%2C%22obscure%22%5D');
+});
+
+it('keeps scalar url_encode behavior intact', function () {
+    /** @var Environment $env */
+    $env = app('liquid.environment');
+    $env->filterRegistry->register(StandardFilters::class);
+
+    $template = $env->parseString('{{ text | url_encode }}');
+
+    $output = $template->render($env->newRenderContext([
+        'text' => 'hello world',
+    ]));
+
+    expect($output)->toBe('hello+world');
+});