fix: order should allow only model fields, not methods (#7188)

Closes: #7178 Co-authored-by: Tomasz Rychlewicz <tomasz.rychlewicz@explaineverything.com>
typeorm · Dec 22, 2020 · 0194193 · 0194193
1 parent f019771
commit 0194193
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/common/EntityFieldsNames.ts b/src/common/EntityFieldsNames.ts
@@ -0,0 +1,6 @@
+/**
+ * Interface of the entity fields names only (without functions)
+ */
+export type EntityFieldsNames<Entity = any> = {
+    [P in keyof Entity]: Entity[P] extends Function ? never : P;
+}[keyof Entity];
diff --git a/src/find-options/FindOneOptions.ts b/src/find-options/FindOneOptions.ts
@@ -1,3 +1,4 @@
+import {EntityFieldsNames} from "../common/EntityFieldsNames";
 import {JoinOptions} from "./JoinOptions";
 import {ObjectLiteral} from "../common/ObjectLiteral";
 import {FindConditions} from "./FindConditions";
@@ -30,7 +31,7 @@ export interface FindOneOptions<Entity = any> {
     /**
      * Order, in which entities should be ordered.
      */
-    order?: { [P in keyof Entity]?: "ASC"|"DESC"|1|-1 };
+    order?: { [P in EntityFieldsNames<Entity>]?: "ASC"|"DESC"|1|-1 };
 
     /**
      * Enables or disables query result caching.