Skip to content

Commit c2a190e

Browse files
committed
Fix package build
1 parent 419abb1 commit c2a190e

6 files changed

Lines changed: 40 additions & 25 deletions

File tree

packages/adapter-sql-js/src/SQLJSAdapter.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ import {
44
BatchedUpdateNotification,
55
ConnectionPool,
66
ControlledExecutor,
7-
createLogger,
7+
createPowerSyncLogger,
88
DBAdapter,
99
DBAdapterDefaultMixin,
1010
DBAdapterListener,
1111
DBGetUtilsDefaultMixin,
1212
DBLockOptions,
13-
ILogger,
1413
LockContext,
14+
LogLevels,
1515
Mutex,
16+
PowerSyncLogger,
1617
QueryResult,
1718
SqlExecutor,
1819
SQLOpenFactory,
@@ -30,12 +31,12 @@ export interface SQLJSPersister {
3031

3132
export interface SQLJSOpenOptions extends SQLOpenOptions {
3233
persister?: SQLJSPersister;
33-
logger?: ILogger;
34+
logger?: PowerSyncLogger;
3435
}
3536

3637
export interface ResolvedSQLJSOpenOptions extends SQLJSOpenOptions {
3738
persister?: SQLJSPersister;
38-
logger: ILogger;
39+
logger: PowerSyncLogger;
3940
}
4041

4142
export class SQLJSOpenFactory implements SQLOpenFactory {
@@ -110,7 +111,7 @@ class SqlJsConnectionPool extends BaseObserver<DBAdapterListener> implements Con
110111
}
111112

112113
protected resolveOptions(options: SQLJSOpenOptions): ResolvedSQLJSOpenOptions {
113-
const logger = options.logger ?? createLogger('SQLJSDBAdapter');
114+
const logger = options.logger ?? createPowerSyncLogger({ prefix: 'SQLJSDBAdapter' });
114115

115116
return {
116117
...options,
@@ -122,10 +123,10 @@ class SqlJsConnectionPool extends BaseObserver<DBAdapterListener> implements Con
122123
const SQL = await SQLJs({
123124
locateFile: (filename: any) => `../dist/${filename}`,
124125
print: (text) => {
125-
this.options.logger.info(text);
126+
this.options.logger.log(LogLevels.info, text);
126127
},
127128
printErr: (text) => {
128-
this.options.logger.error('[stderr]', text);
129+
this.options.logger.log(LogLevels.error, '[stderr]', text);
129130
}
130131
});
131132
const existing = await this.options.persister?.readFile();

packages/capacitor/src/PowerSyncDatabase.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Capacitor } from '@capacitor/core';
22
import {
33
DBAdapter,
44
DEFAULT_STREAM_CONNECTION_OPTIONS,
5+
LogLevels,
56
MEMORY_TRIGGER_CLAIM_MANAGER,
67
PowerSyncBackendConnector,
78
PowerSyncConnectionOptions,
@@ -37,7 +38,8 @@ export class PowerSyncDatabase extends WebPowerSyncDatabase {
3738
? SyncStreamConnectionMethod.HTTP
3839
: DEFAULT_STREAM_CONNECTION_OPTIONS.connectionMethod;
3940
if (options?.connectionMethod == SyncStreamConnectionMethod.WEB_SOCKET && isUsingCapacitorDriver) {
40-
this.logger.warn(
41+
this.logger.log(
42+
LogLevels.warn,
4143
`Connecting via 'SyncStreamConnectionMethod.WEB_SOCKET' when using the 'CapacitorSQLiteAdapter' will result in poor sync performance. Use 'SyncStreamConnectionMethod.HTTP' (the default for native) instead.`
4244
);
4345
}
@@ -57,17 +59,20 @@ export class PowerSyncDatabase extends WebPowerSyncDatabase {
5759
const platform = Capacitor.getPlatform();
5860
if (platform == 'ios' || platform == 'android') {
5961
if (options.database.dbLocation) {
60-
options.logger?.warn(`
62+
options.logger?.log(
63+
LogLevels.warn,
64+
`
6165
dbLocation is ignored on iOS and Android platforms.
6266
The database directory can be configured in the Capacitor project.
63-
See https://github.com/capacitor-community/sqlite?tab=readme-ov-file#installation`);
67+
See https://github.com/capacitor-community/sqlite?tab=readme-ov-file#installation`
68+
);
6469
}
65-
options.logger?.debug(`Using CapacitorSQLiteAdapter for platform: ${platform}`);
70+
options.logger?.log(LogLevels.debug, `Using CapacitorSQLiteAdapter for platform: ${platform}`);
6671
return new CapacitorSQLiteAdapter({
6772
...options.database
6873
});
6974
} else {
70-
options.logger?.debug(`Using default web adapter for web platform`);
75+
options.logger?.log(LogLevels.debug, `Using default web adapter for web platform`);
7176
return super.openDBAdapter(options);
7277
}
7378
}
@@ -102,9 +107,12 @@ export class PowerSyncDatabase extends WebPowerSyncDatabase {
102107
if (this.isNativeCapacitorPlatform) {
103108
// We don't want to support multi-tab on mobile platforms.
104109
// We technically can, but it's not a common use case and requires additional work/testing.
105-
this.logger.debug(`Using Capacitor sync implementation`);
110+
this.logger.log(LogLevels.debug, `Using Capacitor sync implementation`);
106111
if (this.options.flags?.enableMultiTabs) {
107-
this.logger.warn(`enableMultiTabs is not supported on Capacitor mobile platforms. Ignoring the flag.`);
112+
this.logger.log(
113+
LogLevels.warn,
114+
`enableMultiTabs is not supported on Capacitor mobile platforms. Ignoring the flag.`
115+
);
108116
}
109117

110118
const remote = new CapacitorRemote(connector, this.logger);
@@ -124,7 +132,7 @@ export class PowerSyncDatabase extends WebPowerSyncDatabase {
124132
subscriptions: options.subscriptions
125133
});
126134
} else {
127-
this.logger.debug(`Using default web sync implementation for web platform`);
135+
this.logger.log(LogLevels.debug, `Using default web sync implementation for web platform`);
128136
return super.generateSyncStreamImplementation(connector, options);
129137
}
130138
}

packages/react-native/src/db/adapters/react-native-quick-sqlite/RNQSDBOpenFactory.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {
22
AbstractPowerSyncDatabase,
33
AbstractPowerSyncDatabaseOpenFactory,
44
DBAdapter,
5+
LogLevels,
56
PowerSyncDatabaseOptions,
67
PowerSyncOpenFactoryOptions,
78
SQLOpenFactory
@@ -36,7 +37,10 @@ export class RNQSPowerSyncDatabaseOpenFactory extends AbstractPowerSyncDatabaseO
3637

3738
generateInstance(options: PowerSyncDatabaseOptions): AbstractPowerSyncDatabase {
3839
if (this.instanceGenerated) {
39-
this.options.logger?.warn('Generating multiple PowerSync instances can sometimes cause unexpected results.');
40+
this.options.logger?.log(
41+
LogLevels.warn,
42+
'Generating multiple PowerSync instances can sometimes cause unexpected results.'
43+
);
4044
}
4145
this.instanceGenerated = true;
4246
return new PowerSyncDatabase(options);

packages/react-native/src/sync/stream/ReactNativeRemote.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {
22
AbstractRemote,
33
AbstractRemoteOptions,
4-
DEFAULT_REMOTE_LOGGER,
54
FetchImplementation,
65
FetchImplementationProvider,
7-
ILogger,
6+
LogLevels,
7+
PowerSyncLogger,
88
RemoteConnector,
99
SyncStreamOptions
1010
} from '@powersync/common';
@@ -29,7 +29,7 @@ class ReactNativeFetchProvider extends FetchImplementationProvider {
2929
export class ReactNativeRemote extends AbstractRemote {
3030
constructor(
3131
protected connector: RemoteConnector,
32-
protected logger: ILogger = DEFAULT_REMOTE_LOGGER,
32+
protected logger: PowerSyncLogger,
3333
options?: Partial<AbstractRemoteOptions>
3434
) {
3535
super(connector, logger, {
@@ -60,7 +60,8 @@ export class ReactNativeRemote extends AbstractRemote {
6060
const timeout =
6161
Platform.OS == 'android'
6262
? setTimeout(() => {
63-
this.logger.warn(
63+
this.logger.log(
64+
LogLevels.warn,
6465
`HTTP Streaming POST is taking longer than ${Math.ceil(
6566
STREAMING_POST_TIMEOUT_MS / 1000
6667
)} seconds to resolve. If using a debug build, please ensure Flipper Network plugin is disabled.`

packages/vue/src/composables/useSingleQuery.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
type CompilableQuery,
33
DifferentialWatchedQueryComparator,
4+
LogLevels,
45
ParsedQuery,
56
parseQuery,
67
SQLOnChangeOptions
@@ -85,7 +86,7 @@ export const useSingleQuery = <T = any>(
8586
let fetchData: () => Promise<void> | undefined;
8687

8788
const powerSync = usePowerSync();
88-
const logger = powerSync?.value?.logger ?? console;
89+
const logger = powerSync?.value?.logger;
8990

9091
const finishLoading = () => {
9192
isLoading.value = false;
@@ -130,7 +131,7 @@ export const useSingleQuery = <T = any>(
130131
try {
131132
parsedQuery = parseQuery(queryValue, toValue(sqlParameters).map(toValue));
132133
} catch (e) {
133-
logger.error('Failed to parse query:', e);
134+
logger?.log(LogLevels.error, 'Failed to parse query:', e);
134135
handleError(e);
135136
return;
136137
}
@@ -146,7 +147,7 @@ export const useSingleQuery = <T = any>(
146147
const result = await executor();
147148
handleResult(result);
148149
} catch (e) {
149-
logger.error('Failed to fetch data:', e);
150+
logger?.log(LogLevels.error, 'Failed to fetch data:', e);
150151
handleError(e);
151152
}
152153
};

packages/vue/src/composables/useWatchedQuery.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type CompilableQuery, ParsedQuery, parseQuery, WatchCompatibleQuery } from '@powersync/common';
1+
import { type CompilableQuery, LogLevels, ParsedQuery, parseQuery, WatchCompatibleQuery } from '@powersync/common';
22
import { type MaybeRef, type Ref, ref, toValue, watchEffect } from 'vue';
33
import { usePowerSync } from './powerSync.js';
44
import { AdditionalOptions, WatchedQueryResult } from './useSingleQuery.js';
@@ -47,7 +47,7 @@ export const useWatchedQuery = <T = any>(
4747
try {
4848
parsedQuery = parseQuery(queryValue, toValue(sqlParameters).map(toValue));
4949
} catch (e) {
50-
logger.error('Failed to parse query:', e);
50+
logger.log(LogLevels.error, 'Failed to parse query:', e);
5151
handleError(e);
5252
return;
5353
}

0 commit comments

Comments
 (0)