orange-orm 4.7.10-beta.1 → 4.7.10-beta.2

package/dist/index.browser.mjs

@@ -14799,6 +14799,7 @@ function requireIndexBrowser () {
 	connectViaPool.commit = requireCommit();
 	connectViaPool.rollback = requireRollback();
 	connectViaPool.end = requirePools().end;
+	connectViaPool.close = connectViaPool.end;
 	connectViaPool.log = requireLog().registerLogger;
 	connectViaPool.on = requireLog().on;
 	connectViaPool.off = requireLog().off;

package/dist/index.mjs

@@ -20520,6 +20520,7 @@ function requireSrc () {
 	connectViaPool.commit = requireCommit();
 	connectViaPool.rollback = requireRollback();
 	connectViaPool.end = requirePools().end;
+	connectViaPool.close = connectViaPool.end;
 	connectViaPool.log = requireLog().registerLogger;
 	connectViaPool.on = requireLog().on;
 	connectViaPool.off = requireLog().off;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.7.10-beta.1",
+  "version": "4.7.10-beta.2",
   "main": "./src/index.js",
   "module": "./dist/index.mjs",
   "browser": "./dist/index.browser.mjs",

package/src/index.js

@@ -28,6 +28,7 @@ connectViaPool.filter = require('./emptyFilter');
 connectViaPool.commit = require('./table/commit');
 connectViaPool.rollback = require('./table/rollback');
 connectViaPool.end = require('./pools').end;
+connectViaPool.close = connectViaPool.end;
 connectViaPool.log = require('./table/log').registerLogger;
 connectViaPool.on = require('./table/log').on;
 connectViaPool.off = require('./table/log').off;

package/src/indexBrowser.js

@@ -14,6 +14,7 @@ connectViaPool.filter = require('./emptyFilter');
 connectViaPool.commit = require('./table/commit');
 connectViaPool.rollback = require('./table/rollback');
 connectViaPool.end = require('./pools').end;
+connectViaPool.close = connectViaPool.end;
 connectViaPool.log = require('./table/log').registerLogger;
 connectViaPool.on = require('./table/log').on;
 connectViaPool.off = require('./table/log').off;

package/src/map.d.ts

@@ -3,30 +3,24 @@ import type { PGliteOptions } from './pglite.d.ts';
 import type { ConnectionConfiguration } from 'tedious';
 import type { D1Database } from '@cloudflare/workers-types';
 import type { PoolAttributes } from 'oracledb';
-import type { AxiosInterceptorManager, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
 import type { DBClient } from './map2';
 
-
-
-//todo
 export type MergeProperties<T, V> = {
 	[K in keyof T | keyof V]:
-	  K extends keyof T
-		? T[K] extends MappedTableDef<infer M>
-		  ? K extends keyof V
-			? V[K] extends MappedTableDef<infer N>
-			  ? MappedTableDef<M & N & TableAlias<K>>
-			  : V[K]
-			: T[K]
-		  : T[K]
-		: K extends keyof V
-		? V[K] extends MappedTableDef<infer N>
-		  ? MappedTableDef<N & TableAlias<K>>
-		  : V[K]
-		: never;
-  };
-
-
+	K extends keyof T
+	? T[K] extends MappedTableDef<infer M>
+	? K extends keyof V
+	? V[K] extends MappedTableDef<infer N>
+	? MappedTableDef<M & N & TableAlias<K>>
+	: V[K]
+	: T[K]
+	: T[K]
+	: K extends keyof V
+	? V[K] extends MappedTableDef<infer N>
+	? MappedTableDef<N & TableAlias<K>>
+	: V[K]
+	: never;
+};
 
 export type DbMapper<T> = {
 	table(tableName: string): MappedTableDefInit<{}>;
@@ -88,50 +82,6 @@ export interface PoolOptions {
 	size?: number;
 }
 
-type MappedDbInstance<T> = {
-	[K in keyof T]: T[K] extends MappedTableDef<infer U>
-	? MappedTable<T[K]>
-	: never;
-} & {
-	close(): Promise<void>;
-	filter: Filter;
-	and(filter: Filter | RawFilter[], ...filters: RawFilter[]): Filter;
-	or(filter: Filter | RawFilter[], ...filters: RawFilter[]): Filter;
-	not(): Filter;
-	query(filter: RawFilter | string): Promise<unknown[]>;
-	query<T>(filter: RawFilter | string): Promise<T[]>;
-	createPatch(original: any[], modified: any[]): JsonPatch;
-	createPatch(original: any, modified: any): JsonPatch;
-	<O extends DbOptions<T>>(concurrency: O): MappedDbInstance<T>;
-	transaction(
-		fn: (db: MappedDbInstance<T>) => Promise<unknown>
-	): Promise<void>;
-	saveChanges(arraysOrRow: { saveChanges(): Promise<void> }): Promise<void>;
-	express(): import('express').RequestHandler;
-	express(config: ExpressConfig<T>): import('express').RequestHandler;
-	readonly metaData: DbConcurrency<T>;
-	interceptors: WithInterceptors;
-} & DbConnectable<T> & WithInterceptors;
-
-interface WithInterceptors {
-	request: AxiosInterceptorManager<InternalAxiosRequestConfig>;
-	response: AxiosInterceptorManager<AxiosResponse>;
-}
-
-
-type ExpressConfig<T> = {
-	[K in keyof T]?: T[K] extends MappedTableDef<infer U>
-	? ExpressTableConfig<T>
-	: never;
-} & {
-	db?: Pool | ((connectors: Connectors) => Pool | Promise<Pool>);
-}
-
-type ExpressTableConfig<T> = {
-	baseFilter?: RawFilter | ((db: MappedDbInstance<T>, req: import('express').Request, res: import('express').Response) => RawFilter);
-}
-
-
 type JsonPatch = Array<{
 	op: 'add' | 'remove' | 'replace' | 'copy' | 'move' | 'test';
 	path: string;
@@ -141,399 +91,10 @@ type JsonPatch = Array<{
 
 type ToJsonType<M> = M extends JsonOf<infer N> ? N : JsonType;
 
-type PrimaryRowFilter<T> = StrategyToRowDataPrimary<ExtractPrimary<T>>;
-type StrategyToRowDataPrimary<T> = {
-	[K in keyof T]: T[K] extends StringColumnSymbol
-	? string
-	: T[K] extends UuidColumnSymbol
-	? string
-	: T[K] extends NumericColumnSymbol
-	? number
-	: T[K] extends DateColumnSymbol
-	? string | Date
-	: T[K] extends DateWithTimeZoneColumnSymbol
-	? string | Date
-	: T[K] extends BinaryColumnSymbol
-	? string
-	: T[K] extends BooleanColumnSymbol
-	? boolean
-	: T[K] extends JSONColumnType<infer M>
-	? ToJsonType<M>
-	: never;
-};
-
-
-type ExpandedFetchingStrategy<T> = {
-	[K in keyof T &
-	keyof RemoveNever<
-		AllowedColumnsAndTablesStrategy<T>
-	>]?: T[K] extends ColumnSymbols
-	? true
-	: ExpandedFetchingStrategy<T[K]>;
-};
-
-type ExpandedMappedTable<T, FL = ExpandedFetchingStrategy<T>> = {
-	getOne(
-		filter?: Filter | PrimaryRowFilter<T>
-	): Promise<StrategyToRow<FetchedProperties<T, FL>, T>>;
-	getOne<FS extends FetchingStrategy<T>>(
-		filter?: Filter | PrimaryRowFilter<T>,
-		fetchingStrategy?: FS
-	): Promise<StrategyToRow<FetchedProperties<T, FL>, T>>;
-
-	update(
-		values: StrategyToUpdateRowData<T>,
-		where: FetchingStrategy<T>
-	): Promise<void>;
-
-	update<FS extends FetchingStrategy<T>>(
-		values: StrategyToUpdateRowData<T>,
-		where: FetchingStrategy<T>,
-		strategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-
-	replace(
-		row: StrategyToInsertRowData<T> | StrategyToInsertRowData<T>[]
-	): Promise<void>;
-
-	replace<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>,
-		strategy: FS
-	): Promise<StrategyToRow<FetchedProperties<T, FL>, T>>;
-
-	replace<FS extends FetchingStrategy<T>>(
-		rows: StrategyToInsertRowData<T>[],
-		strategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-
-
-	updateChanges(
-		row: StrategyToInsertRowData<T>,
-		originalRow: StrategyToInsertRowData<T>
-	): Promise<StrategyToRow<FetchedProperties<T, FL>, T>>;
-
-	updateChanges(
-		rows: StrategyToInsertRowData<T>[],
-		originalRows: StrategyToInsertRowData<T>[]
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-
-	updateChanges<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>,
-		originalRow: StrategyToInsertRowData<T>,
-		strategy: FS
-	): Promise<StrategyToRow<FetchedProperties<T, FL>, T>>;
-
-	updateChanges<FS extends FetchingStrategy<T>>(
-		rows: StrategyToInsertRowData<T>[],
-		originalRows: StrategyToInsertRowData<T>[],
-		strategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-
-	insert(
-		row: StrategyToInsertRowData<T>
-	): Promise<StrategyToRow<FetchedProperties<T, FL>, T>>;
-
-	insert(
-		rows: StrategyToInsertRowData<T>[]
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-
-	insert<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>,
-		strategy: FS
-	): Promise<StrategyToRow<FetchedProperties<T, FL>, T>>;
-
-	insert<FS extends FetchingStrategy<T>>(
-		rows: StrategyToInsertRowData<T>[],
-		strategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-
-	insertAndForget(
-		row: StrategyToRowData<T>
-	): Promise<void>;
-
-	insertAndForget(
-		row: StrategyToRowData<T>[]
-	): Promise<void>;
-
-	getMany(
-		filter?: Filter | PrimaryRowFilter<T>[]
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-	getMany<FS extends FetchingStrategy<T>>(
-		filter?: Filter | PrimaryRowFilter<T>[],
-		fetchingStrategy?: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-	getAll(): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-	getAll<FS extends FetchingStrategy<T>>(
-		fetchingStrategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FL>, T>>;
-	aggregate<FS extends AggregateStrategy<T>>(
-		fetchingStrategy: FS
-	): Promise<StrategyToRowData<FetchedAggregateProperties<T, FL>>[]>;
-	count(filter?: Filter | PrimaryRowFilter<T>[]): Promise<number>;
-	delete(filter?: Filter | PrimaryRowFilter<T>[]): Promise<void>;
-	deleteCascade(filter?: Filter | PrimaryRowFilter<T>[]): Promise<void>;
-
-	proxify(
-		row: StrategyToInsertRowData<T>
-	): StrategyToRow<FetchedProperties<T, FL>, T>;
-
-	proxify(
-		row: StrategyToInsertRowData<T>[]
-	): StrategyToRowArray<FetchedProperties<T, FL>, T>;
-
-	proxify<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>,
-		strategy: FS
-	): StrategyToRow<FetchedProperties<T, FL>, T>;
-
-	proxify<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>[],
-		strategy: FS
-	): StrategyToRowArray<FetchedProperties<T, FL>, T>;
-
-
-	patch<C extends Concurrency<T>>(
-		patch: JsonPatch,
-		concurrency?: C
-	): Promise<void>;
-
-	tsType<FS extends FetchingStrategy<T>>(
-		strategy: FS
-	): StrategyToRowData<FetchedProperties<T, FS>>;
-	tsType(
-	): StrategyToRowData<FetchedProperties<T, FL>>;
-
-	readonly metaData: Concurrency<T>;
-} & MappedColumnsAndRelations<T> &
-	GetById<T, CountProperties<ExtractPrimary<T>>>;
-
 type ReturnArrayOrObj<W, V1, V2> =
 	W extends any[] ? V2 :
 	V1;
 
-type MappedTable<T> = {
-	expand(): ExpandedMappedTable<T>
-	getOne(
-		filter?: Filter | PrimaryRowFilter<T>
-	): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-	getOne<FS extends FetchingStrategy<T>>(
-		filter?: Filter | PrimaryRowFilter<T>,
-		fetchingStrategy?: FS
-	): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-
-	update(
-		values: StrategyToUpdateRowData<T>,
-		where: FetchingStrategy<T>
-	): Promise<void>;
-
-	update<FS extends FetchingStrategy<T>>(
-		values: StrategyToUpdateRowData<T>,
-		where: FetchingStrategy<T>,
-		strategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FS>, T>>;
-
-	replace(
-		row: StrategyToInsertRowData<T> | StrategyToInsertRowData<T>[]
-	): Promise<void>;
-
-	replace<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>,
-		strategy: FS
-	): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-
-	replace<FS extends FetchingStrategy<T>>(
-		rows: StrategyToInsertRowData<T>[],
-		strategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FS>, T>>;
-
-	updateChanges(
-		modifiedRow: StrategyToInsertRowData<T>,
-		originalRow: StrategyToInsertRowData<T>
-	): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-
-
-	updateChanges(
-		modifiedRows: StrategyToInsertRowData<T>[],
-		originalRows: StrategyToInsertRowData<T>[]
-	): Promise<StrategyToRowArray<FetchedProperties<T, {}>, T>>;
-
-	updateChanges<FS extends FetchingStrategy<T>>(
-		modifiedRow: StrategyToInsertRowData<T>,
-		originalRow: StrategyToInsertRowData<T>,
-		strategy: FS
-	): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-
-	updateChanges<FS extends FetchingStrategy<T>>(
-		modifiedRows: StrategyToInsertRowData<T>[],
-		originalRows: StrategyToInsertRowData<T>[],
-		strategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FS>, T>>;
-
-	insert(
-		row: StrategyToInsertRowData<T>
-	): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-
-	insert(
-		rows: StrategyToInsertRowData<T>[]
-	): Promise<StrategyToRowArray<FetchedProperties<T, {}>, T>>;
-
-	insert<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>,
-		strategy: FS
-	): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-
-	insert<FS extends FetchingStrategy<T>>(
-		rows: StrategyToInsertRowData<T>[],
-		strategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FS>, T>>;
-
-	insertAndForget<TRow extends StrategyToInsertRowData<T> | StrategyToInsertRowData<T>[]>(
-		row: TRow
-	): Promise<void>;
-	getMany(
-		filter?: Filter | PrimaryRowFilter<T>[]
-	): Promise<StrategyToRowArray<FetchedProperties<T, {}>, T>>;
-	getMany<FS extends FetchingStrategy<T>>(
-		filter?: Filter | PrimaryRowFilter<T>[],
-		fetchingStrategy?: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FS>, T>>;
-	getAll(): Promise<StrategyToRowArray<FetchedProperties<T, {}>, T>>;
-	getAll<FS extends FetchingStrategy<T>>(
-		fetchingStrategy: FS
-	): Promise<StrategyToRowArray<FetchedProperties<T, FS>, T>>;
-
-	aggregate<FS extends AggregateStrategy<T>>(
-		fetchingStrategy: FS
-	): Promise<StrategyToRowData<FetchedAggregateProperties<T, FS>>[]>;
-
-	count(filter?: Filter | PrimaryRowFilter<T>[]): Promise<number>;
-	delete(filter?: Filter | PrimaryRowFilter<T>[]): Promise<void>;
-	deleteCascade(filter?: Filter | PrimaryRowFilter<T>[]): Promise<void>;
-
-	proxify(
-		row: StrategyToInsertRowData<T>
-	): StrategyToRow<FetchedProperties<T, {}>, T>;
-
-	proxify(
-		row: StrategyToInsertRowData<T>[]
-	): StrategyToRowArray<FetchedProperties<T, {}>, T>;
-
-	proxify<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>,
-		strategy: FS
-	): StrategyToRow<FetchedProperties<T, FS>, T>;
-
-	proxify<FS extends FetchingStrategy<T>>(
-		row: StrategyToInsertRowData<T>[],
-		strategy: FS
-	): StrategyToRowArray<FetchedProperties<T, FS>, T>;
-
-	patch<C extends Concurrency<T>>(
-		patch: JsonPatch,
-		concurrency?: C
-	): Promise<void>;
-
-	tsType<FS extends FetchingStrategy<T>>(
-		strategy: FS
-	): StrategyToRowData<FetchedProperties<T, FS>>;
-	tsType(
-	): StrategyToRowData<FetchedProperties<T, {}>>;
-
-	readonly metaData: Concurrency<T>;
-} & MappedColumnsAndRelations<T> &
-	GetById<T, CountProperties<ExtractPrimary<T>>>;
-
-type GetById<T, Count extends number> = Count extends 1
-	? {
-		getById(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>
-		): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-		getById<FS extends FetchingStrategy<T>>(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			fetchingStrategy: FS
-		): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-	}
-	: Count extends 2
-	? {
-		getById(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>
-		): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-		getById<FS extends FetchingStrategy<T>>(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			fetchingStrategy: FS
-		): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-	}
-	: Count extends 3
-	? {
-		getById(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			id3: ColumnToType<PickPropertyValue3<PickTypesOf<T, IsPrimary>>>
-		): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-		getById<FS extends FetchingStrategy<T>>(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			id3: ColumnToType<PickPropertyValue3<PickTypesOf<T, IsPrimary>>>,
-			fetchingStrategy: FS
-		): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-	}
-	: Count extends 4
-	? {
-		getById(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			id3: ColumnToType<PickPropertyValue3<PickTypesOf<T, IsPrimary>>>,
-			id4: ColumnToType<PickPropertyValue4<PickTypesOf<T, IsPrimary>>>
-		): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-		getById<FS extends FetchingStrategy<T>>(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			id3: ColumnToType<PickPropertyValue3<PickTypesOf<T, IsPrimary>>>,
-			id4: ColumnToType<PickPropertyValue4<PickTypesOf<T, IsPrimary>>>,
-			fetchingStrategy: FS
-		): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-	}
-	: Count extends 5
-	? {
-		getById(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			id3: ColumnToType<PickPropertyValue3<PickTypesOf<T, IsPrimary>>>,
-			id4: ColumnToType<PickPropertyValue4<PickTypesOf<T, IsPrimary>>>,
-			id5: ColumnToType<PickPropertyValue5<PickTypesOf<T, IsPrimary>>>
-		): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-		getById<FS extends FetchingStrategy<T>>(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			id3: ColumnToType<PickPropertyValue3<PickTypesOf<T, IsPrimary>>>,
-			id4: ColumnToType<PickPropertyValue4<PickTypesOf<T, IsPrimary>>>,
-			id5: ColumnToType<PickPropertyValue5<PickTypesOf<T, IsPrimary>>>,
-			fetchingStrategy: FS
-		): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-	}
-	: Count extends 6
-	? {
-		getById(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			id3: ColumnToType<PickPropertyValue3<PickTypesOf<T, IsPrimary>>>,
-			id4: ColumnToType<PickPropertyValue4<PickTypesOf<T, IsPrimary>>>,
-			id5: ColumnToType<PickPropertyValue5<PickTypesOf<T, IsPrimary>>>,
-			id6: ColumnToType<PickPropertyValue6<PickTypesOf<T, IsPrimary>>>
-		): Promise<StrategyToRow<FetchedProperties<T, {}>, T>>;
-		getById<FS extends FetchingStrategy<T>>(
-			id: ColumnToType<PickPropertyValue1<PickTypesOf<T, IsPrimary>>>,
-			id2: ColumnToType<PickPropertyValue2<PickTypesOf<T, IsPrimary>>>,
-			id3: ColumnToType<PickPropertyValue3<PickTypesOf<T, IsPrimary>>>,
-			id4: ColumnToType<PickPropertyValue4<PickTypesOf<T, IsPrimary>>>,
-			id5: ColumnToType<PickPropertyValue5<PickTypesOf<T, IsPrimary>>>,
-			id6: ColumnToType<PickPropertyValue6<PickTypesOf<T, IsPrimary>>>,
-			fetchingStrategy: FS
-		): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-	}
-	: never;
 
 type ColumnToType<T> = T extends UuidColumnSymbol
 	? string
@@ -555,44 +116,6 @@ type ColumnToType<T> = T extends UuidColumnSymbol
 	? JsonType
 	: never;
 
-type MappedColumnsAndRelations<T> = RemoveNeverFlat<{
-	[K in keyof T]: T[K] extends StringColumnTypeDef<infer M>
-	? StringColumnType<M>
-	: T[K] extends UuidColumnTypeDef<infer M>
-	? UuidColumnType<M>
-	: T[K] extends NumericColumnTypeDef<infer M>
-	? NumericColumnType<M>
-	: T[K] extends DateColumnTypeDef<infer M>
-	? DateColumnType<M>
-	: T[K] extends DateWithTimeZoneColumnTypeDef<infer M>
-	? DateWithTimeZoneColumnType<M>
-	: T[K] extends BinaryColumnTypeDef<infer M>
-	? BinaryColumnType<M>
-	: T[K] extends BooleanColumnTypeDef<infer M>
-	? BooleanColumnType<M>
-	: T[K] extends JSONColumnTypeDef<infer M>
-	? JSONColumnType<M>
-	: T[K] extends ManyRelation
-	? MappedColumnsAndRelations<T[K]> &
-	ManyTable<T[K]> & OneOrJoinTable<T[K]>
-	: T[K] extends RelatedTable
-	? MappedColumnsAndRelations<T[K]> & OneOrJoinTable<T[K]>
-	: never;
-}>;
-
-type OneOrJoinTable<T> = ((
-	fn: (table: MappedColumnsAndRelations<T>) => RawFilter
-) => Filter) & {
-	exists: () => Filter;
-};
-
-type ManyTable<T> = ((
-) => Filter) & {
-	all(selector: (table: MappedColumnsAndRelations<T>) => RawFilter): Filter;
-	any(selector: (table: MappedColumnsAndRelations<T>) => RawFilter): Filter;
-	none(selector: (table: MappedColumnsAndRelations<T>) => RawFilter): Filter;
-};
-
 export type AllowedDbMap<T> = {
 	[P in keyof T]: T[P] extends MappedTableDef<infer U> ? T[P] : never;
 };
@@ -605,64 +128,6 @@ type AllowedColumnsAndTablesConcurrency<T> = {
 };
 
 
-type FetchingStrategy<T> = FetchingStrategyBase<T> | AggType<T>
-
-type AggregateStrategy<T> = AggregateStrategyBase<T> | AggType<T>
-
-type AggType<T> = {
-	[name: string]: AggregationFunction<T>;
-} & {
-	where?: (agg: MappedColumnsAndRelations<T>) => RawFilter;
-};
-
-type AggregateStrategyBase<T> =
-	{
-		limit?: number;
-		offset?: number;
-		where?: (agg: MappedColumnsAndRelations<T>) => RawFilter;
-	};
-
-
-type FetchingStrategyBase<T, IsMany = true> =
-{
-	[K in keyof T &
-	keyof RemoveNever<
-		AllowedColumnsAndTablesStrategy<T>
-	>]?: T[K] extends ColumnSymbols
-	? boolean
-	: boolean | FetchingStrategyBase<T[K], T[K] extends ManyRelation ? true: false> | AggType<T[K]>;
-} &
-(IsMany extends true ? {
-	limit?: number;
-	offset?: number;
-	orderBy?:
-	| OrderBy<Extract<keyof AllowedColumns<T>, string>>[]
-	| OrderBy<Extract<keyof AllowedColumns<T>, string>>;
-	where?: (agg: MappedColumnsAndRelations<T>) => RawFilter;
-}
-: {
-	where?: (agg: MappedColumnsAndRelations<T>) => RawFilter;
-});
-
-type ExtractAggregates<Agg> = {
-	[K in keyof Agg as
-	Required<Agg>[K] extends (agg: Aggregate<infer V>) => ColumnSymbols
-	? K extends 'where' ? never : K
-	: never
-	]: Agg[K] extends (agg: Aggregate<infer V>) => infer R ? R : never;
-}
-
-type AggregationFunction<T> = (agg: Aggregate<T>) => ColumnSymbols;
-
-type Aggregate<T> =
-	RelatedColumns<T> &
-	{
-		sum(fn: (x: AggregateColumns<T>) => NumericColumnSymbol): NumericColumnSymbol & NotNull;
-		avg(fn: (x: AggregateColumns<T>) => NumericColumnSymbol): NumericColumnSymbol & NotNull;
-		min(fn: (x: AggregateColumns<T>) => NumericColumnSymbol): NumericColumnSymbol & NotNull;
-		max(fn: (x: AggregateColumns<T>) => NumericColumnSymbol): NumericColumnSymbol & NotNull;
-		count(fn: (x: AggregateColumns<T>) => NumericColumnSymbol): NumericColumnSymbol & NotNull;
-	}
 
 type RelatedColumns<T> = RemoveNeverFlat<{
 	[K in keyof T]:
@@ -738,8 +203,6 @@ type DbConcurrency<T> = {
 type ConcurrencyValues = 'optimistic' | 'skipOnConflict' | 'overwrite';
 
 
-type OrderBy<T extends string> = `${T} ${'asc' | 'desc'}` | T;
-
 type RelatedTable = {
 	[' relatedTable']: boolean;
 };
@@ -979,7 +442,6 @@ type MappedTableDefInit<T> = {
 	): MappedTableDef<T & V>;
 } & T;
 
-//todo
 type MappedTableDef<T> = {
 	map<V extends AllowedColumnsAndTablesMap<V>>(
 		callback: (mapper: ColumnMapper<T>) => V
@@ -1017,33 +479,6 @@ type NullInsertProperties<T> = Pick<
 type ColumnTypes = ColumnSymbols;
 type ColumnAndTableTypes = ColumnSymbols | RelatedTable;
 
-type StrategyToRow<T, U> = StrategyToRowData<T> & {
-	saveChanges(): Promise<void>;
-	saveChanges<C extends Concurrency<U>>(concurrency?: C): Promise<void>;
-	acceptChanges(): void;
-	clearChanges(): void;
-	refresh(): Promise<void>;
-	refresh<FS extends FetchingStrategy<U>>(
-		fetchingStrategy?: FS
-	): Promise<StrategyToRow<FetchedProperties<U, FS>, U>>;
-	delete(): Promise<void>;
-	delete(concurrency: Concurrency<U>): Promise<void>;
-};
-
-
-type StrategyToRowArray<T, U> = StrategyToRowData<T>[] & {
-	saveChanges(): Promise<void>;
-	saveChanges<C extends Concurrency<U>>(concurrency?: C): Promise<void>;
-	acceptChanges(): void;
-	clearChanges(): void;
-	refresh(): Promise<void>;
-	refresh<FS extends FetchingStrategy<U>>(
-		fetchingStrategy?: FS
-	): Promise<StrategyToRowArray<FetchedProperties<U, FS>, U>>;
-	delete(): Promise<void>;
-	delete(concurrency: Concurrency<U>): Promise<void>;
-};
-
 type JsonValue = null | boolean | number | string | JsonArray | JsonObject;
 
 interface JsonArray extends Array<JsonValue> { }
@@ -1102,176 +537,6 @@ type ExtractColumnBools<T, TStrategy> = RemoveNever<{
 
 type NegotiateNotNull<T> = T extends NotNull ? NotNull : {};
 
-type FetchedProperties<T, TStrategy> = FetchedColumnProperties<T, TStrategy> & FetchedRelationProperties<T, TStrategy> & ExtractAggregates<TStrategy>
-type FetchedAggregateProperties<T, TStrategy> = ExtractAggregates<TStrategy>;
-
-
-type FetchedRelationProperties<T, TStrategy> = RemoveNeverFlat<{
-	[K in keyof T]: K extends keyof TStrategy
-	? TStrategy[K] extends true
-	? T[K] extends ColumnSymbols
-	? never
-	: T[K] extends ManyRelation
-	? FetchedProperties<T[K], {}> & ManyRelation
-	: FetchedProperties<T[K], {}> & NegotiateNotNull<T[K]>
-	: TStrategy[K] extends false
-	? never
-	: T[K] extends ManyRelation
-	? FetchedProperties<T[K], TStrategy[K]> & ManyRelation
-	: FetchedProperties<T[K], TStrategy[K]> & NegotiateNotNull<T[K]>
-	: never;
-}>;
-
-type FetchedColumnProperties<T, TStrategy> = RemoveNeverFlat<
-	AtLeastOneTrue<ExtractColumnBools<T, TStrategy>> extends true
-	? {
-		[K in keyof T]: K extends keyof TStrategy
-		? TStrategy[K] extends true
-		? T[K] extends ColumnSymbols
-		? T[K]
-		: never
-		: never
-		: never;
-	}
-	: {
-		[K in keyof T]: K extends keyof TStrategy
-		? TStrategy[K] extends true
-		? T[K] extends ColumnSymbols
-		? T[K]
-		: never
-		: never
-		: NegotiateDefaultStrategy<T[K]>;
-	}
->;
-
-type StrategyToRowData<T> = {
-	[K in keyof RemoveNever<
-		NotNullProperties<T>
-	>]: T[K] extends StringColumnSymbol
-	? string
-	: T[K] extends UuidColumnSymbol
-	? string
-	: T[K] extends NumericColumnSymbol
-	? number
-	: T[K] extends DateColumnSymbol
-	? string | Date
-	: T[K] extends DateWithTimeZoneColumnSymbol
-	? string | Date
-	: T[K] extends BinaryColumnSymbol
-	? string
-	: T[K] extends BooleanColumnSymbol
-	? boolean
-	: T[K] extends JsonOf<infer M>
-	? M
-	: T[K] extends JSONColumnSymbol
-	? JsonType
-	: T[K] extends ManyRelation
-	? StrategyToRowData<T[K]>[]
-	: StrategyToRowData<T[K]>;
-} & {
-		[K in keyof RemoveNever<
-			NullProperties<T>
-		>]?: T[K] extends StringColumnSymbol
-		? string | null
-		: T[K] extends UuidColumnSymbol
-		? string | null
-		: T[K] extends NumericColumnSymbol
-		? number | null
-		: T[K] extends DateColumnSymbol
-		? string | Date | null
-		: T[K] extends DateWithTimeZoneColumnSymbol
-		? string | Date | null
-		: T[K] extends BinaryColumnSymbol
-		? string | null
-		: T[K] extends BooleanColumnSymbol
-		? boolean | null
-		: T[K] extends JsonOf<infer M>
-		? M | null
-		: T[K] extends JSONColumnSymbol
-		? JsonType | null
-		: T[K] extends ManyRelation
-		? StrategyToRowData<T[K]>[]
-		: StrategyToRowData<T[K]>;
-	};
-
-type StrategyToUpdateRowData<T> = Omit<{
-	[K in keyof T]?: T[K] extends StringColumnSymbol
-	? string
-	: T[K] extends UuidColumnSymbol
-	? string
-	: T[K] extends NumericColumnSymbol
-	? number
-	: T[K] extends DateColumnSymbol
-	? string | Date
-	: T[K] extends DateWithTimeZoneColumnSymbol
-	? string | Date
-	: T[K] extends BinaryColumnSymbol
-	? string
-	: T[K] extends BooleanColumnSymbol
-	? boolean
-	: T[K] extends JsonOf<infer M>
-	? M
-	: T[K] extends JSONColumnSymbol
-	? JsonType
-	: T[K] extends ManyRelation
-	? StrategyToInsertRowData<T[K]>[]
-	: StrategyToInsertRowData<T[K]>;
-	}, 'formulaDiscriminators' | 'columnDiscriminators' | ' notNull' | ' notNullExceptInsert' | 'map' | ' isManyRelation' | ' relatedTable' | ' isOneRelation'>
-	;
-
-type StrategyToInsertRowData<T> = Omit<{
-	[K in keyof RemoveNever<
-		NotNullInsertProperties<T>
-	>]: T[K] extends StringColumnSymbol
-	? string
-	: T[K] extends UuidColumnSymbol
-	? string
-	: T[K] extends NumericColumnSymbol
-	? number
-	: T[K] extends DateColumnSymbol
-	? string | Date
-	: T[K] extends DateWithTimeZoneColumnSymbol
-	? string | Date
-	: T[K] extends BinaryColumnSymbol
-	? string
-	: T[K] extends BooleanColumnSymbol
-	? boolean
-	: T[K] extends JsonOf<infer M>
-	? M
-	: T[K] extends JSONColumnSymbol
-	? JsonType
-	: T[K] extends ManyRelation
-	? StrategyToInsertRowData<T[K]>[]
-	: StrategyToInsertRowData<T[K]>;
-} & {
-		[K in keyof RemoveNever<
-			NullInsertProperties<T>
-		>]?: T[K] extends StringColumnSymbol
-		? string | null
-		: T[K] extends UuidColumnSymbol
-		? string | null
-		: T[K] extends NumericColumnSymbol
-		? number | null
-		: T[K] extends DateColumnSymbol
-		? string | Date | null
-		: T[K] extends DateWithTimeZoneColumnSymbol
-		? string | Date | null
-		: T[K] extends BinaryColumnSymbol
-		? string | null
-		: T[K] extends BooleanColumnSymbol
-		? boolean | null
-		: T[K] extends JsonOf<infer M>
-		? M | null
-		: T[K] extends JSONColumnSymbol
-		? JsonType | null
-		: T[K] extends ManyRelation
-		? StrategyToInsertRowData<T[K]>[]
-		: StrategyToInsertRowData<T[K]>;
-	}, 'formulaDiscriminators' | 'columnDiscriminators' | ' notNull' | ' notNullExceptInsert' | 'map' | ' isManyRelation' | ' relatedTable' | ' isOneRelation'>
-	;
-
-type NegotiateDefaultStrategy<T> = T extends ColumnSymbols ? T : never;
-
 type RemoveNever<T> = {
 	[K in keyof T as T[K] extends never ? never : K]: T[K] extends object
 	? RemoveNever<T[K]>
@@ -1285,183 +550,54 @@ type RemoveNeverFlat<T> = {
 type UuidColumnSymbol = {
 	[' isUuid']: true;
 };
-type UuidColumnType<M> = {
-	equal(value: string | null | undefined): Filter;
-	eq(value: string | null | undefined): Filter;
-	notEqual(value: string | null | undefined): Filter;
-	ne(value: string | null | undefined): Filter;
-	lessThan(value: string | null | undefined): Filter;
-	lt(value: string | null | undefined): Filter;
-	lessThanOrEqual(value: string | null | undefined): Filter;
-	le(value: string | null | undefined): Filter;
-	greaterThan(value: string | null | undefined): Filter;
-	gt(value: string | null | undefined): Filter;
-	greaterThanOrEqual(value: string | null | undefined): Filter;
-	ge(value: string | null | undefined): Filter;
-	between(from: string | null | undefined, to: string | null | undefined): Filter;
-	in(values: Array<string | null | undefined>): Filter;
-} & M &
+type UuidColumnType<M> = M &
 	UuidColumnSymbol;
 
 type BinaryColumnSymbol = {
 	[' isBinary']: true;
 };
-type BinaryColumnType<M> = {
-	equal(value: string | null | undefined): Filter;
-	eq(value: string | null | undefined): Filter;
-	notEqual(value: string | null | undefined): Filter;
-	ne(value: string | null | undefined): Filter;
-	lessThan(value: string | null | undefined): Filter;
-	lt(value: string | null | undefined): Filter;
-	lessThanOrEqual(value: string | null | undefined): Filter;
-	le(value: string | null | undefined): Filter;
-	greaterThan(value: string | null | undefined): Filter;
-	gt(value: string | null | undefined): Filter;
-	greaterThanOrEqual(value: string | null | undefined): Filter;
-	ge(value: string | null | undefined): Filter;
-	between(from: string | null | undefined, to: string | null | undefined): Filter;
-	in(values: Array<string | null | undefined>): Filter;
-} & M &
+type BinaryColumnType<M> = M &
 	BinaryColumnSymbol;
 
 type BooleanColumnSymbol = {
 	[' isBoolean']: true;
 };
 
-type BooleanColumnType<M> = {
-	equal(value: boolean | null | undefined): Filter;
-	eq(value: boolean | null | undefined): Filter;
-	notEqual(value: boolean | null | undefined): Filter;
-	ne(value: boolean | null | undefined): Filter;
-	lessThan(value: boolean | null | undefined): Filter;
-	lt(value: boolean | null | undefined): Filter;
-	lessThanOrEqual(value: boolean | null | undefined): Filter;
-	le(value: boolean | null | undefined): Filter;
-	greaterThan(value: boolean | null | undefined): Filter;
-	gt(value: boolean | null | undefined): Filter;
-	greaterThanOrEqual(value: boolean | null | undefined): Filter;
-	ge(value: boolean | null | undefined): Filter;
-	between(from: boolean | null | undefined, to: boolean | null | undefined): Filter;
-	in(values: Array<boolean | null | undefined>): Filter;
-} & M &
+type BooleanColumnType<M> = M &
 	BooleanColumnSymbol;
 
 type DateColumnSymbol = {
 	[' isDate']: true;
 };
 
-type DateColumnType<M> = {
-	equal(value: string | Date | null | undefined): Filter;
-	eq(value: string | Date | null | undefined): Filter;
-	notEqual(value: string | Date | null | undefined): Filter;
-	ne(value: string | Date | null | undefined): Filter;
-	lessThan(value: string | Date | null | undefined): Filter;
-	lt(value: string | Date | null | undefined): Filter;
-	lessThanOrEqual(value: string | Date | null | undefined): Filter;
-	le(value: string | Date | null | undefined): Filter;
-	greaterThan(value: string | Date | null | undefined): Filter;
-	gt(value: string | Date | null | undefined): Filter;
-	greaterThanOrEqual(value: string | Date | null | undefined): Filter;
-	ge(value: string | Date | null | undefined): Filter;
-	between(from: string | Date, to: string | Date | null | undefined): Filter;
-	in(values: Array<string | Date | null | undefined>): Filter;
-} & M &
+type DateColumnType<M> = M &
 	DateColumnSymbol;
 
 type DateWithTimeZoneColumnSymbol = {
 	[' isDateTimeZone']: true;
 };
 
-type DateWithTimeZoneColumnType<M> = {
-	equal(value: string | Date | null | undefined): Filter;
-	eq(value: string | Date | null | undefined): Filter;
-	notEqual(value: string | Date | null | undefined): Filter;
-	ne(value: string | Date | null | undefined): Filter;
-	lessThan(value: string | Date | null | undefined): Filter;
-	lt(value: string | Date | null | undefined): Filter;
-	lessThanOrEqual(value: string | Date | null | undefined): Filter;
-	le(value: string | Date | null | undefined): Filter;
-	greaterThan(value: string | Date | null | undefined): Filter;
-	gt(value: string | Date | null | undefined): Filter;
-	greaterThanOrEqual(value: string | Date | null | undefined): Filter;
-	ge(value: string | Date | null | undefined): Filter;
-	between(from: string | Date, to: string | Date | null | undefined): Filter;
-	in(values: Array<string | Date | null | undefined>): Filter;
-} & M &
+type DateWithTimeZoneColumnType<M> = M &
 	DateWithTimeZoneColumnSymbol;
 
 type StringColumnSymbol = {
 	[' isString']: true;
 };
 
-type StringColumnType<M> = {
-	equal(value: string | null | undefined): Filter;
-	eq(value: string | null | undefined): Filter;
-	notEqual(value: string | null | undefined): Filter;
-	ne(value: string | null | undefined): Filter;
-	lessThan(value: string | null | undefined): Filter;
-	lt(value: string | null | undefined): Filter;
-	lessThanOrEqual(value: string | null | undefined): Filter;
-	le(value: string | null | undefined): Filter;
-	greaterThan(value: string | null | undefined): Filter;
-	gt(value: string | null | undefined): Filter;
-	greaterThanOrEqual(value: string | null | undefined): Filter;
-	ge(value: string | null | undefined): Filter;
-	between(from: string | null | undefined, to: string | null | undefined): Filter;
-	in(values: Array<string | null | undefined>): Filter;
-
-	startsWith(value: string | null | undefined): Filter;
-	endsWith(value: string | null | undefined): Filter;
-	contains(value: string | null | undefined): Filter;
-	iStartsWith(value: string | null | undefined): Filter;
-	iEndsWith(value: string | null | undefined): Filter;
-	iContains(value: string | null | undefined): Filter;
-	iEqual(value: string | null | undefined): Filter;
-	ieq(value: string | null | undefined): Filter;
-} & M &
+type StringColumnType<M> = M &
 	StringColumnSymbol;
 
 type NumericColumnSymbol = {
 	[' isNumeric']: true;
 };
-type NumericColumnType<M> = {
-	equal(value: number | null | undefined): Filter;
-	eq(value: number | null | undefined): Filter;
-	notEqual(value: number | null | undefined): Filter;
-	ne(value: number | null | undefined): Filter;
-	lessThan(value: number | null | undefined): Filter;
-	lt(value: number | null | undefined): Filter;
-	lessThanOrEqual(value: number | null | undefined): Filter;
-	le(value: number | null | undefined): Filter;
-	greaterThan(value: number | null | undefined): Filter;
-	gt(value: number | null | undefined): Filter;
-	greaterThanOrEqual(value: number | null | undefined): Filter;
-	ge(value: number | null | undefined): Filter;
-	between(from: number, to: number | null | undefined): Filter;
-	in(values: Array<number | null | undefined>): Filter;
-} & M &
+type NumericColumnType<M> = M &
 	NumericColumnSymbol;
 
 type JSONColumnSymbol = {
 	[' isJSON']: true;
 };
 
-type JSONColumnType<M> = {
-	equal(value: ToJsonType<M> | null | undefined): Filter;
-	eq(value: ToJsonType<M> | null | undefined): Filter;
-	notEqual(value: ToJsonType<M> | null | undefined): Filter;
-	ne(value: ToJsonType<M> | null | undefined): Filter;
-	lessThan(value: ToJsonType<M> | null | undefined): Filter;
-	lt(value: ToJsonType<M> | null | undefined): Filter;
-	lessThanOrEqual(value: ToJsonType<M> | null | undefined): Filter;
-	le(value: ToJsonType<M> | null | undefined): Filter;
-	greaterThan(value: ToJsonType<M> | null | undefined): Filter;
-	gt(value: ToJsonType<M> | null | undefined): Filter;
-	greaterThanOrEqual(value: ToJsonType<M> | null | undefined): Filter;
-	ge(value: ToJsonType<M> | null | undefined): Filter;
-	between(from: ToJsonType<M>, to: ToJsonType<M> | null | undefined): Filter;
-	in(values: Array<ToJsonType<M> | null | undefined>): Filter;
-} & M &
+type JSONColumnType<M> =  M &
 	JSONColumnSymbol;
 
 interface IsPrimary {

package/src/map2.d.ts

@@ -207,13 +207,18 @@ type ValidColumnFilterTypes<M extends Record<string, TableDefinition<M>>, K exte
 
 // Column selection refs without filter methods - only for getting values/references
 type ColumnSelectionRefs<M extends Record<string, TableDefinition<M>>, K extends keyof M> = {
-  // Required columns (notNull = true)
-  [C in keyof M[K]['columns'] as IsRequired<M[K]['columns'][C]> extends true ? C : never]: ColumnTypeToTS<M[K]['columns'][C]>;
-} & {
-  // Optional columns (nullable)
-  [C in keyof M[K]['columns'] as IsRequired<M[K]['columns'][C]> extends true ? never : C]?: ColumnTypeToTS<M[K]['columns'][C]> | null | undefined;
+  [C in keyof M[K]['columns']]: M[K]['columns'][C];
 };
 
+
+// type ColumnSelectionRefs<M extends Record<string, TableDefinition<M>>, K extends keyof M> = {
+//   // Required columns (notNull = true)
+//   [C in keyof M[K]['columns'] as IsRequired<M[K]['columns'][C]> extends true ? C : never]: ColumnTypeToTS<M[K]['columns'][C]>;
+// } & {
+//   // Optional columns (nullable)
+//   [C in keyof M[K]['columns'] as IsRequired<M[K]['columns'][C]> extends true ? never : C]?: ColumnTypeToTS<M[K]['columns'][C]> | null | undefined;
+// };
+
 // Relation selection refs without filter methods - supports deep nesting
 // In selectors, all relation types just provide access to the target table structure
 // But WITHOUT aggregate functions (only available at root level)
@@ -578,6 +583,45 @@ type WithActiveRecord<T, M extends Record<string, TableDefinition<M>>, K extends
 type WithArrayActiveRecord<T extends Array<any>, M extends Record<string, TableDefinition<M>>, K extends keyof M> =
   T & ArrayActiveRecordMethods<M, K>;
 
+// Separate CustomSelectorProperties for aggregate (allows column name overlap)
+type AggregateCustomSelectorProperties<M extends Record<string, TableDefinition<M>>, K extends keyof M, FS extends Record<string, any>> = {
+  // Required properties (count, sum, avg) - no question mark, no null/undefined
+  [P in keyof FS as
+    P extends ReservedFetchStrategyProps ? never :
+    P extends (M[K] extends { relations: infer R } ? keyof R : never) ? never :
+    FS[P] extends (row: any) => any ?
+      (FS[P] extends (row: RootSelectionRefs<M, K>) => infer ReturnType
+        ? IsRequiredAggregate<ReturnType> extends true
+          ? P  // Required aggregates
+          : never
+        : never)
+      : never
+  ]: FS[P] extends (row: RootSelectionRefs<M, K>) => infer ReturnType
+      ? number  // Required aggregate functions (count, sum, avg) return required number
+      : never;
+} & {
+  // Optional properties (max, min, plain columns) - with question mark AND null/undefined
+  [P in keyof FS as
+    P extends ReservedFetchStrategyProps ? never :
+    P extends (M[K] extends { relations: infer R } ? keyof R : never) ? never :
+    FS[P] extends (row: any) => any ?
+      (FS[P] extends (row: RootSelectionRefs<M, K>) => infer ReturnType
+        ? IsRequiredAggregate<ReturnType> extends true
+          ? never  // Required aggregates are not optional
+          : P  // Everything else is optional
+        : never)
+      : never
+  ]?: FS[P] extends (row: RootSelectionRefs<M, K>) => infer ReturnType
+        ? IsMinMaxAggregate<ReturnType> extends true
+          ? ExtractMinMaxColumnType<ReturnType> | null | undefined
+          : IsAggregateFunction<ReturnType> extends true
+            ? number | null | undefined
+            : ReturnType extends ORMColumnDefinition | ORMJsonColumnDefinition
+              ? ColumnDefinitionToTS<ReturnType> | null | undefined
+              : never
+        : never;
+};
+
 export type TableClient<M extends Record<string, TableDefinition<M>>, K extends keyof M> = {
   // Array methods - return arrays with array-level active record methods, but individual items are plain
   getAll(): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, {}>>>, M, K>>;
@@ -586,7 +630,9 @@ export type TableClient<M extends Record<string, TableDefinition<M>>, K extends
   getMany<strategy extends FetchStrategy<M, K>>(filter: RawFilter | Array<PrimaryKeyObject<M, K>>, strategy: strategy): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, strategy>>>, M, K>>;
 
   // Aggregate methods - return plain objects (no active record methods)
-  aggregate<strategy extends AggregateStrategy<M, K>>(strategy: strategy): Promise<Array<DeepExpand<CustomSelectorProperties<M, K, strategy>>>>;
+  aggregate<strategy extends AggregateStrategy<M, K>>(strategy: strategy): Promise<Array<DeepExpand<AggregateCustomSelectorProperties<M, K, strategy>>>>;
+
+
 
   // Single item methods - return individual objects with individual active record methods
   getOne<strategy extends FetchStrategy<M, K>>(

package/src/cyclic.d.ts

@@ -1,132 +0,0 @@
-// Type definitions using a type mapping approach
-type EntityMap = {
-  Order: {
-    id: string;
-    date: Date;
-    total: number;
-  };
-  Line: {
-    id: string;
-    quantity: number;
-    price: number;
-  };
-  Package: {
-    id: string;
-    trackingNumber: string;
-    weight: number;
-  };
-  Customer: {
-    id: string;
-    name: string;
-    email: string;
-  };
-};
-
-// Enhanced relation mapping that includes cardinality information
-type RelationMap = {
-  Order: {
-    lines: { type: 'Line'; isArray: true };
-    customer: { type: 'Customer'; isArray: false };
-  };
-  Line: {
-    packages: { type: 'Package'; isArray: true };
-    order: { type: 'Order'; isArray: false };
-  };
-  Customer: {
-    orders: { type: 'Order'; isArray: true };
-  };
-  Package: {};
-};
-
-// Helper type to extract the entity type from a relation
-type RelationEntityType<R> = R extends { type: infer T extends keyof EntityMap } ? T : never;
-
-// Helper type to determine if a relation is an array
-type IsArray<R> = R extends { isArray: infer A extends boolean } ? A : false;
-
-// Generic deep type resolver
-type Depth = [never, 0, 1, 2, 3, 4, 5];
-
-// RecursiveType generic with improved depth handling
-type RecursiveType<
-  T extends keyof EntityMap,
-  D extends number = 5
-> = {
-  // Always include base properties
-  [K in keyof EntityMap[T]]: EntityMap[T][K];
-} & (D extends 0
-  ? // At max depth, only include base properties (which are already included above)
-    {}
-  : // Otherwise include relations with appropriate depth reduction
-    {
-      [K in keyof RelationMap[T]]: IsArray<RelationMap[T][K]> extends true
-        ? RecursiveType<
-            RelationEntityType<RelationMap[T][K]>,
-            Depth[D]
-          >[]
-        : RecursiveType<
-            RelationEntityType<RelationMap[T][K]>,
-            Depth[D]
-          >;
-    });
-
-// Generate the entity types with relationships resolved to the specified depth
-type Order = RecursiveType<'Order', 6>;
-
-type Line = RecursiveType<'Line'>;
-type Package = RecursiveType<'Package'>;
-type Customer = RecursiveType<'Customer'>;
-
-// Example usage
-function processOrder(order: Order, line: Line) {
-  // Can access nested properties up to depth 5
-  // const trackingNumber = order.customer.orders[0].lines[0].order.lines[0].packages[0].
-  // const orderId = order.customer.orders[0].customer.orders[0].lines[0].
-  line.order.customer.orders[0].lines[0].packages[0].
-  
-  console.log(trackingNumber, orderId);
-}
-
-// Allow custom depth control per entity type
-type OrderWithDepth1 = RecursiveType<'Order', 4>;
-
-// Example with custom depth
-function processOrderWithLimitedDepth(order: OrderWithDepth1) {
-  // This would work (depth 1)  
-
-  console.log(order.customer.id); // Can access base properties at max depth
-  console.log(order.customer.name); // Can access base properties at max depth
-  
-  // This would error - beyond depth 1
-  // console.log(order.customer.orders[0].id);
-}
-
-// Example of creating an instance with this type system
-const sampleOrder: Order = {
-  id: "ORD-123",
-  date: new Date(),
-  total: 299.99,
-  customer: {
-    id: "CUST-456",
-    name: "John Doe",
-    email: "john@example.com",
-    orders: [
-      /* would be recursive orders */
-    ]
-  },
-  lines: [
-    {
-      id: "LINE-789",
-      quantity: 2,
-      price: 149.99,
-      order: /* circular reference */,
-      packages: [
-        {
-          id: "PKG-101",
-          trackingNumber: "TRK123456789",
-          weight: 1.5
-        }
-      ]
-    }
-  ]
-};