drizzle-kit 0.20.17-f62f2f6 → 0.20.17-ff96495

package/cli/commands/pgPushUtils.d.ts

@@ -1,9 +1,6 @@
-import { DrizzleDbClient } from "src/drivers";
-import { JsonStatement } from "src/jsonStatements";
-export declare const pgSuggestions: ({ connection, statements, }: {
-    statements: JsonStatement[];
-    connection: DrizzleDbClient;
-}) => Promise<{
+import type { DB } from "../../utils";
+import type { JsonStatement } from "../../jsonStatements";
+export declare const pgSuggestions: (db: DB, statements: JsonStatement[]) => Promise<{
     statementsToExecute: string[];
     shouldAskForApprove: boolean;
     infoToPrint: string[];

package/cli/commands/sqliteIntrospect.d.ts

@@ -1,50 +1,46 @@
-import type { SQLiteCliConfig, SQLiteConnectionConfig } from "./sqliteUtils";
-import type { DrizzleDbClient } from "../../drivers";
-export declare const connectToSQLite: (config: SQLiteConnectionConfig) => Promise<{
-    client: import("../../drivers").BetterSqlite;
-} | {
-    client?: undefined;
-}>;
-export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string[]) => Promise<{
+import type { SqliteCredentials } from "../validations/sqlite";
+import type { SQLiteDB } from "../../utils";
+import { Casing } from "../validations/common";
+export declare const sqliteIntrospect: (credentials: SqliteCredentials, filters: string[], casing: Casing) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
-                default?: any;
-                autoincrement?: boolean | undefined;
                 name: string;
                 type: string;
                 primaryKey: boolean;
                 notNull: boolean;
+                default?: any;
+                autoincrement?: boolean | undefined;
             }>;
             indexes: Record<string, {
-                where?: string | undefined;
                 name: string;
                 columns: string[];
                 isUnique: boolean;
+                where?: string | undefined;
             }>;
             foreignKeys: Record<string, {
-                onUpdate?: string | undefined;
-                onDelete?: string | undefined;
                 name: string;
                 tableFrom: string;
                 columnsFrom: string[];
                 tableTo: string;
                 columnsTo: string[];
+                onUpdate?: string | undefined;
+                onDelete?: string | undefined;
             }>;
             compositePrimaryKeys: Record<string, {
-                name?: string | undefined;
                 columns: string[];
+                name?: string | undefined;
             }>;
             uniqueConstraints: Record<string, {
                 name: string;
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "5";
+        dialect: "sqlite";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;
@@ -58,46 +54,46 @@ export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string
         schemaEntry: string;
     };
 }>;
-export declare const sqlitePushIntrospect: (client: DrizzleDbClient, filters: string[]) => Promise<{
+export declare const sqlitePushIntrospect: (db: SQLiteDB, filters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
-                default?: any;
-                autoincrement?: boolean | undefined;
                 name: string;
                 type: string;
                 primaryKey: boolean;
                 notNull: boolean;
+                default?: any;
+                autoincrement?: boolean | undefined;
             }>;
             indexes: Record<string, {
-                where?: string | undefined;
                 name: string;
                 columns: string[];
                 isUnique: boolean;
+                where?: string | undefined;
             }>;
             foreignKeys: Record<string, {
-                onUpdate?: string | undefined;
-                onDelete?: string | undefined;
                 name: string;
                 tableFrom: string;
                 columnsFrom: string[];
                 tableTo: string;
                 columnsTo: string[];
+                onUpdate?: string | undefined;
+                onDelete?: string | undefined;
             }>;
             compositePrimaryKeys: Record<string, {
-                name?: string | undefined;
                 columns: string[];
+                name?: string | undefined;
             }>;
             uniqueConstraints: Record<string, {
                 name: string;
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "5";
+        dialect: "sqlite";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;

package/cli/commands/sqlitePushUtils.d.ts

@@ -1,16 +1,10 @@
-import { DrizzleDbClient } from "src/drivers";
-import { JsonStatement } from "src/jsonStatements";
-import { SQLiteSchemaInternal, SQLiteSchemaSquashed } from "src/serializer/sqliteSchema";
+import { SQLiteSchemaInternal, SQLiteSchemaSquashed } from "../../serializer/sqliteSchema";
+import type { JsonStatement } from "../../jsonStatements";
+import type { SQLiteDB } from "../../utils";
 export declare const _moveDataStatements: (tableName: string, json: SQLiteSchemaSquashed, dataLoss?: boolean) => string[];
 export declare const getOldTableName: (tableName: string, meta: SQLiteSchemaInternal["_meta"]) => string;
 export declare const getNewTableName: (tableName: string, meta: SQLiteSchemaInternal["_meta"]) => string;
-export declare const logSuggestionsAndReturn: ({ connection, statements, json1, json2, meta, }: {
-    statements: JsonStatement[];
-    connection: DrizzleDbClient;
-    json1: SQLiteSchemaSquashed;
-    json2: SQLiteSchemaSquashed;
-    meta: SQLiteSchemaInternal["_meta"];
-}) => Promise<{
+export declare const logSuggestionsAndReturn: (connection: SQLiteDB, statements: JsonStatement[], json1: SQLiteSchemaSquashed, json2: SQLiteSchemaSquashed, meta: SQLiteSchemaInternal["_meta"]) => Promise<{
     statementsToExecute: string[];
     shouldAskForApprove: boolean;
     infoToPrint: string[];

package/cli/commands/utils.d.ts

@@ -1,274 +1,58 @@
-import { TypeOf } from "zod";
+import { MysqlCredentials } from "../validations/mysql";
+import { PostgresCredentials } from "../validations/pg";
+import { SqliteCredentials } from "../validations/sqlite";
+import { Casing, CliConfig } from "../validations/common";
+import type { Dialect } from "../../schemaValidator";
+import { CliCheckConfig, CliConfigGenerate } from "../validations/cli";
 export declare const safeRegister: () => Promise<{
     unregister: () => void;
 }>;
 export type GenerateConfig = {
+    dialect: Dialect;
     schema: string | string[];
     out: string;
     breakpoints: boolean;
+    name?: string;
     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 assertOutFolder: (it: {
-    config?: string;
+export declare const prepareGenerateConfig: (options: CliConfigGenerate) => Promise<GenerateConfig>;
+export declare const flattenDatabaseCredentials: (config: any) => any;
+export declare const preparePushConfig: (options: Record<string, unknown>) => Promise<({
+    dialect: "mysql";
+    credentials: MysqlCredentials;
 } | {
-    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;
-    breakpoints?: boolean | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
-    tablesFilter?: string | string[] | undefined;
-    schemaFilter?: string | string[] | undefined;
-    schema: string | string[];
+    dialect: "pg";
+    credentials: PostgresCredentials;
+} | {
+    dialect: "sqlite";
+    credentials: SqliteCredentials;
+}) & {
+    schemaPath: string | string[];
+    verbose: boolean;
+    strict: boolean;
+    tablesFilter: string[];
+    schemasFilter: 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;
+export declare const preparePullConfig: (options: Record<string, unknown>) => Promise<({
+    dialect: "mysql";
+    credentials: MysqlCredentials;
+} | {
+    dialect: "pg";
+    credentials: PostgresCredentials;
+} | {
+    dialect: "sqlite";
+    credentials: SqliteCredentials;
+}) & {
     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;
+    casing: Casing;
+    tablesFilter: string[];
+    schemasFilter: string[];
 }>;
-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;
+export declare const assertOutFolder: (it: CliCheckConfig) => Promise<{
     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;
+    dialect: Dialect;
 }>;
-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;
-    breakpoints?: boolean | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | 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/connections.d.ts

@@ -0,0 +1,13 @@
+import type { DB, Proxy, SQLiteDB, SqliteProxy } from "../utils";
+import type { PostgresCredentials } from "./validations/pg";
+import type { MysqlCredentials } from "./validations/mysql";
+import { SqliteCredentials } from "./validations/sqlite";
+export declare const preparePostgresDB: (credentials: PostgresCredentials) => Promise<DB & {
+    proxy: Proxy;
+}>;
+export declare const connectToMySQL: (it: MysqlCredentials) => Promise<{
+    db: DB;
+    proxy: Proxy;
+    database: string;
+}>;
+export declare const connectToSQLite: (credentials: SqliteCredentials) => Promise<SQLiteDB & SqliteProxy>;

package/cli/utils.d.ts

@@ -0,0 +1,13 @@
+export declare const assertExists: (it?: any) => void;
+export declare const assertStudioNodeVersion: () => void;
+export declare const checkPackage: (it: string) => Promise<boolean>;
+export declare const assertPackages: (...pkgs: string[]) => Promise<void>;
+export declare const assertEitherPackage: (...pkgs: string[]) => Promise<string[]>;
+export declare const assertOrmCoreVersion: () => Promise<void>;
+export declare const ormCoreVersions: () => Promise<{
+    compatibilityVersion: number;
+    npmVersion: string;
+} | {
+    compatibilityVersion?: undefined;
+    npmVersion?: undefined;
+}>;