WIP

Author: GordonSmith

samples/wamr/generated/sample_wamr.hpp

@@ -1,5 +1,5 @@
-#ifndef GENERATED_WAMR_BINDINGS_HPP
-#define GENERATED_WAMR_BINDINGS_HPP
+#ifndef GENERATED_SAMPLE_WAMR_HPP_HPP
+#define GENERATED_SAMPLE_WAMR_HPP_HPP
 
 // Generated WAMR helper functions for package: example:sample
 // This header provides utility functions for initializing and using WAMR with Component Model bindings
@@ -150,4 +150,4 @@ inline auto option_func(const wasm_module_inst_t& module_inst, const wasm_exec_e
 
 } // namespace guest_wrappers
 
-#endif // GENERATED_WAMR_BINDINGS_HPP
+#endif // GENERATED_SAMPLE_WAMR_HPP_HPP

tools/wit-codegen/code_generator.cpp

@@ -21,8 +21,9 @@ void CodeGenerator::generateHeader(const std::vector<InterfaceInfo> &interfaces,
         throw std::runtime_error("Cannot create header file: " + filename);
     }
 
-    // Generate header guard
-    std::string guard = "GENERATED_" + sanitize_identifier(filename) + "_HPP";
+    // Generate header guard using just the filename (not full path)
+    std::filesystem::path filepath(filename);
+    std::string guard = "GENERATED_" + sanitize_identifier(filepath.filename().string()) + "_HPP";
     std::transform(guard.begin(), guard.end(), guard.begin(), ::toupper);
 
     out << "#pragma once\n\n";
@@ -893,8 +894,10 @@ void CodeGenerator::generateWAMRHeader(const std::vector<InterfaceInfo> &interfa
         throw std::runtime_error("Cannot create WAMR header file: " + filename);
     }
 
-    // Header guard
-    std::string guard = "GENERATED_WAMR_BINDINGS_HPP";
+    // Header guard using just the filename (not full path)
+    std::filesystem::path filepath(filename);
+    std::string guard = "GENERATED_" + sanitize_identifier(filepath.filename().string()) + "_HPP";
+    std::transform(guard.begin(), guard.end(), guard.begin(), ::toupper);
     out << "#ifndef " << guard << "\n";
     out << "#define " << guard << "\n\n";
 
@@ -1871,8 +1874,7 @@ void CodeGenerator::generateExternalPackageStubs(std::ofstream &out,
             auto *iface_ptr = package->get_interface(iface_name);
             if (!iface_ptr)
             {
-                out << "    // Interface not found: " << iface_name << "\n";
-                continue;
+                throw std::runtime_error("Interface '" + iface_name + "' not found in package '" + package_spec + "'");
             }
 
             out << "    namespace " << sanitize_identifier(iface_name) << " {\n";

tools/wit-codegen/package_registry.cpp

@@ -124,10 +124,11 @@ bool PackageRegistry::load_package(const std::filesystem::path &path)
         // Parse the WIT file
         auto parse_result = WitGrammarParser::parse(path.string());
 
-        // Skip if no package name defined
+        // Skip if no package name defined (these are interface-only files that will be
+        // loaded as part of their parent package)
         if (parse_result.packageName.empty())
         {
-            return false;
+            return true; // Not an error - just skip interface-only files
         }
 
         // Parse package ID from package name

tools/wit-codegen/wit-codegen.cpp

@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
                     std::cout << "Loading dependency: " << dep_file << "\n";
                     if (!registry.load_package(dep_file))
                     {
-                        std::cerr << "Warning: Failed to load dependency: " << dep_file << "\n";
+                        throw std::runtime_error("Failed to load dependency: " + dep_file.string());
                     }
                 }
             }
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
                         std::cout << "Loading dependency: " << dep_file << "\n";
                         if (!registry.load_package(dep_file))
                         {
-                            std::cerr << "Warning: Failed to load dependency: " << dep_file << "\n";
+                            throw std::runtime_error("Failed to load dependency: " + dep_file.string());
                         }
                     }
                 }