@syncular/server 0.11.0 → 0.13.0

package/dist/d1-storage.js

@@ -40,7 +40,7 @@
  * rather than a lock D1 does not expose.
  */
 import { syncError } from './errors.js';
-import { commitWindowPageSql, deleteRowSql, layoutsOf, migratePayload, parseLayouts, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_SQLITE, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, tableColumnNames, upsertSql, upsertValues, } from './relational-rows.js';
+import { commitWindowPageSql, deleteRowSql, dropTableDdl, layoutsOf, migratePayload, parseLayouts, retiredTableNames, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_SQLITE, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, tableColumnNames, upsertSql, upsertValues, } from './relational-rows.js';
 import { matchesEffective } from './scopes.js';
 import { asUint8Array, collectCommitWindowPage, deserializePushResult, serializePushResult, sqliteDdlStatements, toStoredRow, } from './sqlite-dialect.js';
 class D1Transaction {
@@ -307,6 +307,7 @@ export class D1ServerStorage {
         if (marker === null || marker.schema_version < schema.version) {
             await this.migrate();
             const layouts = parseLayouts(marker?.layouts);
+            const retiredTables = retiredTableNames(schema, layouts);
             const existing = new Map();
             for (const table of schema.tables.values()) {
                 const { results } = await this.#db
@@ -331,6 +332,18 @@ export class D1ServerStorage {
                     continue;
                 await this.#rewriteRows(table, plan.migrate ? oldLayout : undefined);
             }
+            // Retire tables only after the additive DDL and rewrites succeed. D1
+            // cannot wrap the whole bump in an interactive transaction, but this
+            // ordering avoids destructive work before every fallible preparatory
+            // step and the batch keeps table + live-scope cleanup atomic.
+            if (retiredTables.length > 0) {
+                await this.#db.batch(retiredTables.flatMap((tableName) => [
+                    this.#db
+                        .prepare('DELETE FROM sync_row_scopes WHERE tbl=?')
+                        .bind(tableName),
+                    this.#db.prepare(dropTableDdl(tableName)),
+                ]));
+            }
             await this.#db
                 .prepare('INSERT INTO sync_schema_meta(id, schema_version, layouts) VALUES (1, ?, ?) ON CONFLICT(id) DO UPDATE SET schema_version=excluded.schema_version, layouts=excluded.layouts')
                 .bind(schema.version, layoutsOf(schema))

package/dist/postgres-storage.js

@@ -1,6 +1,6 @@
 import { syncError } from './errors.js';
 import { asBytes, asNumber, } from './pg-executor.js';
-import { commitWindowPageSql, deleteRowSql, layoutsOf, migratePayload, parseLayouts, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_POSTGRES, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, upsertSql, upsertValues, } from './relational-rows.js';
+import { commitWindowPageSql, deleteRowSql, dropTableDdl, layoutsOf, migratePayload, parseLayouts, retiredTableNames, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_POSTGRES, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, upsertSql, upsertValues, } from './relational-rows.js';
 import { matchesEffective } from './scopes.js';
 /**
  * Schema DDL. Applied by `PostgresServerStorage.migrate()` (idempotent).
@@ -457,6 +457,7 @@ export class PostgresServerStorage {
             const layouts = parseLayouts(typeof marker.rows[0]?.layouts === 'string'
                 ? marker.rows[0].layouts
                 : undefined);
+            const retiredTables = retiredTableNames(schema, layouts);
             await this.#exec.transaction(async (client) => {
                 const existing = new Map();
                 for (const table of schema.tables.values()) {
@@ -466,6 +467,12 @@ export class PostgresServerStorage {
                         existing.set(table.name, new Set(rows.map((r) => r.column_name)));
                     }
                 }
+                for (const tableName of retiredTables) {
+                    await client.query('DELETE FROM sync_row_scopes WHERE tbl=$1', [
+                        tableName,
+                    ]);
+                    await client.query(dropTableDdl(tableName));
+                }
                 for (const statement of schemaDdl(schema, existing, 'postgres')) {
                     await client.query(statement);
                 }

package/dist/relational-rows.d.ts

@@ -178,6 +178,14 @@ export type StoredLayouts = Record<string, readonly StoredColumnLayout[]>;
 /** The layouts JSON persisted alongside the schema version marker. */
 export declare function layoutsOf(schema: CompiledSchema): string;
 export declare function parseLayouts(json: string | null | undefined): StoredLayouts;
+/**
+ * Tables present in the stored layout but absent from the configured head
+ * schema. A schema-version bump retires their relational current-row tables;
+ * append-only commit history remains governed by the normal retention policy.
+ */
+export declare function retiredTableNames(schema: CompiledSchema, storedLayouts: StoredLayouts): string[];
+/** Idempotent DDL for one retired relational current-row table. */
+export declare function dropTableDdl(tableName: string): string;
 /**
  * Enforce the migration subset on a table's column list: the old layout
  * must be an exact prefix (same name, type, nullability) of the new one,

package/dist/relational-rows.js

@@ -381,6 +381,20 @@ export function parseLayouts(json) {
         return {};
     return JSON.parse(json);
 }
+/**
+ * Tables present in the stored layout but absent from the configured head
+ * schema. A schema-version bump retires their relational current-row tables;
+ * append-only commit history remains governed by the normal retention policy.
+ */
+export function retiredTableNames(schema, storedLayouts) {
+    return Object.keys(storedLayouts)
+        .filter((name) => !schema.tables.has(name))
+        .sort();
+}
+/** Idempotent DDL for one retired relational current-row table. */
+export function dropTableDdl(tableName) {
+    return `DROP TABLE IF EXISTS ${quoteIdent(tableName)}`;
+}
 /**
  * Enforce the migration subset on a table's column list: the old layout
  * must be an exact prefix (same name, type, nullability) of the new one,

package/dist/sqlite-storage.js

@@ -8,7 +8,7 @@
  */
 import { Database } from 'bun:sqlite';
 import { syncError } from './errors.js';
-import { commitWindowPageSql, deleteRowSql, layoutsOf, migratePayload, parseLayouts, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_SQLITE, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, upsertSql, upsertValues, } from './relational-rows.js';
+import { commitWindowPageSql, deleteRowSql, dropTableDdl, layoutsOf, migratePayload, parseLayouts, retiredTableNames, rewritePlan, rewriteRowSql, rewriteValues, SCHEMA_META_DDL_SQLITE, scanRowPageSql, schemaDdl, selectRowScopesSql, selectRowSql, selectRowsForRewriteSql, upsertSql, upsertValues, } from './relational-rows.js';
 import { matchesEffective } from './scopes.js';
 import { collectCommitWindowPage, deserializePushResult, SQLITE_DDL, serializePushResult, toStoredRow, } from './sqlite-dialect.js';
 class SqliteTransaction {
@@ -143,6 +143,7 @@ export class SqliteServerStorage {
             // projection backfill for flipped-on materialization). One
             // transaction: a failed bump leaves no half-state.
             const layouts = parseLayouts(marker?.layouts);
+            const retiredTables = retiredTableNames(schema, layouts);
             const existing = new Map();
             for (const table of schema.tables.values()) {
                 const columns = this.db
@@ -154,6 +155,12 @@ export class SqliteServerStorage {
             }
             this.db.exec('BEGIN IMMEDIATE');
             try {
+                for (const tableName of retiredTables) {
+                    this.db
+                        .query('DELETE FROM sync_row_scopes WHERE tbl=?')
+                        .run(tableName);
+                    this.db.exec(dropTableDdl(tableName));
+                }
                 for (const statement of schemaDdl(schema, existing, 'sqlite')) {
                     this.db.exec(statement);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/server",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "description": "Syncular server: handleSyncRequest + storage/auth interfaces for the sync protocol",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -53,7 +53,7 @@
     "!dist/**/*.test.d.ts"
   ],
   "dependencies": {
-    "@syncular/core": "0.11.0"
+    "@syncular/core": "0.13.0"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.5.4"

package/src/d1-storage.ts

@@ -43,9 +43,11 @@ import { syncError } from './errors';
 import {
   commitWindowPageSql,
   deleteRowSql,
+  dropTableDdl,
   layoutsOf,
   migratePayload,
   parseLayouts,
+  retiredTableNames,
   rewritePlan,
   rewriteRowSql,
   rewriteValues,
@@ -489,6 +491,7 @@ export class D1ServerStorage implements ServerStorage {
     if (marker === null || marker.schema_version < schema.version) {
       await this.migrate();
       const layouts = parseLayouts(marker?.layouts);
+      const retiredTables = retiredTableNames(schema, layouts);
       const existing = new Map<string, ReadonlySet<string>>();
       for (const table of schema.tables.values()) {
         const { results } = await this.#db
@@ -512,6 +515,20 @@ export class D1ServerStorage implements ServerStorage {
         if (!plan.migrate && !plan.backfill) continue;
         await this.#rewriteRows(table, plan.migrate ? oldLayout : undefined);
       }
+      // Retire tables only after the additive DDL and rewrites succeed. D1
+      // cannot wrap the whole bump in an interactive transaction, but this
+      // ordering avoids destructive work before every fallible preparatory
+      // step and the batch keeps table + live-scope cleanup atomic.
+      if (retiredTables.length > 0) {
+        await this.#db.batch(
+          retiredTables.flatMap((tableName) => [
+            this.#db
+              .prepare('DELETE FROM sync_row_scopes WHERE tbl=?')
+              .bind(tableName),
+            this.#db.prepare(dropTableDdl(tableName)),
+          ]),
+        );
+      }
       await this.#db
         .prepare(
           'INSERT INTO sync_schema_meta(id, schema_version, layouts) VALUES (1, ?, ?) ON CONFLICT(id) DO UPDATE SET schema_version=excluded.schema_version, layouts=excluded.layouts',

package/src/postgres-storage.ts

@@ -46,9 +46,11 @@ import {
 import {
   commitWindowPageSql,
   deleteRowSql,
+  dropTableDdl,
   layoutsOf,
   migratePayload,
   parseLayouts,
+  retiredTableNames,
   rewritePlan,
   rewriteRowSql,
   rewriteValues,
@@ -721,6 +723,7 @@ export class PostgresServerStorage implements ServerStorage {
           ? marker.rows[0].layouts
           : undefined,
       );
+      const retiredTables = retiredTableNames(schema, layouts);
       await this.#exec.transaction(async (client) => {
         const existing = new Map<string, ReadonlySet<string>>();
         for (const table of schema.tables.values()) {
@@ -733,6 +736,12 @@ export class PostgresServerStorage implements ServerStorage {
             existing.set(table.name, new Set(rows.map((r) => r.column_name)));
           }
         }
+        for (const tableName of retiredTables) {
+          await client.query('DELETE FROM sync_row_scopes WHERE tbl=$1', [
+            tableName,
+          ]);
+          await client.query(dropTableDdl(tableName));
+        }
         for (const statement of schemaDdl(schema, existing, 'postgres')) {
           await client.query(statement);
         }

package/src/relational-rows.ts

@@ -453,6 +453,25 @@ export function parseLayouts(json: string | null | undefined): StoredLayouts {
   return JSON.parse(json) as StoredLayouts;
 }
 
+/**
+ * Tables present in the stored layout but absent from the configured head
+ * schema. A schema-version bump retires their relational current-row tables;
+ * append-only commit history remains governed by the normal retention policy.
+ */
+export function retiredTableNames(
+  schema: CompiledSchema,
+  storedLayouts: StoredLayouts,
+): string[] {
+  return Object.keys(storedLayouts)
+    .filter((name) => !schema.tables.has(name))
+    .sort();
+}
+
+/** Idempotent DDL for one retired relational current-row table. */
+export function dropTableDdl(tableName: string): string {
+  return `DROP TABLE IF EXISTS ${quoteIdent(tableName)}`;
+}
+
 /**
  * Enforce the migration subset on a table's column list: the old layout
  * must be an exact prefix (same name, type, nullability) of the new one,

package/src/sqlite-storage.ts

@@ -11,9 +11,11 @@ import { syncError } from './errors';
 import {
   commitWindowPageSql,
   deleteRowSql,
+  dropTableDdl,
   layoutsOf,
   migratePayload,
   parseLayouts,
+  retiredTableNames,
   rewritePlan,
   rewriteRowSql,
   rewriteValues,
@@ -273,6 +275,7 @@ export class SqliteServerStorage implements ServerStorage {
       // projection backfill for flipped-on materialization). One
       // transaction: a failed bump leaves no half-state.
       const layouts = parseLayouts(marker?.layouts);
+      const retiredTables = retiredTableNames(schema, layouts);
       const existing = new Map<string, ReadonlySet<string>>();
       for (const table of schema.tables.values()) {
         const columns = this.db
@@ -286,6 +289,12 @@ export class SqliteServerStorage implements ServerStorage {
       }
       this.db.exec('BEGIN IMMEDIATE');
       try {
+        for (const tableName of retiredTables) {
+          this.db
+            .query('DELETE FROM sync_row_scopes WHERE tbl=?')
+            .run(tableName);
+          this.db.exec(dropTableDdl(tableName));
+        }
         for (const statement of schemaDdl(schema, existing, 'sqlite')) {
           this.db.exec(statement);
         }