@bizmap/sdk 0.0.115 → 0.0.117

package/dist/main.js

@@ -75,7 +75,7 @@ var Timestamp = z5.iso.datetime();
 var InviteResponse = z5.enum(["accepted", "declined"]);
 var TimeLog = z5.object({
   createdAt: Timestamp.readonly(),
-  lastModified: Timestamp.nullish()
+  lastModified: Timestamp.optional()
 });
 var TicketNo = z5.int().positive().refine(
   (t) => t.toString().length <= 10,
@@ -145,26 +145,25 @@ var CompanyState = z7.object({
   }),
   credits: z7.object({
     current: z7.number(),
-    lastModified: Timestamp.nullable()
+    lastModified: Timestamp.optional()
   }),
   maxStaff: z7.object({
     current: z7.int().min(1),
-    lastModified: Timestamp.nullable()
+    lastModified: Timestamp.optional()
   }),
   usedStorageInBytes: z7.object({
     current: z7.number(),
-    lastModified: Timestamp.nullable()
+    lastModified: Timestamp.optional()
   }),
   /** Data retention period in months */
-  drpInMonths: z7.int().min(1),
+  // drpInMonths: z.int().min(1),
   /** A counter for the company's invoice no.
    * @note This should only be null when the cycle resets
    */
   invoiceNoCounter: z7.int().min(1),
   /**  A counter for the company's ticket no. */
   tktNoCounter: z7.int().min(1),
-  lastSavedAt: Timestamp.nullable(),
-  lastModified: Timestamp.nullable(),
+  lastModified: Timestamp.optional(),
   version: Version,
   createdAt: Timestamp
 });
@@ -190,7 +189,7 @@ var CompanyBilling = z8.object({
     }
   }),
   version: Version,
-  lastModified: Timestamp.nullable()
+  lastModified: Timestamp.optional()
 });
 var MutableCompanyBilling = CompanyBilling.omit({
   uid: true,
@@ -216,9 +215,7 @@ var getInvalidSectorError = (industry, sector) => `Invalid sector: "${sector}" i
 // src/schemas/company/components/Identity.ts
 var CompanyIdentity = z10.object({
   _id: CompanyState.shape._id,
-  alias: z10.string().trim().min(3).max(63).transform(
-    (data) => data.replace(/[^a-z1-9 ]/gi, "").replace(/\s+/g, " ")
-  ).superRefine((data, ctx) => {
+  alias: z10.string().trim().min(3).max(63).transform((data) => data.replace(/\s+/g, " ")).superRefine((data, ctx) => {
     const invalidCharIdx = data.search(/[^a-z1-9 ]/i);
     if (invalidCharIdx >= 0) {
       ctx.addIssue(
@@ -227,18 +224,18 @@ var CompanyIdentity = z10.object({
     }
   }),
   address: Address.optional(),
-  logo: z10.string().nullish(),
+  logo: z10.string().optional(),
   industry: CompanyIndustry.keyof().readonly(),
   sector: z10.string(),
   contact: z10.object({
-    email: z10.email().max(25),
+    email: z10.email().max(45),
     phoneNumber: PhoneNumber.optional(),
     emailVerified: z10.boolean()
   }),
   // Can only be changed by the server
   tier: z10.object({
     current: tiers,
-    lastModified: Timestamp.nullable()
+    lastModified: Timestamp.optional()
   }),
   isVerified: z10.boolean(),
   legal: z10.object({
@@ -248,7 +245,7 @@ var CompanyIdentity = z10.object({
     gctRegNo: z10.string().max(15).nullish()
   }).optional(),
   version: Version,
-  lastModified: Timestamp.nullable()
+  lastModified: Timestamp.optional()
 }).superRefine((data, ctx) => {
   const hasLegalInfo = "legal" in data;
   if (data.isVerified && !hasLegalInfo) {
@@ -403,10 +400,10 @@ var CompanyPreferences = z13.object({
    * @property RR (Round Robin): Even distribution.
    * @property LOR (Least Outstanding Requests): Distribute based on availability.
    */
-  apptDistAlg: appointmentDistAlgs.default("RR"),
+  apptDistAlg: appointmentDistAlgs,
   servicesDeployed: z13.boolean(),
   version: Version,
-  lastModified: Timestamp.nullable()
+  lastModified: Timestamp.optional()
 }).refine(
   (data) => !data.enforcePaidAppointments || data.enforcePaidAppointments && data.serviceSelector === "scheduler",
   'Enforcing paid appointments is only allowed when the service selector is the "scheduler".'
@@ -451,13 +448,13 @@ var UserDetails = z14.object({
     });
   }),
   email: UserModel.shape.email,
-  publicKey: z14.string().nullable(),
+  publicKey: z14.string().optional(),
   // notifications: z.array(Notification),
   version: Version.default(1),
   lastSignedIn: z14.object({
     auto: Timestamp,
     manual: Timestamp
-  }).partial(),
+  }).partial().optional(),
   companyUids: z14.array(CompanyState.shape._id).min(1).optional(),
   // resumeToken: z.uuidv4().optional(),
   ...TimeLog.shape
@@ -508,7 +505,7 @@ var ClientIdentity = UserDetails.pick({
     }).partial().refine(
       (data) => Object.keys(data).length > 0,
       "At least (1) attribute must be defined."
-    ),
+    ).optional(),
     address: Address2.optional(),
     linkedTo: UserDetails.shape._id.optional()
   }).shape
@@ -578,11 +575,11 @@ var CompanyUserSession = z16.object({
   deviceId: z16.string().trim().min(15),
   isAvailable: z16.object({
     value: z16.boolean(),
-    lastModified: Timestamp.nullable()
+    lastModified: Timestamp.optional()
   }),
   isBusy: z16.object({
     value: z16.boolean(),
-    lastModified: Timestamp.nullable()
+    lastModified: Timestamp.optional()
   }),
   appointments: z16.record(z16.literal(["ongoing", "completed"]), z16.int().min(0)),
   roles: z16.array(companyUserRoles).transform((roles) => {
@@ -597,7 +594,7 @@ var CompanyUserSession = z16.object({
     );
   }, "A user is not allowed to have conflicting roles."),
   ttl: z16.number(),
-  lastModified: Timestamp.nullable(),
+  lastModified: Timestamp.optional(),
   expiresAfter: z16.date()
 });
 var MiniCompanyUser2 = z16.object({
@@ -610,9 +607,9 @@ var MiniCompanyUser2 = z16.object({
     appointments: true
   }).shape,
   /** The time before the company session gets deleted */
-  lastActive: Timestamp.nullable(),
-  inviteSent: Timestamp.nullish(),
-  inviteAccepted: Timestamp.nullable()
+  lastActive: Timestamp.optional(),
+  inviteSent: Timestamp.optional(),
+  inviteAccepted: Timestamp.optional()
 });
 var CompanyUser2 = z16.object({
   ...MiniCompanyUser2.shape,
@@ -648,14 +645,14 @@ var MiniRawCompanyStaff = z17.object({
     }).partial()
   ),
   version: Version,
-  lastModified: Timestamp.nullable()
+  lastModified: Timestamp.optional()
 });
 var RawCompanyStaff = z17.object({
   ...MiniRawCompanyStaff.shape,
   members: z17.record(CompanyUser2.shape._id, CompanyUser2.omit({ _id: true }))
 });
-var transformStaff = (object18) => {
-  return object18.transform((d) => {
+var transformStaff = (object17) => {
+  return object17.transform((d) => {
     const copy = structuredClone(d);
     for (const uid of Object.keys(copy.updateQueue)) {
       if (uid in copy.members) {
@@ -731,19 +728,9 @@ var MutableCompanyDetails = z18.object({
   staff: MutableCompanyStaff.partial().optional()
 });
 
-// src/schemas/company/utils/InviteList.ts
-import * as z19 from "zod";
-var CompanyInviteList = z19.record(
-  CompanyUser2.shape.email,
-  z19.object({ createdAt: Timestamp, roles: CompanyUser2.shape.roles })
-).refine(
-  (data) => Object.keys(data).length > 0,
-  "Insufficient amount of members invited."
-);
-
 // src/schemas/company/utils/CreateCompanyForm.ts
-import * as z20 from "zod";
-var CreateCompanyForm = z20.object({
+import * as z19 from "zod";
+var CreateCompanyForm = z19.object({
   _id: CompanyIdentity.shape._id,
   alias: CompanyIdentity.shape.alias.optional(),
   logo: CompanyIdentity.shape.logo.optional(),
@@ -751,11 +738,6 @@ var CreateCompanyForm = z20.object({
   industry: CompanyIdentity.shape.industry,
   sector: CompanyIdentity.shape.sector,
   address: CompanyIdentity.shape.address.nonoptional()
-}).transform((data) => {
-  if (!("alias" in data)) {
-    data.alias = normalizeCompanyId(data._id);
-  }
-  return data;
 }).superRefine((data, ctx) => {
   if (!CompanyIndustry.shape[data.industry].safeParse(data.sector).success) {
     ctx.addIssue(getInvalidSectorError(data.industry, data.sector));
@@ -763,35 +745,35 @@ var CreateCompanyForm = z20.object({
 });
 
 // src/schemas/appointment/components/Medical.ts
-import * as z21 from "zod";
-var Vitals = z21.record(
+import * as z20 from "zod";
+var Vitals = z20.record(
   vitalKeys,
-  z21.object({
-    value: z21.string().trim().regex(/^\d{0,3}((\/|\.)\d{1,3})?/),
+  z20.object({
+    value: z20.string().trim().regex(/^\d{0,3}((\/|\.)\d{1,3})?/),
     lastModified: Timestamp.nullable()
   })
 );
-var Medicine = z21.object({
-  brand: z21.string().trim(),
+var Medicine = z20.object({
+  brand: z20.string().trim(),
   expiresAt: Timestamp.nullish(),
-  quantity: z21.string().trim().regex(/^\d+(\.\d{1,3})? ?[a-zA-Z]{1,20}/, {
+  quantity: z20.string().trim().regex(/^\d+(\.\d{1,3})? ?[a-zA-Z]{1,20}/, {
     error: "Failed to match the pattern <number>+(.<number>{1,3})? ?[a-zA-Z]{1,20}"
   }),
-  refills: z21.string().trim().regex(/^[0-8]/, { error: "Must be between 0 and 8" }),
-  directions: z21.string().trim().max(100, { error: "Must be 100 characters or less" }),
+  refills: z20.string().trim().regex(/^[0-8]/, { error: "Must be between 0 and 8" }),
+  directions: z20.string().trim().max(100, { error: "Must be 100 characters or less" }),
   ...TimeLog.shape
 });
-var MedicalDetails = z21.object({
+var MedicalDetails = z20.object({
   vitals: Vitals,
-  prescriptions: z21.array(z21.array(Medicine)).nullish(),
-  doctorNote: z21.object({
-    value: z21.string(),
+  prescriptions: z20.array(z20.array(Medicine)).nullish(),
+  doctorNote: z20.object({
+    value: z20.string(),
     lastModified: Timestamp.nullable()
   }),
-  physAsstNotes: z21.array(
-    z21.object({
-      title: z21.string(),
-      content: z21.string(),
+  physAsstNotes: z20.array(
+    z20.object({
+      title: z20.string(),
+      content: z20.string(),
       ...TimeLog.shape
     })
   ).optional()
@@ -799,7 +781,7 @@ var MedicalDetails = z21.object({
 
 // src/schemas/appointment/Appointment.ts
 import { sumOf as sumOf2 } from "@wavy/fn";
-import * as z22 from "zod";
+import * as z21 from "zod";
 
 // src/functions/calc.ts
 import { sumOf } from "@wavy/fn";
@@ -828,26 +810,26 @@ var calcPriceMod = (mods, subtotal) => {
 };
 
 // src/schemas/appointment/Appointment.ts
-var TimelineActivity = z22.object({
+var TimelineActivity = z21.object({
   postedAt: Timestamp.nullish(),
   userUid: CompanyUser2.shape._id.nonoptional()
 });
-var AppointmentSeverity = z22.object({
-  "1": z22.literal("Emergency"),
-  "2": z22.literal("Important"),
-  "3": z22.literal("Average")
+var AppointmentSeverity = z21.object({
+  "1": z21.literal("Emergency"),
+  "2": z21.literal("Important"),
+  "3": z21.literal("Average")
 });
-var MiniAppointmentDetails = z22.object({
+var MiniAppointmentDetails = z21.object({
   /** A random uid that identifies the document. */
-  _id: z22.uuidv4(),
+  _id: z21.uuidv4(),
   // This helps to identify the urgency of the appointment
-  severity: z22.string().refine((data) => AppointmentSeverity.keyof().safeParse(data).success),
+  severity: z21.string().refine((data) => AppointmentSeverity.keyof().safeParse(data).success),
   /** The company's uid */
   src: CompanyState.shape._id,
   /** The ticket number */
   tkt: TicketNo,
   /**The reason for the service */
-  reason: z22.object({
+  reason: z21.object({
     value: Reason.shape.value,
     ...TimeLog.shape
   }),
@@ -864,23 +846,23 @@ var MiniAppointmentDetails = z22.object({
     "Expected no more than (20) charges."
   ),
   /**Required to calculate the accurate grandTotal of the charges */
-  additionalFees: CompanyBilling.shape.additionalFees.nullish(),
+  additionalFees: CompanyBilling.shape.additionalFees.optional(),
   /**Required to calculate the accurate grandTotal of the charges */
-  discounts: CompanyBilling.shape.discounts.nullish(),
-  prepayments: CompanyBilling.shape.prepayments.nullish(),
-  payments: z22.array(PaymentDetails).max(100).nullish(),
+  discounts: CompanyBilling.shape.discounts.optional(),
+  prepayments: CompanyBilling.shape.prepayments.optional(),
+  payments: z21.array(PaymentDetails).max(100).optional(),
   /** The client's identity */
   clientUid: ClientIdentity.shape._id,
   /**
    * Data that is specific to the entity (for now it's just medical data).
    * It will only be defined for the participants that have access to it.
    */
-  payload: z22.object({
+  payload: z21.object({
     ...MedicalDetails.shape,
-    lastModified: z22.number().nullable()
-  }).nullish(),
+    lastModified: z21.number().nullable()
+  }).optional(),
   /** Only defined when either the service provider or the client cancelled their appointment */
-  cancelled: z22.object({
+  cancelled: z21.object({
     /** The time that the confirm cancel button was clicked */
     doneAt: Timestamp,
     reason: Reason,
@@ -890,16 +872,16 @@ var MiniAppointmentDetails = z22.object({
   // paymentDueDate: Timestamp.nullish(),
   // The user that is currently modifying the appointment
   lockedBy: UserDetails.shape._id.optional(),
-  timeline: z22.object({
+  timeline: z21.object({
     scheduler: TimelineActivity,
-    physAsst: TimelineActivity.or(z22.literal("none")),
+    physAsst: TimelineActivity.or(z21.literal("none")),
     doctor: TimelineActivity,
     // Array used to accurately record payments made by the "a/r" and the "cshr"
-    debtCollector: z22.array(
-      z22.object({
+    debtCollector: z21.array(
+      z21.object({
         ...TimelineActivity.shape,
         // Payment uid -> collection time
-        collectedPayments: z22.record(z22.uuidv4(), Timestamp)
+        collectedPayments: z21.record(z21.uuidv4(), Timestamp)
       })
     ).min(1).nullable()
   }),
@@ -918,19 +900,19 @@ var MiniAppointmentDetails = z22.object({
 });
 var AppointmentDetails = MiniAppointmentDetails.omit({
   clientUid: true
-}).extend(z22.object({ client: ClientIdentity }).shape);
+}).extend(z21.object({ client: ClientIdentity }).shape);
 var MutableAppointmentDetails = AppointmentDetails.safeExtend(
-  z22.object({
+  z21.object({
     /**
      * @description An encrypted copy of the last state of the appointment.
      * @note Used to accurately update the appointment without having to query the database
      */
-    _hash: z22.string()
+    _hash: z21.string()
   }).shape
 );
-var ScheduleAppointmentForm = z22.object({
+var ScheduleAppointmentForm = z21.object({
   clientId: ClientIdentity.shape._id,
-  serviceProviderId: CompanyUser2.shape._id.or(z22.literal("next")),
+  serviceProviderId: CompanyUser2.shape._id.or(z21.literal("next")),
   category: AppointmentDetails.shape.severity,
   appointmentReason: AppointmentDetails.shape.reason,
   charges: AppointmentDetails.shape.charges.optional(),
@@ -940,7 +922,7 @@ var ScheduleAppointmentForm = z22.object({
 });
 
 // src/functions/scheduleAppointment.ts
-import { findChanges, omit, TODO } from "@wavy/fn";
+import { findChanges, omit, omitNils, TODO } from "@wavy/fn";
 import { v4 } from "uuid";
 
 // src/functions/findAvailableStaff.ts
@@ -1077,7 +1059,7 @@ async function scheduleAppointment(request) {
     staffDetailsCopy.members[selectedPhysAsst].appointments.ongoing++;
   }
   staffDetailsCopy.lastModified = today;
-  const appointment = {
+  const appointment = omitNils({
     _id: v4(),
     src: stateCopy._id,
     tkt: request.state.tktNoCounter,
@@ -1098,7 +1080,6 @@ async function scheduleAppointment(request) {
     charges: request.preferences.serviceSelector === "scheduler" ? request.form?.charges ?? null : null,
     client: await request.findClient(request.form.clientId),
     _hash: "aa.aa.aa",
-    lastModified: null,
     timeline: {
       scheduler: { userUid: request.sender._id, postedAt: today },
       doctor: { userUid: selectedDoctor },
@@ -1110,7 +1091,7 @@ async function scheduleAppointment(request) {
       }
     },
     createdAt: today
-  };
+  });
   appointment._hash = request.createHash(omit(appointment, ["_hash"]));
   return {
     updates: {
@@ -1148,7 +1129,6 @@ export {
   CompanyDetails,
   CompanyIdentity,
   CompanyIndustry,
-  CompanyInviteList,
   CompanyNotifications,
   CompanyPreferences,
   CompanyStaff,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bizmap/sdk",
-  "version": "0.0.115",
+  "version": "0.0.117",
   "main": "./dist/main.js",
   "types": "./dist/main.d.ts",
   "type": "module",