Pass runtime function to allow on the fly callback swap

Author: pinepain

src/Wrappers/FunctionComponents/FunctionCallHandler.php

@@ -16,8 +16,8 @@
 namespace Pinepain\JsSandbox\Wrappers\FunctionComponents;
 
 
-use Pinepain\JsSandbox\Specs\FunctionSpecInterface;
 use Pinepain\JsSandbox\Wrappers\FunctionComponents\Runtime\ColdExecutionContextInterface;
+use Pinepain\JsSandbox\Wrappers\Runtime\RuntimeFunctionInterface;
 use Throwable;
 use V8\FunctionCallbackInfo;
 
@@ -59,9 +59,12 @@ public function __construct(
         $this->return_setter       = $return_setter;
     }
 
-    public function wrap(callable $callback, FunctionSpecInterface $spec, ColdExecutionContextInterface $cold_execution_context)
+    public function wrap(RuntimeFunctionInterface $function, ColdExecutionContextInterface $cold_execution_context)
     {
-        return function (FunctionCallbackInfo $args) use ($callback, $spec, $cold_execution_context) {
+        return function (FunctionCallbackInfo $args) use ($function, $cold_execution_context) {
+            $spec     = $function->getSpec();
+            $callback = $function->getCallback();
+
             $arguments = $this->arguments_extractor->extract($args, $spec);
 
             if ($spec->getDecorators()) {

src/Wrappers/FunctionComponents/FunctionCallHandlerInterface.php

@@ -18,9 +18,10 @@
 
 use Pinepain\JsSandbox\Specs\FunctionSpecInterface;
 use Pinepain\JsSandbox\Wrappers\FunctionComponents\Runtime\ColdExecutionContextInterface;
+use Pinepain\JsSandbox\Wrappers\Runtime\RuntimeFunctionInterface;
 
 
 interface FunctionCallHandlerInterface
 {
-    public function wrap(callable $callback, FunctionSpecInterface $spec, ColdExecutionContextInterface $cold_execution_context);
+    public function wrap(RuntimeFunctionInterface $function, ColdExecutionContextInterface $cold_execution_context);
 }

src/Wrappers/FunctionWrapper.php

@@ -77,7 +77,7 @@ public function wrap(Isolate $isolate, Context $context, $value): FunctionObject
 
         $cold_execution_context = new ColdExecutionContext($this->wrapper, $value);
 
-        $callback = $this->handler->wrap($value->getCallback(), $value->getSpec(), $cold_execution_context);
+        $callback = $this->handler->wrap($value, $cold_execution_context);
         $callback = $this->guard->guard($callback);
 
         $f = new FunctionObject($context, $callback);