From 93548ccc2f83b71f6797e4607bc230cad485fbf3 Mon Sep 17 00:00:00 2001
From: Simon Hofer <simon.hofer@exact.com>
Date: Thu, 11 Jun 2026 08:42:54 +0200
Subject: [PATCH 1/2] chore: disallow arrays in orderBy of SomeQuery

---
 .../01-base/static/queriesWithQueryLanguage.ts.txt          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/generator/01-base/static/queriesWithQueryLanguage.ts.txt b/src/generator/01-base/static/queriesWithQueryLanguage.ts.txt
index eaa8da8..1a13739 100644
--- a/src/generator/01-base/static/queriesWithQueryLanguage.ts.txt
+++ b/src/generator/01-base/static/queriesWithQueryLanguage.ts.txt
@@ -163,6 +163,10 @@ export type CountQuery<F> = {
   where?: QueryFilter<F>;
 };
 
+type NonArrayProps<T> = {
+  [K in keyof T as T[K] extends any[] ? never : K]: T[K];
+};
+
 type SomeQueryBase<E, F, I, P> = {
   serializeNulls?: boolean;
   include?: I;
@@ -173,7 +177,7 @@ type SomeQueryBase<E, F, I, P> = {
 };
 
 export type SomeQuery<E, F, I, P> = SomeQueryBase<E, F, I, P> &
-  ({ sort?: Sort<E>[]; orderBy?: never } | { sort?: never; orderBy?: OrderBy<F>[] });
+  ({ sort?: Sort<E>[]; orderBy?: never } | { sort?: never; orderBy?: OrderBy<NonArrayProps<F>>[] });
 
 const comparisonOperatorList: ComparisonOperator[] = [
   'EQ',

From ec6d9319047a2936f5715d9c0254670eb34be43b Mon Sep 17 00:00:00 2001
From: Simon Hofer <simon.hofer@exact.com>
Date: Wed, 17 Jun 2026 11:14:42 +0200
Subject: [PATCH 2/2] chore: disallow arrays in orderBy of SomeQuery

Sharpen NonArrayProps type
---
 src/generator/01-base/static/queriesWithQueryLanguage.ts.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/generator/01-base/static/queriesWithQueryLanguage.ts.txt b/src/generator/01-base/static/queriesWithQueryLanguage.ts.txt
index 1a13739..025c877 100644
--- a/src/generator/01-base/static/queriesWithQueryLanguage.ts.txt
+++ b/src/generator/01-base/static/queriesWithQueryLanguage.ts.txt
@@ -163,8 +163,11 @@ export type CountQuery<F> = {
   where?: QueryFilter<F>;
 };
 
+type ContainsArray<T> =
+  T extends any[] ? true : never;
+
 type NonArrayProps<T> = {
-  [K in keyof T as T[K] extends any[] ? never : K]: T[K];
+  [K in keyof T as [ContainsArray<T[K]>] extends [never] ? K : never]: T[K]
 };
 
 type SomeQueryBase<E, F, I, P> = {