drizzle-kit 0.20.13-1232ba2 → 0.20.14-05603dc

package/cli/commands/mysqlIntrospect.d.ts

@@ -0,0 +1,119 @@
+import { MySQLConfigIntrospect, MySQLConnectionConfig } from "../validations/mysql";
+import { DrizzleDbClient, MySQL2Client } from "src/drivers";
+export declare const connectToMySQL: (config: MySQLConnectionConfig) => Promise<{
+    client: MySQL2Client;
+    databaseName: string;
+}>;
+export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, filters: string[]) => Promise<{
+    schema: {
+        id: string;
+        prevId: string;
+        version: "5";
+        dialect: "mysql";
+        tables: Record<string, {
+            schema?: string | undefined;
+            name: string;
+            columns: Record<string, {
+                default?: any;
+                onUpdate?: any;
+                autoincrement?: boolean | undefined;
+                name: string;
+                type: string;
+                primaryKey: boolean;
+                notNull: boolean;
+            }>;
+            indexes: Record<string, {
+                using?: "btree" | "hash" | undefined;
+                algorithm?: "default" | "inplace" | "copy" | undefined;
+                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
+                name: string;
+                columns: string[];
+                isUnique: boolean;
+            }>;
+            foreignKeys: Record<string, {
+                onUpdate?: string | undefined;
+                onDelete?: string | undefined;
+                name: string;
+                tableFrom: string;
+                columnsFrom: string[];
+                tableTo: string;
+                columnsTo: string[];
+            }>;
+            compositePrimaryKeys: Record<string, {
+                name: string;
+                columns: string[];
+            }>;
+            uniqueConstraints: Record<string, {
+                name: string;
+                columns: string[];
+            }>;
+        }>;
+        schemas: Record<string, string>;
+        _meta: {
+            columns: Record<string, string>;
+            tables: Record<string, string>;
+            schemas: Record<string, string>;
+        };
+    };
+    ts: {
+        file: string;
+        imports: string;
+        decalrations: string;
+        schemaEntry: string;
+    };
+}>;
+export declare const mysqlPushIntrospect: (connection: {
+    client: DrizzleDbClient;
+    databaseName: string;
+}, filters: string[]) => Promise<{
+    schema: {
+        id: string;
+        prevId: string;
+        version: "5";
+        dialect: "mysql";
+        tables: Record<string, {
+            schema?: string | undefined;
+            name: string;
+            columns: Record<string, {
+                default?: any;
+                onUpdate?: any;
+                autoincrement?: boolean | undefined;
+                name: string;
+                type: string;
+                primaryKey: boolean;
+                notNull: boolean;
+            }>;
+            indexes: Record<string, {
+                using?: "btree" | "hash" | undefined;
+                algorithm?: "default" | "inplace" | "copy" | undefined;
+                lock?: "default" | "none" | "shared" | "exclusive" | undefined;
+                name: string;
+                columns: string[];
+                isUnique: boolean;
+            }>;
+            foreignKeys: Record<string, {
+                onUpdate?: string | undefined;
+                onDelete?: string | undefined;
+                name: string;
+                tableFrom: string;
+                columnsFrom: string[];
+                tableTo: string;
+                columnsTo: string[];
+            }>;
+            compositePrimaryKeys: Record<string, {
+                name: string;
+                columns: string[];
+            }>;
+            uniqueConstraints: Record<string, {
+                name: string;
+                columns: string[];
+            }>;
+        }>;
+        schemas: Record<string, string>;
+        _meta: {
+            columns: Record<string, string>;
+            tables: Record<string, string>;
+            schemas: Record<string, string>;
+        };
+    };
+}>;

package/cli/commands/mysqlPushUtils.d.ts

@@ -0,0 +1,18 @@
+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: DrizzleDbClient;
+    json2: TypeOf<typeof mysqlSchema>;
+}) => Promise<{
+    statementsToExecute: string[];
+    shouldAskForApprove: boolean;
+    infoToPrint: string[];
+    columnsToRemove: string[];
+    schemasToRemove: string[];
+    tablesToTruncate: string[];
+    tablesToRemove: string[];
+}>;

package/cli/commands/sqliteIntrospect.d.ts

@@ -37,7 +37,7 @@ export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string
                 columnsTo: string[];
             }>;
             compositePrimaryKeys: Record<string, {
-                name: string;
+                name?: string | undefined;
                 columns: string[];
             }>;
             uniqueConstraints: Record<string, {
@@ -90,7 +90,7 @@ export declare const sqlitePushIntrospect: (client: DrizzleDbClient, filters: st
                 columnsTo: string[];
             }>;
             compositePrimaryKeys: Record<string, {
-                name: string;
+                name?: string | undefined;
                 columns: string[];
             }>;
             uniqueConstraints: Record<string, {

package/cli/commands/sqlitePushUtils.d.ts

@@ -0,0 +1,21 @@
+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;
+export declare const logSuggestionsAndReturn: ({ connection, statements, json1, json2, meta, }: {
+    statements: JsonStatement[];
+    connection: DrizzleDbClient;
+    json1: SQLiteSchemaSquashed;
+    json2: SQLiteSchemaSquashed;
+    meta: SQLiteSchemaInternal["_meta"];
+}) => Promise<{
+    statementsToExecute: string[];
+    shouldAskForApprove: boolean;
+    infoToPrint: string[];
+    columnsToRemove: string[];
+    schemasToRemove: string[];
+    tablesToTruncate: string[];
+    tablesToRemove: string[];
+}>;

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/introspect-mysql.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.13-1232ba2",
+  "version": "0.20.14-05603dc",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "scripts": {
     "test:pg:push": "drizzle-kit push:pg",
     "payload": "tsx ./dev/payload.ts",
-    "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema2.ts",
+    "migrate:old": "drizzle-kit generate:mysql",
     "push": "node -r esbuild-register ./src/cli/index.ts push:mysql",
     "push:sqlite": "node -r ./src/loader.mjs ./src/cli/index.ts push:sqlite",
     "try1": "tsx ./src/t.ts",
@@ -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",
@@ -56,8 +56,9 @@
     ]
   },
   "dependencies": {
-    "@drizzle-team/studio": "^0.0.39",
     "@esbuild-kit/esm-loader": "^2.5.5",
+    "@hono/node-server": "^1.9.0",
+    "@hono/zod-validator": "^0.2.0",
     "camelcase": "^7.0.1",
     "chalk": "^5.2.0",
     "commander": "^9.4.1",
@@ -66,14 +67,16 @@
     "esbuild-register": "^3.5.0",
     "glob": "^8.1.0",
     "hanji": "^0.0.5",
+    "hono": "^4.1.4",
     "json-diff": "0.9.0",
     "minimatch": "^7.4.3",
     "semver": "^7.5.4",
+    "superjson": "^2.2.1",
     "zod": "^3.20.2"
   },
   "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",
@@ -84,10 +87,11 @@
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",
     "ava": "^5.1.0",
-    "better-sqlite3": "^8.4.0",
+    "better-sqlite3": "^9.4.3",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-orm": "0.29.0",
+    "drizzle-kit": "0.20.14",
+    "drizzle-orm": "0.30.5",
     "esbuild-node-externals": "^1.9.0",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
@@ -127,6 +131,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>;
+}>;