Merge branch 'main' into fix/angular-start-async-bug

Chriztiaan · web-flow · commit e7eb08f62ea2 · 2024-12-13T09:49:19.000+02:00
diff --git a/demos/angular-supabase-todolist/src/app/supabase.service.ts b/demos/angular-supabase-todolist/src/app/supabase.service.ts
@@ -65,10 +65,8 @@ export class SupabaseService implements PowerSyncBackendConnector {
     }
 
     return {
-      client: this.supabase,
       endpoint: environment.powersyncUrl,
-      token: session.access_token ?? '',
-      expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined
+      token: session.access_token ?? ''
     };
   }
 
diff --git a/demos/django-react-native-todolist/library/django/DjangoConnector.ts b/demos/django-react-native-todolist/library/django/DjangoConnector.ts
@@ -45,9 +45,7 @@ export class DjangoConnector implements PowerSyncBackendConnector {
     const session = await this.apiClient.getToken(userId);
     return {
       endpoint: AppConfig.powersyncUrl,
-      token: session.token ?? '',
-      expiresAt: undefined,
-      userID: userId
+      token: session.token ?? ''
     };
   }
 
diff --git a/demos/django-react-native-todolist/library/powersync/AppSchema.ts b/demos/django-react-native-todolist/library/powersync/AppSchema.ts
@@ -1,9 +1,9 @@
-import { column, Schema, TableV2 } from '@powersync/react-native';
+import { column, Schema, Table } from '@powersync/react-native';
 
 export const LIST_TABLE = 'lists';
 export const TODO_TABLE = 'todos';
 
-const todos = new TableV2(
+const todos = new Table(
   {
     list_id: column.text,
     created_at: column.text,
@@ -17,7 +17,7 @@ const todos = new TableV2(
   { indexes: { list: ['list_id'] } }
 );
 
-const lists = new TableV2({
+const lists = new Table({
   created_at: column.text,
   name: column.text,
   owner_id: column.text
diff --git a/demos/example-capacitor/src/library/powersync/AppSchema.ts b/demos/example-capacitor/src/library/powersync/AppSchema.ts
@@ -1,6 +1,6 @@
-import { column, Schema, TableV2 } from '@powersync/web';
+import { column, Schema, Table } from '@powersync/web';
 
-const customers = new TableV2({
+const customers = new Table({
   name: column.text,
   created_at: column.text
 });
diff --git a/demos/example-electron/src/library/powersync/AppSchema.ts b/demos/example-electron/src/library/powersync/AppSchema.ts
@@ -1,6 +1,6 @@
-import { column, Schema, TableV2 } from '@powersync/web';
+import { column, Schema, Table } from '@powersync/web';
 
-const customers = new TableV2({
+const customers = new Table({
   name: column.text,
   created_at: column.text
 });
diff --git a/demos/example-nextjs/src/library/powersync/AppSchema.ts b/demos/example-nextjs/src/library/powersync/AppSchema.ts
@@ -1,6 +1,6 @@
-import { column, Schema, TableV2 } from '@powersync/web';
+import { column, Schema, Table } from '@powersync/web';
 
-const customers = new TableV2({
+const customers = new Table({
   name: column.text,
   created_at: column.text
 });
diff --git a/demos/react-multi-client/src/library/SupabaseConnector.ts b/demos/react-multi-client/src/library/SupabaseConnector.ts
@@ -70,8 +70,7 @@ export class SupabaseConnector extends BaseObserver<SupabaseConnectorListener> i
 
     return {
       token: token,
-      endpoint: import.meta.env.VITE_POWERSYNC_URL,
-      expiresAt: expires_at ? new Date(expires_at) : undefined
+      endpoint: import.meta.env.VITE_POWERSYNC_URL
     };
   }
 
diff --git a/demos/react-native-supabase-group-chat/src/lib/connector.ts b/demos/react-native-supabase-group-chat/src/lib/connector.ts
@@ -36,11 +36,8 @@ export class Connector implements PowerSyncBackendConnector {
     console.debug('session expires at', session.expires_at);
 
     return {
-      client: this.supabaseClient,
       endpoint: config.powerSyncUrl,
-      token: session.access_token ?? '',
-      expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined,
-      userID: session.user.id
+      token: session.access_token ?? ''
     };
   }
 
diff --git a/demos/react-native-supabase-todolist/library/supabase/SupabaseConnector.ts b/demos/react-native-supabase-todolist/library/supabase/SupabaseConnector.ts
@@ -56,9 +56,7 @@ export class SupabaseConnector implements PowerSyncBackendConnector {
 
     return {
       endpoint: AppConfig.powersyncUrl,
-      token: session.access_token ?? '',
-      expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined,
-      userID: session.user.id
+      token: session.access_token ?? ''
     };
   }
 
diff --git a/demos/react-native-web-supabase-todolist/library/supabase/SupabaseConnector.ts b/demos/react-native-web-supabase-todolist/library/supabase/SupabaseConnector.ts
@@ -56,9 +56,7 @@ export class SupabaseConnector implements PowerSyncBackendConnector {
 
     return {
       endpoint: AppConfig.powersyncUrl,
-      token: session.access_token ?? '',
-      expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined,
-      userID: session.user.id
+      token: session.access_token ?? ''
     };
   }
 
diff --git a/demos/react-supabase-todolist-optional-sync/src/library/powersync/AppSchema.ts b/demos/react-supabase-todolist-optional-sync/src/library/powersync/AppSchema.ts
@@ -1,4 +1,4 @@
-import { AbstractPowerSyncDatabase, column, ColumnsType, Schema, Table, TableV2Options } from '@powersync/web';
+import { AbstractPowerSyncDatabase, column, Schema, Table } from '@powersync/web';
 import { setSyncEnabled } from './SyncMode';
 
 /**
diff --git a/demos/react-supabase-todolist-optional-sync/src/library/powersync/SupabaseConnector.ts b/demos/react-supabase-todolist-optional-sync/src/library/powersync/SupabaseConnector.ts
@@ -112,8 +112,7 @@ export class SupabaseConnector extends BaseObserver<SupabaseConnectorListener> i
 
     return {
       endpoint: this.config.powersyncUrl,
-      token: session.access_token ?? '',
-      expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined
+      token: session.access_token ?? ''
     };
   }
 
diff --git a/demos/react-supabase-todolist/src/library/powersync/SupabaseConnector.ts b/demos/react-supabase-todolist/src/library/powersync/SupabaseConnector.ts
@@ -98,8 +98,7 @@ export class SupabaseConnector extends BaseObserver<SupabaseConnectorListener> i
 
     return {
       endpoint: this.config.powersyncUrl,
-      token: session.access_token ?? '',
-      expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined
+      token: session.access_token ?? ''
     };
   }
 
diff --git a/demos/vue-supabase-todolist/src/library/powersync/AppSchema.ts b/demos/vue-supabase-todolist/src/library/powersync/AppSchema.ts
@@ -1,9 +1,9 @@
-import { column, Schema, TableV2 } from '@powersync/web';
+import { column, Schema, Table } from '@powersync/web';
 
 export const LISTS_TABLE = 'lists';
 export const TODOS_TABLE = 'todos';
 
-const todos = new TableV2(
+const todos = new Table(
   {
     list_id: column.text,
     created_at: column.text,
@@ -16,7 +16,7 @@ const todos = new TableV2(
   { indexes: { list: ['list_id'] } }
 );
 
-const lists = new TableV2({
+const lists = new Table({
   created_at: column.text,
   name: column.text,
   owner_id: column.text
diff --git a/demos/vue-supabase-todolist/src/library/powersync/SupabaseConnector.ts b/demos/vue-supabase-todolist/src/library/powersync/SupabaseConnector.ts
@@ -98,8 +98,7 @@ export class SupabaseConnector extends BaseObserver<SupabaseConnectorListener> i
 
     return {
       endpoint: this.config.powersyncUrl,
-      token: session.access_token ?? '',
-      expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined
+      token: session.access_token ?? ''
     };
   }
 
diff --git a/demos/yjs-react-supabase-text-collab/src/library/powersync/AppSchema.ts b/demos/yjs-react-supabase-text-collab/src/library/powersync/AppSchema.ts
@@ -1,11 +1,11 @@
-import { column, Schema, TableV2 } from '@powersync/web';
+import { column, Schema, Table } from '@powersync/web';
 
-const documents = new TableV2({
+const documents = new Table({
   title: column.text,
   created_at: column.text
 });
 
-const document_updates = new TableV2(
+const document_updates = new Table(
   {
     document_id: column.text,
     created_at: column.text,
diff --git a/demos/yjs-react-supabase-text-collab/src/library/powersync/SupabaseConnector.ts b/demos/yjs-react-supabase-text-collab/src/library/powersync/SupabaseConnector.ts
@@ -69,8 +69,7 @@ export class SupabaseConnector extends BaseObserver<SupabaseConnectorListener> i
 
     return {
       endpoint: data.powersync_url,
-      token: data.token,
-      expiresAt: undefined
+      token: data.token
     };
   }
 
diff --git a/demos/yjs-react-supabase-text-collab/supabase/functions/merge-document-updates/index.ts b/demos/yjs-react-supabase-text-collab/supabase/functions/merge-document-updates/index.ts
@@ -71,10 +71,10 @@ Deno.serve(async (req) => {
       }
     );
   } catch (err) {
-    return new Response(
-      JSON.stringify({ error: String(err?.message ?? err) }),
-      { status: 500, headers: responseHeaders }
-    );
+    return new Response(JSON.stringify({ error: String(err?.message ?? err) }), {
+      status: 500,
+      headers: responseHeaders
+    });
   }
 });
 
diff --git a/packages/web/src/db/sync/SharedWebStreamingSyncImplementation.ts b/packages/web/src/db/sync/SharedWebStreamingSyncImplementation.ts
@@ -38,8 +38,7 @@ class SharedSyncClientProvider extends AbstractSharedSyncClientProvider {
      */
     return {
       endpoint: credentials.endpoint,
-      token: credentials.token,
-      expiresAt: credentials.expiresAt
+      token: credentials.token
     };
   }
 

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,8 @@ export class SupabaseService implements PowerSyncBackendConnector {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`return {`
`68`		`- client: this.supabase,`
`69`	`68`	`endpoint: environment.powersyncUrl,`
`70`		`- token: session.access_token ?? '',`
`71`		`- expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined`
	`69`	`+ token: session.access_token ?? ''`
`72`	`70`	`};`
`73`	`71`	`}`
`74`	`72`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,7 @@ export class SupabaseConnector extends BaseObserver<SupabaseConnectorListener> i`
`70`	`70`
`71`	`71`	`return {`
`72`	`72`	`token: token,`
`73`		`- endpoint: import.meta.env.VITE_POWERSYNC_URL,`
`74`		`- expiresAt: expires_at ? new Date(expires_at) : undefined`
	`73`	`+ endpoint: import.meta.env.VITE_POWERSYNC_URL`
`75`	`74`	`};`
`76`	`75`	`}`
`77`	`76`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,7 @@ export class SupabaseConnector implements PowerSyncBackendConnector {`
`56`	`56`
`57`	`57`	`return {`
`58`	`58`	`endpoint: AppConfig.powersyncUrl,`
`59`		`- token: session.access_token ?? '',`
`60`		`- expiresAt: session.expires_at ? new Date(session.expires_at * 1000) : undefined,`
`61`		`- userID: session.user.id`
	`59`	`+ token: session.access_token ?? ''`
`62`	`60`	`};`
`63`	`61`	`}`
`64`	`62`