@remit/drizzle-pg-schema 0.0.34 → 0.0.35

package/dist/schema.d.ts

@@ -601,6 +601,168 @@ export declare const quarantines: import("drizzle-orm/pg-core").PgTableWithColum
     };
     dialect: "pg";
 }>;
+export declare const syncWarnings: import("drizzle-orm/pg-core").PgTableWithColumns<{
+    name: "sync_warning";
+    schema: undefined;
+    columns: {
+        syncWarningId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "sync_warning_id";
+            tableName: "sync_warning";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: true;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        accountConfigId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "account_config_id";
+            tableName: "sync_warning";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        accountId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "account_id";
+            tableName: "sync_warning";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        mailboxId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "mailbox_id";
+            tableName: "sync_warning";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        uidValidity: import("drizzle-orm/pg-core").PgColumn<{
+            name: "uid_validity";
+            tableName: "sync_warning";
+            dataType: "number";
+            columnType: "PgBigInt53";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        uid: import("drizzle-orm/pg-core").PgColumn<{
+            name: "uid";
+            tableName: "sync_warning";
+            dataType: "number";
+            columnType: "PgBigInt53";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        stage: import("drizzle-orm/pg-core").PgColumn<{
+            name: "stage";
+            tableName: "sync_warning";
+            dataType: "string";
+            columnType: "PgText";
+            data: "Header" | "Body";
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            $type: "Header" | "Body";
+        }>;
+        attempts: import("drizzle-orm/pg-core").PgColumn<{
+            name: "attempts";
+            tableName: "sync_warning";
+            dataType: "number";
+            columnType: "PgInteger";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        createdAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: "created_at";
+            tableName: "sync_warning";
+            dataType: "number";
+            columnType: "PgBigInt53";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "pg";
+}>;
 export declare const accountConfigs: import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "account_config";
     schema: undefined;
@@ -1921,23 +2083,6 @@ export declare const filters: import("drizzle-orm/pg-core").PgTableWithColumns<{
         }, {}, {
             $type: "None" | "UserDisabled" | "AwaitingFolder" | "FolderCreateFailed" | "FolderMissing";
         }>;
-        hasAnchor: import("drizzle-orm/pg-core").PgColumn<{
-            name: "has_anchor";
-            tableName: "filter";
-            dataType: "boolean";
-            columnType: "PgBoolean";
-            data: boolean;
-            driverParam: boolean;
-            notNull: true;
-            hasDefault: true;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
         ruleChangedAt: import("drizzle-orm/pg-core").PgColumn<{
             name: "rule_changed_at";
             tableName: "filter";
@@ -1999,7 +2144,7 @@ export declare const filters: import("drizzle-orm/pg-core").PgTableWithColumns<{
             data: unknown;
             driverParam: unknown;
             notNull: true;
-            hasDefault: true;
+            hasDefault: false;
             isPrimaryKey: false;
             isAutoincrement: false;
             hasRuntimeDefault: false;
@@ -2298,23 +2443,6 @@ export declare const organizeJobRequests: import("drizzle-orm/pg-core").PgTableW
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        anchorMessageId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "anchor_message_id";
-            tableName: "organize_job_request";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: true;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
         matchOperator: import("drizzle-orm/pg-core").PgColumn<{
             name: "match_operator";
             tableName: "organize_job_request";
@@ -2351,23 +2479,6 @@ export declare const organizeJobRequests: import("drizzle-orm/pg-core").PgTableW
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        similarityThreshold: import("drizzle-orm/pg-core").PgColumn<{
-            name: "similarity_threshold";
-            tableName: "organize_job_request";
-            dataType: "number";
-            columnType: "PgDoublePrecision";
-            data: number;
-            driverParam: string | number;
-            notNull: true;
-            hasDefault: true;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
         actionLabelId: import("drizzle-orm/pg-core").PgColumn<{
             name: "action_label_id";
             tableName: "organize_job_request";
@@ -4494,7 +4605,7 @@ export declare const addresses: import("drizzle-orm/pg-core").PgTableWithColumns
     };
     dialect: "pg";
 }>;
-export declare const messages: import("drizzle-orm/pg-core").PgTableWithColumns<{
+export declare const messageRecords: import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "message";
     schema: undefined;
     columns: {
@@ -4600,25 +4711,6 @@ export declare const messages: import("drizzle-orm/pg-core").PgTableWithColumns<
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        messageIdHeader: import("drizzle-orm/pg-core").PgColumn<{
-            name: "message_id_header";
-            tableName: "message";
-            dataType: "custom";
-            columnType: "PgCustomColumn";
-            data: string;
-            driverParam: string;
-            notNull: false;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {
-            pgColumnBuilderBrand: "PgCustomColumnBuilderBrand";
-        }>;
         envelopeId: import("drizzle-orm/pg-core").PgColumn<{
             name: "envelope_id";
             tableName: "message";
@@ -7528,6 +7620,64 @@ export declare const bodyPartParameters: import("drizzle-orm/pg-core").PgTableWi
     };
     dialect: "pg";
 }>;
+export declare const bodyStructureRefetches: import("drizzle-orm/pg-core").PgTableWithColumns<{
+    name: "body_structure_refetch";
+    schema: undefined;
+    columns: {
+        messageId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "message_id";
+            tableName: "body_structure_refetch";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: true;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        createdAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: "created_at";
+            tableName: "body_structure_refetch";
+            dataType: "number";
+            columnType: "PgBigInt53";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        updatedAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: "updated_at";
+            tableName: "body_structure_refetch";
+            dataType: "number";
+            columnType: "PgBigInt53";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "pg";
+}>;
 export declare const rawMessageStorages: import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "raw_message_storage";
     schema: undefined;
@@ -7996,132 +8146,6 @@ export declare const bodyPartStorages: import("drizzle-orm/pg-core").PgTableWith
     };
     dialect: "pg";
 }>;
-export declare const bodyPartContents: import("drizzle-orm/pg-core").PgTableWithColumns<{
-    name: "body_part_content";
-    schema: undefined;
-    columns: {
-        bodyPartContentId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "body_part_content_id";
-            tableName: "body_part_content";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: true;
-            isPrimaryKey: true;
-            isAutoincrement: false;
-            hasRuntimeDefault: true;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        messageId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "message_id";
-            tableName: "body_part_content";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        bodyPartId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "body_part_id";
-            tableName: "body_part_content";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        content: import("drizzle-orm/pg-core").PgColumn<{
-            name: "content";
-            tableName: "body_part_content";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        contentLength: import("drizzle-orm/pg-core").PgColumn<{
-            name: "content_length";
-            tableName: "body_part_content";
-            dataType: "number";
-            columnType: "PgBigInt53";
-            data: number;
-            driverParam: string | number;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        createdAt: import("drizzle-orm/pg-core").PgColumn<{
-            name: "created_at";
-            tableName: "body_part_content";
-            dataType: "number";
-            columnType: "PgBigInt53";
-            data: number;
-            driverParam: string | number;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        updatedAt: import("drizzle-orm/pg-core").PgColumn<{
-            name: "updated_at";
-            tableName: "body_part_content";
-            dataType: "number";
-            columnType: "PgBigInt53";
-            data: number;
-            driverParam: string | number;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-    };
-    dialect: "pg";
-}>;
 export declare const calendarEventIndexes: import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "calendar_event_index";
     schema: undefined;
@@ -8574,146 +8598,3 @@ export declare const messageLabels: import("drizzle-orm/pg-core").PgTableWithCol
     };
     dialect: "pg";
 }>;
-export declare const filterAnchors: import("drizzle-orm/pg-core").PgTableWithColumns<{
-    name: "filter_anchor";
-    schema: undefined;
-    columns: {
-        accountConfigId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "account_config_id";
-            tableName: "filter_anchor";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        filterId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "filter_id";
-            tableName: "filter_anchor";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        anchorEmbedding: import("drizzle-orm/pg-core").PgColumn<{
-            name: "anchor_embedding";
-            tableName: "filter_anchor";
-            dataType: "json";
-            columnType: "PgJsonb";
-            data: unknown;
-            driverParam: unknown;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        anchorEmbeddingId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "anchor_embedding_id";
-            tableName: "filter_anchor";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        anchorSourceText: import("drizzle-orm/pg-core").PgColumn<{
-            name: "anchor_source_text";
-            tableName: "filter_anchor";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        anchorMessageId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "anchor_message_id";
-            tableName: "filter_anchor";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        createdAt: import("drizzle-orm/pg-core").PgColumn<{
-            name: "created_at";
-            tableName: "filter_anchor";
-            dataType: "number";
-            columnType: "PgBigInt53";
-            data: number;
-            driverParam: string | number;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        updatedAt: import("drizzle-orm/pg-core").PgColumn<{
-            name: "updated_at";
-            tableName: "filter_anchor";
-            dataType: "number";
-            columnType: "PgBigInt53";
-            data: number;
-            driverParam: string | number;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-    };
-    dialect: "pg";
-}>;

package/dist/schema.js

@@ -1,4 +1,4 @@
-import { bigint, boolean, doublePrecision, index, integer, jsonb, pgTable, primaryKey, text, uniqueIndex } from "drizzle-orm/pg-core";
+import { bigint, boolean, index, integer, jsonb, pgTable, primaryKey, text, uniqueIndex } from "drizzle-orm/pg-core";
 import { generateBase36Id, nullableBigint, nullableInteger, nullableText } from "./types.js";
 export const accountExportRequests = pgTable("account_export_request", {
     accountExportRequestId: text("account_export_request_id").primaryKey().$defaultFn(() => generateBase36Id()),
@@ -41,6 +41,20 @@ export const quarantines = pgTable("quarantine", {
 }, (table) => [
     index("quarantine_by_account_config_id").on(table.accountConfigId, table.quarantinedAt),
 ]);
+export const syncWarnings = pgTable("sync_warning", {
+    syncWarningId: text("sync_warning_id").primaryKey().$defaultFn(() => generateBase36Id()),
+    accountConfigId: text("account_config_id").notNull(),
+    accountId: text("account_id").notNull(),
+    mailboxId: text("mailbox_id").notNull(),
+    uidValidity: bigint("uid_validity", { mode: "number" }).notNull(),
+    uid: bigint("uid", { mode: "number" }).notNull(),
+    stage: text("stage").$type().notNull(),
+    attempts: integer("attempts").notNull(),
+    createdAt: bigint("created_at", { mode: "number" }).notNull(),
+}, (table) => [
+    index("sync_warning_by_mailbox_id").on(table.mailboxId),
+    index("sync_warning_by_account_config_id").on(table.accountConfigId, table.createdAt),
+]);
 export const accountConfigs = pgTable("account_config", {
     accountConfigId: text("account_config_id").primaryKey().$defaultFn(() => generateBase36Id()),
     userId: text("user_id").notNull(),
@@ -128,11 +142,10 @@ export const filters = pgTable("filter", {
     ttl: nullableBigint("ttl"),
     state: text("state").$type().notNull().default("Active"),
     disabledReason: text("disabled_reason").$type().notNull().default("None"),
-    hasAnchor: boolean("has_anchor").notNull().default(false),
     ruleChangedAt: bigint("rule_changed_at", { mode: "number" }).notNull(),
     actionChangedAt: bigint("action_changed_at", { mode: "number" }).notNull(),
     matchOperator: text("match_operator").$type().notNull().default("And"),
-    literalClauses: jsonb("literal_clauses").notNull().default([]),
+    literalClauses: jsonb("literal_clauses").notNull(),
     actionLabelId: text("action_label_id").notNull().default("None"),
     actionMailboxId: text("action_mailbox_id").notNull().default("None"),
     createdAt: bigint("created_at", { mode: "number" }).notNull(),
@@ -159,10 +172,8 @@ export const organizeJobRequests = pgTable("organize_job_request", {
     userId: text("user_id").notNull(),
     state: text("state").$type().notNull().default("Pending"),
     filterId: text("filter_id").notNull().default("None"),
-    anchorMessageId: text("anchor_message_id").notNull().default("None"),
     matchOperator: text("match_operator").$type().notNull().default("And"),
     literalClauses: jsonb("literal_clauses").notNull().default([]),
-    similarityThreshold: doublePrecision("similarity_threshold").notNull().default(0.75),
     actionLabelId: text("action_label_id").notNull().default("None"),
     actionMailboxId: text("action_mailbox_id").notNull().default("None"),
     matchedCount: integer("matched_count").notNull().default(0),
@@ -321,14 +332,13 @@ export const addresses = pgTable("address", {
 }, (table) => [
     index("address_by_account_config_id").on(table.accountConfigId, table.normalizedCompound),
 ]);
-export const messages = pgTable("message", {
+export const messageRecords = pgTable("message", {
     messageId: text("message_id").primaryKey().$defaultFn(() => generateBase36Id()),
     mailboxId: text("mailbox_id").notNull(),
     uid: bigint("uid", { mode: "number" }).notNull(),
     sequenceNumber: integer("sequence_number").notNull(),
     rfc822Size: bigint("rfc822_size", { mode: "number" }).notNull(),
     internalDate: bigint("internal_date", { mode: "number" }).notNull(),
-    messageIdHeader: nullableText("message_id_header"),
     envelopeId: text("envelope_id").notNull(),
     rootBodyPartId: text("root_body_part_id").notNull(),
     bodyStorageKey: nullableText("body_storage_key"),
@@ -563,6 +573,11 @@ export const bodyPartParameters = pgTable("body_part_parameter", {
 }, (table) => [
     index("body_part_parameter_by_message_id").on(table.messageId, table.bodyPartParameterId),
 ]);
+export const bodyStructureRefetches = pgTable("body_structure_refetch", {
+    messageId: text("message_id").primaryKey().$defaultFn(() => generateBase36Id()),
+    createdAt: bigint("created_at", { mode: "number" }).notNull(),
+    updatedAt: bigint("updated_at", { mode: "number" }).notNull(),
+});
 export const rawMessageStorages = pgTable("raw_message_storage", {
     rawStorageId: text("raw_storage_id").primaryKey().$defaultFn(() => generateBase36Id()),
     messageId: text("message_id").notNull(),
@@ -597,17 +612,6 @@ export const bodyPartStorages = pgTable("body_part_storage", {
 }, (table) => [
     index("body_part_storage_by_message_id").on(table.messageId, table.bodyPartStorageId),
 ]);
-export const bodyPartContents = pgTable("body_part_content", {
-    bodyPartContentId: text("body_part_content_id").primaryKey().$defaultFn(() => generateBase36Id()),
-    messageId: text("message_id").notNull(),
-    bodyPartId: text("body_part_id").notNull(),
-    content: text("content").notNull(),
-    contentLength: bigint("content_length", { mode: "number" }).notNull(),
-    createdAt: bigint("created_at", { mode: "number" }).notNull(),
-    updatedAt: bigint("updated_at", { mode: "number" }).notNull(),
-}, (table) => [
-    index("body_part_content_by_message_id").on(table.messageId, table.bodyPartContentId),
-]);
 export const calendarEventIndexes = pgTable("calendar_event_index", {
     calendarId: text("calendar_id").notNull(),
     calendarObjectId: text("calendar_object_id").notNull(),
@@ -648,15 +652,3 @@ export const messageLabels = pgTable("message_label", {
     index("message_label_by_label_id").on(table.accountConfigId, table.labelId, table.createdAt),
     index("message_label_by_message_id").on(table.messageId, table.labelId),
 ]);
-export const filterAnchors = pgTable("filter_anchor", {
-    accountConfigId: text("account_config_id").notNull(),
-    filterId: text("filter_id").notNull(),
-    anchorEmbedding: jsonb("anchor_embedding").notNull(),
-    anchorEmbeddingId: text("anchor_embedding_id").notNull(),
-    anchorSourceText: text("anchor_source_text").notNull(),
-    anchorMessageId: text("anchor_message_id").notNull(),
-    createdAt: bigint("created_at", { mode: "number" }).notNull(),
-    updatedAt: bigint("updated_at", { mode: "number" }).notNull(),
-}, (table) => [
-    primaryKey({ name: "filter_anchor_pk", columns: [table.accountConfigId, table.filterId] }),
-]);

package/dist/types.d.ts

@@ -1,4 +1,31 @@
-/** UUID column that stores as native pg uuid, reads/writes as base36 */
+/** UUID column stored as native pg uuid, reads/writes as base36 */
+export declare const canonicalUuid: {
+    (): import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+        name: "";
+        dataType: "custom";
+        columnType: "PgCustomColumn";
+        data: string;
+        driverParam: string;
+        enumValues: undefined;
+    }>;
+    <TConfig extends Record<string, any>>(fieldConfig?: TConfig): import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+        name: "";
+        dataType: "custom";
+        columnType: "PgCustomColumn";
+        data: string;
+        driverParam: string;
+        enumValues: undefined;
+    }>;
+    <TName extends string>(dbName: TName, fieldConfig?: unknown): import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+        name: TName;
+        dataType: "custom";
+        columnType: "PgCustomColumn";
+        data: string;
+        driverParam: string;
+        enumValues: undefined;
+    }>;
+};
+/** UUID column stored as the 25-character base36 string, reads/writes as base36 */
 export declare const base36Uuid: {
     (): import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
         name: "";
@@ -25,6 +52,33 @@ export declare const base36Uuid: {
         enumValues: undefined;
     }>;
 };
+/** UUID column stored as native pg uuid — 16 bytes on disk — reads/writes as base36 */
+export declare const rawUuid: {
+    (): import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+        name: "";
+        dataType: "custom";
+        columnType: "PgCustomColumn";
+        data: string;
+        driverParam: string;
+        enumValues: undefined;
+    }>;
+    <TConfig extends Record<string, any>>(fieldConfig?: TConfig): import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+        name: "";
+        dataType: "custom";
+        columnType: "PgCustomColumn";
+        data: string;
+        driverParam: string;
+        enumValues: undefined;
+    }>;
+    <TName extends string>(dbName: TName, fieldConfig?: unknown): import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+        name: TName;
+        dataType: "custom";
+        columnType: "PgCustomColumn";
+        data: string;
+        driverParam: string;
+        enumValues: undefined;
+    }>;
+};
 export declare function generateBase36Id(): string;
 export declare const nullableText: {
     (): import("drizzle-orm/pg-core").PgCustomColumnBuilder<{

package/dist/types.js

@@ -1,14 +1,140 @@
 import { customType } from "drizzle-orm/pg-core";
-import short from "short-uuid";
-const translator = short(short.constants.uuid25Base36);
-/** UUID column that stores as native pg uuid, reads/writes as base36 */
+const base36Digits = "0123456789abcdefghijklmnopqrstuvwxyz";
+const hexDigits = "0123456789abcdef";
+const base36Values = (() => {
+    const table = new Int8Array(128).fill(-1);
+    for (let i = 0; i < base36Digits.length; i += 1)
+        table[base36Digits.charCodeAt(i)] = i;
+    return table;
+})();
+const hexValues = (() => {
+    const table = new Int8Array(128).fill(-1);
+    for (let i = 0; i < hexDigits.length; i += 1) {
+        table[hexDigits.charCodeAt(i)] = i;
+        table[hexDigits.toUpperCase().charCodeAt(i)] = i;
+    }
+    return table;
+})();
+const hexOctets = (() => {
+    const table = [];
+    for (let i = 0; i < 256; i += 1)
+        table.push(i.toString(16).padStart(2, "0"));
+    return table;
+})();
+const base36Scales = [1, 36, 1296, 46656, 1679616, 60466176];
+function readBase36(id, start, count) {
+    let value = 0;
+    for (let i = start; i < start + count; i += 1) {
+        const code = id.charCodeAt(i);
+        const digit = code < 128 ? base36Values[code] : -1;
+        if (digit < 0)
+            throw new Error(`Not a base36 uuid: ${id}`);
+        value = value * 36 + digit;
+    }
+    return value;
+}
+function scaleAndAdd(limbs, scale, addend) {
+    let carry = addend;
+    for (let i = 7; i >= 0; i -= 1) {
+        const product = limbs[i] * scale + carry;
+        const low = product % 65536;
+        limbs[i] = low;
+        carry = (product - low) / 65536;
+    }
+    return carry;
+}
+function base36ToBytes(id) {
+    if (id.length === 0 || id.length > 25)
+        throw new Error(`Not a base36 uuid: ${id}`);
+    const limbs = new Uint32Array(8);
+    const head = id.length % 5;
+    if (head > 0 && scaleAndAdd(limbs, base36Scales[head], readBase36(id, 0, head)) !== 0) {
+        throw new Error(`base36 uuid does not fit in 128 bits: ${id}`);
+    }
+    for (let cursor = head; cursor < id.length; cursor += 5) {
+        if (scaleAndAdd(limbs, 60466176, readBase36(id, cursor, 5)) !== 0) {
+            throw new Error(`base36 uuid does not fit in 128 bits: ${id}`);
+        }
+    }
+    const bytes = new Uint8Array(16);
+    for (let i = 0; i < 8; i += 1) {
+        bytes[i * 2] = limbs[i] >>> 8;
+        bytes[i * 2 + 1] = limbs[i] & 0xff;
+    }
+    return bytes;
+}
+function bytesToBase36(bytes) {
+    if (bytes.length !== 16)
+        throw new Error(`Not a 16-byte uuid: ${bytes.length} bytes`);
+    const limbs = new Uint32Array(8);
+    for (let i = 0; i < 8; i += 1)
+        limbs[i] = (bytes[i * 2] << 8) | bytes[i * 2 + 1];
+    let id = "";
+    for (let chunk = 0; chunk < 5; chunk += 1) {
+        let remainder = 0;
+        for (let i = 0; i < 8; i += 1) {
+            const current = remainder * 65536 + limbs[i];
+            const quotient = Math.floor(current / 60466176);
+            limbs[i] = quotient;
+            remainder = current - quotient * 60466176;
+        }
+        let piece = "";
+        for (let i = 0; i < 5; i += 1) {
+            const digit = remainder % 36;
+            piece = base36Digits[digit] + piece;
+            remainder = (remainder - digit) / 36;
+        }
+        id = piece + id;
+    }
+    return id;
+}
+function uuidToBytes(uuid) {
+    const bytes = new Uint8Array(16);
+    let cursor = 0;
+    for (let i = 0; i < 16; i += 1) {
+        if (uuid.charCodeAt(cursor) === 45)
+            cursor += 1;
+        const high = readHex(uuid, cursor);
+        const low = readHex(uuid, cursor + 1);
+        bytes[i] = (high << 4) | low;
+        cursor += 2;
+    }
+    if (cursor !== uuid.length)
+        throw new Error(`Not a uuid: ${uuid}`);
+    return bytes;
+}
+function readHex(uuid, index) {
+    const code = uuid.charCodeAt(index);
+    const value = code < 128 ? hexValues[code] : -1;
+    if (value < 0)
+        throw new Error(`Not a uuid: ${uuid}`);
+    return value;
+}
+function bytesToUuid(bytes) {
+    return `${hexOctets[bytes[0]]}${hexOctets[bytes[1]]}${hexOctets[bytes[2]]}${hexOctets[bytes[3]]}-${hexOctets[bytes[4]]}${hexOctets[bytes[5]]}-${hexOctets[bytes[6]]}${hexOctets[bytes[7]]}-${hexOctets[bytes[8]]}${hexOctets[bytes[9]]}-${hexOctets[bytes[10]]}${hexOctets[bytes[11]]}${hexOctets[bytes[12]]}${hexOctets[bytes[13]]}${hexOctets[bytes[14]]}${hexOctets[bytes[15]]}`;
+}
+/** UUID column stored as native pg uuid, reads/writes as base36 */
+export const canonicalUuid = customType({
+    dataType: () => "uuid",
+    toDriver: (value) => bytesToUuid(base36ToBytes(value)),
+    fromDriver: (value) => bytesToBase36(uuidToBytes(value)),
+});
+/** UUID column stored as the 25-character base36 string, reads/writes as base36 */
 export const base36Uuid = customType({
+    dataType: () => "text",
+});
+/** UUID column stored as native pg uuid — 16 bytes on disk — reads/writes as base36 */
+export const rawUuid = customType({
     dataType: () => "uuid",
-    toDriver: (value) => translator.toUUID(value),
-    fromDriver: (value) => translator.fromUUID(value),
+    toDriver: (value) => bytesToUuid(base36ToBytes(value)),
+    fromDriver: (value) => bytesToBase36(uuidToBytes(value)),
 });
 export function generateBase36Id() {
-    return translator.new();
+    const bytes = new Uint8Array(16);
+    crypto.getRandomValues(bytes);
+    bytes[6] = (bytes[6] & 0x0f) | 0x40;
+    bytes[8] = (bytes[8] & 0x3f) | 0x80;
+    return bytesToBase36(bytes);
 }
 export const nullableText = customType({
     dataType: () => "text",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-pg-schema",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,9 +15,6 @@
     "build": "tsc",
     "prepare": "tsc"
   },
-  "dependencies": {
-    "short-uuid": "^5.2.0"
-  },
   "peerDependencies": {
     "drizzle-orm": ">=0.30.0",
     "typescript": ">=5.0.0"

package/schema.ts

@@ -1,4 +1,4 @@
-import { bigint, boolean, doublePrecision, index, integer, jsonb, pgTable, primaryKey, text, uniqueIndex } from "drizzle-orm/pg-core";
+import { bigint, boolean, index, integer, jsonb, pgTable, primaryKey, text, uniqueIndex } from "drizzle-orm/pg-core";
 import { generateBase36Id, nullableBigint, nullableInteger, nullableText } from "./types.js";
 
 export const accountExportRequests = pgTable(
@@ -52,6 +52,25 @@ export const quarantines = pgTable(
   ],
 );
 
+export const syncWarnings = pgTable(
+  "sync_warning",
+  {
+    syncWarningId: text("sync_warning_id").primaryKey().$defaultFn(() => generateBase36Id()),
+    accountConfigId: text("account_config_id").notNull(),
+    accountId: text("account_id").notNull(),
+    mailboxId: text("mailbox_id").notNull(),
+    uidValidity: bigint("uid_validity", { mode: "number" }).notNull(),
+    uid: bigint("uid", { mode: "number" }).notNull(),
+    stage: text("stage").$type<"Header" | "Body">().notNull(),
+    attempts: integer("attempts").notNull(),
+    createdAt: bigint("created_at", { mode: "number" }).notNull(),
+  },
+  (table) => [
+    index("sync_warning_by_mailbox_id").on(table.mailboxId),
+    index("sync_warning_by_account_config_id").on(table.accountConfigId, table.createdAt),
+  ],
+);
+
 export const accountConfigs = pgTable(
   "account_config",
   {
@@ -156,11 +175,10 @@ export const filters = pgTable(
     ttl: nullableBigint("ttl"),
     state: text("state").$type<"Active" | "Expired" | "Disabled">().notNull().default("Active"),
     disabledReason: text("disabled_reason").$type<"None" | "UserDisabled" | "AwaitingFolder" | "FolderCreateFailed" | "FolderMissing">().notNull().default("None"),
-    hasAnchor: boolean("has_anchor").notNull().default(false),
     ruleChangedAt: bigint("rule_changed_at", { mode: "number" }).notNull(),
     actionChangedAt: bigint("action_changed_at", { mode: "number" }).notNull(),
     matchOperator: text("match_operator").$type<"And" | "Or">().notNull().default("And"),
-    literalClauses: jsonb("literal_clauses").notNull().default([]),
+    literalClauses: jsonb("literal_clauses").notNull(),
     actionLabelId: text("action_label_id").notNull().default("None"),
     actionMailboxId: text("action_mailbox_id").notNull().default("None"),
     createdAt: bigint("created_at", { mode: "number" }).notNull(),
@@ -197,10 +215,8 @@ export const organizeJobRequests = pgTable(
     userId: text("user_id").notNull(),
     state: text("state").$type<"Pending" | "Running" | "Complete" | "Failed">().notNull().default("Pending"),
     filterId: text("filter_id").notNull().default("None"),
-    anchorMessageId: text("anchor_message_id").notNull().default("None"),
     matchOperator: text("match_operator").$type<"And" | "Or">().notNull().default("And"),
     literalClauses: jsonb("literal_clauses").notNull().default([]),
-    similarityThreshold: doublePrecision("similarity_threshold").notNull().default(0.75),
     actionLabelId: text("action_label_id").notNull().default("None"),
     actionMailboxId: text("action_mailbox_id").notNull().default("None"),
     matchedCount: integer("matched_count").notNull().default(0),
@@ -392,7 +408,7 @@ export const addresses = pgTable(
   ],
 );
 
-export const messages = pgTable(
+export const messageRecords = pgTable(
   "message",
   {
     messageId: text("message_id").primaryKey().$defaultFn(() => generateBase36Id()),
@@ -401,7 +417,6 @@ export const messages = pgTable(
     sequenceNumber: integer("sequence_number").notNull(),
     rfc822Size: bigint("rfc822_size", { mode: "number" }).notNull(),
     internalDate: bigint("internal_date", { mode: "number" }).notNull(),
-    messageIdHeader: nullableText("message_id_header"),
     envelopeId: text("envelope_id").notNull(),
     rootBodyPartId: text("root_body_part_id").notNull(),
     bodyStorageKey: nullableText("body_storage_key"),
@@ -719,6 +734,12 @@ export const bodyPartParameters = pgTable(
   ],
 );
 
+export const bodyStructureRefetches = pgTable("body_structure_refetch", {
+  messageId: text("message_id").primaryKey().$defaultFn(() => generateBase36Id()),
+  createdAt: bigint("created_at", { mode: "number" }).notNull(),
+  updatedAt: bigint("updated_at", { mode: "number" }).notNull(),
+});
+
 export const rawMessageStorages = pgTable(
   "raw_message_storage",
   {
@@ -763,22 +784,6 @@ export const bodyPartStorages = pgTable(
   ],
 );
 
-export const bodyPartContents = pgTable(
-  "body_part_content",
-  {
-    bodyPartContentId: text("body_part_content_id").primaryKey().$defaultFn(() => generateBase36Id()),
-    messageId: text("message_id").notNull(),
-    bodyPartId: text("body_part_id").notNull(),
-    content: text("content").notNull(),
-    contentLength: bigint("content_length", { mode: "number" }).notNull(),
-    createdAt: bigint("created_at", { mode: "number" }).notNull(),
-    updatedAt: bigint("updated_at", { mode: "number" }).notNull(),
-  },
-  (table) => [
-    index("body_part_content_by_message_id").on(table.messageId, table.bodyPartContentId),
-  ],
-);
-
 export const calendarEventIndexes = pgTable(
   "calendar_event_index",
   {
@@ -833,20 +838,3 @@ export const messageLabels = pgTable(
     index("message_label_by_message_id").on(table.messageId, table.labelId),
   ],
 );
-
-export const filterAnchors = pgTable(
-  "filter_anchor",
-  {
-    accountConfigId: text("account_config_id").notNull(),
-    filterId: text("filter_id").notNull(),
-    anchorEmbedding: jsonb("anchor_embedding").notNull(),
-    anchorEmbeddingId: text("anchor_embedding_id").notNull(),
-    anchorSourceText: text("anchor_source_text").notNull(),
-    anchorMessageId: text("anchor_message_id").notNull(),
-    createdAt: bigint("created_at", { mode: "number" }).notNull(),
-    updatedAt: bigint("updated_at", { mode: "number" }).notNull(),
-  },
-  (table) => [
-    primaryKey({ name: "filter_anchor_pk", columns: [table.accountConfigId, table.filterId] }),
-  ],
-);

package/types.ts

@@ -1,20 +1,156 @@
 import { customType } from "drizzle-orm/pg-core";
-import short from "short-uuid";
 
-const translator = short(short.constants.uuid25Base36);
+const base36Digits = "0123456789abcdefghijklmnopqrstuvwxyz";
+const hexDigits = "0123456789abcdef";
 
-/** UUID column that stores as native pg uuid, reads/writes as base36 */
+const base36Values = ((): Int8Array => {
+  const table = new Int8Array(128).fill(-1);
+  for (let i = 0; i < base36Digits.length; i += 1) table[base36Digits.charCodeAt(i)] = i;
+  return table;
+})();
+
+const hexValues = ((): Int8Array => {
+  const table = new Int8Array(128).fill(-1);
+  for (let i = 0; i < hexDigits.length; i += 1) {
+    table[hexDigits.charCodeAt(i)] = i;
+    table[hexDigits.toUpperCase().charCodeAt(i)] = i;
+  }
+  return table;
+})();
+
+const hexOctets = ((): string[] => {
+  const table: string[] = [];
+  for (let i = 0; i < 256; i += 1) table.push(i.toString(16).padStart(2, "0"));
+  return table;
+})();
+
+const base36Scales = [1, 36, 1296, 46656, 1679616, 60466176];
+
+function readBase36(id: string, start: number, count: number): number {
+  let value = 0;
+  for (let i = start; i < start + count; i += 1) {
+    const code = id.charCodeAt(i);
+    const digit = code < 128 ? base36Values[code] : -1;
+    if (digit < 0) throw new Error(`Not a base36 uuid: ${id}`);
+    value = value * 36 + digit;
+  }
+  return value;
+}
+
+function scaleAndAdd(limbs: Uint32Array, scale: number, addend: number): number {
+  let carry = addend;
+  for (let i = 7; i >= 0; i -= 1) {
+    const product = limbs[i] * scale + carry;
+    const low = product % 65536;
+    limbs[i] = low;
+    carry = (product - low) / 65536;
+  }
+  return carry;
+}
+
+function base36ToBytes(id: string): Uint8Array {
+  if (id.length === 0 || id.length > 25) throw new Error(`Not a base36 uuid: ${id}`);
+  const limbs = new Uint32Array(8);
+  const head = id.length % 5;
+  if (head > 0 && scaleAndAdd(limbs, base36Scales[head], readBase36(id, 0, head)) !== 0) {
+    throw new Error(`base36 uuid does not fit in 128 bits: ${id}`);
+  }
+  for (let cursor = head; cursor < id.length; cursor += 5) {
+    if (scaleAndAdd(limbs, 60466176, readBase36(id, cursor, 5)) !== 0) {
+      throw new Error(`base36 uuid does not fit in 128 bits: ${id}`);
+    }
+  }
+  const bytes = new Uint8Array(16);
+  for (let i = 0; i < 8; i += 1) {
+    bytes[i * 2] = limbs[i] >>> 8;
+    bytes[i * 2 + 1] = limbs[i] & 0xff;
+  }
+  return bytes;
+}
+
+function bytesToBase36(bytes: Uint8Array): string {
+  if (bytes.length !== 16) throw new Error(`Not a 16-byte uuid: ${bytes.length} bytes`);
+  const limbs = new Uint32Array(8);
+  for (let i = 0; i < 8; i += 1) limbs[i] = (bytes[i * 2] << 8) | bytes[i * 2 + 1];
+  let id = "";
+  for (let chunk = 0; chunk < 5; chunk += 1) {
+    let remainder = 0;
+    for (let i = 0; i < 8; i += 1) {
+      const current = remainder * 65536 + limbs[i];
+      const quotient = Math.floor(current / 60466176);
+      limbs[i] = quotient;
+      remainder = current - quotient * 60466176;
+    }
+    let piece = "";
+    for (let i = 0; i < 5; i += 1) {
+      const digit = remainder % 36;
+      piece = base36Digits[digit] + piece;
+      remainder = (remainder - digit) / 36;
+    }
+    id = piece + id;
+  }
+  return id;
+}
+
+function uuidToBytes(uuid: string): Uint8Array {
+  const bytes = new Uint8Array(16);
+  let cursor = 0;
+  for (let i = 0; i < 16; i += 1) {
+    if (uuid.charCodeAt(cursor) === 45) cursor += 1;
+    const high = readHex(uuid, cursor);
+    const low = readHex(uuid, cursor + 1);
+    bytes[i] = (high << 4) | low;
+    cursor += 2;
+  }
+  if (cursor !== uuid.length) throw new Error(`Not a uuid: ${uuid}`);
+  return bytes;
+}
+
+function readHex(uuid: string, index: number): number {
+  const code = uuid.charCodeAt(index);
+  const value = code < 128 ? hexValues[code] : -1;
+  if (value < 0) throw new Error(`Not a uuid: ${uuid}`);
+  return value;
+}
+
+function bytesToUuid(bytes: Uint8Array): string {
+  return `${hexOctets[bytes[0]]}${hexOctets[bytes[1]]}${hexOctets[bytes[2]]}${hexOctets[bytes[3]]}-${hexOctets[bytes[4]]}${hexOctets[bytes[5]]}-${hexOctets[bytes[6]]}${hexOctets[bytes[7]]}-${hexOctets[bytes[8]]}${hexOctets[bytes[9]]}-${hexOctets[bytes[10]]}${hexOctets[bytes[11]]}${hexOctets[bytes[12]]}${hexOctets[bytes[13]]}${hexOctets[bytes[14]]}${hexOctets[bytes[15]]}`;
+}
+
+/** UUID column stored as native pg uuid, reads/writes as base36 */
+export const canonicalUuid = customType<{
+  data: string;
+  driverData: string;
+}>({
+  dataType: () => "uuid",
+  toDriver: (value: string): string => bytesToUuid(base36ToBytes(value)),
+  fromDriver: (value: string): string => bytesToBase36(uuidToBytes(value)),
+});
+
+/** UUID column stored as the 25-character base36 string, reads/writes as base36 */
 export const base36Uuid = customType<{
   data: string;
   driverData: string;
+}>({
+  dataType: () => "text",
+});
+
+/** UUID column stored as native pg uuid — 16 bytes on disk — reads/writes as base36 */
+export const rawUuid = customType<{
+  data: string;
+  driverData: string;
 }>({
   dataType: () => "uuid",
-  toDriver: (value: string): string => translator.toUUID(value),
-  fromDriver: (value: string): string => translator.fromUUID(value),
+  toDriver: (value: string): string => bytesToUuid(base36ToBytes(value)),
+  fromDriver: (value: string): string => bytesToBase36(uuidToBytes(value)),
 });
 
 export function generateBase36Id(): string {
-  return translator.new();
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  bytes[6] = (bytes[6] & 0x0f) | 0x40;
+  bytes[8] = (bytes[8] & 0x3f) | 0x80;
+  return bytesToBase36(bytes);
 }
 
 export const nullableText = customType<{