feat!: add config to user model/type. Add types for contacts.

package.json

@@ -30,10 +30,6 @@
       "import": "./dist/schemas/index.js",
       "types": "./dist/schemas/index.d.ts"
     },
-    "./templates": {
-      "import": "./dist/templates/index.js",
-      "types": "./dist/templates/index.d.ts"
-    },
     "./i18n": {
       "import": "./dist/i18n/index.js",
       "types": "./dist/i18n/index.d.ts"

src/schemas/common.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { countryCodeSchema } from './i18n';
 
 const unsafeUuidSchema = z.string().uuid();
 export const userIdSchema = unsafeUuidSchema.brand('UserId').or(unsafeUuidSchema.brand('Uuid'));
@@ -9,16 +8,3 @@ export const emailSchema = z.string().email().brand('Email');
 export const idpIdSchema = z.string().brand('IdpId');
 export const dateTimeSchema = z.string().datetime().brand('DateTime');
 export const timeZoneSchema = z.string().brand('TimeZone');
-
-export const phoneSchema = z.object({
-  type: z.literal('phone'),
-  countryCode: countryCodeSchema,
-  phoneNumber: z.string().brand('PhoneNumber')
-});
-
-export const rcsSenderSchema = z.object({
-  type: z.literal('rcs'),
-  identifier: z.string().brand('RCSSenderId')
-});
-
-export const senderSchema = z.discriminatedUnion('type', [rcsSenderSchema, phoneSchema]);

src/schemas/contact.ts

@@ -0,0 +1,16 @@
+import { z } from 'zod';
+import { countryCodeSchema } from './i18n';
+
+export const phoneSchema = z.object({
+  type: z.literal('phone'),
+  countryCode: countryCodeSchema,
+  phoneNumber: z.string().brand('PhoneNumber')
+});
+
+export const rcsSenderSchema = z.object({
+  type: z.literal('rcs'),
+  identifier: z.string().brand('RCSSenderId')
+});
+
+export const senderSchema = z.discriminatedUnion('type', [rcsSenderSchema, phoneSchema]);
+export const receiverSchema = z.discriminatedUnion('type', [phoneSchema]);

src/schemas/index.ts

@@ -1,4 +1,4 @@
 export * from './calendar';
 export * from './common';
+export * from './contact';
 export * from './i18n';
-export * from './reminder';

src/schemas/reminder.ts

@@ -1,18 +1,11 @@
-import { templateSelectionSchema } from '@templates';
 import { z } from 'zod';
-import { calendarSchema } from './calendar';
-import { senderSchema } from './common';
+import { dateTimeSchema, timeZoneSchema } from './common';
+import { receiverSchema } from './contact';
 
-export const templateSchema = z.string().max(160).brand('InterpolatedTemplate');
-
-export const reminderConfigSchema = z.object({
-  calendars: z.array(calendarSchema.extend({ template: templateSelectionSchema })).min(1),
-  business: z.object({
-    name: z.string().min(1).brand('BusinessName'),
-    address: z.string().min(1).brand('BusinessAddress'),
-    senderContact: senderSchema
+export const demoReminderPayloadSchema = z.object({
+  receiverContact: receiverSchema,
+  startTime: z.object({
+    dateTime: dateTimeSchema,
+    timeZone: timeZoneSchema
   })
 });
-
-// This should really be defined in @types but this is an exception to resolve a circular dependency between @schemas, @templates and @types
-export type ReminderConfig = z.infer<typeof reminderConfigSchema>;

src/types/api/index.ts

@@ -1,4 +1,2 @@
 export type * from './authentication';
-export type * from './calendar';
 export type * from './responses';
-export type * from './user';

src/types/contact.ts

@@ -0,0 +1,7 @@
+import type { phoneSchema, rcsSenderSchema } from '@schemas';
+import type { z } from 'zod';
+
+export type PhoneContact = z.infer<typeof phoneSchema>;
+export type RCSSenderContact = z.infer<typeof rcsSenderSchema>;
+export type SenderContact = PhoneContact | RCSSenderContact;
+export type ReceiverContact = PhoneContact;

src/types/index.ts

@@ -1,4 +1,8 @@
 export type * from './api/index';
+export type * from './calendar';
 export type * from './common';
+export type * from './contact';
 export type * from './i18n';
+export * from './reminder';
 export type * from './template';
+export type * from './user';

src/templates/reminders/sms-rcs.ts → src/types/reminder.ts

@@ -1,6 +1,10 @@
-import type { BusinessAddress, BusinessName, Template, TemplateId, TemplateMap } from '@types';
+import { calendarSchema } from '@schemas/calendar';
+import { senderSchema } from '@schemas/contact';
+import type { demoReminderPayloadSchema } from '@schemas/reminder';
 import type { DateTime } from 'luxon';
 import { z } from 'zod';
+import type { BusinessAddress, BusinessName, TemplateId } from './common';
+import type { Template, TemplateMap } from './template';
 
 // Spanish
 const formalEs01: Template = {
@@ -84,3 +88,16 @@ const templateList = Object.values(templateMap).map((t) =>
 );
 
 export const templateSelectionSchema = z.union([templateList[0]!, templateList[1]!, ...templateList.slice(2)]);
+
+export const templateSchema = z.string().max(160).brand('InterpolatedTemplate');
+
+export const reminderConfigSchema = z.object({
+  calendars: z.array(calendarSchema.extend({ template: templateSelectionSchema })).min(1),
+  business: z.object({
+    name: z.string().min(1).brand('BusinessName'),
+    address: z.string().min(1).brand('BusinessAddress'),
+    senderContact: senderSchema
+  })
+});
+
+export type DemoReminderPayload = z.infer<typeof demoReminderPayloadSchema>;

src/types/api/user.ts → src/types/user.ts

@@ -1,4 +1,6 @@
-import type { Email, IdpId, UnixTimestamp, UserId } from '../common';
+import type { z } from 'zod';
+import type { Email, IdpId, UnixTimestamp, UserId } from './common';
+import type { reminderConfigSchema } from './reminder';
 
 // When time comes, append IdpName with | 'idpName2'
 export type IdpName = 'google.com';
@@ -15,8 +17,12 @@ export interface Identity<IdpName> extends BaseIdentity {
 
 export type UserStatus = 'banned' | 'onboarding' | 'live';
 
+// This should really be defined in @schemas but this is an exception to resolve a circular dependency between @schemas, @templates and @types
+export type ReminderConfig = z.infer<typeof reminderConfigSchema>;
+
 export interface User<TIdpName extends IdpName> extends Identity<TIdpName> {
   lastSignInAt: UnixTimestamp;
   signedUpAt: UnixTimestamp;
   userStatus: UserStatus;
+  config?: ReminderConfig;
 }