From 8c6502de2f8ec2bd8382cd6945c327d7be400e14 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 28 Jan 2026 05:34:41 +0000
Subject: [PATCH] =Queue cleanup - seems to be working enough to get legacy before and after going!

---
 inc/managers/queue/TypeRegistry.php |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/inc/managers/queue/TypeRegistry.php b/inc/managers/queue/TypeRegistry.php
index f695d75..7886fdf 100644
--- a/inc/managers/queue/TypeRegistry.php
+++ b/inc/managers/queue/TypeRegistry.php
@@ -3,6 +3,7 @@
 if (!defined('ABSPATH')) {
 	exit;
 }
+use JVBase\managers\queue\mergers\DefaultMerger;
 
 final class TypeRegistry
 {
@@ -10,6 +11,7 @@
 
 	public function register(string $type, TypeConfig $config): void
 	{
+		$this->validateRegistration($type, $config);
 		$this->configs[$type] = $config;
 	}
 
@@ -25,7 +27,22 @@
 
 	public function getMergeable(string $type): ?Mergeable
 	{
-		return $this->configs[$type]?->mergeable;
+		$config = $this->configs[$type] ?? null;
+		if (!$config) {
+			return null;
+		}
+
+		// Explicit mergeable always wins
+		if ($config->mergeable) {
+			return $config->mergeable;
+		}
+
+		// Default merge based on chunkKey
+		if ($config->chunkKey) {
+			return new DefaultMerger($config->chunkKey);
+		}
+
+		return null;
 	}
 
 	public function getConfig(string $type): ?TypeConfig
@@ -49,4 +66,16 @@
 	{
 		return $this->configs[$type]?->maxRetries ?? 3;
 	}
+
+	public function validateRegistration(string $type, TypeConfig $config): void
+	{
+		if ($config->executor && $config->chunkKey) {
+			// Verify executor can handle chunked operations
+			if (!method_exists($config->executor, 'execute')) {
+				throw new \InvalidArgumentException(
+					"Executor for '{$type}' must implement execute() method"
+				);
+			}
+		}
+	}
 }

--
Gitblit v1.10.0