try orm isolated declarations oxc build

Author: AlexBlokh

.oxlintrc.json

@@ -65,8 +65,7 @@
 		"typescript/ban-ts-comment": "off",
 		"typescript/no-empty-interface": "off",
 		"typescript/no-unsafe-declaration-merging": "off",
-		"no-inner-declarations": "off",
-		"drizzle-internal/require-entity-kind": "error"
+		"no-inner-declarations": "off"
 	},
 	"overrides": [
 		{
@@ -106,12 +105,6 @@
 			"rules": {
 				"typescript/consistent-type-imports": "off"
 			}
-		},
-		{
-			"files": ["drizzle-kit/**/*"],
-			"rules": {
-				"drizzle-internal/require-entity-kind": "off"
-			}
 		}
 	],
 	"ignorePatterns": [

drizzle-orm/scripts/build.ts

@@ -66,7 +66,7 @@ async function main() {
 		external: [/^[^./]/], // everything?
 		tsconfig: 'tsconfig.json',
 		sourcemap: true,
-		dts: true,
+		dts: { oxc: true },
 		clean: false,
 		silent: true,
 		alias: {

drizzle-orm/src/_relations.ts

@@ -1,6 +1,6 @@
 import { type AnyTable, getTableUniqueName, type InferModelFromColumns, Table } from '~/table.ts';
 import { type AnyColumn, Column } from './column.ts';
-import { entityKind, is } from './entity.ts';
+import { is } from './entity.ts';
 import { PrimaryKeyBuilder } from './pg-core/primary-keys.ts';
 import {
 	and,
@@ -31,7 +31,7 @@ import { type Placeholder, SQL, sql } from './sql/sql.ts';
 import type { Assume, ColumnsWithTable, Equal, Simplify, ValueOrArray } from './utils.ts';
 
 export abstract class Relation<TTableName extends string = string> {
-	static readonly [entityKind]: string = 'Relation';
+	static readonly ['drizzle:entityKind']: string = 'Relation';
 
 	declare readonly $brand: 'Relation';
 	readonly referencedTableName: TTableName;
@@ -52,7 +52,7 @@ export class Relations<
 	TTableName extends string = string,
 	TConfig extends Record<string, Relation> = Record<string, Relation>,
 > {
-	static readonly [entityKind]: string = 'Relations';
+	static readonly ['drizzle:entityKind']: string = 'Relations';
 
 	declare readonly $brand: 'Relations';
 
@@ -66,7 +66,7 @@ export class One<
 	TTableName extends string = string,
 	TIsNullable extends boolean = boolean,
 > extends Relation<TTableName> {
-	static override readonly [entityKind]: string = 'One';
+	static override readonly ['drizzle:entityKind']: string = 'One';
 
 	declare protected $relationBrand: 'One';
 
@@ -98,7 +98,7 @@ export class One<
 }
 
 export class Many<TTableName extends string> extends Relation<TTableName> {
-	static override readonly [entityKind]: string = 'Many';
+	static override readonly ['drizzle:entityKind']: string = 'Many';
 
 	declare protected $relationBrand: 'Many';
 
@@ -156,7 +156,30 @@ export type ExtractRelationsFromTableExtraConfigSchema<
 	}
 >;
 
-export function getOperators() {
+export function getOperators(): {
+	and: typeof and;
+	between: typeof between;
+	eq: typeof eq;
+	exists: typeof exists;
+	gt: typeof gt;
+	gte: typeof gte;
+	ilike: typeof ilike;
+	inArray: typeof inArray;
+	isNull: typeof isNull;
+	isNotNull: typeof isNotNull;
+	like: typeof like;
+	lt: typeof lt;
+	lte: typeof lte;
+	ne: typeof ne;
+	not: typeof not;
+	notBetween: typeof notBetween;
+	notExists: typeof notExists;
+	notLike: typeof notLike;
+	notIlike: typeof notIlike;
+	notInArray: typeof notInArray;
+	or: typeof or;
+	sql: typeof sql;
+} {
 	return {
 		and,
 		between,
@@ -185,7 +208,11 @@ export function getOperators() {
 
 export type Operators = ReturnType<typeof getOperators>;
 
-export function getOrderByOperators() {
+export function getOrderByOperators(): {
+	sql: typeof sql;
+	asc: typeof asc;
+	desc: typeof desc;
+} {
 	return {
 		sql,
 		asc,
@@ -518,7 +545,19 @@ export function relations<
 	);
 }
 
-export function createOne<TTableName extends string>(sourceTable: Table) {
+export function createOne<TTableName extends string>(sourceTable: Table): <
+	TForeignTable extends Table,
+	TColumns extends [
+		AnyColumn<{ tableName: TTableName }>,
+		...AnyColumn<{ tableName: TTableName }>[],
+	],
+>(
+	table: TForeignTable,
+	config?: RelationConfig<TTableName, TForeignTable['_']['name'], TColumns>,
+) => One<
+	TForeignTable['_']['name'],
+	Equal<TColumns[number]['_']['notNull'], true>
+> {
 	return function one<
 		TForeignTable extends Table,
 		TColumns extends [
@@ -542,7 +581,10 @@ export function createOne<TTableName extends string>(sourceTable: Table) {
 	};
 }
 
-export function createMany(sourceTable: Table) {
+export function createMany(sourceTable: Table): <TForeignTable extends Table>(
+	referencedTable: TForeignTable,
+	config?: { relationName: string },
+) => Many<TForeignTable['_']['name']> {
 	return function many<TForeignTable extends Table>(
 		referencedTable: TForeignTable,
 		config?: { relationName: string },
@@ -635,7 +677,10 @@ export function normalizeRelation(
 
 export function createTableRelationsHelpers<TTableName extends string>(
 	sourceTable: AnyTable<{ name: TTableName }>,
-) {
+): {
+	one: ReturnType<typeof createOne<TTableName>>;
+	many: ReturnType<typeof createMany>;
+} {
 	return {
 		one: createOne<TTableName>(sourceTable),
 		many: createMany(sourceTable),

drizzle-orm/src/alias.ts

@@ -2,14 +2,14 @@ import type * as V1 from './_relations.ts';
 import { OriginalColumn } from './column-common.ts';
 import type { AnyColumn } from './column.ts';
 import { Column } from './column.ts';
-import { entityKind, is } from './entity.ts';
+import { is } from './entity.ts';
 import type { View } from './sql/sql.ts';
 import { SQL, sql } from './sql/sql.ts';
 import { Table } from './table.ts';
 import { ViewBaseConfig } from './view-common.ts';
 
 export class ColumnTableAliasProxyHandler<TColumn extends Column> implements ProxyHandler<TColumn> {
-	static readonly [entityKind]: string = 'ColumnTableAliasProxyHandler';
+	static readonly ['drizzle:entityKind']: string = 'ColumnTableAliasProxyHandler';
 
 	constructor(private table: Table | View, private ignoreColumnAlias?: boolean) {}
 
@@ -27,7 +27,7 @@ export class ColumnTableAliasProxyHandler<TColumn extends Column> implements Pro
 }
 
 export class TableAliasProxyHandler<T extends Table | View> implements ProxyHandler<T> {
-	static readonly [entityKind]: string = 'TableAliasProxyHandler';
+	static readonly ['drizzle:entityKind']: string = 'TableAliasProxyHandler';
 
 	constructor(private alias: string, private replaceOriginalName: boolean, private ignoreColumnAlias?: boolean) {}
 
@@ -83,7 +83,7 @@ export class TableAliasProxyHandler<T extends Table | View> implements ProxyHand
 }
 
 export class ColumnAliasProxyHandler<T extends Column> implements ProxyHandler<T> {
-	static readonly [entityKind]: string = 'ColumnAliasProxyHandler';
+	static readonly ['drizzle:entityKind']: string = 'ColumnAliasProxyHandler';
 
 	constructor(private alias: string) {}
 
@@ -109,7 +109,7 @@ export class ColumnAliasProxyHandler<T extends Column> implements ProxyHandler<T
 }
 
 export class RelationTableAliasProxyHandler<T extends V1.Relation> implements ProxyHandler<T> {
-	static readonly [entityKind]: string = 'RelationTableAliasProxyHandler';
+	static readonly ['drizzle:entityKind']: string = 'RelationTableAliasProxyHandler';
 
 	constructor(private alias: string) {}
 

drizzle-orm/src/aws-data-api/common/index.ts

@@ -1,4 +1,4 @@
-import type { Field } from '@aws-sdk/client-rds-data';
+import type { ArrayValue, Field } from '@aws-sdk/client-rds-data';
 import type { TypeHint } from '@aws-sdk/client-rds-data';
 import type { QueryTypingsValue } from '~/sql/sql.ts';
 
@@ -11,7 +11,9 @@ export const typeHint: { [K in TypeHint]: K } = {
 	UUID: 'UUID',
 };
 
-export function getValueFromDataApi(field: Field) {
+export function getValueFromDataApi(
+	field: Field,
+): string | boolean | number | null | Uint8Array | string[] | number[] | boolean[] | ArrayValue[] {
 	if (field.stringValue !== undefined) {
 		return field.stringValue;
 	} else if (field.booleanValue !== undefined) {

drizzle-orm/src/aws-data-api/pg/driver.ts

@@ -1,6 +1,6 @@
 import { RDSDataClient, type RDSDataClientConfig } from '@aws-sdk/client-rds-data';
 import * as V1 from '~/_relations.ts';
-import { entityKind, is } from '~/entity.ts';
+import { is } from '~/entity.ts';
 import type { Logger } from '~/logger.ts';
 import { DefaultLogger } from '~/logger.ts';
 import { PgAsyncDatabase } from '~/pg-core/async/db.ts';
@@ -35,7 +35,7 @@ export class AwsDataApiPgDatabase<
 	TSchema extends Record<string, unknown> = Record<string, never>,
 	TRelations extends AnyRelations = EmptyRelations,
 > extends PgAsyncDatabase<AwsDataApiPgQueryResultHKT, TSchema, TRelations> {
-	static override readonly [entityKind]: string = 'AwsDataApiPgDatabase';
+	static override readonly ['drizzle:entityKind']: string = 'AwsDataApiPgDatabase';
 
 	override execute<
 		TRow extends Record<string, unknown> = Record<string, unknown>,
@@ -45,7 +45,7 @@ export class AwsDataApiPgDatabase<
 }
 
 export class AwsPgDialect extends PgDialect {
-	static override readonly [entityKind]: string = 'AwsPgDialect';
+	static override readonly ['drizzle:entityKind']: string = 'AwsPgDialect';
 
 	override escapeParam(num: number): string {
 		return `:${num + 1}`;

drizzle-orm/src/aws-data-api/pg/migrator.ts

@@ -1,4 +1,4 @@
-import type { MigrationConfig } from '~/migrator.ts';
+import type { MigrationConfig, MigratorInitFailResponse } from '~/migrator.ts';
 import { readMigrationFiles } from '~/migrator.ts';
 import { migrate as coreMigrate } from '~/pg-core/async/session.ts';
 import type { AnyRelations } from '~/relations.ts';
@@ -7,7 +7,7 @@ import type { AwsDataApiPgDatabase } from './driver.ts';
 export async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(
 	db: AwsDataApiPgDatabase<TSchema, TRelations>,
 	config: MigrationConfig,
-) {
+): Promise<void | MigratorInitFailResponse> {
 	const migrations = readMigrationFiles(config);
 	return await coreMigrate(migrations, db.session, config);
 }

drizzle-orm/src/aws-data-api/pg/session.ts

@@ -9,7 +9,7 @@ import type * as V1 from '~/_relations.ts';
 import type { Cache } from '~/cache/core/cache.ts';
 import { NoopCache } from '~/cache/core/cache.ts';
 import type { WithCacheConfig } from '~/cache/core/types.ts';
-import { entityKind } from '~/entity.ts';
+
 import type { Logger } from '~/logger.ts';
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';
 import type { PgDialect } from '~/pg-core/dialect.ts';
@@ -26,7 +26,7 @@ export class AwsDataApiPreparedQuery<
 	T extends PreparedQueryConfig & { values: AwsDataApiPgQueryResult<unknown[]> },
 	TIsRqbV2 extends boolean = false,
 > extends PgAsyncPreparedQuery<T> {
-	static override readonly [entityKind]: string = 'AwsDataApiPreparedQuery';
+	static override readonly ['drizzle:entityKind']: string = 'AwsDataApiPreparedQuery';
 
 	private rawQuery: ExecuteStatementCommand;
 
@@ -49,7 +49,7 @@ export class AwsDataApiPreparedQuery<
 		private customResultMapper?: (
 			rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],
 		) => T['execute'],
-		private isRqbV2Query?: TIsRqbV2,
+		private isRqbV2Query?: TIsRqbV2 | undefined,
 	) {
 		super({ sql: queryString, params }, cache, queryMetadata, cacheConfig);
 		this.rawQuery = new ExecuteStatementCommand({
@@ -202,7 +202,7 @@ export class AwsDataApiSession<
 	TRelations extends AnyRelations,
 	TSchema extends V1.TablesRelationalConfig,
 > extends PgAsyncSession<AwsDataApiPgQueryResultHKT, TFullSchema, TRelations, TSchema> {
-	static override readonly [entityKind]: string = 'AwsDataApiSession';
+	static override readonly ['drizzle:entityKind']: string = 'AwsDataApiSession';
 
 	/** @internal */
 	readonly rawQuery: AwsDataApiQueryBase;
@@ -336,7 +336,7 @@ export class AwsDataApiTransaction<
 	TRelations extends AnyRelations,
 	TSchema extends V1.TablesRelationalConfig,
 > extends PgAsyncTransaction<AwsDataApiPgQueryResultHKT, TFullSchema, TRelations, TSchema> {
-	static override readonly [entityKind]: string = 'AwsDataApiTransaction';
+	static override readonly ['drizzle:entityKind']: string = 'AwsDataApiTransaction';
 
 	override async transaction<T>(
 		transaction: (tx: AwsDataApiTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,

drizzle-orm/src/better-sqlite3/driver.ts

@@ -1,6 +1,6 @@
 import Client, { type Database, type Options, type RunResult } from 'better-sqlite3';
 import * as V1 from '~/_relations.ts';
-import { entityKind } from '~/entity.ts';
+
 import { DefaultLogger } from '~/logger.ts';
 import type { AnyRelations, EmptyRelations } from '~/relations.ts';
 import { BaseSQLiteDatabase } from '~/sqlite-core/db.ts';
@@ -21,7 +21,7 @@ export class BetterSQLite3Database<
 	TSchema extends Record<string, unknown> = Record<string, never>,
 	TRelations extends AnyRelations = EmptyRelations,
 > extends BaseSQLiteDatabase<'sync', RunResult, TSchema, TRelations> {
-	static override readonly [entityKind]: string = 'BetterSQLite3Database';
+	static override readonly ['drizzle:entityKind']: string = 'BetterSQLite3Database';
 }
 
 function construct<

drizzle-orm/src/better-sqlite3/migrator.ts

@@ -1,12 +1,12 @@
-import type { MigrationConfig } from '~/migrator.ts';
+import type { MigrationConfig, MigratorInitFailResponse } from '~/migrator.ts';
 import { readMigrationFiles } from '~/migrator.ts';
 import type { AnyRelations } from '~/relations.ts';
 import type { BetterSQLite3Database } from './driver.ts';
 
 export function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(
 	db: BetterSQLite3Database<TSchema, TRelations>,
 	config: MigrationConfig,
-) {
+): void | MigratorInitFailResponse {
 	const migrations = readMigrationFiles(config);
 	return db.dialect.migrate(migrations, db.session, config);
 }