Add optimized year, week key, quarter. Add cached version wrapper

src/cache.ts

@@ -0,0 +1,28 @@
+import { DateTime } from "luxon";
+import { IfValid, isValid } from "./helpers";
+
+export function getCachedFor(
+  fn: <IsValid extends boolean>(
+    date: DateTime<IsValid>,
+  ) => IfValid<IsValid, number>,
+) {
+  const cache = new Map<string, number>();
+
+  return <IsValid extends boolean>(
+    date: DateTime<IsValid>,
+  ): IfValid<IsValid, number> => {
+    if (!isValid(date)) {
+      return null as IfValid<IsValid, number>;
+    }
+
+    const key = date.toISODate() as string;
+    const cachedValue = cache.get(key);
+    if (cachedValue) {
+      return cachedValue as IfValid<IsValid, number>;
+    }
+
+    const value = fn(date);
+    cache.set(key, value);
+    return value as IfValid<IsValid, number>;
+  };
+}

src/index.ts

@@ -1,4 +1,5 @@
 export { DateTime, Interval } from "luxon";
+export * from "./cache";
 export * from "./calendar";
 export * from "./format";
 export * from "./interval";

src/quarter.ts

@@ -14,11 +14,7 @@ export function getBroadcastQuarter<IsValid extends boolean>(
     return null as IfValid<IsValid, number>;
   }
 
-  const quarterLength = 13;
-  return Math.min(Math.ceil(week / quarterLength), 4) as IfValid<
-    IsValid,
-    number
-  >;
+  return Math.ceil(date.endOf("week").month / 3) as IfValid<IsValid, number>;
 }
 
 /**
@@ -27,11 +23,12 @@ export function getBroadcastQuarter<IsValid extends boolean>(
 export function getBroadcastQuarterWeek<IsValid extends boolean>(
   date: DateTime<IsValid>,
 ): IfValid<IsValid, [number, number]> {
-  const week = getBroadcastWeek(date);
-  if (!isValid(date) || week === null) {
+  if (!isValid(date)) {
     return null as IfValid<IsValid, [number, number]>;
   }
 
+  const week = getBroadcastWeek(date);
+
   const quarterLength = 13;
   const quarter = Math.min(Math.ceil(week / quarterLength), 4);
   return [quarter, week] as IfValid<IsValid, [number, number]>;

src/weekKey.ts

@@ -1,6 +1,6 @@
 import type { DateTime } from "luxon";
 import { getBroadcastWeek } from "./week";
-import { IfValid } from "./helpers";
+import { IfValid, isValid } from "./helpers";
 import { getBroadcastYear } from "./year";
 
 /**
@@ -9,12 +9,12 @@ import { getBroadcastYear } from "./year";
 export function getBroadcastWeekKey<IsValid extends boolean>(
   date: DateTime<IsValid>,
 ): IfValid<IsValid, number> {
-  const broadcastYear = getBroadcastYear(date);
-  const broadcastWeek = getBroadcastWeek(date);
-
-  if (broadcastYear === null || broadcastWeek === null) {
+  if (!isValid(date)) {
     return null as IfValid<IsValid, number>;
   }
 
+  const broadcastYear = getBroadcastYear(date);
+  const broadcastWeek = getBroadcastWeek(date);
+
   return (broadcastYear * 100 + broadcastWeek) as IfValid<IsValid, number>;
 }

src/year.ts

@@ -1,6 +1,5 @@
 import { DateTime } from "luxon";
 
-import { getBroadcastYearInterval } from "./interval";
 import { IfValid, isValid } from "./helpers";
 
 /**
@@ -9,11 +8,9 @@ import { IfValid, isValid } from "./helpers";
 export function getBroadcastYear<IsValid extends boolean>(
   date: DateTime<IsValid>,
 ): IfValid<IsValid, number> {
-  const yearInterval = getBroadcastYearInterval(date);
-
-  if (!(yearInterval && isValid(yearInterval.end))) {
+  if (!isValid(date)) {
     return null as IfValid<IsValid, number>;
   }
 
-  return yearInterval.end.get("year") as IfValid<IsValid, number>;
+  return date.endOf("week").year as unknown as IfValid<IsValid, number>;
 }