@syncular/client 0.30.10 → 0.30.11

package/README.md

@@ -389,6 +389,14 @@ and scope revocation remove whole retained aggregates. If a sparse conflict
 loses its server base, the client keeps the sparse operation and conflict
 evidence without materializing a local row from the saved before-image.
 
+A retained insert whose unique key belongs to another server primary key remains
+journal intent while reads show the server winner. `retainedRows[].uniqueConflicts`
+contains each matching index, its columns, competing `rowId`, authorized
+`serverRow` and `serverVersion`. Keep-mine patches that competing ID at its
+current version and links the replacement through `superseded`. Edit can choose
+a free unique key. Take-server uses `resolved_keep_server`. Revocation and local
+security purge erase the retained aggregate's protected journal payloads.
+
 ## Application-authorized local security purge
 
 `purgeLocalData({ purgeId, targets })` is the narrow local-storage primitive

package/dist/apply.js

@@ -1,4 +1,4 @@
-import { retainedBaseWrite } from './failed-overlay.js';
+import { retainedBaseWrite, restoreFailedBases } from './failed-overlay.js';
 /**
  * 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
@@ -17,21 +17,20 @@ function upsertSql(table) {
         .filter((name) => name !== quoteIdent(table.primaryKey))
         .map((name) => `${name}=excluded.${name}`)
         .join(', ');
-    return `INSERT INTO ${quoteIdent(table.name)} (${names.join(', ')}) VALUES (${placeholders})
-    ON CONFLICT (${quoteIdent(table.primaryKey)}) DO UPDATE SET ${updates}`;
+    return `INSERT INTO ${quoteIdent(table.name)}(${names.join(', ')})VALUES(${placeholders})ON CONFLICT(${quoteIdent(table.primaryKey)})DO UPDATE SET ${updates}`;
 }
 export function upsertLocalRow(db, table, values, syncVersion, serverWrite = true) {
+    db.exec(upsertSql(table), [...values.map(toSqlValue), syncVersion]);
     if (serverWrite)
-        retainedBaseWrite(db, table.name, String(values[table.primaryKeyIndex]), Object.fromEntries(table.columns.map((column, index) => [
+        retainedBaseWrite(db, table, 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]);
 }
 export function deleteLocalRow(db, table, rowId, serverWrite = true) {
     if (serverWrite)
-        retainedBaseWrite(db, table.name, rowId);
-    db.exec(`DELETE FROM ${quoteIdent(table.name)} WHERE ${quoteIdent(table.primaryKey)} = ?`, [rowId]);
+        retainedBaseWrite(db, table, rowId);
+    db.exec(`DELETE FROM ${quoteIdent(table.name)} WHERE ${quoteIdent(table.primaryKey)}=?`, [rowId]);
 }
 /**
  * Apply one `COMMIT` frame in one local transaction (§1.4 rule 4).
@@ -76,6 +75,7 @@ export async function applyCommitFrame(db, schema, frame, encryption, transactio
         });
     }
     transaction(() => {
+        restoreFailedBases(db, schema);
         for (const change of resolved) {
             if (change.op === 'delete') {
                 deleteLocalRow(db, change.table, change.rowId);
@@ -140,7 +140,7 @@ export function deleteScopedRows(db, table, effective) {
         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));
+        retainedBaseWrite(db, table, String(row.id));
     }
     db.exec(`DELETE FROM ${quoteIdent(table.name)} WHERE ${clauses.join(' AND ')}`, params);
 }
@@ -178,9 +178,7 @@ export function evictScopedRows(db, table, effective, pinnedRowIds) {
         params.push(...ids);
     }
     const target = quoteIdent(table.name);
-    db.exec(`DELETE FROM ${target} WHERE ${pk} IN (
-      SELECT ${pk} FROM ${target} WHERE ${clauses.join(' AND ')}${pinnedClause} LIMIT 1024
-    )`, params);
+    db.exec(`DELETE FROM ${target} WHERE ${pk} IN(SELECT ${pk} FROM ${target} WHERE ${clauses.join(' AND ')}${pinnedClause} LIMIT 1024)`, params);
     const remaining = db.query(`SELECT 1 FROM ${target} WHERE ${clauses.join(' AND ')}${pinnedClause} LIMIT 1`, params).length > 0;
     const deferred = remaining ||
         db.query(`SELECT 1 FROM ${target} WHERE ${clauses.join(' AND ')} LIMIT 1`, params.slice(0, params.length - pinnedRowIds.size)).length > 0;
@@ -211,10 +209,7 @@ export async function applySqliteSegment(db, schema, table, bytes, descriptor, o
         //    SQLite database or lacks the metadata table fails right here.
         let meta;
         try {
-            meta = db.query(`SELECT format, "table" AS tbl, "schemaVersion" AS sv,
-                "asOfCommitSeq" AS pin, "scopeDigest" AS sd,
-                "rowCount" AS rc
-         FROM ${IMAGE_ALIAS}."_syncular_segment"`);
+            meta = db.query(`SELECT format,"table" AS tbl,"schemaVersion" AS sv,"asOfCommitSeq" AS pin,"scopeDigest" AS sd,"rowCount" AS rc FROM ${IMAGE_ALIAS}."_syncular_segment"`);
         }
         catch {
             imageInvalid('bytes are not a SQLite image with _syncular_segment');
@@ -256,7 +251,7 @@ export async function applySqliteSegment(db, schema, table, bytes, descriptor, o
         if (primaryKeys.length !== 1 || primaryKeys[0]?.name !== table.primaryKey)
             imageInvalid('image primary key does not match generated schema');
         const source = `${IMAGE_ALIAS}.${quoteIdent(table.name)}`;
-        const count = Number(db.query(`SELECT count(*) AS n FROM ${source}`)[0]?.n);
+        const count = Number(db.query(`SELECT count(*)AS n FROM ${source}`)[0]?.n);
         if (count !== descriptor.rowCount)
             imageInvalid('image row count does not match descriptor');
         const names = table.columns.map((column) => quoteIdent(column.name));
@@ -271,9 +266,7 @@ export async function applySqliteSegment(db, schema, table, bytes, descriptor, o
         for (;;) {
             if (options.isCurrent?.() === false)
                 return applied;
-            const boundary = db.query(`SELECT ${primaryKey} AS boundary FROM ${source}
-         ${after === undefined ? '' : `WHERE ${primaryKey} > ?`}
-         ORDER BY ${primaryKey} LIMIT 1 OFFSET 1023`, after === undefined ? [] : [after])[0]?.boundary;
+            const boundary = db.query(`SELECT ${primaryKey} AS boundary FROM ${source} ${after === undefined ? '' : `WHERE ${primaryKey} > ?`} ORDER BY ${primaryKey} LIMIT 1 OFFSET 1023`, after === undefined ? [] : [after])[0]?.boundary;
             if (boundary === null)
                 imageInvalid('image primary key must not be null');
             const predicates = [];
@@ -287,15 +280,13 @@ export async function applySqliteSegment(db, schema, table, bytes, descriptor, o
                 params.push(boundary);
             }
             (options.transaction ?? ((fn) => db.transaction(fn)))(() => {
+                restoreFailedBases(db, schema);
                 if (after === undefined && options.clearFirst)
                     deleteScopedRows(db, table, options.effective);
-                db.exec(`INSERT INTO ${quoteIdent(table.name)} (${insertNames.join(', ')})
-           SELECT ${[...names, quoteIdent('_syncular_version')].join(', ')}
-           FROM ${source} WHERE ${predicates.join(' AND ') || 'true'}
-           ON CONFLICT (${primaryKey}) DO UPDATE SET ${updates}`, params);
-                applied += Number(db.query('SELECT changes() AS n')[0]?.n ?? 0);
+                db.exec(`INSERT INTO ${quoteIdent(table.name)}(${insertNames.join(', ')})SELECT ${[...names, quoteIdent('_syncular_version')].join(', ')} FROM ${source} WHERE ${predicates.join(' AND ') || 'true'} ON CONFLICT(${primaryKey})DO UPDATE SET ${updates}`, 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) => [
+                    retainedBaseWrite(db, table, String(row[table.primaryKey]), Object.fromEntries(table.columns.map((column) => [
                         column.name,
                         rowValueToJson(row[column.name]),
                     ])), Number(row._syncular_version));
@@ -348,6 +339,7 @@ export async function applyRowsSegment(db, schema, table, segment, options, encr
         if (!clearThisBlock && rows.length === 0)
             continue;
         (options.transaction ?? ((fn) => db.transaction(fn)))(() => {
+            restoreFailedBases(db, schema);
             if (clearThisBlock) {
                 deleteScopedRows(db, table, options.effective);
             }

package/dist/blob.js

@@ -20,7 +20,7 @@ export async function computeBlobId(bytes) {
     return `sha256:${hex}`;
 }
 export function ensureBlobSchema(db) {
-    const existing = db.query("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = '_syncular_blobs'");
+    const existing = db.query("SELECT 1 FROM sqlite_master WHERE type='table' AND name='_syncular_blobs'");
     if (existing.length > 0) {
         const columns = db
             .query('PRAGMA table_info(_syncular_blobs)')
@@ -39,24 +39,16 @@ export function ensureBlobSchema(db) {
         }
     }
     else {
-        db.exec(`CREATE TABLE _syncular_blobs(
-      blob_id TEXT PRIMARY KEY,
-      bytes BLOB NOT NULL,
-      byte_length INTEGER NOT NULL,
-      media_type TEXT,
-      created_at_ms INTEGER NOT NULL)`);
+        db.exec('CREATE TABLE _syncular_blobs(blob_id TEXT PRIMARY KEY,bytes BLOB NOT NULL,byte_length INTEGER NOT NULL,media_type TEXT,created_at_ms INTEGER NOT NULL)');
     }
-    db.exec(`CREATE TABLE IF NOT EXISTS _syncular_blob_uploads(
-    blob_id TEXT PRIMARY KEY, media_type TEXT, created_at_ms INTEGER NOT NULL)`);
+    db.exec('CREATE TABLE IF NOT EXISTS _syncular_blob_uploads(blob_id TEXT PRIMARY KEY,media_type TEXT,created_at_ms INTEGER NOT NULL)');
 }
 /** Put bytes into the content-addressed cache without rewriting an existing body. */
 export function putCachedBlob(db, blobId, bytes, nowMs, mediaType) {
-    db.exec(`INSERT INTO _syncular_blobs(
-       blob_id, bytes, byte_length, media_type, created_at_ms)
-     VALUES (?,?,?,?,?) ON CONFLICT(blob_id) DO NOTHING`, [blobId, bytes, bytes.length, mediaType ?? null, nowMs]);
+    db.exec('INSERT INTO _syncular_blobs(blob_id,bytes,byte_length,media_type,created_at_ms)VALUES(?,?,?,?,?)ON CONFLICT(blob_id)DO NOTHING', [blobId, bytes, bytes.length, mediaType ?? null, nowMs]);
 }
 export function getCachedBlob(db, blobId) {
-    const rows = db.query('SELECT bytes, byte_length, media_type FROM _syncular_blobs WHERE blob_id = ?', [blobId]);
+    const rows = db.query('SELECT bytes,byte_length,media_type FROM _syncular_blobs WHERE blob_id=?', [blobId]);
     const row = rows[0];
     if (row === undefined)
         return undefined;
@@ -73,23 +65,19 @@ export function getCachedBlob(db, blobId) {
  * until back under the cap. Returns the evicted blobIds.
  */
 export function enforceBlobCacheCap(db, schema, maxBytes) {
-    const totalRow = db.query('SELECT COALESCE(SUM(byte_length), 0) AS total FROM _syncular_blobs')[0];
+    const totalRow = db.query('SELECT COALESCE(SUM(byte_length),0)AS total FROM _syncular_blobs')[0];
     let total = Number(totalRow?.total ?? 0);
     if (total <= maxBytes)
         return [];
     // Oldest eligible body first, with blob ID as a stable tie.
-    const candidates = db.query(`SELECT blob_id, byte_length FROM _syncular_blobs
-     WHERE blob_id NOT IN (SELECT blob_id FROM _syncular_blob_uploads)
-       AND blob_id NOT IN (SELECT blob_id FROM _syncular_blob_commit_refs)
-       AND blob_id NOT IN (${visibleBlobIdsSql(schema)})
-     ORDER BY created_at_ms ASC, blob_id ASC`);
+    const candidates = db.query(`SELECT blob_id,byte_length FROM _syncular_blobs WHERE blob_id NOT IN(SELECT blob_id FROM _syncular_blob_uploads)AND blob_id NOT IN(SELECT blob_id FROM _syncular_blob_commit_refs)AND blob_id NOT IN(${visibleBlobIdsSql(schema)})ORDER BY created_at_ms ASC,blob_id ASC`);
     const evicted = [];
     db.transaction(() => {
         for (const row of candidates) {
             if (total <= maxBytes)
                 break;
             const blobId = row.blob_id;
-            db.exec('DELETE FROM _syncular_blobs WHERE blob_id = ?', [blobId]);
+            db.exec('DELETE FROM _syncular_blobs WHERE blob_id=?', [blobId]);
             total -= Number(row.byte_length);
             evicted.push(blobId);
         }
@@ -98,13 +86,7 @@ export function enforceBlobCacheCap(db, schema, maxBytes) {
 }
 export function listPendingUploads(db) {
     return db
-        .query(`SELECT blob_id, media_type FROM (
-        SELECT blob_id, media_type, created_at_ms FROM _syncular_blob_uploads
-        UNION ALL
-        SELECT DISTINCT r.blob_id, b.media_type, 9223372036854775807 AS created_at_ms
-        FROM _syncular_blob_commit_refs r LEFT JOIN _syncular_blobs b ON b.blob_id = r.blob_id
-        WHERE NOT EXISTS (SELECT 1 FROM _syncular_blob_uploads u WHERE u.blob_id = r.blob_id)
-      ) ORDER BY created_at_ms, blob_id`)
+        .query('SELECT blob_id,media_type FROM(SELECT blob_id,media_type,created_at_ms FROM _syncular_blob_uploads UNION ALL SELECT DISTINCT r.blob_id,b.media_type,9223372036854775807 AS created_at_ms FROM _syncular_blob_commit_refs r LEFT JOIN _syncular_blobs b ON b.blob_id=r.blob_id WHERE NOT EXISTS(SELECT 1 FROM _syncular_blob_uploads u WHERE u.blob_id=r.blob_id))ORDER BY created_at_ms,blob_id')
         .map((row) => {
         if (typeof row.blob_id !== 'string' ||
             (row.media_type !== null && typeof row.media_type !== 'string')) {
@@ -117,11 +99,10 @@ export function listPendingUploads(db) {
     });
 }
 export function recordPendingUpload(db, blobId, nowMs, mediaType) {
-    db.exec(`INSERT OR IGNORE INTO _syncular_blob_uploads(blob_id, media_type, created_at_ms)
-     VALUES (?,?,?)`, [blobId, mediaType ?? null, nowMs]);
+    db.exec('INSERT OR IGNORE INTO _syncular_blob_uploads(blob_id,media_type,created_at_ms)VALUES(?,?,?)', [blobId, mediaType ?? null, nowMs]);
 }
 export function clearPendingUpload(db, blobId) {
-    db.exec('DELETE FROM _syncular_blob_uploads WHERE blob_id = ?', [blobId]);
+    db.exec('DELETE FROM _syncular_blob_uploads WHERE blob_id=?', [blobId]);
 }
 /**
  * All `blob_ref` column names per table.
@@ -149,11 +130,7 @@ function visibleBlobIdsSql(schema) {
     for (const [tableName, columns] of blobRefColumnsBySchema(schema)) {
         for (const column of columns) {
             const identifier = quoteIdent(column);
-            selects.push(`SELECT json_extract(${identifier}, '$.blobId') AS blob_id
-         FROM ${quoteIdent(tableName)}
-         WHERE typeof(${identifier}) = 'text'
-           AND json_valid(${identifier})
-           AND json_type(${identifier}, '$.blobId') = 'text'`);
+            selects.push(`SELECT json_extract(${identifier},'$.blobId')AS blob_id FROM ${quoteIdent(tableName)} WHERE typeof(${identifier})='text' AND json_valid(${identifier})AND json_type(${identifier},'$.blobId')='text'`);
         }
     }
     return selects.length === 0
@@ -161,9 +138,6 @@ function visibleBlobIdsSql(schema) {
         : selects.join(' UNION ');
 }
 export function deleteUnreferencedCachedBlobs(db, schema) {
-    db.exec(`DELETE FROM _syncular_blobs
-     WHERE blob_id NOT IN (SELECT blob_id FROM _syncular_blob_uploads)
-       AND blob_id NOT IN (SELECT blob_id FROM _syncular_blob_commit_refs)
-       AND blob_id NOT IN (${visibleBlobIdsSql(schema)})`);
+    db.exec(`DELETE FROM _syncular_blobs WHERE blob_id NOT IN(SELECT blob_id FROM _syncular_blob_uploads)AND blob_id NOT IN(SELECT blob_id FROM _syncular_blob_commit_refs)AND blob_id NOT IN(${visibleBlobIdsSql(schema)})`);
 }
 export { parseBlobRef, serializeBlobRef };