@syncular/client 0.30.6 → 0.30.9

package/src/apply.ts

@@ -1,3 +1,4 @@
+import { retainedBaseWrite } from './failed-overlay';
 /**
  * Local application of server data: `COMMIT` frames (§4.5), rows segments
  * (§5.2, §5.6), and the scope-matched delete shared by the §3.3 purge
@@ -13,13 +14,14 @@ import {
 } from '@syncular/core';
 import type { ClientDatabase, SqlValue } from './database';
 import type { EncryptionConfig } from './encryption';
-import { ClientSyncError } from './errors';
+import { ClientSyncError, invalidRequest } from './errors';
 import {
   type CompiledClientSchema,
   type CompiledClientTable,
   quoteIdent,
   SYNC_VERSION_COLUMN,
   toSqlValue,
+  rowValueToJson,
 } from './schema';
 
 /** Lets the client wrap the physical write in its revision transaction. */
@@ -44,7 +46,21 @@ export function upsertLocalRow(
   table: CompiledClientTable,
   values: readonly RowValue[],
   syncVersion: number,
+  serverWrite = true,
 ): void {
+  if (serverWrite)
+    retainedBaseWrite(
+      db,
+      table.name,
+      String(values[table.primaryKeyIndex]),
+      Object.fromEntries(
+        table.columns.map((column, index) => [
+          column.name,
+          rowValueToJson(values[index] ?? null),
+        ]),
+      ),
+      syncVersion,
+    );
   db.exec(upsertSql(table), [...values.map(toSqlValue), syncVersion]);
 }
 
@@ -52,7 +68,9 @@ export function deleteLocalRow(
   db: ClientDatabase,
   table: CompiledClientTable,
   rowId: string,
+  serverWrite = true,
 ): void {
+  if (serverWrite) retainedBaseWrite(db, table.name, rowId);
   db.exec(
     `DELETE FROM ${quoteIdent(table.name)} WHERE ${quoteIdent(table.primaryKey)} = ?`,
     [rowId],
@@ -90,8 +108,7 @@ export async function applyCommitFrame(
   for (const change of frame.changes) {
     const tableName = frame.tables[change.tableIndex];
     if (tableName === undefined) {
-      throw new ClientSyncError(
-        'sync.invalid_request',
+      throw invalidRequest(
         `COMMIT change tableIndex ${change.tableIndex} out of range`,
       );
     }
@@ -107,10 +124,7 @@ export async function applyCommitFrame(
       continue;
     }
     if (change.row === undefined || change.rowVersion === undefined) {
-      throw new ClientSyncError(
-        'sync.invalid_request',
-        'upsert change without row payload',
-      );
+      throw invalidRequest('upsert change without row payload');
     }
     let values = decodeRow(table.columns, change.row);
     if (encryption !== undefined && table.hasEncryptedColumns) {
@@ -204,6 +218,12 @@ export function deleteScopedRows(
     );
     params.push(...values);
   }
+  for (const row of db.query(
+    `SELECT ${quoteIdent(table.primaryKey)} AS id FROM ${quoteIdent(table.name)} WHERE ${clauses.join(' AND ')}`,
+    params,
+  )) {
+    retainedBaseWrite(db, table.name, String(row.id));
+  }
   db.exec(
     `DELETE FROM ${quoteIdent(table.name)} WHERE ${clauses.join(' AND ')}`,
     params,
@@ -283,10 +303,7 @@ export interface SqliteSegmentDescriptor {
 const IMAGE_ALIAS = 'syncular_image';
 
 function imageInvalid(detail: string): never {
-  throw new ClientSyncError(
-    'sync.invalid_request',
-    `sqlite segment rejected: ${detail} (§5.3)`,
-  );
+  throw invalidRequest(`sqlite segment rejected: ${detail} (§5.3)`);
 }
 
 /**
@@ -313,8 +330,7 @@ export async function applySqliteSegment(
 ): Promise<number> {
   const withImage = db.withSqliteImage?.bind(db);
   if (withImage === undefined) {
-    throw new ClientSyncError(
-      'sync.invalid_request',
+    throw invalidRequest(
       'received a sqlite segment but the database backend cannot import images (§4.2: do not advertise accept bit 2)',
     );
   }
@@ -422,6 +438,23 @@ export async function applySqliteSegment(
           params,
         );
         applied += Number(db.query('SELECT changes() AS n')[0]?.n ?? 0);
+        for (const row of db.query(
+          `SELECT * FROM ${source} WHERE ${predicates.join(' AND ') || 'true'}`,
+          params,
+        )) {
+          retainedBaseWrite(
+            db,
+            table.name,
+            String(row[table.primaryKey]),
+            Object.fromEntries(
+              table.columns.map((column) => [
+                column.name,
+                rowValueToJson(row[column.name] as RowValue),
+              ]),
+            ),
+            Number(row._syncular_version),
+          );
+        }
       });
       options.onProgress?.(applied);
       await yieldToHost();