further simply query constraints type

src/refs/composite.ts

@@ -6,8 +6,10 @@ export const andCreator: AndCreator =
 	() =>
 	// @ts-expect-error
 	(...queryConstraints) => {
-		// @ts-expect-error
-		const constraints = queryBuilder(queryConstraints)
+		const constraints = queryBuilder(
+			// @ts-expect-error
+			queryConstraints
+		)
 		return {
 			type: 'and',
 			constraints,
@@ -19,8 +21,10 @@ export const orCreator: OrCreator =
 	() =>
 	// @ts-expect-error
 	(...queryConstraints) => {
-		// @ts-expect-error
-		const constraints = queryBuilder(queryConstraints)
+		const constraints = queryBuilder(
+			// @ts-expect-error
+			queryConstraints
+		)
 		return {
 			type: 'or',
 			constraints,

src/refs/utils.ts

@@ -1,4 +1,4 @@
-import { QueryAllConstraints, MetaType, QueryFilterConstraints } from '../types'
+import { QueryAllConstraints, QueryFilterConstraints } from '../types'
 
 export const buildPathFromColIDsAndDocIDs = ({
 	collectionIDs,
@@ -14,9 +14,7 @@ export const buildPathFromColIDsAndDocIDs = ({
 }
 
 export const queryBuilder = (
-	queryConstraints:
-		| QueryAllConstraints<MetaType>[]
-		| QueryFilterConstraints<MetaType>[]
+	queryConstraints: QueryAllConstraints[] | QueryFilterConstraints[]
 ) =>
 	queryConstraints.reduce((acc, qc) => {
 		const type = qc.type

src/types/queryConstraints/composite.ts

@@ -6,9 +6,8 @@ import { ErrorEmptyCompositeFilter } from '../error'
 import { OriQueryCompositeFilterConstraint } from '../alias'
 
 export type QueryCompositeFilterConstraint<
-	T extends MetaType,
 	Y extends 'and' | 'or',
-	X extends QueryFilterConstraints<T>[]
+	X extends QueryFilterConstraints[]
 > = {
 	type: Y
 	constraints: X
@@ -17,7 +16,7 @@ export type QueryCompositeFilterConstraint<
 
 type QueryCompositeFilter<T extends MetaType, Type extends 'and' | 'or'> = <
 	Q extends GeneralQuery<T>,
-	QFCs extends QueryFilterConstraints<T>[]
+	QFCs extends QueryFilterConstraints[]
 >(
 	...queryFilterConstraints: QFCs extends never
 		? QFCs
@@ -28,9 +27,9 @@ type QueryCompositeFilter<T extends MetaType, Type extends 'and' | 'or'> = <
 				Q,
 				QFCs,
 				[],
-				QueryCompositeFilterConstraint<T, Type, QFCs>
+				QueryCompositeFilterConstraint<Type, QFCs>
 		  >
-) => QueryCompositeFilterConstraint<T, Type, QFCs>
+) => QueryCompositeFilterConstraint<Type, QFCs>
 
 /**
  * Creates a new {@link QueryCompositeFilterConstraint} that is a conjunction of

src/types/queryConstraints/query.ts

@@ -1,24 +1,23 @@
-import { MetaType } from '../metaTypeCreator'
 import { WhereFilterOp } from '../alias'
 import { CursorType, CursorConstraint } from './cursor'
 import { WhereConstraint } from './where'
 import { LimitConstraint } from './limit'
 import { OrderByConstraint } from './orderBy'
 import { QueryCompositeFilterConstraint } from './composite'
 
-type QueryNonFilterConstraints<T extends MetaType> =
+type QueryNonFilterConstraints =
 	| LimitConstraint<'limit' | 'limitToLast'>
 	| CursorConstraint<CursorType, unknown[]>
 	| OrderByConstraint<string>
 
-export type QueryConstraints<T extends MetaType> =
+export type QueryConstraints =
 	| WhereConstraint<string, WhereFilterOp, unknown>
-	| QueryNonFilterConstraints<T>
+	| QueryNonFilterConstraints
 
-export type QueryFilterConstraints<T extends MetaType> =
+export type QueryFilterConstraints =
 	| WhereConstraint<string, WhereFilterOp, unknown>
-	| QueryCompositeFilterConstraint<T, 'and' | 'or', QueryFilterConstraints<T>[]>
+	| QueryCompositeFilterConstraint<'and' | 'or', QueryFilterConstraints[]>
 
-export type QueryAllConstraints<T extends MetaType> =
-	| QueryConstraints<T>
-	| QueryCompositeFilterConstraint<T, 'and' | 'or', QueryFilterConstraints<T>[]>
+export type QueryAllConstraints =
+	| QueryConstraints
+	| QueryCompositeFilterConstraint<'and' | 'or', QueryFilterConstraints[]>

src/types/queryConstraintsLimitations/composite.ts

@@ -22,22 +22,20 @@ import { NotIn } from './utils'
 
 type GetAllQueryFilterCompositeConstraint<
 	T extends MetaType,
-	QQCs extends readonly QueryAllConstraints<T>[],
+	QQCs extends readonly QueryAllConstraints[],
 	QueryCompositeConstraintAcc extends QueryCompositeFilterConstraint<
-		T,
 		'and' | 'or',
-		QueryFilterConstraints<T>[]
+		QueryFilterConstraints[]
 	>
-> = QQCs extends [infer H, ...infer R extends QueryAllConstraints<T>[]]
+> = QQCs extends [infer H, ...infer R extends QueryAllConstraints[]]
 	?
 			| QueryCompositeConstraintAcc
 			| GetAllQueryFilterCompositeConstraint<
 					T,
 					R,
 					| (H extends QueryCompositeFilterConstraint<
-							T,
 							'and' | 'or',
-							QueryFilterConstraints<T>[]
+							QueryFilterConstraints[]
 					  >
 							? H
 							: never)
@@ -49,7 +47,7 @@ type GetAllQueryFilterCompositeConstraint<
 // check where + or/and
 export type ValidateTopLevelQueryCompositeFilterPartOne<
 	T extends MetaType,
-	AllQQCs extends readonly QueryAllConstraints<T>[]
+	AllQQCs extends readonly QueryAllConstraints[]
 > = AllQQCs extends (infer P)[]
 	? Extract<P, WhereConstraint<string, WhereFilterOp, unknown>> extends never
 		? true
@@ -62,13 +60,12 @@ export type ValidateTopLevelQueryCompositeFilterPartOne<
 // check or/and + or/and
 export type ValidateTopLevelQueryCompositeFilterPartTwo<
 	T extends MetaType,
-	AllQQCs extends readonly QueryAllConstraints<T>[],
+	AllQQCs extends readonly QueryAllConstraints[],
 	AlreadyExist extends boolean = false
-> = AllQQCs extends [infer Head, ...infer Rest extends QueryAllConstraints<T>[]]
+> = AllQQCs extends [infer Head, ...infer Rest extends QueryAllConstraints[]]
 	? Head extends QueryCompositeFilterConstraint<
-			T,
 			'and' | 'or',
-			QueryFilterConstraints<T>[]
+			QueryFilterConstraints[]
 	  >
 		? AlreadyExist extends false
 			? ValidateTopLevelQueryCompositeFilterPartTwo<T, Rest, true>
@@ -78,18 +75,17 @@ export type ValidateTopLevelQueryCompositeFilterPartTwo<
 
 export type FlattenQueryCompositeFilterConstraint<
 	T extends MetaType,
-	QQCs extends readonly QueryAllConstraints<T>[],
-	ACC extends QueryConstraints<T>[] = []
-> = QQCs extends [infer Head, ...infer Rest extends QueryAllConstraints<T>[]]
+	QQCs extends readonly QueryAllConstraints[],
+	ACC extends QueryConstraints[] = []
+> = QQCs extends [infer Head, ...infer Rest extends QueryAllConstraints[]]
 	? FlattenQueryCompositeFilterConstraint<
 			T,
 			Rest,
-			Head extends QueryConstraints<T>
+			Head extends QueryConstraints
 				? [...ACC, Head]
 				: Head extends QueryCompositeFilterConstraint<
-						T,
 						'and' | 'or',
-						QueryFilterConstraints<T>[]
+						QueryFilterConstraints[]
 				  >
 				? [
 						...ACC,
@@ -106,22 +102,17 @@ export type FlattenQueryCompositeFilterConstraint<
 export type QueryFilterConstraintLimitation<
 	T extends MetaType,
 	Q extends GeneralQuery<T>,
-	RestQQCs extends readonly QueryAllConstraints<T>[],
-	PreviousQCs extends readonly QueryConstraints<T>[],
+	RestQQCs extends readonly QueryAllConstraints[],
+	PreviousQCs extends readonly QueryConstraints[],
 	ParentConstraint extends QueryCompositeFilterConstraint<
-		T,
 		'and' | 'or',
-		QueryFilterConstraints<T>[]
+		QueryFilterConstraints[]
 	>
 > = RestQQCs extends [
 	infer Head extends
-		| QueryConstraints<T>
-		| QueryCompositeFilterConstraint<
-				T,
-				'and' | 'or',
-				QueryFilterConstraints<T>[]
-		  >,
-	...infer Rest extends QueryAllConstraints<T>[]
+		| QueryConstraints
+		| QueryCompositeFilterConstraint<'and' | 'or', QueryFilterConstraints[]>,
+	...infer Rest extends QueryAllConstraints[]
 ]
 	? [
 			Head extends
@@ -138,12 +129,10 @@ export type QueryFilterConstraintLimitation<
 						: WhereConstraintLimitation<T, Q, Head, PreviousQCs>
 					: WhereConstraintLimitation<T, Q, Head, PreviousQCs>
 				: Head extends QueryCompositeFilterConstraint<
-						T,
 						'and' | 'or',
-						QueryFilterConstraints<T>[]
+						QueryFilterConstraints[]
 				  >
 				? QueryCompositeFilterConstraint<
-						T,
 						Head['type'],
 						QueryFilterConstraintLimitation<
 							T,

src/types/queryConstraintsLimitations/cursor.ts

@@ -48,7 +48,7 @@ export type CursorConstraintLimitation<
 	T extends MetaType,
 	Q extends GeneralQuery<T>,
 	U extends CursorConstraint<CursorType, unknown[]>,
-	PreviousQCs extends readonly QueryConstraints<T>[]
+	PreviousQCs extends readonly QueryConstraints[]
 > = CursorConstraint<
 	CursorType,
 	ValidateCursorOrderBy<T, Q, U['values'], GetAllOrderBy<T, PreviousQCs, []>>

src/types/queryConstraintsLimitations/limit.ts

@@ -5,9 +5,9 @@ import { QueryConstraints, LimitConstraint } from '../queryConstraints'
 export type LimitToLastConstraintLimitation<
 	T extends MetaType,
 	U extends LimitConstraint<'limitToLast'>,
-	AllQCs extends readonly QueryConstraints<T>[]
+	AllQCs extends readonly QueryConstraints[]
 > = AllQCs extends (infer A)[]
-	? A extends QueryConstraints<T>
+	? A extends QueryConstraints
 		? A['type'] extends 'orderBy'
 			? U
 			: ErrorLimitToLastOrderBy

src/types/queryConstraintsLimitations/orderBy.ts

@@ -3,21 +3,21 @@ import { QueryConstraints, OrderByConstraint } from '../queryConstraints'
 
 export type GetFirstOrderBy<
 	T extends MetaType,
-	QCs extends readonly QueryConstraints<T>[]
+	QCs extends readonly QueryConstraints[]
 > = QCs extends [infer H, ...infer Rest]
 	? H extends OrderByConstraint<string>
 		? H
-		: Rest extends readonly QueryConstraints<T>[]
+		: Rest extends readonly QueryConstraints[]
 		? GetFirstOrderBy<T, Rest>
 		: never // impossible route
 	: true // not found, no check needed
 
 export type GetAllOrderBy<
 	T extends MetaType,
-	QCs extends readonly QueryConstraints<T>[],
+	QCs extends readonly QueryConstraints[],
 	AllOrderBy extends OrderByConstraint<string>[]
 > = QCs extends [infer H, ...infer Rest]
-	? Rest extends readonly QueryConstraints<T>[]
+	? Rest extends readonly QueryConstraints[]
 		? GetAllOrderBy<
 				T,
 				Rest,

src/types/queryConstraintsLimitations/query.ts

@@ -31,7 +31,7 @@ import {
 // If you include a filter with a range comparison (<, <=, >, >=), your first ordering must be on the same field
 export type ValidateOrderByAndInequalityWhere<
 	T extends MetaType,
-	AllQCs extends readonly QueryConstraints<T>[]
+	AllQCs extends readonly QueryConstraints[]
 > = GetFirstInequalityWhere<T, AllQCs> extends infer W extends WhereConstraint<
 	string,
 	InequalityOpStr,
@@ -49,12 +49,12 @@ export type ValidateOrderByAndInequalityWhere<
 export type QueryConstraintLimitation<
 	T extends MetaType,
 	Q extends GeneralQuery<T>,
-	RestQQCs extends readonly QueryAllConstraints<T>[],
-	PreviousQCs extends readonly QueryConstraints<T>[],
-	AllQCs extends readonly QueryConstraints<T>[]
+	RestQQCs extends readonly QueryAllConstraints[],
+	PreviousQCs extends readonly QueryConstraints[],
+	AllQCs extends readonly QueryConstraints[]
 > = RestQQCs extends [
-	infer Head extends QueryAllConstraints<T>,
-	...infer Rest extends QueryAllConstraints<T>[]
+	infer Head extends QueryAllConstraints,
+	...infer Rest extends QueryAllConstraints[]
 ]
 	? [
 			Head extends LimitConstraint<'limit'> | OrderByConstraint<string>
@@ -72,9 +72,8 @@ export type QueryConstraintLimitation<
 				: Head extends CursorConstraint<CursorType, unknown[]>
 				? CursorConstraintLimitation<T, Q, Head, PreviousQCs>
 				: Head extends QueryCompositeFilterConstraint<
-						T,
 						'and' | 'or',
-						QueryFilterConstraints<T>[]
+						QueryFilterConstraints[]
 				  >
 				? QueryFilterConstraintLimitation<
 						T,

src/types/queryConstraintsLimitations/where.ts

@@ -31,7 +31,7 @@ import { DeepValue } from '../objectFlatten'
 type ValidateWhereNotIn<
 	T extends MetaType,
 	U extends WhereConstraint<string, WhereFilterOp, unknown>,
-	PreviousQCs extends readonly QueryConstraints<T>[]
+	PreviousQCs extends readonly QueryConstraints[]
 > = U['opStr'] extends NotIn
 	? Extract<
 			GetAllWhereConstraintOpStr<T, PreviousQCs, never>,
@@ -52,7 +52,7 @@ type ValidateWhereNotIn<
 type ValidateWhereNotEqual<
 	T extends MetaType,
 	U extends WhereConstraint<string, WhereFilterOp, unknown>,
-	PreviousQCs extends readonly QueryConstraints<T>[]
+	PreviousQCs extends readonly QueryConstraints[]
 > = U['opStr'] extends NotEqual
 	? Extract<
 			GetAllWhereConstraintOpStr<T, PreviousQCs, never>,
@@ -66,7 +66,7 @@ type ValidateWhereNotEqual<
 export type ValidateWhereArrayContainsArrayContainsAny<
 	T extends MetaType,
 	U extends WhereConstraint<string, WhereFilterOp, unknown>,
-	PreviousQCs extends readonly QueryConstraints<T>[]
+	PreviousQCs extends readonly QueryConstraints[]
 > = U['opStr'] extends ArrayContains
 	? Extract<
 			GetAllWhereConstraintOpStr<T, PreviousQCs, never>,
@@ -87,7 +87,7 @@ export type ValidateWhereArrayContainsArrayContainsAny<
 type ValidateWhereInequalityOpStrSameField<
 	T extends MetaType,
 	U extends WhereConstraint<string, WhereFilterOp, unknown>,
-	PreviousQCs extends readonly QueryConstraints<T>[]
+	PreviousQCs extends readonly QueryConstraints[]
 > = U['opStr'] extends InequalityOpStr
 	? Extract<
 			GetAllWhereConstraint<T, PreviousQCs, never>,
@@ -107,19 +107,19 @@ type ValidateWhereInequalityOpStrSameField<
 
 export type GetFirstInequalityWhere<
 	T extends MetaType,
-	QCs extends readonly QueryConstraints<T>[]
-> = QCs extends [infer H, ...infer Rest extends readonly QueryConstraints<T>[]]
+	QCs extends readonly QueryConstraints[]
+> = QCs extends [infer H, ...infer Rest extends readonly QueryConstraints[]]
 	? H extends WhereConstraint<string, InequalityOpStr, unknown>
 		? H
 		: GetFirstInequalityWhere<T, Rest>
 	: true // not found, no check needed
 
 export type GetAllWhereConstraint<
 	T extends MetaType,
-	AllQCs extends readonly QueryConstraints<T>[],
+	AllQCs extends readonly QueryConstraints[],
 	WhereConstraintsAcc extends WhereConstraint<string, WhereFilterOp, unknown>
 > = AllQCs extends [infer H, ...infer R]
-	? R extends readonly QueryConstraints<T>[]
+	? R extends readonly QueryConstraints[]
 		?
 				| WhereConstraintsAcc
 				| GetAllWhereConstraint<
@@ -135,10 +135,10 @@ export type GetAllWhereConstraint<
 
 type GetAllWhereConstraintOpStr<
 	T extends MetaType,
-	QCs extends readonly QueryConstraints<T>[],
+	QCs extends readonly QueryConstraints[],
 	OpStrAcc extends WhereFilterOp
 > = QCs extends [infer H, ...infer R]
-	? R extends readonly QueryConstraints<T>[]
+	? R extends readonly QueryConstraints[]
 		?
 				| OpStrAcc
 				| GetAllWhereConstraintOpStr<
@@ -156,7 +156,7 @@ export type WhereConstraintLimitation<
 	T extends MetaType,
 	Q extends GeneralQuery<T>,
 	U extends WhereConstraint<string, WhereFilterOp, unknown>,
-	PreviousQCs extends readonly QueryConstraints<T>[]
+	PreviousQCs extends readonly QueryConstraints[]
 > = ValidateWhereNotIn<T, U, PreviousQCs> extends infer R extends string
 	? R
 	: ValidateWhereNotEqual<T, U, PreviousQCs> extends infer P extends string