@supabase/pg-delta 1.0.0-alpha.10 → 1.0.0-alpha.12

package/dist/core/objects/type/range/changes/range.privilege.js

@@ -33,7 +33,7 @@ export class GrantRangePrivileges extends AlterRangeChange {
     get requires() {
         return [this.range.stableId, stableId.role(this.grantee)];
     }
-    serialize() {
+    serialize(_options) {
         const hasGrantable = this.privileges.some((p) => p.grantable);
         const hasBase = this.privileges.some((p) => !p.grantable);
         if (hasGrantable && hasBase) {
@@ -87,7 +87,7 @@ export class RevokeRangePrivileges extends AlterRangeChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const kindPrefix = getObjectKindPrefix("TYPE");
         const list = this.privileges.map((p) => p.privilege);
         const privSql = formatObjectPrivilegeList("TYPE", list, this.version);
@@ -122,7 +122,7 @@ export class RevokeGrantOptionRangePrivileges extends AlterRangeChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const kindPrefix = getObjectKindPrefix("TYPE");
         const privSql = formatObjectPrivilegeList("TYPE", this.privilegeNames, this.version);
         const typeName = `${this.range.schema}.${this.range.name}`;

package/dist/core/objects/type/range/changes/range.types.d.ts

@@ -3,4 +3,5 @@ import type { CommentRange } from "./range.comment.ts";
 import type { CreateRange } from "./range.create.ts";
 import type { DropRange } from "./range.drop.ts";
 import type { RangePrivilege } from "./range.privilege.ts";
+/** Union of all range-related change variants (`objectType: "range"`). @category Change Types */
 export type RangeChange = AlterRange | CommentRange | CreateRange | DropRange | RangePrivilege;

package/dist/core/objects/type/type.types.d.ts

@@ -1,4 +1,5 @@
 import type { CompositeTypeChange } from "./composite-type/changes/composite-type.types.ts";
 import type { EnumChange } from "./enum/changes/enum.types.ts";
 import type { RangeChange } from "./range/changes/range.types.ts";
+/** Union of all type-related change variants (`objectType: "composite_type" | "enum" | "range"`). @category Change Types */
 export type TypeChange = CompositeTypeChange | EnumChange | RangeChange;

package/dist/core/objects/view/changes/view.alter.d.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";
 /**
@@ -30,7 +31,7 @@ export declare class AlterViewChangeOwner extends AlterViewChange {
         owner: string;
     });
     get requires(): `view:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * ALTER VIEW ... SET ( ... )
@@ -44,7 +45,7 @@ export declare class AlterViewSetOptions extends AlterViewChange {
         options: string[];
     });
     get requires(): `view:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * ALTER VIEW ... RESET ( ... )
@@ -58,5 +59,5 @@ export declare class AlterViewResetOptions extends AlterViewChange {
         params: string[];
     });
     get requires(): `view:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/view/changes/view.alter.js

@@ -14,7 +14,7 @@ export class AlterViewChangeOwner extends AlterViewChange {
     get requires() {
         return [this.view.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "ALTER VIEW",
             `${this.view.schema}.${this.view.name}`,
@@ -39,7 +39,7 @@ export class AlterViewSetOptions extends AlterViewChange {
     get requires() {
         return [this.view.stableId];
     }
-    serialize() {
+    serialize(_options) {
         const opts = this.options.join(", ");
         return [
             "ALTER VIEW",
@@ -64,7 +64,7 @@ export class AlterViewResetOptions extends AlterViewChange {
     get requires() {
         return [this.view.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "ALTER VIEW",
             `${this.view.schema}.${this.view.name}`,

package/dist/core/objects/view/changes/view.comment.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { View } from "../view.model.ts";
 import { CreateViewChange, DropViewChange } from "./view.base.ts";
 export type CommentView = CreateCommentOnView | DropCommentOnView;
@@ -9,7 +10,7 @@ export declare class CreateCommentOnView extends CreateViewChange {
     });
     get creates(): `comment:${string}`[];
     get requires(): `view:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class DropCommentOnView extends DropViewChange {
     readonly view: View;
@@ -19,5 +20,5 @@ export declare class DropCommentOnView extends DropViewChange {
     });
     get drops(): `comment:${string}`[];
     get requires(): (`comment:${string}` | `view:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/view/changes/view.comment.js

@@ -14,7 +14,7 @@ export class CreateCommentOnView extends CreateViewChange {
     get requires() {
         return [this.view.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON VIEW",
             `${this.view.schema}.${this.view.name}`,
@@ -36,7 +36,7 @@ export class DropCommentOnView extends DropViewChange {
     get requires() {
         return [stableId.comment(this.view.stableId), this.view.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON VIEW",
             `${this.view.schema}.${this.view.name}`,

package/dist/core/objects/view/changes/view.create.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { View } from "../view.model.ts";
 import { CreateViewChange } from "./view.base.ts";
 /**
@@ -23,5 +24,5 @@ export declare class CreateView extends CreateViewChange {
     });
     get creates(): (`column:${string}.${string}.${string}` | `view:${string}`)[];
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/view/changes/view.create.js

@@ -40,7 +40,7 @@ export class CreateView extends CreateViewChange {
         // for those dependencies.
         return Array.from(dependencies);
     }
-    serialize() {
+    serialize(_options) {
         const parts = [
             `CREATE${this.orReplace ? " OR REPLACE" : ""} VIEW`,
         ];

package/dist/core/objects/view/changes/view.drop.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { View } from "../view.model.ts";
 import { DropViewChange } from "./view.base.ts";
 /**
@@ -13,5 +14,5 @@ export declare class DropView extends DropViewChange {
     });
     get drops(): (`column:${string}.${string}.${string}` | `view:${string}`)[];
     get requires(): (`column:${string}.${string}.${string}` | `view:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/view/changes/view.drop.js

@@ -24,7 +24,7 @@ export class DropView extends DropViewChange {
             ...this.view.columns.map((column) => stableId.column(this.view.schema, this.view.name, column.name)),
         ];
     }
-    serialize() {
+    serialize(_options) {
         return ["DROP VIEW", `${this.view.schema}.${this.view.name}`].join(" ");
     }
 }

package/dist/core/objects/view/changes/view.privilege.d.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";
 export type ViewPrivilege = GrantViewPrivileges | RevokeViewPrivileges | RevokeGrantOptionViewPrivileges;
@@ -38,7 +39,7 @@ export declare class GrantViewPrivileges extends AlterViewChange {
     });
     get creates(): `acl:${string}::grantee:${string}`[];
     get requires(): (`role:${string}` | `view:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke privileges on a view.
@@ -79,7 +80,7 @@ export declare class RevokeViewPrivileges extends AlterViewChange {
     });
     get drops(): `acl:${string}::grantee:${string}`[];
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `view:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke grant option for privileges on a view.
@@ -103,5 +104,5 @@ export declare class RevokeGrantOptionViewPrivileges extends AlterViewChange {
         version?: number;
     });
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `view:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/view/changes/view.privilege.js

@@ -37,7 +37,7 @@ export class GrantViewPrivileges extends AlterViewChange {
     get requires() {
         return [this.view.stableId, stableId.role(this.grantee)];
     }
-    serialize() {
+    serialize(_options) {
         const hasGrantable = this.privileges.some((p) => p.grantable);
         const hasBase = this.privileges.some((p) => !p.grantable);
         if (hasGrantable && hasBase) {
@@ -98,7 +98,7 @@ export class RevokeViewPrivileges extends AlterViewChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const kindPrefix = getObjectKindPrefix("VIEW");
         const list = this.privileges.map((p) => p.privilege);
         const privSql = formatObjectPrivilegeList("VIEW", list, this.version);
@@ -138,7 +138,7 @@ export class RevokeGrantOptionViewPrivileges extends AlterViewChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const kindPrefix = getObjectKindPrefix("VIEW");
         const privSql = formatObjectPrivilegeList("VIEW", this.privilegeNames, this.version);
         const viewName = `${this.view.schema}.${this.view.name}`;

package/dist/core/objects/view/changes/view.types.d.ts

@@ -3,4 +3,5 @@ import type { CommentView } from "./view.comment.ts";
 import type { CreateView } from "./view.create.ts";
 import type { DropView } from "./view.drop.ts";
 import type { ViewPrivilege } from "./view.privilege.ts";
+/** Union of all view-related change variants (`objectType: "view"`). @category Change Types */
 export type ViewChange = AlterView | CommentView | CreateView | DropView | ViewPrivilege;

package/dist/core/objects/view/view.diff.js

@@ -1,4 +1,5 @@
 import { diffObjects } from "../base.diff.js";
+import { normalizeColumns } from "../base.model.js";
 import { diffPrivileges, emitColumnPrivilegeChanges, } from "../base.privilege-diff.js";
 import { deepEqual, hasNonAlterableChanges } from "../utils.js";
 import { AlterViewChangeOwner, AlterViewResetOptions, AlterViewSetOptions, } from "./changes/view.alter.js";
@@ -17,35 +18,37 @@ import { GrantViewPrivileges, RevokeGrantOptionViewPrivileges, RevokeViewPrivile
 export function diffViews(ctx, main, branch) {
     const { created, dropped, altered } = diffObjects(main, branch);
     const changes = [];
-    for (const viewId of created) {
-        const v = branch[viewId];
-        changes.push(new CreateView({ view: v }));
+    const appendCreateViewChanges = (view) => {
+        changes.push(new CreateView({ view }));
         // OWNER: If the view should be owned by someone other than the current user,
         // emit ALTER VIEW ... OWNER TO after creation
-        if (v.owner !== ctx.currentUser) {
-            changes.push(new AlterViewChangeOwner({ view: v, owner: v.owner }));
+        if (view.owner !== ctx.currentUser) {
+            changes.push(new AlterViewChangeOwner({ view, owner: view.owner }));
         }
-        if (v.comment !== null) {
-            changes.push(new CreateCommentOnView({ view: v }));
+        if (view.comment !== null) {
+            changes.push(new CreateCommentOnView({ view }));
         }
         // PRIVILEGES: For created objects, compare against default privileges state
         // The migration script will run ALTER DEFAULT PRIVILEGES before CREATE (via constraint spec),
         // so objects are created with the default privileges state in effect.
         // We compare default privileges against desired privileges to generate REVOKE/GRANT statements
         // needed to reach the final desired state.
-        const effectiveDefaults = ctx.defaultPrivilegeState.getEffectiveDefaults(ctx.currentUser, "view", v.schema ?? "");
-        const creatorFilteredDefaults = v.owner !== ctx.currentUser
+        const effectiveDefaults = ctx.defaultPrivilegeState.getEffectiveDefaults(ctx.currentUser, "view", view.schema ?? "");
+        const creatorFilteredDefaults = view.owner !== ctx.currentUser
             ? effectiveDefaults.filter((p) => p.grantee !== ctx.currentUser)
             : effectiveDefaults;
-        const desiredPrivileges = v.privileges;
+        const desiredPrivileges = view.privileges;
         // Filter out owner privileges - owner always has ALL privileges implicitly
         // and shouldn't be compared. Use the view owner as the reference.
-        const privilegeResults = diffPrivileges(creatorFilteredDefaults, desiredPrivileges, v.owner);
-        changes.push(...emitColumnPrivilegeChanges(privilegeResults, v, v, "view", {
+        const privilegeResults = diffPrivileges(creatorFilteredDefaults, desiredPrivileges, view.owner);
+        changes.push(...emitColumnPrivilegeChanges(privilegeResults, view, view, "view", {
             Grant: GrantViewPrivileges,
             Revoke: RevokeViewPrivileges,
             RevokeGrantOption: RevokeGrantOptionViewPrivileges,
         }, effectiveDefaults, ctx.version));
+    };
+    for (const viewId of created) {
+        appendCreateViewChanges(branch[viewId]);
     }
     for (const viewId of dropped) {
         changes.push(new DropView({ view: main[viewId] }));
@@ -69,7 +72,15 @@ export function diffViews(ctx, main, branch) {
             "partition_bound",
         ];
         const nonAlterablePropsChanged = hasNonAlterableChanges(mainView, branchView, NON_ALTERABLE_FIELDS, { options: deepEqual });
-        if (nonAlterablePropsChanged) {
+        // Normalize columns (strip position, sort by name) to match stableSnapshot().
+        // Position-only differences are safe to ignore here because column order in a
+        // view is determined by its definition, which is already checked above via
+        // NON_ALTERABLE_FIELDS - a position change always implies a definition change.
+        if (!deepEqual(normalizeColumns(mainView.columns), normalizeColumns(branchView.columns))) {
+            changes.push(new DropView({ view: mainView }));
+            appendCreateViewChanges(branchView);
+        }
+        else if (nonAlterablePropsChanged) {
             // Replace the entire view using CREATE OR REPLACE to avoid drop when possible
             changes.push(new CreateView({ view: branchView, orReplace: true }));
         }

package/dist/core/postgres-config.d.ts

@@ -1,14 +1,14 @@
 /**
  * PostgreSQL connection configuration with custom type handlers.
  */
-import type { PoolClient, PoolConfig } from "pg";
+import type { ClientBase, PoolClient, PoolConfig } from "pg";
 import { Pool } from "pg";
 /**
  * Options for creating a Pool with event listeners.
  */
 interface CreatePoolOptions extends Partial<PoolConfig> {
     /** Called when a new client connects to the pool */
-    onConnect?: (client: PoolClient) => void | Promise<void>;
+    onConnect?: (client: ClientBase) => void | Promise<void>;
     /** Called when an idle client emits an error */
     onError?: (err: Error, client: PoolClient) => void;
     /** Called when a client is acquired from the pool */

package/dist/core/sort/custom-constraints.js

@@ -1,5 +1,6 @@
-import { getSchema } from "../integrations/filter/extractors.js";
+import { getSchema } from "../change-utils.js";
 import { GrantRoleDefaultPrivileges, RevokeRoleDefaultPrivileges, } from "../objects/role/changes/role.privilege.js";
+import { AlterTableAlterColumnAddIdentity, AlterTableAlterColumnDropDefault, AlterTableAlterColumnDropIdentity, AlterTableAlterColumnSetDefault, } from "../objects/table/changes/table.alter.js";
 /**
  * Maps object type names to PostgreSQL default privilege objtype codes.
  * This mirrors the mapping in base.default-privileges.ts.
@@ -116,11 +117,74 @@ function generateDefaultPrivilegeConstraints(changes) {
     }
     return constraints;
 }
+function generateIdentityTransitionConstraints(changes) {
+    const constraints = [];
+    const dropDefaultByColumn = new Map();
+    const dropIdentityByColumn = new Map();
+    const addIdentityByColumn = new Map();
+    const setDefaultByColumn = new Map();
+    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 = [
     generateDefaultPrivilegeConstraints,
+    generateIdentityTransitionConstraints,
 ];
 /**
  * Generate Constraints from custom constraint generators.

package/dist/core/sort/logical-sort.js

@@ -8,7 +8,7 @@
  * It groups related changes together while preserving the ability for the dependency
  * resolver to reorder within groups when necessary.
  */
-import { getSchema } from "../integrations/filter/extractors.js";
+import { getSchema } from "../change-utils.js";
 import { getExecutionPhase, isMetadataStableId } from "./utils.js";
 /**
  * Object type ordering for logical grouping.
@@ -287,27 +287,6 @@ function getParentStableId(change) {
     // Fallback: return first requires if available
     return requires.length > 0 ? requires[0] : null;
 }
-/**
- * Extract schema name from a change.
- * Returns the schema name if present, or null for non-schema objects.
- *
- * Uses the getSchema helper which directly accesses schema properties from change objects.
- * For default_privilege changes, accesses the inSchema property directly.
- * For event_trigger changes, groups by their function's schema.
- */
-function extractSchemaFromChange(change) {
-    // Handle default_privilege changes specially (they have inSchema property)
-    if (change.scope === "default_privilege") {
-        // TypeScript doesn't know about inSchema, but we know it exists for default_privilege changes
-        return change.inSchema ?? null;
-    }
-    // Handle event_trigger changes specially - group by their function's schema
-    if (change.objectType === "event_trigger") {
-        return change.eventTrigger.function_schema;
-    }
-    // Use the getSchema helper for all other changes
-    return getSchema(change);
-}
 /**
  * Get the effective object type for sorting purposes.
  * For sub-entities, returns the parent's object type (table/view/materialized_view).
@@ -399,8 +378,8 @@ function sortPhase(changes, phase) {
         const changeA = a.change;
         const changeB = b.change;
         // 1. Compare schemas (group objects by schema)
-        const schemaA = extractSchemaFromChange(changeA);
-        const schemaB = extractSchemaFromChange(changeB);
+        const schemaA = getSchema(changeA);
+        const schemaB = getSchema(changeB);
         // Non-schema objects (roles, languages, extensions, etc.) sort first
         // Use a special prefix to ensure they come before schema objects
         const schemaKeyA = schemaA === null ? "::" : schemaA;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supabase/pg-delta",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.12",
   "description": "PostgreSQL migrations made easy",
   "type": "module",
   "sideEffects": false,
@@ -68,6 +68,7 @@
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
     "check-types": "tsc --noEmit",
+    "docs": "typedoc",
     "format-and-lint": "biome check . --error-on-warnings",
     "knip": "knip",
     "pgdelta": "bun src/cli/bin/cli.ts",
@@ -84,6 +85,7 @@
     "chalk": "^5.6.2",
     "debug": "^4.3.7",
     "pg": "^8.17.2",
+    "picomatch": "^4.0.3",
     "zod": "^4.2.1"
   },
   "devDependencies": {
@@ -94,9 +96,11 @@
     "@types/debug": "^4.1.12",
     "@types/node": "^24.10.4",
     "@types/pg": "^8.11.10",
+    "@types/picomatch": "^4.0.2",
     "dedent": "^1.7.1",
     "knip": "^5.75.2",
     "testcontainers": "^11.10.0",
+    "typedoc": "^0.28.17",
     "typescript": "^5.9.3"
   }
 }

package/src/cli/commands/declarative-export.ts

@@ -6,13 +6,14 @@ import { mkdir, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { buildCommand, type CommandContext } from "@stricli/core";
 import chalk from "chalk";
-import type { CatalogSnapshot } from "../../core/catalog.snapshot.ts";
+import { deserializeCatalog } from "../../core/catalog.snapshot.ts";
 import { exportDeclarativeSchema } from "../../core/export/index.ts";
 import type { Grouping, GroupingPattern } from "../../core/export/types.ts";
 import type { FilterDSL } from "../../core/integrations/filter/dsl.ts";
-import type { ChangeFilter } from "../../core/integrations/filter/filter.types.ts";
-import type { SerializeDSL } from "../../core/integrations/serialize/dsl.ts";
-import type { ChangeSerializer } from "../../core/integrations/serialize/serialize.types.ts";
+import {
+  compileSerializeDSL,
+  type SerializeDSL,
+} from "../../core/integrations/serialize/dsl.ts";
 import { createPlan } from "../../core/plan/index.ts";
 import type { SqlFormatOptions } from "../../core/plan/sql-format.ts";
 import {
@@ -21,7 +22,7 @@ import {
   computeFileDiff,
   formatExportSummary,
 } from "../utils/export-display.ts";
-import { loadIntegrationDSL } from "../utils/integrations.ts";
+import { resolveIntegrationOptions } from "../utils/integrations.ts";
 import { isPostgresUrl, loadCatalogFromFile } from "../utils/resolve-input.ts";
 
 function parseJsonFlag<T>(label: string, value: string): T {
@@ -185,29 +186,22 @@ After export, a tip is printed with the command to apply the schema to an empty
       verbose?: boolean;
     },
   ) {
-    const { compileSerializeDSL } = await import(
-      "../../core/integrations/serialize/dsl.ts"
-    );
-
-    let filterOption: FilterDSL | ChangeFilter | undefined = flags.filter;
-    let serializeOption: SerializeDSL | ChangeSerializer | undefined =
-      flags.serialize;
-    let integrationEmptyCatalog: CatalogSnapshot | undefined;
-    if (flags.integration) {
-      const integrationDSL = await loadIntegrationDSL(flags.integration);
-      filterOption = filterOption ?? integrationDSL.filter;
-      serializeOption = serializeOption ?? integrationDSL.serialize;
-      integrationEmptyCatalog = integrationDSL.emptyCatalog;
-    }
+    const {
+      filter,
+      serialize,
+      emptyCatalog: integrationEmptyCatalog,
+    } = await resolveIntegrationOptions({
+      filter: flags.filter,
+      serialize: flags.serialize,
+      integration: flags.integration,
+    });
 
     const resolvedSource = flags.source
       ? isPostgresUrl(flags.source)
         ? flags.source
         : await loadCatalogFromFile(flags.source)
       : integrationEmptyCatalog
-        ? (await import("../../core/catalog.snapshot.ts")).deserializeCatalog(
-            integrationEmptyCatalog,
-          )
+        ? deserializeCatalog(integrationEmptyCatalog)
         : null;
 
     const resolvedTarget = isPostgresUrl(flags.target)
@@ -221,8 +215,8 @@ After export, a tip is printed with the command to apply the schema to an empty
     // changes that depend on filtered objects (e.g. RLS policies that
     // reference auth.uid() when the auth schema is filtered out).
     const planResult = await createPlan(resolvedSource, resolvedTarget, {
-      filter: filterOption,
-      serialize: serializeOption,
+      filter,
+      serialize,
       skipDefaultPrivilegeSubtraction: true,
     });
 
@@ -254,9 +248,7 @@ After export, a tip is printed with the command to apply the schema to an empty
     }
 
     const serializeFn =
-      serializeOption !== undefined
-        ? compileSerializeDSL(serializeOption)
-        : undefined;
+      serialize !== undefined ? compileSerializeDSL(serialize) : undefined;
 
     const output = exportDeclarativeSchema(planResult, {
       integration: