@timothyw/pat-common 1.0.9 → 1.0.10

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

@@ -1,9 +1,10 @@
 import { z } from "zod";
+import { UserConfig } from "../../models";
 export declare const updateUserConfigRequestSchema: z.ZodObject<{
-    name: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    timezone: z.ZodOptional<z.ZodNullable<z.ZodEffects<z.ZodString, string, string>>>;
-    discordID: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    itemListTracking: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+    name: z.ZodOptional<z.ZodString>;
+    timezone: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    discordID: z.ZodOptional<z.ZodOptional<z.ZodString>>;
+    itemListTracking: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         channelId: z.ZodString;
         messageId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
@@ -13,8 +14,8 @@ export declare const updateUserConfigRequestSchema: z.ZodObject<{
         channelId: string;
         messageId: string;
     }>>>;
-    iosApp: z.ZodOptional<z.ZodNullable<z.ZodObject<{
-        panels: z.ZodOptional<z.ZodArray<z.ZodObject<{
+    iosApp: z.ZodOptional<z.ZodObject<{
+        panels: z.ZodArray<z.ZodObject<{
             type: z.ZodEnum<["agenda", "tasks", "inbox", "people", "settings"]>;
             visible: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
@@ -23,65 +24,63 @@ export declare const updateUserConfigRequestSchema: z.ZodObject<{
         }, {
             type: "agenda" | "tasks" | "inbox" | "people" | "settings";
             visible: boolean;
-        }>, "many">>;
-        itemCategories: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-        itemTypes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-        propertyKeys: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        }>, "many">;
+        itemCategories: z.ZodArray<z.ZodString, "many">;
+        itemTypes: z.ZodArray<z.ZodString, "many">;
+        propertyKeys: z.ZodArray<z.ZodString, "many">;
     }, "strip", z.ZodTypeAny, {
-        panels?: {
+        panels: {
             type: "agenda" | "tasks" | "inbox" | "people" | "settings";
             visible: boolean;
-        }[] | undefined;
-        itemCategories?: string[] | undefined;
-        itemTypes?: string[] | undefined;
-        propertyKeys?: string[] | undefined;
+        }[];
+        itemCategories: string[];
+        itemTypes: string[];
+        propertyKeys: string[];
     }, {
-        panels?: {
+        panels: {
             type: "agenda" | "tasks" | "inbox" | "people" | "settings";
             visible: boolean;
-        }[] | undefined;
-        itemCategories?: string[] | undefined;
-        itemTypes?: string[] | undefined;
-        propertyKeys?: string[] | undefined;
-    }>>>;
+        }[];
+        itemCategories: string[];
+        itemTypes: string[];
+        propertyKeys: string[];
+    }>>;
 }, "strict", z.ZodTypeAny, {
-    name?: string | null | undefined;
-    timezone?: string | null | undefined;
-    discordID?: string | null | undefined;
+    name?: string | undefined;
+    timezone?: string | undefined;
+    discordID?: string | undefined;
     itemListTracking?: {
         channelId: string;
         messageId: string;
-    } | null | undefined;
+    } | undefined;
     iosApp?: {
-        panels?: {
+        panels: {
             type: "agenda" | "tasks" | "inbox" | "people" | "settings";
             visible: boolean;
-        }[] | undefined;
-        itemCategories?: string[] | undefined;
-        itemTypes?: string[] | undefined;
-        propertyKeys?: string[] | undefined;
-    } | null | undefined;
+        }[];
+        itemCategories: string[];
+        itemTypes: string[];
+        propertyKeys: string[];
+    } | undefined;
 }, {
-    name?: string | null | undefined;
-    timezone?: string | null | undefined;
-    discordID?: string | null | undefined;
+    name?: string | undefined;
+    timezone?: string | undefined;
+    discordID?: string | undefined;
     itemListTracking?: {
         channelId: string;
         messageId: string;
-    } | null | undefined;
+    } | undefined;
     iosApp?: {
-        panels?: {
+        panels: {
             type: "agenda" | "tasks" | "inbox" | "people" | "settings";
             visible: boolean;
-        }[] | undefined;
-        itemCategories?: string[] | undefined;
-        itemTypes?: string[] | undefined;
-        propertyKeys?: string[] | undefined;
-    } | null | undefined;
+        }[];
+        itemCategories: string[];
+        itemTypes: string[];
+        propertyKeys: string[];
+    } | undefined;
 }>;
 export type UpdateUserConfigRequest = z.infer<typeof updateUserConfigRequestSchema>;
 export interface UpdateUserConfigResponse {
-    user: UpdateUserConfigRequest & {
-        id: string;
-    };
+    user: UserConfig;
 }

package/dist/types/api/account/update-user-config-types.js

@@ -1,35 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateUserConfigRequestSchema = void 0;
-const zod_1 = require("zod");
-const panels_1 = require("../../panels");
-exports.updateUserConfigRequestSchema = zod_1.z.object({
-    name: zod_1.z.string().min(1).nullish(),
-    timezone: zod_1.z.string()
-        .refine((tz) => {
-        try {
-            Intl.DateTimeFormat(undefined, { timeZone: tz });
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    }, {
-        message: "Invalid timezone"
-    })
-        .nullish(),
-    discordID: zod_1.z.string().nullish(),
-    itemListTracking: zod_1.z.object({
-        channelId: zod_1.z.string(),
-        messageId: zod_1.z.string()
-    }).nullish(),
-    iosApp: zod_1.z.object({
-        panels: zod_1.z.array(zod_1.z.object({
-            type: zod_1.z.enum(panels_1.PANEL_TYPES),
-            visible: zod_1.z.boolean()
-        })).optional(),
-        itemCategories: zod_1.z.array(zod_1.z.string()).optional(),
-        itemTypes: zod_1.z.array(zod_1.z.string()).optional(),
-        propertyKeys: zod_1.z.array(zod_1.z.string()).optional()
-    }).nullish()
-}).strict();
+const models_1 = require("../../models");
+exports.updateUserConfigRequestSchema = models_1.userConfigSchema
+    .omit({ _id: true, createdAt: true, updatedAt: true })
+    .partial()
+    .strict();
+const test = null;
+test.iosApp;

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, {
-    name?: string | undefined;
     type?: string | null | undefined;
+    name?: string | undefined;
     dueDate?: string | null | undefined;
     notes?: string | undefined;
     urgent?: boolean | undefined;
     category?: string | null | undefined;
 }, {
-    name?: string | undefined;
     type?: string | null | undefined;
+    name?: string | undefined;
     dueDate?: string | null | undefined;
     notes?: string | undefined;
     urgent?: boolean | undefined;

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

@@ -1,15 +1,21 @@
+import { z } from "zod";
+export declare const userIdSchema: z.ZodEffects<z.ZodString, UserId, string>;
 export type UserId = string & {
-    readonly __brand: unique symbol;
+    readonly __brand: "UserId";
 };
+export declare const authIdSchema: z.ZodEffects<z.ZodString, AuthId, string>;
 export type AuthId = string & {
-    readonly __brand: unique symbol;
+    readonly __brand: "AuthId";
 };
+export declare const itemIdSchema: z.ZodEffects<z.ZodString, ItemId, string>;
 export type ItemId = string & {
-    readonly __brand: unique symbol;
+    readonly __brand: "ItemId";
 };
+export declare const personIdSchema: z.ZodEffects<z.ZodString, PersonId, string>;
 export type PersonId = string & {
-    readonly __brand: unique symbol;
+    readonly __brand: "PersonId";
 };
+export declare const thoughtIdSchema: z.ZodEffects<z.ZodString, ThoughtId, string>;
 export type ThoughtId = string & {
-    readonly __brand: unique symbol;
+    readonly __brand: "ThoughtId";
 };

package/dist/types/id-types.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.thoughtIdSchema = exports.personIdSchema = exports.itemIdSchema = exports.authIdSchema = exports.userIdSchema = void 0;
+const zod_1 = require("zod");
+exports.userIdSchema = zod_1.z.string().transform((val) => val);
+exports.authIdSchema = zod_1.z.string().transform((val) => val);
+exports.itemIdSchema = zod_1.z.string().transform((val) => val);
+exports.personIdSchema = zod_1.z.string().transform((val) => val);
+exports.thoughtIdSchema = zod_1.z.string().transform((val) => val);

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

@@ -1,24 +1,106 @@
-import { PanelType } from "../panels";
+import { z } from "zod";
 import { UserId } from "../id-types";
-export interface Panel {
-    type: PanelType;
+declare const panelSchema: z.ZodObject<{
+    type: z.ZodEnum<["agenda", "tasks", "inbox", "people", "settings"]>;
+    visible: z.ZodBoolean;
+}, "strip", z.ZodTypeAny, {
+    type: "agenda" | "tasks" | "inbox" | "people" | "settings";
     visible: boolean;
-}
-export interface UserConfig {
-    _id: UserId;
+}, {
+    type: "agenda" | "tasks" | "inbox" | "people" | "settings";
+    visible: boolean;
+}>;
+export type Panel = z.infer<typeof panelSchema>;
+export declare const userConfigSchema: z.ZodObject<{
+    _id: z.ZodEffects<z.ZodString, UserId, string>;
+    createdAt: z.ZodDate;
+    updatedAt: z.ZodDate;
+    name: z.ZodString;
+    timezone: z.ZodEffects<z.ZodString, string, string>;
+    discordID: z.ZodOptional<z.ZodString>;
+    itemListTracking: z.ZodOptional<z.ZodObject<{
+        channelId: z.ZodString;
+        messageId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        channelId: string;
+        messageId: string;
+    }, {
+        channelId: string;
+        messageId: string;
+    }>>;
+    iosApp: z.ZodObject<{
+        panels: z.ZodArray<z.ZodObject<{
+            type: z.ZodEnum<["agenda", "tasks", "inbox", "people", "settings"]>;
+            visible: z.ZodBoolean;
+        }, "strip", z.ZodTypeAny, {
+            type: "agenda" | "tasks" | "inbox" | "people" | "settings";
+            visible: boolean;
+        }, {
+            type: "agenda" | "tasks" | "inbox" | "people" | "settings";
+            visible: boolean;
+        }>, "many">;
+        itemCategories: z.ZodArray<z.ZodString, "many">;
+        itemTypes: z.ZodArray<z.ZodString, "many">;
+        propertyKeys: z.ZodArray<z.ZodString, "many">;
+    }, "strip", z.ZodTypeAny, {
+        panels: {
+            type: "agenda" | "tasks" | "inbox" | "people" | "settings";
+            visible: boolean;
+        }[];
+        itemCategories: string[];
+        itemTypes: string[];
+        propertyKeys: string[];
+    }, {
+        panels: {
+            type: "agenda" | "tasks" | "inbox" | "people" | "settings";
+            visible: boolean;
+        }[];
+        itemCategories: string[];
+        itemTypes: string[];
+        propertyKeys: string[];
+    }>;
+}, "strip", z.ZodTypeAny, {
+    _id: string & {
+        readonly __brand: "UserId";
+    };
     createdAt: Date;
     updatedAt: Date;
     name: string;
     timezone: string;
-    discordID?: string;
+    iosApp: {
+        panels: {
+            type: "agenda" | "tasks" | "inbox" | "people" | "settings";
+            visible: boolean;
+        }[];
+        itemCategories: string[];
+        itemTypes: string[];
+        propertyKeys: string[];
+    };
+    discordID?: string | undefined;
     itemListTracking?: {
         channelId: string;
         messageId: string;
-    };
+    } | undefined;
+}, {
+    _id: string;
+    createdAt: Date;
+    updatedAt: Date;
+    name: string;
+    timezone: string;
     iosApp: {
-        panels: Panel[];
+        panels: {
+            type: "agenda" | "tasks" | "inbox" | "people" | "settings";
+            visible: boolean;
+        }[];
         itemCategories: string[];
         itemTypes: string[];
         propertyKeys: string[];
     };
-}
+    discordID?: string | undefined;
+    itemListTracking?: {
+        channelId: string;
+        messageId: string;
+    } | undefined;
+}>;
+export type UserConfig = z.infer<typeof userConfigSchema>;
+export {};

package/dist/types/models/user-config.js

@@ -1,2 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.userConfigSchema = void 0;
+const panels_1 = require("../panels");
+const zod_1 = require("zod");
+const id_types_1 = require("../id-types");
+const panelSchema = zod_1.z.object({
+    type: zod_1.z.enum(panels_1.PANEL_TYPES),
+    visible: zod_1.z.boolean()
+});
+// export interface Panel {
+//     type: PanelType;
+//     visible: boolean;
+// }
+exports.userConfigSchema = zod_1.z.object({
+    _id: id_types_1.userIdSchema,
+    createdAt: zod_1.z.date(),
+    updatedAt: zod_1.z.date(),
+    name: zod_1.z.string().min(1),
+    timezone: zod_1.z.string().refine((tz) => {
+        try {
+            Intl.DateTimeFormat(undefined, { timeZone: tz });
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }, { message: "Invalid timezone" }),
+    discordID: zod_1.z.string().optional(),
+    itemListTracking: zod_1.z.object({
+        channelId: zod_1.z.string(),
+        messageId: zod_1.z.string()
+    }).optional(),
+    iosApp: zod_1.z.object({
+        panels: zod_1.z.array(panelSchema),
+        itemCategories: zod_1.z.array(zod_1.z.string()),
+        itemTypes: zod_1.z.array(zod_1.z.string()),
+        propertyKeys: zod_1.z.array(zod_1.z.string())
+    })
+});
+// export interface UserConfig {
+//     _id: UserId;
+//     createdAt: Date;
+//     updatedAt: Date;
+//
+//     name: string;
+//     timezone: string;
+//     discordID?: string;
+//     itemListTracking?: {
+//         channelId: string;
+//         messageId: string;
+//     };
+//     iosApp: {
+//         panels: Panel[];
+//         itemCategories: string[];
+//         itemTypes: string[];
+//         propertyKeys: string[];
+//     };
+// }

package/package.json

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

package/src/types/api/account/update-user-config-types.ts

@@ -1,40 +1,17 @@
 import { z } from "zod";
-import { PANEL_TYPES } from "../../panels";
+import { UserId } from "../../id-types";
+import { UserConfig, userConfigSchema } from "../../models";
 
-export const updateUserConfigRequestSchema = z.object({
-    name: z.string().min(1).nullish(),
-    timezone: z.string()
-        .refine((tz: string) => {
-            try {
-                Intl.DateTimeFormat(undefined, { timeZone: tz });
-                return true;
-            } catch (e) {
-                return false;
-            }
-        }, {
-            message: "Invalid timezone"
-        })
-        .nullish(),
-    discordID: z.string().nullish(),
-    itemListTracking: z.object({
-        channelId: z.string(),
-        messageId: z.string()
-    }).nullish(),
-    iosApp: z.object({
-        panels: z.array(z.object({
-            type: z.enum(PANEL_TYPES),
-            visible: z.boolean()
-        })).optional(),
-        itemCategories: z.array(z.string()).optional(),
-        itemTypes: z.array(z.string()).optional(),
-        propertyKeys: z.array(z.string()).optional()
-    }).nullish()
-}).strict();
+export const updateUserConfigRequestSchema = userConfigSchema
+    .omit({ _id: true, createdAt: true, updatedAt: true })
+    .partial()
+    .strict();
 
 export type UpdateUserConfigRequest = z.infer<typeof updateUserConfigRequestSchema>;
 
+const test: UpdateUserConfigRequest | null = null;
+test!.iosApp
+
 export interface UpdateUserConfigResponse {
-    user: UpdateUserConfigRequest & {
-        id: string;
-    };
+    user: UserConfig
 }

package/src/types/id-types.ts

@@ -1,6 +1,16 @@
-export type UserId = string & { readonly __brand: unique symbol };
-export type AuthId = string & { readonly __brand: unique symbol };
+import { z } from "zod";
 
-export type ItemId = string & { readonly __brand: unique symbol };
-export type PersonId = string & { readonly __brand: unique symbol };
-export type ThoughtId = string & { readonly __brand: unique symbol };
+export const userIdSchema = z.string().transform((val): UserId => val as UserId);
+export type UserId = string & { readonly __brand: "UserId" };
+
+export const authIdSchema = z.string().transform((val): AuthId => val as AuthId);
+export type AuthId = string & { readonly __brand: "AuthId" };
+
+export const itemIdSchema = z.string().transform((val): ItemId => val as ItemId);
+export type ItemId = string & { readonly __brand: "ItemId" };
+
+export const personIdSchema = z.string().transform((val): PersonId => val as PersonId);
+export type PersonId = string & { readonly __brand: "PersonId" };
+
+export const thoughtIdSchema = z.string().transform((val): ThoughtId => val as ThoughtId);
+export type ThoughtId = string & { readonly __brand: "ThoughtId" };

package/src/types/models/user-config.ts

@@ -1,27 +1,63 @@
-import { PanelType } from "../panels";
-import { UserId } from "../id-types";
+import { PANEL_TYPES, PanelType } from "../panels";
+import { z } from "zod";
+import { AuthId, UserId, userIdSchema } from "../id-types";
 
-export interface Panel {
-    type: PanelType;
-    visible: boolean;
-}
+const panelSchema = z.object({
+    type: z.enum(PANEL_TYPES),
+    visible: z.boolean()
+});
 
-export interface UserConfig {
-    _id: UserId;
-    createdAt: Date;
-    updatedAt: Date;
+export type Panel = z.infer<typeof panelSchema>;
 
-    name: string;
-    timezone: string;
-    discordID?: string;
-    itemListTracking?: {
-        channelId: string;
-        messageId: string;
-    };
-    iosApp: {
-        panels: Panel[];
-        itemCategories: string[];
-        itemTypes: string[];
-        propertyKeys: string[];
-    };
-}
+// export interface Panel {
+//     type: PanelType;
+//     visible: boolean;
+// }
+
+export const userConfigSchema = z.object({
+    _id: userIdSchema,
+    createdAt: z.date(),
+    updatedAt: z.date(),
+    name: z.string().min(1),
+    timezone: z.string().refine((tz: string) => {
+        try {
+            Intl.DateTimeFormat(undefined, { timeZone: tz });
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }, { message: "Invalid timezone" }),
+    discordID: z.string().optional(),
+    itemListTracking: z.object({
+        channelId: z.string(),
+        messageId: z.string()
+    }).optional(),
+    iosApp: z.object({
+        panels: z.array(panelSchema),
+        itemCategories: z.array(z.string()),
+        itemTypes: z.array(z.string()),
+        propertyKeys: z.array(z.string())
+    })
+});
+
+export type UserConfig = z.infer<typeof userConfigSchema>;
+
+// export interface UserConfig {
+//     _id: UserId;
+//     createdAt: Date;
+//     updatedAt: Date;
+//
+//     name: string;
+//     timezone: string;
+//     discordID?: string;
+//     itemListTracking?: {
+//         channelId: string;
+//         messageId: string;
+//     };
+//     iosApp: {
+//         panels: Panel[];
+//         itemCategories: string[];
+//         itemTypes: string[];
+//         propertyKeys: string[];
+//     };
+// }