Merge remote-tracking branch 'origin/alternation-engine' into alternation-engine

Author: AlexBlokh

.oxlintrc.json

@@ -78,7 +78,11 @@
 			],
 			"rules": {
 				"import/extensions": "off",
-				"drizzle-internal/no-instanceof": "off"
+				"drizzle-internal/no-instanceof": "off",
+				"no-useless-escape": "off",
+				"consistent-type-imports": "off",
+				"no-unused-vars": "off",
+				"no-unused-expressions": "off"
 			}
 		},
 		{
@@ -98,6 +102,12 @@
 			"rules": {
 				"typescript/consistent-type-imports": "off"
 			}
+		},
+		{
+			"files": ["drizzle-kit/**/*"],
+			"rules": {
+				"drizzle-internal/require-entity-kind": "off"
+			}
 		}
 	],
 	"ignorePatterns": [

drizzle-kit/imports-checker/checker.ts

@@ -49,15 +49,15 @@ class ImportAnalyzer {
 	private isDirectory = (path: string) => {
 		try {
 			return fs.lstatSync(path).isDirectory();
-		} catch (e) {
+		} catch {
 			return false;
 		}
 	};
 
 	private isFile = (path: string) => {
 		try {
 			return fs.lstatSync(path).isFile();
-		} catch (e) {
+		} catch {
 			return false;
 		}
 	};
@@ -154,8 +154,6 @@ class ImportAnalyzer {
 					type: type,
 				});
 			}
-		} catch (e) {
-			throw e;
 		} finally {
 			this.visited.add(target);
 		}

drizzle-kit/imports-checker/index.ts

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
-import { analyzeImports, ChainLink } from './checker';
+import type { ChainLink } from './checker';
+import { analyzeImports } from './checker';
 
 const issues = analyzeImports({
 	basePath: './drizzle-kit',

drizzle-kit/src/cli/commands/check.ts

@@ -1,4 +1,4 @@
-import { Dialect } from '../../utils/schemaValidator';
+import type { Dialect } from '../../utils/schemaValidator';
 import { prepareOutFolder, validateWithReport } from '../../utils/utils-node';
 
 export const checkHandler = (out: string, dialect: Dialect) => {
@@ -44,7 +44,7 @@ export const checkHandler = (out: string, dialect: Dialect) => {
 		console.log(message);
 	}
 
-	const abort = report.malformed.length!! || collisionEntries.length > 0;
+	const abort = report.malformed.length! || collisionEntries.length > 0;
 
 	if (abort) {
 		process.exit(1);

drizzle-kit/src/cli/commands/drop.ts

@@ -3,7 +3,7 @@ import { readFileSync, rmSync, writeFileSync } from 'fs';
 import fs from 'fs';
 import { render } from 'hanji';
 import { join } from 'path';
-import { Journal } from '../../utils';
+import type { Journal } from '../../utils';
 import { DropMigrationView } from '../views';
 import { embeddedMigrations } from './generate-common';
 

drizzle-kit/src/cli/commands/generate-cockroach.ts

@@ -1,26 +1,25 @@
 import { fromDrizzleSchema, prepareFromSchemaFiles } from 'src/dialects/cockroach/drizzle';
 import { prepareFilenames } from 'src/utils/utils-node';
-import {
+import type {
 	CheckConstraint,
 	CockroachEntities,
 	Column,
-	createDDL,
 	Enum,
 	ForeignKey,
 	Index,
-	interimToDDL,
 	Policy,
 	PrimaryKey,
 	Schema,
 	Sequence,
 	View,
 } from '../../dialects/cockroach/ddl';
+import { createDDL, interimToDDL } from '../../dialects/cockroach/ddl';
 import { ddlDiff, ddlDiffDry } from '../../dialects/cockroach/diff';
 import { prepareSnapshot } from '../../dialects/cockroach/serializer';
 import { assertV1OutFolder, prepareMigrationFolder } from '../../utils/utils-node';
 import { resolver } from '../prompts';
 import { writeResult } from './generate-common';
-import { ExportConfig, GenerateConfig } from './utils';
+import type { ExportConfig, GenerateConfig } from './utils';
 
 export const handle = async (config: GenerateConfig) => {
 	const { out: outFolder, schema: schemaPath, casing } = config;

drizzle-kit/src/cli/commands/generate-common.ts

@@ -2,8 +2,8 @@ import chalk from 'chalk';
 import fs from 'fs';
 import { render } from 'hanji';
 import path, { join } from 'path';
-import { CockroachSnapshot } from 'src/dialects/cockroach/snapshot';
-import { MssqlSnapshot } from 'src/dialects/mssql/snapshot';
+import type { CockroachSnapshot } from 'src/dialects/cockroach/snapshot';
+import type { MssqlSnapshot } from 'src/dialects/mssql/snapshot';
 import type { PostgresSnapshot } from 'src/dialects/postgres/snapshot';
 import type { MysqlSnapshot } from '../../dialects/mysql/snapshot';
 import type { SqliteSnapshot } from '../../dialects/sqlite/snapshot';

drizzle-kit/src/cli/commands/generate-mssql.ts

@@ -3,25 +3,26 @@ import { ddlDiff, ddlDiffDry } from 'src/dialects/mssql/diff';
 import { fromDrizzleSchema, prepareFromSchemaFiles } from 'src/dialects/mssql/drizzle';
 import { prepareSnapshot } from 'src/dialects/mssql/serializer';
 import { prepareFilenames } from 'src/utils/utils-node';
-import { createDDL, DefaultConstraint } from '../../dialects/mssql/ddl';
-import {
+import type { DefaultConstraint } from '../../dialects/mssql/ddl';
+import { createDDL } from '../../dialects/mssql/ddl';
+import type {
 	CheckConstraint,
 	Column,
 	ForeignKey,
 	Index,
-	interimToDDL,
 	MssqlEntities,
 	PrimaryKey,
 	Schema,
 	UniqueConstraint,
 	View,
 } from '../../dialects/mssql/ddl';
+import { interimToDDL } from '../../dialects/mssql/ddl';
 import { assertV1OutFolder, prepareMigrationFolder } from '../../utils/utils-node';
 import { resolver } from '../prompts';
 import { withStyle } from '../validations/outputs';
 import { mssqlSchemaError } from '../views';
 import { writeResult } from './generate-common';
-import { ExportConfig, GenerateConfig } from './utils';
+import type { ExportConfig, GenerateConfig } from './utils';
 
 export const handle = async (config: GenerateConfig) => {
 	const { out: outFolder, schema: schemaPath, casing } = config;
@@ -65,7 +66,7 @@ export const handle = async (config: GenerateConfig) => {
 	const recreateIdentity = statements.find((it) => it.type === 'recreate_identity_column');
 	if (
 		recreateIdentity && Boolean(recreateIdentity.column.identity?.to)
-		&& !Boolean(recreateIdentity.column.identity?.from)
+		&& !recreateIdentity.column.identity?.from
 	) {
 		console.log(
 			withStyle.warning(

drizzle-kit/src/cli/commands/generate-mysql.ts

@@ -1,7 +1,8 @@
 import { fromDrizzleSchema, prepareFromSchemaFiles } from 'src/dialects/mysql/drizzle';
 import { prepareSnapshot } from 'src/dialects/mysql/serializer';
 import { prepareFilenames } from 'src/utils/utils-node';
-import { Column, createDDL, interimToDDL, type Table, View } from '../../dialects/mysql/ddl';
+import type { Column, View } from '../../dialects/mysql/ddl';
+import { createDDL, interimToDDL, type Table } from '../../dialects/mysql/ddl';
 import { ddlDiff, ddlDiffDry } from '../../dialects/mysql/diff';
 import { assertV1OutFolder, prepareMigrationFolder } from '../../utils/utils-node';
 import { resolver } from '../prompts';
@@ -17,7 +18,7 @@ export const handle = async (config: GenerateConfig) => {
 	assertV1OutFolder(outFolder);
 
 	const { snapshots, journal } = prepareMigrationFolder(outFolder, 'mysql');
-	const { ddlCur, ddlPrev, snapshot, snapshotPrev, custom } = await prepareSnapshot(snapshots, schemaPath, casing);
+	const { ddlCur, ddlPrev, snapshot, custom } = await prepareSnapshot(snapshots, schemaPath, casing);
 
 	if (config.custom) {
 		writeResult({

drizzle-kit/src/cli/commands/generate-postgres.ts

@@ -1,13 +1,11 @@
 import { fromDrizzleSchema, prepareFromSchemaFiles } from 'src/dialects/postgres/drizzle';
 import { prepareFilenames } from 'src/utils/utils-node';
-import {
+import type {
 	CheckConstraint,
 	Column,
-	createDDL,
 	Enum,
 	ForeignKey,
 	Index,
-	interimToDDL,
 	Policy,
 	PostgresEntities,
 	PrimaryKey,
@@ -18,12 +16,13 @@ import {
 	UniqueConstraint,
 	View,
 } from '../../dialects/postgres/ddl';
+import { createDDL, interimToDDL } from '../../dialects/postgres/ddl';
 import { ddlDiff, ddlDiffDry } from '../../dialects/postgres/diff';
 import { prepareSnapshot } from '../../dialects/postgres/serializer';
 import { assertV1OutFolder, prepareMigrationFolder } from '../../utils/utils-node';
 import { resolver } from '../prompts';
 import { writeResult } from './generate-common';
-import { ExportConfig, GenerateConfig } from './utils';
+import type { ExportConfig, GenerateConfig } from './utils';
 
 export const handle = async (config: GenerateConfig) => {
 	const { out: outFolder, schema: schemaPath, casing } = config;