Merge pull request #74 from 00JCIV00/zig-v0.15

Update to Zig v0.15.1

Author: 00JCIV00

README.md

@@ -3,7 +3,7 @@
 # Commands **⋅** Options **⋅** Values **⋅** Arguments 
 A simple yet robust cross-platform command line argument parsing library for Zig.
 
-[![Static Badge](https://img.shields.io/badge/v0.14.1(stable)-orange?logo=Zig&logoColor=Orange&label=Zig&labelColor=Orange)](https://ziglang.org/download/)
+[![Static Badge](https://img.shields.io/badge/v0.15.1(stable)-orange?logo=Zig&logoColor=Orange&label=Zig&labelColor=Orange)](https://ziglang.org/download/)
 [![Static Badge](https://img.shields.io/badge/v0.10.1b-blue?logo=GitHub&label=Release)](https://github.com/00JCIV00/cova/releases/tag/v0.10.1-beta)
 [![GitHub commit activity](https://img.shields.io/github/commits-difference/00JCIV00/cova?base=v0.10.1&head=main&logo=Github&label=Commits%20(v0.11.0b))](https://github.com/00JCIV00/cova/commits/main/)
 [![Static Badge](https://img.shields.io/badge/MIT-silver?label=License)](https://github.com/00JCIV00/cova/blob/main/LICENSE)
@@ -53,11 +53,11 @@ pub fn main() !void {
     // ...
     var main_cmd = try setup_cmd.init(alloc, .{});
     defer main_cmd.deinit();
-    var args_iter = try cova.ArgIteratorGeneric.init(alloc);
+    var args_iter: cova.ArgIteratorGeneric = try .init(alloc);
     defer args_iter.deinit();
 
     cova.parseArgs(&args_iter, CommandT, main_cmd, stdout, .{}) catch |err| switch (err) {
-        error.UsageHelpCalled => {},
+        error.UsageHelpCalled => return,
         else => return err,
     };
     // ...
@@ -185,9 +185,13 @@ pub fn main() !void {
     defer main_cmd.deinit();
 
     // Parsing
-    var args_iter = try cova.ArgIteratorGeneric.init(alloc);
+    var args_iter: cova.ArgIteratorGeneric = try .init(alloc);
     defer args_iter.deinit();
-    const stdout = std.io.getStdOut().writer();
+    var stdout_file = fs.File.stdout();
+    var stdout_buf: [4096]u8 = undefined;
+    var stdout_writer = stdout_file.writer(stdout_buf[0..]);
+    const stdout = &stdout_writer.interface;
+    defer stdout.flush() catch {};
 
     cova.parseArgs(&args_iter, CommandT, main_cmd, stdout, .{}) catch |err| switch (err) {
         error.UsageHelpCalled,
@@ -263,8 +267,8 @@ pub fn build(b: *std.Build) void {
 
     const cova_gen = @import("cova").addCovaDocGenStep(b, cova_dep, exe, .{
         .kinds = &.{ .all },
-        .version = "0.10.1",
-        .ver_date = "25 MAR 2025",
+        .version = "0.10.2",
+        .ver_date = "23 AUG 2025",
         .author = "00JCIV00",
         .copyright = "MIT License",
     });

build.zig

@@ -13,35 +13,33 @@ pub fn build(b: *std.Build) void {
     const cova_mod = b.addModule("cova", .{
         .root_source_file = b.path("src/cova.zig"),
     });
+    // - Meta Module (for Docs and Tests)
+    const cova_meta_mod = b.addModule("cova", .{
+        .root_source_file = b.path("src/cova.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
     // - Generator Artifact
     _ = b.addModule("cova_gen", .{
         .root_source_file = b.path("src/generator.zig"),
     });
 
-    // Static Lib (Used for Docs)
-    const cova_lib = b.addStaticLibrary(.{
+    // Library (Used for Docs)
+    const cova_lib = b.addLibrary(.{
         .name = "cova",
-        .root_source_file = b.path("src/cova.zig"),
-        .target = target,
-        .optimize = optimize,
+        .linkage = .static,
+        .root_module = cova_meta_mod,
     });
-    //b.installArtifact(cova_lib);
 
     // Tests
-    const cova_tests = b.addTest(.{
-        .root_source_file = b.path("src/cova.zig"),
-        .target = target,
-        .optimize = optimize,
-    });
+    const cova_tests = b.addTest(.{ .root_module = cova_meta_mod });
     const run_cova_tests = b.addRunArtifact(cova_tests);
     const test_step = b.step("test", "Run the cova library tests");
     test_step.dependOn(&run_cova_tests.step);
 
     // Docs
-    const cova_docs = cova_lib;
-    //const cova_docs = cova_tests;
     const build_docs = b.addInstallDirectory(.{
-        .source_dir = cova_docs.getEmittedDocs(),
+        .source_dir = cova_lib.getEmittedDocs(),
         .install_dir = .prefix,
         .install_subdir = "../docs",
     });
@@ -53,7 +51,7 @@ pub fn build(b: *std.Build) void {
     // Examples
     //==========================================
     const examples = &.{ "cova-demo", "basic_app", "logger" };
-    var ex_arena = std.heap.ArenaAllocator.init(b.allocator);
+    var ex_arena: std.heap.ArenaAllocator = .init(b.allocator);
     defer ex_arena.deinit();
     const ex_alloc = ex_arena.allocator();
     inline for (examples) |example| {
@@ -63,13 +61,17 @@ pub fn build(b: *std.Build) void {
             if (std.mem.eql(u8, example, "cova-demo")) break :exName "covademo";
             break :exName example;
         };
-        // - Exe
-        const ex_exe = b.addExecutable(.{
-            .name = bin_name orelse ex_name,
+        // - Mod
+        const ex_mod = b.createModule(.{
             .root_source_file = b.path(std.fmt.allocPrint(ex_alloc, "examples/{s}.zig", .{ ex_name }) catch @panic("OOM")),
             .target = target,
             .optimize = optimize,
         });
+        // - Exe
+        const ex_exe = b.addExecutable(.{
+            .name = bin_name orelse ex_name,
+            .root_module = ex_mod,
+        });
         ex_exe.root_module.addImport("cova", cova_mod);
         const build_ex_demo = b.addInstallArtifact(ex_exe, .{});
         const build_ex_demo_step = b.step(example, "Build the '" ++ example ++ "' example (default: Debug)");
@@ -163,21 +165,25 @@ fn createDocGenStep(
     doc_gen_config: generate.MetaDocConfig,
 ) *std.Build.Step.Run {
     const program_mod = program_step.root_module;
-    const cova_gen_exe = b.addExecutable(.{
-        .name = std.fmt.allocPrint(b.allocator, "cova_generator_{s}", .{ program_step.name }) catch @panic("OOM"),
+    const cova_gen_mod = b.createModule(.{
         .root_source_file = cova_gen_path,
         .target = b.graph.host,
         .optimize = .Debug,
     });
+    const cova_gen_exe = b.addExecutable(.{
+        .name = std.fmt.allocPrint(b.allocator, "cova_generator_{s}", .{ program_step.name }) catch @panic("OOM"),
+        .root_module = cova_gen_mod,
+    });
     b.installArtifact(cova_gen_exe);
     cova_gen_exe.root_module.addImport("cova", cova_mod);
     cova_gen_exe.root_module.addImport("program", program_mod);
 
     const md_conf_opts = b.addOptions();
-    var sub_conf_map = std.StringHashMap(?*std.Build.Step.Options).init(b.allocator);
-    sub_conf_map.put("help_docs_config", null) catch @panic("OOM");
-    sub_conf_map.put("tab_complete_config", null) catch @panic("OOM");
-    sub_conf_map.put("arg_template_config", null) catch @panic("OOM");
+    var sub_conf_map: std.StringHashMapUnmanaged(?*std.Build.Step.Options) = .empty;
+    defer sub_conf_map.deinit(b.allocator);
+    sub_conf_map.put(b.allocator, "help_docs_config", null) catch @panic("OOM");
+    sub_conf_map.put(b.allocator, "tab_complete_config", null) catch @panic("OOM");
+    sub_conf_map.put(b.allocator, "arg_template_config", null) catch @panic("OOM");
 
     inline for (@typeInfo(generate.MetaDocConfig).@"struct".fields) |field| {
         switch(@typeInfo(field.type)) {
@@ -196,7 +202,7 @@ fn createDocGenStep(
                                 doc_conf_opts.addOption(s_field.type, s_field.name, @field(conf, s_field.name));
                             }
                             doc_conf_opts.addOption(bool, "provided", true);
-                            sub_conf_map.put(field.name, doc_conf_opts) catch @panic("OOM");
+                            sub_conf_map.put(b.allocator, field.name, doc_conf_opts) catch @panic("OOM");
                         }
                         continue;
                     },
@@ -205,13 +211,14 @@ fn createDocGenStep(
             },
             .pointer => |ptr| {
                 if (ptr.child == generate.MetaDocConfig.MetaDocKind) {
-                    var kinds_list = std.ArrayList(usize).init(b.allocator);
+                    var kinds_list: std.ArrayList(usize) = .empty;
+                    defer kinds_list.deinit(b.allocator);
                     for (@field(doc_gen_config, field.name)) |kind|
-                        kinds_list.append(@intFromEnum(kind)) catch @panic("There was an issue with the Meta Doc Config.");
+                        kinds_list.append(b.allocator, @intFromEnum(kind)) catch @panic("There was an issue with the Meta Doc Config.");
                     md_conf_opts.addOption(
                         []const usize,
                         field.name,
-                        kinds_list.toOwnedSlice() catch @panic("There was an issue with the Meta Doc Config."),
+                        kinds_list.toOwnedSlice(b.allocator) catch @panic("There was an issue with the Meta Doc Config."),
                     );
                     continue;
                 }

docs/index.html

@@ -2,9 +2,13 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Zig Documentation</title>
     <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNTMgMTQwIj48ZyBmaWxsPSIjRjdBNDFEIj48Zz48cG9seWdvbiBwb2ludHM9IjQ2LDIyIDI4LDQ0IDE5LDMwIi8+PHBvbHlnb24gcG9pbnRzPSI0NiwyMiAzMywzMyAyOCw0NCAyMiw0NCAyMiw5NSAzMSw5NSAyMCwxMDAgMTIsMTE3IDAsMTE3IDAsMjIiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxwb2x5Z29uIHBvaW50cz0iMzEsOTUgMTIsMTE3IDQsMTA2Ii8+PC9nPjxnPjxwb2x5Z29uIHBvaW50cz0iNTYsMjIgNjIsMzYgMzcsNDQiLz48cG9seWdvbiBwb2ludHM9IjU2LDIyIDExMSwyMiAxMTEsNDQgMzcsNDQgNTYsMzIiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxwb2x5Z29uIHBvaW50cz0iMTE2LDk1IDk3LDExNyA5MCwxMDQiLz48cG9seWdvbiBwb2ludHM9IjExNiw5NSAxMDAsMTA0IDk3LDExNyA0MiwxMTcgNDIsOTUiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxwb2x5Z29uIHBvaW50cz0iMTUwLDAgNTIsMTE3IDMsMTQwIDEwMSwyMiIvPjwvZz48Zz48cG9seWdvbiBwb2ludHM9IjE0MSwyMiAxNDAsNDAgMTIyLDQ1Ii8+PHBvbHlnb24gcG9pbnRzPSIxNTMsMjIgMTUzLDExNyAxMDYsMTE3IDEyMCwxMDUgMTI1LDk1IDEzMSw5NSAxMzEsNDUgMTIyLDQ1IDEzMiwzNiAxNDEsMjIiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxwb2x5Z29uIHBvaW50cz0iMTI1LDk1IDEzMCwxMTAgMTA2LDExNyIvPjwvZz48L2c+PC9zdmc+">
     <style type="text/css">
+      *, *::before, *::after {
+        box-sizing: border-box;
+      }
       body {
         font-family: system-ui, -apple-system, Roboto, "Segoe UI", sans-serif;
         color: #000000;
@@ -26,6 +30,9 @@
         margin: 0;
         overflow-x: auto;
       }
+      :not(pre) > code {
+        white-space: break-spaces;
+      }
       code {
         font-family:"Source Code Pro",monospace;
         font-size: 0.9em;
@@ -153,6 +160,23 @@
         cursor: default;
       }
 
+      #errors {
+        background-color: #faa;
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        max-height: min(20em, 50vh);
+        padding: 0.5em;
+        overflow: auto;
+      }
+      #errors h1 {
+        font-size: 1.5em;
+      }
+      #errors pre {
+        background-color: #fcc;
+      }
+
       #listSearchResults li.selected {
         background-color: #93e196;
       }
@@ -167,7 +191,8 @@
           margin-top: 0.5em;
       }
 
-      td {
+      td, th {
+        text-align: unset;
         vertical-align: top;
         margin: 0;
         padding: 0.5em;
@@ -247,6 +272,14 @@
         #listSearchResults li.selected a {
           color: #fff;
         }
+        #errors {
+          background-color: #800;
+          color: #fff;
+        }
+        #errors pre {
+          background-color: #a00;
+          color: #fff;
+        }
         dl > div {
           border-color: #373737;
         }
@@ -409,6 +442,10 @@ <h1>Keyboard Shortcuts</h1>
       <dl><dt><kbd>↓</kbd></dt><dd>Move down in search results</dd></dl>
       <dl><dt><kbd>⏎</kbd></dt><dd>Go to active search result</dd></dl>
     </div>
+    <div id="errors" class="hidden">
+      <h1>Errors</h1>
+      <pre id="errorsText"></pre>
+    </div>
     <script src="main.js"></script>
   </body>
 </html>