fix: error handling for codegen and recipe plugins work (#92)

Co-authored-by: Ezekiel Warren <[email protected]>
Co-authored-by: Ezekiel Warren <[email protected]>

Author: Kelwan

MODULE.bazel

@@ -11,7 +11,7 @@ bazel_dep(name = "rules_pkg", version = "0.10.1")
 bazel_dep(name = "bazel_skylib", version = "1.6.1")
 bazel_dep(name = "ecsact_parse", version = "0.4.0")
 bazel_dep(name = "ecsact_runtime", version = "0.6.1")
-bazel_dep(name = "ecsact_interpret", version = "0.6.0")
+bazel_dep(name = "ecsact_interpret", version = "0.6.1")
 bazel_dep(name = "ecsact_codegen", version = "0.2.0")
 bazel_dep(name = "boost.dll", version = "1.83.0.bzl.2")
 bazel_dep(name = "magic_enum", version = "0.9.3")

MODULE.bazel.lock

@@ -11,6 +11,7 @@
 #include "docopt.h"
 #include "magic_enum.hpp"
 #include "ecsact/interpret/eval.hh"
+#include "ecsact/runtime/dynamic.h"
 #include "ecsact/runtime/meta.hh"
 #include "ecsact/cli/report.hh"
 #include "ecsact/cli/detail/argv0.hh"
@@ -207,6 +208,13 @@ auto ecsact::cli::detail::build_command( //
 
 	auto ec = std::error_code{};
 	fs::remove_all(work_dir, ec);
+	if(ec) {
+		ecsact::cli::report_error(
+			"Failed to clear work directory: {}",
+			ec.message()
+		);
+		return 1;
+	}
 	fs::create_directories(work_dir, ec);
 
 	for(auto file : files) {
@@ -218,6 +226,9 @@ auto ecsact::cli::detail::build_command( //
 		file_paths.emplace_back(file);
 	}
 
+	if(auto main_pkg_id = ecsact::meta::main_package(); main_pkg_id) {
+		ecsact_destroy_package(*main_pkg_id);
+	}
 	auto eval_errors = ecsact::eval_files(file_paths);
 
 	if(!eval_errors.empty()) {

ecsact/cli/commands/build.cc

@@ -189,6 +189,13 @@ static auto handle_source( //
 	auto default_plugins_dir = ecsact::cli::get_default_plugins_dir();
 	auto plugin_paths = std::vector<fs::path>{};
 
+	auto out_dir = fs::path(options.work_dir);
+
+	if(src.outdir) {
+		auto outdir_path = fs::path(*src.outdir);
+		out_dir = options.work_dir / outdir_path;
+	}
+
 	for(auto plugin : src.plugins) {
 		auto plugin_path = ecsact::cli::resolve_plugin_path({
 			.plugin_arg = plugin,
@@ -199,11 +206,13 @@ static auto handle_source( //
 		if(!plugin_path) {
 			return 1;
 		}
+
+		plugin_paths.push_back(*plugin_path);
 	}
 
 	auto exit_code = ecsact::cli::codegen({
 		.plugin_paths = plugin_paths,
-		.outdir = src.outdir ? *src.outdir : "",
+		.outdir = out_dir,
 	});
 
 	return exit_code;

ecsact/cli/commands/build/recipe/cook.cc

@@ -10,7 +10,8 @@
 #include <boost/dll/library_info.hpp>
 #include "docopt.h"
 #include "ecsact/interpret/eval.hh"
-#include "ecsact/runtime/meta.h"
+#include "ecsact/runtime/dynamic.h"
+#include "ecsact/runtime/meta.hh"
 #include "ecsact/runtime/dylib.h"
 #include "ecsact/codegen/plugin.h"
 #include "ecsact/codegen/plugin_validate.hh"
@@ -118,6 +119,9 @@ int ecsact::cli::detail::codegen_command(int argc, const char* argv[]) {
 		return 1;
 	}
 
+	if(auto main_pkg_id = ecsact::meta::main_package(); main_pkg_id) {
+		ecsact_destroy_package(*main_pkg_id);
+	}
 	auto eval_errors = ecsact::eval_files(files);
 	if(!eval_errors.empty()) {
 		for(auto& eval_err : eval_errors) {

ecsact/cli/commands/codegen.cc

@@ -8,6 +8,10 @@ cc_library(
     copts = copts,
     hdrs = ["codegen.hh"],
     srcs = ["codegen.cc"],
+    defines = [
+        "ECSACT_DYNAMIC_API=\"\"",
+        "ECSACT_META_API=\"\"",
+    ],
     deps = [
         ":codegen_util",
         "//ecsact/cli:report",

ecsact/cli/commands/codegen/BUILD.bazel

@@ -13,8 +13,16 @@
 namespace fs = std::filesystem;
 using namespace std::string_literals;
 
+static thread_local std::ofstream file_write_stream;
+
+static void file_write_fn(const char* str, int32_t str_len) {
+	file_write_stream << std::string_view(str, str_len);
+}
+
 auto ecsact::cli::codegen(codegen_options options) -> int {
 	auto plugins = std::vector<boost::dll::shared_library>{};
+	// key = plugin name, value = plugin path
+	auto plugin_names = std::unordered_map<std::string, std::string>{};
 
 	auto unload_plugins = [&plugins] {
 		for(auto& plugin : plugins) {
@@ -37,6 +45,16 @@ auto ecsact::cli::codegen(codegen_options options) -> int {
 			unload_plugins();
 			return 1;
 		}
+
+		auto plugin_name_fn = plugin.get<decltype(ecsact_codegen_plugin_name)>(
+			"ecsact_codegen_plugin_name"
+		);
+		std::string plugin_name = plugin_name_fn();
+		if(plugin_names.contains(plugin_name)) {
+			ecsact::cli::report_error("Multiple plugins with name '{}'", plugin_name);
+			unload_plugins();
+			return 1;
+		}
 	}
 
 	std::vector<ecsact_package_id> package_ids;
@@ -47,7 +65,8 @@ auto ecsact::cli::codegen(codegen_options options) -> int {
 		nullptr
 	);
 
-	auto output_paths = std::unordered_set<std::string>{};
+	// key is output path, value is plugin responsible for generating it
+	auto output_paths = std::unordered_map<std::string, std::string>{};
 	auto has_plugin_error = false;
 
 	for(auto& plugin : plugins) {
@@ -101,9 +120,47 @@ auto ecsact::cli::codegen(codegen_options options) -> int {
 		}
 
 		for(auto package_id : package_ids) {
-			plugin_fn(package_id, options.output_write_fn);
-		}
+			fs::path output_file_path = ecsact_meta_package_file_path(package_id);
+			if(output_file_path.empty()) {
+				has_plugin_error = true;
+				ecsact::cli::report_error( //
+					"Could not find package source file path from "
+					"ecsact_meta_package_file_path"
+				);
+				continue;
+			}
+
+			output_file_path.replace_extension(
+				output_file_path.extension().string() + "." + plugin_name
+			);
+
+			if(output_paths.contains(output_file_path.string())) {
+				has_plugin_error = true;
+				auto conflicting_plugin_name = output_paths[output_file_path.string()];
+
+				ecsact::cli::report_error(
+					"Plugin '{}' ({}) has conflicts with plugin '{}' output file "
+					"{}",
+					plugin_name,
+					plugin.location().filename().string(),
+					conflicting_plugin_name,
+					output_file_path.string()
+				);
+
+				continue;
+			}
+			output_paths.emplace(output_file_path.string(), plugin_name);
+			if(fs::exists(output_file_path)) {
+				fs::permissions(output_file_path, fs::perms::all);
+			}
+
+			output_file_path = options.outdir / output_file_path.filename();
 
+			file_write_stream.open(output_file_path);
+			plugin_fn(package_id, &file_write_fn);
+			file_write_stream.flush();
+			file_write_stream.close();
+		}
 		plugin.unload();
 	}
 	if(has_plugin_error) {

ecsact/cli/commands/codegen/codegen.cc

@@ -12,7 +12,6 @@ using codegen_output_write_fn_t = void (*)(const char* str, int32_t str_len);
 struct codegen_options {
 	std::vector<std::filesystem::path> plugin_paths;
 	std::filesystem::path              outdir;
-	codegen_output_write_fn_t          output_write_fn;
 };
 
 auto codegen(codegen_options options) -> int;

ecsact/cli/commands/codegen/codegen.hh

@@ -66,7 +66,6 @@ cc_test(
         "TEST_CODEGEN_PLUGIN_PATH": "$(rootpath :test_codegen_plugin)",
     },
     deps = [
-        "@ecsact_interpret",
         "@bazel_tools//tools/cpp/runfiles",
         "@ecsact_cli//ecsact/cli/commands:codegen",
         "@googletest//:gtest",

test/BUILD.bazel

@@ -4,7 +4,6 @@ bazel_dep(name = "ecsact_codegen", version = "0.2.0")
 bazel_dep(name = "boost.dll", version = "1.83.0.bzl.2")
 bazel_dep(name = "boost.process", version = "1.83.0.bzl.2")
 bazel_dep(name = "ecsact_runtime", version = "0.6.1")
-bazel_dep(name = "ecsact_interpret", version = "0.6.0")
 
 # TODO: https://github.com/bazelbuild/bazel-central-registry/pull/1916
 git_override(