drizzle-kit 0.20.0-572b8ee → 0.20.0-588929f

package/cli/validations/studio.d.ts

@@ -24,75 +24,143 @@ export declare const studioSpecificConnections: import("zod").ZodObject<{
         dbName: string;
     };
 }>;
-export declare const studioConfidConnections: import("zod").ZodUnion<[import("zod").ZodUnion<[import("zod").ZodObject<{
-    driver: import("zod").ZodLiteral<"mysql2">;
+export declare const stuioSqliteConnectionConfig: import("zod").ZodUnion<[import("zod").ZodUnion<[import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"turso">;
+    dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+        authToken: import("zod").ZodOptional<import("zod").ZodString>;
+    }, "strip", import("zod").ZodTypeAny, {
+        authToken?: string | undefined;
+        url: string;
+    }, {
+        authToken?: string | undefined;
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "turso";
+    dbCredentials: {
+        authToken?: string | undefined;
+        url: string;
+    };
+}, {
+    driver: "turso";
+    dbCredentials: {
+        authToken?: string | undefined;
+        url: string;
+    };
+}>, import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"libsql">;
+    dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        url: string;
+    }, {
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+}, {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+}>, import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"better-sqlite">;
     dbCredentials: import("zod").ZodObject<{
+        url: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        url: string;
+    }, {
+        url: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+}, {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+}>]>, import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"d1">;
+    dbCredentials: import("zod").ZodObject<{
+        wranglerConfigPath: import("zod").ZodString;
+        dbName: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        wranglerConfigPath: string;
+        dbName: string;
+    }, {
+        wranglerConfigPath: string;
+        dbName: string;
+    }>;
+}, "strip", import("zod").ZodTypeAny, {
+    driver: "d1";
+    dbCredentials: {
+        wranglerConfigPath: string;
+        dbName: string;
+    };
+}, {
+    driver: "d1";
+    dbCredentials: {
+        wranglerConfigPath: string;
+        dbName: string;
+    };
+}>]>;
+export declare const studioConfidConnections: import("zod").ZodUnion<[import("zod").ZodObject<{
+    driver: import("zod").ZodLiteral<"mysql2">;
+    dbCredentials: 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;
-        type: import("zod").ZodDefault<import("zod").ZodLiteral<"params">>;
     }, "strip", import("zod").ZodTypeAny, {
         port?: number | undefined;
         password?: string | undefined;
-        type: "params";
         host: string;
         user: string;
         database: string;
     }, {
-        type?: "params" | undefined;
         port?: number | undefined;
         user?: string | undefined;
         password?: string | undefined;
         host: string;
         database: string;
-    }>;
+    }>, import("zod").ZodObject<{
+        uri: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        uri: string;
+    }, {
+        uri: string;
+    }>]>;
 }, "strip", import("zod").ZodTypeAny, {
     driver: "mysql2";
     dbCredentials: {
         port?: number | undefined;
         password?: string | undefined;
-        type: "params";
         host: string;
         user: string;
         database: string;
+    } | {
+        uri: string;
     };
 }, {
     driver: "mysql2";
     dbCredentials: {
-        type?: "params" | undefined;
         port?: number | undefined;
         user?: string | undefined;
         password?: string | undefined;
         host: string;
         database: string;
+    } | {
+        uri: string;
     };
-}>, import("zod").ZodObject<{
-    driver: import("zod").ZodLiteral<"mysql2">;
-    dbCredentials: import("zod").ZodObject<{
-        connectionString: import("zod").ZodString;
-        type: import("zod").ZodDefault<import("zod").ZodLiteral<"url">>;
-    }, "strip", import("zod").ZodTypeAny, {
-        type: "url";
-        connectionString: string;
-    }, {
-        type?: "url" | undefined;
-        connectionString: string;
-    }>;
-}, "strip", import("zod").ZodTypeAny, {
-    driver: "mysql2";
-    dbCredentials: {
-        type: "url";
-        connectionString: string;
-    };
-}, {
-    driver: "mysql2";
-    dbCredentials: {
-        type?: "url" | undefined;
-        connectionString: string;
-    };
-}>]>, import("zod").ZodUnion<[import("zod").ZodObject<{
+}>, import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"pg">;
     dbCredentials: import("zod").ZodObject<{
         host: import("zod").ZodString;
@@ -258,75 +326,56 @@ export declare const studioConfigSchema: import("zod").ZodIntersection<import("z
     schema: string | string[];
 }, {
     schema: string | string[];
-}>, import("zod").ZodUnion<[import("zod").ZodUnion<[import("zod").ZodObject<{
+}>, import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"mysql2">;
-    dbCredentials: import("zod").ZodObject<{
+    dbCredentials: 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;
-        type: import("zod").ZodDefault<import("zod").ZodLiteral<"params">>;
     }, "strip", import("zod").ZodTypeAny, {
         port?: number | undefined;
         password?: string | undefined;
-        type: "params";
         host: string;
         user: string;
         database: string;
     }, {
-        type?: "params" | undefined;
         port?: number | undefined;
         user?: string | undefined;
         password?: string | undefined;
         host: string;
         database: string;
-    }>;
+    }>, import("zod").ZodObject<{
+        uri: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        uri: string;
+    }, {
+        uri: string;
+    }>]>;
 }, "strip", import("zod").ZodTypeAny, {
     driver: "mysql2";
     dbCredentials: {
         port?: number | undefined;
         password?: string | undefined;
-        type: "params";
         host: string;
         user: string;
         database: string;
+    } | {
+        uri: string;
     };
 }, {
     driver: "mysql2";
     dbCredentials: {
-        type?: "params" | undefined;
         port?: number | undefined;
         user?: string | undefined;
         password?: string | undefined;
         host: string;
         database: string;
+    } | {
+        uri: string;
     };
-}>, import("zod").ZodObject<{
-    driver: import("zod").ZodLiteral<"mysql2">;
-    dbCredentials: import("zod").ZodObject<{
-        connectionString: import("zod").ZodString;
-        type: import("zod").ZodDefault<import("zod").ZodLiteral<"url">>;
-    }, "strip", import("zod").ZodTypeAny, {
-        type: "url";
-        connectionString: string;
-    }, {
-        type?: "url" | undefined;
-        connectionString: string;
-    }>;
-}, "strip", import("zod").ZodTypeAny, {
-    driver: "mysql2";
-    dbCredentials: {
-        type: "url";
-        connectionString: string;
-    };
-}, {
-    driver: "mysql2";
-    dbCredentials: {
-        type?: "url" | undefined;
-        connectionString: string;
-    };
-}>]>, import("zod").ZodUnion<[import("zod").ZodObject<{
+}>, import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"pg">;
     dbCredentials: import("zod").ZodObject<{
         host: import("zod").ZodString;
@@ -488,6 +537,7 @@ export declare const studioConfigSchema: import("zod").ZodIntersection<import("z
 }>]>>;
 export type StudioConfig = TypeOf<typeof studioConfigSchema>;
 export type StudioConfigConnections = TypeOf<typeof studioConfidConnections>;
+export type StudioSqliteConnectionConfig = TypeOf<typeof stuioSqliteConnectionConfig>;
 export declare const validateStudio: (options: any) => Promise<{
     schema: string | string[];
 } & ({
@@ -528,16 +578,11 @@ export declare const validateStudio: (options: any) => Promise<{
     dbCredentials: {
         port?: number | undefined;
         password?: string | undefined;
-        type: "params";
         host: string;
         user: string;
         database: string;
-    };
-} | {
-    driver: "mysql2";
-    dbCredentials: {
-        type: "url";
-        connectionString: string;
+    } | {
+        uri: string;
     };
 } | {
     driver: "d1";

package/global.d.ts

@@ -1,2 +1,3 @@
 export declare const originUUID = "00000000-0000-0000-0000-000000000000";
 export declare const snapshotVersion = "5";
+export declare function assertUnreachable(x: never): never;

package/index.d.mts

@@ -0,0 +1,105 @@
+export type DbConnection = {
+    driver: "turso";
+    dbCredentials: {
+        url: string;
+        authToken?: string;
+    };
+} | {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+} | {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+} | {
+    driver: "d1";
+    dbCredentials: {
+        wranglerConfigPath: string;
+        dbName: string;
+    };
+} | {
+    driver: "pg";
+    dbCredentials: {
+        host: string;
+        port?: number;
+        user?: string;
+        password?: string;
+        database: string;
+        ssl?: boolean;
+    } | {
+        connectionString: string;
+    };
+} | {
+    driver: "mysql2";
+    dbCredentials: {
+        host: string;
+        port?: number;
+        user?: string;
+        password?: string;
+        database: string;
+    } | {
+        uri: string;
+    };
+};
+export type Config = {
+    out?: string | undefined;
+    breakpoints?: boolean | undefined;
+    tablesFilter?: string | string[] | undefined;
+    schemaFilter?: string | string[] | undefined;
+    schema?: string | string[];
+    verbose?: boolean | undefined;
+    strict?: boolean | undefined;
+} & {
+    introspect?: {
+        casing: "camel" | "preserve";
+    };
+} & ({
+    driver: "turso";
+    dbCredentials: {
+        url: string;
+        authToken?: string;
+    };
+} | {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+} | {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+} | {
+    driver: "pg";
+    dbCredentials: {
+        host: string;
+        port?: number;
+        user?: string;
+        password?: string;
+        database: string;
+        ssl?: boolean;
+    } | {
+        connectionString: string;
+    };
+} | {
+    driver: "mysql2";
+    dbCredentials: {
+        host: string;
+        port?: number;
+        user?: string;
+        password?: string;
+        database: string;
+    } | {
+        uri: string;
+    };
+} | {
+    driver: "d1";
+    dbCredentials: {
+        wranglerConfigPath: string;
+        dbName: string;
+    };
+} | {});
+export declare function defineConfig(config: Config): Config;

package/index.d.ts

@@ -41,7 +41,7 @@ export type DbConnection = {
         password?: string;
         database: string;
     } | {
-        connectionString: string;
+        uri: string;
     };
 };
 export type Config = {
@@ -93,7 +93,7 @@ export type Config = {
         password?: string;
         database: string;
     } | {
-        connectionString: string;
+        uri: string;
     };
 } | {
     driver: "d1";

package/index.js

@@ -0,0 +1,31 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  defineConfig: () => defineConfig
+});
+module.exports = __toCommonJS(src_exports);
+function defineConfig(config) {
+  return config;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defineConfig
+});

package/index.mjs

@@ -0,0 +1,7 @@
+// src/index.ts
+function defineConfig(config) {
+  return config;
+}
+export {
+  defineConfig
+};

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,11 +1,11 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.0-572b8ee",
+  "version": "0.20.0-588929f",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
   "bin": {
-    "drizzle-kit": "./index.cjs"
+    "drizzle-kit": "./bin.cjs"
   },
   "scripts": {
     "test:pg:push": "drizzle-kit push:pg",
@@ -35,12 +35,13 @@
     "sim": "node -r esbuild-register ./dev/simulate.ts",
     "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
     "test": "ava test --timeout=60s",
-    "build": "rm -rf ./dist && tsx build.ts && tsc -p tsconfig.cli-types.json",
+    "build": "rm -rf ./dist && tsc -p tsconfig.cli-types.json && cp dist/index.d.ts dist/index.d.mts && tsx build.ts",
     "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",
     "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,25 +77,40 @@
     "@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",
+    "esbuild-node-externals": "^1.9.0",
     "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",
     "typescript": "^4.9.4",
     "uvu": "^0.5.6",
     "zx": "^7.2.2"
+  },
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./index.d.mts",
+        "default": "./index.mjs"
+      },
+      "require": {
+        "types": "./index.d.ts",
+        "default": "./index.js"
+      },
+      "types": "./index.d.mts",
+      "default": "./index.mjs"
+    }
   }
 }

package/serializer/studioUtils.d.ts

@@ -1,19 +1,36 @@
+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 type { Pool } from "pg";
-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, 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>;
     sqliteSchema?: Record<string, AnySQLiteTable | Relations>;
-}, logger: boolean, pgClient?: Pool) => Promise<{
+}, logger: boolean) => Promise<{
     db: import("drizzle-orm/node-postgres").NodePgDatabase<Record<string, never>>;
     type: "pg";
     schema: Record<string, AnyPgTable<{}> | Relations<string, Record<string, import("drizzle-orm").Relation<string>>>> | undefined;

package/utils.d.ts

@@ -2,7 +2,7 @@ import { Dialect } from "./schemaValidator";
 import { NamedWithSchema } from "./cli/commands/migrate";
 import { PgDatabase } from "drizzle-orm/pg-core";
 import { PgSchema as PgSchemaKit } from "./serializer/pgSchema";
-import { Config, DbConnection } from ".";
+import { DbConnection } from ".";
 export declare const assertV1OutFolder: (out: string, dialect: Dialect | "{dialect}") => void;
 export type Journal = {
     version: string;
@@ -17,7 +17,6 @@ export type Journal = {
 };
 export declare const dryJournal: (dialect: Dialect) => Journal;
 export declare const snapshotsPriorV4: (out: string) => string[];
-export declare function defineConfig(config: Config): Config;
 export declare const prepareOutFolder: (out: string, dialect: Dialect) => {
     meta: string;
     snapshots: string[];