@bizmap/sdk 0.0.131 → 0.0.133

package/dist/main.d.ts

@@ -102,10 +102,6 @@ declare const CompanyDetails: z.ZodObject<{
             current: z.ZodNumber;
             lastModified: z.ZodOptional<z.ZodISODateTime>;
         }, z.core.$strip>;
-        usedStorageInBytes: z.ZodObject<{
-            current: z.ZodNumber;
-            lastModified: z.ZodOptional<z.ZodISODateTime>;
-        }, z.core.$strip>;
         tierId: z.ZodObject<{
             current: z.ZodString;
             lastModified: z.ZodOptional<z.ZodISODateTime>;
@@ -184,10 +180,14 @@ declare const CompanyDetails: z.ZodObject<{
     staff: z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodISODateTime>;
+        ownerId: z.ZodUUID;
         members: z.ZodRecord<z.ZodUUID, z.ZodObject<{
             invitedAt: z.ZodOptional<z.ZodISODateTime>;
             joinedAt: z.ZodISODateTime;
-            lastActive: z.ZodISODateTime;
+            lastSession: z.ZodOptional<z.ZodObject<{
+                startedAt: z.ZodOptional<z.ZodISODateTime>;
+                endedAt: z.ZodOptional<z.ZodISODateTime>;
+            }, z.core.$strip>>;
             roles: z.ZodPipe<z.ZodArray<z.ZodEnum<{
                 doc: "doc";
                 physAsst: "physAsst";
@@ -255,10 +255,6 @@ declare const _CompanyDetails: z.ZodObject<{
             current: z.ZodNumber;
             lastModified: z.ZodOptional<z.ZodISODateTime>;
         }, z.core.$strip>;
-        usedStorageInBytes: z.ZodObject<{
-            current: z.ZodNumber;
-            lastModified: z.ZodOptional<z.ZodISODateTime>;
-        }, z.core.$strip>;
         tierId: z.ZodObject<{
             current: z.ZodString;
             lastModified: z.ZodOptional<z.ZodISODateTime>;
@@ -340,10 +336,14 @@ declare const _CompanyDetails: z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodISODateTime>;
         _id: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
+        ownerId: z.ZodUUID;
         members: z.ZodRecord<z.ZodUUID, z.ZodObject<{
             invitedAt: z.ZodOptional<z.ZodISODateTime>;
             joinedAt: z.ZodISODateTime;
-            lastActive: z.ZodISODateTime;
+            lastSession: z.ZodOptional<z.ZodObject<{
+                startedAt: z.ZodOptional<z.ZodISODateTime>;
+                endedAt: z.ZodOptional<z.ZodISODateTime>;
+            }, z.core.$strip>>;
             roles: z.ZodPipe<z.ZodArray<z.ZodEnum<{
                 doc: "doc";
                 physAsst: "physAsst";
@@ -683,10 +683,14 @@ declare const CompanyStaff: z.ZodObject<{
     createdAt: z.ZodReadonly<z.ZodISODateTime>;
     lastModified: z.ZodOptional<z.ZodISODateTime>;
     _id: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
+    ownerId: z.ZodUUID;
     members: z.ZodRecord<z.ZodUUID, z.ZodObject<{
         invitedAt: z.ZodOptional<z.ZodISODateTime>;
         joinedAt: z.ZodISODateTime;
-        lastActive: z.ZodISODateTime;
+        lastSession: z.ZodOptional<z.ZodObject<{
+            startedAt: z.ZodOptional<z.ZodISODateTime>;
+            endedAt: z.ZodOptional<z.ZodISODateTime>;
+        }, z.core.$strip>>;
         roles: z.ZodPipe<z.ZodArray<z.ZodEnum<{
             doc: "doc";
             physAsst: "physAsst";
@@ -750,10 +754,6 @@ declare const CompanyState: z.ZodObject<{
         current: z.ZodNumber;
         lastModified: z.ZodOptional<z.ZodISODateTime>;
     }, z.core.$strip>;
-    usedStorageInBytes: z.ZodObject<{
-        current: z.ZodNumber;
-        lastModified: z.ZodOptional<z.ZodISODateTime>;
-    }, z.core.$strip>;
     tierId: z.ZodObject<{
         current: z.ZodString;
         lastModified: z.ZodOptional<z.ZodISODateTime>;
@@ -1062,7 +1062,11 @@ declare const UserDetails: z.ZodObject<{
     phoneNumber: z.ZodOptional<z.ZodString>;
     name: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     publicKey: z.ZodOptional<z.ZodString>;
-    availableStorageInBytes: z.ZodOptional<z.ZodNumber>;
+    usedStorageInBytes: z.ZodReadonly<z.ZodRecord<z.ZodUnion<[z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>, z.ZodLiteral<"gp">]>, z.ZodObject<{
+        createdAt: z.ZodReadonly<z.ZodISODateTime>;
+        lastModified: z.ZodOptional<z.ZodISODateTime>;
+        current: z.ZodNumber;
+    }, z.core.$strip>>>;
     lastSignedIn: z.ZodObject<{
         auto: z.ZodOptional<z.ZodISODateTime>;
         manual: z.ZodOptional<z.ZodISODateTime>;

package/dist/main.js

@@ -137,10 +137,6 @@ var CompanyState = z6.object({
     current: z6.number(),
     lastModified: Timestamp.optional()
   }),
-  usedStorageInBytes: z6.object({
-    current: z6.number(),
-    lastModified: Timestamp.optional()
-  }),
   tierId: z6.object({
     current: z6.string(),
     lastModified: Timestamp.optional()
@@ -314,12 +310,21 @@ var UserDetails = z11.object({
   }),
   email: UserModel.shape.email,
   publicKey: z11.string().optional(),
-  availableStorageInBytes: z11.number().optional(),
+  // Used to track the user's general purpose (gp) storage and the total storage used by
+  // their companies.
+  usedStorageInBytes: z11.record(
+    CompanyState.shape._id.or(z11.literal("gp")),
+    z11.object({
+      current: z11.number().positive(),
+      ...TimeLog.shape
+    })
+  ).readonly(),
   // notifications: z.array(Notification),
   lastSignedIn: z11.object({
     auto: Timestamp,
     manual: Timestamp
   }).partial(),
+  // This is useful for tracking the companies that a non-company owner belongs to.
   companyIds: z11.array(CompanyState.shape._id).min(1).optional(),
   // resumeToken: z.uuidv4().optional(),
   ...TimeLog.shape
@@ -416,12 +421,16 @@ var CompanyMemberRoles = z13.array(companyUserRoles).transform((roles) => distin
 }, "A user is not allowed to have conflicting roles.");
 var CompanyStaff = z13.object({
   _id: CompanyState.shape._id,
+  ownerId: UserDetails.shape._id,
   members: z13.record(
     UserDetails.shape._id,
     z13.object({
       invitedAt: Timestamp.optional(),
       joinedAt: Timestamp,
-      lastActive: Timestamp,
+      lastSession: z13.object({
+        startedAt: Timestamp,
+        endedAt: Timestamp
+      }).partial().optional(),
       roles: CompanyMemberRoles,
       serviceCounter: z13.record(z13.literal(["undone", "done"]), z13.int().min(0)).optional()
     })
@@ -444,17 +453,20 @@ var CompanyStaff = z13.object({
     }).partial()
   ).optional(),
   ...TimeLog.shape
-}).superRefine((details, ctx) => {
-  for (const [_id, user] of Object.entries(details.members)) {
-    if (user.roles.includes("doc") && details.partnerMap && _id in details.partnerMap) {
-      for (const asstUid of Object.keys(details.partnerMap[_id])) {
-        if (!details.members[asstUid].roles.includes("physAsst")) {
+}).superRefine((data, ctx) => {
+  if (!(data.ownerId in data.members)) {
+    ctx.addIssue('"ownerId" missing from "members" object.');
+  }
+  for (const [_id, user] of Object.entries(data.members)) {
+    if (user.roles.includes("doc") && data.partnerMap && _id in data.partnerMap) {
+      for (const asstUid of Object.keys(data.partnerMap[_id])) {
+        if (!data.members[asstUid].roles.includes("physAsst")) {
           ctx.addIssue(
             `A partner group member must have the "physAsst" role (${_id}) -> (${asstUid}).`
           );
         }
       }
-    } else if (details.partnerMap && _id in details.partnerMap) {
+    } else if (data.partnerMap && _id in data.partnerMap) {
       ctx.addIssue(
         `A partner group leader must have the "doc" role. (${_id})`
       );

package/package.json

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