drizzle-kit 0.20.14-6ce9d1f → 0.20.14-a77266f

package/payload.mjs

@@ -2103,7 +2103,7 @@ ${withStyle.errorWarning(
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = (table4) => true, schemaFilters, progressCallback) => {
       const result = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `table_schema = '${t}'`).join(" or ");
@@ -6178,226 +6178,6 @@ var init_lib = __esm({
   }
 });
 
-// src/cli/validations/common.ts
-var init_common = __esm({
-  "src/cli/validations/common.ts"() {
-    init_outputs();
-  }
-});
-
-// src/cli/validations/mysql.ts
-var mysqlConnectionCli, mysql2credentials, mysqlConnectionConfig, mysqlConfigIntrospectSchema, mysqlCliIntrospectParams, mysqlCliPushParams, mysqlConfigPushParams;
-var init_mysql = __esm({
-  "src/cli/validations/mysql.ts"() {
-    init_lib();
-    init_utils();
-    init_common();
-    init_outputs();
-    mysqlConnectionCli = unionType([
-      objectType({
-        driver: literalType("mysql2"),
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("mysql"),
-        password: stringType().optional(),
-        database: stringType()
-      }),
-      objectType({
-        driver: literalType("mysql2"),
-        uri: stringType()
-        // TODO: change docs
-      })
-    ]);
-    mysql2credentials = unionType([
-      objectType({
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("mysql"),
-        password: stringType().optional(),
-        database: stringType()
-      }),
-      objectType({
-        uri: stringType()
-        // TODO: change docs
-      })
-    ]);
-    mysqlConnectionConfig = objectType({
-      driver: literalType("mysql2"),
-      dbCredentials: mysql2credentials
-    });
-    mysqlConfigIntrospectSchema = intersectionType(
-      configIntrospectSchema,
-      mysqlConnectionConfig
-    );
-    mysqlCliIntrospectParams = intersectionType(
-      configIntrospectCliSchema,
-      mysqlConnectionCli
-    );
-    mysqlCliPushParams = intersectionType(
-      configPushSchema,
-      mysqlConnectionCli
-    );
-    mysqlConfigPushParams = intersectionType(
-      configPushSchema,
-      mysqlConnectionConfig
-    );
-  }
-});
-
-// src/cli/validations/pg.ts
-var pgConnectionCli, pgConnectionConfig, pgConfigIntrospectSchema, pgCliIntrospectParams, pgCliPushParams, pgConfigPushParams;
-var init_pg = __esm({
-  "src/cli/validations/pg.ts"() {
-    init_lib();
-    init_utils();
-    init_common();
-    init_outputs();
-    pgConnectionCli = unionType([
-      objectType({
-        driver: literalType("pg"),
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("postgres"),
-        password: stringType().optional(),
-        database: stringType(),
-        ssl: coerce.boolean().optional(),
-        type: literalType("params").default("params")
-      }),
-      objectType({
-        driver: literalType("pg"),
-        connectionString: stringType(),
-        type: literalType("url").default("url")
-      })
-    ]);
-    pgConnectionConfig = unionType([
-      objectType({
-        driver: literalType("pg"),
-        dbCredentials: objectType({
-          host: stringType(),
-          port: coerce.number().optional(),
-          user: stringType().default("postgres"),
-          password: stringType().optional(),
-          database: stringType(),
-          ssl: coerce.boolean().optional(),
-          type: literalType("params").default("params").optional()
-        })
-      }),
-      objectType({
-        driver: literalType("pg"),
-        dbCredentials: objectType({
-          connectionString: stringType(),
-          type: literalType("url").default("url").optional()
-        })
-      })
-    ]);
-    pgConfigIntrospectSchema = intersectionType(
-      configIntrospectSchema,
-      pgConnectionConfig
-    );
-    pgCliIntrospectParams = intersectionType(
-      configIntrospectCliSchema,
-      pgConnectionCli
-    );
-    pgCliPushParams = intersectionType(
-      configPushSchema,
-      pgConnectionCli
-    );
-    pgConfigPushParams = intersectionType(
-      configPushSchema,
-      pgConnectionConfig
-    );
-  }
-});
-
-// src/cli/commands/sqliteUtils.ts
-var sqliteConnectionSchema, sqliteCliConfigSchema;
-var init_sqliteUtils = __esm({
-  "src/cli/commands/sqliteUtils.ts"() {
-    init_lib();
-    init_utils();
-    sqliteConnectionSchema = unionType([
-      objectType({
-        driver: literalType("turso"),
-        dbCredentials: objectType({
-          url: stringType(),
-          authToken: stringType().optional()
-        })
-      }),
-      objectType({
-        driver: literalType("libsql"),
-        dbCredentials: objectType({
-          url: stringType()
-        })
-      }),
-      objectType({
-        driver: literalType("better-sqlite"),
-        dbCredentials: objectType({
-          url: stringType()
-        })
-      })
-    ]);
-    sqliteCliConfigSchema = intersectionType(
-      configIntrospectSchema,
-      sqliteConnectionSchema
-    );
-  }
-});
-
-// src/cli/validations/sqlite.ts
-var sqliteConnectionCli, sqliteCliIntrospectParams, sqliteCliPushParams, sqliteConfigPushParams;
-var init_sqlite = __esm({
-  "src/cli/validations/sqlite.ts"() {
-    init_lib();
-    init_sqliteUtils();
-    init_utils();
-    init_common();
-    init_outputs();
-    sqliteConnectionCli = unionType([
-      objectType({
-        driver: literalType("turso"),
-        url: stringType(),
-        authToken: stringType()
-      }),
-      objectType({
-        driver: literalType("better-sqlite"),
-        url: stringType()
-      }),
-      objectType({
-        driver: literalType("libsql"),
-        url: stringType()
-      })
-    ]);
-    sqliteCliIntrospectParams = intersectionType(
-      configIntrospectCliSchema,
-      sqliteConnectionCli
-    );
-    sqliteCliPushParams = intersectionType(
-      configPushSchema,
-      sqliteConnectionCli
-    );
-    sqliteConfigPushParams = intersectionType(
-      configPushSchema,
-      sqliteConnectionSchema
-    );
-  }
-});
-
-// src/global.ts
-var originUUID, snapshotVersion, mapValues;
-var init_global = __esm({
-  "src/global.ts"() {
-    originUUID = "00000000-0000-0000-0000-000000000000";
-    snapshotVersion = "5";
-    mapValues = (obj, map) => {
-      const result = Object.keys(obj).reduce(function(result2, key) {
-        result2[key] = map(obj[key]);
-        return result2;
-      }, {});
-      return result;
-    };
-  }
-});
-
 // src/cli/commands/_es5.ts
 var es5_exports = {};
 __export(es5_exports, {
@@ -12025,13 +11805,6 @@ var init_utils = __esm({
     init_source();
     init_views();
     import_hanji2 = __toESM(require_hanji());
-    init_mysql();
-    init_pg();
-    init_sqlite();
-    init_outputs();
-    init_pg();
-    init_sqlite();
-    init_global();
     assertES5 = async (unregister) => {
       try {
         init_es5();
@@ -12202,6 +11975,22 @@ var init_pgImports = __esm({
   }
 });
 
+// src/global.ts
+var originUUID, snapshotVersion, mapValues;
+var init_global = __esm({
+  "src/global.ts"() {
+    originUUID = "00000000-0000-0000-0000-000000000000";
+    snapshotVersion = "5";
+    mapValues = (obj, map) => {
+      const result = Object.keys(obj).reduce(function(result2, key) {
+        result2[key] = map(obj[key]);
+        return result2;
+      }, {});
+      return result;
+    };
+  }
+});
+
 // src/serializer/pgSchema.ts
 var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, schemaHash, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaExternal, kitInternals, pgSchemaInternal, tableSquashed, tableSquashedV4, pgSchemaSquashedV4, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
@@ -12695,12 +12484,9 @@ var init_sqliteSchema = __esm({
           const squashedPKs = mapValues(it[1].compositePrimaryKeys, (pk) => {
             return SQLiteSquasher.squashPK(pk);
           });
-          const squashedUniqueConstraints = mapValues(
-            it[1].uniqueConstraints,
-            (unq) => {
-              return SQLiteSquasher.squashUnique(unq);
-            }
-          );
+          const squashedUniqueConstraints = mapValues(it[1].uniqueConstraints, (unq) => {
+            return SQLiteSquasher.squashUnique(unq);
+          });
           return [
             it[0],
             {
@@ -12734,11 +12520,7 @@ var init_sqliteSchema = __esm({
       }
     });
     sqliteSchema = schema2;
-    backwardCompatibleSqliteSchema = unionType([
-      schemaV3,
-      schemaV4,
-      schema2
-    ]);
+    backwardCompatibleSqliteSchema = unionType([schemaV3, schemaV4, schema2]);
   }
 });
 
@@ -16388,50 +16170,60 @@ var init_migrate = __esm({
         return { sqlStatements, statements, validatedCur, validatedPrev };
       } catch (e) {
         console.error(e);
-        process.exit(1);
       }
     };
     prepareSQLitePush = async (config, snapshot) => {
       const schemaPath = config.schema;
-      const { prev, cur } = await prepareSQLiteDbPushSnapshot(snapshot, schemaPath);
-      const validatedPrev = sqliteSchema.parse(prev);
-      const validatedCur = sqliteSchema.parse(cur);
-      const squashedPrev = squashSqliteScheme(validatedPrev);
-      const squashedCur = squashSqliteScheme(validatedCur);
-      const { sqlStatements, statements, _meta } = await prepareSQL(
-        squashedPrev,
-        squashedCur,
-        "sqlite",
-        validatedPrev,
-        validatedCur
-      );
-      return {
-        sqlStatements,
-        statements,
-        squashedPrev,
-        squashedCur,
-        meta: _meta
-      };
+      try {
+        const { prev, cur } = await prepareSQLiteDbPushSnapshot(
+          snapshot,
+          schemaPath
+        );
+        const validatedPrev = sqliteSchema.parse(prev);
+        const validatedCur = sqliteSchema.parse(cur);
+        const squashedPrev = squashSqliteScheme(validatedPrev);
+        const squashedCur = squashSqliteScheme(validatedCur);
+        const { sqlStatements, statements, _meta } = await prepareSQL(
+          squashedPrev,
+          squashedCur,
+          "sqlite",
+          validatedPrev,
+          validatedCur
+        );
+        return {
+          sqlStatements,
+          statements,
+          squashedPrev,
+          squashedCur,
+          meta: _meta
+        };
+      } catch (e) {
+        console.error(e);
+      }
     };
     preparePgPush = async (config, snapshot, schemaFilter) => {
       const schemaPath = config.schema;
-      const { prev, cur } = await preparePgDbPushSnapshot(
-        snapshot,
-        schemaPath,
-        schemaFilter
-      );
-      const validatedPrev = pgSchema.parse(prev);
-      const validatedCur = pgSchema.parse(cur);
-      const squashedPrev = squashPgScheme(validatedPrev);
-      const squashedCur = squashPgScheme(validatedCur);
-      const { sqlStatements, statements } = await prepareSQL(
-        squashedPrev,
-        squashedCur,
-        "pg",
-        validatedPrev,
-        validatedCur
-      );
-      return { sqlStatements, statements, squashedPrev, squashedCur };
+      try {
+        const { prev, cur } = await preparePgDbPushSnapshot(
+          snapshot,
+          schemaPath,
+          schemaFilter
+        );
+        const validatedPrev = pgSchema.parse(prev);
+        const validatedCur = pgSchema.parse(cur);
+        const squashedPrev = squashPgScheme(validatedPrev);
+        const squashedCur = squashPgScheme(validatedCur);
+        const { sqlStatements, statements } = await prepareSQL(
+          squashedPrev,
+          squashedCur,
+          "pg",
+          validatedPrev,
+          validatedCur
+        );
+        return { sqlStatements, statements, squashedPrev, squashedCur };
+      } catch (e) {
+        console.error(e);
+      }
     };
     prepareAndMigrateMySql = async (config) => {
       const outFolder = config.out;

package/schemaValidator.d.ts

@@ -1,5 +1,5 @@
 import { TypeOf } from "zod";
-export declare const dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
+declare const dialect: import("zod").ZodEnum<["pg", "mysql", "sqlite"]>;
 export type Dialect = TypeOf<typeof dialect>;
 declare const commonSquashedSchema: import("zod").ZodUnion<[import("zod").ZodObject<{
     version: import("zod").ZodLiteral<"5">;

package/serializer/mysqlSerializer.d.ts

@@ -1,6 +1,6 @@
 import { AnyMySqlTable, MySqlSchema } from "drizzle-orm/mysql-core";
-import { MySqlSchemaInternal } from "../serializer/mysqlSchema";
-import { IntrospectStage, IntrospectStatus } from "../cli/views";
+import { MySqlSchemaInternal } from "src/serializer/mysqlSchema";
+import { IntrospectStage, IntrospectStatus } from "src/cli/views";
 import { DrizzleDbClient } from "src/drivers";
 export declare const indexName: (tableName: string, columns: string[]) => string;
 export declare const generateMySqlSnapshot: (tables: AnyMySqlTable[], enums: any[], mysqlSchemas: MySqlSchema[]) => MySqlSchemaInternal;

package/serializer/sqliteSerializer.d.ts

@@ -1,6 +1,6 @@
 import type { SQLiteSchemaInternal } from "../serializer/sqliteSchema";
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
-import type { IntrospectStage, IntrospectStatus } from "../cli/views";
-import type { DrizzleDbClient } from "../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>;

package/utils-studio.js

@@ -1081,14 +1081,6 @@ var init_views = __esm({
   }
 });
 
-// src/global.ts
-var originUUID;
-var init_global = __esm({
-  "src/global.ts"() {
-    originUUID = "00000000-0000-0000-0000-000000000000";
-  }
-});
-
 // src/serializer/index.ts
 var glob;
 var init_serializer = __esm({
@@ -1579,7 +1571,7 @@ var init_pgSerializer = __esm({
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = (table) => true, schemaFilters, progressCallback) => {
       const result = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `table_schema = '${t}'`).join(" or ");
@@ -2174,7 +2166,11 @@ var sqliteSchemaToDrizzle = (schema) => {
 
 // src/cli/commands/sqliteIntrospect.ts
 init_views();
-init_global();
+
+// src/global.ts
+var originUUID = "00000000-0000-0000-0000-000000000000";
+
+// src/cli/commands/sqliteIntrospect.ts
 init_sqliteSerializer();
 
 // node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
@@ -3360,7 +3356,6 @@ var import_relations = require("drizzle-orm/relations");
 init_pgSerializer();
 
 // src/cli/commands/pgIntrospect.ts
-init_global();
 var pgPushIntrospect = async (connection, filters, schemaFilters) => {
   const { client } = connection;
   const matchers = filters.map((it) => {

package/utils-studio.mjs

@@ -1083,14 +1083,6 @@ var init_views = __esm({
   }
 });
 
-// src/global.ts
-var originUUID;
-var init_global = __esm({
-  "src/global.ts"() {
-    originUUID = "00000000-0000-0000-0000-000000000000";
-  }
-});
-
 // src/serializer/index.ts
 import * as glob from "glob";
 var init_serializer = __esm({
@@ -1588,7 +1580,7 @@ var init_pgSerializer = __esm({
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = (table) => true, schemaFilters, progressCallback) => {
       const result = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `table_schema = '${t}'`).join(" or ");
@@ -2208,7 +2200,11 @@ var sqliteSchemaToDrizzle = (schema) => {
 
 // src/cli/commands/sqliteIntrospect.ts
 init_views();
-init_global();
+
+// src/global.ts
+var originUUID = "00000000-0000-0000-0000-000000000000";
+
+// src/cli/commands/sqliteIntrospect.ts
 init_sqliteSerializer();
 
 // node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
@@ -3399,7 +3395,6 @@ import {
 init_pgSerializer();
 
 // src/cli/commands/pgIntrospect.ts
-init_global();
 var pgPushIntrospect = async (connection, filters, schemaFilters) => {
   const { client } = connection;
   const matchers = filters.map((it) => {

package/utils.js

@@ -1086,22 +1086,6 @@ var init_views = __esm({
   }
 });
 
-// src/global.ts
-var originUUID, snapshotVersion, mapValues;
-var init_global = __esm({
-  "src/global.ts"() {
-    originUUID = "00000000-0000-0000-0000-000000000000";
-    snapshotVersion = "5";
-    mapValues = (obj, map) => {
-      const result = Object.keys(obj).reduce(function(result2, key) {
-        result2[key] = map(obj[key]);
-        return result2;
-      }, {});
-      return result;
-    };
-  }
-});
-
 // node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs
 function getErrorMap() {
   return overrideErrorMap;
@@ -4278,8 +4262,18 @@ module.exports = __toCommonJS(utils_exports);
 var import_fs = require("fs");
 init_views();
 
+// src/global.ts
+var originUUID = "00000000-0000-0000-0000-000000000000";
+var snapshotVersion = "5";
+var mapValues = (obj, map) => {
+  const result = Object.keys(obj).reduce(function(result2, key) {
+    result2[key] = map(obj[key]);
+    return result2;
+  }, {});
+  return result;
+};
+
 // src/serializer/mysqlSchema.ts
-init_global();
 init_lib();
 var index = objectType({
   name: stringType(),
@@ -4484,7 +4478,6 @@ var dryMySql = mysqlSchema.parse({
 });
 
 // src/serializer/pgSchema.ts
-init_global();
 init_lib();
 var indexV2 = objectType({
   name: stringType(),
@@ -4811,7 +4804,6 @@ var dryPg = pgSchema.parse({
 });
 
 // src/serializer/sqliteSchema.ts
-init_global();
 init_lib();
 var index3 = objectType({
   name: stringType(),
@@ -4968,16 +4960,11 @@ var drySQLite = schema2.parse({
     columns: {}
   }
 });
-var backwardCompatibleSqliteSchema = unionType([
-  schemaV32,
-  schemaV42,
-  schema2
-]);
+var backwardCompatibleSqliteSchema = unionType([schemaV32, schemaV42, schema2]);
 
 // src/utils.ts
 init_source();
 var import_path = require("path");
-init_global();
 
 // src/jsonDiffer.js
 var import_json_diff = require("json-diff");
@@ -7724,7 +7711,6 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
 
 // src/cli/commands/pgUp.ts
 init_source();
-init_global();
 
 // src/cli/commands/mysqlUp.ts
 init_source();

package/utils.mjs

@@ -1088,22 +1088,6 @@ var init_views = __esm({
   }
 });
 
-// src/global.ts
-var originUUID, snapshotVersion, mapValues;
-var init_global = __esm({
-  "src/global.ts"() {
-    originUUID = "00000000-0000-0000-0000-000000000000";
-    snapshotVersion = "5";
-    mapValues = (obj, map) => {
-      const result = Object.keys(obj).reduce(function(result2, key) {
-        result2[key] = map(obj[key]);
-        return result2;
-      }, {});
-      return result;
-    };
-  }
-});
-
 // node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs
 function getErrorMap() {
   return overrideErrorMap;
@@ -4269,8 +4253,18 @@ import {
   writeFileSync
 } from "fs";
 
+// src/global.ts
+var originUUID = "00000000-0000-0000-0000-000000000000";
+var snapshotVersion = "5";
+var mapValues = (obj, map) => {
+  const result = Object.keys(obj).reduce(function(result2, key) {
+    result2[key] = map(obj[key]);
+    return result2;
+  }, {});
+  return result;
+};
+
 // src/serializer/mysqlSchema.ts
-init_global();
 init_lib();
 var index = objectType({
   name: stringType(),
@@ -4475,7 +4469,6 @@ var dryMySql = mysqlSchema.parse({
 });
 
 // src/serializer/pgSchema.ts
-init_global();
 init_lib();
 var indexV2 = objectType({
   name: stringType(),
@@ -4802,7 +4795,6 @@ var dryPg = pgSchema.parse({
 });
 
 // src/serializer/sqliteSchema.ts
-init_global();
 init_lib();
 var index3 = objectType({
   name: stringType(),
@@ -4959,15 +4951,10 @@ var drySQLite = schema2.parse({
     columns: {}
   }
 });
-var backwardCompatibleSqliteSchema = unionType([
-  schemaV32,
-  schemaV42,
-  schema2
-]);
+var backwardCompatibleSqliteSchema = unionType([schemaV32, schemaV42, schema2]);
 
 // src/utils.ts
 init_source();
-init_global();
 import { join } from "path";
 
 // src/jsonDiffer.js
@@ -7715,7 +7702,6 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
 
 // src/cli/commands/pgUp.ts
 init_source();
-init_global();
 
 // src/cli/commands/mysqlUp.ts
 init_source();

package/cli/commands/check.d.ts

@@ -1,2 +0,0 @@
-import { Dialect } from "../../schemaValidator";
-export declare const checkHandler: (out: string, dialect: Dialect) => void;

package/cli/commands/drop.d.ts

@@ -1,4 +0,0 @@
-export declare const dropMigration: ({ out, bundle, }: {
-    out: string;
-    bundle?: boolean | undefined;
-}) => Promise<void>;