@bgord/tools 1.1.0 → 1.1.1

package/dist/age.vo.d.ts

@@ -1,4 +1,4 @@
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export declare const AgeError: {
     readonly FutureBirthdate: "age.future.birthdate";
 };
@@ -9,12 +9,12 @@ export declare class Age {
     private constructor();
     static fromValue(candidate: number): Age;
     static fromBirthdateEpochMs(params: {
-        birthdate: Timestamp;
-        now: Timestamp;
+        birthdate: TimestampVO;
+        now: TimestampVO;
     }): Age;
     static fromBirthdate(candidate: {
         birthdate: string;
-        now: Timestamp;
+        now: TimestampVO;
     }): Age;
     get(): number;
     equals(other: Age): boolean;

package/dist/age.vo.js

@@ -1,6 +1,6 @@
 import { differenceInYears } from "date-fns";
 import { AgeYears, AgeYearsConstraints } from "./age-years.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export const AgeError = { FutureBirthdate: "age.future.birthdate" };
 export class Age {
     value;
@@ -15,13 +15,13 @@ export class Age {
     static fromBirthdateEpochMs(params) {
         if (params.birthdate.isAfter(params.now))
             throw new Error(AgeError.FutureBirthdate);
-        return Age.fromValue(differenceInYears(params.now.get(), params.birthdate.get()));
+        return Age.fromValue(differenceInYears(params.now.ms, params.birthdate.ms));
     }
     static fromBirthdate(candidate) {
-        const birthdate = Timestamp.fromNumber(new Date(candidate.birthdate).getTime());
+        const birthdate = TimestampVO.fromNumber(new Date(candidate.birthdate).getTime());
         if (birthdate.isAfter(candidate.now))
             throw new Error(AgeError.FutureBirthdate);
-        return Age.fromValue(differenceInYears(candidate.now.get(), birthdate.get()));
+        return Age.fromValue(differenceInYears(candidate.now.ms, birthdate.ms));
     }
     get() {
         return this.value;

package/dist/clock.vo.d.ts

@@ -3,13 +3,13 @@ import { Hour } from "./hour.vo";
 import type { HourSchemaType } from "./hour-schema.vo";
 import { Minute } from "./minute.vo";
 import type { MinuteSchemaType } from "./minute-schema.vo";
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 export declare class Clock {
     private readonly hour;
     private readonly minute;
     private readonly formatter;
     constructor(hour: Hour, minute: Minute, formatter?: ClockFormatter);
-    static fromEpochMs(timestamp: Timestamp, formatter?: ClockFormatter): Clock;
+    static fromEpochMs(timestamp: TimestampVO, formatter?: ClockFormatter): Clock;
     get(): {
         hour: HourSchemaType;
         minute: MinuteSchemaType;

package/dist/date-calculator.service.d.ts

@@ -1,10 +1,10 @@
-import type { TimeZoneOffsetValueType } from "./time-zone-offset-value.vo";
-import { Timestamp } from "./timestamp.vo";
+import { Duration } from "./duration.service";
+import { TimestampVO } from "./timestamp.vo";
 type GetStartOfDayTsInTzConfigType = {
-    now: Timestamp;
-    timeZoneOffsetMs: TimeZoneOffsetValueType;
+    now: TimestampVO;
+    timeZoneOffset: Duration;
 };
 export declare class DateCalculator {
-    static getStartOfDayTsInTz(config: GetStartOfDayTsInTzConfigType): Timestamp;
+    static getStartOfDayTsInTz(config: GetStartOfDayTsInTzConfigType): TimestampVO;
 }
 export {};

package/dist/date-calculator.service.js

@@ -1,15 +1,12 @@
 import { Duration } from "./duration.service";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export class DateCalculator {
     static getStartOfDayTsInTz(config) {
         const dayMs = Duration.Days(1).ms;
-        // UTC midnight for the UTC date of `now`
-        const utcMidnight = Math.floor(config.now.get() / dayMs) * dayMs;
-        // Candidate start of the local day (in UTC), anchored to the same UTC date
-        let start = utcMidnight + config.timeZoneOffsetMs;
-        // If the candidate is in the future relative to `now`, it means local midnight was "yesterday" in UTC.
-        if (start > config.now.get())
-            start -= dayMs;
-        return Timestamp.fromNumber(start);
+        const utcMidnightOfNow = TimestampVO.fromNumber(Math.floor(config.now.ms / dayMs) * dayMs);
+        let startOfDayInTz = utcMidnightOfNow.add(config.timeZoneOffset);
+        if (startOfDayInTz.isAfter(config.now))
+            startOfDayInTz = startOfDayInTz.subtract(Duration.Days(1));
+        return startOfDayInTz;
     }
 }

package/dist/date-range.vo.d.ts

@@ -1,15 +1,15 @@
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 export declare const DateRangeError: {
     readonly Invalid: "date.range.invalid";
 };
 export declare class DateRange {
     private readonly start;
     private readonly end;
-    constructor(start: Timestamp, end: Timestamp);
-    getStart(): Timestamp;
-    getEnd(): Timestamp;
-    toRange(): [Timestamp, Timestamp];
-    contains(timestamp: Timestamp): boolean;
+    constructor(start: TimestampVO, end: TimestampVO);
+    getStart(): TimestampVO;
+    getEnd(): TimestampVO;
+    toRange(): [TimestampVO, TimestampVO];
+    contains(timestamp: TimestampVO): boolean;
     equals(other: DateRange): boolean;
     toJSON(): {
         start: number;

package/dist/date-range.vo.js

@@ -24,6 +24,6 @@ export class DateRange {
         return this.start.equals(other.start) && this.end.equals(other.end);
     }
     toJSON() {
-        return { start: this.getStart().get(), end: this.getEnd().get() };
+        return { start: this.getStart().ms, end: this.getEnd().ms };
     }
 }

package/dist/day.vo.d.ts

@@ -1,9 +1,9 @@
 import { DateRange } from "./date-range.vo";
 import { type DayIsoIdType } from "./day-iso-id.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export declare class Day extends DateRange {
-    static fromTimestamp(timestamp: Timestamp): Day;
-    static fromNow(now: Timestamp): Day;
+    static fromTimestamp(timestamp: TimestampVO): Day;
+    static fromNow(now: TimestampVO): Day;
     static fromIsoId(isoId: DayIsoIdType): Day;
     toIsoId(): DayIsoIdType;
     previous(): Day;

package/dist/day.vo.js

@@ -2,11 +2,11 @@ import { formatISO } from "date-fns";
 import { DateRange } from "./date-range.vo";
 import { DayIsoId } from "./day-iso-id.vo";
 import { Duration } from "./duration.service";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export class Day extends DateRange {
     static fromTimestamp(timestamp) {
-        const date = new Date(timestamp.get());
-        const startUtc = Timestamp.fromNumber(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()));
+        const date = new Date(timestamp.ms);
+        const startUtc = TimestampVO.fromNumber(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()));
         const endUtc = startUtc.add(Duration.Days(1)).subtract(Duration.Ms(1));
         return new Day(startUtc, endUtc);
     }
@@ -15,13 +15,13 @@ export class Day extends DateRange {
     }
     static fromIsoId(isoId) {
         const [year, month, day] = DayIsoId.parse(isoId).split("-").map(Number);
-        const startUtc = Timestamp.fromNumber(Date.UTC(year, month - 1, day));
+        const startUtc = TimestampVO.fromNumber(Date.UTC(year, month - 1, day));
         const endUtc = startUtc.add(Duration.Days(1)).subtract(Duration.Ms(1));
         return new Day(startUtc, endUtc);
     }
     toIsoId() {
         const midday = this.getStart().add(Duration.Hours(12));
-        return DayIsoId.parse(formatISO(midday.get(), { representation: "date" }));
+        return DayIsoId.parse(formatISO(midday.ms, { representation: "date" }));
     }
     previous() {
         return this.shift(-1);

package/dist/hour.vo.d.ts

@@ -1,12 +1,12 @@
 import { type HourFormatter } from "./hour-format.service";
 import { type HourSchemaType } from "./hour-schema.vo";
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 export declare class Hour {
     private readonly value;
     static readonly ZERO: Hour;
     static readonly MAX: Hour;
     constructor(candidate: number);
-    static fromEpochMs(timestamp: Timestamp): Hour;
+    static fromEpochMs(timestamp: TimestampVO): Hour;
     get(): HourSchemaType;
     format(formatter: HourFormatter): string;
     equals(another: Hour): boolean;

package/dist/hour.vo.js

@@ -8,7 +8,7 @@ export class Hour {
         this.value = HourSchema.parse(candidate);
     }
     static fromEpochMs(timestamp) {
-        return new Hour(new Date(timestamp.get()).getUTCHours());
+        return new Hour(new Date(timestamp.ms).getUTCHours());
     }
     get() {
         return this.value;

package/dist/minute.vo.d.ts

@@ -1,11 +1,11 @@
 import { type MinuteSchemaType } from "./minute-schema.vo";
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 export declare class Minute {
     private readonly value;
     static readonly ZERO: Minute;
     static readonly MAX: Minute;
     constructor(candidate: number);
-    static fromEpochMs(timestamp: Timestamp): Minute;
+    static fromEpochMs(timestamp: TimestampVO): Minute;
     get(): MinuteSchemaType;
     equals(another: Minute): boolean;
     isAfter(another: Minute): boolean;

package/dist/minute.vo.js

@@ -7,7 +7,7 @@ export class Minute {
         this.value = MinuteSchema.parse(candidate);
     }
     static fromEpochMs(timestamp) {
-        return new Minute(new Date(timestamp.get()).getUTCMinutes());
+        return new Minute(new Date(timestamp.ms).getUTCMinutes());
     }
     get() {
         return this.value;

package/dist/month.vo.d.ts

@@ -1,9 +1,9 @@
 import { DateRange } from "./date-range.vo";
 import { type MonthIsoIdType } from "./month-iso-id.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export declare class Month extends DateRange {
-    static fromTimestamp(timestamp: Timestamp): Month;
-    static fromNow(now: Timestamp): Month;
+    static fromTimestamp(timestamp: TimestampVO): Month;
+    static fromNow(now: TimestampVO): Month;
     static fromIsoId(iso: MonthIsoIdType): Month;
     toIsoId(): MonthIsoIdType;
     previous(): Month;

package/dist/month.vo.js

@@ -1,11 +1,11 @@
 import { endOfMonth, format, getMonth, setMonth, startOfMonth } from "date-fns";
 import { DateRange } from "./date-range.vo";
 import { MonthIsoId } from "./month-iso-id.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export class Month extends DateRange {
     static fromTimestamp(timestamp) {
-        const start = Timestamp.fromNumber(startOfMonth(timestamp.get()).getTime());
-        const end = Timestamp.fromNumber(endOfMonth(timestamp.get()).getTime());
+        const start = TimestampVO.fromNumber(startOfMonth(timestamp.ms).getTime());
+        const end = TimestampVO.fromNumber(endOfMonth(timestamp.ms).getTime());
         return new Month(start, end);
     }
     static fromNow(now) {
@@ -14,10 +14,10 @@ export class Month extends DateRange {
     static fromIsoId(iso) {
         const [year, month] = MonthIsoId.parse(iso).split("-").map(Number);
         const reference = setMonth(Date.UTC(year), month - 1).getTime();
-        return Month.fromTimestamp(Timestamp.fromNumber(reference));
+        return Month.fromTimestamp(TimestampVO.fromNumber(reference));
     }
     toIsoId() {
-        return MonthIsoId.parse(format(this.getStart().get(), "yyyy-MM"));
+        return MonthIsoId.parse(format(this.getStart().ms, "yyyy-MM"));
     }
     previous() {
         return this.shift(-1);
@@ -26,8 +26,8 @@ export class Month extends DateRange {
         return this.shift(1);
     }
     shift(count) {
-        const shifted = setMonth(this.getStart().get(), getMonth(this.getStart().get()) + count).getTime();
-        return Month.fromTimestamp(Timestamp.fromNumber(shifted));
+        const shifted = setMonth(this.getStart().ms, getMonth(this.getStart().ms) + count).getTime();
+        return Month.fromTimestamp(TimestampVO.fromNumber(shifted));
     }
     toString() {
         return this.toIsoId();

package/dist/quarter.vo.d.ts

@@ -1,9 +1,9 @@
 import { DateRange } from "./date-range.vo";
 import { type QuarterIsoIdType } from "./quarter-iso-id.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export declare class Quarter extends DateRange {
-    static fromTimestamp(timestamp: Timestamp): Quarter;
-    static fromNow(now: Timestamp): Quarter;
+    static fromTimestamp(timestamp: TimestampVO): Quarter;
+    static fromNow(now: TimestampVO): Quarter;
     static fromIsoId(isoId: QuarterIsoIdType): Quarter;
     toIsoId(): QuarterIsoIdType;
     toString(): string;

package/dist/quarter.vo.js

@@ -1,11 +1,11 @@
 import { endOfQuarter, getQuarter, getYear, setQuarter, startOfQuarter } from "date-fns";
 import { DateRange } from "./date-range.vo";
 import { QuarterIsoId } from "./quarter-iso-id.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export class Quarter extends DateRange {
     static fromTimestamp(timestamp) {
-        const start = Timestamp.fromNumber(startOfQuarter(timestamp.get()).getTime());
-        const end = Timestamp.fromNumber(endOfQuarter(timestamp.get()).getTime());
+        const start = TimestampVO.fromNumber(startOfQuarter(timestamp.ms).getTime());
+        const end = TimestampVO.fromNumber(endOfQuarter(timestamp.ms).getTime());
         return new Quarter(start, end);
     }
     static fromNow(now) {
@@ -14,11 +14,11 @@ export class Quarter extends DateRange {
     static fromIsoId(isoId) {
         const [year, quarter] = QuarterIsoId.parse(isoId).split("-Q").map(Number);
         const reference = setQuarter(Date.UTC(year), quarter).getTime();
-        return Quarter.fromTimestamp(Timestamp.fromNumber(reference));
+        return Quarter.fromTimestamp(TimestampVO.fromNumber(reference));
     }
     toIsoId() {
-        const year = getYear(this.getStart().get());
-        const quarter = getQuarter(this.getStart().get());
+        const year = getYear(this.getStart().ms);
+        const quarter = getQuarter(this.getStart().ms);
         return QuarterIsoId.parse(`${year}-Q${quarter}`);
     }
     toString() {

package/dist/rate-limiter.service.d.ts

@@ -1,5 +1,5 @@
-import { Duration } from "./duration.service";
-import type { Timestamp } from "./timestamp.vo";
+import type { Duration } from "./duration.service";
+import type { TimestampVO } from "./timestamp.vo";
 type RateLimiterResultSuccessType = {
     allowed: true;
 };
@@ -12,6 +12,6 @@ export declare class RateLimiter {
     private readonly duration;
     private lastInvocation;
     constructor(duration: Duration);
-    verify(now: Timestamp): RateLimiterResultType;
+    verify(now: TimestampVO): RateLimiterResultType;
 }
 export {};

package/dist/rate-limiter.service.js

@@ -1,4 +1,3 @@
-import { Duration } from "./duration.service";
 export class RateLimiter {
     duration;
     lastInvocation = null;
@@ -15,7 +14,6 @@ export class RateLimiter {
             this.lastInvocation = now;
             return { allowed: true };
         }
-        const remainingDelta = nextAllowedTimestamp.get() - now.get();
-        return { allowed: false, remaining: Duration.Ms(remainingDelta) };
+        return { allowed: false, remaining: nextAllowedTimestamp.difference(now) };
     }
 }

package/dist/relative-date.vo.d.ts

@@ -1,4 +1,4 @@
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 import type { TimestampValueType } from "./timestamp-value.vo";
 import type { Falsy } from "./ts-utils";
 type RelativeDateType = {
@@ -6,8 +6,8 @@ type RelativeDateType = {
     relative: string;
 };
 export declare class RelativeDate {
-    static truthy(timestamp: Timestamp): RelativeDateType;
-    static falsy(timestamp: Falsy<Timestamp>): RelativeDateType | null;
+    static truthy(timestamp: TimestampVO): RelativeDateType;
+    static falsy(timestamp: Falsy<TimestampVO>): RelativeDateType | null;
     private static _format;
 }
 export {};

package/dist/relative-date.vo.js

@@ -9,6 +9,6 @@ export class RelativeDate {
         return RelativeDate._format(timestamp);
     }
     static _format(timestamp) {
-        return { raw: timestamp.get(), relative: DateFormatters.relative(timestamp.get()) };
+        return { raw: timestamp.ms, relative: DateFormatters.relative(timestamp.ms) };
     }
 }

package/dist/stopwatch.service.d.ts

@@ -1,5 +1,5 @@
-import { Duration } from "./duration.service";
-import { Timestamp } from "./timestamp.vo";
+import type { Duration } from "./duration.service";
+import { TimestampVO } from "./timestamp.vo";
 export declare const StopwatchError: {
     readonly AlreadyStopped: "stopwatch.already.stopped";
 };
@@ -7,6 +7,6 @@ export type StopwatchResultType = Duration;
 export declare class Stopwatch {
     private readonly start;
     private state;
-    constructor(start: Timestamp);
+    constructor(start: TimestampVO);
     stop(): StopwatchResultType;
 }

package/dist/stopwatch.service.js

@@ -1,5 +1,4 @@
-import { Duration } from "./duration.service";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 export const StopwatchError = { AlreadyStopped: "stopwatch.already.stopped" };
 var StopwatchState;
 (function (StopwatchState) {
@@ -16,6 +15,6 @@ export class Stopwatch {
         if (this.state === StopwatchState.stopped)
             throw new Error(StopwatchError.AlreadyStopped);
         this.state = StopwatchState.stopped;
-        return Duration.Ms(Timestamp.fromNumber(Date.now() - this.start.get()).get());
+        return TimestampVO.fromNumber(Date.now()).difference(this.start);
     }
 }

package/dist/timestamp.vo.d.ts

@@ -1,18 +1,19 @@
-import type { Duration } from "./duration.service";
+import { Duration } from "./duration.service";
 import { type TimestampValueType } from "./timestamp-value.vo";
-export declare class Timestamp {
+export declare class TimestampVO {
     private readonly value;
     constructor(value: TimestampValueType);
-    static fromValue(value: TimestampValueType): Timestamp;
-    static fromNumber(value: number): Timestamp;
-    add(duration: Duration): Timestamp;
-    subtract(duration: Duration): Timestamp;
-    isBefore(another: Timestamp): boolean;
-    isBeforeOrEqual(another: Timestamp): boolean;
-    isAfter(another: Timestamp): boolean;
-    isAfterOrEqual(another: Timestamp): boolean;
-    equals(another: Timestamp): boolean;
-    get(): TimestampValueType;
+    static fromValue(value: TimestampValueType): TimestampVO;
+    static fromNumber(value: number): TimestampVO;
+    add(duration: Duration): TimestampVO;
+    subtract(duration: Duration): TimestampVO;
+    difference(another: TimestampVO): Duration;
+    isBefore(another: TimestampVO): boolean;
+    isBeforeOrEqual(another: TimestampVO): boolean;
+    isAfter(another: TimestampVO): boolean;
+    isAfterOrEqual(another: TimestampVO): boolean;
+    equals(another: TimestampVO): boolean;
+    get ms(): TimestampValueType;
     toJSON(): TimestampValueType;
     toString(): string;
 }

package/dist/timestamp.vo.js

@@ -1,20 +1,24 @@
+import { Duration } from "./duration.service";
 import { TimestampValue } from "./timestamp-value.vo";
-export class Timestamp {
+export class TimestampVO {
     value;
     constructor(value) {
         this.value = value;
     }
     static fromValue(value) {
-        return new Timestamp(value);
+        return new TimestampVO(value);
     }
     static fromNumber(value) {
-        return new Timestamp(TimestampValue.parse(value));
+        return new TimestampVO(TimestampValue.parse(value));
     }
     add(duration) {
-        return Timestamp.fromNumber(this.value + duration.ms);
+        return TimestampVO.fromNumber(this.value + duration.ms);
     }
     subtract(duration) {
-        return Timestamp.fromNumber(this.value - duration.ms);
+        return TimestampVO.fromNumber(this.value - duration.ms);
+    }
+    difference(another) {
+        return Duration.Ms(this.value - another.value);
     }
     isBefore(another) {
         return this.value < another.value;
@@ -31,7 +35,7 @@ export class Timestamp {
     equals(another) {
         return this.value === another.value;
     }
-    get() {
+    get ms() {
         return this.value;
     }
     toJSON() {

package/dist/week.vo.d.ts

@@ -1,9 +1,9 @@
 import { DateRange } from "./date-range.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 import { type WeekIsoIdType } from "./week-iso-id.vo";
 export declare class Week extends DateRange {
-    static fromTimestamp(timestamp: Timestamp): Week;
-    static fromNow(now: Timestamp): Week;
+    static fromTimestamp(timestamp: TimestampVO): Week;
+    static fromNow(now: TimestampVO): Week;
     static fromIsoId(isoId: WeekIsoIdType): Week;
     toIsoId(): WeekIsoIdType;
     previous(): Week;

package/dist/week.vo.js

@@ -1,11 +1,11 @@
 import { addWeeks, endOfISOWeek, getISOWeek, getISOWeekYear, setISOWeek, startOfISOWeek } from "date-fns";
 import { DateRange } from "./date-range.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 import { WeekIsoId } from "./week-iso-id.vo";
 export class Week extends DateRange {
     static fromTimestamp(timestamp) {
-        const start = Timestamp.fromNumber(startOfISOWeek(timestamp.get()).getTime());
-        const end = Timestamp.fromNumber(endOfISOWeek(timestamp.get()).getTime());
+        const start = TimestampVO.fromNumber(startOfISOWeek(timestamp.ms).getTime());
+        const end = TimestampVO.fromNumber(endOfISOWeek(timestamp.ms).getTime());
         return new Week(start, end);
     }
     static fromNow(now) {
@@ -15,11 +15,11 @@ export class Week extends DateRange {
         const [year, week] = WeekIsoId.parse(isoId).split("-W").map(Number);
         // ISO-8601 rule: Jan 4 is always in week 01 of the ISO week-year.
         const reference = setISOWeek(Date.UTC(year, 0, 4), week).getTime();
-        return Week.fromTimestamp(Timestamp.fromNumber(reference));
+        return Week.fromTimestamp(TimestampVO.fromNumber(reference));
     }
     toIsoId() {
-        const year = getISOWeekYear(this.getStart().get());
-        const week = getISOWeek(this.getStart().get());
+        const year = getISOWeekYear(this.getStart().ms);
+        const week = getISOWeek(this.getStart().ms);
         return WeekIsoId.parse(`${year}-W${String(week).padStart(2, "0")}`);
     }
     previous() {
@@ -29,8 +29,8 @@ export class Week extends DateRange {
         return this.shift(1);
     }
     shift(count) {
-        const shifted = addWeeks(this.getStart().get(), count).getTime();
-        return Week.fromTimestamp(Timestamp.fromNumber(shifted));
+        const shifted = addWeeks(this.getStart().ms, count).getTime();
+        return Week.fromTimestamp(TimestampVO.fromNumber(shifted));
     }
     toString() {
         return this.toIsoId();

package/dist/weekday.vo.d.ts

@@ -1,4 +1,4 @@
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 export type WeekdayFormatter = (value: Weekday["value"]) => string;
 export declare enum WeekdayFormatterEnum {
     FULL = "FULL",// "Sunday"
@@ -19,7 +19,7 @@ export declare class Weekday {
     static readonly FRIDAY: Weekday;
     static readonly SATURDAY: Weekday;
     constructor(candidate: number, formatter?: WeekdayFormatter);
-    static fromUtcTimestamp(timestamp: Timestamp, formatter?: WeekdayFormatter): Weekday;
+    static fromUtcTimestamp(timestamp: TimestampVO, formatter?: WeekdayFormatter): Weekday;
     get(): number;
     format(): string;
     toString(): string;

package/dist/weekday.vo.js

@@ -41,7 +41,7 @@ export class Weekday {
         this.formatter = formatter ?? WeekdayFormatters.FULL;
     }
     static fromUtcTimestamp(timestamp, formatter) {
-        const dayZeroBased = new Date(timestamp.get()).getUTCDay(); // 0..6
+        const dayZeroBased = new Date(timestamp.ms).getUTCDay(); // 0..6
         return new Weekday(dayZeroBased, formatter);
     }
     get() {

package/dist/year.vo.d.ts

@@ -1,9 +1,9 @@
 import { DateRange } from "./date-range.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 import { type YearIsoIdType } from "./year-iso-id.vo";
 export declare class Year extends DateRange {
-    static fromTimestamp(timestamp: Timestamp): Year;
-    static fromNow(now: Timestamp): Year;
+    static fromTimestamp(timestamp: TimestampVO): Year;
+    static fromNow(now: TimestampVO): Year;
     static fromNumber(candidate: number): Year;
     static fromIsoId(isoId: YearIsoIdType): Year;
     toIsoId(): YearIsoIdType;

package/dist/year.vo.js

@@ -1,11 +1,11 @@
 import { addYears, endOfYear, getYear, startOfYear } from "date-fns";
 import { DateRange } from "./date-range.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 import { YearIsoId } from "./year-iso-id.vo";
 export class Year extends DateRange {
     static fromTimestamp(timestamp) {
-        const start = Timestamp.fromNumber(startOfYear(timestamp.get()).getTime());
-        const end = Timestamp.fromNumber(endOfYear(timestamp.get()).getTime());
+        const start = TimestampVO.fromNumber(startOfYear(timestamp.ms).getTime());
+        const end = TimestampVO.fromNumber(endOfYear(timestamp.ms).getTime());
         return new Year(start, end);
     }
     static fromNow(now) {
@@ -16,13 +16,13 @@ export class Year extends DateRange {
     }
     static fromIsoId(isoId) {
         const reference = Date.UTC(Number(isoId));
-        return Year.fromTimestamp(Timestamp.fromNumber(reference));
+        return Year.fromTimestamp(TimestampVO.fromNumber(reference));
     }
     toIsoId() {
-        return YearIsoId.parse(String(getYear(this.getStart().get())));
+        return YearIsoId.parse(String(getYear(this.getStart().ms)));
     }
     isLeapYear() {
-        const year = getYear(this.getStart().get());
+        const year = getYear(this.getStart().ms);
         return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
     }
     previous() {
@@ -32,8 +32,8 @@ export class Year extends DateRange {
         return this.shift(1);
     }
     shift(count) {
-        const shifted = addYears(this.getStart().get(), count).getTime();
-        return Year.fromTimestamp(Timestamp.fromNumber(shifted));
+        const shifted = addYears(this.getStart().ms, count).getTime();
+        return Year.fromTimestamp(TimestampVO.fromNumber(shifted));
     }
     toString() {
         return this.toIsoId();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/tools",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "license": "MIT",
   "author": "Bartosz Gordon",

package/src/age.vo.ts

@@ -1,6 +1,6 @@
 import { differenceInYears } from "date-fns";
 import { AgeYears, AgeYearsConstraints, type AgeYearsType } from "./age-years.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 
 export const AgeError = { FutureBirthdate: "age.future.birthdate" } as const;
 
@@ -14,16 +14,16 @@ export class Age {
     return new Age(AgeYears.parse(candidate));
   }
 
-  static fromBirthdateEpochMs(params: { birthdate: Timestamp; now: Timestamp }): Age {
+  static fromBirthdateEpochMs(params: { birthdate: TimestampVO; now: TimestampVO }): Age {
     if (params.birthdate.isAfter(params.now)) throw new Error(AgeError.FutureBirthdate);
-    return Age.fromValue(differenceInYears(params.now.get(), params.birthdate.get()));
+    return Age.fromValue(differenceInYears(params.now.ms, params.birthdate.ms));
   }
 
-  static fromBirthdate(candidate: { birthdate: string; now: Timestamp }): Age {
-    const birthdate = Timestamp.fromNumber(new Date(candidate.birthdate).getTime());
+  static fromBirthdate(candidate: { birthdate: string; now: TimestampVO }): Age {
+    const birthdate = TimestampVO.fromNumber(new Date(candidate.birthdate).getTime());
 
     if (birthdate.isAfter(candidate.now)) throw new Error(AgeError.FutureBirthdate);
-    return Age.fromValue(differenceInYears(candidate.now.get(), birthdate.get()));
+    return Age.fromValue(differenceInYears(candidate.now.ms, birthdate.ms));
   }
 
   get(): number {

package/src/clock.vo.ts

@@ -3,7 +3,7 @@ import { Hour } from "./hour.vo";
 import type { HourSchemaType } from "./hour-schema.vo";
 import { Minute } from "./minute.vo";
 import type { MinuteSchemaType } from "./minute-schema.vo";
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 
 export class Clock {
   private readonly formatter: ClockFormatter;
@@ -16,7 +16,7 @@ export class Clock {
     this.formatter = formatter ?? ClockFormatters.TWENTY_FOUR_HOURS;
   }
 
-  static fromEpochMs(timestamp: Timestamp, formatter?: ClockFormatter): Clock {
+  static fromEpochMs(timestamp: TimestampVO, formatter?: ClockFormatter): Clock {
     const hour = Hour.fromEpochMs(timestamp);
     const minute = Minute.fromEpochMs(timestamp);
 

package/src/date-calculator.service.ts

@@ -1,22 +1,18 @@
 import { Duration } from "./duration.service";
-import type { TimeZoneOffsetValueType } from "./time-zone-offset-value.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 
-type GetStartOfDayTsInTzConfigType = { now: Timestamp; timeZoneOffsetMs: TimeZoneOffsetValueType };
+type GetStartOfDayTsInTzConfigType = { now: TimestampVO; timeZoneOffset: Duration };
 
 export class DateCalculator {
-  static getStartOfDayTsInTz(config: GetStartOfDayTsInTzConfigType): Timestamp {
+  static getStartOfDayTsInTz(config: GetStartOfDayTsInTzConfigType): TimestampVO {
     const dayMs = Duration.Days(1).ms;
 
-    // UTC midnight for the UTC date of `now`
-    const utcMidnight = Math.floor(config.now.get() / dayMs) * dayMs;
+    const utcMidnightOfNow = TimestampVO.fromNumber(Math.floor(config.now.ms / dayMs) * dayMs);
 
-    // Candidate start of the local day (in UTC), anchored to the same UTC date
-    let start = utcMidnight + config.timeZoneOffsetMs;
+    let startOfDayInTz = utcMidnightOfNow.add(config.timeZoneOffset);
 
-    // If the candidate is in the future relative to `now`, it means local midnight was "yesterday" in UTC.
-    if (start > config.now.get()) start -= dayMs;
+    if (startOfDayInTz.isAfter(config.now)) startOfDayInTz = startOfDayInTz.subtract(Duration.Days(1));
 
-    return Timestamp.fromNumber(start);
+    return startOfDayInTz;
   }
 }

package/src/date-range.vo.ts

@@ -1,28 +1,28 @@
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 
 export const DateRangeError = { Invalid: "date.range.invalid" } as const;
 
 export class DateRange {
   constructor(
-    private readonly start: Timestamp,
-    private readonly end: Timestamp,
+    private readonly start: TimestampVO,
+    private readonly end: TimestampVO,
   ) {
     if (start.isAfter(end)) throw new Error(DateRangeError.Invalid);
   }
 
-  getStart(): Timestamp {
+  getStart(): TimestampVO {
     return this.start;
   }
 
-  getEnd(): Timestamp {
+  getEnd(): TimestampVO {
     return this.end;
   }
 
-  toRange(): [Timestamp, Timestamp] {
+  toRange(): [TimestampVO, TimestampVO] {
     return [this.start, this.end];
   }
 
-  contains(timestamp: Timestamp): boolean {
+  contains(timestamp: TimestampVO): boolean {
     return timestamp.isAfterOrEqual(this.start) && timestamp.isBeforeOrEqual(this.end);
   }
 
@@ -31,6 +31,6 @@ export class DateRange {
   }
 
   toJSON(): { start: number; end: number } {
-    return { start: this.getStart().get(), end: this.getEnd().get() };
+    return { start: this.getStart().ms, end: this.getEnd().ms };
   }
 }

package/src/day.vo.ts

@@ -2,13 +2,13 @@ import { formatISO } from "date-fns";
 import { DateRange } from "./date-range.vo";
 import { DayIsoId, type DayIsoIdType } from "./day-iso-id.vo";
 import { Duration } from "./duration.service";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 
 export class Day extends DateRange {
-  static fromTimestamp(timestamp: Timestamp): Day {
-    const date = new Date(timestamp.get());
+  static fromTimestamp(timestamp: TimestampVO): Day {
+    const date = new Date(timestamp.ms);
 
-    const startUtc = Timestamp.fromNumber(
+    const startUtc = TimestampVO.fromNumber(
       Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()),
     );
     const endUtc = startUtc.add(Duration.Days(1)).subtract(Duration.Ms(1));
@@ -16,14 +16,14 @@ export class Day extends DateRange {
     return new Day(startUtc, endUtc);
   }
 
-  static fromNow(now: Timestamp): Day {
+  static fromNow(now: TimestampVO): Day {
     return Day.fromTimestamp(now);
   }
 
   static fromIsoId(isoId: DayIsoIdType): Day {
     const [year, month, day] = DayIsoId.parse(isoId).split("-").map(Number);
 
-    const startUtc = Timestamp.fromNumber(Date.UTC(year, month - 1, day));
+    const startUtc = TimestampVO.fromNumber(Date.UTC(year, month - 1, day));
     const endUtc = startUtc.add(Duration.Days(1)).subtract(Duration.Ms(1));
 
     return new Day(startUtc, endUtc);
@@ -32,7 +32,7 @@ export class Day extends DateRange {
   toIsoId(): DayIsoIdType {
     const midday = this.getStart().add(Duration.Hours(12));
 
-    return DayIsoId.parse(formatISO(midday.get(), { representation: "date" }));
+    return DayIsoId.parse(formatISO(midday.ms, { representation: "date" }));
   }
 
   previous(): Day {

package/src/hour.vo.ts

@@ -1,6 +1,6 @@
 import { type HourFormatter, HourFormatters } from "./hour-format.service";
 import { HourSchema, type HourSchemaType } from "./hour-schema.vo";
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 
 export class Hour {
   private readonly value: HourSchemaType;
@@ -12,8 +12,8 @@ export class Hour {
     this.value = HourSchema.parse(candidate);
   }
 
-  static fromEpochMs(timestamp: Timestamp): Hour {
-    return new Hour(new Date(timestamp.get()).getUTCHours());
+  static fromEpochMs(timestamp: TimestampVO): Hour {
+    return new Hour(new Date(timestamp.ms).getUTCHours());
   }
 
   get(): HourSchemaType {

package/src/minute.vo.ts

@@ -1,5 +1,5 @@
 import { MinuteSchema, type MinuteSchemaType } from "./minute-schema.vo";
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 
 export class Minute {
   private readonly value: MinuteSchemaType;
@@ -11,8 +11,8 @@ export class Minute {
     this.value = MinuteSchema.parse(candidate);
   }
 
-  static fromEpochMs(timestamp: Timestamp): Minute {
-    return new Minute(new Date(timestamp.get()).getUTCMinutes());
+  static fromEpochMs(timestamp: TimestampVO): Minute {
+    return new Minute(new Date(timestamp.ms).getUTCMinutes());
   }
 
   get(): MinuteSchemaType {

package/src/month.vo.ts

@@ -1,17 +1,17 @@
 import { endOfMonth, format, getMonth, setMonth, startOfMonth } from "date-fns";
 import { DateRange } from "./date-range.vo";
 import { MonthIsoId, type MonthIsoIdType } from "./month-iso-id.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 
 export class Month extends DateRange {
-  static fromTimestamp(timestamp: Timestamp): Month {
-    const start = Timestamp.fromNumber(startOfMonth(timestamp.get()).getTime());
-    const end = Timestamp.fromNumber(endOfMonth(timestamp.get()).getTime());
+  static fromTimestamp(timestamp: TimestampVO): Month {
+    const start = TimestampVO.fromNumber(startOfMonth(timestamp.ms).getTime());
+    const end = TimestampVO.fromNumber(endOfMonth(timestamp.ms).getTime());
 
     return new Month(start, end);
   }
 
-  static fromNow(now: Timestamp): Month {
+  static fromNow(now: TimestampVO): Month {
     return Month.fromTimestamp(now);
   }
 
@@ -20,11 +20,11 @@ export class Month extends DateRange {
 
     const reference = setMonth(Date.UTC(year), month - 1).getTime();
 
-    return Month.fromTimestamp(Timestamp.fromNumber(reference));
+    return Month.fromTimestamp(TimestampVO.fromNumber(reference));
   }
 
   toIsoId(): MonthIsoIdType {
-    return MonthIsoId.parse(format(this.getStart().get(), "yyyy-MM"));
+    return MonthIsoId.parse(format(this.getStart().ms, "yyyy-MM"));
   }
 
   previous(): Month {
@@ -36,9 +36,9 @@ export class Month extends DateRange {
   }
 
   shift(count: number): Month {
-    const shifted = setMonth(this.getStart().get(), getMonth(this.getStart().get()) + count).getTime();
+    const shifted = setMonth(this.getStart().ms, getMonth(this.getStart().ms) + count).getTime();
 
-    return Month.fromTimestamp(Timestamp.fromNumber(shifted));
+    return Month.fromTimestamp(TimestampVO.fromNumber(shifted));
   }
 
   toString(): string {

package/src/quarter.vo.ts

@@ -1,17 +1,17 @@
 import { endOfQuarter, getQuarter, getYear, setQuarter, startOfQuarter } from "date-fns";
 import { DateRange } from "./date-range.vo";
 import { QuarterIsoId, type QuarterIsoIdType } from "./quarter-iso-id.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 
 export class Quarter extends DateRange {
-  static fromTimestamp(timestamp: Timestamp): Quarter {
-    const start = Timestamp.fromNumber(startOfQuarter(timestamp.get()).getTime());
-    const end = Timestamp.fromNumber(endOfQuarter(timestamp.get()).getTime());
+  static fromTimestamp(timestamp: TimestampVO): Quarter {
+    const start = TimestampVO.fromNumber(startOfQuarter(timestamp.ms).getTime());
+    const end = TimestampVO.fromNumber(endOfQuarter(timestamp.ms).getTime());
 
     return new Quarter(start, end);
   }
 
-  static fromNow(now: Timestamp): Quarter {
+  static fromNow(now: TimestampVO): Quarter {
     return Quarter.fromTimestamp(now);
   }
 
@@ -20,12 +20,12 @@ export class Quarter extends DateRange {
 
     const reference = setQuarter(Date.UTC(year), quarter).getTime();
 
-    return Quarter.fromTimestamp(Timestamp.fromNumber(reference));
+    return Quarter.fromTimestamp(TimestampVO.fromNumber(reference));
   }
 
   toIsoId(): QuarterIsoIdType {
-    const year = getYear(this.getStart().get());
-    const quarter = getQuarter(this.getStart().get());
+    const year = getYear(this.getStart().ms);
+    const quarter = getQuarter(this.getStart().ms);
 
     return QuarterIsoId.parse(`${year}-Q${quarter}`);
   }

package/src/rate-limiter.service.ts

@@ -1,16 +1,16 @@
-import { Duration } from "./duration.service";
-import type { Timestamp } from "./timestamp.vo";
+import type { Duration } from "./duration.service";
+import type { TimestampVO } from "./timestamp.vo";
 
 type RateLimiterResultSuccessType = { allowed: true };
 type RateLimiterResultErrorType = { allowed: false; remaining: Duration };
 type RateLimiterResultType = RateLimiterResultSuccessType | RateLimiterResultErrorType;
 
 export class RateLimiter {
-  private lastInvocation: Timestamp | null = null;
+  private lastInvocation: TimestampVO | null = null;
 
   constructor(private readonly duration: Duration) {}
 
-  verify(now: Timestamp): RateLimiterResultType {
+  verify(now: TimestampVO): RateLimiterResultType {
     if (this.lastInvocation == null) {
       this.lastInvocation = now;
 
@@ -25,8 +25,6 @@ export class RateLimiter {
       return { allowed: true };
     }
 
-    const remainingDelta = nextAllowedTimestamp.get() - now.get();
-
-    return { allowed: false, remaining: Duration.Ms(remainingDelta) };
+    return { allowed: false, remaining: nextAllowedTimestamp.difference(now) };
   }
 }

package/src/relative-date.vo.ts

@@ -1,21 +1,21 @@
 import { DateFormatters } from "./date-formatter.service";
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 import type { TimestampValueType } from "./timestamp-value.vo";
 import type { Falsy } from "./ts-utils";
 
 type RelativeDateType = { raw: TimestampValueType; relative: string };
 
 export class RelativeDate {
-  static truthy(timestamp: Timestamp): RelativeDateType {
+  static truthy(timestamp: TimestampVO): RelativeDateType {
     return RelativeDate._format(timestamp);
   }
 
-  static falsy(timestamp: Falsy<Timestamp>): RelativeDateType | null {
+  static falsy(timestamp: Falsy<TimestampVO>): RelativeDateType | null {
     if (!timestamp) return null;
     return RelativeDate._format(timestamp);
   }
 
-  private static _format(timestamp: Timestamp): RelativeDateType {
-    return { raw: timestamp.get(), relative: DateFormatters.relative(timestamp.get()) };
+  private static _format(timestamp: TimestampVO): RelativeDateType {
+    return { raw: timestamp.ms, relative: DateFormatters.relative(timestamp.ms) };
   }
 }

package/src/stopwatch.service.ts

@@ -1,5 +1,5 @@
-import { Duration } from "./duration.service";
-import { Timestamp } from "./timestamp.vo";
+import type { Duration } from "./duration.service";
+import { TimestampVO } from "./timestamp.vo";
 
 export const StopwatchError = { AlreadyStopped: "stopwatch.already.stopped" } as const;
 
@@ -13,13 +13,13 @@ export type StopwatchResultType = Duration;
 export class Stopwatch {
   private state: StopwatchState = StopwatchState.started;
 
-  constructor(private readonly start: Timestamp) {}
+  constructor(private readonly start: TimestampVO) {}
 
   stop(): StopwatchResultType {
     if (this.state === StopwatchState.stopped) throw new Error(StopwatchError.AlreadyStopped);
 
     this.state = StopwatchState.stopped;
 
-    return Duration.Ms(Timestamp.fromNumber(Date.now() - this.start.get()).get());
+    return TimestampVO.fromNumber(Date.now()).difference(this.start);
   }
 }

package/src/timestamp.vo.ts

@@ -1,46 +1,50 @@
-import type { Duration } from "./duration.service";
+import { Duration } from "./duration.service";
 import { TimestampValue, type TimestampValueType } from "./timestamp-value.vo";
 
-export class Timestamp {
+export class TimestampVO {
   constructor(private readonly value: TimestampValueType) {}
 
-  static fromValue(value: TimestampValueType): Timestamp {
-    return new Timestamp(value);
+  static fromValue(value: TimestampValueType): TimestampVO {
+    return new TimestampVO(value);
   }
 
-  static fromNumber(value: number): Timestamp {
-    return new Timestamp(TimestampValue.parse(value));
+  static fromNumber(value: number): TimestampVO {
+    return new TimestampVO(TimestampValue.parse(value));
   }
 
-  add(duration: Duration): Timestamp {
-    return Timestamp.fromNumber(this.value + duration.ms);
+  add(duration: Duration): TimestampVO {
+    return TimestampVO.fromNumber(this.value + duration.ms);
   }
 
-  subtract(duration: Duration): Timestamp {
-    return Timestamp.fromNumber(this.value - duration.ms);
+  subtract(duration: Duration): TimestampVO {
+    return TimestampVO.fromNumber(this.value - duration.ms);
   }
 
-  isBefore(another: Timestamp): boolean {
+  difference(another: TimestampVO): Duration {
+    return Duration.Ms(this.value - another.value);
+  }
+
+  isBefore(another: TimestampVO): boolean {
     return this.value < another.value;
   }
 
-  isBeforeOrEqual(another: Timestamp): boolean {
+  isBeforeOrEqual(another: TimestampVO): boolean {
     return this.value <= another.value;
   }
 
-  isAfter(another: Timestamp): boolean {
+  isAfter(another: TimestampVO): boolean {
     return this.value > another.value;
   }
 
-  isAfterOrEqual(another: Timestamp): boolean {
+  isAfterOrEqual(another: TimestampVO): boolean {
     return this.value >= another.value;
   }
 
-  equals(another: Timestamp): boolean {
+  equals(another: TimestampVO): boolean {
     return this.value === another.value;
   }
 
-  get(): TimestampValueType {
+  get ms(): TimestampValueType {
     return this.value;
   }
 

package/src/week.vo.ts

@@ -1,17 +1,17 @@
 import { addWeeks, endOfISOWeek, getISOWeek, getISOWeekYear, setISOWeek, startOfISOWeek } from "date-fns";
 import { DateRange } from "./date-range.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 import { WeekIsoId, type WeekIsoIdType } from "./week-iso-id.vo";
 
 export class Week extends DateRange {
-  static fromTimestamp(timestamp: Timestamp): Week {
-    const start = Timestamp.fromNumber(startOfISOWeek(timestamp.get()).getTime());
-    const end = Timestamp.fromNumber(endOfISOWeek(timestamp.get()).getTime());
+  static fromTimestamp(timestamp: TimestampVO): Week {
+    const start = TimestampVO.fromNumber(startOfISOWeek(timestamp.ms).getTime());
+    const end = TimestampVO.fromNumber(endOfISOWeek(timestamp.ms).getTime());
 
     return new Week(start, end);
   }
 
-  static fromNow(now: Timestamp): Week {
+  static fromNow(now: TimestampVO): Week {
     return Week.fromTimestamp(now);
   }
 
@@ -21,12 +21,12 @@ export class Week extends DateRange {
     // ISO-8601 rule: Jan 4 is always in week 01 of the ISO week-year.
     const reference = setISOWeek(Date.UTC(year, 0, 4), week).getTime();
 
-    return Week.fromTimestamp(Timestamp.fromNumber(reference));
+    return Week.fromTimestamp(TimestampVO.fromNumber(reference));
   }
 
   toIsoId(): WeekIsoIdType {
-    const year = getISOWeekYear(this.getStart().get());
-    const week = getISOWeek(this.getStart().get());
+    const year = getISOWeekYear(this.getStart().ms);
+    const week = getISOWeek(this.getStart().ms);
 
     return WeekIsoId.parse(`${year}-W${String(week).padStart(2, "0")}`);
   }
@@ -40,9 +40,9 @@ export class Week extends DateRange {
   }
 
   shift(count: number): Week {
-    const shifted = addWeeks(this.getStart().get(), count).getTime();
+    const shifted = addWeeks(this.getStart().ms, count).getTime();
 
-    return Week.fromTimestamp(Timestamp.fromNumber(shifted));
+    return Week.fromTimestamp(TimestampVO.fromNumber(shifted));
   }
 
   toString(): string {

package/src/weekday.vo.ts

@@ -1,4 +1,4 @@
-import type { Timestamp } from "./timestamp.vo";
+import type { TimestampVO } from "./timestamp.vo";
 
 export type WeekdayFormatter = (value: Weekday["value"]) => string;
 
@@ -52,8 +52,8 @@ export class Weekday {
     this.formatter = formatter ?? WeekdayFormatters.FULL;
   }
 
-  static fromUtcTimestamp(timestamp: Timestamp, formatter?: WeekdayFormatter): Weekday {
-    const dayZeroBased = new Date(timestamp.get()).getUTCDay(); // 0..6
+  static fromUtcTimestamp(timestamp: TimestampVO, formatter?: WeekdayFormatter): Weekday {
+    const dayZeroBased = new Date(timestamp.ms).getUTCDay(); // 0..6
     return new Weekday(dayZeroBased, formatter);
   }
 

package/src/year.vo.ts

@@ -1,17 +1,17 @@
 import { addYears, endOfYear, getYear, startOfYear } from "date-fns";
 import { DateRange } from "./date-range.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
 import { YearIsoId, type YearIsoIdType } from "./year-iso-id.vo";
 
 export class Year extends DateRange {
-  static fromTimestamp(timestamp: Timestamp): Year {
-    const start = Timestamp.fromNumber(startOfYear(timestamp.get()).getTime());
-    const end = Timestamp.fromNumber(endOfYear(timestamp.get()).getTime());
+  static fromTimestamp(timestamp: TimestampVO): Year {
+    const start = TimestampVO.fromNumber(startOfYear(timestamp.ms).getTime());
+    const end = TimestampVO.fromNumber(endOfYear(timestamp.ms).getTime());
 
     return new Year(start, end);
   }
 
-  static fromNow(now: Timestamp): Year {
+  static fromNow(now: TimestampVO): Year {
     return Year.fromTimestamp(now);
   }
 
@@ -22,15 +22,15 @@ export class Year extends DateRange {
   static fromIsoId(isoId: YearIsoIdType): Year {
     const reference = Date.UTC(Number(isoId));
 
-    return Year.fromTimestamp(Timestamp.fromNumber(reference));
+    return Year.fromTimestamp(TimestampVO.fromNumber(reference));
   }
 
   toIsoId(): YearIsoIdType {
-    return YearIsoId.parse(String(getYear(this.getStart().get())));
+    return YearIsoId.parse(String(getYear(this.getStart().ms)));
   }
 
   isLeapYear(): boolean {
-    const year = getYear(this.getStart().get());
+    const year = getYear(this.getStart().ms);
 
     return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
   }
@@ -44,9 +44,9 @@ export class Year extends DateRange {
   }
 
   shift(count: number): Year {
-    const shifted = addYears(this.getStart().get(), count).getTime();
+    const shifted = addYears(this.getStart().ms, count).getTime();
 
-    return Year.fromTimestamp(Timestamp.fromNumber(shifted));
+    return Year.fromTimestamp(TimestampVO.fromNumber(shifted));
   }
 
   toString(): string {