@marcoappio/marco-config 2.0.535 → 2.0.537

package/dist/zero/index.d.ts

@@ -1,3 +1,5 @@
+import { mutatorSchemas } from './mutatorSchemas';
+export { mutatorSchemas };
 export declare const marcoZero: {
     readonly mutatorSchemas: {
         account: {
@@ -137,7 +139,7 @@ export declare const marcoZero: {
                     readonly content: import("valibot").SchemaWithPipe<readonly [import("valibot").StringSchema<undefined>, import("valibot").MaxLengthAction<string, 384000, undefined>]>;
                     readonly subject: import("valibot").NullableSchema<import("valibot").SchemaWithPipe<readonly [import("valibot").StringSchema<undefined>, import("valibot").NonEmptyAction<string, undefined>, import("valibot").MaxLengthAction<string, number, undefined>]>, undefined>;
                     readonly to: import("valibot").ArraySchema<import("valibot").NonOptionalSchema<import("valibot").SchemaWithPipe<readonly [import("valibot").StringSchema<undefined>, import("valibot").RfcEmailAction<string, undefined>]>, undefined>, undefined>;
-                }, undefined>, "~standard" | "~run" | "~types" | "entries"> & {
+                }, undefined>, "~types" | "~run" | "~standard" | "entries"> & {
                     readonly entries: Omit<{
                         readonly bcc: import("valibot").ArraySchema<import("valibot").NonOptionalSchema<import("valibot").SchemaWithPipe<readonly [import("valibot").StringSchema<undefined>, import("valibot").RfcEmailAction<string, undefined>]>, undefined>, undefined>;
                         readonly cc: import("valibot").ArraySchema<import("valibot").NonOptionalSchema<import("valibot").SchemaWithPipe<readonly [import("valibot").StringSchema<undefined>, import("valibot").RfcEmailAction<string, undefined>]>, undefined>, undefined>;
@@ -872,72 +874,6 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly userPushNotificationToken: {
-                name: "userPushNotificationToken";
-                columns: {
-                    readonly createdAt: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly token: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly userId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
-            readonly contact: {
-                name: "contact";
-                columns: {
-                    readonly emailAddress: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly name: Omit<{
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    }, "optional"> & {
-                        optional: true;
-                    };
-                    readonly userId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
             readonly account: {
                 name: "account";
                 columns: {
@@ -1002,16 +938,9 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly accountAlias: {
-                name: "accountAlias";
+            readonly contact: {
+                name: "contact";
                 columns: {
-                    readonly accountId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
                     readonly emailAddress: {
                         type: "string";
                         optional: false;
@@ -1024,40 +953,6 @@ export declare const marcoZero: {
                         optional: false;
                         customType: string;
                     };
-                    readonly isPrimary: {
-                        type: "boolean";
-                        optional: false;
-                        customType: boolean;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly name: Omit<{
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    }, "optional"> & {
-                        optional: true;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
-            readonly accountLabel: {
-                name: "accountLabel";
-                columns: {
-                    readonly accountId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
                     readonly name: Omit<{
                         type: "string";
                         optional: false;
@@ -1065,31 +960,10 @@ export declare const marcoZero: {
                     }, "optional"> & {
                         optional: true;
                     };
-                    readonly path: {
+                    readonly userId: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    };
-                    readonly specialUse: Omit<{
-                        type: "string";
-                        optional: false;
-                        customType: "ARCHIVE" | "INBOX" | "SENT" | "SPAM" | "TRASH";
-                    }, "optional"> & {
-                        optional: true;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly uidValidity: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly unreadCount: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
                     } & {
                         serverName: string;
                     };
@@ -1209,54 +1083,6 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly draftAttachment: {
-                name: "draftAttachment";
-                columns: {
-                    readonly draftId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly fileName: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly mimeType: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly status: {
-                        type: "string";
-                        optional: false;
-                        customType: "PENDING" | "COMPLETE" | "FAILED";
-                    } & {
-                        serverName: string;
-                    };
-                    readonly totalSize: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
-                    } & {
-                        serverName: string;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
             readonly thread: {
                 name: "thread";
                 columns: {
@@ -1364,92 +1190,81 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly threadLabel: {
-                name: "threadLabel";
+            readonly userPushNotificationToken: {
+                name: "userPushNotificationToken";
                 columns: {
-                    readonly accountId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly labelId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly lastSyncedAt: {
+                    readonly createdAt: {
                         type: "number";
                         optional: false;
                         customType: number;
                     } & {
                         serverName: string;
                     };
-                    readonly threadId: {
+                    readonly id: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    } & {
-                        serverName: string;
                     };
-                    readonly threadMessageId: {
+                    readonly token: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly uid: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
                     };
-                    readonly uidValidity: {
-                        type: "number";
+                    readonly userId: {
+                        type: "string";
                         optional: false;
-                        customType: number;
+                        customType: string;
                     } & {
                         serverName: string;
                     };
                 };
                 primaryKey: readonly [string, ...string[]];
             } & {
-                primaryKey: ["accountId", "labelId", "threadMessageId"];
+                primaryKey: ["id"];
             };
-            readonly threadByLabel: {
-                name: "threadByLabel";
+            readonly accountAlias: {
+                name: "accountAlias";
                 columns: {
-                    readonly labelId: {
+                    readonly accountId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly latestMessageDate: {
-                        type: "number";
+                    readonly emailAddress: {
+                        type: "string";
                         optional: false;
-                        customType: number;
+                        customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly threadId: {
+                    readonly id: {
                         type: "string";
                         optional: false;
                         customType: string;
+                    };
+                    readonly isPrimary: {
+                        type: "boolean";
+                        optional: false;
+                        customType: boolean;
                     } & {
                         serverName: string;
                     };
+                    readonly name: Omit<{
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    }, "optional"> & {
+                        optional: true;
+                    };
                 };
                 primaryKey: readonly [string, ...string[]];
             } & {
-                primaryKey: ["labelId", "threadId"];
+                primaryKey: ["id"];
             };
-            readonly threadMessage: {
-                name: "threadMessage";
+            readonly accountLabel: {
+                name: "accountLabel";
                 columns: {
                     readonly accountId: {
                         type: "string";
@@ -1458,7 +1273,194 @@ export declare const marcoZero: {
                     } & {
                         serverName: string;
                     };
-                    readonly envelopeDate: {
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly name: Omit<{
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    }, "optional"> & {
+                        optional: true;
+                    };
+                    readonly path: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly specialUse: Omit<{
+                        type: "string";
+                        optional: false;
+                        customType: "ARCHIVE" | "INBOX" | "SENT" | "SPAM" | "TRASH";
+                    }, "optional"> & {
+                        optional: true;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly uidValidity: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly unreadCount: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["id"];
+            };
+            readonly draftAttachment: {
+                name: "draftAttachment";
+                columns: {
+                    readonly draftId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly fileName: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly mimeType: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly status: {
+                        type: "string";
+                        optional: false;
+                        customType: "PENDING" | "COMPLETE" | "FAILED";
+                    } & {
+                        serverName: string;
+                    };
+                    readonly totalSize: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["id"];
+            };
+            readonly threadLabel: {
+                name: "threadLabel";
+                columns: {
+                    readonly accountId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly labelId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly lastSyncedAt: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly threadId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly threadMessageId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly uid: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    };
+                    readonly uidValidity: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["accountId", "labelId", "threadMessageId"];
+            };
+            readonly threadByLabel: {
+                name: "threadByLabel";
+                columns: {
+                    readonly labelId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly latestMessageDate: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly threadId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["labelId", "threadId"];
+            };
+            readonly threadMessage: {
+                name: "threadMessage";
+                columns: {
+                    readonly accountId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly envelopeDate: {
                         type: "number";
                         optional: false;
                         customType: number;
@@ -1605,259 +1607,259 @@ export declare const marcoZero: {
         relationships: {
             readonly user: {
                 accounts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "many";
                 }];
                 contacts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "name" | "userId" | "emailAddress")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("emailAddress" | "id" | "name" | "userId")[];
                     readonly destSchema: "contact";
                     readonly cardinality: "many";
                 }];
                 drafts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destSchema: "draft";
                     readonly cardinality: "many";
                 }];
                 pushNotificationTokens: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "createdAt" | "token" | "userId")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("id" | "userId" | "createdAt" | "token")[];
                     readonly destSchema: "userPushNotificationToken";
                     readonly cardinality: "many";
                 }];
                 threads: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "many";
                 }];
             };
-            readonly userPushNotificationToken: {
-                user: [{
-                    readonly sourceField: readonly ("id" | "createdAt" | "token" | "userId")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destSchema: "user";
-                    readonly cardinality: "one";
-                }];
-            };
-            readonly contact: {
-                user: [{
-                    readonly sourceField: readonly ("id" | "name" | "userId" | "emailAddress")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destSchema: "user";
-                    readonly cardinality: "one";
-                }];
-            };
             readonly account: {
                 aliases: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
                     readonly destSchema: "accountAlias";
                     readonly cardinality: "many";
                 }];
                 drafts: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destSchema: "draft";
                     readonly cardinality: "many";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 primaryAlias: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
                     readonly destSchema: "accountAlias";
                     readonly cardinality: "one";
                 }];
                 threads: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
-            readonly accountAlias: {
-                account: [{
-                    readonly sourceField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destSchema: "account";
-                    readonly cardinality: "one";
-                }];
-            };
-            readonly accountLabel: {
-                account: [{
-                    readonly sourceField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destSchema: "account";
+            readonly contact: {
+                user: [{
+                    readonly sourceField: readonly ("emailAddress" | "id" | "name" | "userId")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
-                threads: [{
-                    readonly sourceField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destSchema: "threadLabel";
-                    readonly cardinality: "many";
-                }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destSchema: "thread";
-                    readonly cardinality: "many";
-                }];
             };
             readonly draft: {
                 account: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "one";
                 }];
                 attachments: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
                     readonly destSchema: "draftAttachment";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
-            readonly draftAttachment: {
-                draft: [{
-                    readonly sourceField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destSchema: "draft";
-                    readonly cardinality: "one";
-                }];
-            };
             readonly thread: {
                 account: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "one";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
                     readonly destSchema: "threadLabel";
                     readonly cardinality: "many";
                 }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 messages: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "many";
                 }];
                 threadByLabel: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
                     readonly destSchema: "threadByLabel";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destSchema: "user";
+                    readonly cardinality: "one";
+                }];
+            };
+            readonly userPushNotificationToken: {
+                user: [{
+                    readonly sourceField: readonly ("id" | "userId" | "createdAt" | "token")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
+            readonly accountAlias: {
+                account: [{
+                    readonly sourceField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destSchema: "account";
+                    readonly cardinality: "one";
+                }];
+            };
+            readonly accountLabel: {
+                account: [{
+                    readonly sourceField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destSchema: "account";
+                    readonly cardinality: "one";
+                }];
+                threads: [{
+                    readonly sourceField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destSchema: "threadLabel";
+                    readonly cardinality: "many";
+                }, {
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destSchema: "thread";
+                    readonly cardinality: "many";
+                }];
+            };
+            readonly draftAttachment: {
+                draft: [{
+                    readonly sourceField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destSchema: "draft";
+                    readonly cardinality: "one";
+                }];
+            };
             readonly threadLabel: {
                 label: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "one";
                 }];
                 message: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadByLabel: {
                 label: [{
-                    readonly sourceField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "one";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessage: {
                 attachments: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("id" | "fileName" | "mimeType" | "threadMessageId" | "size")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("id" | "fileName" | "mimeType" | "size" | "threadMessageId")[];
                     readonly destSchema: "threadMessageAttachment";
                     readonly cardinality: "many";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
                     readonly destSchema: "threadLabel";
                     readonly cardinality: "many";
                 }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 recipients: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("type" | "id" | "name" | "emailAddress" | "threadMessageId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("type" | "emailAddress" | "id" | "name" | "threadMessageId")[];
                     readonly destSchema: "threadMessageRecipient";
                     readonly cardinality: "many";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessageRecipient: {
                 message: [{
-                    readonly sourceField: readonly ("type" | "id" | "name" | "emailAddress" | "threadMessageId")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("type" | "emailAddress" | "id" | "name" | "threadMessageId")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessageAttachment: {
                 message: [{
-                    readonly sourceField: readonly ("id" | "fileName" | "mimeType" | "threadMessageId" | "size")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("id" | "fileName" | "mimeType" | "size" | "threadMessageId")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];
@@ -2139,7 +2141,15 @@ export declare const marcoZero: {
         }, {
             userId: string;
         }>;
-        readonly getUser: import("@rocicorp/zero").QueryDefinition<"user", import("@rocicorp/zero").ReadonlyJSONValue | undefined, import("@rocicorp/zero").ReadonlyJSONValue | undefined, {
+        readonly getUser: import("@rocicorp/zero").QueryDefinition<"user", {
+            aliasesLimit?: number | undefined;
+            labelsLimit?: number | undefined;
+            pushNotificationTokensLimit?: number | undefined;
+        } | undefined, {
+            aliasesLimit: number;
+            labelsLimit: number;
+            pushNotificationTokensLimit: number;
+        }, {
             readonly id: string;
             readonly name: string | null;
             readonly profilePicture: string | null;
@@ -2245,72 +2255,6 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly userPushNotificationToken: {
-                name: "userPushNotificationToken";
-                columns: {
-                    readonly createdAt: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly token: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly userId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
-            readonly contact: {
-                name: "contact";
-                columns: {
-                    readonly emailAddress: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly name: Omit<{
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    }, "optional"> & {
-                        optional: true;
-                    };
-                    readonly userId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
             readonly account: {
                 name: "account";
                 columns: {
@@ -2363,63 +2307,22 @@ export declare const marcoZero: {
                     } & {
                         serverName: string;
                     };
-                    readonly userId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
-            readonly accountAlias: {
-                name: "accountAlias";
-                columns: {
-                    readonly accountId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly emailAddress: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly isPrimary: {
-                        type: "boolean";
-                        optional: false;
-                        customType: boolean;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly name: Omit<{
+                    readonly userId: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    }, "optional"> & {
-                        optional: true;
+                    } & {
+                        serverName: string;
                     };
                 };
                 primaryKey: readonly [string, ...string[]];
             } & {
                 primaryKey: ["id"];
             };
-            readonly accountLabel: {
-                name: "accountLabel";
+            readonly contact: {
+                name: "contact";
                 columns: {
-                    readonly accountId: {
+                    readonly emailAddress: {
                         type: "string";
                         optional: false;
                         customType: string;
@@ -2438,31 +2341,10 @@ export declare const marcoZero: {
                     }, "optional"> & {
                         optional: true;
                     };
-                    readonly path: {
+                    readonly userId: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    };
-                    readonly specialUse: Omit<{
-                        type: "string";
-                        optional: false;
-                        customType: "ARCHIVE" | "INBOX" | "SENT" | "SPAM" | "TRASH";
-                    }, "optional"> & {
-                        optional: true;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly uidValidity: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly unreadCount: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
                     } & {
                         serverName: string;
                     };
@@ -2582,20 +2464,25 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly draftAttachment: {
-                name: "draftAttachment";
+            readonly thread: {
+                name: "thread";
                 columns: {
-                    readonly draftId: {
+                    readonly accountId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly fileName: {
-                        type: "string";
+                    readonly flagged: {
+                        type: "boolean";
                         optional: false;
-                        customType: string;
+                        customType: boolean;
+                    };
+                    readonly hasAttachments: {
+                        type: "boolean";
+                        optional: false;
+                        customType: boolean;
                     } & {
                         serverName: string;
                     };
@@ -2604,133 +2491,256 @@ export declare const marcoZero: {
                         optional: false;
                         customType: string;
                     };
-                    readonly mimeType: {
+                    readonly labelIdList: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly status: {
+                    readonly latestMessageDate: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly latestMessageId: {
                         type: "string";
                         optional: false;
-                        customType: "PENDING" | "COMPLETE" | "FAILED";
+                        customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly totalSize: {
+                    readonly messageCount: {
                         type: "number";
                         optional: false;
                         customType: number;
                     } & {
                         serverName: string;
                     };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
-            readonly thread: {
-                name: "thread";
-                columns: {
-                    readonly accountId: {
+                    readonly previewText: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly flagged: {
+                    readonly seen: {
                         type: "boolean";
                         optional: false;
                         customType: boolean;
                     };
-                    readonly hasAttachments: {
-                        type: "boolean";
+                    readonly senderEmail: {
+                        type: "string";
                         optional: false;
-                        customType: boolean;
+                        customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly id: {
+                    readonly senderName: Omit<{
                         type: "string";
                         optional: false;
                         customType: string;
+                    }, "optional"> & {
+                        optional: true;
+                    } & {
+                        serverName: string;
                     };
-                    readonly labelIdList: {
+                    readonly subject: Omit<{
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    }, "optional"> & {
+                        optional: true;
+                    };
+                    readonly userId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly latestMessageDate: {
+                    readonly words: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["id"];
+            };
+            readonly userPushNotificationToken: {
+                name: "userPushNotificationToken";
+                columns: {
+                    readonly createdAt: {
                         type: "number";
                         optional: false;
                         customType: number;
                     } & {
                         serverName: string;
                     };
-                    readonly latestMessageId: {
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly token: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly userId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly messageCount: {
-                        type: "number";
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["id"];
+            };
+            readonly accountAlias: {
+                name: "accountAlias";
+                columns: {
+                    readonly accountId: {
+                        type: "string";
                         optional: false;
-                        customType: number;
+                        customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly previewText: {
+                    readonly emailAddress: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly seen: {
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly isPrimary: {
                         type: "boolean";
                         optional: false;
                         customType: boolean;
+                    } & {
+                        serverName: string;
                     };
-                    readonly senderEmail: {
+                    readonly name: Omit<{
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    }, "optional"> & {
+                        optional: true;
+                    };
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["id"];
+            };
+            readonly accountLabel: {
+                name: "accountLabel";
+                columns: {
+                    readonly accountId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly senderName: Omit<{
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly name: Omit<{
                         type: "string";
                         optional: false;
                         customType: string;
                     }, "optional"> & {
                         optional: true;
-                    } & {
-                        serverName: string;
                     };
-                    readonly subject: Omit<{
+                    readonly path: {
                         type: "string";
                         optional: false;
                         customType: string;
+                    };
+                    readonly specialUse: Omit<{
+                        type: "string";
+                        optional: false;
+                        customType: "ARCHIVE" | "INBOX" | "SENT" | "SPAM" | "TRASH";
                     }, "optional"> & {
                         optional: true;
+                    } & {
+                        serverName: string;
                     };
-                    readonly userId: {
+                    readonly uidValidity: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly unreadCount: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
+                    };
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["id"];
+            };
+            readonly draftAttachment: {
+                name: "draftAttachment";
+                columns: {
+                    readonly draftId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly words: {
+                    readonly fileName: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly mimeType: {
                         type: "string";
                         optional: false;
                         customType: string;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly status: {
+                        type: "string";
+                        optional: false;
+                        customType: "PENDING" | "COMPLETE" | "FAILED";
+                    } & {
+                        serverName: string;
+                    };
+                    readonly totalSize: {
+                        type: "number";
+                        optional: false;
+                        customType: number;
+                    } & {
+                        serverName: string;
                     };
                 };
                 primaryKey: readonly [string, ...string[]];
@@ -2978,259 +2988,259 @@ export declare const marcoZero: {
         relationships: {
             readonly user: {
                 accounts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "many";
                 }];
                 contacts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "name" | "userId" | "emailAddress")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("emailAddress" | "id" | "name" | "userId")[];
                     readonly destSchema: "contact";
                     readonly cardinality: "many";
                 }];
                 drafts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destSchema: "draft";
                     readonly cardinality: "many";
                 }];
                 pushNotificationTokens: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "createdAt" | "token" | "userId")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("id" | "userId" | "createdAt" | "token")[];
                     readonly destSchema: "userPushNotificationToken";
                     readonly cardinality: "many";
                 }];
-                threads: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destSchema: "thread";
-                    readonly cardinality: "many";
-                }];
-            };
-            readonly userPushNotificationToken: {
-                user: [{
-                    readonly sourceField: readonly ("id" | "createdAt" | "token" | "userId")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destSchema: "user";
-                    readonly cardinality: "one";
-                }];
-            };
-            readonly contact: {
-                user: [{
-                    readonly sourceField: readonly ("id" | "name" | "userId" | "emailAddress")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destSchema: "user";
-                    readonly cardinality: "one";
-                }];
+                threads: [{
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destSchema: "thread";
+                    readonly cardinality: "many";
+                }];
             };
             readonly account: {
                 aliases: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
                     readonly destSchema: "accountAlias";
                     readonly cardinality: "many";
                 }];
                 drafts: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destSchema: "draft";
                     readonly cardinality: "many";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 primaryAlias: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
                     readonly destSchema: "accountAlias";
                     readonly cardinality: "one";
                 }];
                 threads: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
-            readonly accountAlias: {
-                account: [{
-                    readonly sourceField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destSchema: "account";
-                    readonly cardinality: "one";
-                }];
-            };
-            readonly accountLabel: {
-                account: [{
-                    readonly sourceField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destSchema: "account";
+            readonly contact: {
+                user: [{
+                    readonly sourceField: readonly ("emailAddress" | "id" | "name" | "userId")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
-                threads: [{
-                    readonly sourceField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destSchema: "threadLabel";
-                    readonly cardinality: "many";
-                }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destSchema: "thread";
-                    readonly cardinality: "many";
-                }];
             };
             readonly draft: {
                 account: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "one";
                 }];
                 attachments: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
                     readonly destSchema: "draftAttachment";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
-            readonly draftAttachment: {
-                draft: [{
-                    readonly sourceField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destSchema: "draft";
-                    readonly cardinality: "one";
-                }];
-            };
             readonly thread: {
                 account: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "one";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
                     readonly destSchema: "threadLabel";
                     readonly cardinality: "many";
                 }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 messages: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "many";
                 }];
                 threadByLabel: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
                     readonly destSchema: "threadByLabel";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destSchema: "user";
+                    readonly cardinality: "one";
+                }];
+            };
+            readonly userPushNotificationToken: {
+                user: [{
+                    readonly sourceField: readonly ("id" | "userId" | "createdAt" | "token")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
+            readonly accountAlias: {
+                account: [{
+                    readonly sourceField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destSchema: "account";
+                    readonly cardinality: "one";
+                }];
+            };
+            readonly accountLabel: {
+                account: [{
+                    readonly sourceField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destSchema: "account";
+                    readonly cardinality: "one";
+                }];
+                threads: [{
+                    readonly sourceField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destSchema: "threadLabel";
+                    readonly cardinality: "many";
+                }, {
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destSchema: "thread";
+                    readonly cardinality: "many";
+                }];
+            };
+            readonly draftAttachment: {
+                draft: [{
+                    readonly sourceField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destSchema: "draft";
+                    readonly cardinality: "one";
+                }];
+            };
             readonly threadLabel: {
                 label: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "one";
                 }];
                 message: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadByLabel: {
                 label: [{
-                    readonly sourceField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "one";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessage: {
                 attachments: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("id" | "fileName" | "mimeType" | "threadMessageId" | "size")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("id" | "fileName" | "mimeType" | "size" | "threadMessageId")[];
                     readonly destSchema: "threadMessageAttachment";
                     readonly cardinality: "many";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
                     readonly destSchema: "threadLabel";
                     readonly cardinality: "many";
                 }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 recipients: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("type" | "id" | "name" | "emailAddress" | "threadMessageId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("type" | "emailAddress" | "id" | "name" | "threadMessageId")[];
                     readonly destSchema: "threadMessageRecipient";
                     readonly cardinality: "many";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessageRecipient: {
                 message: [{
-                    readonly sourceField: readonly ("type" | "id" | "name" | "emailAddress" | "threadMessageId")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("type" | "emailAddress" | "id" | "name" | "threadMessageId")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessageAttachment: {
                 message: [{
-                    readonly sourceField: readonly ("id" | "fileName" | "mimeType" | "threadMessageId" | "size")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("id" | "fileName" | "mimeType" | "size" | "threadMessageId")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];
@@ -3287,72 +3297,6 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly userPushNotificationToken: {
-                name: "userPushNotificationToken";
-                columns: {
-                    readonly createdAt: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly token: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly userId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
-            readonly contact: {
-                name: "contact";
-                columns: {
-                    readonly emailAddress: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly id: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    };
-                    readonly name: Omit<{
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    }, "optional"> & {
-                        optional: true;
-                    };
-                    readonly userId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                };
-                primaryKey: readonly [string, ...string[]];
-            } & {
-                primaryKey: ["id"];
-            };
             readonly account: {
                 name: "account";
                 columns: {
@@ -3417,16 +3361,9 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly accountAlias: {
-                name: "accountAlias";
+            readonly contact: {
+                name: "contact";
                 columns: {
-                    readonly accountId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
                     readonly emailAddress: {
                         type: "string";
                         optional: false;
@@ -3439,13 +3376,6 @@ export declare const marcoZero: {
                         optional: false;
                         customType: string;
                     };
-                    readonly isPrimary: {
-                        type: "boolean";
-                        optional: false;
-                        customType: boolean;
-                    } & {
-                        serverName: string;
-                    };
                     readonly name: Omit<{
                         type: "string";
                         optional: false;
@@ -3453,13 +3383,20 @@ export declare const marcoZero: {
                     }, "optional"> & {
                         optional: true;
                     };
+                    readonly userId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
                 };
                 primaryKey: readonly [string, ...string[]];
             } & {
                 primaryKey: ["id"];
             };
-            readonly accountLabel: {
-                name: "accountLabel";
+            readonly draft: {
+                name: "draft";
                 columns: {
                     readonly accountId: {
                         type: "string";
@@ -3468,53 +3405,109 @@ export declare const marcoZero: {
                     } & {
                         serverName: string;
                     };
-                    readonly id: {
+                    readonly body: {
+                        type: "json";
+                        optional: false;
+                        customType: {
+                            content: string;
+                            to: string[];
+                            cc: string[];
+                            bcc: string[];
+                        };
+                    };
+                    readonly error: Omit<{
                         type: "string";
                         optional: false;
                         customType: string;
+                    }, "optional"> & {
+                        optional: true;
                     };
-                    readonly name: Omit<{
+                    readonly fromAliasId: Omit<{
                         type: "string";
                         optional: false;
                         customType: string;
                     }, "optional"> & {
                         optional: true;
+                    } & {
+                        serverName: string;
                     };
-                    readonly path: {
+                    readonly fromEmail: {
                         type: "string";
                         optional: false;
                         customType: string;
+                    } & {
+                        serverName: string;
                     };
-                    readonly specialUse: Omit<{
+                    readonly fromName: Omit<{
                         type: "string";
                         optional: false;
-                        customType: "ARCHIVE" | "INBOX" | "SENT" | "SPAM" | "TRASH";
+                        customType: string;
                     }, "optional"> & {
                         optional: true;
                     } & {
                         serverName: string;
                     };
-                    readonly uidValidity: {
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly referencedMessageId: Omit<{
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    }, "optional"> & {
+                        optional: true;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly scheduledFor: Omit<{
                         type: "number";
                         optional: false;
                         customType: number;
+                    }, "optional"> & {
+                        optional: true;
                     } & {
                         serverName: string;
                     };
-                    readonly unreadCount: {
+                    readonly status: {
+                        type: "string";
+                        optional: false;
+                        customType: "DRAFT" | "SEND_REQUESTED" | "SEND_IN_PROGRESS" | "SEND_CONFIRMED" | "SEND_FAILED";
+                    };
+                    readonly subject: Omit<{
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    }, "optional"> & {
+                        optional: true;
+                    };
+                    readonly type: {
+                        type: "string";
+                        optional: false;
+                        customType: "NEW" | "REPLY" | "FORWARD";
+                    };
+                    readonly updatedAt: {
                         type: "number";
                         optional: false;
                         customType: number;
                     } & {
                         serverName: string;
                     };
+                    readonly userId: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    } & {
+                        serverName: string;
+                    };
                 };
                 primaryKey: readonly [string, ...string[]];
             } & {
                 primaryKey: ["id"];
             };
-            readonly draft: {
-                name: "draft";
+            readonly thread: {
+                name: "thread";
                 columns: {
                     readonly accountId: {
                         type: "string";
@@ -3523,76 +3516,79 @@ export declare const marcoZero: {
                     } & {
                         serverName: string;
                     };
-                    readonly body: {
-                        type: "json";
+                    readonly flagged: {
+                        type: "boolean";
                         optional: false;
-                        customType: {
-                            content: string;
-                            to: string[];
-                            cc: string[];
-                            bcc: string[];
-                        };
+                        customType: boolean;
                     };
-                    readonly error: Omit<{
+                    readonly hasAttachments: {
+                        type: "boolean";
+                        optional: false;
+                        customType: boolean;
+                    } & {
+                        serverName: string;
+                    };
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly labelIdList: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    }, "optional"> & {
-                        optional: true;
+                    } & {
+                        serverName: string;
                     };
-                    readonly fromAliasId: Omit<{
-                        type: "string";
+                    readonly latestMessageDate: {
+                        type: "number";
                         optional: false;
-                        customType: string;
-                    }, "optional"> & {
-                        optional: true;
+                        customType: number;
                     } & {
                         serverName: string;
                     };
-                    readonly fromEmail: {
+                    readonly latestMessageId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly fromName: Omit<{
-                        type: "string";
+                    readonly messageCount: {
+                        type: "number";
                         optional: false;
-                        customType: string;
-                    }, "optional"> & {
-                        optional: true;
+                        customType: number;
                     } & {
                         serverName: string;
                     };
-                    readonly id: {
+                    readonly previewText: {
                         type: "string";
                         optional: false;
                         customType: string;
+                    } & {
+                        serverName: string;
                     };
-                    readonly referencedMessageId: Omit<{
+                    readonly seen: {
+                        type: "boolean";
+                        optional: false;
+                        customType: boolean;
+                    };
+                    readonly senderEmail: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    }, "optional"> & {
-                        optional: true;
                     } & {
                         serverName: string;
                     };
-                    readonly scheduledFor: Omit<{
-                        type: "number";
+                    readonly senderName: Omit<{
+                        type: "string";
                         optional: false;
-                        customType: number;
+                        customType: string;
                     }, "optional"> & {
                         optional: true;
                     } & {
                         serverName: string;
                     };
-                    readonly status: {
-                        type: "string";
-                        optional: false;
-                        customType: "DRAFT" | "SEND_REQUESTED" | "SEND_IN_PROGRESS" | "SEND_CONFIRMED" | "SEND_FAILED";
-                    };
                     readonly subject: Omit<{
                         type: "string";
                         optional: false;
@@ -3600,18 +3596,43 @@ export declare const marcoZero: {
                     }, "optional"> & {
                         optional: true;
                     };
-                    readonly type: {
+                    readonly userId: {
                         type: "string";
                         optional: false;
-                        customType: "NEW" | "REPLY" | "FORWARD";
+                        customType: string;
+                    } & {
+                        serverName: string;
                     };
-                    readonly updatedAt: {
+                    readonly words: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["id"];
+            };
+            readonly userPushNotificationToken: {
+                name: "userPushNotificationToken";
+                columns: {
+                    readonly createdAt: {
                         type: "number";
                         optional: false;
                         customType: number;
                     } & {
                         serverName: string;
                     };
+                    readonly id: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
+                    readonly token: {
+                        type: "string";
+                        optional: false;
+                        customType: string;
+                    };
                     readonly userId: {
                         type: "string";
                         optional: false;
@@ -3624,17 +3645,17 @@ export declare const marcoZero: {
             } & {
                 primaryKey: ["id"];
             };
-            readonly draftAttachment: {
-                name: "draftAttachment";
+            readonly accountAlias: {
+                name: "accountAlias";
                 columns: {
-                    readonly draftId: {
+                    readonly accountId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly fileName: {
+                    readonly emailAddress: {
                         type: "string";
                         optional: false;
                         customType: string;
@@ -3646,34 +3667,27 @@ export declare const marcoZero: {
                         optional: false;
                         customType: string;
                     };
-                    readonly mimeType: {
-                        type: "string";
+                    readonly isPrimary: {
+                        type: "boolean";
                         optional: false;
-                        customType: string;
+                        customType: boolean;
                     } & {
                         serverName: string;
                     };
-                    readonly status: {
+                    readonly name: Omit<{
                         type: "string";
                         optional: false;
-                        customType: "PENDING" | "COMPLETE" | "FAILED";
-                    } & {
-                        serverName: string;
-                    };
-                    readonly totalSize: {
-                        type: "number";
-                        optional: false;
-                        customType: number;
-                    } & {
-                        serverName: string;
+                        customType: string;
+                    }, "optional"> & {
+                        optional: true;
                     };
                 };
                 primaryKey: readonly [string, ...string[]];
             } & {
                 primaryKey: ["id"];
             };
-            readonly thread: {
-                name: "thread";
+            readonly accountLabel: {
+                name: "accountLabel";
                 columns: {
                     readonly accountId: {
                         type: "string";
@@ -3682,97 +3696,93 @@ export declare const marcoZero: {
                     } & {
                         serverName: string;
                     };
-                    readonly flagged: {
-                        type: "boolean";
+                    readonly id: {
+                        type: "string";
                         optional: false;
-                        customType: boolean;
+                        customType: string;
                     };
-                    readonly hasAttachments: {
-                        type: "boolean";
+                    readonly name: Omit<{
+                        type: "string";
                         optional: false;
-                        customType: boolean;
-                    } & {
-                        serverName: string;
+                        customType: string;
+                    }, "optional"> & {
+                        optional: true;
                     };
-                    readonly id: {
+                    readonly path: {
                         type: "string";
                         optional: false;
                         customType: string;
                     };
-                    readonly labelIdList: {
+                    readonly specialUse: Omit<{
                         type: "string";
                         optional: false;
-                        customType: string;
+                        customType: "ARCHIVE" | "INBOX" | "SENT" | "SPAM" | "TRASH";
+                    }, "optional"> & {
+                        optional: true;
                     } & {
                         serverName: string;
                     };
-                    readonly latestMessageDate: {
+                    readonly uidValidity: {
                         type: "number";
                         optional: false;
                         customType: number;
                     } & {
                         serverName: string;
                     };
-                    readonly latestMessageId: {
-                        type: "string";
-                        optional: false;
-                        customType: string;
-                    } & {
-                        serverName: string;
-                    };
-                    readonly messageCount: {
+                    readonly unreadCount: {
                         type: "number";
                         optional: false;
                         customType: number;
                     } & {
                         serverName: string;
                     };
-                    readonly previewText: {
+                };
+                primaryKey: readonly [string, ...string[]];
+            } & {
+                primaryKey: ["id"];
+            };
+            readonly draftAttachment: {
+                name: "draftAttachment";
+                columns: {
+                    readonly draftId: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly seen: {
-                        type: "boolean";
-                        optional: false;
-                        customType: boolean;
-                    };
-                    readonly senderEmail: {
+                    readonly fileName: {
                         type: "string";
                         optional: false;
                         customType: string;
                     } & {
                         serverName: string;
                     };
-                    readonly senderName: Omit<{
+                    readonly id: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    }, "optional"> & {
-                        optional: true;
-                    } & {
-                        serverName: string;
                     };
-                    readonly subject: Omit<{
+                    readonly mimeType: {
                         type: "string";
                         optional: false;
                         customType: string;
-                    }, "optional"> & {
-                        optional: true;
+                    } & {
+                        serverName: string;
                     };
-                    readonly userId: {
+                    readonly status: {
                         type: "string";
                         optional: false;
-                        customType: string;
+                        customType: "PENDING" | "COMPLETE" | "FAILED";
                     } & {
                         serverName: string;
                     };
-                    readonly words: {
-                        type: "string";
+                    readonly totalSize: {
+                        type: "number";
                         optional: false;
-                        customType: string;
+                        customType: number;
+                    } & {
+                        serverName: string;
                     };
                 };
                 primaryKey: readonly [string, ...string[]];
@@ -4020,259 +4030,259 @@ export declare const marcoZero: {
         relationships: {
             readonly user: {
                 accounts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "many";
                 }];
                 contacts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "name" | "userId" | "emailAddress")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("emailAddress" | "id" | "name" | "userId")[];
                     readonly destSchema: "contact";
                     readonly cardinality: "many";
                 }];
                 drafts: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destSchema: "draft";
                     readonly cardinality: "many";
                 }];
                 pushNotificationTokens: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "createdAt" | "token" | "userId")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("id" | "userId" | "createdAt" | "token")[];
                     readonly destSchema: "userPushNotificationToken";
                     readonly cardinality: "many";
                 }];
                 threads: [{
-                    readonly sourceField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "many";
                 }];
             };
-            readonly userPushNotificationToken: {
-                user: [{
-                    readonly sourceField: readonly ("id" | "createdAt" | "token" | "userId")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destSchema: "user";
-                    readonly cardinality: "one";
-                }];
-            };
-            readonly contact: {
-                user: [{
-                    readonly sourceField: readonly ("id" | "name" | "userId" | "emailAddress")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
-                    readonly destSchema: "user";
-                    readonly cardinality: "one";
-                }];
-            };
             readonly account: {
                 aliases: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
                     readonly destSchema: "accountAlias";
                     readonly cardinality: "many";
                 }];
                 drafts: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destSchema: "draft";
                     readonly cardinality: "many";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 primaryAlias: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
                     readonly destSchema: "accountAlias";
                     readonly cardinality: "one";
                 }];
                 threads: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
-            readonly accountAlias: {
-                account: [{
-                    readonly sourceField: readonly ("id" | "name" | "emailAddress" | "accountId" | "isPrimary")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destSchema: "account";
-                    readonly cardinality: "one";
-                }];
-            };
-            readonly accountLabel: {
-                account: [{
-                    readonly sourceField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
-                    readonly destSchema: "account";
+            readonly contact: {
+                user: [{
+                    readonly sourceField: readonly ("emailAddress" | "id" | "name" | "userId")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
-                threads: [{
-                    readonly sourceField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destSchema: "threadLabel";
-                    readonly cardinality: "many";
-                }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destSchema: "thread";
-                    readonly cardinality: "many";
-                }];
             };
             readonly draft: {
                 account: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "one";
                 }];
                 attachments: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
                     readonly destField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
                     readonly destSchema: "draftAttachment";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
-            readonly draftAttachment: {
-                draft: [{
-                    readonly sourceField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
-                    readonly destField: readonly ("type" | "status" | "id" | "userId" | "accountId" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "scheduledFor" | "updatedAt" | "body" | "error" | "subject")[];
-                    readonly destSchema: "draft";
-                    readonly cardinality: "one";
-                }];
-            };
             readonly thread: {
                 account: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "userId" | "color" | "displayName" | "imapConnectionStatus" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
                     readonly destSchema: "account";
                     readonly cardinality: "one";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
                     readonly destSchema: "threadLabel";
                     readonly cardinality: "many";
                 }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 messages: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "many";
                 }];
                 threadByLabel: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
                     readonly destSchema: "threadByLabel";
                     readonly cardinality: "many";
                 }];
                 user: [{
-                    readonly sourceField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
-                    readonly destField: readonly ("id" | "profilePicture" | "undoSendEnabled" | "name" | "views")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
                     readonly destSchema: "user";
                     readonly cardinality: "one";
                 }];
             };
+            readonly userPushNotificationToken: {
+                user: [{
+                    readonly sourceField: readonly ("id" | "userId" | "createdAt" | "token")[];
+                    readonly destField: readonly ("id" | "name" | "views" | "profilePicture" | "undoSendEnabled")[];
+                    readonly destSchema: "user";
+                    readonly cardinality: "one";
+                }];
+            };
+            readonly accountAlias: {
+                account: [{
+                    readonly sourceField: readonly ("accountId" | "emailAddress" | "id" | "isPrimary" | "name")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destSchema: "account";
+                    readonly cardinality: "one";
+                }];
+            };
+            readonly accountLabel: {
+                account: [{
+                    readonly sourceField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
+                    readonly destField: readonly ("id" | "imapConnectionStatus" | "color" | "displayName" | "mailProcessedCount" | "mailTotalCount" | "primaryAliasId" | "userId")[];
+                    readonly destSchema: "account";
+                    readonly cardinality: "one";
+                }];
+                threads: [{
+                    readonly sourceField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destSchema: "threadLabel";
+                    readonly cardinality: "many";
+                }, {
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
+                    readonly destSchema: "thread";
+                    readonly cardinality: "many";
+                }];
+            };
+            readonly draftAttachment: {
+                draft: [{
+                    readonly sourceField: readonly ("status" | "id" | "draftId" | "fileName" | "mimeType" | "totalSize")[];
+                    readonly destField: readonly ("type" | "status" | "accountId" | "id" | "userId" | "scheduledFor" | "body" | "error" | "fromAliasId" | "fromEmail" | "fromName" | "referencedMessageId" | "subject" | "updatedAt")[];
+                    readonly destSchema: "draft";
+                    readonly cardinality: "one";
+                }];
+            };
             readonly threadLabel: {
                 label: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "one";
                 }];
                 message: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadByLabel: {
                 label: [{
-                    readonly sourceField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "one";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("latestMessageDate" | "labelId" | "threadId")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("threadId" | "latestMessageDate" | "labelId")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessage: {
                 attachments: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("id" | "fileName" | "mimeType" | "threadMessageId" | "size")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("id" | "fileName" | "mimeType" | "size" | "threadMessageId")[];
                     readonly destSchema: "threadMessageAttachment";
                     readonly cardinality: "many";
                 }];
                 labels: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
                     readonly destSchema: "threadLabel";
                     readonly cardinality: "many";
                 }, {
-                    readonly sourceField: readonly ("accountId" | "uidValidity" | "labelId" | "lastSyncedAt" | "threadId" | "threadMessageId" | "uid")[];
-                    readonly destField: readonly ("id" | "name" | "accountId" | "path" | "specialUse" | "uidValidity" | "unreadCount")[];
+                    readonly sourceField: readonly ("accountId" | "uidValidity" | "threadMessageId" | "threadId" | "labelId" | "lastSyncedAt" | "uid")[];
+                    readonly destField: readonly ("accountId" | "id" | "name" | "specialUse" | "path" | "uidValidity" | "unreadCount")[];
                     readonly destSchema: "accountLabel";
                     readonly cardinality: "many";
                 }];
                 recipients: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("type" | "id" | "name" | "emailAddress" | "threadMessageId")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("type" | "emailAddress" | "id" | "name" | "threadMessageId")[];
                     readonly destSchema: "threadMessageRecipient";
                     readonly cardinality: "many";
                 }];
                 thread: [{
-                    readonly sourceField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
-                    readonly destField: readonly ("id" | "userId" | "accountId" | "subject" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "previewText" | "seen" | "senderEmail" | "senderName" | "words")[];
+                    readonly sourceField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
+                    readonly destField: readonly ("accountId" | "id" | "userId" | "subject" | "previewText" | "senderEmail" | "senderName" | "flagged" | "hasAttachments" | "labelIdList" | "latestMessageDate" | "latestMessageId" | "messageCount" | "seen" | "words")[];
                     readonly destSchema: "thread";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessageRecipient: {
                 message: [{
-                    readonly sourceField: readonly ("type" | "id" | "name" | "emailAddress" | "threadMessageId")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("type" | "emailAddress" | "id" | "name" | "threadMessageId")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];
             };
             readonly threadMessageAttachment: {
                 message: [{
-                    readonly sourceField: readonly ("id" | "fileName" | "mimeType" | "threadMessageId" | "size")[];
-                    readonly destField: readonly ("id" | "accountId" | "previewText" | "senderEmail" | "senderName" | "threadId" | "envelopeDate" | "envelopeSubject" | "unsubscribeUrl")[];
+                    readonly sourceField: readonly ("id" | "fileName" | "mimeType" | "size" | "threadMessageId")[];
+                    readonly destField: readonly ("accountId" | "id" | "envelopeDate" | "envelopeSubject" | "previewText" | "senderEmail" | "senderName" | "threadId" | "unsubscribeUrl")[];
                     readonly destSchema: "threadMessage";
                     readonly cardinality: "one";
                 }];