feat: add woff impl

Author: nonzzz

src/table.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const reader = @import("./byte_read.zig");
 
 const Allocator = std.mem.Allocator;
 

src/unit_tests.zig

@@ -4,6 +4,5 @@ comptime {
     _ = @import("table/mod.zig");
     _ = @import("./lib.zig");
     _ = @import("./byte_writer.zig");
-    _ = @import("./woff/woff_v1.zig");
-    _ = @import("./woff/woff_v2.zig");
+    _ = @import("woff/mod.zig");
 }

src/woff/impl.zig

@@ -0,0 +1,28 @@
+const std = @import("std");
+
+const Allocator = std.mem.Allocator;
+
+const Woff = @This();
+
+ptr: *anyopaque,
+
+vtable: *const VTable,
+
+pub const VTable = struct {
+    as_woff: *const fn (*anyopaque) anyerror![]u8,
+};
+
+pub fn as_woff(self: Woff) anyerror![]u8 {
+    return self.vtable.as_woff(self.ptr);
+}
+
+pub fn cast(self: Woff, comptime T: type) *T {
+    return @ptrCast(@alignCast(self.ptr));
+}
+
+pub const Compressor = *const fn (allocator: Allocator, data: []const u8) anyerror![]u8;
+
+pub const Error = error{
+    InvalidSfntVersion,
+    CompressionFailed,
+};

src/woff/mod.zig

@@ -1,2 +1,8 @@
 pub const woff_v1 = @import("./woff_v1.zig");
 pub const woff_v2 = @import("./woff_v2.zig");
+pub const woff_impl = @import("./impl.zig");
+
+test {
+    _ = woff_v1;
+    _ = woff_v2;
+}

src/woff/woff_v1.zig

@@ -1,12 +1,13 @@
 const std = @import("std");
 const reader = @import("../byte_read.zig");
 const mod = @import("../parser.zig");
-const Allocator = std.mem.Allocator;
 const Head = @import("../table/head.zig");
 const byte_writer = @import("../byte_writer.zig");
+const Impl = @import("./impl.zig");
 
 const zlib = std.compress.zlib;
 const fs = std.fs;
+const Allocator = std.mem.Allocator;
 
 const Parser = mod.Parser;
 const ByteWriter = byte_writer.ByteWriter;
@@ -18,12 +19,8 @@ pub const Woff = struct {
 
     allocator: Allocator,
     parser: *Parser,
-    compressor: *const fn (allocator: Allocator, data: []const u8) anyerror![]u8,
+    compressor: Impl.Compressor,
 
-    pub const Error = error{
-        InvalidSfntVersion,
-        CompressionFailed,
-    };
     pub const TableRecord = struct {
         tag: mod.TableTag,
         offset: u32,
@@ -36,16 +33,25 @@ pub const Woff = struct {
     pub fn init(
         allocator: Allocator,
         parser: *Parser,
-        compressor: *const fn (allocator: Allocator, data: []const u8) anyerror![]u8,
-    ) Self {
-        return Self{
+        compressor: Impl.Compressor,
+    ) Impl {
+        const self = allocator.create(Self) catch unreachable;
+        self.* = Self{
             .allocator = allocator,
             .parser = parser,
             .compressor = compressor,
         };
+        return Impl{
+            .ptr = self,
+            .vtable = &.{
+                .as_woff = as_woff,
+            },
+        };
     }
 
-    pub fn as_woff(self: *Self) ![]u8 {
+    fn as_woff(ptr: *anyopaque) ![]u8 {
+        const self: *Self = @ptrCast(@alignCast(ptr));
+        defer self.allocator.destroy(self);
         var buffer = ByteWriter(u8).init(self.allocator);
 
         try self.parser.reader.seek_to(0);
@@ -159,23 +165,15 @@ pub const Woff = struct {
     }
 };
 
-pub fn ttf_to_woff_v1(
-    allocator: Allocator,
-    data: []u8,
-    compressor: *const fn (allocator: Allocator, data: []const u8) anyerror![]u8,
-) ![]u8 {
+pub fn ttf_to_woff_v1(allocator: Allocator, data: []u8, compressor: Impl.Compressor) ![]u8 {
     var parser = try Parser.init(allocator, data);
     defer parser.deinit();
     try parser.parse();
     var woff = Woff.init(allocator, &parser, compressor);
     return woff.as_woff();
 }
 
-pub fn ttf_woff_v1_with_parser(
-    allocator: Allocator,
-    parser: *Parser,
-    compressor: *const fn (allocator: Allocator, data: []const u8) anyerror![]u8,
-) ![]u8 {
+pub fn ttf_woff_v1_with_parser(allocator: Allocator, parser: *Parser, compressor: Impl.Compressor) ![]u8 {
     var woff = Woff.init(allocator, parser, compressor);
     return woff.as_woff();
 }
@@ -194,7 +192,6 @@ fn mock_compressor(allocator: Allocator, data: []const u8) ![]u8 {
 
 test "woff " {
     const allocator = std.testing.allocator;
-
     const font_file_path = fs.path.join(allocator, &.{ "./", "fonts", "LXGWBright-Light.ttf" }) catch unreachable;
     defer allocator.free(font_file_path);
 

src/woff/woff_v2.zig

@@ -1,20 +1,70 @@
-const std = @import("std");
 const brotli = @import("brotli");
+const std = @import("std");
+const reader = @import("../byte_read.zig");
+const mod = @import("../parser.zig");
+const Head = @import("../table/head.zig");
+const byte_writer = @import("../byte_writer.zig");
+const Impl = @import("./impl.zig");
 
-test "brotli round-trip encode/decode" {
-    const allocator = std.testing.allocator;
-    const input = "hello, world! this is a test for brotli encoder/decoder.";
+const Allocator = std.mem.Allocator;
 
-    var encoder = try brotli.Encoder.init(allocator, .{});
-    defer encoder.deinit();
-    const compressed = try encoder.encode(input);
+const Parser = mod.Parser;
+const ByteWriter = byte_writer.ByteWriter;
+
+// https://www.w3.org/TR/WOFF2/
+pub const Woff = struct {
+    const Self = @This();
+
+    allocator: Allocator,
+    parser: *Parser,
+    compressor: *const fn (allocator: Allocator, data: []const u8) anyerror![]u8,
+
+    pub fn init(
+        allocator: Allocator,
+        parser: *Parser,
+        compressor: *const fn (allocator: Allocator, data: []const u8) anyerror![]u8,
+    ) Impl {
+        const self = allocator.create(Self) catch unreachable;
+        self.* = Self{
+            .allocator = allocator,
+            .parser = parser,
+            .compressor = compressor,
+        };
+        return Impl{
+            .ptr = self,
+            .vtable = &.{
+                .as_woff = as_woff,
+            },
+        };
+    }
 
-    var decoder = try brotli.Decoder.init(allocator, .{});
-    defer decoder.deinit();
-    const decompressed = try decoder.decode(compressed);
+    fn as_woff(ptr: *anyopaque) ![]u8 {
+        const self: *Self = @ptrCast(@alignCast(ptr));
+        defer self.allocator.destroy(self);
+        var buffer = ByteWriter(u8).init(self.allocator);
+        try buffer.write(u8, 1, .big);
 
-    try std.testing.expectEqualStrings(input, decompressed);
+        return buffer.to_owned_slice();
+    }
+};
 
-    allocator.free(compressed);
-    allocator.free(decompressed);
+pub fn ttf_to_woff_v2(allocator: Allocator, data: []u8, compressor: Impl.Compressor) ![]u8 {
+    var parser = try Parser.init(allocator, data);
+    defer parser.deinit();
+    try parser.parse();
+    var woff = Woff.init(allocator, &parser, compressor);
+    return woff.as_woff();
+}
+
+pub fn ttf_woff_v2_with_parser(allocator: Allocator, parser: *Parser, compressor: Impl.Compressor) ![]u8 {
+    var woff = Woff.init(allocator, parser, compressor);
+    return woff.as_woff();
+}
+
+// brotli mock
+fn mock_compressor(allocator: Allocator, data: []const u8) anyerror![]u8 {
+    var encoder = try brotli.Encoder.init(allocator, .{});
+    defer encoder.deinit();
+    const compressed = try encoder.encode(data);
+    return compressed;
 }