feat(MetadataGenerator): support including non-system frameworks

Author: DjDeveloperr

core-test/src/compat.js

@@ -5,20 +5,6 @@ globalThis.__IOS__ = true;
 globalThis.__VISIONOS__ = false;
 globalThis.__dirname = NSBundle.mainBundle.bundlePath;
 
-function NativeScriptEmbedder() {}
-
-globalThis.NativeScriptEmbedder = NativeScriptEmbedder;
-
-globalThis.nativeScriptEmbedder = new NativeScriptEmbedder();
-
-NativeScriptEmbedder.sharedInstance = function () {
-    return nativeScriptEmbedder;
-};
-
-NativeScriptEmbedder.prototype.setDelegate = function (delegate) {
-    this.delegate = delegate;
-};
-
 WeakRef.prototype.get = function () {
   return this.deref();
 };

core-test/src/index.js

@@ -1,11 +1,24 @@
 import "./compat.js";
 import "../core/globals/index.js";
-import { StackLayout, Application } from "../core/index.js";
+import { StackLayout, Application, Label } from "../core/index.js";
 
 Application.run({
   create: () => {
     const stackLayout = new StackLayout();
     stackLayout.backgroundColor = "yellow";
+    stackLayout.width = 300;
+    stackLayout.height = 300;
+    
+    const label = new Label();
+    label.text = "Hello World!";
+    label.textAlignment = "center";
+    label.fontSize = 24;
+    label.color = "black";
+    label.width = 200;
+    label.height = 200;
+
+    stackLayout.addChild(label);
+
     return stackLayout;
   },
 });

examples/metal.js

@@ -45,7 +45,7 @@ class MetalAdder {
     const library = device.newLibraryWithSourceOptionsError(
       `
       #include <metal_stdlib>
-      using namespace metall; // error
+      using namespace metal;
       
       kernel void add_arrays(device const float* inA,
                             device const float* inB,

metadata/include/IR.h

@@ -348,7 +348,7 @@ class MetadataFactory {
   void processClassRefs();
   void processProtocolRefs();
 
-  std::unordered_set<std::string> frameworks;
+  std::unordered_set<std::string> includePaths;
 
   std::unordered_map<std::string, VariableDecl> variables;
   std::unordered_map<std::string, EnumDecl> enums;

metadata/metadata.ios.nsmd

@@ -1,5 +1,6 @@
 #include "IR.h"
 #include "MetadataWriter.h"
+#include <string>
 #include <unordered_map>
 #include <unordered_set>
 
@@ -250,9 +251,20 @@ bool MetadataFactory::shouldProcess(CXCursor cursor, bool required) {
     return false;
   }
 
-  // TODO(Dj): Support user defined header files as well.
-  std::string framework = getFrameworkName(cursor);
-  return frameworks.contains(framework);
+  CXSourceLocation srcloc = clang_getCursorLocation(cursor);
+  CXFile file;
+  clang_getFileLocation(srcloc, &file, nullptr, nullptr, nullptr);
+  CXString fileName = clang_getFileName(file);
+  std::string fileNameStr = clang_getCString(fileName);
+  clang_disposeString(fileName);
+
+  for (const std::string &path : includePaths) {
+    if (fileNameStr.find(path) != std::string::npos) {
+      return true;
+    }
+  }
+
+  return false;
 }
 
 void MetadataFactory::processVariable(CXCursor cursor) {

metadata/metadata.macos.nsmd

@@ -11,28 +11,24 @@
 #include <set>
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 using namespace metagen;
 
 #define UMBRELLA_HEADER "umbrella.h"
 
 int main(int argc, char **argv) {
-  char *target = argv[1];
-  char *outputFile = argv[2];
-  char *outputTypesDir = argv[3];
-  std::string sdk = argv[4];
-  std::string frameworksDir = sdk + "/System/Library/Frameworks";
+  std::string outputFile;
+  std::string outputTypesDir;
+  std::string sdk;
+  std::string frameworksDir;
 
-  std::set<std::string> frameworks;
-
-  for (int i = 5; i < argc; i++) {
-    frameworks.insert(argv[i]);
-  }
+  std::string code = "";
 
   std::vector<std::string> args = {"-Xclang",
                                    "-isysroot",
-                                   sdk,
+                                   "",
                                    "-x",
                                    "objective-c",
                                    "-fno-objc-arc",
@@ -44,18 +40,54 @@ int main(int argc, char **argv) {
                                    "-Wno-expansion-to-defined",
                                    "-Wno-deprecated-declarations",
                                    "-Wno-objc-property-no-attribute",
-                                   "-std=gnu11",
-                                   "-I" + sdk + "/usr/include",
-                                   "-F" + frameworksDir,
-                                   "-target",
-                                   target};
-
-  std::string code = "";
-
-  for (auto &framework : frameworks) {
-    args.emplace_back("-I" + frameworksDir + "/" + framework +
-                      ".framework/Headers");
-    code += "#import <" + framework + "/" + framework + ".h>\n";
+                                   "-std=gnu11"};
+
+  std::unordered_set<std::string> includePaths;
+
+  for (int i = 1; i < argc; i++) {
+    std::string arg = argv[i];
+    if (arg.find("framework=") == 0) {
+      if (frameworksDir.empty()) {
+        std::cout << "framework= argument must be specified after sdk="
+                  << std::endl;
+        std::exit(1);
+      }
+
+      std::string framework = arg.substr(10);
+      std::string includePath = frameworksDir + "/" + framework + ".framework";
+      includePaths.emplace(includePath);
+      args.emplace_back("-I" + includePath + "/Headers");
+      code += "#import <" + framework + "/" + framework + ".h>\n";
+    } else if (arg.find("include=") == 0) {
+      std::string includeDir = arg.substr(8);
+      includePaths.emplace(includeDir);
+    } else if (arg.find("headers=") == 0) {
+      std::string includeDir = arg.substr(8);
+      args.emplace_back("-I" + includeDir);
+    } else if (arg.find("import=") == 0) {
+      std::string import = arg.substr(7);
+      code += "#import " + import + "\n";
+    } else if (arg.find("sdk=") == 0) {
+      sdk = arg.substr(4);
+      args[2] = sdk;
+      args.emplace_back("-I" + sdk + "/usr/include");
+      frameworksDir = sdk + "/System/Library/Frameworks";
+      args.emplace_back("-F" + frameworksDir);
+    } else if (arg.find("target=") == 0) {
+      std::string target = arg.substr(7);
+      args.emplace_back("-target");
+      args.emplace_back(target);
+    } else if (arg.find("arg=") == 0) {
+      std::string argval = arg.substr(4);
+      args.emplace_back(argval);
+    } else if (arg.find("output=") == 0) {
+      outputFile = arg.substr(7);
+    } else if (arg.find("types=") == 0) {
+      outputTypesDir = arg.substr(6);
+    } else {
+      std::cout << "Unknown argument: " << arg << std::endl;
+      std::exit(1);
+    }
   }
 
   std::vector<const char *> argsC(args.size());
@@ -72,13 +104,13 @@ int main(int argc, char **argv) {
       index, UMBRELLA_HEADER, argsC.data(), args.size(), nullptr, 0,
       CXTranslationUnit_None);
 
+  std::remove(UMBRELLA_HEADER);
+
   if (unit == nullptr) {
     std::cout << "Failed to parse translation unit" << std::endl;
     std::exit(1);
   }
 
-  std::remove(UMBRELLA_HEADER);
-
   // print diagnostics
   unsigned numDiagnostics = clang_getNumDiagnostics(unit);
 
@@ -100,9 +132,7 @@ int main(int argc, char **argv) {
   CXCursor cursor = clang_getTranslationUnitCursor(unit);
 
   MetadataFactory factory;
-  for (auto fw : frameworks) {
-    factory.frameworks.emplace(fw);
-  }
+  factory.includePaths = includePaths;
   factory.process(cursor);
   factory.postProcess();
 
@@ -121,7 +151,6 @@ int main(int argc, char **argv) {
   std::cout << "           total size: " << result.second / 1024. / 1024.
             << " MB" << std::endl;
   std::cout << "       total sections: " << MD_NUM_SECTIONS << std::endl;
-  std::cout << "       num frameworks: " << frameworks.size() << std::endl;
   std::cout << "    strings (n, size): " << writer.strings.size() << ", "
             << writer.strings.section_size / 1024. << " KB" << std::endl;
   std::cout << "     consts (n, size): " << writer.constants.size() << ","
@@ -141,7 +170,7 @@ int main(int argc, char **argv) {
   std::cout << "     unions (n, size): " << writer.unions.size() << ", "
             << writer.unions.section_size / 1024. << " KB" << std::endl;
 
-  auto file = std::fopen(outputFile, "w");
+  auto file = std::fopen(outputFile.c_str(), "w");
   std::fwrite(result.first, 1, result.second, file);
   std::fclose(file);
 

metadata/src/IR/Factory.cpp

@@ -99,15 +99,42 @@ await Deno.mkdir(new URL(`../types/${sdkName}`, import.meta.url), {
 
 const exec = new URL("../metadata/build/MetadataGenerator", import.meta.url);
 const args = [
-  sdk.target,
-  new URL(`../metadata/metadata.${sdkName}.nsmd`, import.meta.url)
-    .pathname,
-  new URL(`../types/${sdkName}`, import.meta.url)
-    .pathname,
-  sdk.path,
-  ...sdk.frameworks,
+  `target=${sdk.target}`,
+  `output=${
+    new URL(`../metadata/metadata.${sdkName}.nsmd`, import.meta.url)
+      .pathname
+  }`,
+  `types=${
+    new URL(`../types/${sdkName}`, import.meta.url)
+      .pathname
+  }`,
+  `sdk=${sdk.path}`,
 ];
 
+for (const framework of sdk.frameworks) {
+  args.push(`framework=${framework}`);
+}
+
+const customFrameworks = [
+  "/Users/dj/Projects/NativeScript/packages/ui-mobile-base/dist/package/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework",
+];
+
+for (const framework of customFrameworks) {
+  args.push(`include=${framework}`);
+  args.push(`headers=${framework}/Headers`);
+  args.push(`import="TNSWidgets.h"`);
+}
+
+args.push(
+  "include=/Users/dj/Projects/NativeScript/packages/core/platforms/ios/src",
+);
+args.push(
+  "headers=/Users/dj/Projects/NativeScript/packages/core/platforms/ios/src",
+);
+args.push('import="NativeScriptEmbedder.h"');
+args.push('import="NativeScriptUtils.h"');
+args.push('import="UIView+NativeScript.h"');
+
 console.log(`%c$ MetadataGenerator ${args.join(" ")}`, "color: grey");
 
 const proc = new Deno.Command(

metadata/src/main.cpp

@@ -1014,7 +1014,8 @@ void toNative(napi_env env, napi_value value, void *result, bool *shouldFree,
             napi_value elem;
             napi_get_property(env, value, key, &elem);
             toNative(env, elem, (void *)&obj, shouldFree, shouldFreeAny);
-            [(*res) setObject:obj forKey:[NSString stringWithUTF8String:buf]];
+            if (obj != nil)
+              [(*res) setObject:obj forKey:[NSString stringWithUTF8String:buf]];
           }
 
           return;