fix(instant): update props to be snake_case

This commit is contained in:
Nurul Huda (Apon) 2026-01-24 00:27:50 +06:00
parent e42982deda
commit b5f34b4fed
2 changed files with 53 additions and 27 deletions

View file

@ -3,8 +3,8 @@ const std = @import("std");
const Instant = @This(); const Instant = @This();
_inner: *CInstant, _inner: *CInstant,
epochMilliseconds: i64, epoch_milliseconds: i64,
epochNanoseconds: i128, epoch_nanoseconds: i128,
/// Construct from epoch nanoseconds (Temporal.Instant.fromEpochNanoseconds). /// Construct from epoch nanoseconds (Temporal.Instant.fromEpochNanoseconds).
pub fn init(epoch_ns: i128) !Instant { pub fn init(epoch_ns: i128) !Instant {
@ -69,17 +69,6 @@ pub fn equals(a: Instant, b: Instant) bool {
return temporal_rs_Instant_equals(a._inner, b._inner); return temporal_rs_Instant_equals(a._inner, b._inner);
} }
/// Epoch milliseconds accessor (Temporal.Instant.prototype.epochMilliseconds).
// pub fn epochMilliseconds(self: Instant) i64 {
// return temporal_rs_Instant_epoch_milliseconds(self.inner);
// }
/// Epoch nanoseconds accessor (Temporal.Instant.prototype.epochNanoseconds).
// pub fn epochNanoseconds(self: Instant) i128 {
// const value = temporal_rs_Instant_epoch_nanoseconds(self.inner);
// return partsToI128(value);
// }
/// Convert to string using compiled TZ data; caller owns returned slice. /// Convert to string using compiled TZ data; caller owns returned slice.
pub fn toString(self: Instant, allocator: std.mem.Allocator, opts: ToStringOptions) ![]u8 { pub fn toString(self: Instant, allocator: std.mem.Allocator, opts: ToStringOptions) ![]u8 {
const zone_opt = if (opts.time_zone) |z| const zone_opt = if (opts.time_zone) |z|
@ -151,7 +140,7 @@ fn toZonedDateTimeIsoWithProvider(self: Instant, zone: TimeZone, provider: *cons
/// Clone the underlying instant. /// Clone the underlying instant.
fn clone(self: Instant) Instant { fn clone(self: Instant) Instant {
const ptr = temporal_rs_Instant_clone(self._inner); const ptr = temporal_rs_Instant_clone(self._inner);
return .{ ._inner = ptr, .epochMilliseconds = temporal_rs_Instant_epoch_milliseconds(ptr), .epochNanoseconds = partsToI128(temporal_rs_Instant_epoch_nanoseconds(ptr)) }; return .{ ._inner = ptr, .epoch_milliseconds = temporal_rs_Instant_epoch_milliseconds(ptr), .epoch_nanoseconds = partsToI128(temporal_rs_Instant_epoch_nanoseconds(ptr)) };
} }
pub fn deinit(self: Instant) void { pub fn deinit(self: Instant) void {
@ -163,7 +152,7 @@ pub fn deinit(self: Instant) void {
fn wrapInstant(res: InstantResult) !Instant { fn wrapInstant(res: InstantResult) !Instant {
if (!res.is_ok) return error.TemporalError; if (!res.is_ok) return error.TemporalError;
const ptr = res.result.ok orelse return error.TemporalError; const ptr = res.result.ok orelse return error.TemporalError;
return .{ ._inner = ptr, .epochMilliseconds = temporal_rs_Instant_epoch_milliseconds(ptr), .epochNanoseconds = partsToI128(temporal_rs_Instant_epoch_nanoseconds(ptr)) }; return .{ ._inner = ptr, .epoch_milliseconds = temporal_rs_Instant_epoch_milliseconds(ptr), .epoch_nanoseconds = partsToI128(temporal_rs_Instant_epoch_nanoseconds(ptr)) };
} }
fn wrapDuration(res: DurationResult) !DurationHandle { fn wrapDuration(res: DurationResult) !DurationHandle {
@ -442,7 +431,7 @@ test init {
const inst = try Instant.init(epoch_ns); const inst = try Instant.init(epoch_ns);
defer inst.deinit(); defer inst.deinit();
try std.testing.expectEqual(epoch_ns, inst.epochNanoseconds); try std.testing.expectEqual(epoch_ns, inst.epoch_nanoseconds);
} }
test fromEpochNanoseconds { test fromEpochNanoseconds {
@ -455,8 +444,8 @@ test fromEpochNanoseconds {
const min_inst = try Instant.fromEpochNanoseconds(min_ns); const min_inst = try Instant.fromEpochNanoseconds(min_ns);
defer min_inst.deinit(); defer min_inst.deinit();
try std.testing.expectEqual(max_ns, max_inst.epochNanoseconds); try std.testing.expectEqual(max_ns, max_inst.epoch_nanoseconds);
try std.testing.expectEqual(min_ns, min_inst.epochNanoseconds); try std.testing.expectEqual(min_ns, min_inst.epoch_nanoseconds);
try std.testing.expectError(error.TemporalError, Instant.fromEpochNanoseconds(max_ns + 1)); try std.testing.expectError(error.TemporalError, Instant.fromEpochNanoseconds(max_ns + 1));
try std.testing.expectError(error.TemporalError, Instant.fromEpochNanoseconds(min_ns - 1)); try std.testing.expectError(error.TemporalError, Instant.fromEpochNanoseconds(min_ns - 1));
@ -466,7 +455,7 @@ test from {
const inst = try Instant.from("2024-03-15T14:30:45.123Z"); const inst = try Instant.from("2024-03-15T14:30:45.123Z");
defer inst.deinit(); defer inst.deinit();
try std.testing.expectEqual(@as(i64, 1_710_513_045_123), inst.epochMilliseconds); try std.testing.expectEqual(@as(i64, 1_710_513_045_123), inst.epoch_milliseconds);
} }
test fromUtf16 { test fromUtf16 {
@ -478,7 +467,7 @@ test fromUtf16 {
const inst = try Instant.fromUtf16(utf16); const inst = try Instant.fromUtf16(utf16);
defer inst.deinit(); defer inst.deinit();
try std.testing.expectEqual(@as(i64, 1_710_513_045_123), inst.epochMilliseconds); try std.testing.expectEqual(@as(i64, 1_710_513_045_123), inst.epoch_milliseconds);
} }
test subtract { test subtract {
@ -490,11 +479,11 @@ test subtract {
const added = try base.add(dur.ptr); const added = try base.add(dur.ptr);
defer added.deinit(); defer added.deinit();
try std.testing.expectEqual(@as(i64, 5_400_000), added.epochMilliseconds); try std.testing.expectEqual(@as(i64, 5_400_000), added.epoch_milliseconds);
const subbed = try added.subtract(dur.ptr); const subbed = try added.subtract(dur.ptr);
defer subbed.deinit(); defer subbed.deinit();
try std.testing.expectEqual(@as(i64, 0), subbed.epochMilliseconds); try std.testing.expectEqual(@as(i64, 0), subbed.epoch_milliseconds);
} }
test compare { test compare {
@ -587,7 +576,7 @@ test round {
const rounded = try inst.round(opts); const rounded = try inst.round(opts);
defer rounded.deinit(); defer rounded.deinit();
const ns = rounded.epochNanoseconds; const ns = rounded.epoch_nanoseconds;
try std.testing.expectEqual(@as(i128, 1_609_459_245_000_000_000), ns); try std.testing.expectEqual(@as(i128, 1_609_459_245_000_000_000), ns);
} }
@ -598,7 +587,7 @@ test clone {
const cloned = inst.clone(); const cloned = inst.clone();
defer cloned.deinit(); defer cloned.deinit();
try std.testing.expectEqual(inst.epochMilliseconds, cloned.epochMilliseconds); try std.testing.expectEqual(inst.epoch_milliseconds, cloned.epoch_milliseconds);
} }
test toString { test toString {

View file

@ -417,7 +417,10 @@ fn assertDecls(comptime T: type, checks: anytype) !void {
if (typeInfo == .@"struct") { if (typeInfo == .@"struct") {
const struct_info = typeInfo.@"struct"; const struct_info = typeInfo.@"struct";
inline for (struct_info.fields) |field| { inline for (struct_info.fields) |field| {
if (std.mem.eql(u8, field.name, check)) { // Check both camelCase and snake_case
if (std.mem.eql(u8, field.name, check) or
std.mem.eql(u8, field.name, camelToSnakeCase(check)))
{
hasField = true; hasField = true;
break; break;
} }
@ -460,7 +463,7 @@ fn assertDecls(comptime T: type, checks: anytype) !void {
var found = false; var found = false;
inline for (checks) |check| { inline for (checks) |check| {
if (std.mem.eql(u8, field.name, check)) { if (std.mem.eql(u8, field.name, camelToSnakeCase(check))) {
found = true; found = true;
break; break;
} }
@ -473,3 +476,37 @@ fn assertDecls(comptime T: type, checks: anytype) !void {
} }
} }
} }
fn camelToSnakeCase(comptime input: []const u8) []const u8 {
comptime var len: usize = undefined;
comptime {
var llen: usize = input.len;
for (input, 0..) |c, i| {
if (c >= 'A' and c <= 'Z' and i != 0) {
llen += 1;
}
}
len = llen;
}
comptime var result: [len]u8 = undefined;
comptime var write_index: usize = 0;
comptime {
for (input, 0..) |c, i| {
if (c >= 'A' and c <= 'Z') {
if (i != 0) {
result[write_index] = '_';
write_index += 1;
}
result[write_index] = c + 32; // Convert to lowercase
} else {
result[write_index] = c;
}
write_index += 1;
}
}
const final = result;
return &final;
}