@bgord/tools 1.1.0 → 1.1.2

package/dist/weekday.vo.js

@@ -1,3 +1,4 @@
+import { TimestampVO } from "./timestamp.vo";
 export var WeekdayFormatterEnum;
 (function (WeekdayFormatterEnum) {
     WeekdayFormatterEnum["FULL"] = "FULL";
@@ -40,10 +41,13 @@ export class Weekday {
         this.value = candidate;
         this.formatter = formatter ?? WeekdayFormatters.FULL;
     }
-    static fromUtcTimestamp(timestamp, formatter) {
-        const dayZeroBased = new Date(timestamp.get()).getUTCDay(); // 0..6
+    static fromTimestamp(timestamp, formatter) {
+        const dayZeroBased = new Date(timestamp.ms).getUTCDay(); // 0..6
         return new Weekday(dayZeroBased, formatter);
     }
+    static fromTimestampValue(timestamp) {
+        return Weekday.fromTimestamp(TimestampVO.fromValue(timestamp));
+    }
     get() {
         return this.value;
     }

package/dist/year.vo.d.ts

@@ -1,9 +1,11 @@
 import { DateRange } from "./date-range.vo";
-import { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
+import type { TimestampValueType } from "./timestamp-value.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 fromTimestampValue(timestamp: TimestampValueType): Year;
+    static fromNow(now: TimestampVO): Year;
     static fromNumber(candidate: number): Year;
     static fromIsoId(isoId: YearIsoIdType): Year;
     toIsoId(): YearIsoIdType;

package/dist/year.vo.js

@@ -1,13 +1,16 @@
 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 fromTimestampValue(timestamp) {
+        return Year.fromTimestamp(TimestampVO.fromValue(timestamp));
+    }
     static fromNow(now) {
         return Year.fromTimestamp(now);
     }
@@ -16,13 +19,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 +35,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.2",
   "type": "module",
   "license": "MIT",
   "author": "Bartosz Gordon",
@@ -27,7 +27,7 @@
     "@types/bun": "1.3.1",
     "@types/mime-types": "3.0.1",
     "cspell": "9.2.2",
-    "knip": "5.66.4",
+    "knip": "5.67.0",
     "lefthook": "2.0.2",
     "only-allow": "1.2.1",
     "shellcheck": "4.1.0",

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 fromBirthdateTimestamp(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,9 +16,9 @@ export class Clock {
     this.formatter = formatter ?? ClockFormatters.TWENTY_FOUR_HOURS;
   }
 
-  static fromEpochMs(timestamp: Timestamp, formatter?: ClockFormatter): Clock {
-    const hour = Hour.fromEpochMs(timestamp);
-    const minute = Minute.fromEpochMs(timestamp);
+  static fromTimestamp(timestamp: TimestampVO, formatter?: ClockFormatter): Clock {
+    const hour = Hour.fromTimestamp(timestamp);
+    const minute = Minute.fromTimestamp(timestamp);
 
     return new Clock(hour, minute, formatter);
   }

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,14 @@ 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";
+import type { TimestampValueType } from "./timestamp-value.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 +17,18 @@ export class Day extends DateRange {
     return new Day(startUtc, endUtc);
   }
 
-  static fromNow(now: Timestamp): Day {
+  static fromTimestampValue(timestamp: TimestampValueType): Day {
+    return Day.fromTimestamp(TimestampVO.fromValue(timestamp));
+  }
+
+  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 +37,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,7 @@
 import { type HourFormatter, HourFormatters } from "./hour-format.service";
 import { HourSchema, type HourSchemaType } from "./hour-schema.vo";
-import type { Timestamp } from "./timestamp.vo";
+import { TimestampVO } from "./timestamp.vo";
+import type { TimestampValueType } from "./timestamp-value.vo";
 
 export class Hour {
   private readonly value: HourSchemaType;
@@ -12,8 +13,12 @@ export class Hour {
     this.value = HourSchema.parse(candidate);
   }
 
-  static fromEpochMs(timestamp: Timestamp): Hour {
-    return new Hour(new Date(timestamp.get()).getUTCHours());
+  static fromTimestamp(timestamp: TimestampVO): Hour {
+    return new Hour(new Date(timestamp.ms).getUTCHours());
+  }
+
+  static fromTimestampValue(timestamp: TimestampValueType): Hour {
+    return Hour.fromTimestamp(TimestampVO.fromValue(timestamp));
   }
 
   get(): HourSchemaType {

package/src/minute.vo.ts

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

package/src/month.vo.ts

@@ -1,17 +1,22 @@
 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";
+import type { TimestampValueType } from "./timestamp-value.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 fromTimestampValue(timestamp: TimestampValueType): Month {
+    return Month.fromTimestamp(TimestampVO.fromValue(timestamp));
+  }
+
+  static fromNow(now: TimestampVO): Month {
     return Month.fromTimestamp(now);
   }
 
@@ -20,11 +25,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 +41,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,22 @@
 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";
+import type { TimestampValueType } from "./timestamp-value.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 fromTimestampValue(timestamp: TimestampValueType): Quarter {
+    return Quarter.fromTimestamp(TimestampVO.fromValue(timestamp));
+  }
+
+  static fromNow(now: TimestampVO): Quarter {
     return Quarter.fromTimestamp(now);
   }
 
@@ -20,12 +25,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,22 @@
 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 type { TimestampValueType } from "./timestamp-value.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 fromTimestampValue(timestamp: TimestampValueType): Week {
+    return Week.fromTimestamp(TimestampVO.fromValue(timestamp));
+  }
+
+  static fromNow(now: TimestampVO): Week {
     return Week.fromTimestamp(now);
   }
 
@@ -21,12 +26,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 +45,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 {