Enhance metadata generation by adding directory creation and error handling for umbrella header output

Author: DjDeveloperr

metadata-generator/src/main.cpp

@@ -2,6 +2,9 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
+#include <filesystem>
+#include <fstream>
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -187,9 +190,35 @@ int main(int argc, char** argv) {
     }
   }
 
-  auto umbrellaHeader = std::fopen(umbrellaHeaderName.c_str(), "w");
-  std::fwrite(code.data(), 1, code.size(), umbrellaHeader);
-  std::fclose(umbrellaHeader);
+  std::error_code umbrellaDirError;
+  std::filesystem::path umbrellaPath(umbrellaHeaderName);
+  if (!umbrellaPath.parent_path().empty()) {
+    std::filesystem::create_directories(umbrellaPath.parent_path(),
+                                        umbrellaDirError);
+    if (umbrellaDirError) {
+      std::cerr << "Failed to create umbrella output directory: "
+                << umbrellaPath.parent_path() << " ("
+                << umbrellaDirError.message() << ")" << std::endl;
+      std::exit(1);
+    }
+  }
+
+  std::ofstream umbrellaHeader(
+      umbrellaHeaderName, std::ios::out | std::ios::binary | std::ios::trunc);
+  if (!umbrellaHeader.is_open()) {
+    std::cerr << "Failed to open umbrella header for writing: "
+              << umbrellaHeaderName << " (" << std::strerror(errno) << ")"
+              << std::endl;
+    std::exit(1);
+  }
+
+  umbrellaHeader.write(code.data(), static_cast<std::streamsize>(code.size()));
+  if (!umbrellaHeader) {
+    std::cerr << "Failed to write umbrella header: " << umbrellaHeaderName
+              << std::endl;
+    std::exit(1);
+  }
+  umbrellaHeader.close();
 
   std::vector<const char*> argsC(args.size());
   for (size_t i = 0; i < args.size(); ++i) {

scripts/metagen.js

@@ -312,8 +312,10 @@ async function main() {
   }
 
   const typesDir = path.resolve(__dirname, "..", "packages", sdkName, "types");
+  const metadataDir = path.resolve(__dirname, "..", "metadata-generator", "metadata");
   await fsp.rm(typesDir, { recursive: true, force: true });
   await fsp.mkdir(typesDir, { recursive: true });
+  await fsp.mkdir(metadataDir, { recursive: true });
 
   for (const arch of Object.keys(sdk.targets)) {
     // Use the matching arch binary when available, falling back to arm64.
@@ -357,18 +359,12 @@ async function main() {
       "-verbose",
       "-output-bin",
       path.resolve(
-        __dirname,
-        "..",
-        "metadata-generator",
-        "metadata",
+        metadataDir,
         `metadata.${sdkName}.${arch}.nsmd`,
       ),
       "-output-umbrella",
       path.resolve(
-        __dirname,
-        "..",
-        "metadata-generator",
-        "metadata",
+        metadataDir,
         `metadata.${sdkName}.${arch}.h`,
       ),
       "Xclang",