@timothyw/pat-common 1.0.45 → 1.0.47

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

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

package/dist/types/api/habits/create-habit-entry-types.js

@@ -4,6 +4,6 @@ exports.createHabitEntryRequestSchema = void 0;
 const zod_1 = require("zod");
 const misc_types_1 = require("../../misc-types");
 exports.createHabitEntryRequestSchema = zod_1.z.object({
-    date: misc_types_1.dateSchema,
+    dateString: misc_types_1.dateStringSchema,
     status: zod_1.z.enum(['completed', 'excused'])
 });

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

@@ -2,7 +2,7 @@ import { z } from "zod";
 export type DateString = string & {
     readonly __brand: "DateString";
 };
-export declare const dateSchema: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Date, string>;
+export declare const dateStringSchema: 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/misc-types.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dateSchema = void 0;
+exports.dateStringSchema = void 0;
 const zod_1 = require("zod");
-exports.dateSchema = zod_1.z.string()
+exports.dateStringSchema = zod_1.z.string()
     .refine(val => !isNaN(Date.parse(val)), {
     message: "Invalid date string",
 })

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toHabit = exports.HabitEntryStatus = exports.HabitFrequency = void 0;
+const utils_1 = require("../../utils");
 var HabitFrequency;
 (function (HabitFrequency) {
     HabitFrequency["DAILY"] = "daily";
@@ -17,13 +18,13 @@ var HabitEntryStatus;
 const toHabit = (data, entries, stats) => {
     return {
         ...data,
-        createdAt: data.createdAt.toISOString(),
-        updatedAt: data.updatedAt.toISOString(),
+        createdAt: (0, utils_1.toDateString)(data.createdAt),
+        updatedAt: (0, utils_1.toDateString)(data.updatedAt),
         entries: entries.map(entry => ({
             ...entry,
-            date: entry.date.toISOString(),
-            createdAt: entry.createdAt.toISOString(),
-            updatedAt: entry.updatedAt.toISOString()
+            date: (0, utils_1.toDateString)(entry.date),
+            createdAt: (0, utils_1.toDateString)(entry.createdAt),
+            updatedAt: (0, utils_1.toDateString)(entry.updatedAt)
         })),
         stats
     };

package/dist/utils/date-utils.d.ts

@@ -1,2 +1,3 @@
 import { DateString } from "../types";
 export declare const toDateString: (date: Date) => DateString;
+export declare const fromDateString: (dateString: DateString) => Date;

package/dist/utils/date-utils.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toDateString = void 0;
+exports.fromDateString = exports.toDateString = void 0;
 const toDateString = (date) => {
     return date.toISOString();
 };
 exports.toDateString = toDateString;
+const fromDateString = (dateString) => {
+    return new Date(dateString);
+};
+exports.fromDateString = fromDateString;

package/package.json

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

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

@@ -1,14 +1,14 @@
 import { z } from "zod";
-import { dateSchema, DateString } from "../../misc-types";
 import { Habit } from "../../models";
+import { DateString, dateStringSchema } from "../../misc-types";
 
 export const createHabitEntryRequestSchema = z.object({
-    date: dateSchema,
+    dateString: dateStringSchema,
     status: z.enum(['completed', 'excused'])
 });
 
 export interface CreateHabitEntryRequest {
-    date: DateString;
+    dateString: DateString;
     status: 'completed' | 'excused';
 }
 

package/src/types/misc-types.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
 
 export type DateString = string & { readonly __brand: "DateString" };
-export const dateSchema = z.string()
+
+export const dateStringSchema = z.string()
     .refine(val => !isNaN(Date.parse(val)), {
         message: "Invalid date string",
     })

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

@@ -1,4 +1,5 @@
-import { DateString, ToDateString } from "../misc-types";
+import { ToDateString } from "../misc-types";
+import { toDateString } from "../../utils";
 
 export enum HabitFrequency {
     DAILY = 'daily',
@@ -51,13 +52,13 @@ export type Habit = ToDateString<HabitData> & {
 export const toHabit = (data: HabitData, entries: HabitEntryData[], stats: HabitStats): Habit => {
     return {
         ...data,
-        createdAt: data.createdAt.toISOString() as DateString,
-        updatedAt: data.updatedAt.toISOString() as DateString,
+        createdAt: toDateString(data.createdAt),
+        updatedAt: toDateString(data.updatedAt),
         entries: entries.map(entry => ({
             ...entry,
-            date: entry.date.toISOString() as DateString,
-            createdAt: entry.createdAt.toISOString() as DateString,
-            updatedAt: entry.updatedAt.toISOString() as DateString
+            date: toDateString(entry.date),
+            createdAt: toDateString(entry.createdAt),
+            updatedAt: toDateString(entry.updatedAt)
         })),
         stats
     };

package/src/utils/date-utils.ts

@@ -2,4 +2,8 @@ import { DateString } from "../types";
 
 export const toDateString = (date: Date): DateString => {
     return date.toISOString() as DateString;
+}
+
+export const fromDateString = (dateString: DateString): Date => {
+    return new Date(dateString);
 }