Improve types.

Author: rkistner

modules/module-mongodb-storage/src/storage/implementation/v3/models.ts

@@ -176,13 +176,19 @@ export function taggedBucketParameterDocumentToV3(document: TaggedBucketParamete
   return rest as BucketParameterDocumentV3;
 }
 
+export interface ReplicaIdColumn {
+  name: string;
+  type_oid?: number;
+  type?: string;
+}
+
 export interface SourceTableDocumentV3 {
   _id: bson.ObjectId;
   connection_id: number;
   relation_id: number | string | undefined;
   schema_name: string;
   table_name: string;
-  replica_id_columns: { name: string; type_oid?: number; type?: string }[];
+  replica_id_columns: ReplicaIdColumn[];
   snapshot_done: boolean;
   snapshot_status: SourceTableDocumentSnapshotStatus | undefined;
   bucket_data_source_ids: BucketDefinitionId[];

modules/module-mongodb-storage/src/storage/implementation/v3/source-table-utils.ts

@@ -8,14 +8,15 @@ import {
   ParameterIndexId,
   ParameterIndexLookupCreator
 } from '@powersync/service-sync-rules';
+import * as bson from 'bson';
 import { BucketDefinitionMapping } from '../BucketDefinitionMapping.js';
-import { SourceTableDocumentV3 } from './models.js';
+import { ReplicaIdColumn, SourceTableDocumentV3 } from './models.js';
 
 export interface SourceTableIdentity {
   schema: string;
   name: string;
   objectId: number | string | undefined;
-  replicaIdColumns: NonNullable<SourceTableDocumentV3['replica_id_columns']>;
+  replicaIdColumns: ReplicaIdColumn[];
 }
 
 export interface SourceTableMembershipIds {
@@ -50,13 +51,13 @@ export interface SourceTableRetentionPlanningContext {
 
 export interface SourceTableRetentionPlan {
   coveredMembershipIds: SourceTableMembershipIdSets;
-  retainedDocIds: SourceTableDocumentV3['_id'][];
+  retainedDocIds: bson.ObjectId[];
   tables: storage.SourceTable[];
   narrowingUpdates: SourceTableMembershipUpdate[];
 }
 
 export interface SourceTableMembershipUpdate {
-  id: SourceTableDocumentV3['_id'];
+  id: bson.ObjectId;
   memberships: SourceTableMembershipIds;
 }
 
@@ -254,10 +255,7 @@ class SourceTableRetentionPlanner {
   }
 }
 
-export function sameReplicaIdColumns(
-  left: SourceTableDocumentV3['replica_id_columns'] | undefined,
-  right: NonNullable<SourceTableDocumentV3['replica_id_columns']>
-) {
+export function sameReplicaIdColumns(left: ReplicaIdColumn[] | undefined, right: ReplicaIdColumn[]) {
   return (
     left != null &&
     left.length == right.length &&
@@ -293,10 +291,10 @@ export function overlappingSourceTableFilter(
 }
 
 export function createNewSourceTable(options: {
-  id: SourceTableDocumentV3['_id'];
+  id: bson.ObjectId;
   connectionId: number;
   source: storage.SourceEntityDescriptor;
-  replicaIdColumns: NonNullable<SourceTableDocumentV3['replica_id_columns']>;
+  replicaIdColumns: ReplicaIdColumn[];
   memberships: SourceTableMembershipIds;
   syncRules: HydratedSyncConfig;
   mapping: BucketDefinitionMapping;
@@ -338,7 +336,7 @@ export function designateEventCarrier(tables: storage.SourceTable[], triggersEve
 
 export function conflictingSourceTableDocs(
   candidateDocs: SourceTableDocumentV3[],
-  retainedDocIds: SourceTableDocumentV3['_id'][],
+  retainedDocIds: bson.ObjectId[],
   currentIdentity: SourceTableIdentity,
   options: { dropSameIdentity: boolean }
 ) {