Skip to content

Commit 2017270

Browse files
committed
Use internal type for serialized schema
1 parent 6ec757b commit 2017270

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

packages/common/src/client/AbstractPowerSyncDatabase.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { CrudTransaction } from './sync/bucket/CrudTransaction.js';
2727
import {
2828
DEFAULT_CRUD_UPLOAD_THROTTLE_MS,
2929
DEFAULT_RETRY_DELAY_MS,
30+
InternalConnectionOptions,
3031
StreamingSyncImplementation,
3132
StreamingSyncImplementationListener,
3233
type AdditionalConnectionOptions,
@@ -462,7 +463,7 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
462463
* Connects to stream of events from the PowerSync instance.
463464
*/
464465
async connect(connector: PowerSyncBackendConnector, options?: PowerSyncConnectionOptions) {
465-
const resolvedOptions = options ?? {};
466+
const resolvedOptions: InternalConnectionOptions = options ?? {};
466467
resolvedOptions.serializedSchema = this.schema.toJSON();
467468

468469
return this.connectionManager.connect(connector, resolvedOptions);

packages/common/src/client/ConnectionManager.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ILogger } from 'js-logger';
22
import { BaseListener, BaseObserver } from '../utils/BaseObserver.js';
33
import { PowerSyncBackendConnector } from './connection/PowerSyncBackendConnector.js';
44
import {
5-
PowerSyncConnectionOptions,
5+
InternalConnectionOptions,
66
StreamingSyncImplementation
77
} from './sync/stream/AbstractStreamingSyncImplementation.js';
88

@@ -24,14 +24,14 @@ export interface ConnectionManagerSyncImplementationResult {
2424
export interface ConnectionManagerOptions {
2525
createSyncImplementation(
2626
connector: PowerSyncBackendConnector,
27-
options: PowerSyncConnectionOptions
27+
options: InternalConnectionOptions
2828
): Promise<ConnectionManagerSyncImplementationResult>;
2929
logger: ILogger;
3030
}
3131

3232
type StoredConnectionOptions = {
3333
connector: PowerSyncBackendConnector;
34-
options: PowerSyncConnectionOptions;
34+
options: InternalConnectionOptions;
3535
};
3636

3737
/**
@@ -95,7 +95,7 @@ export class ConnectionManager extends BaseObserver<ConnectionManagerListener> {
9595
await this.syncDisposer?.();
9696
}
9797

98-
async connect(connector: PowerSyncBackendConnector, options: PowerSyncConnectionOptions) {
98+
async connect(connector: PowerSyncBackendConnector, options: InternalConnectionOptions) {
9999
// Keep track if there were pending operations before this call
100100
const hadPendingOptions = !!this.pendingConnectionOptions;
101101

@@ -140,7 +140,7 @@ export class ConnectionManager extends BaseObserver<ConnectionManagerListener> {
140140
}
141141

142142
protected async connectInternal() {
143-
let appliedOptions: PowerSyncConnectionOptions | null = null;
143+
let appliedOptions: InternalConnectionOptions | null = null;
144144

145145
// This method ensures a disconnect before any connection attempt
146146
await this.disconnectInternal();

packages/common/src/client/sync/stream/AbstractStreamingSyncImplementation.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ export interface StreamingSyncImplementationListener extends BaseListener {
123123
* Configurable options to be used when connecting to the PowerSync
124124
* backend instance.
125125
*/
126-
export interface PowerSyncConnectionOptions extends BaseConnectionOptions, AdditionalConnectionOptions {}
126+
export type PowerSyncConnectionOptions = Omit<InternalConnectionOptions, 'serializedSchema'>;
127+
128+
export interface InternalConnectionOptions extends BaseConnectionOptions, AdditionalConnectionOptions {}
127129

128130
/** @internal */
129131
export interface BaseConnectionOptions {
@@ -181,7 +183,7 @@ export interface StreamingSyncImplementation extends BaseObserver<StreamingSyncI
181183
/**
182184
* Connects to the sync service
183185
*/
184-
connect(options?: PowerSyncConnectionOptions): Promise<void>;
186+
connect(options?: InternalConnectionOptions): Promise<void>;
185187
/**
186188
* Disconnects from the sync services.
187189
* @throws if not connected or if abort is not controlled internally

0 commit comments

Comments
 (0)