drizzle-kit 0.20.14-95be75d → 0.20.14-a183d8b

package/cli/commands/mysqlIntrospect.d.ts

@@ -1,7 +1,7 @@
-import { Connection } from "mysql2/promise";
 import { MySQLConfigIntrospect, MySQLConnectionConfig } from "../validations/mysql";
+import { DrizzleDbClient, MySQL2Client } from "src/drivers";
 export declare const connectToMySQL: (config: MySQLConnectionConfig) => Promise<{
-    client: Connection;
+    client: MySQL2Client;
     databaseName: string;
 }>;
 export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, filters: string[]) => Promise<{
@@ -63,7 +63,7 @@ export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, filters: s
     };
 }>;
 export declare const mysqlPushIntrospect: (connection: {
-    client: Connection;
+    client: DrizzleDbClient;
     databaseName: string;
 }, filters: string[]) => Promise<{
     schema: {

package/cli/commands/mysqlPushUtils.d.ts

@@ -1,11 +1,11 @@
-import { Connection } from "mysql2/promise";
+import { DrizzleDbClient } from "src/drivers";
 import { JsonStatement } from "../../jsonStatements";
 import { mysqlSchema } from "../../serializer/mysqlSchema";
 import { TypeOf } from "zod";
 export declare const filterStatements: (statements: JsonStatement[], currentSchema: TypeOf<typeof mysqlSchema>, prevSchema: TypeOf<typeof mysqlSchema>) => JsonStatement[];
 export declare const logSuggestionsAndReturn: ({ connection, statements, json2, }: {
     statements: JsonStatement[];
-    connection: Connection;
+    connection: DrizzleDbClient;
     json2: TypeOf<typeof mysqlSchema>;
 }) => Promise<{
     statementsToExecute: string[];

package/cli/commands/sqliteIntrospect.d.ts

@@ -1,4 +1,4 @@
-import type { SQLiteCliConfig, SQLiteConnectionConfig } from "./sqliteUtils";
+import type { SQLiteCliConfig, SQLiteConnectionConfig } from "../validations/sqlite";
 import type { DrizzleDbClient } from "../../drivers";
 export declare const connectToSQLite: (config: SQLiteConnectionConfig) => Promise<{
     client: import("../../drivers").BetterSqlite;

package/cli/commands/utils.d.ts

@@ -1,25 +1,21 @@
-import { TypeOf } from "zod";
-import { CliParamsPush } from "..";
+import { CliConfigGenerate, CliParamsPush } from "..";
 import { MySQLPushConfig } from "../validations/mysql";
 import { PgPushConfig } from "../validations/pg";
 import { SQLitePushConfig } from "../validations/sqlite";
+import { CliConfig } from "../validations/common";
+import { Dialect } from "src/schemaValidator";
 export declare const safeRegister: () => Promise<{
     unregister: () => void;
 }>;
 export type GenerateConfig = {
+    dialect: Dialect;
     schema: string | string[];
     out: string;
     breakpoints: boolean;
     custom: boolean;
     bundle: boolean;
 };
-export declare const prepareGenerateConfig: (options: {
-    schema?: string | string[];
-    out?: string;
-    config?: string;
-    breakpoints: boolean;
-    custom: boolean;
-}) => Promise<GenerateConfig>;
+export declare const prepareGenerateConfig: (options: CliConfigGenerate) => Promise<GenerateConfig>;
 export declare const preparePushConfig: (options: CliParamsPush) => Promise<{
     config: MySQLPushConfig | PgPushConfig | SQLitePushConfig;
     schemaFiles: string[];
@@ -30,254 +26,5 @@ export declare const assertOutFolder: (it: {
 } | {
     out: string;
 }) => Promise<string>;
-export declare const driver: import("zod").ZodUnion<[import("zod").ZodLiteral<"better-sqlite">, import("zod").ZodLiteral<"turso">, import("zod").ZodLiteral<"libsql">, import("zod").ZodLiteral<"d1">, import("zod").ZodLiteral<"expo">, import("zod").ZodLiteral<"pg">, import("zod").ZodLiteral<"mysql2">]>;
-export declare const configCommonSchema: import("zod").ZodObject<{
-    schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
-    out: import("zod").ZodOptional<import("zod").ZodString>;
-    breakpoints: import("zod").ZodDefault<import("zod").ZodBoolean>;
-    driver: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"better-sqlite">, import("zod").ZodLiteral<"turso">, import("zod").ZodLiteral<"libsql">, import("zod").ZodLiteral<"d1">, import("zod").ZodLiteral<"expo">, import("zod").ZodLiteral<"pg">, import("zod").ZodLiteral<"mysql2">]>>;
-    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">]>>;
-}, "strip", import("zod").ZodTypeAny, {
-    out?: string | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schema: string | string[];
-    breakpoints: boolean;
-    schemaFilter: string | string[];
-}, {
-    out?: string | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
-    breakpoints?: boolean | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schemaFilter?: string | string[] | undefined;
-    schema: string | string[];
-}>;
-export declare const introspectCasing: 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;
-}>>;
-export declare const configIntrospectSchema: 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;
-}>;
-export type ConfigIntrospectSchema = TypeOf<typeof configIntrospectSchema>;
-export type ConfigIntrospectCasing = TypeOf<typeof introspectCasing>;
-export declare const configIntrospectCliSchema: 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">]>>;
-    introspectCasing: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodLiteral<"camel">, import("zod").ZodLiteral<"preserve">]>>;
-}, "strip", import("zod").ZodTypeAny, {
-    schema?: string | string[] | undefined;
-    tablesFilter?: string | string[] | undefined;
-    out: string;
-    breakpoints: boolean;
-    schemaFilter: string | string[];
-    introspectCasing: "camel" | "preserve";
-}, {
-    schema?: string | string[] | undefined;
-    out?: string | undefined;
-    breakpoints?: boolean | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schemaFilter?: string | string[] | undefined;
-    introspectCasing?: "camel" | "preserve" | undefined;
-}>;
-export declare const configGenerateSchema: import("zod").ZodObject<{
-    schema: 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>;
-}, "strip", import("zod").ZodTypeAny, {
-    schema: string | string[];
-    out: string;
-    breakpoints: boolean;
-}, {
-    out?: string | undefined;
-    breakpoints?: boolean | undefined;
-    schema: string | string[];
-}>;
-export type GenerateSchema = TypeOf<typeof configGenerateSchema>;
-export declare const configPushSchema: import("zod").ZodObject<{
-    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">]>>;
-    verbose: import("zod").ZodDefault<import("zod").ZodBoolean>;
-    strict: import("zod").ZodDefault<import("zod").ZodBoolean>;
-}, "strip", import("zod").ZodTypeAny, {
-    tablesFilter?: string | string[] | undefined;
-    strict: boolean;
-    schema: string | string[];
-    schemaFilter: string | string[];
-    verbose: boolean;
-}, {
-    strict?: boolean | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schemaFilter?: string | string[] | undefined;
-    verbose?: boolean | undefined;
-    schema: string | string[];
-}>;
-export declare const mysqlConnectionSchema: import("zod").ZodUnion<[import("zod").ZodObject<{
-    host: import("zod").ZodString;
-    port: import("zod").ZodOptional<import("zod").ZodNumber>;
-    user: import("zod").ZodDefault<import("zod").ZodString>;
-    password: import("zod").ZodOptional<import("zod").ZodString>;
-    database: import("zod").ZodString;
-}, "strip", import("zod").ZodTypeAny, {
-    port?: number | undefined;
-    password?: string | undefined;
-    host: string;
-    user: string;
-    database: string;
-}, {
-    port?: number | undefined;
-    user?: string | undefined;
-    password?: string | undefined;
-    host: string;
-    database: string;
-}>, import("zod").ZodObject<{
-    connectionString: import("zod").ZodString;
-}, "strip", import("zod").ZodTypeAny, {
-    connectionString: string;
-}, {
-    connectionString: string;
-}>, import("zod").ZodObject<{}, "strip", import("zod").ZodTypeAny, {}, {}>]>;
-export declare const mySqlCliConfigSchema: import("zod").ZodIntersection<import("zod").ZodObject<{
-    schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
-    out: import("zod").ZodOptional<import("zod").ZodString>;
-    breakpoints: import("zod").ZodDefault<import("zod").ZodBoolean>;
-    driver: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"better-sqlite">, import("zod").ZodLiteral<"turso">, import("zod").ZodLiteral<"libsql">, import("zod").ZodLiteral<"d1">, import("zod").ZodLiteral<"expo">, import("zod").ZodLiteral<"pg">, import("zod").ZodLiteral<"mysql2">]>>;
-    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">]>>;
-}, "strip", import("zod").ZodTypeAny, {
-    out?: string | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schema: string | string[];
-    breakpoints: boolean;
-    schemaFilter: string | string[];
-}, {
-    out?: string | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
-    breakpoints?: boolean | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schemaFilter?: string | string[] | undefined;
-    schema: string | string[];
-}>, import("zod").ZodUnion<[import("zod").ZodObject<{
-    host: import("zod").ZodString;
-    port: import("zod").ZodOptional<import("zod").ZodNumber>;
-    user: import("zod").ZodDefault<import("zod").ZodString>;
-    password: import("zod").ZodOptional<import("zod").ZodString>;
-    database: import("zod").ZodString;
-}, "strip", import("zod").ZodTypeAny, {
-    port?: number | undefined;
-    password?: string | undefined;
-    host: string;
-    user: string;
-    database: string;
-}, {
-    port?: number | undefined;
-    user?: string | undefined;
-    password?: string | undefined;
-    host: string;
-    database: string;
-}>, import("zod").ZodObject<{
-    connectionString: import("zod").ZodString;
-}, "strip", import("zod").ZodTypeAny, {
-    connectionString: string;
-}, {
-    connectionString: string;
-}>, import("zod").ZodObject<{}, "strip", import("zod").ZodTypeAny, {}, {}>]>>;
-export declare const mySqlIntrospectConfigSchema: 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<{
-    host: import("zod").ZodString;
-    port: import("zod").ZodOptional<import("zod").ZodNumber>;
-    user: import("zod").ZodDefault<import("zod").ZodString>;
-    password: import("zod").ZodOptional<import("zod").ZodString>;
-    database: import("zod").ZodString;
-}, "strip", import("zod").ZodTypeAny, {
-    port?: number | undefined;
-    password?: string | undefined;
-    host: string;
-    user: string;
-    database: string;
-}, {
-    port?: number | undefined;
-    user?: string | undefined;
-    password?: string | undefined;
-    host: string;
-    database: string;
-}>, import("zod").ZodObject<{
-    connectionString: import("zod").ZodString;
-}, "strip", import("zod").ZodTypeAny, {
-    connectionString: string;
-}, {
-    connectionString: string;
-}>, import("zod").ZodObject<{}, "strip", import("zod").ZodTypeAny, {}, {}>]>>;
-export type MySqlCliConfig = TypeOf<typeof mySqlCliConfigSchema>;
-export type CliConfig = MySqlCliConfig;
-export type Driver = TypeOf<typeof driver>;
 export declare const drizzleConfigFromFile: (configPath?: string) => Promise<CliConfig>;
 export declare const readDrizzleConfig: (configPath?: string) => Promise<any>;

package/cli/index.d.ts

@@ -1,12 +1,35 @@
 import { TypeOf } from "zod";
 import "../@types/utils";
 import "dotenv/config";
+declare const cliConfigGenerate: import("zod").ZodObject<{
+    dialect: import("zod").ZodOptional<import("zod").ZodEnum<["pg", "mysql", "sqlite"]>>;
+    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>>;
+    config: import("zod").ZodOptional<import("zod").ZodString>;
+    breakpoints: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodBoolean>>;
+    custom: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodBoolean>>;
+}, "strict", import("zod").ZodTypeAny, {
+    schema?: string | string[] | undefined;
+    dialect?: "mysql" | "pg" | "sqlite" | undefined;
+    config?: string | undefined;
+    custom: boolean;
+    out: string;
+    breakpoints: boolean;
+}, {
+    custom?: boolean | undefined;
+    schema?: string | string[] | undefined;
+    dialect?: "mysql" | "pg" | "sqlite" | undefined;
+    out?: string | undefined;
+    config?: string | undefined;
+    breakpoints?: boolean | undefined;
+}>;
+export type CliConfigGenerate = TypeOf<typeof cliConfigGenerate>;
 declare const cliParamsPush: import("zod").ZodObject<{
     config: import("zod").ZodOptional<import("zod").ZodString>;
-    dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
+    dialect: import("zod").ZodOptional<import("zod").ZodEnum<["pg", "mysql", "sqlite"]>>;
     schema: import("zod").ZodOptional<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">]>>;
-    driver: import("zod").ZodString;
+    driver: import("zod").ZodOptional<import("zod").ZodString>;
     connectionString: import("zod").ZodOptional<import("zod").ZodString>;
     host: import("zod").ZodOptional<import("zod").ZodString>;
     port: import("zod").ZodOptional<import("zod").ZodString>;
@@ -16,42 +39,42 @@ declare const cliParamsPush: import("zod").ZodObject<{
     ssl: import("zod").ZodOptional<import("zod").ZodString>;
     uri: import("zod").ZodOptional<import("zod").ZodString>;
     authToken: import("zod").ZodOptional<import("zod").ZodString>;
-    verbose: import("zod").ZodDefault<import("zod").ZodBoolean>;
-    strict: import("zod").ZodDefault<import("zod").ZodBoolean>;
+    verbose: import("zod").ZodOptional<import("zod").ZodBoolean>;
+    strict: import("zod").ZodOptional<import("zod").ZodBoolean>;
 }, "strict", import("zod").ZodTypeAny, {
+    strict?: boolean | undefined;
     schema?: string | string[] | undefined;
-    authToken?: string | undefined;
-    tablesFilter?: string | string[] | undefined;
+    dialect?: "mysql" | "pg" | "sqlite" | undefined;
     config?: string | undefined;
+    driver?: string | undefined;
+    tablesFilter?: string | string[] | undefined;
+    verbose?: boolean | undefined;
     host?: string | undefined;
     port?: string | undefined;
     user?: string | undefined;
     password?: string | undefined;
     database?: string | undefined;
-    ssl?: string | undefined;
     connectionString?: string | undefined;
+    authToken?: string | undefined;
+    ssl?: string | undefined;
     uri?: string | undefined;
-    strict: boolean;
-    dialect: "pg" | "mysql" | "sqlite";
-    driver: string;
-    verbose: boolean;
 }, {
     strict?: boolean | undefined;
     schema?: string | string[] | undefined;
-    authToken?: string | undefined;
-    tablesFilter?: string | string[] | undefined;
+    dialect?: "mysql" | "pg" | "sqlite" | undefined;
     config?: string | undefined;
+    driver?: string | undefined;
+    tablesFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
     host?: string | undefined;
     port?: string | undefined;
     user?: string | undefined;
     password?: string | undefined;
     database?: string | undefined;
-    ssl?: string | undefined;
     connectionString?: string | undefined;
+    authToken?: string | undefined;
+    ssl?: string | undefined;
     uri?: string | undefined;
-    dialect: "pg" | "mysql" | "sqlite";
-    driver: string;
 }>;
 export type CliParamsPush = TypeOf<typeof cliParamsPush>;
 export declare const checkSchema: import("zod").ZodObject<{
@@ -60,12 +83,12 @@ export declare const checkSchema: import("zod").ZodObject<{
     driver: import("zod").ZodOptional<import("zod").ZodString>;
 }, "strict", import("zod").ZodTypeAny, {
     out?: string | undefined;
-    driver?: string | undefined;
     config?: string | undefined;
+    driver?: string | undefined;
 }, {
     out?: string | undefined;
-    driver?: string | undefined;
     config?: string | undefined;
+    driver?: string | undefined;
 }>;
 export type CheckConfig = TypeOf<typeof checkSchema>;
 export {};