flip around from-zon args

Author: dasimmet

build.zig

@@ -170,8 +170,9 @@ fn depPackagesInternal(b: *std.Build, this_b: *std.Build, opt: DepPackageOptions
     run.addArgs(&.{
         "deppkg",
         "from-zon",
-        b.build_root.path.?,
     });
+    const out_file = run.addOutputFileArg(out_basename);
+    run.addArg(b.build_root.path.?);
     run.addFileArg(zon_file);
-    return run.addOutputFileArg(out_basename);
+    return out_file;
 }

src/pkg-extractor.zig

@@ -55,21 +55,33 @@ pub fn process(opt: Options) !void {
     var fbuf: [8192]u8 = undefined;
     var freader = fd.reader(&fbuf);
 
-    const gz_buf = try opt.gpa.alloc(u8, std.compress.flate.max_window_len);
-    defer opt.gpa.free(gz_buf);
+    var flate_buffer: [std.compress.flate.max_window_len]u8 = undefined;
     var gz = std.compress.flate.Decompress.init(
         &freader.interface,
         .gzip,
-        gz_buf,
+        &flate_buffer,
     );
 
     var file_name_buffer: [std.fs.max_path_bytes]u8 = undefined;
     var link_name_buffer: [std.fs.max_path_bytes]u8 = undefined;
+    var tardiag: std.tar.Diagnostics = .{
+        .allocator = opt.gpa,
+    };
+    defer tardiag.deinit();
     var it: tar.Iterator = .init(&gz.reader, .{
         .file_name_buffer = &file_name_buffer,
         .link_name_buffer = &link_name_buffer,
+        .diagnostics = &tardiag,
     });
-    while (try it.next()) |entry| {
+    var count_entries: usize = 0;
+    while (it.next() catch |err| {
+        std.log.err("err: {} {}", .{ count_entries, err });
+        for (tardiag.errors.items) |errit| {
+            std.log.err("err: {any}", .{errit});
+        }
+        return err;
+    }) |entry| {
+        count_entries += 1;
         if (!std.mem.startsWith(u8, entry.name, tar_prefix)) continue;
         const sep_idx = std.mem.indexOfAnyPos(
             u8,

src/zigpkg.zig

@@ -134,7 +134,7 @@ pub fn cmd_deppkg(opt: GlobalOptions, args: []const []const u8) !void {
         \\
         \\available subcommands:
         \\  create   <deppkg.tar.gz> {build root path}
-        \\  from-zon <deppkg.tar.gz> {build root path}
+        \\  from-zon <deppkg.tar.gz> <build root path> <zon file>
         \\  extract  <deppkg.tar.gz> {build root output path}
         \\  build    <deppkg.tar.gz> <intall prefix> [zig build args] # WIP
         \\  checkout <empty directory for git deps> {build root path} # WIP
@@ -244,21 +244,21 @@ pub fn cmd_create(opt: GlobalOptions, args: []const []const u8) !void {
 }
 
 pub fn cmd_from_zon(opt: GlobalOptions, args: []const []const u8) !void {
+    const output = try std.fs.path.resolve(
+        opt.gpa,
+        &.{ opt.cwd, args[0] },
+    );
+    defer opt.gpa.free(output);
+
     const root = args[0];
 
     const zon_src = try Manifest.cwdReadFileAllocZ(
-        args[1],
+        args[2],
         opt.gpa,
         std.math.maxInt(u32),
     );
     defer opt.gpa.free(zon_src);
 
-    const output = try std.fs.path.resolve(
-        opt.gpa,
-        &.{ opt.cwd, args[2] },
-    );
-    defer opt.gpa.free(output);
-
     const parsed = try zonparse.fromSliceAlloc(
         Serialize,
         opt.gpa,