drizzle-kit 0.20.14-a183d8b → 0.20.14-c82ab68

package/cli/commands/migrate.d.ts

@@ -26,10 +26,6 @@ export declare const prepareMySQLPush: (config: {
                 } | undefined>;
             } | undefined>;
         } | undefined;
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
         tables: Record<string, {
             schema?: string | undefined;
             name: string;
@@ -68,6 +64,10 @@ export declare const prepareMySQLPush: (config: {
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "mysql";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -83,10 +83,6 @@ export declare const prepareMySQLPush: (config: {
                 } | undefined>;
             } | undefined>;
         } | undefined;
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
         tables: Record<string, {
             schema?: string | undefined;
             name: string;
@@ -125,6 +121,10 @@ export declare const prepareMySQLPush: (config: {
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "mysql";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -140,8 +140,6 @@ export declare const prepareSQLitePush: (config: {
     statements: import("../../jsonStatements").JsonStatement[];
     squashedPrev: {
         enums?: any;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -157,11 +155,11 @@ export declare const prepareSQLitePush: (config: {
             compositePrimaryKeys: Record<string, string>;
             uniqueConstraints: Record<string, string>;
         }>;
+        version: "5";
+        dialect: "sqlite";
     };
     squashedCur: {
         enums?: any;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -177,6 +175,8 @@ export declare const prepareSQLitePush: (config: {
             compositePrimaryKeys: Record<string, string>;
             uniqueConstraints: Record<string, string>;
         }>;
+        version: "5";
+        dialect: "sqlite";
     };
     meta: {
         schemas: {};
@@ -190,8 +190,6 @@ export declare const preparePgPush: (config: {
     sqlStatements: string[];
     statements: import("../../jsonStatements").JsonStatement[];
     squashedPrev: {
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -210,6 +208,8 @@ export declare const preparePgPush: (config: {
             compositePrimaryKeys: Record<string, string>;
             uniqueConstraints: Record<string, string>;
         }>;
+        version: "6";
+        dialect: "pg";
         schemas: Record<string, string>;
         enums: Record<string, {
             name: string;
@@ -217,8 +217,6 @@ export declare const preparePgPush: (config: {
         }>;
     };
     squashedCur: {
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -237,6 +235,8 @@ export declare const preparePgPush: (config: {
             compositePrimaryKeys: Record<string, string>;
             uniqueConstraints: Record<string, string>;
         }>;
+        version: "6";
+        dialect: "pg";
         schemas: Record<string, string>;
         enums: Record<string, {
             name: string;
@@ -246,7 +246,7 @@ export declare const preparePgPush: (config: {
 }>;
 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<{
+export declare const prepareSQL: (prev: CommonSquashedSchema, cur: CommonSquashedSchema, dialect: Dialect, prevFull: PgSchema | MySqlSchema | SQLiteSchema, curFull: PgSchema | MySqlSchema | SQLiteSchema) => Promise<{
     statements: import("../../jsonStatements").JsonStatement[];
     sqlStatements: string[];
     _meta: {

package/cli/commands/mysqlIntrospect.d.ts

@@ -6,10 +6,6 @@ export declare const connectToMySQL: (config: MySQLConnectionConfig) => Promise<
 }>;
 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;
@@ -48,6 +44,10 @@ export declare const mysqlIntrospect: (config: MySQLConfigIntrospect, filters: s
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "mysql";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -67,10 +67,6 @@ export declare const mysqlPushIntrospect: (connection: {
     databaseName: string;
 }, filters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "mysql";
         tables: Record<string, {
             schema?: string | undefined;
             name: string;
@@ -109,6 +105,10 @@ export declare const mysqlPushIntrospect: (connection: {
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "mysql";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;

package/cli/commands/mysqlUp.d.ts

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

package/cli/commands/pgIntrospect.d.ts

@@ -5,10 +5,6 @@ export declare const pgPushIntrospect: (connection: {
     client: DrizzleDbClient;
 }, filters: string[], schemaFilters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -47,6 +43,10 @@ export declare const pgPushIntrospect: (connection: {
                 nullsNotDistinct: boolean;
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "pg";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -61,10 +61,6 @@ export declare const pgPushIntrospect: (connection: {
 }>;
 export declare const pgIntrospect: (config: PgConfigIntrospect, filters: string[], schemaFilters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -103,6 +99,10 @@ export declare const pgIntrospect: (config: PgConfigIntrospect, filters: string[
                 nullsNotDistinct: boolean;
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "pg";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -120,4 +120,7 @@ export declare const pgIntrospect: (config: PgConfigIntrospect, filters: string[
         decalrations: string;
         schemaEntry: string;
     };
+    relationsTs: {
+        file: string;
+    };
 }>;

package/cli/commands/pgUp.d.ts

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

package/cli/commands/sqliteIntrospect.d.ts

@@ -7,10 +7,6 @@ export declare const connectToSQLite: (config: SQLiteConnectionConfig) => Promis
 }>;
 export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -45,6 +41,10 @@ export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "5";
+        dialect: "sqlite";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;
@@ -60,10 +60,6 @@ export declare const sqliteIntrospect: (config: SQLiteCliConfig, filters: string
 }>;
 export declare const sqlitePushIntrospect: (client: DrizzleDbClient, filters: string[]) => Promise<{
     schema: {
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "sqlite";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -98,6 +94,10 @@ export declare const sqlitePushIntrospect: (client: DrizzleDbClient, filters: st
                 columns: string[];
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "5";
+        dialect: "sqlite";
         _meta: {
             columns: Record<string, string>;
             tables: Record<string, string>;

package/cli/commands/utils.d.ts

@@ -1,9 +1,9 @@
-import { CliConfigGenerate, CliParamsPush } from "..";
 import { MySQLPushConfig } from "../validations/mysql";
 import { PgPushConfig } from "../validations/pg";
 import { SQLitePushConfig } from "../validations/sqlite";
 import { CliConfig } from "../validations/common";
 import { Dialect } from "src/schemaValidator";
+import { CliCheckConfig, CliConfigGenerate, CliParamsPush } from "../validations/cli";
 export declare const safeRegister: () => Promise<{
     unregister: () => void;
 }>;
@@ -21,10 +21,9 @@ export declare const preparePushConfig: (options: CliParamsPush) => Promise<{
     schemaFiles: string[];
     tablesFilter: string[];
 }>;
-export declare const assertOutFolder: (it: {
-    config?: string;
-} | {
+export declare const assertOutFolder: (it: CliCheckConfig) => Promise<{
     out: string;
-}) => Promise<string>;
+    dialect: Dialect;
+}>;
 export declare const drizzleConfigFromFile: (configPath?: string) => Promise<CliConfig>;
 export declare const readDrizzleConfig: (configPath?: string) => Promise<any>;

package/cli/{index.d.ts → validations/cli.d.ts}

@@ -1,7 +1,5 @@
 import { TypeOf } from "zod";
-import "../@types/utils";
-import "dotenv/config";
-declare const cliConfigGenerate: import("zod").ZodObject<{
+export declare const cliConfigGenerate: import("zod").ZodObject<{
     dialect: import("zod").ZodOptional<import("zod").ZodEnum<["pg", "mysql", "sqlite"]>>;
     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>>;
@@ -19,25 +17,25 @@ declare const cliConfigGenerate: import("zod").ZodObject<{
     custom?: boolean | undefined;
     schema?: string | string[] | undefined;
     dialect?: "mysql" | "pg" | "sqlite" | undefined;
-    out?: string | undefined;
     config?: string | undefined;
+    out?: string | undefined;
     breakpoints?: boolean | undefined;
 }>;
 export type CliConfigGenerate = TypeOf<typeof cliConfigGenerate>;
-declare const cliParamsPush: import("zod").ZodObject<{
+export declare const cliParamsPush: import("zod").ZodObject<{
     config: import("zod").ZodOptional<import("zod").ZodString>;
     dialect: import("zod").ZodOptional<import("zod").ZodEnum<["pg", "mysql", "sqlite"]>>;
     schema: import("zod").ZodOptional<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">]>>;
     driver: import("zod").ZodOptional<import("zod").ZodString>;
     connectionString: import("zod").ZodOptional<import("zod").ZodString>;
+    uri: import("zod").ZodOptional<import("zod").ZodString>;
     host: import("zod").ZodOptional<import("zod").ZodString>;
     port: import("zod").ZodOptional<import("zod").ZodString>;
     user: import("zod").ZodOptional<import("zod").ZodString>;
     password: import("zod").ZodOptional<import("zod").ZodString>;
     database: import("zod").ZodOptional<import("zod").ZodString>;
     ssl: import("zod").ZodOptional<import("zod").ZodString>;
-    uri: import("zod").ZodOptional<import("zod").ZodString>;
     authToken: import("zod").ZodOptional<import("zod").ZodString>;
     verbose: import("zod").ZodOptional<import("zod").ZodBoolean>;
     strict: import("zod").ZodOptional<import("zod").ZodBoolean>;
@@ -55,9 +53,9 @@ declare const cliParamsPush: import("zod").ZodObject<{
     password?: string | undefined;
     database?: string | undefined;
     connectionString?: string | undefined;
-    authToken?: string | undefined;
-    ssl?: string | undefined;
     uri?: string | undefined;
+    ssl?: string | undefined;
+    authToken?: string | undefined;
 }, {
     strict?: boolean | undefined;
     schema?: string | string[] | undefined;
@@ -72,23 +70,35 @@ declare const cliParamsPush: import("zod").ZodObject<{
     password?: string | undefined;
     database?: string | undefined;
     connectionString?: string | undefined;
-    authToken?: string | undefined;
-    ssl?: string | undefined;
     uri?: string | undefined;
+    ssl?: string | undefined;
+    authToken?: string | undefined;
 }>;
 export type CliParamsPush = TypeOf<typeof cliParamsPush>;
-export declare const checkSchema: import("zod").ZodObject<{
+export declare const configCheck: import("zod").ZodObject<{
+    dialect: import("zod").ZodOptional<import("zod").ZodEnum<["pg", "mysql", "sqlite"]>>;
     out: import("zod").ZodOptional<import("zod").ZodString>;
-    config: import("zod").ZodOptional<import("zod").ZodString>;
-    driver: import("zod").ZodOptional<import("zod").ZodString>;
-}, "strict", import("zod").ZodTypeAny, {
+}, "strip", import("zod").ZodTypeAny, {
+    dialect?: "mysql" | "pg" | "sqlite" | undefined;
     out?: string | undefined;
-    config?: string | undefined;
-    driver?: string | undefined;
 }, {
+    dialect?: "mysql" | "pg" | "sqlite" | undefined;
     out?: string | undefined;
-    config?: string | undefined;
-    driver?: string | undefined;
 }>;
-export type CheckConfig = TypeOf<typeof checkSchema>;
-export {};
+export declare const cliConfigCheck: import("zod").ZodIntersection<import("zod").ZodObject<{
+    config: import("zod").ZodOptional<import("zod").ZodString>;
+}, "strip", import("zod").ZodTypeAny, {
+    config?: string | undefined;
+}, {
+    config?: string | undefined;
+}>, import("zod").ZodObject<{
+    dialect: import("zod").ZodOptional<import("zod").ZodEnum<["pg", "mysql", "sqlite"]>>;
+    out: import("zod").ZodOptional<import("zod").ZodString>;
+}, "strip", import("zod").ZodTypeAny, {
+    dialect?: "mysql" | "pg" | "sqlite" | undefined;
+    out?: string | undefined;
+}, {
+    dialect?: "mysql" | "pg" | "sqlite" | undefined;
+    out?: string | undefined;
+}>>;
+export type CliCheckConfig = TypeOf<typeof cliConfigCheck>;

package/cli/validations/common.d.ts

@@ -1,5 +1,5 @@
 import { TypeOf } from "zod";
-export type Commands = "introspect:sqlite" | "introspect:pg" | "generate" | "check:pg" | "check:mysql" | "check:sqlite" | "up:pg" | "up:mysql" | "up:sqlite" | "drop" | "introspect:mysql" | "push";
+export type Commands = "introspect:sqlite" | "introspect:pg" | "generate" | "check" | "up" | "drop" | "introspect:mysql" | "push";
 /**
  * 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/global.d.ts

@@ -1,4 +1,4 @@
 export declare const originUUID = "00000000-0000-0000-0000-000000000000";
-export declare const snapshotVersion = "5";
+export declare const snapshotVersion = "6";
 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/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/introspect-pg.d.ts

@@ -3,7 +3,10 @@ import { Relation, Relations } from "drizzle-orm/relations";
 import "./@types/utils";
 import type { ConfigIntrospectCasing } from "./cli/validations/common";
 import { PgSchemaInternal } from "./serializer/pgSchema";
-export declare const relationsToTypeScript: (schema: Record<string, Record<string, AnyPgTable<{}>>>, relations: Record<string, Relations<string, Record<string, Relation<string>>>>) => string;
+export declare const relationsToTypeScriptForStudio: (schema: Record<string, Record<string, AnyPgTable<{}>>>, relations: Record<string, Relations<string, Record<string, Relation<string>>>>) => string;
+export declare const relationsToTypeScript: (schema: PgSchemaInternal, casing: ConfigIntrospectCasing) => {
+    file: string;
+};
 export declare const schemaToTypeScript: (schema: PgSchemaInternal, casing: ConfigIntrospectCasing) => {
     file: string;
     imports: string;

package/jsonStatements.d.ts

@@ -294,7 +294,7 @@ export interface JsonRenameSchema {
 export type JsonAlterColumnStatement = JsonRenameColumnStatement | JsonAlterColumnTypeStatement | JsonAlterColumnSetDefaultStatement | JsonAlterColumnDropDefaultStatement | JsonAlterColumnSetNotNullStatement | JsonAlterColumnDropNotNullStatement | JsonAlterColumnDropOnUpdateStatement | JsonAlterColumnSetOnUpdateStatement | JsonAlterColumnDropAutoincrementStatement | JsonAlterColumnSetAutoincrementStatement | JsonAlterColumnSetPrimaryKeyStatement | JsonAlterColumnDropPrimaryKeyStatement;
 export type JsonStatement = JsonAlterColumnStatement | JsonCreateTableStatement | JsonDropTableStatement | JsonRenameTableStatement | JsonCreateEnumStatement | JsonAddValueToEnumStatement | JsonDropColumnStatement | JsonAddColumnStatement | JsonCreateIndexStatement | JsonCreateReferenceStatement | JsonAlterReferenceStatement | JsonDeleteReferenceStatement | JsonDropIndexStatement | JsonReferenceStatement | JsonSqliteCreateTableStatement | JsonSqliteAddColumnStatement | JsonCreateCompositePK | JsonDeleteCompositePK | JsonAlterCompositePK | JsonCreateUniqueConstraint | JsonDeleteUniqueConstraint | JsonAlterUniqueConstraint | JsonCreateSchema | JsonDropSchema | JsonRenameSchema | JsonAlterTableSetSchema | JsonAlterTableRemoveFromSchema | JsonAlterTableSetNewSchema;
 export declare const preparePgCreateTableJson: (table: Table, json2: PgSchema) => JsonCreateTableStatement;
-export declare const prepareMySqlCreateTableJson: (table: Table, json2: PgSchema) => JsonCreateTableStatement;
+export declare const prepareMySqlCreateTableJson: (table: Table, json2: MySqlSchema) => JsonCreateTableStatement;
 export declare const prepareSQLiteCreateTable: (table: Table) => JsonSqliteCreateTableStatement;
 export declare const prepareDropTableJson: (table: Table) => JsonDropTableStatement;
 export declare const prepareRenameTableJson: (tableFrom: Table, tableTo: Table) => JsonRenameTableStatement;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.14-a183d8b",
+  "version": "0.20.14-c82ab68",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -68,6 +68,7 @@
     "hanji": "^0.0.5",
     "json-diff": "0.9.0",
     "minimatch": "^7.4.3",
+    "pluralize": "^8.0.0",
     "semver": "^7.5.4",
     "zod": "^3.20.2"
   },
@@ -80,6 +81,7 @@
     "@types/minimatch": "^5.1.2",
     "@types/node": "^18.11.15",
     "@types/pg": "^8.10.7",
+    "@types/pluralize": "^0.0.33",
     "@types/semver": "^7.5.5",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",