WIP

Author: GordonSmith

tools/wit-codegen/code_generator.cpp

@@ -680,6 +680,12 @@ void CodeGenerator::generateWAMRBindings(const std::vector<InterfaceInfo> &inter
         {
             std::string funcName = sanitize_identifier(func.name);
 
+            // If this is a resource method, prefix with resource name to match header generation
+            if (!func.resource_name.empty())
+            {
+                funcName = sanitize_identifier(func.resource_name) + "_" + funcName;
+            }
+
             // For standalone functions, reference directly in host namespace
             // For interface functions, reference within their interface namespace
             if (iface->is_standalone_function)
@@ -764,6 +770,13 @@ void CodeGenerator::generateWAMRBindings(const std::vector<InterfaceInfo> &inter
                 for (const auto &func : iface_info->functions)
                 {
                     std::string funcName = sanitize_identifier(func.name);
+
+                    // If this is a resource method, prefix with resource name to match header generation
+                    if (!func.resource_name.empty())
+                    {
+                        funcName = sanitize_identifier(func.resource_name) + "_" + funcName;
+                    }
+
                     out << "    host_function(\"" << func.name << "\", host::" << sanitize_identifier(local_namespace) << "::" << funcName << "),\n";
                 }
 
@@ -999,6 +1012,16 @@ void CodeGenerator::generateGuestFunctionWrappers(std::ofstream &out, const std:
             std::replace(type_alias_name.begin(), type_alias_name.end(), '-', '_');
             std::replace(type_alias_name.begin(), type_alias_name.end(), '.', '_');
 
+            // If this is a resource method, prefix with resource name to match type alias generation
+            if (!func.resource_name.empty())
+            {
+                std::string resource_name = func.resource_name;
+                std::replace(resource_name.begin(), resource_name.end(), '-', '_');
+                std::replace(resource_name.begin(), resource_name.end(), '.', '_');
+                type_alias_name = resource_name + "_" + type_alias_name;
+                function_name = resource_name + "_" + function_name;
+            }
+
             // Build the export name (e.g., "example:sample/booleans#and")
             std::string export_name = packageName + "/" + iface->name + "#" + func.name;
 
@@ -1584,6 +1607,19 @@ void CodeGenerator::generateGuestFunctionTypeAlias(std::ofstream &out, const Fun
                 }
             }
 
+            // Check in resources
+            if (!found)
+            {
+                for (const auto &resource : iface->resources)
+                {
+                    if (resource.name == potential_type)
+                    {
+                        found = true;
+                        break;
+                    }
+                }
+            }
+
             // If not found in any defined types, it's unknown
             if (!found)
             {
@@ -1644,6 +1680,15 @@ void CodeGenerator::generateGuestFunctionTypeAlias(std::ofstream &out, const Fun
     std::replace(type_alias_name.begin(), type_alias_name.end(), '-', '_');
     std::replace(type_alias_name.begin(), type_alias_name.end(), '.', '_');
 
+    // If this is a resource method, prefix with resource name to match other declarations
+    if (!func.resource_name.empty())
+    {
+        std::string resource_name = func.resource_name;
+        std::replace(resource_name.begin(), resource_name.end(), '-', '_');
+        std::replace(resource_name.begin(), resource_name.end(), '.', '_');
+        type_alias_name = resource_name + "_" + type_alias_name;
+    }
+
     out << "// Guest function signature for use with guest_function<" << type_alias_name << "_t>()\n";
     out << "using " << type_alias_name << "_t = " << return_type << "(";