objc-js 0.0.6 → 0.0.7

package/dist/index.js

@@ -36,7 +36,12 @@ class NobjcObject {
                 if (p === "toString")
                     return true;
                 // check if the object responds to the selector
-                return target.$msgSend("respondsToSelector:", NobjcMethodNameToObjcSelector(p.toString()));
+                try {
+                    return target.$msgSend("respondsToSelector:", NobjcMethodNameToObjcSelector(p.toString()));
+                }
+                catch (e) {
+                    return false;
+                }
             },
             get(target, methodName, receiver) {
                 // Return the underlying native object when Symbol is accessed
@@ -51,6 +56,23 @@ class NobjcObject {
                 if (methodName === "toString") {
                     return () => String(object.$msgSend("description"));
                 }
+                // handle other built-in Object.prototype properties
+                const builtInProps = [
+                    "constructor",
+                    "valueOf",
+                    "hasOwnProperty",
+                    "isPrototypeOf",
+                    "propertyIsEnumerable",
+                    "toLocaleString",
+                    "__proto__",
+                    "__defineGetter__",
+                    "__defineSetter__",
+                    "__lookupGetter__",
+                    "__lookupSetter__"
+                ];
+                if (builtInProps.includes(methodName)) {
+                    return Reflect.get(target, methodName);
+                }
                 if (!(methodName in receiver)) {
                     throw new Error(`Method ${methodName} not found on object ${receiver}`);
                 }
@@ -66,6 +88,12 @@ function unwrapArg(arg) {
     }
     return arg;
 }
+function wrapObjCObjectIfNeeded(result) {
+    if (typeof result == "object" && result instanceof ObjcObject) {
+        return new NobjcObject(result);
+    }
+    return result;
+}
 // Note: This is actually a factory function that returns a callable Proxy
 const NobjcMethod = function (object, methodName) {
     const selector = NobjcMethodNameToObjcSelector(methodName);
@@ -73,10 +101,7 @@ const NobjcMethod = function (object, methodName) {
     function methodFunc() {
         const unwrappedArgs = Array.from(arguments).map(unwrapArg);
         const result = object.$msgSend(selector, ...unwrappedArgs);
-        if (typeof result == "object" && result instanceof ObjcObject) {
-            return new NobjcObject(result);
-        }
-        return result;
+        return wrapObjCObjectIfNeeded(result);
     }
     const handler = {};
     return new Proxy(methodFunc, handler);
@@ -87,19 +112,15 @@ class NobjcProtocol {
         const convertedMethods = {};
         for (const [methodName, impl] of Object.entries(methodImplementations)) {
             const selector = NobjcMethodNameToObjcSelector(methodName);
-            // Wrap the implementation to unwrap args and wrap return values
+            // Wrap the implementation to wrap args and unwrap return values
             convertedMethods[selector] = function (...args) {
-                const unwrappedArgs = args.map(unwrapArg);
-                const result = impl(...unwrappedArgs);
+                // Wrap native ObjcObject arguments in NobjcObject proxies
+                const wrappedArgs = args.map((arg) => {
+                    return wrapObjCObjectIfNeeded(arg);
+                });
+                const result = impl(...wrappedArgs);
                 // If the result is already a NobjcObject, unwrap it to get the native object
-                if (result && typeof result === "object" && NATIVE_OBJC_OBJECT in result) {
-                    return result[NATIVE_OBJC_OBJECT];
-                }
-                // If the result is a native ObjcObject, return it as-is
-                if (typeof result === "object" && result instanceof ObjcObject) {
-                    return result;
-                }
-                return result;
+                return unwrapArg(result);
             };
         }
         // Call native implementation

package/package.json

@@ -36,7 +36,7 @@
     "format": "prettier --write \"**/*.{ts,js,json,md}\"",
     "preinstall-disabled": "npm run build-scripts && npm run make-clangd-config"
   },
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Objective-C bridge for Node.js",
   "main": "dist/index.js",
   "devDependencies": {