drizzle-kit 0.20.14-dc3503a → 0.20.14-e8e7ed6

package/cli/validations/mysql.d.ts

@@ -239,6 +239,7 @@ export declare const mysqlCliIntrospectParams: import("zod").ZodIntersection<imp
     uri: string;
 }>]>>;
 export declare const mysqlCliPushParams: import("zod").ZodIntersection<import("zod").ZodObject<{
+    dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
@@ -248,6 +249,7 @@ export declare const mysqlCliPushParams: import("zod").ZodIntersection<import("z
     tablesFilter?: string | string[] | undefined;
     strict: boolean;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
     schemaFilter: string | string[];
     verbose: boolean;
 }, {
@@ -256,6 +258,7 @@ export declare const mysqlCliPushParams: import("zod").ZodIntersection<import("z
     schemaFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
 }>, import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"mysql2">;
     host: import("zod").ZodString;
@@ -288,6 +291,7 @@ export declare const mysqlCliPushParams: import("zod").ZodIntersection<import("z
     uri: string;
 }>]>>;
 export declare const mysqlConfigPushParams: import("zod").ZodIntersection<import("zod").ZodObject<{
+    dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
@@ -297,6 +301,7 @@ export declare const mysqlConfigPushParams: import("zod").ZodIntersection<import
     tablesFilter?: string | string[] | undefined;
     strict: boolean;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
     schemaFilter: string | string[];
     verbose: boolean;
 }, {
@@ -305,6 +310,7 @@ export declare const mysqlConfigPushParams: import("zod").ZodIntersection<import
     schemaFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
 }>, import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"mysql2">;
     dbCredentials: import("zod").ZodUnion<[import("zod").ZodObject<{
@@ -362,4 +368,3 @@ export type MySQLConnectionConfig = TypeOf<typeof mysqlConnectionConfig>;
 export declare const printCliConnectionIssues: (options: any) => void;
 export declare const printConfigConnectionIssues: (options: any) => void;
 export declare const validateMySqlIntrospect: (options: Record<string, any>) => Promise<MySQLConfigIntrospect>;
-export declare const validateMySqlPush: (options: Record<string, unknown>) => Promise<MySQLPushConfig>;

package/cli/validations/pg.d.ts

@@ -280,6 +280,7 @@ export declare const pgCliIntrospectParams: import("zod").ZodIntersection<import
     connectionString: string;
 }>]>>;
 export declare const pgCliPushParams: import("zod").ZodIntersection<import("zod").ZodObject<{
+    dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
@@ -289,6 +290,7 @@ export declare const pgCliPushParams: import("zod").ZodIntersection<import("zod"
     tablesFilter?: string | string[] | undefined;
     strict: boolean;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
     schemaFilter: string | string[];
     verbose: boolean;
 }, {
@@ -297,6 +299,7 @@ export declare const pgCliPushParams: import("zod").ZodIntersection<import("zod"
     schemaFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
 }>, import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"pg">;
     host: import("zod").ZodString;
@@ -338,6 +341,7 @@ export declare const pgCliPushParams: import("zod").ZodIntersection<import("zod"
     connectionString: string;
 }>]>>;
 export declare const pgConfigPushParams: import("zod").ZodIntersection<import("zod").ZodObject<{
+    dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
@@ -347,6 +351,7 @@ export declare const pgConfigPushParams: import("zod").ZodIntersection<import("z
     tablesFilter?: string | string[] | undefined;
     strict: boolean;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
     schemaFilter: string | string[];
     verbose: boolean;
 }, {
@@ -355,6 +360,7 @@ export declare const pgConfigPushParams: import("zod").ZodIntersection<import("z
     schemaFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
 }>, import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"pg">;
     dbCredentials: import("zod").ZodObject<{
@@ -435,4 +441,3 @@ export type PgCliIntrospect = TypeOf<typeof pgCliIntrospectParams>;
 export type PgConnectionConfig = TypeOf<typeof pgConnectionConfig>;
 export declare const printConfigConnectionIssues: (options: any) => void;
 export declare const validatePgIntrospect: (options: Record<string, any>) => Promise<PgConfigIntrospect>;
-export declare const validatePgPush: (options: Record<string, unknown>) => Promise<PgPushConfig>;

package/cli/validations/sqlite.d.ts

@@ -1,5 +1,4 @@
 import { TypeOf } from "zod";
-import { SQLiteCliConfig } from "../commands/sqliteUtils";
 export declare const sqliteConnectionCli: import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"turso">;
     url: import("zod").ZodString;
@@ -31,6 +30,165 @@ export declare const sqliteConnectionCli: import("zod").ZodUnion<[import("zod").
     url: string;
     driver: "libsql";
 }>]>;
+export declare const sqliteConnectionSchema: import("zod").ZodUnion<[import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"turso">;
+    dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+        authToken: import("zod").ZodOptional<import("zod").ZodString>;
+    }, "strip", import("zod").ZodTypeAny, {
+        authToken?: string | undefined;
+        url: string;
+    }, {
+        authToken?: string | undefined;
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "turso";
+    dbCredentials: {
+        authToken?: string | undefined;
+        url: string;
+    };
+}, {
+    driver: "turso";
+    dbCredentials: {
+        authToken?: string | undefined;
+        url: string;
+    };
+}>, import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"libsql">;
+    dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        url: string;
+    }, {
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+}, {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+}>, import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"better-sqlite">;
+    dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        url: string;
+    }, {
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+}, {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+}>]>;
+export declare const sqliteCliConfigSchema: import("zod").ZodIntersection<import("zod").ZodObject<{
+    schema: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
+    out: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodString>>;
+    breakpoints: import("zod").ZodDefault<import("zod").ZodBoolean>;
+    tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
+    schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
+    introspect: import("zod").ZodDefault<import("zod").ZodObject<{
+        casing: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodLiteral<"camel">, import("zod").ZodLiteral<"preserve">]>>;
+    }, "strip", import("zod").ZodTypeAny, {
+        casing: "camel" | "preserve";
+    }, {
+        casing?: "camel" | "preserve" | undefined;
+    }>>;
+}, "strip", import("zod").ZodTypeAny, {
+    schema?: string | string[] | undefined;
+    tablesFilter?: string | string[] | undefined;
+    out: string;
+    breakpoints: boolean;
+    schemaFilter: string | string[];
+    introspect: {
+        casing: "camel" | "preserve";
+    };
+}, {
+    schema?: string | string[] | undefined;
+    out?: string | undefined;
+    breakpoints?: boolean | undefined;
+    tablesFilter?: string | string[] | undefined;
+    schemaFilter?: string | string[] | undefined;
+    introspect?: {
+        casing?: "camel" | "preserve" | undefined;
+    } | undefined;
+}>, import("zod").ZodUnion<[import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"turso">;
+    dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+        authToken: import("zod").ZodOptional<import("zod").ZodString>;
+    }, "strip", import("zod").ZodTypeAny, {
+        authToken?: string | undefined;
+        url: string;
+    }, {
+        authToken?: string | undefined;
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "turso";
+    dbCredentials: {
+        authToken?: string | undefined;
+        url: string;
+    };
+}, {
+    driver: "turso";
+    dbCredentials: {
+        authToken?: string | undefined;
+        url: string;
+    };
+}>, import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"libsql">;
+    dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        url: string;
+    }, {
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+}, {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+}>, import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"better-sqlite">;
+    dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        url: string;
+    }, {
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+}, {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+}>]>>;
+export type SQLiteCliConfig = TypeOf<typeof sqliteCliConfigSchema>;
+export type SQLiteConnectionConfig = TypeOf<typeof sqliteConnectionSchema>;
 export declare const sqliteCliIntrospectParams: import("zod").ZodIntersection<import("zod").ZodObject<{
     schema: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     out: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodString>>;
@@ -84,6 +242,7 @@ export declare const sqliteCliIntrospectParams: import("zod").ZodIntersection<im
     driver: "libsql";
 }>]>>;
 export declare const sqliteCliPushParams: import("zod").ZodIntersection<import("zod").ZodObject<{
+    dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
@@ -93,6 +252,7 @@ export declare const sqliteCliPushParams: import("zod").ZodIntersection<import("
     tablesFilter?: string | string[] | undefined;
     strict: boolean;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
     schemaFilter: string | string[];
     verbose: boolean;
 }, {
@@ -101,6 +261,7 @@ export declare const sqliteCliPushParams: import("zod").ZodIntersection<import("
     schemaFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
 }>, import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"turso">;
     url: import("zod").ZodString;
@@ -133,6 +294,7 @@ export declare const sqliteCliPushParams: import("zod").ZodIntersection<import("
     driver: "libsql";
 }>]>>;
 export declare const sqliteConfigPushParams: import("zod").ZodIntersection<import("zod").ZodObject<{
+    dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
@@ -142,6 +304,7 @@ export declare const sqliteConfigPushParams: import("zod").ZodIntersection<impor
     tablesFilter?: string | string[] | undefined;
     strict: boolean;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
     schemaFilter: string | string[];
     verbose: boolean;
 }, {
@@ -150,6 +313,7 @@ export declare const sqliteConfigPushParams: import("zod").ZodIntersection<impor
     schemaFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
     schema: string | string[];
+    dialect: "mysql" | "pg" | "sqlite";
 }>, import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"turso">;
     dbCredentials: import("zod").ZodObject<{
@@ -216,5 +380,3 @@ export declare const sqliteConfigPushParams: import("zod").ZodIntersection<impor
 export type SQLitePushConfig = TypeOf<typeof sqliteConfigPushParams>;
 export declare const printConfigConnectionIssues: (options: any) => void;
 export declare const validateIntrospect: (options: Record<string, any>) => Promise<SQLiteCliConfig>;
-export declare const validatePush: (options: Record<string, unknown>) => Promise<SQLitePushConfig>;
-export declare const validateGenerate: () => void;

package/cli/views.d.ts

@@ -1,6 +1,6 @@
 import { Prompt, TaskView } from "hanji";
 import type { CommonSchema } from "../schemaValidator";
-import type { Named } from "./commands/migrate";
+import type { Named, NamedWithSchema } from "./commands/migrate";
 export declare const warning: (msg: string) => void;
 export declare const err: (msg: string) => void;
 export declare const info: (msg: string, greyMsg?: string) => string;
@@ -10,7 +10,7 @@ export interface RenamePropmtItem<T> {
     from: T;
     to: T;
 }
-export declare const isRenamePromptItem: <T extends Named>(item: T | RenamePropmtItem<T>) => item is RenamePropmtItem<T>;
+export declare const isRenamePromptItem: <T extends Named>(item: RenamePropmtItem<T> | T) => item is RenamePropmtItem<T>;
 export declare class ResolveColumnSelect<T extends Named> extends Prompt<RenamePropmtItem<T> | T> {
     private readonly tableName;
     private readonly base;
@@ -19,10 +19,12 @@ export declare class ResolveColumnSelect<T extends Named> extends Prompt<RenameP
     render(status: "idle" | "submitted" | "aborted"): string;
     result(): RenamePropmtItem<T> | T;
 }
-export declare class ResolveTableSelect<T extends Named> extends Prompt<RenamePropmtItem<T> | T> {
+export declare const tableKey: (it: NamedWithSchema) => string;
+export declare class ResolveSelect<T extends NamedWithSchema> extends Prompt<RenamePropmtItem<T> | T> {
     private readonly base;
+    private readonly entityType;
     private readonly state;
-    constructor(base: Named, data: (RenamePropmtItem<T> | T)[]);
+    constructor(base: T, data: (RenamePropmtItem<T> | T)[], entityType: "table" | "enum");
     render(status: "idle" | "submitted" | "aborted"): string;
     result(): RenamePropmtItem<T> | T;
 }

package/global.d.ts

@@ -1,4 +1,6 @@
 export declare const originUUID = "00000000-0000-0000-0000-000000000000";
-export declare const snapshotVersion = "5";
+export declare const snapshotVersion = "6";
 export declare function assertUnreachable(x: never): never;
 export declare const mapValues: <IN, OUT>(obj: Record<string, IN>, map: (input: IN) => OUT) => Record<string, OUT>;
+export declare const mapKeys: <T>(obj: Record<string, T>, map: (key: string, value: T) => string) => Record<string, T>;
+export declare const mapEntries: <T>(obj: Record<string, T>, map: (key: string, value: T) => [string, T]) => Record<string, T>;

package/index.d.mts

@@ -1,3 +1,4 @@
+import { Dialect } from "./schemaValidator";
 export type DbConnection = {
     driver: "turso";
     dbCredentials: {
@@ -45,13 +46,14 @@ export type DbConnection = {
     };
 };
 export type Config = {
-    out?: string | undefined;
-    breakpoints?: boolean | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schemaFilter?: string | string[] | undefined;
+    dialect?: Dialect;
+    out?: string;
+    breakpoints?: boolean;
+    tablesFilter?: string | string[];
+    schemaFilter?: string | string[];
     schema?: string | string[];
-    verbose?: boolean | undefined;
-    strict?: boolean | undefined;
+    verbose?: boolean;
+    strict?: boolean;
 } & {
     introspect?: {
         casing: "camel" | "preserve";

package/index.d.ts

@@ -1,3 +1,4 @@
+import { Dialect } from "./schemaValidator";
 export type DbConnection = {
     driver: "turso";
     dbCredentials: {
@@ -45,13 +46,14 @@ export type DbConnection = {
     };
 };
 export type Config = {
-    out?: string | undefined;
-    breakpoints?: boolean | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schemaFilter?: string | string[] | undefined;
+    dialect?: Dialect;
+    out?: string;
+    breakpoints?: boolean;
+    tablesFilter?: string | string[];
+    schemaFilter?: string | string[];
     schema?: string | string[];
-    verbose?: boolean | undefined;
-    strict?: boolean | undefined;
+    verbose?: boolean;
+    strict?: boolean;
 } & {
     introspect?: {
         casing: "camel" | "preserve";

package/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/introspect-mysql.d.ts

@@ -1,5 +1,5 @@
 import "./@types/utils";
-import { ConfigIntrospectCasing } from "./cli/commands/utils";
+import type { ConfigIntrospectCasing } from "./cli/validations/common";
 import { MySqlSchemaInternal } from "./serializer/mysqlSchema";
 export declare const schemaToTypeScript: (schema: MySqlSchemaInternal, casing: ConfigIntrospectCasing["casing"]) => {
     file: string;

package/introspect-pg.d.ts

@@ -1,9 +1,12 @@
 import { AnyPgTable } from "drizzle-orm/pg-core";
 import { Relation, Relations } from "drizzle-orm/relations";
 import "./@types/utils";
-import { ConfigIntrospectCasing } from "./cli/commands/utils";
+import type { ConfigIntrospectCasing } from "./cli/validations/common";
 import { PgSchemaInternal } from "./serializer/pgSchema";
-export declare const relationsToTypeScript: (schema: Record<string, Record<string, AnyPgTable<{}>>>, relations: Record<string, Relations<string, Record<string, Relation<string>>>>) => string;
+export declare const relationsToTypeScriptForStudio: (schema: Record<string, Record<string, AnyPgTable<{}>>>, relations: Record<string, Relations<string, Record<string, Relation<string>>>>) => string;
+export declare const relationsToTypeScript: (schema: PgSchemaInternal, casing: ConfigIntrospectCasing) => {
+    file: string;
+};
 export declare const schemaToTypeScript: (schema: PgSchemaInternal, casing: ConfigIntrospectCasing) => {
     file: string;
     imports: string;

package/introspect-sqlite.d.ts

@@ -1,5 +1,5 @@
 import "./@types/utils";
-import type { ConfigIntrospectCasing } from "./cli/commands/utils";
+import type { ConfigIntrospectCasing } from "./cli/validations/common";
 import type { SQLiteSchemaInternal } from "./serializer/sqliteSchema";
 export declare const indexName: (tableName: string, columns: string[]) => string;
 export declare const schemaToTypeScript: (schema: SQLiteSchemaInternal, casing: ConfigIntrospectCasing["casing"]) => {

package/jsonDiffer.d.ts

@@ -1,25 +1,16 @@
 export function diffForRenamedTables(pairs: any): any;
 export function diffForRenamedColumn(t1: any, t2: any): any;
+export function diffSchemasOrTables(left: any, right: any): {
+    added: any[];
+    deleted: any[];
+};
+export function diffColumns(left: any, right: any): {
+    [k: string]: any;
+};
 export function applyJsonDiff(json1: any, json2: any): {
-    addedTables?: undefined;
-    deletedTables?: undefined;
-    alteredTablesWithColumns?: undefined;
-    addedEnums?: undefined;
-    deletedEnums?: undefined;
-    alteredEnums?: undefined;
-    addedSchemas?: undefined;
-    deletedSchemas?: undefined;
-} | {
-    addedTables: any[];
-    deletedTables: any[];
     alteredTablesWithColumns: {
         name: any;
-        schema: {
-            type: string;
-            value: any;
-        };
-        deleted: any[];
-        added: any[];
+        schema: any;
         altered: any[];
         addedIndexes: {
             [k: string]: any;
@@ -58,19 +49,13 @@ export function applyJsonDiff(json1: any, json2: any): {
             [k: string]: any;
         };
     }[];
-    addedEnums: {
-        name: any;
-        values: any[];
-    }[];
-    deletedEnums: {
-        name: any;
-        values: any[];
-    }[];
     alteredEnums: {
-        name: string;
-        addedValues: any[];
+        name: any;
+        schema: any;
+        addedValues: {
+            before: any;
+            value: any;
+        }[];
         deletedValues: any[];
     }[];
-    addedSchemas: any[];
-    deletedSchemas: any[];
 };

package/jsonStatements.d.ts

@@ -1,4 +1,4 @@
-import { CommonSquashedSchema, Dialect } from "./schemaValidator";
+import { CommonSquashedSchema } from "./schemaValidator";
 import { MySqlSchema } from "./serializer/mysqlSchema";
 import { PgSchema } from "./serializer/pgSchema";
 import { AlteredColumn, Column, Table } from "./snapshotsDiffer";
@@ -34,12 +34,32 @@ export interface JsonRenameTableStatement {
 export interface JsonCreateEnumStatement {
     type: "create_type_enum";
     name: string;
+    schema: string;
     values: string[];
 }
+export interface JsonDropEnumStatement {
+    type: "drop_type_enum";
+    name: string;
+    schema: string;
+}
+export interface JsonMoveEnumStatement {
+    type: "move_type_enum";
+    name: string;
+    schemaFrom: string;
+    schemaTo: string;
+}
+export interface JsonRenameEnumStatement {
+    type: "rename_type_enum";
+    nameFrom: string;
+    nameTo: string;
+    schema: string;
+}
 export interface JsonAddValueToEnumStatement {
     type: "alter_type_add_value";
     name: string;
+    schema: string;
     value: string;
+    before: string;
 }
 export interface JsonDropColumnStatement {
     type: "alter_table_drop_column";
@@ -120,7 +140,8 @@ export interface JsonAlterCompositePK {
 export interface JsonAlterTableSetSchema {
     type: "alter_table_set_schema";
     tableName: string;
-    schema: string;
+    schemaFrom: string;
+    schemaTo: string;
 }
 export interface JsonAlterTableRemoveFromSchema {
     type: "alter_table_remove_from_schema";
@@ -292,14 +313,20 @@ export interface JsonRenameSchema {
     to: string;
 }
 export type JsonAlterColumnStatement = JsonRenameColumnStatement | JsonAlterColumnTypeStatement | JsonAlterColumnSetDefaultStatement | JsonAlterColumnDropDefaultStatement | JsonAlterColumnSetNotNullStatement | JsonAlterColumnDropNotNullStatement | JsonAlterColumnDropOnUpdateStatement | JsonAlterColumnSetOnUpdateStatement | JsonAlterColumnDropAutoincrementStatement | JsonAlterColumnSetAutoincrementStatement | JsonAlterColumnSetPrimaryKeyStatement | JsonAlterColumnDropPrimaryKeyStatement;
-export type JsonStatement = JsonAlterColumnStatement | JsonCreateTableStatement | JsonDropTableStatement | JsonRenameTableStatement | JsonCreateEnumStatement | JsonAddValueToEnumStatement | JsonDropColumnStatement | JsonAddColumnStatement | JsonCreateIndexStatement | JsonCreateReferenceStatement | JsonAlterReferenceStatement | JsonDeleteReferenceStatement | JsonDropIndexStatement | JsonReferenceStatement | JsonSqliteCreateTableStatement | JsonSqliteAddColumnStatement | JsonCreateCompositePK | JsonDeleteCompositePK | JsonAlterCompositePK | JsonCreateUniqueConstraint | JsonDeleteUniqueConstraint | JsonAlterUniqueConstraint | JsonCreateSchema | JsonDropSchema | JsonRenameSchema | JsonAlterTableSetSchema | JsonAlterTableRemoveFromSchema | JsonAlterTableSetNewSchema;
+export type JsonStatement = JsonAlterColumnStatement | JsonCreateTableStatement | JsonDropTableStatement | JsonRenameTableStatement | JsonCreateEnumStatement | JsonDropEnumStatement | JsonMoveEnumStatement | JsonRenameEnumStatement | JsonAddValueToEnumStatement | JsonDropColumnStatement | JsonAddColumnStatement | JsonCreateIndexStatement | JsonCreateReferenceStatement | JsonAlterReferenceStatement | JsonDeleteReferenceStatement | JsonDropIndexStatement | JsonReferenceStatement | JsonSqliteCreateTableStatement | JsonSqliteAddColumnStatement | JsonCreateCompositePK | JsonDeleteCompositePK | JsonAlterCompositePK | JsonCreateUniqueConstraint | JsonDeleteUniqueConstraint | JsonAlterUniqueConstraint | JsonCreateSchema | JsonDropSchema | JsonRenameSchema | JsonAlterTableSetSchema | JsonAlterTableRemoveFromSchema | JsonAlterTableSetNewSchema;
 export declare const preparePgCreateTableJson: (table: Table, json2: PgSchema) => JsonCreateTableStatement;
-export declare const prepareMySqlCreateTableJson: (table: Table, json2: PgSchema) => JsonCreateTableStatement;
+export declare const prepareMySqlCreateTableJson: (table: Table, json2: MySqlSchema) => JsonCreateTableStatement;
 export declare const prepareSQLiteCreateTable: (table: Table) => JsonSqliteCreateTableStatement;
 export declare const prepareDropTableJson: (table: Table) => JsonDropTableStatement;
 export declare const prepareRenameTableJson: (tableFrom: Table, tableTo: Table) => JsonRenameTableStatement;
-export declare const prepareCreateEnumJson: (name: string, values: string[]) => JsonCreateEnumStatement;
-export declare const prepareAddValuesToEnumJson: (name: string, values: string[]) => JsonAddValueToEnumStatement[];
+export declare const prepareCreateEnumJson: (name: string, schema: string, values: string[]) => JsonCreateEnumStatement;
+export declare const prepareAddValuesToEnumJson: (name: string, schema: string, values: {
+    value: string;
+    before: string;
+}[]) => JsonAddValueToEnumStatement[];
+export declare const prepareDropEnumJson: (name: string, schema: string) => JsonDropEnumStatement;
+export declare const prepareMoveEnumJson: (name: string, schemaFrom: string, schemaTo: string) => JsonMoveEnumStatement;
+export declare const prepareRenameEnumJson: (nameFrom: string, nameTo: string, schema: string) => JsonRenameEnumStatement;
 export declare const prepareCreateSchemasJson: (values: string[]) => JsonCreateSchema[];
 export declare const prepareRenameSchemasJson: (values: {
     from: string;
@@ -310,11 +337,11 @@ export declare const prepareRenameColumns: (tableName: string, schema: string, p
     from: Column;
     to: Column;
 }[]) => JsonRenameColumnStatement[];
-export declare const prepareAlterTableColumnsJson: (tableName: string, schema: string, deleted: Column[], added: Column[], altered: AlteredColumn[], addedFk: Record<string, string>, json2: CommonSquashedSchema, dialect?: Dialect) => {
-    addColumns: JsonStatement[];
-    dropColumns: JsonDropColumnStatement[];
-    alterColumns: JsonAlterColumnStatement[];
-};
+export declare const _prepareDropColumns: (taleName: string, schema: string, columns: Column[]) => JsonDropColumnStatement[];
+export declare const _prepareAddColumns: (tableName: string, schema: string, columns: Column[]) => JsonAddColumnStatement[];
+export declare const prepareAlterColumnsMysql: (tableName: string, schema: string, columns: AlteredColumn[], json2: CommonSquashedSchema) => JsonAlterColumnStatement[];
+export declare const preparePgAlterColumns: (_tableName: string, schema: string, columns: AlteredColumn[], json2: CommonSquashedSchema) => JsonAlterColumnStatement[];
+export declare const prepareSqliteAlterColumns: (tableName: string, schema: string, columns: AlteredColumn[], json2: CommonSquashedSchema) => JsonAlterColumnStatement[];
 export declare const prepareCreateIndexesJson: (tableName: string, schema: string, indexes: Record<string, string>) => JsonCreateIndexStatement[];
 export declare const prepareCreateReferencesJson: (tableName: string, schema: string, foreignKeys: Record<string, string>) => JsonCreateReferenceStatement[];
 export declare const prepareDropReferencesJson: (tableName: string, schema: string, foreignKeys: Record<string, string>) => JsonDeleteReferenceStatement[];