update: support 0.14.0 (#10)

* update: support `0.14.0`

* ci: remove 13 test

Author: jinzhongjia

.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest]
-                version: [0.13.0, master]
+                version: [0.14.0, master]
             fail-fast: false
         runs-on: ${{ matrix.os }}
         steps:

build.zig.zon

@@ -1,7 +1,8 @@
 .{
-    .name = "zig-lamp",
-    .version = "0.0.1",
-    .minimum_zig_version = "0.13.0",
+    .name = .zig_lamp,
+    .version = "0.0.2",
+    .fingerprint = 0x519db185c03fa148,
+    .minimum_zig_version = "0.14.0",
     .dependencies = .{},
     .paths = .{
         "build.zig",

lua/zig-lamp/ffi.lua

@@ -92,6 +92,7 @@ end
 --- @class ZigBuildZon
 --- @field name string
 --- @field version string
+--- @field fingerprint string
 --- @field minimum_zig_version string|nil
 --- @field dependencies { [string] : ZigDependency }
 --- @field paths string[]
@@ -110,10 +111,10 @@ function M.get_build_zon_info(file_path)
     if not _p:exists() then return nil end
 
     local res = ffi.string(zig_lamp.get_build_zon_info(file_path))
-    zig_lamp.free_build_zon_info()
     if res == "" then
         return nil
     end
+    zig_lamp.free_build_zon_info()
     local _tmp = vim.fn.json_decode(res)
     return _tmp
 end
@@ -134,10 +135,10 @@ function M.fmt_zon(source_code)
     -- stylua: ignore
     if not zig_lamp then return nil end
     local res = ffi.string(zig_lamp.fmt_zon(source_code))
-    zig_lamp.free_fmt_zon()
     if res == "" then
         return nil
     end
+    zig_lamp.free_fmt_zon()
     return res
 end
 

lua/zig-lamp/module/pkg.lua

@@ -105,6 +105,17 @@ local function render(ctx)
         col_end = str_len(version_str),
     })
 
+    -- for fingerprint
+    local fingerprint_str = "  Fingerprint: "
+    table.insert(content, fingerprint_str .. (zon_info.fingerprint or "[none]"))
+    current_lnum = current_lnum + 1
+    table.insert(highlight, {
+        group = "Title",
+        line = current_lnum,
+        col_start = 0,
+        col_end = str_len(fingerprint_str),
+    })
+
     local min_version = zon_info.minimum_zig_version or "[none]"
     local min_version_str = "  Minimum zig version: "
     table.insert(content, min_version_str .. min_version)
@@ -258,6 +269,8 @@ local function delete_cb(ctx)
         end
         lnum = lnum - 4
 
+        lnum = lnum - 1
+
         if
             ctx.zon_info.paths
             and #ctx.zon_info.paths > 0
@@ -341,6 +354,24 @@ local edit_cb = function(ctx)
         end
         lnum = lnum - 1
 
+        -- for fingerprint
+        if lnum - 1 == 0 then
+            vim.ui.input({
+                prompt = "Enter value for fingerprint: ",
+                default = ctx.zon_info.fingerprint,
+            }, function(input)
+                -- stylua: ignore
+                if not input then return end
+                if input == "" then
+                    ctx.zon_info.fingerprint = nil
+                else
+                    ctx.zon_info.fingerprint = input
+                end
+                render(ctx)
+            end)
+        end
+        lnum = lnum - 1
+
         -- for minimum zig version
         if lnum - 1 == 0 then
             vim.ui.input({
@@ -349,7 +380,11 @@ local edit_cb = function(ctx)
             }, function(input)
                 -- stylua: ignore
                 if not input then return end
-                ctx.zon_info.minimum_zig_version = input
+                if input == "" then
+                    ctx.zon_info.minimum_zig_version = nil
+                else
+                    ctx.zon_info.minimum_zig_version = input
+                end
                 render(ctx)
             end)
             return
@@ -595,6 +630,8 @@ local function switch_cb(ctx)
         lnum = lnum - 1
         -- for version
         lnum = lnum - 1
+        -- for fingerprint
+        lnum = lnum - 1
         -- for minimum zig version
         lnum = lnum - 1
 
@@ -644,8 +681,6 @@ local function switch_cb(ctx)
                             return
                         end
 
-                        print(input)
-
                         if not is_url then
                             local _hash = get_hash(input)
                             if _hash then

lua/zig-lamp/util.lua

@@ -56,10 +56,13 @@ end
 function M.wrap_j2zon(info)
     local res = ""
     res = res .. ".{"
-    res = res .. ".name = " .. M.data2zon(info.name or "") .. ","
+    res = res .. ".name = ." .. (info.name or "") .. ","
     res = res .. ".version = " .. M.data2zon(info.version or "") .. ","
-    -- stylua: ignore
-    res = res .. ".minimum_zig_version = " .. M.data2zon(info.minimum_zig_version or "") .. ","
+    res = res .. ".fingerprint = " .. info.fingerprint .. ","
+    if info.minimum_zig_version then
+        -- stylua: ignore
+        res = res .. ".minimum_zig_version = " .. M.data2zon(info.minimum_zig_version or "") .. ","
+    end
     -- stylua: ignore
     res = res .. ".dependencies = ".. M.data2zon(info.dependencies or {}) .. ","
     res = res .. ".paths=" .. M.data2zon(info.paths or {}) .. ","

src/zon2json.zig

@@ -45,6 +45,15 @@ fn stringify(allocator: std.mem.Allocator, writer: anytype, ast: std.zig.Ast, id
         if (try stringifyFieldName(allocator, ast, idx)) |name| {
             defer allocator.free(name);
             try writer.print("{s}:", .{name});
+            if (std.mem.eql(u8, name, "\"fingerprint\"")) {
+                const slice = ast.tokenSlice(ast.nodes.items(.main_token)[idx]);
+
+                const v = try std.fmt.allocPrint(allocator, "\"{s}\"", .{slice});
+                defer allocator.free(v);
+
+                try writer.writeAll(v);
+                return;
+            }
         }
     }