Merge branch 'main' into feat/logging-cleanup

Author: Chriztiaan

.changeset/giant-moose-crash.md

@@ -0,0 +1,5 @@
+---
+'@powersync/web': minor
+---
+
+Removed `js-logger` dependency, using the logger helper exposed by `@powersync/common`.

.changeset/lemon-shrimps-pretend.md

@@ -0,0 +1,5 @@
+---
+'@powersync/common': minor
+---
+
+Added logger helpers, which can be used instead of the `js-logger` dependency.

.changeset/moody-fans-knock.md

@@ -0,0 +1,5 @@
+---
+'@powersync/kysely-driver': minor
+---
+
+Updated Kysely depedency to ^0.28.0. Introduces new features to the PowerSync Kysely wrapper. See https://github.com/kysely-org/kysely/releases/tag/0.28.0

demos/example-electron-node/config.ts

@@ -85,7 +85,7 @@ const mainConfig: Configuration = {
     new CopyPlugin({
       patterns: [{
         from: path.resolve(require.resolve('@powersync/node/package.json'), `../lib/${extensionPath}`),
-        to: extensionPath,
+        to: path.join('powersync', extensionPath),
       }],
     }),
     new DefinePluginImpl({
@@ -95,7 +95,8 @@ const mainConfig: Configuration = {
   ],
   resolve: {
     extensions: ['.js', '.ts', '.jsx', '.tsx', '.css', '.json']
-  }
+  },
+  target: "electron-main",
 };
 
 const rendererConfig: Configuration = {
@@ -116,7 +117,9 @@ const rendererConfig: Configuration = {
 
 const config: ForgeConfig = {
   packagerConfig: {
-    asar: true
+    asar: {
+      unpack: '**/{.**,**}/**/powersync/*'
+    },
   },
   rebuildConfig: {
     force: true,

demos/example-electron-node/src/main/index.ts

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import { Worker } from 'node:worker_threads';
 
 import { PowerSyncDatabase, SyncStreamConnectionMethod } from '@powersync/node';
@@ -19,10 +20,22 @@ if (require('electron-squirrel-startup')) {
   app.quit();
 }
 
+const userDataDirectory = app.getPath('userData');
+try {
+  if (!fs.existsSync(userDataDirectory)) {
+    fs.mkdirSync(userDataDirectory);
+  }
+} catch (e) {
+  console.error('Could not create database directory', e);
+}
+
+console.log('Storing data in ', userDataDirectory);
+
 const database = new PowerSyncDatabase({
   schema: AppSchema,
   database: {
     dbFilename: 'test.db',
+    dbLocation: userDataDirectory,
     openWorker(_, options) {
       return new Worker(new URL('./worker.ts', import.meta.url), options);
     }

demos/example-electron-node/src/main/worker.ts

@@ -18,7 +18,14 @@ function resolvePowerSyncCoreExtension() {
 
   // This example uses copy-webpack-plugin to copy the prebuilt library over. This ensures that it is
   // available in packaged release builds.
-  return path.resolve(__dirname, extensionPath);
+  let libraryPath = path.resolve(__dirname, 'powersync', extensionPath);
+
+  if (__dirname.indexOf('app.asar') != -1) {
+    // Our build configuration ensures the extension is always available outside of the archive too.
+    libraryPath = libraryPath.replace('app.asar', 'app.asar.unpacked');
+  }
+
+  return libraryPath;
 }
 
 startPowerSyncWorker({ extensionPath: resolvePowerSyncCoreExtension });

packages/common/rollup.config.mjs

@@ -32,9 +32,7 @@ export default (commandLineArgs) => {
     // This makes life easier
     external: [
       // This has dynamic logic - makes bundling hard
-      'cross-fetch',
-      // TODO: make the useDefaults logic better. Currently need access to this package directly
-      'js-logger'
+      'cross-fetch'
     ]
   };
 };

packages/common/src/index.ts

@@ -34,6 +34,7 @@ export * from './db/DBAdapter.js';
 export * from './utils/AbortOperation.js';
 export * from './utils/BaseObserver.js';
 export * from './utils/DataStream.js';
+export * from './utils/Logger.js';
 export * from './utils/parseQuery.js';
 
 export * from './types/types.js';

packages/common/src/utils/Logger.ts

@@ -0,0 +1,47 @@
+import Logger, { type ILogger, type ILogLevel } from 'js-logger';
+
+export { GlobalLogger, ILogger, ILoggerOpts, ILogHandler, ILogLevel } from 'js-logger';
+
+const TypedLogger: ILogger = Logger as any;
+
+export const LogLevel = {
+  TRACE: TypedLogger.TRACE,
+  DEBUG: TypedLogger.DEBUG,
+  INFO: TypedLogger.INFO,
+  TIME: TypedLogger.TIME,
+  WARN: TypedLogger.WARN,
+  ERROR: TypedLogger.ERROR,
+  OFF: TypedLogger.OFF
+};
+
+export interface CreateLoggerOptions {
+  logLevel?: ILogLevel;
+}
+
+/**
+ * Retrieves the base (default) logger instance.
+ *
+ * This base logger controls the default logging configuration and is shared
+ * across all loggers created with `createLogger`. Adjusting settings on this
+ * base logger affects all loggers derived from it unless explicitly overridden.
+ *
+ */
+export function createBaseLogger() {
+  return Logger;
+}
+
+/**
+ * Creates and configures a new named logger based on the base logger.
+ *
+ * Named loggers allow specific modules or areas of your application to have
+ * their own logging levels and behaviors. These loggers inherit configuration
+ * from the base logger by default but can override settings independently.
+ */
+export function createLogger(name: string, options: CreateLoggerOptions = {}): ILogger {
+  const logger = Logger.get(name);
+  if (options.logLevel) {
+    logger.setLevel(options.logLevel);
+  }
+
+  return logger;
+}

packages/kysely-driver/package.json

@@ -29,7 +29,7 @@
     "@powersync/common": "workspace:^1.27.1"
   },
   "dependencies": {
-    "kysely": "^0.27.4"
+    "kysely": "^0.28.0"
   },
   "devDependencies": {
     "@powersync/web": "workspace:*",