drizzle-kit 0.20.17-4e262b7 → 0.20.17-7776aba

package/jsonDiffer.d.ts

@@ -1,16 +1,25 @@
 export function diffForRenamedTables(pairs: any): any;
 export function diffForRenamedColumn(t1: any, t2: any): any;
-export function diffSchemasOrTables(left: any, right: any): {
-    added: any[];
-    deleted: any[];
-};
-export function diffColumns(left: any, right: any): {
-    [k: string]: any;
-};
 export function applyJsonDiff(json1: any, json2: any): {
+    addedTables?: undefined;
+    deletedTables?: undefined;
+    alteredTablesWithColumns?: undefined;
+    addedEnums?: undefined;
+    deletedEnums?: undefined;
+    alteredEnums?: undefined;
+    addedSchemas?: undefined;
+    deletedSchemas?: undefined;
+} | {
+    addedTables: any[];
+    deletedTables: any[];
     alteredTablesWithColumns: {
         name: any;
-        schema: any;
+        schema: {
+            type: string;
+            value: any;
+        };
+        deleted: any[];
+        added: any[];
         altered: any[];
         addedIndexes: {
             [k: string]: any;
@@ -49,13 +58,19 @@ export function applyJsonDiff(json1: any, json2: any): {
             [k: string]: any;
         };
     }[];
-    alteredEnums: {
+    addedEnums: {
         name: any;
-        schema: any;
-        addedValues: {
-            before: any;
-            value: any;
-        }[];
+        values: any[];
+    }[];
+    deletedEnums: {
+        name: any;
+        values: any[];
+    }[];
+    alteredEnums: {
+        name: string;
+        addedValues: any[];
         deletedValues: any[];
     }[];
+    addedSchemas: any[];
+    deletedSchemas: any[];
 };

package/jsonStatements.d.ts

@@ -1,4 +1,4 @@
-import { CommonSquashedSchema } from "./schemaValidator";
+import { CommonSquashedSchema, Dialect } from "./schemaValidator";
 import { MySqlSchema } from "./serializer/mysqlSchema";
 import { PgSchema } from "./serializer/pgSchema";
 import { AlteredColumn, Column, Table } from "./snapshotsDiffer";
@@ -34,32 +34,12 @@ export interface JsonRenameTableStatement {
 export interface JsonCreateEnumStatement {
     type: "create_type_enum";
     name: string;
-    schema: string;
     values: string[];
 }
-export interface JsonDropEnumStatement {
-    type: "drop_type_enum";
-    name: string;
-    schema: string;
-}
-export interface JsonMoveEnumStatement {
-    type: "move_type_enum";
-    name: string;
-    schemaFrom: string;
-    schemaTo: string;
-}
-export interface JsonRenameEnumStatement {
-    type: "rename_type_enum";
-    nameFrom: string;
-    nameTo: string;
-    schema: string;
-}
 export interface JsonAddValueToEnumStatement {
     type: "alter_type_add_value";
     name: string;
-    schema: string;
     value: string;
-    before: string;
 }
 export interface JsonDropColumnStatement {
     type: "alter_table_drop_column";
@@ -140,8 +120,7 @@ export interface JsonAlterCompositePK {
 export interface JsonAlterTableSetSchema {
     type: "alter_table_set_schema";
     tableName: string;
-    schemaFrom: string;
-    schemaTo: string;
+    schema: string;
 }
 export interface JsonAlterTableRemoveFromSchema {
     type: "alter_table_remove_from_schema";
@@ -313,20 +292,14 @@ export interface JsonRenameSchema {
     to: string;
 }
 export type JsonAlterColumnStatement = JsonRenameColumnStatement | JsonAlterColumnTypeStatement | JsonAlterColumnSetDefaultStatement | JsonAlterColumnDropDefaultStatement | JsonAlterColumnSetNotNullStatement | JsonAlterColumnDropNotNullStatement | JsonAlterColumnDropOnUpdateStatement | JsonAlterColumnSetOnUpdateStatement | JsonAlterColumnDropAutoincrementStatement | JsonAlterColumnSetAutoincrementStatement | JsonAlterColumnSetPrimaryKeyStatement | JsonAlterColumnDropPrimaryKeyStatement;
-export type JsonStatement = JsonAlterColumnStatement | JsonCreateTableStatement | JsonDropTableStatement | JsonRenameTableStatement | JsonCreateEnumStatement | JsonDropEnumStatement | JsonMoveEnumStatement | JsonRenameEnumStatement | JsonAddValueToEnumStatement | JsonDropColumnStatement | JsonAddColumnStatement | JsonCreateIndexStatement | JsonCreateReferenceStatement | JsonAlterReferenceStatement | JsonDeleteReferenceStatement | JsonDropIndexStatement | JsonReferenceStatement | JsonSqliteCreateTableStatement | JsonSqliteAddColumnStatement | JsonCreateCompositePK | JsonDeleteCompositePK | JsonAlterCompositePK | JsonCreateUniqueConstraint | JsonDeleteUniqueConstraint | JsonAlterUniqueConstraint | JsonCreateSchema | JsonDropSchema | JsonRenameSchema | JsonAlterTableSetSchema | JsonAlterTableRemoveFromSchema | JsonAlterTableSetNewSchema;
+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: MySqlSchema) => JsonCreateTableStatement;
+export declare const prepareMySqlCreateTableJson: (table: Table, json2: PgSchema) => JsonCreateTableStatement;
 export declare const prepareSQLiteCreateTable: (table: Table) => JsonSqliteCreateTableStatement;
 export declare const prepareDropTableJson: (table: Table) => JsonDropTableStatement;
 export declare const prepareRenameTableJson: (tableFrom: Table, tableTo: Table) => JsonRenameTableStatement;
-export declare const prepareCreateEnumJson: (name: string, schema: string, values: string[]) => JsonCreateEnumStatement;
-export declare const prepareAddValuesToEnumJson: (name: string, schema: string, values: {
-    value: string;
-    before: string;
-}[]) => JsonAddValueToEnumStatement[];
-export declare const prepareDropEnumJson: (name: string, schema: string) => JsonDropEnumStatement;
-export declare const prepareMoveEnumJson: (name: string, schemaFrom: string, schemaTo: string) => JsonMoveEnumStatement;
-export declare const prepareRenameEnumJson: (nameFrom: string, nameTo: string, schema: string) => JsonRenameEnumStatement;
+export declare const prepareCreateEnumJson: (name: string, values: string[]) => JsonCreateEnumStatement;
+export declare const prepareAddValuesToEnumJson: (name: string, values: string[]) => JsonAddValueToEnumStatement[];
 export declare const prepareCreateSchemasJson: (values: string[]) => JsonCreateSchema[];
 export declare const prepareRenameSchemasJson: (values: {
     from: string;
@@ -337,11 +310,11 @@ export declare const prepareRenameColumns: (tableName: string, schema: string, p
     from: Column;
     to: Column;
 }[]) => JsonRenameColumnStatement[];
-export declare const _prepareDropColumns: (taleName: string, schema: string, columns: Column[]) => JsonDropColumnStatement[];
-export declare const _prepareAddColumns: (tableName: string, schema: string, columns: Column[]) => JsonAddColumnStatement[];
-export declare const prepareAlterColumnsMysql: (tableName: string, schema: string, columns: AlteredColumn[], json2: CommonSquashedSchema) => JsonAlterColumnStatement[];
-export declare const preparePgAlterColumns: (_tableName: string, schema: string, columns: AlteredColumn[], json2: CommonSquashedSchema) => JsonAlterColumnStatement[];
-export declare const prepareSqliteAlterColumns: (tableName: string, schema: string, columns: AlteredColumn[], json2: CommonSquashedSchema) => JsonAlterColumnStatement[];
+export declare const prepareAlterTableColumnsJson: (tableName: string, schema: string, deleted: Column[], added: Column[], altered: AlteredColumn[], addedFk: Record<string, string>, json2: CommonSquashedSchema, dialect?: Dialect) => {
+    addColumns: JsonStatement[];
+    dropColumns: JsonDropColumnStatement[];
+    alterColumns: JsonAlterColumnStatement[];
+};
 export declare const prepareCreateIndexesJson: (tableName: string, schema: string, indexes: Record<string, string>) => JsonCreateIndexStatement[];
 export declare const prepareCreateReferencesJson: (tableName: string, schema: string, foreignKeys: Record<string, string>) => JsonCreateReferenceStatement[];
 export declare const prepareDropReferencesJson: (tableName: string, schema: string, foreignKeys: Record<string, string>) => JsonDeleteReferenceStatement[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.17-4e262b7",
+  "version": "0.20.17-7776aba",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -8,20 +8,55 @@
     "drizzle-kit": "./bin.cjs"
   },
   "scripts": {
+    "test:pg:push": "drizzle-kit push:pg",
     "payload": "tsx ./dev/payload.ts",
     "migrate:old": "drizzle-kit generate:mysql",
-    "cli": "tsx ./src/cli/index.ts",
-    "test": "vitest",
-    "mts": "cp dist/index.d.ts dist/index.d.mts && cp dist/utils-studio.d.ts dist/utils-studio.d.mts && cp dist/payload.d.ts dist/payload.d.mts",
+    "push": "node -r esbuild-register ./src/cli/index.ts push:mysql",
+    "push:sqlite": "node -r ./src/loader.mjs ./src/cli/index.ts push:sqlite",
+    "try1": "tsx ./src/t.ts",
+    "migrate:old:mysql": "drizzle-kit generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
+    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg",
+    "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite",
+    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql",
+    "check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
+    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --config drizzle.config2.ts",
+    "introspect:sqlite": "node -r esbuild-register ./src/cli/index.ts introspect:sqlite --driver=sqlite",
+    "introspect:pg": "node -r esbuild-register ./src/cli/index.ts introspect:pg --out ./dev/introspect-pg --connectionString=postgresql://postgres@localhost:5432/introspect",
+    "drop": "node -r esbuild-register ./src/cli/index.ts drop",
+    "up:pg": "node -r esbuild-register ./src/cli/index.ts up:pg --out ./dev/migrations-pg",
+    "up:mysql": "node -r esbuild-register ./src/cli/index.ts up:mysql --out ./dev/migrations-mysql",
+    "check:equedi": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/equedi --dialect pg",
+    "run": "node -r esbuild-register index.ts",
+    "watch": "esbuild ./src/clie/index.ts --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --external:pg-native --sourcemap --watch",
+    "diff": "esbuild ./src/clie/index.ts ./dev/diff.ts",
+    "prepare:mysql": "node -r esbuild-register dev/mysql/index.ts",
+    "prepare:pg": "node -r esbuild-register dev/index.ts",
+    "prepare-snapshot": "node -r esbuild-register ./dev/prepare-snapshot prepare ./dev/data",
+    "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 && tsc -p tsconfig.cli-types.json && pnpm mts && tsx build.ts",
+    "mts": "cp dist/index.d.ts dist/index.d.mts && cp dist/utils-studio.d.ts dist/utils-studio.d.mts && cp dist/payload.d.ts dist/payload.d.mts",
     "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"
+    "pub": "cp package.json readme.md dist/ && cd dist && npm publish",
+    "studio": "tsx ./src/cli/index.ts studio --verbose --port=3000",
+    "studio:dev": "tsx ./src/cli/index.ts studio --verbose"
+  },
+  "ava": {
+    "files": [
+      "test/**/*.ts"
+    ],
+    "extensions": {
+      "ts": "module"
+    },
+    "nodeArguments": [
+      "--loader=tsx"
+    ]
   },
   "dependencies": {
     "@esbuild-kit/esm-loader": "^2.5.5",
-    "@types/json-diff": "^1.0.3",
     "@hono/node-server": "^1.9.0",
     "@hono/zod-validator": "^0.2.0",
     "camelcase": "^7.0.1",
@@ -35,47 +70,40 @@
     "hono": "^4.1.4",
     "json-diff": "0.9.0",
     "minimatch": "^7.4.3",
-    "pluralize": "^8.0.0",
     "semver": "^7.5.4",
     "superjson": "^2.2.1",
     "zod": "^3.20.2"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",
-    "@electric-sql/pglite": "^0.1.3",
     "@libsql/client": "^0.4.2",
-    "@originjs/vite-plugin-commonjs": "^1.0.3",
     "@types/better-sqlite3": "^7.6.4",
-    "@types/dockerode": "^3.3.28",
+    "@types/dockerode": "^3.3.14",
     "@types/glob": "^8.1.0",
     "@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",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
-    "dockerode": "^3.3.4",
-    "dotenv": "^16.0.3",
-    "drizzle-orm": "0.30.5-ab9feb7",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
     "ava": "^5.1.0",
     "better-sqlite3": "^9.4.3",
+    "dockerode": "^3.3.4",
+    "dotenv": "^16.0.3",
     "drizzle-kit": "0.20.14",
+    "drizzle-orm": "0.30.5",
     "esbuild-node-externals": "^1.9.0",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "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.11.3",
     "postgres": "^3.3.5",
     "prettier": "^2.8.1",
     "tsx": "^3.12.1",
-    "typescript": "^5.4.3",
-    "uuid": "^9.0.1",
-    "vite-tsconfig-paths": "^4.3.2",
-    "vitest": "^1.4.0",
+    "typescript": "^4.9.4",
+    "uvu": "^0.5.6",
     "wrangler": "^3.22.1",
     "zx": "^7.2.2"
   },

package/payload.d.mts

@@ -2,14 +2,14 @@ import { PgDatabase } from "drizzle-orm/pg-core";
 import { PgSchema as PgSchemaKit } from "./serializer/pgSchema";
 import { SQLiteSchema as SQLiteSchemaKit } from "./serializer/sqliteSchema";
 import { MySqlSchema as MySQLSchemaKit } from "./serializer/mysqlSchema";
-import type { MySql2Database } from "drizzle-orm/mysql2";
-import type { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
+import { MySql2Database } from "drizzle-orm/mysql2";
+import { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
 export type DrizzleSnapshotJSON = PgSchemaKit;
 export type DrizzleSQLiteSnapshotJSON = SQLiteSchemaKit;
 export type DrizzleMySQLSnapshotJSON = MySQLSchemaKit;
 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>, drizzleInstance: PgDatabase<any>) => Promise<{
+export declare const pushSchema: (imports: Record<string, unknown>, db: PgDatabase<any>) => Promise<{
     hasDataLoss: boolean;
     warnings: string[];
     statementsToExecute: string[];
@@ -17,7 +17,7 @@ export declare const pushSchema: (imports: Record<string, unknown>, drizzleInsta
 }>;
 export declare const generateSQLiteDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => Promise<SQLiteSchemaKit>;
 export declare const generateSQLiteMigration: (prev: DrizzleSQLiteSnapshotJSON, cur: DrizzleSQLiteSnapshotJSON) => Promise<string[]>;
-export declare const pushSQLiteSchema: (imports: Record<string, unknown>, drizzleInstance: BetterSQLite3Database<any>) => Promise<{
+export declare const pushSQLiteSchema: (imports: Record<string, unknown>, db: BetterSQLite3Database<any>) => Promise<{
     hasDataLoss: boolean;
     warnings: string[];
     statementsToExecute: string[];
@@ -25,7 +25,7 @@ export declare const pushSQLiteSchema: (imports: Record<string, unknown>, drizzl
 }>;
 export declare const generateMySQLDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => Promise<MySQLSchemaKit>;
 export declare const generateMySQLMigration: (prev: DrizzleMySQLSnapshotJSON, cur: DrizzleMySQLSnapshotJSON) => Promise<string[]>;
-export declare const pushMySQLSchema: (imports: Record<string, unknown>, drizzleInstance: MySql2Database<any>, databaseName: string) => Promise<{
+export declare const pushMySQLSchema: (imports: Record<string, unknown>, db: MySql2Database<any>, databaseName: string) => Promise<{
     hasDataLoss: boolean;
     warnings: string[];
     statementsToExecute: string[];

package/payload.d.ts

@@ -2,14 +2,14 @@ import { PgDatabase } from "drizzle-orm/pg-core";
 import { PgSchema as PgSchemaKit } from "./serializer/pgSchema";
 import { SQLiteSchema as SQLiteSchemaKit } from "./serializer/sqliteSchema";
 import { MySqlSchema as MySQLSchemaKit } from "./serializer/mysqlSchema";
-import type { MySql2Database } from "drizzle-orm/mysql2";
-import type { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
+import { MySql2Database } from "drizzle-orm/mysql2";
+import { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
 export type DrizzleSnapshotJSON = PgSchemaKit;
 export type DrizzleSQLiteSnapshotJSON = SQLiteSchemaKit;
 export type DrizzleMySQLSnapshotJSON = MySQLSchemaKit;
 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>, drizzleInstance: PgDatabase<any>) => Promise<{
+export declare const pushSchema: (imports: Record<string, unknown>, db: PgDatabase<any>) => Promise<{
     hasDataLoss: boolean;
     warnings: string[];
     statementsToExecute: string[];
@@ -17,7 +17,7 @@ export declare const pushSchema: (imports: Record<string, unknown>, drizzleInsta
 }>;
 export declare const generateSQLiteDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => Promise<SQLiteSchemaKit>;
 export declare const generateSQLiteMigration: (prev: DrizzleSQLiteSnapshotJSON, cur: DrizzleSQLiteSnapshotJSON) => Promise<string[]>;
-export declare const pushSQLiteSchema: (imports: Record<string, unknown>, drizzleInstance: BetterSQLite3Database<any>) => Promise<{
+export declare const pushSQLiteSchema: (imports: Record<string, unknown>, db: BetterSQLite3Database<any>) => Promise<{
     hasDataLoss: boolean;
     warnings: string[];
     statementsToExecute: string[];
@@ -25,7 +25,7 @@ export declare const pushSQLiteSchema: (imports: Record<string, unknown>, drizzl
 }>;
 export declare const generateMySQLDrizzleJson: (imports: Record<string, unknown>, prevId?: string) => Promise<MySQLSchemaKit>;
 export declare const generateMySQLMigration: (prev: DrizzleMySQLSnapshotJSON, cur: DrizzleMySQLSnapshotJSON) => Promise<string[]>;
-export declare const pushMySQLSchema: (imports: Record<string, unknown>, drizzleInstance: MySql2Database<any>, databaseName: string) => Promise<{
+export declare const pushMySQLSchema: (imports: Record<string, unknown>, db: MySql2Database<any>, databaseName: string) => Promise<{
     hasDataLoss: boolean;
     warnings: string[];
     statementsToExecute: string[];