Merge branch 'main' into attachment-package-refactor

# Conflicts:
#	pnpm-lock.yaml

Author: Amine

.changeset/four-pans-laugh.md

@@ -0,0 +1,8 @@
+---
+'@powersync/common': minor
+'@powersync/web': minor
+'@powersync/node': minor
+'@powersync/react-native': minor
+---
+
+Populate Table `name` values in `schema.props` for Schemas created with typed `Table`s. e.g. `schema.props['some_table'].name` will contain the table name.

demos/angular-supabase-todolist/extra-webpack.config.js

@@ -18,7 +18,7 @@ module.exports = (config, options, targetOptions) => {
       ...config.plugins,
       new webpack.DefinePlugin({
         // Embed environment variables starting with `WEBPACK_PUBLIC_`
-        'process.env': JSON.stringify(
+        env: JSON.stringify(
           Object.fromEntries(Object.entries(process.env).filter(([key]) => key.startsWith('WEBPACK_PUBLIC_')))
         )
       })

demos/angular-supabase-todolist/src/env.d.ts

@@ -1,5 +1,5 @@
 export const environment = {
-  supabaseUrl: process.env.WEBPACK_PUBLIC_SUPABASE_URL,
-  supabaseKey: process.env.WEBPACK_PUBLIC_SUPABASE_ANON_KEY,
-  powersyncUrl: process.env.WEBPACK_PUBLIC_POWERSYNC_URL
+  supabaseUrl: env.WEBPACK_PUBLIC_SUPABASE_URL,
+  supabaseKey: env.WEBPACK_PUBLIC_SUPABASE_ANON_KEY,
+  powersyncUrl: env.WEBPACK_PUBLIC_POWERSYNC_URL
 };

demos/angular-supabase-todolist/src/environment.ts

@@ -0,0 +1,12 @@
+// Ambient declarations for webpack-injected environment variables.
+// webpack's DefinePlugin injects `env` at build time.
+
+declare global {
+  const env: {
+    WEBPACK_PUBLIC_SUPABASE_URL: string;
+    WEBPACK_PUBLIC_SUPABASE_ANON_KEY: string;
+    WEBPACK_PUBLIC_POWERSYNC_URL: string;
+  };
+}
+
+export {};

demos/angular-supabase-todolist/src/global.d.ts

@@ -9,8 +9,9 @@ In particular:
    queries. This worker is part of the `@powersync/node` package and wouldn't be copied into the resulting Electron
    app by default. For this reason, this example has its own `src/main/worker.ts` loaded with `new URL('./worker.ts', import.meta.url)`.
 2. In addition to the worker, PowerSync requires access to a SQLite extension providing sync functionality.
-   This file is also part of the `@powersync/node` package and called `powersync.dll`, `libpowersync.dylib` or
-   `libpowersync.so` depending on the operating system.
+   This file is also part of the `@powersync/node` package and is the prebuilt release asset (for example
+   `powersync_x64.dll`, `libpowersync_x64.dylib` or `libpowersync_x64.so`) depending on the operating system and
+   architecture.
    We use the `copy-webpack-plugin` package to make sure a copy of that file is available to the main process,
    and load it in the custom `src/main/worker.ts`.
 3. The `get()` and `getAll()` methods are exposed to the renderer process with an IPC channel.
@@ -21,7 +22,7 @@ To see it in action:
 2. Copy `.env.local.template` to `.env.local`, and complete the environment variables. You can generate a [temporary development token](https://docs.powersync.com/usage/installation/authentication-setup/development-tokens), or leave blank to test with local-only data.
    The example works with the schema from the [PowerSync + Supabase tutorial](https://docs.powersync.com/integration-guides/supabase-+-powersync#supabase-powersync).
 3. `cd` into this directory. In this mono-repo, you'll have to run `./node_modules/.bin/electron-rebuild` once to make sure `@powersync/better-sqlite3` was compiled with Electron's toolchain.
-3. Finally, run `pnpm start`.
+4. Finally, run `pnpm start`.
 
 Apart from the build setup, this example is purposefully kept simple.
 To make sure PowerSync is working, you can run `await powersync.get('SELECT powersync_rs_version()');` in the DevTools

demos/example-electron-node/README.md

@@ -1,20 +1,18 @@
-import OS from 'node:os';
 import path from 'node:path';
-import { createRequire } from 'node:module';
 
-import type { ForgeConfig } from '@electron-forge/shared-types';
-import { MakerSquirrel } from '@electron-forge/maker-squirrel';
-import { MakerZIP } from '@electron-forge/maker-zip';
 import { MakerDeb } from '@electron-forge/maker-deb';
 import { MakerRpm } from '@electron-forge/maker-rpm';
+import { MakerSquirrel } from '@electron-forge/maker-squirrel';
+import { MakerZIP } from '@electron-forge/maker-zip';
 import { AutoUnpackNativesPlugin } from '@electron-forge/plugin-auto-unpack-natives';
 import { WebpackPlugin } from '@electron-forge/plugin-webpack';
-import { type Configuration, type ModuleOptions, type DefinePlugin } from 'webpack';
+import type { ForgeConfig } from '@electron-forge/shared-types';
+import { getPowerSyncExtensionFilename } from '@powersync/node/worker.js';
+import type ICopyPlugin from 'copy-webpack-plugin';
 import * as dotenv from 'dotenv';
 import type IForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
-import type ICopyPlugin from 'copy-webpack-plugin';
-
-dotenv.config({path: '.env.local'});
+import { type Configuration, type DefinePlugin, type ModuleOptions } from 'webpack';
+dotenv.config({ path: '.env.local' });
 
 const ForkTsCheckerWebpackPlugin: typeof IForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 const CopyPlugin: typeof ICopyPlugin = require('copy-webpack-plugin');
@@ -58,17 +56,7 @@ const defaultWebpackRules: () => Required<ModuleOptions>['rules'] = () => {
   ];
 };
 
-const platform = OS.platform();
-let extensionPath: string;
-if (platform === 'win32') {
-  extensionPath = 'powersync.dll';
-} else if (platform === 'linux') {
-  extensionPath = 'libpowersync.so';
-} else if (platform === 'darwin') {
-  extensionPath = 'libpowersync.dylib';
-} else {
-  throw 'Unknown platform, PowerSync for Node.js currently supports Windows, Linux and macOS.';
-}
+let extensionFilename = getPowerSyncExtensionFilename();
 
 const mainConfig: Configuration = {
   /**
@@ -78,25 +66,27 @@ const mainConfig: Configuration = {
   entry: './src/main/index.ts',
   // Put your normal webpack config below here
   module: {
-    rules: defaultWebpackRules(),
+    rules: defaultWebpackRules()
   },
   plugins: [
     ...webpackPlugins,
     new CopyPlugin({
-      patterns: [{
-        from: path.resolve(require.resolve('@powersync/node/package.json'), `../lib/${extensionPath}`),
-        to: path.join('powersync', extensionPath),
-      }],
+      patterns: [
+        {
+          from: path.resolve(require.resolve('@powersync/node/package.json'), `../lib/${extensionFilename}`),
+          to: path.join('powersync', extensionFilename)
+        }
+      ]
     }),
     new DefinePluginImpl({
       POWERSYNC_URL: JSON.stringify(process.env.POWERSYNC_URL),
-      POWERSYNC_TOKEN: JSON.stringify(process.env.POWERSYNC_TOKEN),
-    }),
+      POWERSYNC_TOKEN: JSON.stringify(process.env.POWERSYNC_TOKEN)
+    })
   ],
   resolve: {
     extensions: ['.js', '.ts', '.jsx', '.tsx', '.css', '.json']
   },
-  target: "electron-main",
+  target: 'electron-main'
 };
 
 const rendererConfig: Configuration = {
@@ -107,7 +97,7 @@ const rendererConfig: Configuration = {
         test: /\.css$/,
         use: [{ loader: 'style-loader' }, { loader: 'css-loader' }]
       }
-    ],
+    ]
   },
   plugins: webpackPlugins,
   resolve: {
@@ -119,10 +109,10 @@ const config: ForgeConfig = {
   packagerConfig: {
     asar: {
       unpack: '**/{.**,**}/**/powersync/*'
-    },
+    }
   },
   rebuildConfig: {
-    force: true,
+    force: true
   },
   makers: [
     new MakerSquirrel(),
@@ -142,7 +132,7 @@ const config: ForgeConfig = {
             html: './src/render/index.html',
             js: './src/render/main.ts',
             preload: {
-              js: './src/render/preload.ts',
+              js: './src/render/preload.ts'
             }
           }
         ]

demos/example-electron-node/config.ts

@@ -23,11 +23,12 @@
     "@electron-forge/maker-zip": "^7.7.0",
     "@electron-forge/plugin-auto-unpack-natives": "^7.7.0",
     "@electron-forge/plugin-webpack": "^7.7.0",
+    "@types/better-sqlite3": "^7.6.13",
     "@vercel/webpack-asset-relocator-loader": "1.7.3",
     "copy-webpack-plugin": "^13.0.0",
     "css-loader": "^6.11.0",
     "dotenv": "^16.4.7",
-    "electron": "30.0.2",
+    "electron": "37.0.0",
     "electron-rebuild": "^3.2.9",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "node-loader": "^2.1.0",
@@ -40,6 +41,7 @@
   },
   "dependencies": {
     "@powersync/node": "workspace:*",
+    "better-sqlite3": "^12.2.0",
     "electron-squirrel-startup": "^1.0.1"
   }
 }

demos/example-electron-node/package.json

@@ -1,24 +1,14 @@
+import Database from 'better-sqlite3';
 import * as path from 'node:path';
-import OS from 'node:os';
 
-import { startPowerSyncWorker } from '@powersync/node/worker.js';
+import { getPowerSyncExtensionFilename, startPowerSyncWorker } from '@powersync/node/worker.js';
 
 function resolvePowerSyncCoreExtension() {
-  const platform = OS.platform();
-  let extensionPath: string;
-  if (platform === 'win32') {
-    extensionPath = 'powersync.dll';
-  } else if (platform === 'linux') {
-    extensionPath = 'libpowersync.so';
-  } else if (platform === 'darwin') {
-    extensionPath = 'libpowersync.dylib';
-  } else {
-    throw 'Unknown platform, PowerSync for Node.js currently supports Windows, Linux and macOS.';
-  }
+  const extensionFilename = getPowerSyncExtensionFilename();
 
   // This example uses copy-webpack-plugin to copy the prebuilt library over. This ensures that it is
   // available in packaged release builds.
-  let libraryPath = path.resolve(__dirname, 'powersync', extensionPath);
+  let libraryPath = path.resolve(__dirname, 'powersync', extensionFilename);
 
   if (__dirname.indexOf('app.asar') != -1) {
     // Our build configuration ensures the extension is always available outside of the archive too.
@@ -28,4 +18,8 @@ function resolvePowerSyncCoreExtension() {
   return libraryPath;
 }
 
-startPowerSyncWorker({ extensionPath: resolvePowerSyncCoreExtension });
+async function resolveBetterSqlite3() {
+  return Database;
+}
+
+startPowerSyncWorker({ extensionPath: resolvePowerSyncCoreExtension, loadBetterSqlite3: resolveBetterSqlite3 });

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

@@ -1,4 +1,5 @@
 BACKEND=http://localhost:6060
 SYNC_SERVICE=http://localhost:8080
 POWERSYNC_TOKEN=
-POWERSYNC_DEBUG=1
+POWERSYNC_DEBUG=1
+ENCRYPTION_KEY=