Update cxx_impl and unity build for the regenerated C API

Picks up the C API where each type's C++ <-> C converters live in the
*_c.h that declares it, and refreshes the unity translation unit that the
macOS/iOS SwiftPM plugin builds: the generated capi sources are re-sorted
and the newly generated ones (dialog, geometry, placement) are included.

codegen.py stops emitting shortcut_manager_macos.mm in the platform list,
since cnativeapi.mm already includes it in its preamble to shadow Carbon's
global Point before anything introduces `using namespace nativeapi;`.

The Dart bindings are unchanged: the converters sit behind
#ifdef __cplusplus, so ffigen sees exactly the same C ABI as before.

Author: lijy91

packages/cnativeapi/codegen.py

@@ -311,6 +311,12 @@ def update_nativeapi_mm(nativeapi_path, cxx_impl_dir, platform):
         if "/capi/" in file_str:
             capi_files.append(rel_path)
         elif f"/platform/{platform}/" in file_str:
+            # The Carbon-based shortcut implementation is `#include`d directly in
+            # the cnativeapi.mm preamble (before the "Include source files" marker)
+            # so it can shadow Carbon's global `Point` before any file introduces
+            # `using namespace nativeapi;`. Skip it here to avoid including it twice.
+            if platform == "macos" and "shortcut_manager_macos.mm" in file_str:
+                continue
             platform_files.append(rel_path)
         elif "/foundation/" in file_str:
             foundation_files.append(rel_path)

packages/cnativeapi/cxx_impl

@@ -24,7 +24,11 @@ let package = Package(
             dependencies: [],
             path: "Sources/cnativeapi",
             sources: [
-                "cnativeapi.mm"
+                "cnativeapi.mm",
+                // The C API translation units (src/capi/*.cpp) need not be
+                // listed here: cnativeapi.mm #includes them into a single unity
+                // translation unit, and their conversion helpers are defined in
+                // the *_c.h that owns each type, so no redefinition errors occur.
             ],
             publicHeadersPath: "include",
             cxxSettings: [

packages/cnativeapi/ios/cnativeapi/Package.swift

@@ -5,19 +5,26 @@
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
 
+// NOTE: The C API translation units (cxx_impl/src/capi/*.cpp) are compiled in
+// this unity translation unit. Their C++ <-> C conversion helpers are defined in
+// the *_c.h header that owns each type, so every *_c.cpp shares one definition
+// and merging them here raises no redefinition errors.
+
 // Include source files
 #include "../../../../cxx_impl/src/capi/accessibility_manager_c.cpp"
 #include "../../../../cxx_impl/src/capi/application_c.cpp"
-#include "../../../../cxx_impl/src/capi/launch_at_login_c.cpp"
 #include "../../../../cxx_impl/src/capi/color_c.cpp"
+#include "../../../../cxx_impl/src/capi/dialog_c.cpp"
 #include "../../../../cxx_impl/src/capi/display_c.cpp"
 #include "../../../../cxx_impl/src/capi/display_manager_c.cpp"
+#include "../../../../cxx_impl/src/capi/geometry_c.cpp"
 #include "../../../../cxx_impl/src/capi/image_c.cpp"
-#include "../../../../cxx_impl/src/capi/dialog_c.cpp"
 #include "../../../../cxx_impl/src/capi/keyboard_c.cpp"
 #include "../../../../cxx_impl/src/capi/keyboard_monitor_c.cpp"
+#include "../../../../cxx_impl/src/capi/launch_at_login_c.cpp"
 #include "../../../../cxx_impl/src/capi/menu_c.cpp"
 #include "../../../../cxx_impl/src/capi/message_dialog_c.cpp"
+#include "../../../../cxx_impl/src/capi/placement_c.cpp"
 #include "../../../../cxx_impl/src/capi/positioning_strategy_c.cpp"
 #include "../../../../cxx_impl/src/capi/preferences_c.cpp"
 #include "../../../../cxx_impl/src/capi/secure_storage_c.cpp"
@@ -30,13 +37,13 @@
 #include "../../../../cxx_impl/src/capi/window_c.cpp"
 #include "../../../../cxx_impl/src/capi/window_manager_c.cpp"
 #include "../../../../cxx_impl/src/platform/ios/accessibility_manager_ios.mm"
-#include "../../../../cxx_impl/src/platform/ios/dispatcher_ios.mm"
 #include "../../../../cxx_impl/src/platform/ios/application_ios.mm"
-#include "../../../../cxx_impl/src/platform/ios/launch_at_login_ios.mm"
+#include "../../../../cxx_impl/src/platform/ios/dispatcher_ios.mm"
 #include "../../../../cxx_impl/src/platform/ios/display_ios.mm"
 #include "../../../../cxx_impl/src/platform/ios/display_manager_ios.mm"
 #include "../../../../cxx_impl/src/platform/ios/image_ios.mm"
 #include "../../../../cxx_impl/src/platform/ios/keyboard_monitor_ios.mm"
+#include "../../../../cxx_impl/src/platform/ios/launch_at_login_ios.mm"
 #include "../../../../cxx_impl/src/platform/ios/menu_ios.mm"
 #include "../../../../cxx_impl/src/platform/ios/message_dialog_ios.mm"
 #include "../../../../cxx_impl/src/platform/ios/preferences_ios.mm"

packages/cnativeapi/ios/cnativeapi/Sources/cnativeapi/cnativeapi.mm

@@ -24,7 +24,11 @@ let package = Package(
             dependencies: [],
             path: "Sources/cnativeapi",
             sources: [
-                "cnativeapi.mm"
+                "cnativeapi.mm",
+                // The C API translation units (src/capi/*.cpp) need not be
+                // listed here: cnativeapi.mm #includes them into a single unity
+                // translation unit, and their conversion helpers are defined in
+                // the *_c.h that owns each type, so no redefinition errors occur.
             ],
             publicHeadersPath: "include",
             cxxSettings: [

packages/cnativeapi/macos/cnativeapi/Package.swift

@@ -4,24 +4,31 @@
 // Import Cocoa framework
 #import <Cocoa/Cocoa.h>
 
-// Include Carbon-based shortcut implementation before any C API translation units
+// Include Carbon-based shortcut implementation before any platform translation units
 // that introduce `using namespace nativeapi;`, otherwise Carbon's global `Point`
 // collides with nativeapi::Point in this unified Objective-C++ translation unit.
 #include "../../../../cxx_impl/src/platform/macos/shortcut_manager_macos.mm"
 
+// NOTE: The C API translation units (cxx_impl/src/capi/*.cpp) are compiled in
+// this unity translation unit. Their C++ <-> C conversion helpers are defined in
+// the *_c.h header that owns each type, so every *_c.cpp shares one definition
+// and merging them here raises no redefinition errors.
+
 // Include source files
 #include "../../../../cxx_impl/src/capi/accessibility_manager_c.cpp"
 #include "../../../../cxx_impl/src/capi/application_c.cpp"
-#include "../../../../cxx_impl/src/capi/launch_at_login_c.cpp"
 #include "../../../../cxx_impl/src/capi/color_c.cpp"
+#include "../../../../cxx_impl/src/capi/dialog_c.cpp"
 #include "../../../../cxx_impl/src/capi/display_c.cpp"
 #include "../../../../cxx_impl/src/capi/display_manager_c.cpp"
+#include "../../../../cxx_impl/src/capi/geometry_c.cpp"
 #include "../../../../cxx_impl/src/capi/image_c.cpp"
-#include "../../../../cxx_impl/src/capi/dialog_c.cpp"
 #include "../../../../cxx_impl/src/capi/keyboard_c.cpp"
 #include "../../../../cxx_impl/src/capi/keyboard_monitor_c.cpp"
+#include "../../../../cxx_impl/src/capi/launch_at_login_c.cpp"
 #include "../../../../cxx_impl/src/capi/menu_c.cpp"
 #include "../../../../cxx_impl/src/capi/message_dialog_c.cpp"
+#include "../../../../cxx_impl/src/capi/placement_c.cpp"
 #include "../../../../cxx_impl/src/capi/positioning_strategy_c.cpp"
 #include "../../../../cxx_impl/src/capi/preferences_c.cpp"
 #include "../../../../cxx_impl/src/capi/secure_storage_c.cpp"
@@ -34,13 +41,13 @@
 #include "../../../../cxx_impl/src/capi/window_c.cpp"
 #include "../../../../cxx_impl/src/capi/window_manager_c.cpp"
 #include "../../../../cxx_impl/src/platform/macos/accessibility_manager_macos.mm"
-#include "../../../../cxx_impl/src/platform/macos/dispatcher_macos.mm"
 #include "../../../../cxx_impl/src/platform/macos/application_macos.mm"
-#include "../../../../cxx_impl/src/platform/macos/launch_at_login_macos.mm"
+#include "../../../../cxx_impl/src/platform/macos/dispatcher_macos.mm"
 #include "../../../../cxx_impl/src/platform/macos/display_macos.mm"
 #include "../../../../cxx_impl/src/platform/macos/display_manager_macos.mm"
 #include "../../../../cxx_impl/src/platform/macos/image_macos.mm"
 #include "../../../../cxx_impl/src/platform/macos/keyboard_monitor_macos.mm"
+#include "../../../../cxx_impl/src/platform/macos/launch_at_login_macos.mm"
 #include "../../../../cxx_impl/src/platform/macos/menu_macos.mm"
 #include "../../../../cxx_impl/src/platform/macos/message_dialog_macos.mm"
 #include "../../../../cxx_impl/src/platform/macos/preferences_macos.mm"