feat: inline functions and more

DjDeveloperr · DjDeveloperr · commit 983ed385e493 · 2023-12-06T10:55:00.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,7 +91,6 @@ set(LIB_SOURCE_FILES
   src/Closure.mm
   src/NativeCall.mm
   src/MethodCif.mm
-  src/ObjCBridgeData.mm
   src/TypeConv.mm
   src/Util.mm
   src/Struct.mm
@@ -103,6 +102,7 @@ set(LIB_SOURCE_FILES
   src/CustomClass.mm
   src/CFunction.mm
   src/Interop.mm
+  src/InlineFunctions.mm
 )
 
 add_library(
diff --git a/bench/main.js b/bench/main.js
@@ -1,6 +1,21 @@
 import "objc";
 import { bench, run } from "mitata";
 
+{
+  const arr = NSArray.array();
+
+  let total = 0;
+  let n = 1e6;
+
+  for (let i = 0; i < n; i++) {
+    const start = performance.now();
+    arr.count;
+    total += performance.now() - start;
+  }
+
+  console.log("ns/iter:", total * 1e6 / n);
+}
+
 const arr = NSMutableArray.arrayWithCapacity(100);
 
 const arr2 = new Proxy(arr, {
diff --git a/core-test/src/compat.js b/core-test/src/compat.js
@@ -8,7 +8,3 @@ globalThis.__dirname = NSBundle.mainBundle.bundlePath;
 WeakRef.prototype.get = function () {
   return this.deref();
 };
-
-globalThis.CGRectMake = function (x, y, width, height) {
-  return { origin: { x, y }, size: { width, height } };
-};
diff --git a/include/Bridge.h b/include/Bridge.h
diff --git a/include/InlineFunctions.h b/include/InlineFunctions.h
@@ -0,0 +1,12 @@
+#ifndef INLINE_FUNCTIONS_H
+#define INLINE_FUNCTIONS_H
+
+#include "js_native_api.h"
+
+namespace objc_bridge {
+
+void registerInlineFunctions(napi_env env);
+
+} // namespace objc_bridge
+
+#endif /* INLINE_FUNCTIONS_H */
diff --git a/include/NativeCall.h b/include/NativeCall.h
@@ -1,7 +1,7 @@
 #ifndef BRIDGED_METHOD_H
 #define BRIDGED_METHOD_H
 
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "objc/runtime.h"
 
 namespace objc_bridge {
diff --git a/include/ObjCBridge.h b/include/ObjCBridge.h
@@ -1,5 +1,5 @@
-#ifndef OBJC_BRIDGE_DATA_H
-#define OBJC_BRIDGE_DATA_H
+#ifndef OBJC_BRIDGE_H
+#define OBJC_BRIDGE_H
 
 #include "AutoreleasePool.h"
 #include "CFunction.h"
@@ -19,6 +19,9 @@
 #include <unordered_map>
 #include <unordered_set>
 
+extern "C" void objc_bridge_init(napi_env env, const char *metadata_path);
+extern "C" napi_value napi_register_module_v1(napi_env env, napi_value exports);
+
 using namespace metagen;
 
 namespace objc_bridge {
@@ -138,4 +141,4 @@ class ObjCBridgeData {
 
 } // namespace objc_bridge
 
-#endif /* OBJC_BRIDGE_DATA_H */
+#endif /* OBJC_BRIDGE_H */
diff --git a/lib/inline_functions.d.ts b/lib/inline_functions.d.ts
@@ -0,0 +1,35 @@
+export {};
+
+declare global {
+  function CGMakePoint(x: number, y: number): { x: number; y: number };
+  let NSMakePoint: typeof CGMakePoint;
+
+  function CGMakeSize(
+    width: number,
+    height: number,
+  ): { width: number; height: number };
+  let NSMakeSize: typeof CGMakeSize;
+
+  function CGMakeRect(
+    x: number,
+    y: number,
+    width: number,
+    height: number,
+  ): {
+    origin: { x: number; y: number };
+    size: { width: number; height: number };
+  };
+  let NSMakeRect: typeof CGMakeRect;
+
+  function UIMakeEdgeInsets(
+    top: number,
+    left: number,
+    bottom: number,
+    right: number,
+  ): { top: number; left: number; bottom: number; right: number };
+
+  function NSMakeRange(
+    location: number,
+    length: number,
+  ): { location: number; length: number };
+}
diff --git a/lib/types.d.ts b/lib/types.d.ts
@@ -1,3 +1,5 @@
+/// <reference path="./inline_functions.d.ts" />
+
 // It's a module
 export {};
 
diff --git a/src/Block.mm b/src/Block.mm
@@ -1,5 +1,5 @@
 #include "Block.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "node_api_util.h"
 #include "objc/runtime.h"
 #import <Foundation/Foundation.h>
diff --git a/src/CFunction.mm b/src/CFunction.mm
@@ -1,6 +1,6 @@
 #include "CFunction.h"
 #include "NativeCall.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 
 namespace objc_bridge {
 
diff --git a/src/Class.mm b/src/Class.mm
@@ -2,7 +2,7 @@
 #include "Metadata.h"
 #include "MetadataReader.h"
 #include "NativeCall.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "Protocol.h"
 #include "Util.h"
 #include "js_native_api.h"
diff --git a/src/Closure.mm b/src/Closure.mm
@@ -1,7 +1,7 @@
 #include "Closure.h"
 #include "AutoreleasePool.h"
 #include "MetadataReader.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "TypeConv.h"
 #include "Util.h"
 #include "js_native_api.h"
diff --git a/src/CustomClass.mm b/src/CustomClass.mm
@@ -1,5 +1,5 @@
 #include "Closure.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "Util.h"
 #include "js_native_api.h"
 #import <Foundation/Foundation.h>
diff --git a/src/Enum.mm b/src/Enum.mm
@@ -1,5 +1,5 @@
 #include "Enum.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #import <Foundation/Foundation.h>
 
 namespace objc_bridge {
diff --git a/src/InlineFunctions.mm b/src/InlineFunctions.mm
@@ -0,0 +1,37 @@
+#include "InlineFunctions.h"
+#include "js_native_api.h"
+
+namespace objc_bridge {
+
+static const char *inlineFunctionsSource = R"(
+
+globalThis.CGMakePoint = globalThis.NSMakePoint = function CGMakePoint(x, y) {
+  return { x, y };
+};
+
+globalThis.CGMakeSize = globalThis.NSMakeSize = function CGMakeSize(width, height) {
+  return { width, height };
+};
+
+globalThis.CGMakeRect = globalThis.NSMakeRect = function CGMakeRect(x, y, width, height) {
+  return { origin: { x, y }, size: { width, height } };
+};
+
+globalThis.NSMakeRange = function NSMakeRange(location, length) {
+  return { location, length };
+};
+
+globalThis.UIEdgeInsetsMake = function UIEdgeInsetsMake(top, left, bottom, right) {
+  return { top, left, bottom, right };
+};
+
+)";
+
+void registerInlineFunctions(napi_env env) {
+  napi_value script;
+  napi_create_string_utf8(env, inlineFunctionsSource, NAPI_AUTO_LENGTH,
+                          &script);
+  napi_run_script(env, script, nullptr);
+}
+
+} // namespace objc_bridge
diff --git a/src/Interop.mm b/src/Interop.mm
@@ -1,5 +1,5 @@
 #include "Interop.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "Util.h"
 #include "js_native_api.h"
 #include "js_native_api_types.h"
diff --git a/src/JSObject.mm b/src/JSObject.mm
@@ -1,5 +1,5 @@
 #include "JSObject.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "js_native_api.h"
 
 #import <Foundation/Foundation.h>
@@ -50,7 +50,8 @@ - (void)dealloc {
 
 @protocol Test
 
-@optional @property (nonatomic, readonly) bool optionalString;
+@optional
+@property(nonatomic, readonly) bool optionalString;
 
 @end
 
diff --git a/src/MethodCif.mm b/src/MethodCif.mm
@@ -1,6 +1,6 @@
 #include "MethodCif.h"
 #include "MetadataReader.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "TypeConv.h"
 #include "Util.h"
 #include <Foundation/Foundation.h>
diff --git a/src/NativeCall.mm b/src/NativeCall.mm
@@ -1,6 +1,6 @@
 #include "NativeCall.h"
 #include "MetadataReader.h"
-#include "ObjCBridgeData.h"
+#include "ObjCBridge.h"
 #include "TypeConv.h"
 #include "js_native_api.h"
 #include "js_native_api_types.h"
@@ -43,9 +43,11 @@
 
   cif->call(func->fnptr, rvalue, avalues);
 
-  for (unsigned int i = 0; i < cif->argc; i++) {
-    if (shouldFree[i]) {
-      cif->argTypes[i]->free(env, *((void **)avalues[i]));
+  if (shouldFreeAny) {
+    for (unsigned int i = 0; i < cif->argc; i++) {
+      if (shouldFree[i]) {
+        cif->argTypes[i]->free(env, *((void **)avalues[i]));
+      }
     }
   }
 
@@ -54,8 +56,9 @@
 
 inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
                            id self, void **avalues, void *rvalue) {
-  bool supercall;
-  napi_has_named_property(env, jsThis, "__objc_msgSendSuper__", &supercall);
+  // TODO: This seems bad for performance. Is there a better way?
+  bool supercall = false;
+  // napi_has_named_property(env, jsThis, "__objc_msgSendSuper__", &supercall);
 
 #if defined(__x86_64__)
   bool isStret = cif->returnType->type->size > 16 &&
diff --git a/src/ObjCBridge.mm b/src/ObjCBridge.mm
@@ -1,13 +1,13 @@
+#include "ObjCBridge.h"
 #include "AutoreleasePool.h"
 #include "Block.h"
-#include "Bridge.h"
 #include "Class.h"
 #include "Enum.h"
+#include "InlineFunctions.h"
 #include "Interop.h"
 #include "Metadata.h"
 #include "MetadataReader.h"
 #include "NativeCall.h"
-#include "ObjCBridgeData.h"
 #include "ObjectRef.h"
 #include "Struct.h"
 #include "TypeConv.h"
@@ -17,8 +17,77 @@
 #include "node_api_util.h"
 
 #import <Foundation/Foundation.h>
+#include <mach-o/dyld.h>
+#include <mach-o/getsect.h>
 #include <objc/runtime.h>
 
+#ifdef EMBED_METADATA_SIZE
+const unsigned char __attribute__((section("__objc_metadata,__objc_metadata")))
+embedded_metadata[EMBED_METADATA_SIZE] = "NSMDSectionHeader";
+#endif
+
+namespace objc_bridge {
+
+void finalize_bridge_data(napi_env env, void *data, void *hint) {
+  auto bridgeData = (ObjCBridgeData *)data;
+  delete bridgeData;
+}
+
+MDMetadataReader *loadMetadataFromFile(const char *metadata_path) {
+  if (metadata_path == nullptr) {
+    metadata_path = "metadata.nsmd";
+  }
+
+  auto f =
+      fopen(metadata_path == nullptr ? "metadata.nsmd" : metadata_path, "r");
+  if (f == nullptr) {
+    fprintf(stderr, "metadata.nsmd not found\n");
+    exit(1);
+  }
+  fseek(f, 0, SEEK_END);
+  auto size = ftell(f);
+  fseek(f, 0, SEEK_SET);
+  auto buffer = (uint8_t *)malloc(size);
+  fread(buffer, 1, size, f);
+  fclose(f);
+  return new MDMetadataReader(buffer, size);
+}
+
+ObjCBridgeData::ObjCBridgeData(napi_env env, const char *metadata_path) {
+  napi_set_instance_data(env, this, finalize_bridge_data, nil);
+
+  self_dl = dlopen(nullptr, RTLD_NOW);
+
+#ifdef EMBED_METADATA_SIZE
+  if (metadata_path != nullptr) {
+    metadata = loadMetadataFromFile(metadata_path);
+  } else {
+    metadata =
+        new MDMetadataReader((void *)embedded_metadata, EMBED_METADATA_SIZE);
+  }
+#else
+  unsigned long segmentSize = 0;
+  auto segmentData =
+      getsegmentdata((const mach_header_64 *)_dyld_get_image_header(0),
+                     "__objc_metadata", &segmentSize);
+  if (segmentData != nullptr) {
+    metadata = new MDMetadataReader(segmentData, segmentSize);
+  } else {
+    metadata = loadMetadataFromFile(metadata_path);
+  }
+#endif
+
+  objc_autoreleasePool = objc_autoreleasePoolPush();
+}
+
+ObjCBridgeData::~ObjCBridgeData() {
+  objc_autoreleasePoolPop(objc_autoreleasePool);
+  delete metadata;
+  dlclose(self_dl);
+}
+
+} // namespace objc_bridge
+
 using namespace objc_bridge;
 
 NAPI_FUNCTION(getArrayBuffer) {
@@ -106,6 +175,7 @@ NAPI_EXPORT void objc_bridge_init(napi_env env, const char *metadata_path) {
   napi_define_properties(env, global, 3, globalProperties);
 
   registerInterop(env, global);
+  registerInlineFunctions(env);
 
   bridgeData->registerVarGlobals(env, global);
   bridgeData->registerEnumGlobals(env, global);
diff --git a/src/ObjCBridgeData.mm b/src/ObjCBridgeData.mm
diff --git a/src/Object.mm b/src/Object.mm
diff --git a/src/Protocol.mm b/src/Protocol.mm
diff --git a/src/Struct.mm b/src/Struct.mm
diff --git a/src/TypeConv.mm b/src/TypeConv.mm
diff --git a/src/Variable.mm b/src/Variable.mm

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/// <reference path="./inline_functions.d.ts" />`
	`2`	`+`
`1`	`3`	`// It's a module`
`2`	`4`	`export {};`
`3`	`5`