dedupe in list, normalize

Author: Grazfather

tools/sorcerer/build.zig

@@ -477,6 +477,17 @@ fn generate_zig_schema_literal(allocator: std.mem.Allocator, schemas: []const Re
     var buf: std.ArrayList(u8) = .{};
     const writer = buf.writer(allocator);
 
+    // Helper to normalize paths (convert backslashes to forward slashes for Windows compatibility)
+    const normalize_path = struct {
+        fn call(alloc: std.mem.Allocator, path: []const u8) ![]const u8 {
+            const result = try alloc.alloc(u8, path.len);
+            for (path, 0..) |c, i| {
+                result[i] = if (c == '\\') '/' else c;
+            }
+            return result;
+        }
+    }.call;
+
     try writer.writeAll(
         \\// Auto-generated file - do not edit manually.
         \\// Generated by tools/sorcerer/build.zig
@@ -494,12 +505,40 @@ fn generate_zig_schema_literal(allocator: std.mem.Allocator, schemas: []const Re
         try writer.print("        .format = .{s},\n", .{@tagName(schema.format)});
 
         // Chips
-        try writer.writeAll("        .chips = &.{");
-        for (schema.chips, 0..) |chip, i| {
-            if (i > 0) try writer.writeAll(", ");
-            try writer.print(".{{ .name = \"{s}\" }}", .{chip.name});
+        try writer.writeAll("        .chips = &.{\n");
+        for (schema.chips) |chip| {
+            try writer.writeAll("            .{\n");
+            try writer.print("                .name = \"{s}\",\n", .{chip.name});
+            try writer.print("                .target_name = \"{s}\",\n", .{chip.target_name});
+            // Patch files
+            if (chip.patch_files.len > 0) {
+                try writer.writeAll("                .patch_files = &.{\n");
+                for (chip.patch_files) |patch_file| {
+                    switch (patch_file) {
+                        .src_path => |src| {
+                            const sub_path = try normalize_path(allocator, src.sub_path);
+                            const build_root = try normalize_path(allocator, src.build_root);
+                            try writer.writeAll("                    .{ .src_path = .{\n");
+                            try writer.print("                        .sub_path = \"{s}\",\n", .{sub_path});
+                            try writer.print("                        .build_root = \"{s}\",\n", .{build_root});
+                            try writer.writeAll("                    } },\n");
+                        },
+                        .dependency => |dep| {
+                            const sub_path = try normalize_path(allocator, dep.sub_path);
+                            const build_root = try normalize_path(allocator, dep.build_root);
+                            try writer.writeAll("                    .{ .dependency = .{\n");
+                            try writer.print("                        .sub_path = \"{s}\",\n", .{sub_path});
+                            try writer.print("                        .build_root = \"{s}\",\n", .{build_root});
+                            try writer.print("                        .dep_name = \"{s}\",\n", .{dep.dep_name});
+                            try writer.writeAll("                    } },\n");
+                        },
+                    }
+                }
+                try writer.writeAll("                },\n");
+            }
+            try writer.writeAll("            },\n");
         }
-        try writer.writeAll("},\n");
+        try writer.writeAll("        },\n");
 
         // Boards
         try writer.writeAll("        .boards = &.{");

tools/sorcerer/src/cli.zig

@@ -149,19 +149,23 @@ fn run_list(allocator: Allocator, args: []const []const u8) !void {
     if (json_output) {
         try print_list_json(allocator, port_filter);
     } else {
-        try print_list_table(port_filter);
+        try print_list_table(allocator, port_filter);
     }
 }
 
-fn print_list_table(port_filter: ?[]const u8) !void {
+fn print_list_table(allocator: Allocator, port_filter: ?[]const u8) !void {
     var stdout_writer: StdoutWriter = .{};
     const stdout = stdout_writer.writer();
 
+    // Track seen chip names to deduplicate display
+    var seen_chips = std.StringHashMap(void).init(allocator);
+    defer seen_chips.deinit();
+
     // Print header
     stdout.print("{s:<24} {s:<24} {s}\n", .{ "CHIP", "PORT", "BOARD" }) catch |err| return handle_write_error(err);
     stdout.print("{s:-<24} {s:-<24} {s:-<32}\n", .{ "", "", "" }) catch |err| return handle_write_error(err);
 
-    // Print entries
+    // Print entries (deduplicated by chip name)
     for (schemas.schemas) |schema| {
         const port_name = get_port_name(schema.location);
 
@@ -173,6 +177,12 @@ fn print_list_table(port_filter: ?[]const u8) !void {
         }
 
         for (schema.chips) |chip| {
+            // Skip if we've already shown this chip name
+            if (seen_chips.contains(chip.name)) {
+                continue;
+            }
+            seen_chips.put(chip.name, {}) catch {};
+
             const board_name = if (schema.boards.len > 0) schema.boards[0].name else "-";
             stdout.print("{s:<24} {s:<24} {s}\n", .{ chip.name, port_name, board_name }) catch |err| return handle_write_error(err);
 
@@ -215,6 +225,7 @@ fn print_list_json(allocator: Allocator, port_filter: ?[]const u8) !void {
         for (schema.chips) |chip| {
             try entries.append(allocator, .{
                 .chip = chip.name,
+                .target = chip.target_name,
                 .port = port_name,
                 .format = @tagName(schema.format),
                 .boards = schema.boards,
@@ -235,6 +246,7 @@ fn print_list_json(allocator: Allocator, port_filter: ?[]const u8) !void {
 
 const JsonEntry = struct {
     chip: []const u8,
+    target: []const u8,
     port: []const u8,
     format: []const u8,
     boards: []const RegisterSchemaUsage.Board,

tools/sorcerer/src/main.zig

@@ -266,8 +266,7 @@ fn open_register_schema_submenu(m: *dvui.MenuWidget) !void {
                     };
 
                     const path = try gpa.dupe(u8, f);
-                    const register_schemas = if (state.register_schema_usages) |rsu| rsu.value else null;
-                    const new_window = try RegzWindow.create(gpa, format, path, null, null, register_schemas);
+                    const new_window = try RegzWindow.create(gpa, format, path, null, null, schemas.schemas);
                     errdefer new_window.destroy();
 
                     try state.regz_windows.put(gpa, f, new_window);
@@ -386,8 +385,7 @@ fn from_microzig_menu() void {
             else
                 null;
 
-            const rsus = if (state.register_schema_usages) |r| r.value else null;
-            const new_window = RegzWindow.create(gpa, format, path, null, chip_info, rsus) catch unreachable;
+            const new_window = RegzWindow.create(gpa, format, path, null, chip_info, schemas.schemas) catch unreachable;
 
             state.regz_windows.put(gpa, path, new_window) catch {
                 new_window.destroy();
@@ -703,7 +701,7 @@ fn open_chip_target(rsu_idx: usize, chip_idx: usize) void {
         .patch_files = chip.patch_files,
     };
 
-    const new_window = RegzWindow.create(gpa, format, path, chip.name, chip_info, rsus.value) catch return;
+    const new_window = RegzWindow.create(gpa, format, path, chip.name, chip_info, rsus) catch return;
 
     state.regz_windows.put(gpa, path, new_window) catch {
         new_window.destroy();
@@ -1055,7 +1053,7 @@ fn open_board(rsu_idx: usize, board_idx: usize) void {
         .targetdb => .targetdb,
     };
 
-    const new_window = RegzWindow.create(gpa, format, path, null, chip_info, rsus.value) catch return;
+    const new_window = RegzWindow.create(gpa, format, path, null, chip_info, rsus) catch return;
 
     state.regz_windows.put(gpa, path, new_window) catch {
         new_window.destroy();