@supabase/pg-delta 1.0.0-alpha.11 → 1.0.0-alpha.13

package/src/core/objects/type/enum/changes/enum.privilege.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import {
   formatObjectPrivilegeList,
   getObjectKindPrefix,
@@ -52,7 +53,7 @@ export class GrantEnumPrivileges extends AlterEnumChange {
     return [this.enum.stableId, stableId.role(this.grantee)];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const hasGrantable = this.privileges.some((p) => p.grantable);
     const hasBase = this.privileges.some((p) => !p.grantable);
     if (hasGrantable && hasBase) {
@@ -118,7 +119,7 @@ export class RevokeEnumPrivileges extends AlterEnumChange {
     ];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const kindPrefix = getObjectKindPrefix("TYPE");
     const list = this.privileges.map((p) => p.privilege);
     const privSql = formatObjectPrivilegeList("TYPE", list, this.version);
@@ -162,7 +163,7 @@ export class RevokeGrantOptionEnumPrivileges extends AlterEnumChange {
     ];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const kindPrefix = getObjectKindPrefix("TYPE");
     const privSql = formatObjectPrivilegeList(
       "TYPE",

package/src/core/objects/type/range/changes/range.alter.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { Range } from "../range.model.ts";
 import { AlterRangeChange } from "./range.base.ts";
 
@@ -34,7 +35,7 @@ export class AlterRangeChangeOwner extends AlterRangeChange {
     return [this.range.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return [
       "ALTER TYPE",
       `${this.range.schema}.${this.range.name}`,

package/src/core/objects/type/range/changes/range.comment.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import { quoteLiteral } from "../../../base.change.ts";
 import { stableId } from "../../../utils.ts";
 import type { Range } from "../range.model.ts";
@@ -26,7 +27,7 @@ export class CreateCommentOnRange extends CreateRangeChange {
     return [this.range.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return [
       "COMMENT ON TYPE",
       `${this.range.schema}.${this.range.name}`,
@@ -54,7 +55,7 @@ export class DropCommentOnRange extends DropRangeChange {
     return [stableId.comment(this.range.stableId), this.range.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return [
       "COMMENT ON TYPE",
       `${this.range.schema}.${this.range.name}`,

package/src/core/objects/type/range/changes/range.create.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import {
   isUserDefinedTypeSchema,
   parseProcedureReference,
@@ -98,7 +99,7 @@ export class CreateRange extends CreateRangeChange {
     return Array.from(dependencies);
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const name = `${this.range.schema}.${this.range.name}`;
     const prefix: string = ["CREATE TYPE", name, "AS RANGE"].join(" ");
 

package/src/core/objects/type/range/changes/range.drop.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { Range } from "../range.model.ts";
 import { DropRangeChange } from "./range.base.ts";
 
@@ -28,7 +29,7 @@ export class DropRange extends DropRangeChange {
     return [this.range.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return ["DROP TYPE", `${this.range.schema}.${this.range.name}`].join(" ");
   }
 }

package/src/core/objects/type/range/changes/range.privilege.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import {
   formatObjectPrivilegeList,
   getObjectKindPrefix,
@@ -52,7 +53,7 @@ export class GrantRangePrivileges extends AlterRangeChange {
     return [this.range.stableId, stableId.role(this.grantee)];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const hasGrantable = this.privileges.some((p) => p.grantable);
     const hasBase = this.privileges.some((p) => !p.grantable);
     if (hasGrantable && hasBase) {
@@ -118,7 +119,7 @@ export class RevokeRangePrivileges extends AlterRangeChange {
     ];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const kindPrefix = getObjectKindPrefix("TYPE");
     const list = this.privileges.map((p) => p.privilege);
     const privSql = formatObjectPrivilegeList("TYPE", list, this.version);
@@ -162,7 +163,7 @@ export class RevokeGrantOptionRangePrivileges extends AlterRangeChange {
     ];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const kindPrefix = getObjectKindPrefix("TYPE");
     const privSql = formatObjectPrivilegeList(
       "TYPE",

package/src/core/objects/view/changes/view.alter.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { View } from "../view.model.ts";
 import { AlterViewChange } from "./view.base.ts";
 
@@ -42,7 +43,7 @@ export class AlterViewChangeOwner extends AlterViewChange {
     return [this.view.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return [
       "ALTER VIEW",
       `${this.view.schema}.${this.view.name}`,
@@ -72,7 +73,7 @@ export class AlterViewSetOptions extends AlterViewChange {
     return [this.view.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const opts = this.options.join(", ");
     return [
       "ALTER VIEW",
@@ -101,7 +102,7 @@ export class AlterViewResetOptions extends AlterViewChange {
     return [this.view.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return [
       "ALTER VIEW",
       `${this.view.schema}.${this.view.name}`,

package/src/core/objects/view/changes/view.comment.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import { quoteLiteral } from "../../base.change.ts";
 import { stableId } from "../../utils.ts";
 import type { View } from "../view.model.ts";
@@ -22,7 +23,7 @@ export class CreateCommentOnView extends CreateViewChange {
     return [this.view.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return [
       "COMMENT ON VIEW",
       `${this.view.schema}.${this.view.name}`,
@@ -49,7 +50,7 @@ export class DropCommentOnView extends DropViewChange {
     return [stableId.comment(this.view.stableId), this.view.stableId];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return [
       "COMMENT ON VIEW",
       `${this.view.schema}.${this.view.name}`,

package/src/core/objects/view/changes/view.create.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import { stableId } from "../../utils.ts";
 import type { View } from "../view.model.ts";
 import { CreateViewChange } from "./view.base.ts";
@@ -52,7 +53,7 @@ export class CreateView extends CreateViewChange {
     return Array.from(dependencies);
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const parts: string[] = [
       `CREATE${this.orReplace ? " OR REPLACE" : ""} VIEW`,
     ];

package/src/core/objects/view/changes/view.drop.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import { stableId } from "../../utils.ts";
 import type { View } from "../view.model.ts";
 import { DropViewChange } from "./view.base.ts";
@@ -34,7 +35,7 @@ export class DropView extends DropViewChange {
     ];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     return ["DROP VIEW", `${this.view.schema}.${this.view.name}`].join(" ");
   }
 }

package/src/core/objects/view/changes/view.privilege.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import {
   formatObjectPrivilegeList,
   getObjectKindPrefix,
@@ -57,7 +58,7 @@ export class GrantViewPrivileges extends AlterViewChange {
     return [this.view.stableId, stableId.role(this.grantee)];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const hasGrantable = this.privileges.some((p) => p.grantable);
     const hasBase = this.privileges.some((p) => !p.grantable);
     if (hasGrantable && hasBase) {
@@ -132,7 +133,7 @@ export class RevokeViewPrivileges extends AlterViewChange {
     ];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const kindPrefix = getObjectKindPrefix("VIEW");
     const list = this.privileges.map((p) => p.privilege);
     const privSql = formatObjectPrivilegeList("VIEW", list, this.version);
@@ -183,7 +184,7 @@ export class RevokeGrantOptionViewPrivileges extends AlterViewChange {
     ];
   }
 
-  serialize(): string {
+  serialize(_options?: SerializeOptions): string {
     const kindPrefix = getObjectKindPrefix("VIEW");
     const privSql = formatObjectPrivilegeList(
       "VIEW",

package/src/core/plan/create.ts

@@ -10,15 +10,12 @@ import { createEmptyCatalog, extractCatalog } from "../catalog.model.ts";
 import type { Change } from "../change.types.ts";
 import type { DiffContext } from "../context.ts";
 import { buildPlanScopeFingerprint, hashStableIds } from "../fingerprint.ts";
+import type { FilterDSL } from "../integrations/filter/dsl.ts";
 import {
-  compileFilterDSL,
-  type FilterDSL,
-} from "../integrations/filter/dsl.ts";
-import type { Integration } from "../integrations/integration.types.ts";
-import {
-  compileSerializeDSL,
-  type SerializeDSL,
-} from "../integrations/serialize/dsl.ts";
+  type ResolvedIntegration,
+  resolveIntegration,
+} from "../integrations/integration.types.ts";
+import type { SerializeDSL } from "../integrations/serialize/dsl.ts";
 import { createManagedPool, endPool } from "../postgres-config.ts";
 import { sortChanges } from "../sort/sort-changes.ts";
 import type { PgDependRow } from "../sort/types.ts";
@@ -155,23 +152,10 @@ function buildPlanForCatalogs(
     : undefined;
 
   // Build final integration: compile DSL if needed, use functions directly otherwise
-  let finalIntegration: Integration | undefined;
-  if (filterOption || serializeOption) {
-    finalIntegration = {
-      filter:
-        typeof filterOption === "function"
-          ? filterOption
-          : filterDSL
-            ? compileFilterDSL(filterDSL)
-            : undefined,
-      serialize:
-        typeof serializeOption === "function"
-          ? serializeOption
-          : serializeDSL
-            ? compileSerializeDSL(serializeDSL)
-            : undefined,
-    };
-  }
+  const finalIntegration = resolveIntegration({
+    filter: filterOption,
+    serialize: serializeOption,
+  });
 
   // Use filter from final integration
   const filterFn = finalIntegration?.filter;
@@ -317,7 +301,7 @@ function buildPlan(
   options?: CreatePlanOptions,
   filterDSL?: FilterDSL,
   serializeDSL?: SerializeDSL,
-  integration?: Integration,
+  integration?: ResolvedIntegration,
 ): Plan {
   const role = options?.role;
   const statements = generateStatements(changes, {
@@ -350,7 +334,7 @@ function buildPlan(
 function generateStatements(
   changes: Change[],
   options?: {
-    integration?: Integration;
+    integration?: ResolvedIntegration;
     role?: string;
   },
 ): string[] {

package/src/core/plan/sql-format/format-off.test.ts

@@ -439,7 +439,7 @@ describe("sql formatting snapshots", () => {
       CREATE SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
 
       -- sequence.drop
-      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq CASCADE;
 
       -- sequence.alter.set_owned_by
       ALTER SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq OWNED BY public.table_with_very_long_name_for_formatting_and_wrapping_test.id;

package/src/core/plan/sql-format/format-pretty-lower-leading.test.ts

@@ -579,7 +579,7 @@ describe("sql formatting snapshots", () => {
       create sequence public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
 
       -- sequence.drop
-      drop sequence public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+      drop sequence public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq cascade;
 
       -- sequence.alter.set_owned_by
       alter sequence public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq owned by

package/src/core/plan/sql-format/format-pretty-narrow.test.ts

@@ -684,7 +684,7 @@ describe("sql formatting snapshots", () => {
 
       -- sequence.drop
       DROP SEQUENCE
-        public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+        public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq CASCADE;
 
       -- sequence.alter.set_owned_by
       ALTER SEQUENCE

package/src/core/plan/sql-format/format-pretty-preserve.test.ts

@@ -577,7 +577,7 @@ describe("sql formatting snapshots", () => {
       CREATE SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
 
       -- sequence.drop
-      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq CASCADE;
 
       -- sequence.alter.set_owned_by
       ALTER SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq OWNED BY

package/src/core/plan/sql-format/format-pretty-upper.test.ts

@@ -570,7 +570,7 @@ describe("sql formatting snapshots", () => {
       CREATE SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
 
       -- sequence.drop
-      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq CASCADE;
 
       -- sequence.alter.set_owned_by
       ALTER SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq OWNED BY

package/src/core/plan/types.ts

@@ -4,10 +4,7 @@
 
 import z from "zod";
 import type { Change } from "../change.types.ts";
-import type { FilterDSL } from "../integrations/filter/dsl.ts";
-import type { ChangeFilter } from "../integrations/filter/filter.types.ts";
-import type { SerializeDSL } from "../integrations/serialize/dsl.ts";
-import type { ChangeSerializer } from "../integrations/serialize/serialize.types.ts";
+import type { Integration } from "../integrations/integration.types.ts";
 
 // ============================================================================
 // Core Types
@@ -157,9 +154,9 @@ export type Plan = z.infer<typeof PlanSchema>;
  */
 export interface CreatePlanOptions {
   /** Filter - either FilterDSL (stored in plan) or ChangeFilter function (not stored) */
-  filter?: FilterDSL | ChangeFilter;
+  filter?: Integration["filter"];
   /** Serialize - either SerializeDSL (stored in plan) or ChangeSerializer function (not stored) */
-  serialize?: SerializeDSL | ChangeSerializer;
+  serialize?: Integration["serialize"];
   /** Role to use when executing the migration (SET ROLE will be added to statements) */
   role?: string;
   /**

package/src/core/sort/custom-constraints.ts

@@ -4,6 +4,12 @@ import {
   GrantRoleDefaultPrivileges,
   RevokeRoleDefaultPrivileges,
 } from "../objects/role/changes/role.privilege.ts";
+import {
+  AlterTableAlterColumnAddIdentity,
+  AlterTableAlterColumnDropDefault,
+  AlterTableAlterColumnDropIdentity,
+  AlterTableAlterColumnSetDefault,
+} from "../objects/table/changes/table.alter.ts";
 import type { Constraint } from "./types.ts";
 
 /**
@@ -143,11 +149,79 @@ function generateDefaultPrivilegeConstraints(changes: Change[]): Constraint[] {
   return constraints;
 }
 
+function generateIdentityTransitionConstraints(
+  changes: Change[],
+): Constraint[] {
+  const constraints: Constraint[] = [];
+  const dropDefaultByColumn = new Map<string, number[]>();
+  const dropIdentityByColumn = new Map<string, number[]>();
+  const addIdentityByColumn = new Map<string, number[]>();
+  const setDefaultByColumn = new Map<string, number[]>();
+
+  for (let i = 0; i < changes.length; i++) {
+    const change = changes[i];
+    const columnKey =
+      "table" in change && "column" in change
+        ? `${change.table.schema}.${change.table.name}.${change.column.name}`
+        : null;
+    if (!columnKey) continue;
+
+    if (change instanceof AlterTableAlterColumnDropDefault) {
+      const entries = dropDefaultByColumn.get(columnKey) ?? [];
+      entries.push(i);
+      dropDefaultByColumn.set(columnKey, entries);
+    } else if (change instanceof AlterTableAlterColumnAddIdentity) {
+      const entries = addIdentityByColumn.get(columnKey) ?? [];
+      entries.push(i);
+      addIdentityByColumn.set(columnKey, entries);
+    } else if (change instanceof AlterTableAlterColumnDropIdentity) {
+      const entries = dropIdentityByColumn.get(columnKey) ?? [];
+      entries.push(i);
+      dropIdentityByColumn.set(columnKey, entries);
+    } else if (change instanceof AlterTableAlterColumnSetDefault) {
+      const entries = setDefaultByColumn.get(columnKey) ?? [];
+      entries.push(i);
+      setDefaultByColumn.set(columnKey, entries);
+    }
+  }
+
+  // These rules only order same-column ALTERs inside the create/alter phase.
+  // Sequence drops are handled separately in the earlier drop phase.
+  for (const [columnKey, dropDefaultIndexes] of dropDefaultByColumn) {
+    const addIdentityIndexes = addIdentityByColumn.get(columnKey) ?? [];
+    for (const sourceIndex of dropDefaultIndexes) {
+      for (const targetIndex of addIdentityIndexes) {
+        constraints.push({
+          sourceChangeIndex: sourceIndex,
+          targetChangeIndex: targetIndex,
+          source: "custom",
+        });
+      }
+    }
+  }
+
+  for (const [columnKey, dropIdentityIndexes] of dropIdentityByColumn) {
+    const setDefaultIndexes = setDefaultByColumn.get(columnKey) ?? [];
+    for (const sourceIndex of dropIdentityIndexes) {
+      for (const targetIndex of setDefaultIndexes) {
+        constraints.push({
+          sourceChangeIndex: sourceIndex,
+          targetChangeIndex: targetIndex,
+          source: "custom",
+        });
+      }
+    }
+  }
+
+  return constraints;
+}
+
 /**
  * All custom constraint generators.
  */
 const customConstraintGenerators: ConstraintGenerator[] = [
   generateDefaultPrivilegeConstraints,
+  generateIdentityTransitionConstraints,
 ];
 
 /**

package/src/typedoc.ts

@@ -25,6 +25,11 @@ export type { FlatValue } from "./core/integrations/filter/flatten.ts";
 
 export type { IntegrationDSL } from "./core/integrations/integration-dsl.ts";
 export type { SerializeDSL } from "./core/integrations/serialize/dsl.ts";
+export type {
+  ExtensionSerializeOptions,
+  SchemaSerializeOptions,
+  SerializeOptions,
+} from "./core/integrations/serialize/serialize.types.ts";
 
 // ---------------------------------------------------------------------------
 // Change Types — Base & Top-Level Unions