From 312a6066e42ab1c443d01079211e3acf0df92a5d Mon Sep 17 00:00:00 2001
From: baldo <baldo@toppoint.de>
Date: Thu, 25 Aug 2022 21:10:37 +0200
Subject: [PATCH] Replace EnumValue type by more general TypeOf type.

---
 server/shared/types/index.ts | 15 +++++----------
 server/utils/resources.ts    |  8 ++++----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/server/shared/types/index.ts b/server/shared/types/index.ts
index 1a03fa4..f9a471e 100644
--- a/server/shared/types/index.ts
+++ b/server/shared/types/index.ts
@@ -1,9 +1,4 @@
-import {
-    ArrayField,
-    Field,
-    RawJsonField,
-    registerStringMapper,
-} from "sparkson";
+import { ArrayField, Field, RawJsonField } from "sparkson";
 
 // Types shared with the client.
 export type TypeGuard<T> = (arg: unknown) => arg is T;
@@ -71,8 +66,8 @@ export type JSONArray = Array<JSONValue>;
 
 export const isJSONArray = toIsArray(isJSONValue);
 
-export type EnumValue<E> = E[keyof E];
-export type EnumTypeGuard<E> = TypeGuard<EnumValue<E>>;
+export type ValueOf<T> = T[keyof T];
+export type EnumTypeGuard<E> = TypeGuard<ValueOf<E>>;
 
 export function unhandledEnumField(field: never): never {
     throw new Error(`Unhandled enum field: ${field}`);
@@ -138,7 +133,7 @@ export function isBoolean(arg: unknown): arg is boolean {
 }
 
 export function isUndefined(arg: unknown): arg is undefined {
-    return arg === undefined;
+    return typeof arg === "undefined";
 }
 
 export function isNull(arg: unknown): arg is null {
@@ -150,7 +145,7 @@ export function toIsArray<T>(isT: TypeGuard<T>): TypeGuard<T[]> {
 }
 
 export function toIsEnum<E>(enumDef: E): EnumTypeGuard<E> {
-    return (arg): arg is EnumValue<E> =>
+    return (arg): arg is ValueOf<E> =>
         Object.values(enumDef).includes(arg as [keyof E]);
 }
 
diff --git a/server/utils/resources.ts b/server/utils/resources.ts
index 218c939..e218f1a 100644
--- a/server/utils/resources.ts
+++ b/server/utils/resources.ts
@@ -12,7 +12,7 @@ import {
 import { Request, Response } from "express";
 import {
     EnumTypeGuard,
-    EnumValue,
+    ValueOf,
     type GenericSortField,
     getFieldIfExists,
     isJSONObject,
@@ -79,10 +79,10 @@ function respond(
 
 function orderByClause<S>(
     restParams: RestParams,
-    defaultSortField: EnumValue<S>,
+    defaultSortField: ValueOf<S>,
     isSortField: EnumTypeGuard<S>
 ): OrderByClause {
-    let sortField: EnumValue<S> | undefined = isSortField(restParams._sortField)
+    let sortField: ValueOf<S> | undefined = isSortField(restParams._sortField)
         ? restParams._sortField
         : undefined;
     if (!sortField) {
@@ -347,7 +347,7 @@ export { filterCondition as whereCondition };
 
 export function filterClause<S>(
     restParams: RestParams,
-    defaultSortField: EnumValue<S>,
+    defaultSortField: ValueOf<S>,
     isSortField: EnumTypeGuard<S>,
     filterFields: string[]
 ): FilterClause {