Add full (probably) macos support

Author: SerafimArts

src/Api/MessageBox/Driver/MacOS/LibObjectC.php

@@ -27,14 +27,17 @@ public function __construct()
     }
 
     /**
+     * @param non-empty-string $return
      * @param non-empty-string ...$types
      * @return callable(CData,CData,...):mixed
      */
-    public function getMessageSend(string ...$types): callable
+    public function getMessageSend(string $return, string ...$types): callable
     {
-        $signature = \sprintf('id(*)(id, SEL, %s)', \implode(',', $types));
+        $suffix = $types === [] ? '...' : \implode(',', $types);
 
-        return $this->cast($signature, $this->ffi->objc_msgSend);
+        $signature = \sprintf('%s(*)(id, SEL, %s)', $return, $suffix);
+
+        return $this->ffi->cast($signature, $this->ffi->objc_msgSend);
     }
 
     /**

src/Api/MessageBox/Driver/MacOSMessageBoxExtension.php

@@ -5,46 +5,48 @@
 namespace Boson\Api\MessageBox\Driver;
 
 use Boson\Api\MessageBox\Driver\MacOS\LibObjectC;
+use Boson\Api\MessageBox\MessageBoxButton;
 use Boson\Api\MessageBox\MessageBoxCreateInfo;
 use Boson\Api\MessageBox\MessageBoxExtensionInterface;
 use Boson\Api\MessageBox\MessageBoxIcon;
 use FFI\CData;
-use React\Promise\PromiseInterface;
-
-use function React\Promise\resolve;
 
 final readonly class MacOSMessageBoxExtension implements MessageBoxExtensionInterface
 {
     private CData $msgSendId;
-    private CData $msgSendString;
+    private CData $msgSendStringGetId;
     private CData $msgSendLong;
+    private CData $msgSendVoidGetId;
+    private CData $msgSendVoidGetLong;
 
     public function __construct(
         private LibObjectC $libobjc = new LibObjectC(),
     ) {
-        $this->msgSendId = $libobjc->getMessageSend('id');
-        $this->msgSendString = $libobjc->getMessageSend('const char*');
-        $this->msgSendLong = $libobjc->getMessageSend('long');
+        $this->msgSendStringGetId = $libobjc->getMessageSend('id', 'const char*');
+        $this->msgSendId = $libobjc->getMessageSend('id', 'id');
+        $this->msgSendLong = $libobjc->getMessageSend('id', 'long');
+        $this->msgSendVoidGetId = $libobjc->getMessageSend('id');
+        $this->msgSendVoidGetLong = $libobjc->getMessageSend('long');
     }
 
-    public function create(MessageBoxCreateInfo $info): PromiseInterface
+    public function create(MessageBoxCreateInfo $info): ?MessageBoxButton
     {
         // NSString *titleStr = [NSString stringWithUTF8String:title]
-        $titleStr = ($this->msgSendString)(
+        $titleStr = ($this->msgSendStringGetId)(
             $this->libobjc->objc_getClass('NSString'),
             $this->libobjc->sel_registerName('stringWithUTF8String:'),
             $info->title . "\0",
         );
 
         // NSString *textStr = [NSString stringWithUTF8String:text]
-        $textStr = ($this->msgSendString)(
+        $textStr = ($this->msgSendStringGetId)(
             $this->libobjc->objc_getClass('NSString'),
             $this->libobjc->sel_registerName('stringWithUTF8String:'),
             $info->text . "\0",
         );
 
         // NSAlert *alert = [NSAlert new]
-        $alert = $this->libobjc->objc_msgSend(
+        $alert = ($this->msgSendVoidGetId)(
             $this->libobjc->objc_getClass('NSAlert'),
             $this->libobjc->sel_registerName('new'),
         );
@@ -65,24 +67,52 @@ public function create(MessageBoxCreateInfo $info): PromiseInterface
 
         // Set alert style based on icon
         if ($info->icon !== null) {
-            // [alert setAlertStyle:alertStyle];
             ($this->msgSendLong)(
                 $alert,
                 $this->libobjc->sel_registerName('setAlertStyle:'),
                 match ($info->icon) {
-                    MessageBoxIcon::Error => 0,   // NSAlertStyleCritical
-                    MessageBoxIcon::Warning => 1, // NSAlertStyleWarning
-                    MessageBoxIcon::Info => 2,    // NSAlertStyleInformational
+                    MessageBoxIcon::Error => 2,   // NSAlertStyleCritical
+                    MessageBoxIcon::Warning => 0, // NSAlertStyleWarning
+                    MessageBoxIcon::Info => 1,    // NSAlertStyleInformational
                 },
             );
         }
 
+        // Add buttons based on cancel flag
+        if ($info->cancel) {
+            // [alert addButtonWithTitle:@"Cancel"];
+            ($this->msgSendId)(
+                $alert,
+                $this->libobjc->sel_registerName('addButtonWithTitle:'),
+                ($this->msgSendStringGetId)(
+                    $this->libobjc->objc_getClass('NSString'),
+                    $this->libobjc->sel_registerName('stringWithUTF8String:'),
+                    "Cancel\0",
+                ),
+            );
+        }
+
+        // [alert addButtonWithTitle:@"OK"];
+        ($this->msgSendId)(
+            $alert,
+            $this->libobjc->sel_registerName('addButtonWithTitle:'),
+            ($this->msgSendStringGetId)(
+                $this->libobjc->objc_getClass('NSString'),
+                $this->libobjc->sel_registerName('stringWithUTF8String:'),
+                "OK\0",
+            ),
+        );
+
         // [alert runModal];
-        $this->libobjc->objc_msgSend(
+        $result = ($this->msgSendVoidGetLong)(
             $alert,
             $this->libobjc->sel_registerName('runModal'),
         );
 
-        return resolve(null);
+        return match ($result) {
+            1000 => $info->cancel ? MessageBoxButton::Cancel : MessageBoxButton::Ok,
+            1001 => MessageBoxButton::Ok,
+            default => $info->cancel,
+        };
     }
 }

src/Api/MessageBox/Driver/WindowsMessageBoxExtension.php

@@ -10,9 +10,6 @@
 use Boson\Api\MessageBox\MessageBoxExtensionInterface;
 use Boson\Api\MessageBox\MessageBoxIcon;
 use FFI\CData;
-use React\Promise\PromiseInterface;
-
-use function React\Promise\resolve;
 
 final readonly class WindowsMessageBoxExtension implements MessageBoxExtensionInterface
 {
@@ -37,7 +34,7 @@ private function string(string $text): CData
         return $result;
     }
 
-    public function create(MessageBoxCreateInfo $info): PromiseInterface
+    public function create(MessageBoxCreateInfo $info): ?MessageBoxButton
     {
         $title = $this->string($info->title);
         $text = $this->string($info->text);
@@ -59,9 +56,9 @@ public function create(MessageBoxCreateInfo $info): PromiseInterface
         \FFI::free($text);
 
         return match ($result) {
-            User32::IDOK => resolve(MessageBoxButton::Ok),
-            User32::IDCANCEL => resolve(MessageBoxButton::Cancel),
-            default => resolve(null),
+            User32::IDOK => MessageBoxButton::Ok,
+            User32::IDCANCEL => MessageBoxButton::Cancel,
+            default => null,
         };
     }
 }

src/Api/MessageBox/MessageBoxExtensionInterface.php

@@ -4,12 +4,7 @@
 
 namespace Boson\Api\MessageBox;
 
-use React\Promise\PromiseInterface;
-
 interface MessageBoxExtensionInterface
 {
-    /**
-     * @return PromiseInterface<MessageBoxButton|null>
-     */
-    public function create(MessageBoxCreateInfo $info): PromiseInterface;
+    public function create(MessageBoxCreateInfo $info): ?MessageBoxButton;
 }