update to latest zig

Author: kristoff-it

build.zig

@@ -11,10 +11,34 @@ pub fn build(b: *std.Build) !void {
     )) |v| .{ .commit = v } else getVersion(b);
 
     const scripty = b.dependency("scripty", .{});
+
+    const enable_tracy = b.option(bool, "tracy", "Enable Tracy profiling") orelse false;
+    const tracy_options = b.addOptions();
+    tracy_options.addOption(bool, "enable_tracy", enable_tracy);
+    tracy_options.addOption(bool, "enable_tracy_allocation", false);
+    tracy_options.addOption(bool, "enable_tracy_callstack", true);
+    tracy_options.addOption(usize, "tracy_callstack_depth", 10);
+
     const superhtml = b.addModule("superhtml", .{
         .root_source_file = b.path("src/root.zig"),
+        .target = target,
     });
     superhtml.addImport("scripty", scripty.module("scripty"));
+    superhtml.addOptions("tracy_options", tracy_options);
+
+    if (enable_tracy) {
+        if (target.result.os.tag == .windows) {
+            superhtml.linkSystemLibrary("dbghelp", .{});
+            superhtml.linkSystemLibrary("ws2_32", .{});
+        }
+
+        // superhtml.addObjectFile(b.path("libTracyClient.a"));
+        //
+        superhtml.linkSystemLibrary("TracyClient", .{});
+        superhtml.addLibraryPath(.{ .cwd_relative = "/opt/homebrew/opt/tracy/lib" });
+        superhtml.link_libc = true;
+        superhtml.link_libcpp = true;
+    }
 
     const options = b.addOptions();
     const verbose_logging = b.option(bool, "log", "Enable verbose logging also in release modes") orelse false;
@@ -24,8 +48,8 @@ pub fn build(b: *std.Build) !void {
     options.addOption([]const u8, "version", version.string());
     options.addOption(Version.Kind, "version_kind", version);
 
-    const folders = b.dependency("known-folders", .{});
-    const lsp = b.dependency("zig-lsp-kit", .{});
+    const folders = b.dependency("known_folders", .{});
+    const lsp = b.dependency("lsp_kit", .{});
 
     setupTestStep(b, target, superhtml);
     setupCliTool(b, target, optimize, options, superhtml, folders, lsp);
@@ -62,7 +86,7 @@ fn setupCheckStep(
 
     super_cli_check.root_module.addImport("superhtml", superhtml);
     super_cli_check.root_module.addImport(
-        "known-folders",
+        "known_folders",
         folders.module("known-folders"),
     );
     super_cli_check.root_module.addImport("lsp", lsp.module("lsp"));
@@ -109,7 +133,7 @@ fn setupFuzzStep(
     target: std.Build.ResolvedTarget,
     superhtml: *std.Build.Module,
 ) void {
-    const afl = b.lazyImport(@This(), "zig-afl-kit") orelse return;
+    const afl = b.lazyImport(@This(), "afl_kit") orelse return;
     const afl_obj = b.addObject(.{
         .name = "superfuzz-afl",
         .root_source_file = b.path("src/fuzz/afl.zig"),
@@ -125,9 +149,12 @@ fn setupFuzzStep(
         b,
         target,
         .ReleaseSafe,
+        null,
+        false,
         afl_obj,
-    );
+    ) orelse return;
     b.getInstallStep().dependOn(&b.addInstallFile(afl_fuzz, "superfuzz-afl").step);
+    // b.installArtifact(afl_fuzz);
 
     const super_fuzz = b.addExecutable(.{
         .name = "superfuzz",
@@ -169,7 +196,7 @@ fn setupCliTool(
 
     super_cli.root_module.addImport("superhtml", superhtml);
     super_cli.root_module.addImport(
-        "known-folders",
+        "known_folders",
         folders.module("known-folders"),
     );
     super_cli.root_module.addImport("lsp", lsp.module("lsp"));
@@ -245,8 +272,8 @@ fn setupReleaseStep(
 
         super_exe_release.root_module.addImport("superhtml", superhtml);
         super_exe_release.root_module.addImport(
-            "known-folders",
-            folders.module("known-folders"),
+            "known_folders",
+            folders.module("known_folders"),
         );
         super_exe_release.root_module.addImport("lsp", lsp.module("lsp"));
         super_exe_release.root_module.addOptions("build_options", options);

build.zig.zon

@@ -1,24 +1,26 @@
 .{
-    .name = "superhtml",
+    .name = .superhtml,
     .version = "0.4.0",
+    .fingerprint = 0xc5e9aede3c1db363,
+    .minimum_zig_version = "0.14.0-dev.3451+d8d2aa9af",
     .dependencies = .{
-        .@"zig-lsp-kit" = .{
-            .url = "git+https://github.com/kristoff-it/zig-lsp-kit#b4bf61d7fbf9cf7cfdb6f01b211947d2de3e42fd",
-            .hash = "1220b9ce6dc0e1fbcd9e7b406ab164344f81774351495f860a90729187c3c058ef4f",
-        },
-        .@"known-folders" = .{
-            .url = "git+https://github.com/ziglibs/known-folders#1cceeb70e77dec941a4178160ff6c8d05a74de6f",
-            .hash = "12205f5e7505c96573f6fc5144592ec38942fb0a326d692f9cddc0c7dd38f9028f29",
+        .lsp_kit = .{
+            .url = "git+https://github.com/kristoff-it/zig-lsp-kit#87ff3d537a0c852442e180137d9557711963802c",
+            .hash = "lsp_kit-0.1.0-hAAxO9S9AADv_5D0iplASFtNCFXAPk54M0u-3jj2MRFk",
         },
         .scripty = .{
-            .url = "git+https://github.com/kristoff-it/scripty#c76ef31dd5429725220de30504bde89a68565ece",
-            .hash = "1220c242654fe9bdd1be1fdb7b8e142842adc9adcc987efe7eb64af6451f45cbbc34",
+            .url = "git+https://github.com/kristoff-it/scripty#458ed4724feeae91727da4771ffccc5d3ea20a12",
+            .hash = "scripty-0.1.0-LKK5O5--AAAYA23ErngQEPW9Il_kiljcfTRUkDgwK2G4",
         },
-        .@"zig-afl-kit" = .{
-            .url = "git+https://github.com/kristoff-it/zig-afl-kit#f003bfe714f2964c90939fdc940d5993190a66ec",
-            .hash = "1220f2d8402bb7bbc4786b9c0aad73910929ea209cbd3b063842371d68abfed33c1e",
+        .afl_kit = .{
+            .url = "git+https://github.com/kristoff-it/zig-afl-kit?ref=zig-0.14.0#1e9fcaa08361307d16a9bde82b4a7fd4560ce502",
+            .hash = "afl_kit-0.1.0-uhOgGDkdAAALG16McR2B4b8QwRUQ2sa9XdgDTFXRWQTY",
             .lazy = true,
         },
+        .known_folders = .{
+            .url = "git+https://github.com/ziglibs/known-folders#aa24df42183ad415d10bc0a33e6238c437fc0f59",
+            .hash = "known_folders-0.0.0-Fy-PJtLDAADGDOwYwMkVydMSTp_aN-nfjCZw6qPQ2ECL",
+        },
     },
     .paths = .{
         "LICENSE",

src/cli.zig

@@ -1,14 +1,15 @@
 const std = @import("std");
 const builtin = @import("builtin");
 const build_options = @import("build_options");
+const known = @import("known-folders");
 const super = @import("super");
 const logging = @import("cli/logging.zig");
 const interface_exe = @import("cli/interface.zig");
 const check_exe = @import("cli/check.zig");
 const fmt_exe = @import("cli/fmt.zig");
 const lsp_exe = @import("cli/lsp.zig");
 
-pub const known_folders_config = .{
+pub const known_folders_config = known.KnownFolderConfig{
     .xdg_force_default = true,
     .xdg_on_mac = true,
 };

src/cli/logging.zig

@@ -18,7 +18,7 @@ pub var log_file: ?std.fs.File = switch (builtin.target.os.tag) {
 
 pub fn logFn(
     comptime level: std.log.Level,
-    comptime scope: @Type(.EnumLiteral),
+    comptime scope: @Type(.enum_literal),
     comptime format: []const u8,
     args: anytype,
 ) void {

src/cli/lsp/Document.zig

@@ -9,11 +9,11 @@ const log = std.log.scoped(.lsp_document);
 language: super.Language,
 src: []const u8,
 html: super.html.Ast,
-super: ?super.Ast = null,
+super_ast: ?super.Ast = null,
 
 pub fn deinit(doc: *Document, gpa: std.mem.Allocator) void {
     doc.html.deinit(gpa);
-    if (doc.super) |s| s.deinit(gpa);
+    if (doc.super_ast) |s| s.deinit(gpa);
 }
 
 pub fn init(
@@ -31,7 +31,7 @@ pub fn init(
     if (language == .superhtml and doc.html.errors.len == 0) {
         const super_ast = try super.Ast.init(gpa, doc.html, src);
         errdefer super_ast.deinit(gpa);
-        doc.super = super_ast;
+        doc.super_ast = super_ast;
     }
 
     return doc;
@@ -43,9 +43,9 @@ pub fn reparse(doc: *Document, gpa: std.mem.Allocator) !void {
     errdefer doc.html.deinit(gpa);
 
     if (doc.language == .superhtml and doc.html.errors.len == 0) {
-        doc.super = try super.Ast.init(gpa, doc.html, doc.src);
+        doc.super_ast = try super.Ast.init(gpa, doc.html, doc.src);
     } else {
-        doc.super = null;
+        doc.super_ast = null;
     }
 
     return;

src/cli/lsp/logic.zig

@@ -56,7 +56,7 @@ pub fn loadFile(
         }
         res.diagnostics = diags;
     } else {
-        if (doc.super) |super_ast| {
+        if (doc.super_ast) |super_ast| {
             const diags = try arena.alloc(
                 lsp.types.Diagnostic,
                 super_ast.errors.len,

src/fuzz.zig

@@ -1,7 +1,7 @@
 const std = @import("std");
 const super = @import("superhtml");
 
-pub const std_options = .{ .log_level = .err };
+pub const std_options: std.Options = .{ .log_level = .err };
 
 /// This main function is meant to be used via black box fuzzers
 /// and/or to manually weed out test cases that are not valid anymore

src/fuzz/afl.zig

@@ -2,7 +2,7 @@ const std = @import("std");
 const super = @import("superhtml");
 const astgen = @import("astgen.zig");
 
-pub const std_options = .{ .log_level = .err };
+pub const std_options: std.Options = .{ .log_level = .err };
 
 export fn zig_fuzz_init() void {}
 

src/html/Ast.zig

@@ -1,6 +1,7 @@
 const Ast = @This();
 
 const std = @import("std");
+const tracy = @import("../tracy.zig");
 const root = @import("../root.zig");
 const Language = root.Language;
 const Span = root.Span;
@@ -121,6 +122,9 @@ pub const Node = struct {
     };
 
     pub fn startTagIterator(n: Node, src: []const u8, language: Language) TagIterator {
+        const zone = tracy.trace(@src());
+        defer zone.end();
+
         var t: Tokenizer = .{
             .language = language,
             .idx = n.open.start,
@@ -538,12 +542,16 @@ pub fn render(ast: Ast, src: []const u8, w: anytype) !void {
     // var last_open_was_vertical = false;
     var pre: u32 = 0;
     while (true) {
+        const zone_outer = tracy.trace(@src());
+        defer zone_outer.end();
         log.debug("looping, ind: {}, dir: {s}", .{
             indentation,
             @tagName(direction),
         });
         switch (direction) {
             .enter => {
+                const zone = tracy.trace(@src());
+                defer zone.end();
                 log.debug("rendering enter ({}): {s} {any}", .{
                     indentation,
                     "",
@@ -573,6 +581,8 @@ pub fn render(ast: Ast, src: []const u8, w: anytype) !void {
                 }
             },
             .exit => {
+                const zone = tracy.trace(@src());
+                defer zone.end();
                 std.debug.assert(current.kind != .text);
                 std.debug.assert(current.kind != .element_void);
                 std.debug.assert(current.kind != .element_self_closing);
@@ -608,13 +618,17 @@ pub fn render(ast: Ast, src: []const u8, w: anytype) !void {
         switch (current.kind) {
             .root => switch (direction) {
                 .enter => {
+                    const zone = tracy.trace(@src());
+                    defer zone.end();
                     if (current.first_child_idx == 0) break;
                     current = ast.nodes[current.first_child_idx];
                 },
                 .exit => break,
             },
 
             .text => {
+                const zone = tracy.trace(@src());
+                defer zone.end();
                 std.debug.assert(direction == .enter);
 
                 const txt = current.open.slice(src);
@@ -636,6 +650,8 @@ pub fn render(ast: Ast, src: []const u8, w: anytype) !void {
             },
 
             .comment => {
+                const zone = tracy.trace(@src());
+                defer zone.end();
                 std.debug.assert(direction == .enter);
 
                 try w.writeAll(current.open.slice(src));
@@ -650,6 +666,8 @@ pub fn render(ast: Ast, src: []const u8, w: anytype) !void {
             },
 
             .doctype => {
+                const zone = tracy.trace(@src());
+                defer zone.end();
                 last_rbracket = current.open.end;
                 const maybe_name, const maybe_extra = blk: {
                     var tt: Tokenizer = .{ .language = ast.language };
@@ -690,6 +708,8 @@ pub fn render(ast: Ast, src: []const u8, w: anytype) !void {
 
             .element, .element_void, .element_self_closing => switch (direction) {
                 .enter => {
+                    const zone = tracy.trace(@src());
+                    defer zone.end();
                     last_rbracket = current.open.end;
                     var tt: Tokenizer = .{
                         .idx = current.open.start,
@@ -802,6 +822,8 @@ pub fn render(ast: Ast, src: []const u8, w: anytype) !void {
                     }
                 },
                 .exit => {
+                    const zone = tracy.trace(@src());
+                    defer zone.end();
                     std.debug.assert(current.kind != .element_void);
                     std.debug.assert(current.kind != .element_self_closing);
                     last_rbracket = current.close.end;

src/html/Tokenizer.zig

@@ -12,6 +12,7 @@ const named_character_references = @import("named_character_references.zig");
 
 const std = @import("std");
 const root = @import("../root.zig");
+const tracy = @import("../tracy.zig");
 const Language = root.Language;
 const Span = root.Span;
 
@@ -396,6 +397,9 @@ pub fn getName(tokenizer: *Tokenizer, tag_src: []const u8) ?Span {
 }
 
 pub fn next(self: *Tokenizer, src: []const u8) ?Token {
+    const zone = tracy.trace(@src());
+    defer zone.end();
+
     if (self.deferred_token) |t| {
         const token_copy = t;
         self.deferred_token = null;