drizzle-kit 0.20.14-1ebe0ff → 0.20.14-1f99bf7

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 "src/cli/views";
-import type { DrizzleDbClient } from "src/drivers";
+import type { IntrospectStage, IntrospectStatus } from "../cli/views";
+import type { DrizzleDbClient } from "../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/snapshotsDiffer.d.ts

@@ -1,6 +1,9 @@
 import { TypeOf, ZodTypeAny, z } from "zod";
 import { JsonStatement } from "./jsonStatements";
-import { CommonSquashedSchema, Dialect } from "./schemaValidator";
+import { CommonSquashedSchema } from "./schemaValidator";
+import { SQLiteSchema } from "./serializer/sqliteSchema";
+import { MySqlSchema } from "./serializer/mysqlSchema";
+import { PgSchema } from "./serializer/pgSchema";
 export declare const makePatched: <T extends ZodTypeAny>(schema: T) => z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"added">;
     value: T;
@@ -54,19 +57,19 @@ export declare const makePatched: <T extends ZodTypeAny>(schema: T) => z.ZodUnio
 }>[k_3_2]; } : never>]>;
 export declare const makeSelfOrPatched: <T extends ZodTypeAny>(schema: T) => z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"none">;
-    value: z.ZodOptional<T>;
+    value: T;
 }, "strip", ZodTypeAny, z.objectUtil.addQuestionMarks<{
     type: "none";
-    value: T["_output"] | undefined;
+    value: T["_output"];
 }> extends infer T_1 ? { [k_1 in keyof T_1]: z.objectUtil.addQuestionMarks<{
     type: "none";
-    value: T["_output"] | undefined;
+    value: T["_output"];
 }>[k_1]; } : never, z.objectUtil.addQuestionMarks<{
     type: "none";
-    value: T["_input"] | undefined;
+    value: T["_input"];
 }> extends infer T_2 ? { [k_3 in keyof T_2]: z.objectUtil.addQuestionMarks<{
     type: "none";
-    value: T["_input"] | undefined;
+    value: T["_input"];
 }>[k_3]; } : never>, z.ZodObject<{
     type: z.ZodLiteral<"added">;
     value: T;
@@ -561,13 +564,13 @@ export declare const alteredTableScheme: z.ZodObject<{
     name: z.ZodString;
     schema: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"none">;
-        value: z.ZodOptional<z.ZodString>;
+        value: z.ZodString;
     }, "strip", ZodTypeAny, {
-        value?: string | undefined;
         type: "none";
+        value: string;
     }, {
-        value?: string | undefined;
         type: "none";
+        value: string;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"added">;
         value: z.ZodString;
@@ -1033,8 +1036,8 @@ export declare const alteredTableScheme: z.ZodObject<{
 }, "strict", ZodTypeAny, {
     name: string;
     schema: {
-        value?: string | undefined;
         type: "none";
+        value: string;
     } | {
         type: "added";
         value: string;
@@ -1164,8 +1167,8 @@ export declare const alteredTableScheme: z.ZodObject<{
 }, {
     name: string;
     schema: {
-        value?: string | undefined;
         type: "none";
+        value: string;
     } | {
         type: "added";
         value: string;
@@ -1458,13 +1461,13 @@ export declare const diffResultScheme: z.ZodObject<{
         name: z.ZodString;
         schema: z.ZodUnion<[z.ZodObject<{
             type: z.ZodLiteral<"none">;
-            value: z.ZodOptional<z.ZodString>;
+            value: z.ZodString;
         }, "strip", ZodTypeAny, {
-            value?: string | undefined;
             type: "none";
+            value: string;
         }, {
-            value?: string | undefined;
             type: "none";
+            value: string;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"added">;
             value: z.ZodString;
@@ -1930,8 +1933,8 @@ export declare const diffResultScheme: z.ZodObject<{
     }, "strict", ZodTypeAny, {
         name: string;
         schema: {
-            value?: string | undefined;
             type: "none";
+            value: string;
         } | {
             type: "added";
             value: string;
@@ -2061,8 +2064,8 @@ export declare const diffResultScheme: z.ZodObject<{
     }, {
         name: string;
         schema: {
-            value?: string | undefined;
             type: "none";
+            value: string;
         } | {
             type: "added";
             value: string;
@@ -2269,8 +2272,8 @@ export declare const diffResultScheme: z.ZodObject<{
     alteredTablesWithColumns: {
         name: string;
         schema: {
-            value?: string | undefined;
             type: "none";
+            value: string;
         } | {
             type: "added";
             value: string;
@@ -2457,8 +2460,8 @@ export declare const diffResultScheme: z.ZodObject<{
     alteredTablesWithColumns: {
         name: string;
         schema: {
-            value?: string | undefined;
             type: "none";
+            value: string;
         } | {
             type: "added";
             value: string;
@@ -2644,11 +2647,12 @@ export interface ColumnsResolverOutput<T extends {
     }[];
     deleted: T[];
 }
-export declare const applySnapshotsDiff: (json1: CommonSquashedSchema, json2: CommonSquashedSchema, dialect: Dialect, schemasResolver: (input: TablesResolverInput<{
+export type SchemaFrom<D> = D extends "pg" ? PgSchema : D extends "mysql" ? MySqlSchema : D extends "sqlite" ? SQLiteSchema : undefined;
+export declare const applySnapshotsDiff: <DIALECT extends "mysql" | "pg" | "sqlite" = "mysql" | "pg" | "sqlite">(json1: CommonSquashedSchema, json2: CommonSquashedSchema, dialect: DIALECT, schemasResolver: (input: TablesResolverInput<{
     name: string;
 }>) => Promise<TablesResolverOutput<{
     name: string;
-}>>, tablesResolver: (input: TablesResolverInput<Table>) => Promise<TablesResolverOutput<Table>>, columnsResolver: (input: ColumnsResolverInput<Column>) => Promise<ColumnsResolverOutput<Column>>, prevFull?: any, curFull?: any) => Promise<{
+}>>, tablesResolver: (input: TablesResolverInput<Table>) => Promise<TablesResolverOutput<Table>>, columnsResolver: (input: ColumnsResolverInput<Column>) => Promise<ColumnsResolverOutput<Column>>, prevFull: SchemaFrom<DIALECT>, curFull: SchemaFrom<DIALECT>) => Promise<{
     statements: JsonStatement[];
     sqlStatements: string[];
     _meta: {

package/utils-studio.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1076,15 +1077,26 @@ var require_hanji = __commonJS({
 var import_hanji;
 var init_views = __esm({
   "src/cli/views.ts"() {
+    "use strict";
     init_source();
     import_hanji = __toESM(require_hanji());
   }
 });
 
+// src/global.ts
+var originUUID;
+var init_global = __esm({
+  "src/global.ts"() {
+    "use strict";
+    originUUID = "00000000-0000-0000-0000-000000000000";
+  }
+});
+
 // src/serializer/index.ts
 var glob;
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
+    "use strict";
     glob = __toESM(require("glob"));
     init_source();
     init_views();
@@ -1094,6 +1106,7 @@ var init_serializer = __esm({
 // src/cli/validations/outputs.ts
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
+    "use strict";
     init_source();
   }
 });
@@ -1137,6 +1150,7 @@ function mapSqlToSqliteType(sqlType) {
 var import_drizzle_orm, import_sqlite_core2, dialect, fromDatabase;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
+    "use strict";
     import_drizzle_orm = require("drizzle-orm");
     import_sqlite_core2 = require("drizzle-orm/sqlite-core");
     init_serializer();
@@ -1555,6 +1569,7 @@ var require_brace_expansion = __commonJS({
 var import_pg_core2, import_pg_core3, import_drizzle_orm2, dialect2, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
+    "use strict";
     import_pg_core2 = require("drizzle-orm/pg-core");
     import_pg_core3 = require("drizzle-orm/pg-core");
     import_drizzle_orm2 = require("drizzle-orm");
@@ -1571,7 +1586,7 @@ var init_pgSerializer = __esm({
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = (table) => true, schemaFilters, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, progressCallback) => {
       const result = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `table_schema = '${t}'`).join(" or ");
@@ -1898,7 +1913,7 @@ var init_pgSerializer = __esm({
       }
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
-        version: "5",
+        version: "6",
         dialect: "pg",
         tables: result,
         enums: enumsToReturn,
@@ -1974,6 +1989,7 @@ var init_pgSerializer = __esm({
 var import_drizzle_orm4, DrizzleDbClient, DrizzleORMPgClient, TursoSqlite;
 var init_drivers = __esm({
   "src/drivers/index.ts"() {
+    "use strict";
     import_drizzle_orm4 = require("drizzle-orm");
     DrizzleDbClient = class {
       constructor(db) {
@@ -2166,11 +2182,7 @@ var sqliteSchemaToDrizzle = (schema) => {
 
 // src/cli/commands/sqliteIntrospect.ts
 init_views();
-
-// src/global.ts
-var originUUID = "00000000-0000-0000-0000-000000000000";
-
-// src/cli/commands/sqliteIntrospect.ts
+init_global();
 init_sqliteSerializer();
 
 // node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
@@ -2272,7 +2284,7 @@ String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
 String.prototype.concatIf = function(it, condition) {
-  return condition ? `${this}${it}` : this;
+  return condition ? `${this}${it}` : String(this);
 };
 Array.prototype.random = function() {
   return this[~~(Math.random() * this.length)];
@@ -3356,6 +3368,7 @@ 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

@@ -1078,15 +1078,26 @@ var require_hanji = __commonJS({
 var import_hanji;
 var init_views = __esm({
   "src/cli/views.ts"() {
+    "use strict";
     init_source();
     import_hanji = __toESM(require_hanji());
   }
 });
 
+// src/global.ts
+var originUUID;
+var init_global = __esm({
+  "src/global.ts"() {
+    "use strict";
+    originUUID = "00000000-0000-0000-0000-000000000000";
+  }
+});
+
 // src/serializer/index.ts
 import * as glob from "glob";
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
+    "use strict";
     init_source();
     init_views();
   }
@@ -1095,6 +1106,7 @@ var init_serializer = __esm({
 // src/cli/validations/outputs.ts
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
+    "use strict";
     init_source();
   }
 });
@@ -1145,6 +1157,7 @@ function mapSqlToSqliteType(sqlType) {
 var dialect, fromDatabase;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
+    "use strict";
     init_serializer();
     init_outputs();
     init_source();
@@ -1567,6 +1580,7 @@ import { is as is2, SQL as SQL2, getTableName as getTableName2 } from "drizzle-o
 var dialect2, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
+    "use strict";
     init_serializer();
     init_source();
     init_outputs();
@@ -1580,7 +1594,7 @@ var init_pgSerializer = __esm({
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = (table) => true, schemaFilters, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, progressCallback) => {
       const result = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `table_schema = '${t}'`).join(" or ");
@@ -1907,7 +1921,7 @@ var init_pgSerializer = __esm({
       }
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
-        version: "5",
+        version: "6",
         dialect: "pg",
         tables: result,
         enums: enumsToReturn,
@@ -1984,6 +1998,7 @@ import { sql } from "drizzle-orm";
 var DrizzleDbClient, DrizzleORMPgClient, TursoSqlite;
 var init_drivers = __esm({
   "src/drivers/index.ts"() {
+    "use strict";
     DrizzleDbClient = class {
       constructor(db) {
         this.db = db;
@@ -2200,11 +2215,7 @@ var sqliteSchemaToDrizzle = (schema) => {
 
 // src/cli/commands/sqliteIntrospect.ts
 init_views();
-
-// src/global.ts
-var originUUID = "00000000-0000-0000-0000-000000000000";
-
-// src/cli/commands/sqliteIntrospect.ts
+init_global();
 init_sqliteSerializer();
 
 // node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
@@ -2306,7 +2317,7 @@ String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
 String.prototype.concatIf = function(it, condition) {
-  return condition ? `${this}${it}` : this;
+  return condition ? `${this}${it}` : String(this);
 };
 Array.prototype.random = function() {
   return this[~~(Math.random() * this.length)];
@@ -3395,6 +3406,7 @@ 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.d.ts

@@ -1,9 +1,6 @@
-import { Dialect } from "./schemaValidator";
+import type { Dialect } from "./schemaValidator";
 import { NamedWithSchema } from "./cli/commands/migrate";
-import { PgDatabase } from "drizzle-orm/pg-core";
-import { PgSchema as PgSchemaKit } from "./serializer/pgSchema";
-import { DbConnection } from ".";
-export declare const assertV1OutFolder: (out: string, dialect: Dialect | "{dialect}") => void;
+export declare const assertV1OutFolder: (out: string) => void;
 export type Journal = {
     version: string;
     dialect: Dialect;
@@ -22,7 +19,6 @@ export declare const prepareOutFolder: (out: string, dialect: Dialect) => {
     snapshots: string[];
     journal: any;
 };
-export declare const mapValues: <IN, OUT>(obj: Record<string, IN>, map: (input: IN) => OUT) => Record<string, OUT>;
 export declare const validateWithReport: (snapshots: string[], dialect: Dialect) => {
     malformed: string[];
     nonLatest: string[];
@@ -54,9 +50,9 @@ export declare const prepareMigrationMeta: (schemas: {
         column: string;
     };
 }[]) => {
-    schemas: {};
-    tables: {};
-    columns: {};
+    schemas: Record<string, string>;
+    tables: Record<string, string>;
+    columns: Record<string, string>;
 };
 export declare const schemaRenameKey: (it: string) => string;
 export declare const tableRenameKey: (it: NamedWithSchema) => string;
@@ -77,10 +73,6 @@ export declare const statementsForDiffs: (in1: any, in2: any) => Promise<{
                 } | undefined>;
             } | undefined>;
         } | undefined;
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -119,6 +111,10 @@ export declare const statementsForDiffs: (in1: any, in2: any) => Promise<{
                 nullsNotDistinct: boolean;
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "pg";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -140,10 +136,6 @@ export declare const statementsForDiffs: (in1: any, in2: any) => Promise<{
                 } | undefined>;
             } | undefined>;
         } | undefined;
-        id: string;
-        prevId: string;
-        version: "5";
-        dialect: "pg";
         tables: Record<string, {
             name: string;
             columns: Record<string, {
@@ -182,6 +174,10 @@ export declare const statementsForDiffs: (in1: any, in2: any) => Promise<{
                 nullsNotDistinct: boolean;
             }>;
         }>;
+        id: string;
+        prevId: string;
+        version: "6";
+        dialect: "pg";
         schemas: Record<string, string>;
         _meta: {
             columns: Record<string, string>;
@@ -201,13 +197,3 @@ export declare const statementsForDiffs: (in1: any, in2: any) => Promise<{
         columns: {};
     } | undefined;
 }>;
-export type DrizzleSnapshotJSON = PgSchemaKit;
-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 prepareFrom: (connection: DbConnection) => Promise<Record<string, any>>;