@timothyw/pat-common 1.0.42 → 1.0.45

package/dist/types/api/account/update-user-types.d.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { UserData } from "../../models";
 export declare const updateUserRequestSchema: z.ZodObject<{
+    name: z.ZodOptional<z.ZodString>;
     sandbox: z.ZodOptional<z.ZodObject<{
         discordId: z.ZodOptional<z.ZodOptional<z.ZodString>>;
         devices: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -21,7 +22,6 @@ export declare const updateUserRequestSchema: z.ZodObject<{
             pushToken?: string | undefined;
         }[] | undefined;
     }>>;
-    name: z.ZodOptional<z.ZodString>;
     timezone: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     config: z.ZodOptional<z.ZodObject<{
         modules: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -77,13 +77,13 @@ export declare const updateUserRequestSchema: z.ZodObject<{
         }[] | undefined;
     }>>;
 }, "strict", z.ZodTypeAny, {
+    name?: string | undefined;
     sandbox?: {
         discordId?: string | undefined;
         devices?: {
             pushToken?: string | undefined;
         }[] | undefined;
     } | undefined;
-    name?: string | undefined;
     timezone?: string | undefined;
     config?: {
         agenda?: {
@@ -99,13 +99,13 @@ export declare const updateUserRequestSchema: z.ZodObject<{
         }[] | undefined;
     } | undefined;
 }, {
+    name?: string | undefined;
     sandbox?: {
         discordId?: string | undefined;
         devices?: {
             pushToken?: string | undefined;
         }[] | undefined;
     } | undefined;
-    name?: string | undefined;
     timezone?: string | undefined;
     config?: {
         agenda?: {

package/dist/types/api/habits/create-habit-entry-types.d.ts

@@ -1,20 +1,20 @@
 import { z } from "zod";
 import { DateString } from "../../misc-types";
-import { HabitWithEntries } from "../../models";
+import { Habit } from "../../models";
 export declare const createHabitEntryRequestSchema: z.ZodObject<{
     date: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Date, string>;
     status: z.ZodEnum<["completed", "excused"]>;
 }, "strip", z.ZodTypeAny, {
-    status: "completed" | "excused";
     date: Date;
-}, {
     status: "completed" | "excused";
+}, {
     date: string;
+    status: "completed" | "excused";
 }>;
 export interface CreateHabitEntryRequest {
     date: DateString;
     status: 'completed' | 'excused';
 }
 export interface CreateHabitEntryResponse {
-    habit: HabitWithEntries;
+    habit: Habit;
 }

package/dist/types/api/habits/create-habit-types.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { HabitWithEntries } from "../../models/habit-data";
+import { Habit } from "../../models/habit-data";
 export declare const createHabitRequestSchema: z.ZodObject<{
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
@@ -23,5 +23,5 @@ export interface CreateHabitRequest {
     rolloverTime: string;
 }
 export interface CreateHabitResponse {
-    habit: HabitWithEntries;
+    habit: Habit;
 }

package/dist/types/api/habits/delete-habit-entry-types.d.ts

@@ -1,4 +1,4 @@
-import { HabitWithEntries } from "../../models/habit-data";
+import { Habit } from "../../models/habit-data";
 export interface DeleteHabitEntryResponse {
-    habit: HabitWithEntries;
+    habit: Habit;
 }

package/dist/types/api/habits/get-habits-types.d.ts

@@ -1,4 +1,4 @@
-import { HabitWithEntries } from "../../models/habit-data";
+import { Habit } from "../../models/habit-data";
 export interface GetHabitsResponse {
-    habits: HabitWithEntries[];
+    habits: Habit[];
 }

package/dist/types/api/habits/update-habit-types.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { HabitWithEntries } from "../../models/habit-data";
+import { Habit } from "../../models";
 export declare const updateHabitRequestSchema: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     description: z.ZodOptional<z.ZodString>;
@@ -23,5 +23,5 @@ export interface UpdateHabitRequest {
     rolloverTime?: string;
 }
 export interface UpdateHabitResponse {
-    habit: HabitWithEntries;
+    habit: Habit;
 }

package/dist/types/api/items/update-item-types.d.ts

@@ -7,15 +7,15 @@ export declare const updateItemRequestSchema: z.ZodObject<{
     category: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     type: z.ZodOptional<z.ZodNullable<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
-    type?: string | null | undefined;
     name?: string | undefined;
+    type?: string | null | undefined;
     dueDate?: string | null | undefined;
     notes?: string | undefined;
     urgent?: boolean | undefined;
     category?: string | null | undefined;
 }, {
-    type?: string | null | undefined;
     name?: string | undefined;
+    type?: string | null | undefined;
     dueDate?: string | null | undefined;
     notes?: string | undefined;
     urgent?: boolean | undefined;

package/dist/types/misc-types.d.ts

@@ -3,3 +3,6 @@ export type DateString = string & {
     readonly __brand: "DateString";
 };
 export declare const dateSchema: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Date, string>;
+export type ToDateString<T> = {
+    [K in keyof T]: T[K] extends Date ? DateString : T[K] extends Array<infer U> ? Array<ToDateString<U>> : T[K] extends object ? ToDateString<T[K]> : T[K];
+};

package/dist/types/models/habit-data.d.ts

@@ -1,3 +1,4 @@
+import { ToDateString } from "../misc-types";
 export declare enum HabitFrequency {
     DAILY = "daily",
     WEEKLY = "weekly",
@@ -34,7 +35,9 @@ export interface HabitStats {
     missedDays: number;
     completionRate: number;
 }
-export interface HabitWithEntries extends HabitData {
-    entries: HabitEntryData[];
+export type HabitEntry = ToDateString<HabitEntryData>;
+export type Habit = ToDateString<HabitData> & {
+    entries: HabitEntry[];
     stats: HabitStats;
-}
+};
+export declare const toHabit: (data: HabitData, entries: HabitEntryData[], stats: HabitStats) => Habit;

package/dist/types/models/habit-data.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HabitEntryStatus = exports.HabitFrequency = void 0;
+exports.toHabit = exports.HabitEntryStatus = exports.HabitFrequency = void 0;
 var HabitFrequency;
 (function (HabitFrequency) {
     HabitFrequency["DAILY"] = "daily";
@@ -14,3 +14,18 @@ var HabitEntryStatus;
     HabitEntryStatus["COMPLETED"] = "completed";
     HabitEntryStatus["EXCUSED"] = "excused";
 })(HabitEntryStatus || (exports.HabitEntryStatus = HabitEntryStatus = {}));
+const toHabit = (data, entries, stats) => {
+    return {
+        ...data,
+        createdAt: data.createdAt.toISOString(),
+        updatedAt: data.updatedAt.toISOString(),
+        entries: entries.map(entry => ({
+            ...entry,
+            date: entry.date.toISOString(),
+            createdAt: entry.createdAt.toISOString(),
+            updatedAt: entry.updatedAt.toISOString()
+        })),
+        stats
+    };
+};
+exports.toHabit = toHabit;

package/dist/types/models/user-data.d.ts

@@ -95,13 +95,13 @@ export declare const userDataSchema: z.ZodObject<{
     };
     createdAt: Date;
     updatedAt: Date;
+    name: string;
     sandbox: {
         devices: {
             pushToken: string;
         }[];
         discordId?: string | undefined;
     };
-    name: string;
     timezone: string;
     config: {
         agenda: {
@@ -120,13 +120,13 @@ export declare const userDataSchema: z.ZodObject<{
     _id: string;
     createdAt: Date;
     updatedAt: Date;
+    name: string;
     sandbox: {
         devices: {
             pushToken: string;
         }[];
         discordId?: string | undefined;
     };
-    name: string;
     timezone: string;
     config: {
         agenda: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@timothyw/pat-common",
   "description": "",
   "author": "Timothy Washburn",
-  "version": "1.0.42",
+  "version": "1.0.45",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/types/api/habits/create-habit-entry-types.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { dateSchema, DateString } from "../../misc-types";
-import { HabitWithEntries } from "../../models";
+import { Habit } from "../../models";
 
 export const createHabitEntryRequestSchema = z.object({
     date: dateSchema,
@@ -13,5 +13,5 @@ export interface CreateHabitEntryRequest {
 }
 
 export interface CreateHabitEntryResponse {
-    habit: HabitWithEntries;
+    habit: Habit;
 }

package/src/types/api/habits/create-habit-types.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { HabitWithEntries } from "../../models/habit-data";
+import { Habit } from "../../models/habit-data";
 
 export const createHabitRequestSchema = z.object({
     name: z.string().min(1, 'Name is required').trim(),
@@ -16,5 +16,5 @@ export interface CreateHabitRequest {
 }
 
 export interface CreateHabitResponse {
-    habit: HabitWithEntries;
+    habit: Habit;
 }

package/src/types/api/habits/delete-habit-entry-types.ts

@@ -1,5 +1,5 @@
-import { HabitWithEntries } from "../../models/habit-data";
+import { Habit } from "../../models/habit-data";
 
 export interface DeleteHabitEntryResponse {
-    habit: HabitWithEntries;
+    habit: Habit;
 }

package/src/types/api/habits/get-habits-types.ts

@@ -1,5 +1,5 @@
-import { HabitWithEntries } from "../../models/habit-data";
+import { Habit } from "../../models/habit-data";
 
 export interface GetHabitsResponse {
-    habits: HabitWithEntries[];
+    habits: Habit[];
 }

package/src/types/api/habits/update-habit-types.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { HabitWithEntries } from "../../models/habit-data";
+import { Habit } from "../../models";
 
 export const updateHabitRequestSchema = z.object({
     name: z.string().min(1, 'Name is required').trim().optional(),
@@ -16,5 +16,5 @@ export interface UpdateHabitRequest {
 }
 
 export interface UpdateHabitResponse {
-    habit: HabitWithEntries;
+    habit: Habit;
 }

package/src/types/misc-types.ts

@@ -5,4 +5,14 @@ export const dateSchema = z.string()
     .refine(val => !isNaN(Date.parse(val)), {
         message: "Invalid date string",
     })
-    .transform(val => new Date(val));
+    .transform(val => new Date(val));
+
+export type ToDateString<T> = {
+    [K in keyof T]: T[K] extends Date
+        ? DateString
+        : T[K] extends Array<infer U>
+            ? Array<ToDateString<U>>
+            : T[K] extends object
+                ? ToDateString<T[K]>
+                : T[K];
+};

package/src/types/models/habit-data.ts

@@ -1,3 +1,5 @@
+import { DateString, ToDateString } from "../misc-types";
+
 export enum HabitFrequency {
     DAILY = 'daily',
     WEEKLY = 'weekly',
@@ -39,7 +41,24 @@ export interface HabitStats {
     completionRate: number;
 }
 
-export interface HabitWithEntries extends HabitData {
-    entries: HabitEntryData[];
+export type HabitEntry = ToDateString<HabitEntryData>;
+
+export type Habit = ToDateString<HabitData> & {
+    entries: HabitEntry[];
     stats: HabitStats;
+}
+
+export const toHabit = (data: HabitData, entries: HabitEntryData[], stats: HabitStats): Habit => {
+    return {
+        ...data,
+        createdAt: data.createdAt.toISOString() as DateString,
+        updatedAt: data.updatedAt.toISOString() as DateString,
+        entries: entries.map(entry => ({
+            ...entry,
+            date: entry.date.toISOString() as DateString,
+            createdAt: entry.createdAt.toISOString() as DateString,
+            updatedAt: entry.updatedAt.toISOString() as DateString
+        })),
+        stats
+    };
 }