drizzle-kit 0.20.0-f28522c → 0.20.0

package/index.d.ts

@@ -41,7 +41,7 @@ export type DbConnection = {
         password?: string;
         database: string;
     } | {
-        connectionString: string;
+        uri: string;
     };
 };
 export type Config = {
@@ -93,12 +93,13 @@ export type Config = {
         password?: string;
         database: string;
     } | {
-        connectionString: string;
+        uri: string;
     };
 } | {
     driver: "d1";
     dbCredentials: {
         wranglerConfigPath: string;
+        dbName: string;
     };
 } | {});
 export declare function defineConfig(config: Config): Config;

package/orm-extenstions/d1-driver/session.d.ts

@@ -2,10 +2,9 @@ import { entityKind } from "drizzle-orm";
 import type { Logger } from "drizzle-orm";
 import { type RelationalSchemaConfig, type TablesRelationalConfig } from "drizzle-orm";
 import { type Query } from "drizzle-orm";
-import type { SQLiteAsyncDialect, SQLiteExecuteMethod } from "drizzle-orm/sqlite-core";
+import { SQLiteAsyncDialect, SQLiteExecuteMethod, SQLitePreparedQuery, SQLiteSession } from "drizzle-orm/sqlite-core";
 import type { SelectedFieldsOrdered } from "drizzle-orm/sqlite-core";
 import { type PreparedQueryConfig as PreparedQueryConfigBase, type SQLiteTransactionConfig } from "drizzle-orm/sqlite-core";
-import { PreparedQuery as PreparedQueryBase, SQLiteSession } from "drizzle-orm/sqlite-core";
 export interface SQLiteD1SessionOptions {
     logger?: Logger;
 }
@@ -25,7 +24,7 @@ export declare class SQLiteWranglerD1Session<TFullSchema extends Record<string,
     prepareQuery(query: Query, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: (rows: unknown[][]) => unknown): PreparedQuery;
     transaction<T>(transaction: (tx: any) => T | Promise<T>, config?: SQLiteTransactionConfig): Promise<T>;
 }
-export declare class PreparedQuery<T extends PreparedQueryConfig = PreparedQueryConfig> extends PreparedQueryBase<{
+export declare class PreparedQuery<T extends PreparedQueryConfig = PreparedQueryConfig> extends SQLitePreparedQuery<{
     type: "async";
     run: D1WranglerResults;
     all: T["all"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.0-f28522c",
+  "version": "0.20.0",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -40,7 +40,8 @@
     "packit": "pnpm build && cp package.json dist/ && cd dist && pnpm pack",
     "tsc": "tsc -p tsconfig.build.json",
     "pub": "cp package.json readme.md dist/ && cd dist && npm publish",
-    "studio": "./dist/index.cjs studio --verbose"
+    "studio": "./dist/index.cjs studio --verbose",
+    "studio:dev": "tsx ./src/cli/index.ts studio --verbose"
   },
   "ava": {
     "files": [
@@ -54,7 +55,7 @@
     ]
   },
   "dependencies": {
-    "@drizzle-team/studio": "^0.0.9",
+    "@drizzle-team/studio": "^0.0.27",
     "@esbuild-kit/esm-loader": "^2.5.5",
     "camelcase": "^7.0.1",
     "chalk": "^5.2.0",
@@ -76,20 +77,20 @@
     "@types/glob": "^8.1.0",
     "@types/minimatch": "^5.1.2",
     "@types/node": "^18.11.15",
-    "@types/pg": "^8.6.5",
+    "@types/pg": "^8.10.7",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",
     "ava": "^5.1.0",
     "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-orm": "0.28.7-4e094f0",
+    "drizzle-orm": "0.29.0-d3b1c58",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "get-port": "^6.1.2",
     "mysql2": "2.3.3",
-    "pg": "^8.8.0",
+    "pg": "^8.11.3",
     "postgres": "^3.3.5",
     "prettier": "^2.8.1",
     "tsx": "^3.12.1",

package/serializer/index.d.ts

@@ -1,7 +1,7 @@
-import { PgSchemaInternal } from "./pgSchema";
-import { SQLiteSchemaInternal } from "./sqliteSchema";
-import { MySqlSchemaInternal } from "./mysqlSchema";
-import { SQL } from "drizzle-orm";
+import type { PgSchemaInternal } from "./pgSchema";
+import type { SQLiteSchemaInternal } from "./sqliteSchema";
+import type { MySqlSchemaInternal } from "./mysqlSchema";
+import type { SQL } from "drizzle-orm";
 export declare const sqlToStr: (sql: SQL) => string;
 export declare const serializeMySql: (path: string | string[]) => Promise<MySqlSchemaInternal>;
 export declare const serializePg: (path: string | string[], schemaFilter?: string[]) => Promise<PgSchemaInternal>;

package/serializer/pgSchema.d.ts

@@ -171,24 +171,24 @@ export declare const pgSchemaV1: import("zod").ZodObject<{
             }, "strict", import("zod").ZodTypeAny, {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             }, {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             }>>;
         }, "strict", import("zod").ZodTypeAny, {
             default?: any;
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -199,9 +199,9 @@ export declare const pgSchemaV1: import("zod").ZodObject<{
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -238,9 +238,9 @@ export declare const pgSchemaV1: import("zod").ZodObject<{
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -261,9 +261,9 @@ export declare const pgSchemaV1: import("zod").ZodObject<{
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -297,9 +297,9 @@ export declare const pgSchemaV1: import("zod").ZodObject<{
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -327,9 +327,9 @@ export declare const pgSchemaV1: import("zod").ZodObject<{
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -3059,24 +3059,24 @@ export declare const backwardCompatiblePgSchema: import("zod").ZodUnion<[import(
             }, "strict", import("zod").ZodTypeAny, {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             }, {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             }>>;
         }, "strict", import("zod").ZodTypeAny, {
             default?: any;
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -3087,9 +3087,9 @@ export declare const backwardCompatiblePgSchema: import("zod").ZodUnion<[import(
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -3126,9 +3126,9 @@ export declare const backwardCompatiblePgSchema: import("zod").ZodUnion<[import(
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -3149,9 +3149,9 @@ export declare const backwardCompatiblePgSchema: import("zod").ZodUnion<[import(
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -3185,9 +3185,9 @@ export declare const backwardCompatiblePgSchema: import("zod").ZodUnion<[import(
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;
@@ -3215,9 +3215,9 @@ export declare const backwardCompatiblePgSchema: import("zod").ZodUnion<[import(
             references?: {
                 onUpdate?: string | undefined;
                 onDelete?: string | undefined;
-                column: string;
                 foreignKeyName: string;
                 table: string;
+                column: string;
             } | undefined;
             name: string;
             type: string;

package/serializer/pgSerializer.d.ts

@@ -1,7 +1,9 @@
 import { AnyPgTable, PgEnum, PgSchema } from "drizzle-orm/pg-core";
-import { IntrospectStage, IntrospectStatus } from "src/cli/views";
-import { PgSchemaInternal } from "src/serializer/pgSchema";
-import { DrizzleDbClient } from "src/drivers";
+import { Relations } from "drizzle-orm";
+import type { IntrospectStage, IntrospectStatus } from "../cli/views";
+import type { PgSchemaInternal } from "../serializer/pgSchema";
+import type { DrizzleDbClient } from "../drivers";
 export declare const indexName: (tableName: string, columns: string[]) => string;
 export declare const generatePgSnapshot: (tables: AnyPgTable[], enums: PgEnum<any>[], schemas: PgSchema[], schemaFilter?: string[]) => PgSchemaInternal;
 export declare const fromDatabase: (db: DrizzleDbClient, tablesFilter: ((table: string) => boolean) | undefined, schemaFilters: string[], progressCallback?: ((stage: IntrospectStage, count: number, status: IntrospectStatus) => void) | undefined) => Promise<PgSchemaInternal>;
+export declare const toDrizzle: (schema: PgSchemaInternal, schemaName: string) => Record<string, AnyPgTable | Relations>;

package/serializer/sqliteSerializer.d.ts

@@ -1,8 +1,8 @@
-import { SQLiteSchemaInternal } from "src/serializer/sqliteSchema";
+import type { SQLiteSchemaInternal } from "../serializer/sqliteSchema";
 import { Relations } from "drizzle-orm";
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
-import { IntrospectStage, IntrospectStatus } from "src/cli/views";
-import { DrizzleDbClient } from "src/drivers";
+import type { IntrospectStage, IntrospectStatus } from "src/cli/views";
+import type { DrizzleDbClient } from "src/drivers";
 export declare const generateSqliteSnapshot: (tables: AnySQLiteTable[], enums: any[]) => SQLiteSchemaInternal;
 export declare const fromDatabase: (db: DrizzleDbClient, tablesFilter?: (table: string) => boolean, progressCallback?: ((stage: IntrospectStage, count: number, status: IntrospectStatus) => void) | undefined) => Promise<SQLiteSchemaInternal>;
 export declare const toDrizzle: (schema: SQLiteSchemaInternal) => Record<string, AnySQLiteTable | Relations>;

package/serializer/studioUtils.d.ts

@@ -1,13 +1,31 @@
+import type { Setup } from "@drizzle-team/studio";
 import { Relations } from "drizzle-orm";
 import { AnyMySqlTable } from "drizzle-orm/mysql-core";
 import { AnyPgTable } from "drizzle-orm/pg-core";
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
-import { StudioConfigConnections } from "src/cli/validations/studio";
+import { MySQLConnectionConfig } from "src/cli/validations/mysql";
+import { PgConnectionConfig } from "src/cli/validations/pg";
+import { StudioConfigConnections, StudioSqliteConnectionConfig as StudioSQLiteConnectionConfig } from "src/cli/validations/studio";
+export declare const preparePgSchema: (path: string | string[]) => Promise<{
+    schema: Record<string, Record<string, AnyPgTable<{}>>>;
+    relations: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+}>;
+export declare const prepareMySqlSchema: (path: string | string[]) => Promise<{
+    schema: Record<string, Record<string, AnyMySqlTable<{}>>>;
+    relations: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+}>;
+export declare const prepareSQLiteSchema: (path: string | string[]) => Promise<{
+    schema: Record<string, Record<string, AnySQLiteTable<{}>>>;
+    relations: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+}>;
 export declare const prepareModels: (path: string | string[]) => Promise<{
     pgSchema: Record<string, AnyPgTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
     mysqlSchema: Record<string, AnyMySqlTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
-    sqliteSchema: Record<string, AnySQLiteTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>>;
+    sqliteSchema: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>> | AnySQLiteTable<{}>>;
 }>;
+export declare const drizzleForPostgres: (connectionConfig: PgConnectionConfig, pgSchema: Record<string, Record<string, AnyPgTable>>, relations: Record<string, Relations>, verbose: boolean) => Promise<Setup>;
+export declare const drizzleForMySQL: (config: MySQLConnectionConfig, mysqlSchema: Record<string, Record<string, AnyMySqlTable>>, relations: Record<string, Relations>, verbose: boolean) => Promise<Setup>;
+export declare const drizzleForSQLite: (config: StudioSQLiteConnectionConfig, sqliteSchema: Record<string, Record<string, AnySQLiteTable>>, relations: Record<string, Relations>, verbose: boolean) => Promise<Setup>;
 export declare const drizzleDb: (drizzleConfig: StudioConfigConnections, models: {
     pgSchema?: Record<string, AnyPgTable | Relations>;
     mysqlSchema?: Record<string, AnyMySqlTable | Relations>;
@@ -23,13 +41,13 @@ export declare const drizzleDb: (drizzleConfig: StudioConfigConnections, models:
 } | {
     db: import("../orm-extenstions/d1-driver/driver").DrizzleD1WranglerDatabase<Record<string, never>>;
     type: "sqlite";
-    schema: Record<string, AnySQLiteTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>> | undefined;
+    schema: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>> | AnySQLiteTable<{}>> | undefined;
 } | {
     db: import("drizzle-orm/better-sqlite3").BetterSQLite3Database<Record<string, never>>;
     type: "sqlite";
-    schema: Record<string, AnySQLiteTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>> | undefined;
+    schema: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>> | AnySQLiteTable<{}>> | undefined;
 } | {
     db: import("drizzle-orm/libsql").LibSQLDatabase<Record<string, never>>;
     type: "sqlite";
-    schema: Record<string, AnySQLiteTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>> | undefined;
+    schema: Record<string, Relations<string, Record<string, import("drizzle-orm").Relation<string>>> | AnySQLiteTable<{}>> | undefined;
 }>;

package/sqlite-introspect.d.ts

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

package/utils-studio.d.ts

@@ -0,0 +1,5 @@
+export { toDrizzle as drizzleSchemaPg } from "./serializer/pgSerializer";
+export { toDrizzle as drizzleSchemaSQLite } from "./serializer/sqliteSerializer";
+export { sqlitePushIntrospect } from "./cli/commands/sqliteIntrospect";
+export { pgPushIntrospect } from "./cli/commands/pgIntrospect";
+export { DrizzleORMPgClient } from "./drivers";