@bizmap/sdk 0.0.33 → 0.0.34

package/dist/main.d.ts

@@ -251,7 +251,7 @@ declare const CompanyDetails: z.ZodObject<{
         lastModified: z.ZodNullable<z.ZodInt>;
     }, z.core.$strip>>>;
     staffDetails: z.ZodPipe<z.ZodObject<{
-        members: z.ZodArray<z.ZodObject<{
+        members: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodObject<{
             createdAt: z.ZodReadonly<z.ZodInt>;
             lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
             uid: z.ZodReadonly<z.ZodString>;
@@ -282,10 +282,12 @@ declare const CompanyDetails: z.ZodObject<{
             phoneNumber: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
         partnerMap: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodPipe<z.ZodArray<z.ZodReadonly<z.ZodString>>, z.ZodTransform<string[], string[]>>>;
-        blackList: z.ZodPipe<z.ZodArray<z.ZodReadonly<z.ZodString>>, z.ZodTransform<string[], string[]>>;
+        blackList: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodObject<{
+            addedAt: z.ZodInt;
+        }, z.core.$strip>>;
         lastModified: z.ZodNullable<z.ZodInt>;
     }, z.core.$strip>, z.ZodTransform<{
-        members: {
+        members: Record<string, {
             createdAt: number;
             uid: string;
             status: "inviteSent" | "active" | "inactive";
@@ -301,12 +303,14 @@ declare const CompanyDetails: z.ZodObject<{
             lastModified?: number | null | undefined;
             photoUrl?: string | null | undefined;
             phoneNumber?: string | undefined;
-        }[];
+        }>;
         partnerMap: Record<string, string[]>;
-        blackList: string[];
+        blackList: Record<string, {
+            addedAt: number;
+        }>;
         lastModified: number | null;
     }, {
-        members: {
+        members: Record<string, {
             createdAt: number;
             uid: string;
             status: "inviteSent" | "active" | "inactive";
@@ -322,12 +326,14 @@ declare const CompanyDetails: z.ZodObject<{
             lastModified?: number | null | undefined;
             photoUrl?: string | null | undefined;
             phoneNumber?: string | undefined;
-        }[];
+        }>;
         partnerMap: Record<string, string[]>;
-        blackList: string[];
+        blackList: Record<string, {
+            addedAt: number;
+        }>;
         lastModified: number | null;
     }>> | z.ZodOptional<z.ZodNullable<z.ZodPipe<z.ZodObject<{
-        members: z.ZodArray<z.ZodObject<{
+        members: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodObject<{
             createdAt: z.ZodReadonly<z.ZodInt>;
             lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
             uid: z.ZodReadonly<z.ZodString>;
@@ -358,10 +364,12 @@ declare const CompanyDetails: z.ZodObject<{
             phoneNumber: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
         partnerMap: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodPipe<z.ZodArray<z.ZodReadonly<z.ZodString>>, z.ZodTransform<string[], string[]>>>;
-        blackList: z.ZodPipe<z.ZodArray<z.ZodReadonly<z.ZodString>>, z.ZodTransform<string[], string[]>>;
+        blackList: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodObject<{
+            addedAt: z.ZodInt;
+        }, z.core.$strip>>;
         lastModified: z.ZodNullable<z.ZodInt>;
     }, z.core.$strip>, z.ZodTransform<{
-        members: {
+        members: Record<string, {
             createdAt: number;
             uid: string;
             status: "inviteSent" | "active" | "inactive";
@@ -377,12 +385,14 @@ declare const CompanyDetails: z.ZodObject<{
             lastModified?: number | null | undefined;
             photoUrl?: string | null | undefined;
             phoneNumber?: string | undefined;
-        }[];
+        }>;
         partnerMap: Record<string, string[]>;
-        blackList: string[];
+        blackList: Record<string, {
+            addedAt: number;
+        }>;
         lastModified: number | null;
     }, {
-        members: {
+        members: Record<string, {
             createdAt: number;
             uid: string;
             status: "inviteSent" | "active" | "inactive";
@@ -398,9 +408,11 @@ declare const CompanyDetails: z.ZodObject<{
             lastModified?: number | null | undefined;
             photoUrl?: string | null | undefined;
             phoneNumber?: string | undefined;
-        }[];
+        }>;
         partnerMap: Record<string, string[]>;
-        blackList: string[];
+        blackList: Record<string, {
+            addedAt: number;
+        }>;
         lastModified: number | null;
     }>>>>;
     createdAt: z.ZodInt | z.ZodOptional<z.ZodNullable<z.ZodInt>>;
@@ -534,7 +546,7 @@ declare const PartialCompanyDetails: z.ZodObject<{
         lastModified: z.ZodNullable<z.ZodInt>;
     }, z.core.$strip>>>;
     staffDetails: z.ZodPipe<z.ZodObject<{
-        members: z.ZodArray<z.ZodObject<{
+        members: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodObject<{
             createdAt: z.ZodReadonly<z.ZodInt>;
             lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
             uid: z.ZodReadonly<z.ZodString>;
@@ -565,10 +577,12 @@ declare const PartialCompanyDetails: z.ZodObject<{
             phoneNumber: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
         partnerMap: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodPipe<z.ZodArray<z.ZodReadonly<z.ZodString>>, z.ZodTransform<string[], string[]>>>;
-        blackList: z.ZodPipe<z.ZodArray<z.ZodReadonly<z.ZodString>>, z.ZodTransform<string[], string[]>>;
+        blackList: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodObject<{
+            addedAt: z.ZodInt;
+        }, z.core.$strip>>;
         lastModified: z.ZodNullable<z.ZodInt>;
     }, z.core.$strip>, z.ZodTransform<{
-        members: {
+        members: Record<string, {
             createdAt: number;
             uid: string;
             status: "inviteSent" | "active" | "inactive";
@@ -584,12 +598,14 @@ declare const PartialCompanyDetails: z.ZodObject<{
             lastModified?: number | null | undefined;
             photoUrl?: string | null | undefined;
             phoneNumber?: string | undefined;
-        }[];
+        }>;
         partnerMap: Record<string, string[]>;
-        blackList: string[];
+        blackList: Record<string, {
+            addedAt: number;
+        }>;
         lastModified: number | null;
     }, {
-        members: {
+        members: Record<string, {
             createdAt: number;
             uid: string;
             status: "inviteSent" | "active" | "inactive";
@@ -605,12 +621,14 @@ declare const PartialCompanyDetails: z.ZodObject<{
             lastModified?: number | null | undefined;
             photoUrl?: string | null | undefined;
             phoneNumber?: string | undefined;
-        }[];
+        }>;
         partnerMap: Record<string, string[]>;
-        blackList: string[];
+        blackList: Record<string, {
+            addedAt: number;
+        }>;
         lastModified: number | null;
     }>> | z.ZodOptional<z.ZodNullable<z.ZodPipe<z.ZodObject<{
-        members: z.ZodArray<z.ZodObject<{
+        members: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodObject<{
             createdAt: z.ZodReadonly<z.ZodInt>;
             lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
             uid: z.ZodReadonly<z.ZodString>;
@@ -641,10 +659,12 @@ declare const PartialCompanyDetails: z.ZodObject<{
             phoneNumber: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
         partnerMap: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodPipe<z.ZodArray<z.ZodReadonly<z.ZodString>>, z.ZodTransform<string[], string[]>>>;
-        blackList: z.ZodPipe<z.ZodArray<z.ZodReadonly<z.ZodString>>, z.ZodTransform<string[], string[]>>;
+        blackList: z.ZodRecord<z.ZodReadonly<z.ZodString>, z.ZodObject<{
+            addedAt: z.ZodInt;
+        }, z.core.$strip>>;
         lastModified: z.ZodNullable<z.ZodInt>;
     }, z.core.$strip>, z.ZodTransform<{
-        members: {
+        members: Record<string, {
             createdAt: number;
             uid: string;
             status: "inviteSent" | "active" | "inactive";
@@ -660,12 +680,14 @@ declare const PartialCompanyDetails: z.ZodObject<{
             lastModified?: number | null | undefined;
             photoUrl?: string | null | undefined;
             phoneNumber?: string | undefined;
-        }[];
+        }>;
         partnerMap: Record<string, string[]>;
-        blackList: string[];
+        blackList: Record<string, {
+            addedAt: number;
+        }>;
         lastModified: number | null;
     }, {
-        members: {
+        members: Record<string, {
             createdAt: number;
             uid: string;
             status: "inviteSent" | "active" | "inactive";
@@ -681,9 +703,11 @@ declare const PartialCompanyDetails: z.ZodObject<{
             lastModified?: number | null | undefined;
             photoUrl?: string | null | undefined;
             phoneNumber?: string | undefined;
-        }[];
+        }>;
         partnerMap: Record<string, string[]>;
-        blackList: string[];
+        blackList: Record<string, {
+            addedAt: number;
+        }>;
         lastModified: number | null;
     }>>>>;
     createdAt: z.ZodInt | z.ZodOptional<z.ZodNullable<z.ZodInt>>;

package/dist/main.js

@@ -214,37 +214,22 @@ var CompanyBillingModel = z4.object({
   }
 });
 var StaffDetails = z4.object({
-  /** Doc -> total appointments
-   * @note This should be reset at the end of every cycle.
-   */
-  // totalApptsMap: z.record(CompanyUser.shape.uid, z.number().positive()),
-  members: z4.array(CompanyUser).superRefine((users, ctx) => {
-    const duplicateUids = [];
-    const duplicateEmails = [];
-    const uids = [];
+  members: z4.record(CompanyUser.shape.uid, CompanyUser).superRefine((data, ctx) => {
     const emails = [];
-    for (const user of users) {
-      if (uids.includes(user.uid)) {
-        duplicateUids.push(user.uid);
-      } else {
-        uids.push(user.uid);
+    for (const [uid, user] of Object.entries(data)) {
+      if (uid !== user.uid) {
+        ctx.addIssue(
+          `User found with a uid that doesn't match their respective key. (${uid} !== ${user.uid}).`
+        );
       }
-      if (emails.includes(user.email)) {
-        duplicateEmails.push(user.email);
-      } else {
-        emails.push(user.email);
+      if (!!user.email && emails.includes(user.email.toLowerCase())) {
+        ctx.addIssue(
+          `Having multiple members with the same email is prohibited. (${user.email})`
+        );
+      } else if (!!user.email) {
+        emails.push(user.email.toLowerCase());
       }
     }
-    if (duplicateUids.length > 0) {
-      ctx.addIssue(
-        `Having multiple members with the same uid is prohibited (${duplicateUids.join()}).`
-      );
-    }
-    if (duplicateEmails.length > 0) {
-      ctx.addIssue(
-        `Having multiple members with the same email is prohibited (${duplicateEmails.join()}).`
-      );
-    }
   }),
   /**
    * @relationship one -> many
@@ -262,35 +247,21 @@ var StaffDetails = z4.object({
       return partners.sort();
     })
   ),
-  blackList: z4.array(CompanyUser.shape.uid).transform((list) => {
-    const newList = [];
-    for (const uid of list) {
-      if (!uid || typeof uid !== "string") continue;
-      if (!newList.some(
-        (newUid) => newUid.toLowerCase() === uid.toLowerCase()
-      )) {
-        newList.push(uid);
-      }
-    }
-    return newList.sort();
-  }),
+  blackList: z4.record(
+    CompanyUser.shape.uid,
+    z4.object({ addedAt: Timestamp })
+  ),
   lastModified: Timestamp.nullable()
 }).transform((d) => {
-  let blackListWithExisitingUsers = [];
-  for (const uid of d.blackList) {
-    if (!uid || typeof uid !== "string") continue;
-    if (d.members.find((m) => m.uid.toLowerCase() === uid.toLowerCase())) {
-      blackListWithExisitingUsers.push(uid);
-    }
-  }
-  if (blackListWithExisitingUsers.length !== d.blackList.length) {
-    d.blackList = blackListWithExisitingUsers;
+  const copy = structuredClone(d);
+  for (const uid of Object.keys(copy.blackList)) {
+    if (uid in copy.members) continue;
+    delete copy.blackList[uid];
   }
-  return d;
+  return copy;
 }).superRefine((details, ctx) => {
-  const findMember = (uid) => details.members.find((m) => m.uid === uid);
   for (const [docUid, physAssts] of Object.entries(details.partnerMap)) {
-    const queriedDoc = findMember(docUid);
+    const queriedDoc = details.members[docUid];
     if (!queriedDoc) {
       ctx.addIssue(
         `Only existing members of a company are allowed to be leaders of a partner group (${docUid}).`
@@ -301,7 +272,7 @@ var StaffDetails = z4.object({
       );
     }
     for (const asstUid of physAssts) {
-      const queriedAsst = findMember(asstUid);
+      const queriedAsst = details.members[asstUid];
       if (!queriedAsst) {
         ctx.addIssue(
           `Only existing members of a company are allowed to be apart of a partner group (${asstUid}).`

package/package.json

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