fix: use napi_run_script to register inline functions correctly, look for NS_RETURNS_RETAINED, unique encoding for methods with different signature offsets used in the method definition, fix type errors in generated TS types

Author: DjDeveloperr

deno.json

@@ -13,9 +13,9 @@
     "build": "deno run -A scripts/build.ts",
     "bench": "node examples/main.js",
     "deno": "../deno/target/release/deno run -A",
-    "bundle": "deno run -A --unstable scripts/bundler.ts",
+    "bundle": "deno run -A scripts/bundler.ts",
     "open-bundle": "open \"NativeScript for macOS.app\"",
-    "metagen": "deno run -A --unstable scripts/metagen.ts",
+    "metagen": "deno run -A scripts/metagen.ts",
     "build-metagen": "cd metadata && deno task build"
   },
 

metadata/include/IR.h

@@ -216,6 +216,7 @@ class MemberDecl {
   std::string methodSelector;
   bool isVariadic;
   bool isInit = false;
+  bool returnOwned = false;
 
   // Property
   TypeSpec propertyType;

metadata/metadata.ios.nsmd

@@ -1,4 +1,5 @@
 #include "IR.h"
+#include "clang-c/Index.h"
 #include <cassert>
 
 namespace metagen {
@@ -20,6 +21,23 @@ MemberDecl::MemberDecl(CXCursor cursor,
     name = jsifySelector(methodSelector);
     clang_disposeString(cxname);
 
+    clang_visitChildren(
+        cursor,
+        [](CXCursor cursor, CXCursor, CXClientData clientData) {
+          if (!isAvailable(cursor)) {
+            return CXChildVisit_Continue;
+          }
+
+          auto method = (MemberDecl *)clientData;
+
+          if (cursor.kind == CXCursor_NSReturnsRetained) {
+            method->returnOwned = true;
+          }
+
+          return CXChildVisit_Continue;
+        },
+        this);
+
     auto argc = clang_Cursor_getNumArguments(cursor);
 
     for (int i = 0; i < argc; i++) {

metadata/metadata.macos.nsmd

@@ -86,7 +86,7 @@ void ProtocolDecl::postProcessMembers() {
 
     for (ProtocolDecl *protocol : protocolRefs) {
       convertMethodToPropertyIfNeeded(
-          member, protocol->getMemberNamed(member.name), false);
+          member, protocol->getMemberNamed(member.name), true);
     }
 
     for (ProtocolDecl *protocol : derivedProtocolRefs) {

metadata/src/IR/Member.cpp

@@ -51,7 +51,7 @@ MDMember *MDMetadataWriter::memberFromDecl(MemberDecl &decl) {
     member->flags = mdMemberMethod;
     if (decl.isStatic)
       member->flags = (MDMemberFlag)(member->flags | mdMemberStatic);
-    if (isSelectorOwned(decl.methodSelector))
+    if (isSelectorOwned(decl.methodSelector) || decl.returnOwned)
       member->flags = (MDMemberFlag)(member->flags | mdMemberReturnOwned);
 
     if (decl.isInit) {
@@ -66,6 +66,7 @@ MDMember *MDMetadataWriter::memberFromDecl(MemberDecl &decl) {
     mdSignature->isVariadic = decl.isVariadic;
     MDSignatureResolvable res{mdSignature, &member->signature};
     signatureResolvables.emplace_back(res);
+
     break;
   }
   }

metadata/src/IR/Protocol.cpp

@@ -361,7 +361,7 @@ std::string MDTypeInfoSerde::encode(MDTypeInfo *type) {
     result += "}";
     break;
   case mdTypeBlock:
-    result = "^?";
+    result = "^" + std::to_string(type->signatureOffset);
     break;
   case mdTypePointer:
     result = "^";

metadata/src/MetadataWriter/Member.cpp

@@ -39,7 +39,7 @@ void TSFile::write(ClassDecl &decl) {
 
   line += " {";
   if (decl.tsIgnore) {
-    code.write("// @ts-ignore");
+    code.write("// @ts-ignore ClassDecl.tsIgnore");
   }
   code.write(line);
   code.enter();

metadata/src/MetadataWriter/TypeSpec.cpp

@@ -72,7 +72,7 @@ void TSFile::write(MemberDecl &decl, bool isInterface,
       // Due to inconsistencies between Objective-C and TypeScript type
       // systems, we have to use this annotation to prevent the TypeScript
       // compiler from complaining about how one type doesn't satisfy another.
-      code.write("// @ts-ignore");
+      code.write("// @ts-ignore MemberDecl.tsIgnore");
     }
 
     code.write(line);
@@ -97,7 +97,7 @@ void TSFile::write(MemberDecl &decl, bool isInterface,
                   : getterType;
       line += ";";
       if (decl.tsIgnore) {
-        code.write("// @ts-ignore");
+        code.write("// @ts-ignore MemberDecl.tsIgnore");
       }
       code.write(line);
 
@@ -114,7 +114,7 @@ void TSFile::write(MemberDecl &decl, bool isInterface,
                   : setterType;
       line += ");";
       if (decl.tsIgnore) {
-        code.write("// @ts-ignore");
+        code.write("// @ts-ignore MemberDecl.tsIgnore");
       }
       code.write(line);
     } else {
@@ -136,7 +136,7 @@ void TSFile::write(MemberDecl &decl, bool isInterface,
       line += ";";
 
       if (decl.tsIgnore) {
-        code.write("// @ts-ignore");
+        code.write("// @ts-ignore MemberDecl.tsIgnore");
       }
 
       code.write(line);