@bizmap/sdk 0.0.107 → 0.0.109

package/dist/main.d.ts

@@ -10,11 +10,6 @@ declare const companyUserRoles: z.ZodEnum<{
     founder: "founder";
 }>;
 type CompanyUserRole = z.infer<typeof companyUserRoles>;
-declare const companyPartnerRoles: z.ZodEnum<{
-    doc: "doc";
-    physAsst: "physAsst";
-}>;
-type CompanyPartnerRole = z.infer<typeof companyPartnerRoles>;
 declare const employeeRoles: z.ZodEnum<{
     doc: "doc";
     physAsst: "physAsst";
@@ -676,6 +671,7 @@ declare const CompanyState: z.ZodObject<{
 }, z.core.$strip>;
 type CompanyState = z.infer<typeof CompanyState>;
 
+declare const COMPANY_USER_RELATIONSHIP: Partial<Record<CompanyUserRole, CompanyUserRole[]>>;
 declare const CompanyUserSession: z.ZodObject<{
     _id: z.ZodUUID;
     user: z.ZodObject<{
@@ -1875,6 +1871,7 @@ declare function findAvailableStaff(role: CompanyUserRole, staff: CompanyStaff):
 declare function findNextAvailableStaff(userUids: string[], algorithm: CompanyPreferences["apptDistAlg"], staff: CompanyStaff): string | null;
 
 /**
+ * @deprecated I don't like this for some reason (please remove/replace it!)
  * @param {...CompanyUser|MiniCompanyUser} partners
  * @returns {(CompanyUser|MiniCompanyUser)[]|null} an array of the users that have conflicting roles or roles that are
  * incompatible with the other partners, or null if none was found. */
@@ -1911,6 +1908,7 @@ declare const findConflictingPartners: (...partners: (CompanyUser | MiniCompanyU
  * @returns {CompanyUserRole[]} The roles that are compatible with the selected role.
  * */
 declare const getCompatibleRoles: (role: CompanyUserRole) => CompanyUserRole[];
+declare const getIncompatibleRoles: (role: CompanyUserRole) => CompanyUserRole[];
 declare const normalizeCompanyId: (id: string) => string;
 declare const normalizeNidKey: (value: keyof NonNullable<ClientIdentity["nid"]>) => string;
 declare const parseClientName: ({ firstName, middleName, lastName, }: Pick<ClientIdentity, "firstName" | "middleName" | "lastName">) => string;
@@ -1920,4 +1918,4 @@ declare function createNotifId(options?: {
     to: string;
 }): string;
 
-export { type AcceptedCurrency, AlphaNumeric, AppointmentDetails, type AppointmentDistAlg, AppointmentSeverity, ClientForm, ClientIdentity, CompanyBilling, CompanyDetails, CompanyIdentity, CompanyInviteList, CompanyNotifications, type CompanyPartnerRole, CompanyPreferences, type CompanyServiceSelector, CompanyStaff, CompanyState, CompanyUser, type CompanyUserRole, CompanyUserSession, CreateCompanyForm, CreditCurrency, type EmployeeRole, type Gender, type HealthcareProviderRole, type Industry, InviteResponse, InvoiceNo, MAX_COMPANY_PRICE_MODS, MedicalDetails, Medicine, MiniAppointmentDetails, MiniCompanyUser, MutableAppointmentDetails, MutableCompanyBilling, MutableCompanyDetails, MutableCompanyIdentity, MutableCompanyPreferences, Notification, PaymentDetails, type PaymentMethod, PriceMod, PriceModList, PriceTag, Reason, Receipts, ScheduleAppointmentForm, StandardTime, TicketNo, type Tier, TierList, TimeLog, Timestamp, Trn, UserDetails, Version, Vitals, acceptedCurrencies, adminRoles, appointmentDistAlgs, calcBalance, calcPriceMod, companyPartnerRoles, companyServiceSelectors, companyUserRoles, createNotifId, employeeRoles, findAvailableStaff, findConflictingPartners, findNextAvailableStaff, genders, getCompatibleRoles, healthcareProviderRoles, industries, normalizeCompanyId, normalizeNidKey, parseClientName, paymentMethods, scheduleAppointment, serviceProviders, tiers, vitalKeys };
+export { type AcceptedCurrency, AlphaNumeric, AppointmentDetails, type AppointmentDistAlg, AppointmentSeverity, COMPANY_USER_RELATIONSHIP, ClientForm, ClientIdentity, CompanyBilling, CompanyDetails, CompanyIdentity, CompanyInviteList, CompanyNotifications, CompanyPreferences, type CompanyServiceSelector, CompanyStaff, CompanyState, CompanyUser, type CompanyUserRole, CompanyUserSession, CreateCompanyForm, CreditCurrency, type EmployeeRole, type Gender, type HealthcareProviderRole, type Industry, InviteResponse, InvoiceNo, MAX_COMPANY_PRICE_MODS, MedicalDetails, Medicine, MiniAppointmentDetails, MiniCompanyUser, MutableAppointmentDetails, MutableCompanyBilling, MutableCompanyDetails, MutableCompanyIdentity, MutableCompanyPreferences, Notification, PaymentDetails, type PaymentMethod, PriceMod, PriceModList, PriceTag, Reason, Receipts, ScheduleAppointmentForm, StandardTime, TicketNo, type Tier, TierList, TimeLog, Timestamp, Trn, UserDetails, Version, Vitals, acceptedCurrencies, adminRoles, appointmentDistAlgs, calcBalance, calcPriceMod, companyServiceSelectors, companyUserRoles, createNotifId, employeeRoles, findAvailableStaff, findConflictingPartners, findNextAvailableStaff, genders, getCompatibleRoles, getIncompatibleRoles, healthcareProviderRoles, industries, normalizeCompanyId, normalizeNidKey, parseClientName, paymentMethods, scheduleAppointment, serviceProviders, tiers, vitalKeys };

package/dist/main.js

@@ -9,10 +9,6 @@ var companyUserRoles = z.enum([
   "founder"
   // "admin",
 ]);
-var companyPartnerRoles = companyUserRoles.extract([
-  "doc",
-  "physAsst"
-]);
 var employeeRoles = companyUserRoles.exclude(["founder"]);
 var adminRoles = companyUserRoles.extract(["founder"]);
 var healthcareProviderRoles = companyUserRoles.extract([
@@ -511,9 +507,7 @@ var findConflictingPartners = (...partners) => {
   const conflicts = [];
   if (!partners) return partners;
   for (const partner of partners) {
-    if (!partner.roles || partner.roles.some(
-      (r) => !companyPartnerRoles.options.includes(r)
-    ) || !CompanyUser.shape.roles.safeParse(partner.roles).success) {
+    if (!partner.roles || partner.roles.some((r) => !(r in COMPANY_USER_RELATIONSHIP))) {
       conflicts.push(partner);
       continue;
     }
@@ -527,13 +521,15 @@ var findConflictingPartners = (...partners) => {
   return conflicts.length === 0 ? null : conflicts;
 };
 var getCompatibleRoles = (role) => {
-  if (role === "physAsst") {
-    return companyUserRoles.exclude([...adminRoles.options, "doc", role]).options;
-  }
-  if (adminRoles.safeParse(role).success || role === "doc") {
-    return companyUserRoles.exclude(["physAsst", role]).options;
-  }
-  return companyUserRoles.exclude([role]).options;
+  return companyUserRoles.options.filter(
+    (r) => !COMPANY_USER_RELATIONSHIP[role]?.includes(r)
+  );
+};
+var getIncompatibleRoles = (role) => {
+  const compatibleRoles = getCompatibleRoles(role);
+  return companyUserRoles.options.filter(
+    (r) => !compatibleRoles.includes(r) && r !== role
+  );
 };
 var normalizeCompanyId = (id) => {
   return id.split("-").map((value) => upperFirst2(value.toLowerCase())).join(" ");
@@ -551,6 +547,10 @@ var parseClientName = ({
 }) => [firstName, middleName[0] + ".", lastName].join(" ");
 
 // src/schemas/company/components/User.ts
+var COMPANY_USER_RELATIONSHIP = {
+  doc: ["physAsst"],
+  physAsst: ["doc"]
+};
 var CompanyUserSession = z15.object({
   _id: z15.uuidv4(),
   user: UserDetails.pick({ _id: true, name: true, email: true }),
@@ -572,8 +572,8 @@ var CompanyUserSession = z15.object({
     }
     return newRoles.sort();
   }).refine((roles) => {
-    return roles.every(
-      (role, i) => i === 0 || getCompatibleRoles(roles[0]).includes(role)
+    return !roles.find(
+      (role) => getIncompatibleRoles(role).some((r) => roles.includes(r))
     );
   }, "A user is not allowed to have conflicting roles."),
   ttl: z15.number(),
@@ -594,7 +594,7 @@ var MiniCompanyUser2 = z15.object({
   inviteSent: Timestamp.nullish(),
   inviteAccepted: Timestamp.nullable()
 });
-var CompanyUser = z15.object({
+var CompanyUser2 = z15.object({
   ...MiniCompanyUser2.shape,
   ...CompanyUserSession.shape.user.shape,
   // Only true when the user's data is retrieved from the session pool
@@ -614,15 +614,15 @@ var MiniRawCompanyStaff = z16.object({
    * @relationship one -> many
    *@description A map of doctor `uids` to their assistants `uids` */
   partnerMap: z16.record(
-    CompanyUser.shape._id,
-    z16.record(CompanyUser.shape._id, z16.object({ addedAt: Timestamp }))
+    CompanyUser2.shape._id,
+    z16.record(CompanyUser2.shape._id, z16.object({ addedAt: Timestamp }))
   ),
   updateQueue: z16.record(
-    CompanyUser.shape._id,
+    CompanyUser2.shape._id,
     z16.object({
       $REMOVE: z16.object({ addedAt: Timestamp }),
       $CHANGE_ROLES: z16.object({
-        newRoles: CompanyUser.shape.roles,
+        newRoles: CompanyUser2.shape.roles,
         addedAt: Timestamp
       })
     }).partial()
@@ -632,7 +632,7 @@ var MiniRawCompanyStaff = z16.object({
 });
 var RawCompanyStaff = z16.object({
   ...MiniRawCompanyStaff.shape,
-  members: z16.record(CompanyUser.shape._id, CompanyUser.omit({ _id: true }))
+  members: z16.record(CompanyUser2.shape._id, CompanyUser2.omit({ _id: true }))
 });
 var transformStaff = (object17) => {
   return object17.transform((d) => {
@@ -714,8 +714,8 @@ var MutableCompanyDetails = z17.object({
 // src/schemas/company/utils/InviteList.ts
 import * as z18 from "zod";
 var CompanyInviteList = z18.record(
-  CompanyUser.shape.email,
-  z18.object({ createdAt: Timestamp, roles: CompanyUser.shape.roles })
+  CompanyUser2.shape.email,
+  z18.object({ createdAt: Timestamp, roles: CompanyUser2.shape.roles })
 ).refine(
   (data) => Object.keys(data).length > 0,
   "Insufficient amount of members invited."
@@ -805,7 +805,7 @@ var calcPriceMod = (mods, subtotal) => {
 // src/schemas/appointment/Appointment.ts
 var TimelineActivity = z21.object({
   postedAt: Timestamp.nullish(),
-  userUid: CompanyUser.shape._id.nonoptional()
+  userUid: CompanyUser2.shape._id.nonoptional()
 });
 var AppointmentSeverity = z21.object({
   "1": z21.literal("Emergency"),
@@ -905,7 +905,7 @@ var MutableAppointmentDetails = AppointmentDetails.safeExtend(
 );
 var ScheduleAppointmentForm = z21.object({
   clientId: ClientIdentity.shape._id,
-  serviceProviderId: CompanyUser.shape._id.or(z21.literal("next")),
+  serviceProviderId: CompanyUser2.shape._id.or(z21.literal("next")),
   category: AppointmentDetails.shape.severity,
   appointmentReason: AppointmentDetails.shape.reason,
   charges: AppointmentDetails.shape.charges.optional(),
@@ -1116,6 +1116,7 @@ export {
   AlphaNumeric,
   AppointmentDetails,
   AppointmentSeverity,
+  COMPANY_USER_RELATIONSHIP,
   ClientForm,
   ClientIdentity,
   CompanyBilling,
@@ -1126,7 +1127,7 @@ export {
   CompanyPreferences,
   CompanyStaff,
   CompanyState,
-  CompanyUser,
+  CompanyUser2 as CompanyUser,
   CompanyUserSession,
   CreateCompanyForm,
   CreditCurrency,
@@ -1164,7 +1165,6 @@ export {
   appointmentDistAlgs,
   calcBalance,
   calcPriceMod,
-  companyPartnerRoles,
   companyServiceSelectors,
   companyUserRoles,
   createNotifId,
@@ -1174,6 +1174,7 @@ export {
   findNextAvailableStaff,
   genders,
   getCompatibleRoles,
+  getIncompatibleRoles,
   healthcareProviderRoles,
   industries,
   normalizeCompanyId,

package/package.json

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