Overhaul validator packages

drizzle-orm/src/column-builder.ts

@@ -312,10 +312,35 @@ export type BuildColumn<
 	TTableName extends string,
 	TBuilder extends ColumnBuilderBase,
 	TDialect extends Dialect,
-> = TDialect extends 'pg' ? PgColumn<MakeColumnConfig<TBuilder['_'], TTableName>>
-	: TDialect extends 'mysql' ? MySqlColumn<MakeColumnConfig<TBuilder['_'], TTableName>>
-	: TDialect extends 'sqlite' ? SQLiteColumn<MakeColumnConfig<TBuilder['_'], TTableName>>
-	: TDialect extends 'common' ? Column<MakeColumnConfig<TBuilder['_'], TTableName>>
+> = TDialect extends 'pg' ? PgColumn<
+		MakeColumnConfig<TBuilder['_'], TTableName>,
+		{},
+		Simplify<Omit<TBuilder['_'], keyof MakeColumnConfig<TBuilder['_'], TTableName> | 'brand' | 'dialect'>>
+	>
+	: TDialect extends 'mysql' ? MySqlColumn<
+			MakeColumnConfig<TBuilder['_'], TTableName>,
+			{},
+			Simplify<
+				Omit<
+					TBuilder['_'],
+					| keyof MakeColumnConfig<TBuilder['_'], TTableName>
+					| 'brand'
+					| 'dialect'
+					| 'primaryKeyHasDefault'
+					| 'mysqlColumnBuilderBrand'
+				>
+			>
+		>
+	: TDialect extends 'sqlite' ? SQLiteColumn<
+			MakeColumnConfig<TBuilder['_'], TTableName>,
+			{},
+			Simplify<Omit<TBuilder['_'], keyof MakeColumnConfig<TBuilder['_'], TTableName> | 'brand' | 'dialect'>>
+		>
+	: TDialect extends 'common' ? Column<
+			MakeColumnConfig<TBuilder['_'], TTableName>,
+			{},
+			Simplify<Omit<TBuilder['_'], keyof MakeColumnConfig<TBuilder['_'], TTableName> | 'brand' | 'dialect'>>
+		>
 	: never;
 
 export type BuildIndexColumn<

drizzle-orm/src/mysql-core/columns/all.ts

@@ -15,7 +15,7 @@ import { mediumint } from './mediumint.ts';
 import { real } from './real.ts';
 import { serial } from './serial.ts';
 import { smallint } from './smallint.ts';
-import { text } from './text.ts';
+import { longtext, mediumtext, text, tinytext } from './text.ts';
 import { time } from './time.ts';
 import { timestamp } from './timestamp.ts';
 import { tinyint } from './tinyint.ts';
@@ -49,6 +49,9 @@ export function getMySqlColumnBuilders() {
 		varbinary,
 		varchar,
 		year,
+		longtext,
+		mediumtext,
+		tinytext,
 	};
 }
 

drizzle-orm/src/mysql-core/columns/char.ts

@@ -5,22 +5,30 @@ import type { AnyMySqlTable } from '~/mysql-core/table.ts';
 import { getColumnNameAndConfig, type Writable } from '~/utils.ts';
 import { MySqlColumn, MySqlColumnBuilder } from './common.ts';
 
-export type MySqlCharBuilderInitial<TName extends string, TEnum extends [string, ...string[]]> = MySqlCharBuilder<{
+export type MySqlCharBuilderInitial<
+	TName extends string,
+	TLength extends number | undefined,
+	TEnum extends [string, ...string[]],
+> = MySqlCharBuilder<{
 	name: TName;
 	dataType: 'string';
 	columnType: 'MySqlChar';
 	data: TEnum[number];
 	driverParam: number | string;
 	enumValues: TEnum;
+	length: TLength;
 }>;
 
-export class MySqlCharBuilder<T extends ColumnBuilderBaseConfig<'string', 'MySqlChar'>> extends MySqlColumnBuilder<
-	T,
-	MySqlCharConfig<T['enumValues']>
-> {
+export class MySqlCharBuilder<T extends ColumnBuilderBaseConfig<'string', 'MySqlChar'> & { length: number | undefined }>
+	extends MySqlColumnBuilder<
+		T,
+		MySqlCharConfig<T['length'], T['enumValues']>,
+		{ length: T['length'] }
+	>
+{
 	static override readonly [entityKind]: string = 'MySqlCharBuilder';
 
-	constructor(name: T['name'], config: MySqlCharConfig<T['enumValues']>) {
+	constructor(name: T['name'], config: MySqlCharConfig<T['length'], T['enumValues']>) {
 		super(name, 'string', 'MySqlChar');
 		this.config.length = config.length;
 		this.config.enum = config.enum;
@@ -29,20 +37,20 @@ export class MySqlCharBuilder<T extends ColumnBuilderBaseConfig<'string', 'MySql
 	/** @internal */
 	override build<TTableName extends string>(
 		table: AnyMySqlTable<{ name: TTableName }>,
-	): MySqlChar<MakeColumnConfig<T, TTableName> & { enumValues: T['enumValues'] }> {
-		return new MySqlChar<MakeColumnConfig<T, TTableName> & { enumValues: T['enumValues'] }>(
+	): MySqlChar<MakeColumnConfig<T, TTableName> & { length: T['length']; enumValues: T['enumValues'] }> {
+		return new MySqlChar<MakeColumnConfig<T, TTableName> & { length: T['length']; enumValues: T['enumValues'] }>(
 			table,
 			this.config as ColumnBuilderRuntimeConfig<any, any>,
 		);
 	}
 }
 
-export class MySqlChar<T extends ColumnBaseConfig<'string', 'MySqlChar'>>
-	extends MySqlColumn<T, MySqlCharConfig<T['enumValues']>>
+export class MySqlChar<T extends ColumnBaseConfig<'string', 'MySqlChar'> & { length: number | undefined }>
+	extends MySqlColumn<T, MySqlCharConfig<T['length'], T['enumValues']>, { length: T['length'] }>
 {
 	static override readonly [entityKind]: string = 'MySqlChar';
 
-	readonly length: number | undefined = this.config.length;
+	readonly length: T['length'] = this.config.length;
 	override readonly enumValues = this.config.enum;
 
 	getSQLType(): string {
@@ -51,20 +59,26 @@ export class MySqlChar<T extends ColumnBaseConfig<'string', 'MySqlChar'>>
 }
 
 export interface MySqlCharConfig<
+	TLength extends number | undefined = number | undefined,
 	TEnum extends readonly string[] | string[] | undefined = readonly string[] | string[] | undefined,
 > {
-	length?: number;
+	length?: TLength;
 	enum?: TEnum;
 }
 
-export function char(): MySqlCharBuilderInitial<'', [string, ...string[]]>;
-export function char<U extends string, T extends Readonly<[U, ...U[]]>>(
-	config?: MySqlCharConfig<T | Writable<T>>,
-): MySqlCharBuilderInitial<'', Writable<T>>;
-export function char<TName extends string, U extends string, T extends Readonly<[U, ...U[]]>>(
+export function char(): MySqlCharBuilderInitial<'', undefined, [string, ...string[]]>;
+export function char<U extends string, L extends number | undefined, T extends Readonly<[U, ...U[]]>>(
+	config?: MySqlCharConfig<L, T | Writable<T>>,
+): MySqlCharBuilderInitial<'', L, Writable<T>>;
+export function char<
+	TName extends string,
+	U extends string,
+	L extends number | undefined,
+	T extends Readonly<[U, ...U[]]>,
+>(
 	name: TName,
-	config?: MySqlCharConfig<T | Writable<T>>,
-): MySqlCharBuilderInitial<TName, Writable<T>>;
+	config?: MySqlCharConfig<L, T | Writable<T>>,
+): MySqlCharBuilderInitial<TName, L, Writable<T>>;
 export function char(a?: string | MySqlCharConfig, b: MySqlCharConfig = {}): any {
 	const { name, config } = getColumnNameAndConfig<MySqlCharConfig>(a, b);
 	return new MySqlCharBuilder(name, config as any);

drizzle-orm/src/mysql-core/columns/common.ts

@@ -101,8 +101,9 @@ export abstract class MySqlColumnBuilder<
 // To understand how to use `MySqlColumn` and `AnyMySqlColumn`, see `Column` and `AnyColumn` documentation.
 export abstract class MySqlColumn<
 	T extends ColumnBaseConfig<ColumnDataType, string> = ColumnBaseConfig<ColumnDataType, string>,
-	TRuntimeConfig extends object = object,
-> extends Column<T, TRuntimeConfig, { dialect: 'mysql' }> {
+	TRuntimeConfig extends object = {},
+	TTypeConfig extends object = {},
+> extends Column<T, TRuntimeConfig, TTypeConfig & { dialect: 'mysql' }> {
 	static override readonly [entityKind]: string = 'MySqlColumn';
 
 	constructor(

drizzle-orm/src/mysql-core/columns/text.ts

@@ -41,7 +41,7 @@ export class MySqlText<T extends ColumnBaseConfig<'string', 'MySqlText'>>
 {
 	static override readonly [entityKind]: string = 'MySqlText';
 
-	private textType: MySqlTextColumnType = this.config.textType;
+	readonly textType: MySqlTextColumnType = this.config.textType;
 
 	override readonly enumValues = this.config.enumValues;
 

drizzle-orm/src/mysql-core/columns/varchar.ts

@@ -5,24 +5,29 @@ import type { AnyMySqlTable } from '~/mysql-core/table.ts';
 import { getColumnNameAndConfig, type Writable } from '~/utils.ts';
 import { MySqlColumn, MySqlColumnBuilder } from './common.ts';
 
-export type MySqlVarCharBuilderInitial<TName extends string, TEnum extends [string, ...string[]]> = MySqlVarCharBuilder<
+export type MySqlVarCharBuilderInitial<
+	TName extends string,
+	TLength extends number | undefined,
+	TEnum extends [string, ...string[]],
+> = MySqlVarCharBuilder<
 	{
 		name: TName;
 		dataType: 'string';
 		columnType: 'MySqlVarChar';
 		data: TEnum[number];
 		driverParam: number | string;
 		enumValues: TEnum;
+		length: TLength;
 	}
 >;
 
-export class MySqlVarCharBuilder<T extends ColumnBuilderBaseConfig<'string', 'MySqlVarChar'>>
-	extends MySqlColumnBuilder<T, MySqlVarCharConfig<T['enumValues']>>
-{
+export class MySqlVarCharBuilder<
+	T extends ColumnBuilderBaseConfig<'string', 'MySqlVarChar'> & { length: number | undefined },
+> extends MySqlColumnBuilder<T, MySqlVarCharConfig<T['length'], T['enumValues']>> {
 	static override readonly [entityKind]: string = 'MySqlVarCharBuilder';
 
 	/** @internal */
-	constructor(name: T['name'], config: MySqlVarCharConfig<T['enumValues']>) {
+	constructor(name: T['name'], config: MySqlVarCharConfig<T['length'], T['enumValues']>) {
 		super(name, 'string', 'MySqlVarChar');
 		this.config.length = config.length;
 		this.config.enum = config.enum;
@@ -31,16 +36,16 @@ export class MySqlVarCharBuilder<T extends ColumnBuilderBaseConfig<'string', 'My
 	/** @internal */
 	override build<TTableName extends string>(
 		table: AnyMySqlTable<{ name: TTableName }>,
-	): MySqlVarChar<MakeColumnConfig<T, TTableName> & { enumValues: T['enumValues'] }> {
-		return new MySqlVarChar<MakeColumnConfig<T, TTableName> & { enumValues: T['enumValues'] }>(
+	): MySqlVarChar<MakeColumnConfig<T, TTableName> & { length: T['length']; enumValues: T['enumValues'] }> {
+		return new MySqlVarChar<MakeColumnConfig<T, TTableName> & { length: T['length']; enumValues: T['enumValues'] }>(
 			table,
 			this.config as ColumnBuilderRuntimeConfig<any, any>,
 		);
 	}
 }
 
-export class MySqlVarChar<T extends ColumnBaseConfig<'string', 'MySqlVarChar'>>
-	extends MySqlColumn<T, MySqlVarCharConfig<T['enumValues']>>
+export class MySqlVarChar<T extends ColumnBaseConfig<'string', 'MySqlVarChar'> & { length: number | undefined }>
+	extends MySqlColumn<T, MySqlVarCharConfig<T['length'], T['enumValues']>>
 {
 	static override readonly [entityKind]: string = 'MySqlVarChar';
 
@@ -54,19 +59,25 @@ export class MySqlVarChar<T extends ColumnBaseConfig<'string', 'MySqlVarChar'>>
 }
 
 export interface MySqlVarCharConfig<
+	TLength extends number | undefined = number | undefined,
 	TEnum extends string[] | readonly string[] | undefined = string[] | readonly string[] | undefined,
 > {
-	length: number;
+	length: TLength;
 	enum?: TEnum;
 }
 
-export function varchar<U extends string, T extends Readonly<[U, ...U[]]>>(
-	config: MySqlVarCharConfig<T | Writable<T>>,
-): MySqlVarCharBuilderInitial<'', Writable<T>>;
-export function varchar<TName extends string, U extends string, T extends Readonly<[U, ...U[]]>>(
+export function varchar<U extends string, L extends number | undefined, T extends Readonly<[U, ...U[]]>>(
+	config: MySqlVarCharConfig<L, T | Writable<T>>,
+): MySqlVarCharBuilderInitial<'', L, Writable<T>>;
+export function varchar<
+	TName extends string,
+	L extends number | undefined,
+	U extends string,
+	T extends Readonly<[U, ...U[]]>,
+>(
 	name: TName,
-	config: MySqlVarCharConfig<T | Writable<T>>,
-): MySqlVarCharBuilderInitial<TName, Writable<T>>;
+	config: MySqlVarCharConfig<L, T | Writable<T>>,
+): MySqlVarCharBuilderInitial<TName, L, Writable<T>>;
 export function varchar(a?: string | MySqlVarCharConfig, b?: MySqlVarCharConfig): any {
 	const { name, config } = getColumnNameAndConfig<MySqlVarCharConfig>(a, b);
 	return new MySqlVarCharBuilder(name, config as any);

drizzle-orm/src/mysql-core/view.ts

@@ -7,7 +7,6 @@ import type { ColumnsSelection, SQL } from '~/sql/sql.ts';
 import { getTableColumns } from '~/utils.ts';
 import type { MySqlColumn, MySqlColumnBuilderBase } from './columns/index.ts';
 import { QueryBuilder } from './query-builders/query-builder.ts';
-import type { SelectedFields } from './query-builders/select.types.ts';
 import { mysqlTable } from './table.ts';
 import { MySqlViewBase } from './view-base.ts';
 import { MySqlViewConfig } from './view-common.ts';
@@ -58,7 +57,7 @@ export class ViewBuilderCore<TConfig extends { name: string; columns?: unknown }
 export class ViewBuilder<TName extends string = string> extends ViewBuilderCore<{ name: TName }> {
 	static override readonly [entityKind]: string = 'MySqlViewBuilder';
 
-	as<TSelectedFields extends SelectedFields>(
+	as<TSelectedFields extends ColumnsSelection>(
 		qb: TypedQueryBuilder<TSelectedFields> | ((qb: QueryBuilder) => TypedQueryBuilder<TSelectedFields>),
 	): MySqlViewWithSelection<TName, false, AddAliasToSelection<TSelectedFields, TName, 'mysql'>> {
 		if (typeof qb === 'function') {
@@ -160,7 +159,7 @@ export class MySqlView<
 		config: {
 			name: TName;
 			schema: string | undefined;
-			selectedFields: SelectedFields;
+			selectedFields: ColumnsSelection;
 			query: SQL | undefined;
 		};
 	}) {

drizzle-orm/src/pg-core/columns/char.ts

@@ -5,22 +5,30 @@ import type { AnyPgTable } from '~/pg-core/table.ts';
 import { getColumnNameAndConfig, type Writable } from '~/utils.ts';
 import { PgColumn, PgColumnBuilder } from './common.ts';
 
-export type PgCharBuilderInitial<TName extends string, TEnum extends [string, ...string[]]> = PgCharBuilder<{
+export type PgCharBuilderInitial<
+	TName extends string,
+	TLength extends number | undefined,
+	TEnum extends [string, ...string[]],
+> = PgCharBuilder<{
 	name: TName;
 	dataType: 'string';
 	columnType: 'PgChar';
 	data: TEnum[number];
 	enumValues: TEnum;
 	driverParam: string;
+	length: TLength;
 }>;
 
-export class PgCharBuilder<T extends ColumnBuilderBaseConfig<'string', 'PgChar'>> extends PgColumnBuilder<
-	T,
-	{ length: number | undefined; enumValues: T['enumValues'] }
-> {
+export class PgCharBuilder<T extends ColumnBuilderBaseConfig<'string', 'PgChar'> & { length: number | undefined }>
+	extends PgColumnBuilder<
+		T,
+		{ length: T['length']; enumValues: T['enumValues'] },
+		{ length: T['length'] }
+	>
+{
 	static override readonly [entityKind]: string = 'PgCharBuilder';
 
-	constructor(name: T['name'], config: PgCharConfig<T['enumValues']>) {
+	constructor(name: T['name'], config: PgCharConfig<T['length'], T['enumValues']>) {
 		super(name, 'string', 'PgChar');
 		this.config.length = config.length;
 		this.config.enumValues = config.enum;
@@ -29,13 +37,16 @@ export class PgCharBuilder<T extends ColumnBuilderBaseConfig<'string', 'PgChar'>
 	/** @internal */
 	override build<TTableName extends string>(
 		table: AnyPgTable<{ name: TTableName }>,
-	): PgChar<MakeColumnConfig<T, TTableName>> {
-		return new PgChar<MakeColumnConfig<T, TTableName>>(table, this.config as ColumnBuilderRuntimeConfig<any, any>);
+	): PgChar<MakeColumnConfig<T, TTableName> & { length: T['length'] }> {
+		return new PgChar<MakeColumnConfig<T, TTableName> & { length: T['length'] }>(
+			table,
+			this.config as ColumnBuilderRuntimeConfig<any, any>,
+		);
 	}
 }
 
-export class PgChar<T extends ColumnBaseConfig<'string', 'PgChar'>>
-	extends PgColumn<T, { length: number | undefined; enumValues: T['enumValues'] }>
+export class PgChar<T extends ColumnBaseConfig<'string', 'PgChar'> & { length: number | undefined }>
+	extends PgColumn<T, { length: T['length']; enumValues: T['enumValues'] }, { length: T['length'] }>
 {
 	static override readonly [entityKind]: string = 'PgChar';
 
@@ -48,20 +59,26 @@ export class PgChar<T extends ColumnBaseConfig<'string', 'PgChar'>>
 }
 
 export interface PgCharConfig<
+	TLength extends number | undefined = number | undefined,
 	TEnum extends readonly string[] | string[] | undefined = readonly string[] | string[] | undefined,
 > {
-	length?: number;
+	length?: TLength;
 	enum?: TEnum;
 }
 
-export function char(): PgCharBuilderInitial<'', [string, ...string[]]>;
-export function char<U extends string, T extends Readonly<[U, ...U[]]>>(
-	config?: PgCharConfig<T | Writable<T>>,
-): PgCharBuilderInitial<'', Writable<T>>;
-export function char<TName extends string, U extends string, T extends Readonly<[U, ...U[]]>>(
+export function char(): PgCharBuilderInitial<'', undefined, [string, ...string[]]>;
+export function char<U extends string, L extends number | undefined, T extends Readonly<[U, ...U[]]>>(
+	config?: PgCharConfig<L, T | Writable<T>>,
+): PgCharBuilderInitial<'', L, Writable<T>>;
+export function char<
+	TName extends string,
+	U extends string,
+	L extends number | undefined,
+	T extends Readonly<[U, ...U[]]>,
+>(
 	name: TName,
-	config?: PgCharConfig<T | Writable<T>>,
-): PgCharBuilderInitial<TName, Writable<T>>;
+	config?: PgCharConfig<L, T | Writable<T>>,
+): PgCharBuilderInitial<TName, L, Writable<T>>;
 export function char(a?: string | PgCharConfig, b: PgCharConfig = {}): any {
 	const { name, config } = getColumnNameAndConfig<PgCharConfig>(a, b);
 	return new PgCharBuilder(name, config as any);