More module fixes (#15)

* Fix framework structure

* more fixes

* imports

Author: kabiroberai

Package.swift

@@ -30,7 +30,8 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"),
     ],
     targets: [
-        .target(name: "CNodeAPI"),
+        .systemLibrary(name: "CNodeAPI"),
+        .target(name: "CNodeAPISupport"),
         .macro(
             name: "NodeAPIMacros",
             dependencies: [
@@ -41,7 +42,7 @@ let package = Package(
         ),
         .target(
             name: "NodeAPI",
-            dependencies: ["CNodeAPI", "NodeAPIMacros"],
+            dependencies: ["CNodeAPI", "CNodeAPISupport", "NodeAPIMacros"],
             swiftSettings: baseSwiftSettings
         ),
         .target(

Sources/CNodeAPI/module.modulemap

@@ -0,0 +1,4 @@
+module CNodeAPI {
+    export Darwin.POSIX
+    header "vendored/node_api.h"
+}

Sources/CNodeAPI/include/vendored/js_native_api.h renamed to Sources/CNodeAPI/vendored/js_native_api.h

@@ -1,4 +1,5 @@
 import Foundation
+import CNodeAPISupport
 @_implementationOnly import CNodeAPI
 
 extension NodeContext {

Sources/CNodeAPI/include/vendored/js_native_api_types.h renamed to Sources/CNodeAPI/vendored/js_native_api_types.h

@@ -1,4 +1,5 @@
 import Foundation
+import CNodeAPISupport
 @_implementationOnly import CNodeAPI
 
 extension NodeEnvironment {

Sources/CNodeAPI/include/vendored/node_api.h renamed to Sources/CNodeAPI/vendored/node_api.h

@@ -1,4 +1,4 @@
-#include "vendored/node_api.h"
+@import CNodeAPI;
 
 NAPI_MODULE_INIT() {
     napi_value node_swift_register(napi_env);

Sources/CNodeAPI/include/vendored/node_api_types.h renamed to Sources/CNodeAPI/vendored/node_api_types.h

@@ -1,5 +1,5 @@
 import { rm, rename, realpath } from "fs/promises";
-import { spawnSync } from "child_process";
+import { spawn, spawnSync } from "child_process";
 import { forceSymlink } from "./utils";
 import path from "path";
 import { isDeepStrictEqual } from "util";
@@ -270,25 +270,31 @@ export async function build(mode: BuildMode, config: Config = {}): Promise<strin
             throw new Error(`xcodebuild exited with status ${result.status}`);
         }
 
+        // the exec realpath must end with .node for it to be considered a native module.
         await Promise.all([
             rename(
                 originalBinary,
-                // the realpath must end with .node for it to be considered a native module.
                 path.join(binaryDir, `${product}.framework`, "Versions", "A", `${product}.node`)
             ),
-            forceSymlink(
-                `${product}.node`,
-                // fixes symlinks that point to the binary without the .node ext
-                originalBinary
-            ),
-            // convenience
+            rm(path.join(binaryDir, `${product}.framework`, `${product}`), { force: true }),
             forceSymlink(
                 path.join("Versions", "Current", `${product}.node`),
                 path.join(binaryDir, `${product}.framework`, `${product}.node`)
             ),
             forceSymlink(
                 path.join(`${product}.framework`, `${product}.node`),
-                path.join(binaryDir, `${product}.node`)
+                binaryPath
+            ),
+            spawn(
+                "/usr/libexec/PlistBuddy",
+                [
+                    "-c",
+                    `Set :CFBundleExecutable ${product}.node`,
+                    path.join(binaryDir, `${product}.framework`, "Resources", "Info.plist"),
+                ],
+                {
+                    stdio: "inherit",
+                }
             ),
         ]);
     } else {