begin work on variadic functions

Author: DjDeveloperr

core-test/src/index.js

@@ -4,10 +4,12 @@ import { StackLayout, Application, Label } from "../core/index.js";
 
 Application.run({
   create: () => {
+    setTimeout(() => {
+      alert("Hello World!");
+    }, 1000);
+
     const stackLayout = new StackLayout();
-    stackLayout.backgroundColor = "yellow";
-    stackLayout.width = 300;
-    stackLayout.height = 300;
+    stackLayout.backgroundColor = "white";
 
     const label = new Label();
     label.text = "Hello World!";

metadata/include/IR.h

@@ -59,6 +59,7 @@ class TypeSpec {
   // kTypeCallback, kTypeFunctionPointer
   std::vector<TypeSpec> callbackArgs;
   std::shared_ptr<TypeSpec> callbackReturn;
+  bool isVariadic = false;
 
   // kTypeObject, kTypeInstanceObject, kTypeAnyObject
   std::string className;

metadata/include/Metadata.h

@@ -75,7 +75,7 @@ enum MDTypeKind : uint8_t {
 
 enum MDTypeFlag : uint8_t {
   mdTypeFlagNext = 1 << 7,
-  mdTypeFlagReserved = 1 << 6,
+  mdTypeFlagVariadic = 1 << 6,
 };
 
 enum MDVariableEvalKind : uint8_t {

metadata/include/MetadataWriter.h

@@ -74,6 +74,7 @@ struct MDUnion {
 struct MDSignature {
   MDTypeInfo *returnType;
   std::vector<MDTypeInfo *> arguments;
+  bool isVariadic;
 };
 
 struct MDFunction {

metadata/metadata.macos.nsmd

@@ -12,6 +12,7 @@ void MDMetadataWriter::write(FunctionDecl &decl) {
   for (auto param : decl.parameters) {
     mdSignature->arguments.push_back(getTypeInfo(param.type));
   }
+  mdSignature->isVariadic = decl.isVariadic;
 
   MDSignatureResolvable res{mdSignature, &mdFunction->signature};
   signatureResolvables.emplace_back(res);
@@ -38,10 +39,13 @@ void MDSignatureSerde::serialize(MDSignature *value, void *data) {
   auto typeInfoSerde = MDTypeInfoSerde();
   auto returnTypeSize = typeInfoSerde.size(value->returnType);
   typeInfoSerde.serialize(value->returnType, data);
+  MDTypeKind *data_kind = (MDTypeKind *)data;
   if (value->arguments.size() > 0) {
-    MDTypeKind *data_kind = (MDTypeKind *)data;
     data_kind[0] = (MDTypeKind)(value->returnType->kind | mdTypeFlagNext);
   }
+  if (value->isVariadic) {
+    data_kind[0] = (MDTypeKind)(value->returnType->kind | mdTypeFlagVariadic);
+  }
   ptr_add(&data, returnTypeSize);
   // Arguments
   size_t argumentsSize = value->arguments.size();
@@ -64,6 +68,9 @@ std::string MDSignatureSerde::encode(MDSignature *signature) {
   for (auto arg : signature->arguments) {
     result += typeInfoSerde.encode(arg);
   }
+  if (signature->isVariadic) {
+    result += "...";
+  }
   return result;
 }
 

metadata/src/MetadataWriter/Function.cpp

@@ -20,6 +20,7 @@ MDMember *MDMetadataWriter::memberFromDecl(MemberDecl &decl) {
 
     MDSignature *mdSignature = new MDSignature();
     mdSignature->returnType = info;
+    mdSignature->isVariadic = false;
     MDSignatureResolvable res{mdSignature, &member->getterSignature};
     signatureResolvables.emplace_back(res);
 
@@ -28,6 +29,7 @@ MDMember *MDMetadataWriter::memberFromDecl(MemberDecl &decl) {
       mdSetterSignature->arguments.push_back(info);
       mdSetterSignature->returnType = new MDTypeInfo();
       mdSetterSignature->returnType->kind = mdTypeVoid;
+      mdSetterSignature->isVariadic = false;
 
       MDSignatureResolvable setterRes{mdSetterSignature,
                                       &member->setterSignature};
@@ -57,6 +59,7 @@ MDMember *MDMetadataWriter::memberFromDecl(MemberDecl &decl) {
     for (auto param : decl.parameters) {
       mdSignature->arguments.push_back(getTypeInfo(param.type));
     }
+    mdSignature->isVariadic = decl.isVariadic;
     MDSignatureResolvable res{mdSignature, &member->signature};
     signatureResolvables.emplace_back(res);
     break;

metadata/src/MetadataWriter/Member.cpp

@@ -74,6 +74,7 @@ MDTypeInfo *MDMetadataWriter::getTypeInfo(TypeSpec &type) {
       sig->arguments.emplace_back(getTypeInfo(arg));
     }
     sig->returnType = getTypeInfo(*type.callbackReturn);
+    sig->isVariadic = type.isVariadic;
     info->kind = mdTypeBlock;
     MDSignatureResolvable res{sig, &info->signatureOffset};
     signatureResolvables.emplace_back(res);
@@ -87,6 +88,7 @@ MDTypeInfo *MDMetadataWriter::getTypeInfo(TypeSpec &type) {
       sig->arguments.emplace_back(getTypeInfo(arg));
     }
     sig->returnType = getTypeInfo(*type.callbackReturn);
+    sig->isVariadic = type.isVariadic;
     info->kind = mdTypeFunctionPointer;
     MDSignatureResolvable res{sig, &info->signatureOffset};
     signatureResolvables.emplace_back(res);

metadata/src/MetadataWriter/TypeSpec.cpp

@@ -77,6 +77,18 @@
 
 NAPI_FUNCTION(registerClass) {
   NAPI_CALLBACK_BEGIN(1)
+
+  // In case no arguments are passed, we just return the NativeObject class.
+  // This is to support both @NativeClass and @NativeClass() syntaxes.
+  // Maybe we should support more in future like
+  // @NativeClass(NSApplicationDelegate).
+  if (argc == 0) {
+    napi_value func;
+    napi_create_function(env, "NativeClass", NAPI_AUTO_LENGTH, JS_registerClass,
+                         nullptr, &func);
+    return func;
+  }
+
   auto bridgeData = ObjCBridgeData::InstanceData(env);
   bridgeData->registerClass(env, argv[0]);
   return nullptr;

src/Class.mm

@@ -1422,7 +1422,7 @@ void toNative(napi_env env, napi_value value, void *result, bool *shouldFree,
                                          uint8_t opaquePointers) {
   auto kind = reader->getTypeKind(*offset);
   bool next = kind & mdTypeFlagNext;
-  kind = (MDTypeKind)(kind & ~mdTypeFlagNext);
+  kind = (MDTypeKind)((kind & ~mdTypeFlagNext) & ~mdTypeFlagVariadic);
   *offset += sizeof(MDTypeKind);
 
   switch (kind) {