drizzle-kit 0.20.14-95be75d → 0.20.14-a77266f

package/cli/commands/migrate.d.ts

@@ -1,9 +1,9 @@
 import { CommonSchema, CommonSquashedSchema, Dialect } from "../../schemaValidator";
 import { schema } from "../views";
-import { PgSchema } from "../../serializer/pgSchema";
-import { SQLiteSchema } from "../../serializer/sqliteSchema";
-import { MySqlSchema } from "../../serializer/mysqlSchema";
-import { Journal } from "../../utils";
+import { PgSchema } from "src/serializer/pgSchema";
+import { SQLiteSchema } from "src/serializer/sqliteSchema";
+import { MySqlSchema } from "src/serializer/mysqlSchema";
+import { Journal } from "src/utils";
 import { GenerateConfig } from "./utils";
 export type Named = {
     name: string;
@@ -132,7 +132,7 @@ export declare const prepareMySQLPush: (config: {
             schemas: Record<string, string>;
         };
     };
-}>;
+} | undefined>;
 export declare const prepareSQLitePush: (config: {
     schema: string | string[];
 }, snapshot: SQLiteSchema) => Promise<{
@@ -183,7 +183,7 @@ export declare const prepareSQLitePush: (config: {
         tables: {};
         columns: {};
     } | undefined;
-}>;
+} | undefined>;
 export declare const preparePgPush: (config: {
     schema: string | string[];
 }, snapshot: PgSchema, schemaFilter: string[]) => Promise<{
@@ -243,7 +243,7 @@ export declare const preparePgPush: (config: {
             values: Record<string, string>;
         }>;
     };
-}>;
+} | undefined>;
 export declare const prepareAndMigrateMySql: (config: GenerateConfig) => Promise<void>;
 export declare const prepareAndMigrateSqlite: (config: GenerateConfig) => Promise<void>;
 export declare const prepareSQL: (prev: CommonSquashedSchema, cur: CommonSquashedSchema, dialect: Dialect, prevFull?: any, curFull?: any) => Promise<{

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 { JsonStatement } from "../../jsonStatements";
-import { mysqlSchema } from "../../serializer/mysqlSchema";
+import { DrizzleDbClient } from "src/drivers";
+import { JsonStatement } from "src/jsonStatements";
+import { mysqlSchema } from "src/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/mysqlUp.d.ts

@@ -1,4 +1,4 @@
-import { MySqlSchema, MySqlSchemaV4 } from "../../serializer/mysqlSchema";
+import { MySqlSchema, MySqlSchemaV4 } from "src/serializer/mysqlSchema";
 export declare const upMysqlHandler: (out: string) => void;
 export declare const upMySqlHandlerV4toV5: (obj: MySqlSchemaV4) => MySqlSchema;
 export declare const upMysqlHandlerV4: (out: string) => void;

package/cli/commands/pgConnect.d.ts

@@ -1,5 +1,5 @@
 import type { PgConnectionConfig } from "../validations/pg";
-import { PgPostgres } from "../../drivers";
+import { PgPostgres } from "src/drivers";
 export declare const connectToPg: (config: PgConnectionConfig) => Promise<{
     client: PgPostgres;
 }>;

package/cli/commands/pgIntrospect.d.ts

@@ -1,5 +1,5 @@
 import type { PgConfigIntrospect } from "../validations/pg";
-import type { DrizzleDbClient } from "../../drivers";
+import type { DrizzleDbClient } from "src/drivers";
 export declare const pgSchemas: (client: DrizzleDbClient) => Promise<string[]>;
 export declare const pgPushIntrospect: (connection: {
     client: DrizzleDbClient;

package/cli/commands/pgPushUtils.d.ts

@@ -1,5 +1,5 @@
-import { DrizzleDbClient } from "../../drivers";
-import { JsonStatement } from "../../jsonStatements";
+import { DrizzleDbClient } from "src/drivers";
+import { JsonStatement } from "src/jsonStatements";
 export declare const pgSuggestions: ({ connection, statements, }: {
     statements: JsonStatement[];
     connection: DrizzleDbClient;

package/cli/commands/pgUp.d.ts

@@ -1,4 +1,4 @@
-import { PgSchema, PgSchemaV4 } from "../../serializer/pgSchema";
+import { PgSchema, PgSchemaV4 } from "src/serializer/pgSchema";
 export declare const upPgHandlerV4toV5: (obj: PgSchemaV4) => PgSchema;
 export declare const upPgHandler: (out: string) => void;
 export declare const upPgHandlerV4: (out: string) => void;

package/cli/commands/sqlitePushUtils.d.ts

@@ -1,6 +1,6 @@
-import { DrizzleDbClient } from "../../drivers";
-import { JsonStatement } from "../../jsonStatements";
-import { SQLiteSchemaInternal, SQLiteSchemaSquashed } from "../../serializer/sqliteSchema";
+import { DrizzleDbClient } from "src/drivers";
+import { JsonStatement } from "src/jsonStatements";
+import { SQLiteSchemaInternal, SQLiteSchemaSquashed } from "src/serializer/sqliteSchema";
 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;

package/cli/commands/upFolders.d.ts

@@ -1,4 +1,4 @@
-import { Dialect } from "../../schemaValidator";
+import { Dialect } from "src/schemaValidator";
 import { Named, NamedWithSchema } from "./migrate";
 export declare const resolveSchemas: <T extends Named>(missingSchemas: T[], newSchemas: T[], predicate: (leftMissing: T[], created: T) => T | undefined) => {
     created: T[];

package/cli/commands/utils.d.ts

@@ -1,8 +1,4 @@
 import { TypeOf } from "zod";
-import { CliParamsPush } from "..";
-import { MySQLPushConfig } from "../validations/mysql";
-import { PgPushConfig } from "../validations/pg";
-import { SQLitePushConfig } from "../validations/sqlite";
 export declare const safeRegister: () => Promise<{
     unregister: () => void;
 }>;
@@ -20,11 +16,6 @@ export declare const prepareGenerateConfig: (options: {
     breakpoints: boolean;
     custom: boolean;
 }) => Promise<GenerateConfig>;
-export declare const preparePushConfig: (options: CliParamsPush) => Promise<{
-    config: MySQLPushConfig | PgPushConfig | SQLitePushConfig;
-    schemaFiles: string[];
-    tablesFilter: string[];
-}>;
 export declare const assertOutFolder: (it: {
     config?: string;
 } | {
@@ -47,8 +38,8 @@ export declare const configCommonSchema: import("zod").ZodObject<{
     schemaFilter: string | string[];
 }, {
     out?: string | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | 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[];
@@ -190,8 +181,8 @@ export declare const mySqlCliConfigSchema: import("zod").ZodIntersection<import(
     schemaFilter: string | string[];
 }, {
     out?: string | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | 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[];

package/cli/validations/common.d.ts

@@ -3,7 +3,7 @@ export type CollusionCheckOutput = {
     message?: string;
     action: "config" | "cli" | "error";
 };
-export type Commands = "push:sqlite" | "introspect:sqlite" | "introspect:pg" | "generate" | "check:pg" | "check:mysql" | "check:sqlite" | "up:pg" | "up:mysql" | "up:sqlite" | "drop" | "introspect:mysql" | "push:mysql" | "push:pg";
+export type Commands = "push:sqlite" | "introspect:sqlite" | "introspect:pg" | "generate:pg" | "generate:sqlite" | "generate:mysql" | "check:pg" | "check:mysql" | "check:sqlite" | "up:pg" | "up:mysql" | "up:sqlite" | "drop" | "introspect:mysql" | "push:mysql" | "push:pg";
 /**
  * This function checks an input from a user and if there are any params together with config path - return true
  * @param options - user input

package/cli/views.d.ts

@@ -1,5 +1,5 @@
 import { Prompt, TaskView } from "hanji";
-import type { CommonSchema } from "../schemaValidator";
+import type { CommonSchema } from "src/schemaValidator";
 import type { Named } from "./commands/migrate";
 export declare const warning: (msg: string) => void;
 export declare const err: (msg: string) => void;

package/drivers/index.d.ts

@@ -1,4 +1,6 @@
 import type { Client } from "@libsql/client";
+import { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
+import { MySql2Database } from "drizzle-orm/mysql2";
 import type { PgDatabase } from "drizzle-orm/pg-core";
 import type { Client as PgClient } from "pg";
 export declare abstract class DrizzleDbClient<T = any> {
@@ -11,10 +13,22 @@ export declare class DrizzleORMPgClient extends DrizzleDbClient<PgDatabase<any>>
     query<K = any>(query: string, values?: any[] | undefined): Promise<K[]>;
     run(query: string): Promise<void>;
 }
+export declare class DrizzleORMMySQLClient extends DrizzleDbClient<MySql2Database<any>> {
+    query<K = any>(query: string, values?: any[] | undefined): Promise<K[]>;
+    run(query: string): Promise<void>;
+}
+export declare class DrizzleORMSQLiteClient extends DrizzleDbClient<BetterSQLite3Database<any>> {
+    query<K = any>(query: string, values?: any[] | undefined): Promise<K[]>;
+    run(query: string): Promise<void>;
+}
 export declare class BetterSqlite extends DrizzleDbClient {
     run(query: string): Promise<void>;
     query(query: string): Promise<any[]>;
 }
+export declare class MySQL2Client extends DrizzleDbClient {
+    run(query: string): Promise<void>;
+    query(query: string): Promise<any>;
+}
 export declare class TursoSqlite extends DrizzleDbClient<Client> {
     run(query: string): Promise<void>;
     query(query: string): Promise<any[]>;

package/global.d.ts

@@ -1,3 +1,4 @@
 export declare const originUUID = "00000000-0000-0000-0000-000000000000";
 export declare const snapshotVersion = "5";
 export declare function assertUnreachable(x: never): never;
+export declare const mapValues: <IN, OUT>(obj: Record<string, IN>, map: (input: IN) => OUT) => Record<string, OUT>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.14-95be75d",
+  "version": "0.20.14-a77266f",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
     "test": "ava test --timeout=60s",
     "build": "rm -rf ./dist && tsc -p tsconfig.cli-types.json && pnpm mts && tsx build.ts",
-    "mts": "cp dist/index.d.ts dist/index.d.mts && cp dist/utils-studio.d.ts dist/utils-studio.d.mts",
+    "mts": "cp dist/index.d.ts dist/index.d.mts && cp dist/utils-studio.d.ts dist/utils-studio.d.mts && cp dist/payload.d.ts dist/payload.d.mts",
     "build:dev": "rm -rf ./dist && tsx build.dev.ts && tsc -p tsconfig.cli-types.json && chmod +x ./dist/index.cjs",
     "packit": "pnpm build && cp package.json dist/ && cd dist && pnpm pack",
     "tsc": "tsc -p tsconfig.build.json",
@@ -73,7 +73,7 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",
-    "@libsql/client": "^0.1.6",
+    "@libsql/client": "^0.4.2",
     "@types/better-sqlite3": "^7.6.4",
     "@types/dockerode": "^3.3.14",
     "@types/glob": "^8.1.0",
@@ -128,6 +128,18 @@
       },
       "types": "./utils-studio.d.mts",
       "default": "./utils-studio.mjs"
+    },
+    "./payload": {
+      "import": {
+        "types": "./payload.d.mts",
+        "default": "./payload.mjs"
+      },
+      "require": {
+        "types": "./payload.d.ts",
+        "default": "./payload.js"
+      },
+      "types": "./payload.d.mts",
+      "default": "./payload.mjs"
     }
   }
 }

package/payload.d.mts

@@ -0,0 +1,33 @@
+import { PgDatabase } from "drizzle-orm/pg-core";
+import { PgSchema as PgSchemaKit } from "./serializer/pgSchema";
+import { SQLiteSchema as SQLiteSchemaKit } from "./serializer/sqliteSchema";
+import { MySqlSchema as MySQLSchemaKit } from "./serializer/mysqlSchema";
+import { MySql2Database } from "drizzle-orm/mysql2";
+import { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
+export type DrizzleSnapshotJSON = PgSchemaKit;
+export type DrizzleSQLiteSnapshotJSON = SQLiteSchemaKit;
+export type DrizzleMySQLSnapshotJSON = MySQLSchemaKit;
+export declare const generateDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => PgSchemaKit;
+export declare const generateMigration: (prev: DrizzleSnapshotJSON, cur: DrizzleSnapshotJSON) => Promise<string[]>;
+export declare const pushSchema: (imports: Record<string, unknown>, db: PgDatabase<any>) => Promise<{
+    hasDataLoss: boolean;
+    warnings: string[];
+    statementsToExecute: string[];
+    apply: () => Promise<void>;
+}>;
+export declare const generateSQLiteDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => Promise<SQLiteSchemaKit>;
+export declare const generateSQLiteMigration: (prev: DrizzleSQLiteSnapshotJSON, cur: DrizzleSQLiteSnapshotJSON) => Promise<string[]>;
+export declare const pushSQLiteSchema: (imports: Record<string, unknown>, db: BetterSQLite3Database<any>) => Promise<{
+    hasDataLoss: boolean;
+    warnings: string[];
+    statementsToExecute: string[];
+    apply: () => Promise<void>;
+}>;
+export declare const generateMySQLDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => Promise<MySQLSchemaKit>;
+export declare const generateMySQLMigration: (prev: DrizzleMySQLSnapshotJSON, cur: DrizzleMySQLSnapshotJSON) => Promise<string[]>;
+export declare const pushMySQLSchema: (imports: Record<string, unknown>, db: MySql2Database<any>, databaseName: string) => Promise<{
+    hasDataLoss: boolean;
+    warnings: string[];
+    statementsToExecute: string[];
+    apply: () => Promise<void>;
+}>;

package/payload.d.ts

@@ -0,0 +1,33 @@
+import { PgDatabase } from "drizzle-orm/pg-core";
+import { PgSchema as PgSchemaKit } from "./serializer/pgSchema";
+import { SQLiteSchema as SQLiteSchemaKit } from "./serializer/sqliteSchema";
+import { MySqlSchema as MySQLSchemaKit } from "./serializer/mysqlSchema";
+import { MySql2Database } from "drizzle-orm/mysql2";
+import { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
+export type DrizzleSnapshotJSON = PgSchemaKit;
+export type DrizzleSQLiteSnapshotJSON = SQLiteSchemaKit;
+export type DrizzleMySQLSnapshotJSON = MySQLSchemaKit;
+export declare const generateDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => PgSchemaKit;
+export declare const generateMigration: (prev: DrizzleSnapshotJSON, cur: DrizzleSnapshotJSON) => Promise<string[]>;
+export declare const pushSchema: (imports: Record<string, unknown>, db: PgDatabase<any>) => Promise<{
+    hasDataLoss: boolean;
+    warnings: string[];
+    statementsToExecute: string[];
+    apply: () => Promise<void>;
+}>;
+export declare const generateSQLiteDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => Promise<SQLiteSchemaKit>;
+export declare const generateSQLiteMigration: (prev: DrizzleSQLiteSnapshotJSON, cur: DrizzleSQLiteSnapshotJSON) => Promise<string[]>;
+export declare const pushSQLiteSchema: (imports: Record<string, unknown>, db: BetterSQLite3Database<any>) => Promise<{
+    hasDataLoss: boolean;
+    warnings: string[];
+    statementsToExecute: string[];
+    apply: () => Promise<void>;
+}>;
+export declare const generateMySQLDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => Promise<MySQLSchemaKit>;
+export declare const generateMySQLMigration: (prev: DrizzleMySQLSnapshotJSON, cur: DrizzleMySQLSnapshotJSON) => Promise<string[]>;
+export declare const pushMySQLSchema: (imports: Record<string, unknown>, db: MySql2Database<any>, databaseName: string) => Promise<{
+    hasDataLoss: boolean;
+    warnings: string[];
+    statementsToExecute: string[];
+    apply: () => Promise<void>;
+}>;