Optimise the transform object method

It now works with arrays The type is even better
Dlurak · Apr 10, 2024 · b51fbef · b51fbef
1 parent 1c73415
commit b51fbef
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/src/routes/calendar/list.ts b/src/routes/calendar/list.ts
@@ -124,11 +124,8 @@ export const listCalendar = new Elysia().use(HttpStatusCode()).get(
  return DATABASE_READ_FAILED;
  }
 
- // the type is incorrect ending is `CustomDate | null` not `Date | null`
- // Not in the mood to fix it rn
  const formatted = result.data.calendar.map((c) => ({
  ...replaceDateDeep(c, normalDateToCustom),
- tags: c.tags,
  updates: c.updates.map((u) => replaceDateDeep(u, (d) => d.getTime())),
  }));
 

diff --git a/src/routes/tags/delete.ts b/src/routes/tags/delete.ts
@@ -1,6 +1,6 @@
 import e from "@edgedb";
 import { DATABASE_DELETE_FAILED, UNAUTHORIZED } from "constants/responses";
-import Elysia, { t } from "elysia";
+import Elysia from "elysia";
 import { HttpStatusCode } from "elysia-http-status-code";
 import { client } from "index";
 import { auth } from "plugins/auth";

diff --git a/src/utils/objects/transform.ts b/src/utils/objects/transform.ts
@@ -1,11 +1,13 @@
 type Object = Record<string | number | symbol, unknown>;
 
+type FinalReturn<T, R> = T extends Object ? ConverDatesDeep<T, R> : T;
+
 type ConverDatesDeep<T extends Object, R> = {
- [K in keyof T]: T[K] extends Date
+ [K in keyof T]: Date extends T[K]
  ? R
- : T[K] extends Object
- ? ConverDatesDeep<T[K], R>
- : T[K];
+ : T[K] extends unknown[]
+ ? FinalReturn<T[K][number], R>
+ : FinalReturn<T[K], R>;
 };
 
 type DateCallback<T> = (val: Date) => T;
@@ -18,6 +20,8 @@ export const replaceDateDeep = <T extends Object, R>(
  const newPairs: [string, unknown][] = [];
  for (const [key, val] of pairs) {
  if (val instanceof Date) newPairs.push([key, callback(val)]);
+ else if (Array.isArray(val))
+ newPairs.push([key, val.map((i) => replaceDateDeep(i, callback))]);
  else if (typeof val === "object" && val)
  newPairs.push([key, replaceDateDeep(val as Object, callback)]);
  else newPairs.push([key, val]);

diff --git a/tests/objects/transform.test.ts b/tests/objects/transform.test.ts
@@ -20,6 +20,20 @@ describe("transform", () => {
  it("works recursively", () => {
  const obj = {
  date: new Date("2021-01-01"),
+ arrayStuff: [
+ {
+ date: new Date("2021-01-01"),
+ number: 1,
+ },
+ {
+ date: new Date("2021-01-01"),
+ number: 1,
+ },
+ {
+ date: new Date("2021-01-01"),
+ number: 1,
+ },
+ ],
  inner: {
  date: new Date("2021-01-01"),
  number: 1,
@@ -29,6 +43,20 @@ describe("transform", () => {
 
  expect(replaceDateWithTimestamp(obj)).toEqual({
  date: 1609459200000,
+ arrayStuff: [
+ {
+ date: 1609459200000,
+ number: 1,
+ },
+ {
+ date: 1609459200000,
+ number: 1,
+ },
+ {
+ date: 1609459200000,
+ number: 1,
+ },
+ ],
  inner: {
  date: 1609459200000,
  number: 1,