drizzle-kit 0.20.18-d190692 → 0.20.18

package/jsonStatements.d.ts

@@ -0,0 +1,349 @@
+import { CommonSquashedSchema, Dialect } from "./schemaValidator";
+import { MySqlSchema } from "./serializer/mysqlSchema";
+import { PgSchema } from "./serializer/pgSchema";
+import { AlteredColumn, Column, Table } from "./snapshotsDiffer";
+export interface JsonSqliteCreateTableStatement {
+    type: "sqlite_create_table";
+    tableName: string;
+    columns: Column[];
+    referenceData: string[];
+    compositePKs: string[][];
+    uniqueConstraints?: string[];
+}
+export interface JsonCreateTableStatement {
+    type: "create_table";
+    tableName: string;
+    schema: string;
+    columns: Column[];
+    compositePKs: string[];
+    compositePkName?: string;
+    uniqueConstraints?: string[];
+}
+export interface JsonDropTableStatement {
+    type: "drop_table";
+    tableName: string;
+    schema: string;
+}
+export interface JsonRenameTableStatement {
+    type: "rename_table";
+    fromSchema: string;
+    toSchema: string;
+    tableNameFrom: string;
+    tableNameTo: string;
+}
+export interface JsonCreateEnumStatement {
+    type: "create_type_enum";
+    name: string;
+    values: string[];
+}
+export interface JsonAddValueToEnumStatement {
+    type: "alter_type_add_value";
+    name: string;
+    value: string;
+}
+export interface JsonDropColumnStatement {
+    type: "alter_table_drop_column";
+    tableName: string;
+    columnName: string;
+    schema: string;
+}
+export interface JsonAddColumnStatement {
+    type: "alter_table_add_column";
+    tableName: string;
+    column: Column;
+    schema: string;
+}
+export interface JsonSqliteAddColumnStatement {
+    type: "sqlite_alter_table_add_column";
+    tableName: string;
+    column: Column;
+    referenceData?: string;
+}
+export interface JsonCreateIndexStatement {
+    type: "create_index";
+    tableName: string;
+    data: string;
+    schema: string;
+}
+export interface JsonReferenceStatement {
+    type: "create_reference" | "alter_reference" | "delete_reference";
+    data: string;
+    schema: string;
+    tableName: string;
+}
+export interface JsonCreateUniqueConstraint {
+    type: "create_unique_constraint";
+    tableName: string;
+    data: string;
+    schema?: string;
+    constraintName?: string;
+}
+export interface JsonDeleteUniqueConstraint {
+    type: "delete_unique_constraint";
+    tableName: string;
+    data: string;
+    schema?: string;
+    constraintName?: string;
+}
+export interface JsonAlterUniqueConstraint {
+    type: "alter_unique_constraint";
+    tableName: string;
+    old: string;
+    new: string;
+    schema?: string;
+    oldConstraintName?: string;
+    newConstraintName?: string;
+}
+export interface JsonCreateCompositePK {
+    type: "create_composite_pk";
+    tableName: string;
+    data: string;
+    schema?: string;
+    constraintName?: string;
+}
+export interface JsonDeleteCompositePK {
+    type: "delete_composite_pk";
+    tableName: string;
+    data: string;
+    schema?: string;
+    constraintName?: string;
+}
+export interface JsonAlterCompositePK {
+    type: "alter_composite_pk";
+    tableName: string;
+    old: string;
+    new: string;
+    schema?: string;
+    oldConstraintName?: string;
+    newConstraintName?: string;
+}
+export interface JsonAlterTableSetSchema {
+    type: "alter_table_set_schema";
+    tableName: string;
+    schema: string;
+}
+export interface JsonAlterTableRemoveFromSchema {
+    type: "alter_table_remove_from_schema";
+    tableName: string;
+    schema: string;
+}
+export interface JsonAlterTableSetNewSchema {
+    type: "alter_table_set_new_schema";
+    tableName: string;
+    from: string;
+    to: string;
+}
+export interface JsonCreateReferenceStatement extends JsonReferenceStatement {
+    type: "create_reference";
+}
+export interface JsonAlterReferenceStatement extends JsonReferenceStatement {
+    type: "alter_reference";
+    oldFkey: string;
+}
+export interface JsonDeleteReferenceStatement extends JsonReferenceStatement {
+    type: "delete_reference";
+}
+export interface JsonDropIndexStatement {
+    type: "drop_index";
+    tableName: string;
+    data: string;
+    schema: string;
+}
+export interface JsonRenameColumnStatement {
+    type: "alter_table_rename_column";
+    tableName: string;
+    oldColumnName: string;
+    newColumnName: string;
+    schema: string;
+}
+export interface JsonAlterColumnTypeStatement {
+    type: "alter_table_alter_column_set_type";
+    tableName: string;
+    columnName: string;
+    newDataType: string;
+    oldDataType: string;
+    schema: string;
+    columnDefault: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonAlterColumnSetPrimaryKeyStatement {
+    type: "alter_table_alter_column_set_pk";
+    tableName: string;
+    schema: string;
+    columnName: string;
+}
+export interface JsonAlterColumnDropPrimaryKeyStatement {
+    type: "alter_table_alter_column_drop_pk";
+    tableName: string;
+    columnName: string;
+    schema: string;
+}
+export interface JsonAlterColumnSetDefaultStatement {
+    type: "alter_table_alter_column_set_default";
+    tableName: string;
+    columnName: string;
+    newDefaultValue: any;
+    oldDefaultValue?: any;
+    schema: string;
+    newDataType: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonAlterColumnDropDefaultStatement {
+    type: "alter_table_alter_column_drop_default";
+    tableName: string;
+    columnName: string;
+    schema: string;
+    newDataType: string;
+    columnDefault: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonAlterColumnSetNotNullStatement {
+    type: "alter_table_alter_column_set_notnull";
+    tableName: string;
+    columnName: string;
+    schema: string;
+    newDataType: string;
+    columnDefault: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonAlterColumnDropNotNullStatement {
+    type: "alter_table_alter_column_drop_notnull";
+    tableName: string;
+    columnName: string;
+    schema: string;
+    newDataType: string;
+    columnDefault: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonAlterColumnSetOnUpdateStatement {
+    type: "alter_table_alter_column_set_on_update";
+    tableName: string;
+    columnName: string;
+    schema: string;
+    newDataType: string;
+    columnDefault: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonAlterColumnDropOnUpdateStatement {
+    type: "alter_table_alter_column_drop_on_update";
+    tableName: string;
+    columnName: string;
+    schema: string;
+    newDataType: string;
+    columnDefault: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonAlterColumnSetAutoincrementStatement {
+    type: "alter_table_alter_column_set_autoincrement";
+    tableName: string;
+    columnName: string;
+    schema: string;
+    newDataType: string;
+    columnDefault: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonAlterColumnDropAutoincrementStatement {
+    type: "alter_table_alter_column_drop_autoincrement";
+    tableName: string;
+    columnName: string;
+    schema: string;
+    newDataType: string;
+    columnDefault: string;
+    columnOnUpdate: boolean;
+    columnNotNull: boolean;
+    columnAutoIncrement: boolean;
+    columnPk: boolean;
+}
+export interface JsonCreateSchema {
+    type: "create_schema";
+    name: string;
+}
+export interface JsonDropSchema {
+    type: "drop_schema";
+    name: string;
+}
+export interface JsonRenameSchema {
+    type: "rename_schema";
+    from: string;
+    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 | 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 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, 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;
+    to: string;
+}[]) => JsonRenameSchema[];
+export declare const prepareDeleteSchemasJson: (values: string[]) => JsonDropSchema[];
+export declare const prepareRenameColumns: (tableName: string, schema: string, pairs: {
+    from: Column;
+    to: Column;
+}[]) => JsonRenameColumnStatement[];
+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[];
+export declare const prepareAlterReferencesJson: (tableName: string, schema: string, foreignKeys: Record<string, {
+    __old: string;
+    __new: string;
+}>) => JsonReferenceStatement[];
+export declare const prepareDropIndexesJson: (tableName: string, schema: string, indexes: Record<string, string>) => JsonDropIndexStatement[];
+export declare const prepareAddCompositePrimaryKeySqlite: (tableName: string, pks: Record<string, string>) => JsonCreateCompositePK[];
+export declare const prepareDeleteCompositePrimaryKeySqlite: (tableName: string, pks: Record<string, string>) => JsonDeleteCompositePK[];
+export declare const prepareAlterCompositePrimaryKeySqlite: (tableName: string, pks: Record<string, {
+    __old: string;
+    __new: string;
+}>) => JsonAlterCompositePK[];
+export declare const prepareAddCompositePrimaryKeyPg: (tableName: string, schema: string, pks: Record<string, string>, json2: PgSchema) => JsonCreateCompositePK[];
+export declare const prepareDeleteCompositePrimaryKeyPg: (tableName: string, schema: string, pks: Record<string, string>, json1: PgSchema) => JsonDeleteCompositePK[];
+export declare const prepareAlterCompositePrimaryKeyPg: (tableName: string, schema: string, pks: Record<string, {
+    __old: string;
+    __new: string;
+}>, json1: PgSchema, json2: PgSchema) => JsonAlterCompositePK[];
+export declare const prepareAddUniqueConstraintPg: (tableName: string, schema: string, unqs: Record<string, string>) => JsonCreateUniqueConstraint[];
+export declare const prepareDeleteUniqueConstraintPg: (tableName: string, schema: string, unqs: Record<string, string>) => JsonDeleteUniqueConstraint[];
+export declare const prepareAlterUniqueConstraintPg: (tableName: string, schema: string, unqs: Record<string, {
+    __old: string;
+    __new: string;
+}>) => JsonAlterUniqueConstraint[];
+export declare const prepareAddCompositePrimaryKeyMySql: (tableName: string, pks: Record<string, string>, json1: MySqlSchema, json2: MySqlSchema) => JsonCreateCompositePK[];
+export declare const prepareDeleteCompositePrimaryKeyMySql: (tableName: string, pks: Record<string, string>, json1: MySqlSchema) => JsonDeleteCompositePK[];
+export declare const prepareAlterCompositePrimaryKeyMySql: (tableName: string, pks: Record<string, {
+    __old: string;
+    __new: string;
+}>, json1: MySqlSchema, json2: MySqlSchema) => JsonAlterCompositePK[];

package/migrationPreparator.d.ts

@@ -0,0 +1,35 @@
+import { PgSchema, PgSchemaInternal } from "./serializer/pgSchema";
+import { SQLiteSchema } from "./serializer/sqliteSchema";
+import { MySqlSchema } from "./serializer/mysqlSchema";
+export declare const prepareMySqlDbPushSnapshot: (prev: MySqlSchema, schemaPath: string | string[]) => Promise<{
+    prev: MySqlSchema;
+    cur: MySqlSchema;
+}>;
+export declare const prepareSQLiteDbPushSnapshot: (prev: SQLiteSchema, schemaPath: string | string[]) => Promise<{
+    prev: SQLiteSchema;
+    cur: SQLiteSchema;
+}>;
+export declare const preparePgDbPushSnapshot: (prev: PgSchema, schemaPath: string | string[], schemaFilter?: string[]) => Promise<{
+    prev: PgSchema;
+    cur: PgSchema;
+}>;
+export declare const prepareMySqlMigrationSnapshot: (migrationFolders: string[], schemaPath: string | string[]) => Promise<{
+    prev: MySqlSchema;
+    cur: MySqlSchema;
+    custom: MySqlSchema;
+}>;
+export declare const prepareSqliteMigrationSnapshot: (snapshots: string[], schemaPath: string | string[]) => Promise<{
+    prev: SQLiteSchema;
+    cur: SQLiteSchema;
+    custom: SQLiteSchema;
+}>;
+export declare const fillPgSnapshot: ({ serialized, id, idPrev, }: {
+    serialized: PgSchemaInternal;
+    id: string;
+    idPrev: string;
+}) => PgSchema;
+export declare const preparePgMigrationSnapshot: (snapshots: string[], schemaPath: string | string[]) => Promise<{
+    prev: PgSchema;
+    cur: PgSchema;
+    custom: PgSchema;
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.18-d190692",
+  "version": "0.20.18",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -8,21 +8,57 @@
     "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",
-    "build": "rm -rf ./dist && tsx build.ts && cp package.json dist/ && attw --pack dist",
+    "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",
     "@hono/node-server": "^1.9.0",
     "@hono/zod-validator": "^0.2.0",
-    "@types/json-diff": "^1.0.3",
     "camelcase": "^7.0.1",
     "chalk": "^5.2.0",
     "commander": "^9.4.1",
@@ -34,55 +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",
-    "ws": "^8.16.0",
     "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.15.3",
-    "@aws-sdk/client-rds-data": "^3.556.0",
     "@cloudflare/workers-types": "^4.20230518.0",
-    "@electric-sql/pglite": "^0.1.3",
     "@libsql/client": "^0.4.2",
-    "@neondatabase/serverless": "^0.9.1",
-    "@originjs/vite-plugin-commonjs": "^1.0.3",
-    "@planetscale/database": "^1.16.0",
     "@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",
-    "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
-    "@vercel/postgres": "^0.8.0",
+    "@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.9-f9be0ab",
+    "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.4.4",
+    "postgres": "^3.3.5",
     "prettier": "^2.8.1",
-    "tsup": "^8.0.2",
     "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"
   },
@@ -99,6 +120,18 @@
       "types": "./index.d.mts",
       "default": "./index.mjs"
     },
+    "./utils-studio": {
+      "import": {
+        "types": "./utils-studio.d.mts",
+        "default": "./utils-studio.mjs"
+      },
+      "require": {
+        "types": "./utils-studio.d.ts",
+        "default": "./utils-studio.js"
+      },
+      "types": "./utils-studio.d.mts",
+      "default": "./utils-studio.mjs"
+    },
     "./payload": {
       "import": {
         "types": "./payload.d.mts",