Use Object.hasOwn instead of in keyword

Author: hhvrc

src/app.d.ts

@@ -13,6 +13,12 @@ declare global {
   declare interface Window {
     turnstile: TurnstileInstance | undefined;
   }
+  interface ObjectConstructor {
+    hasOwn<T extends object, K extends PropertyKey>(
+      o: T,
+      prop: K,
+    ): o is T & Record<K, unknown>;
+  }
 }
 
 export {};

src/lib/errorhandling/apiErrorHandling.ts

@@ -42,7 +42,7 @@ export async function handleApiError(
     return;
   }
 
-  if ('cause' in error) {
+  if (Object.hasOwn(error, 'cause')) {
     console.error('Got unknown error type: ' + JSON.stringify(error)); // TODO: Display toast
     return;
   }

src/lib/signalr/models/ControlLog.ts

@@ -15,24 +15,24 @@ export interface ControlLog {
 function isControlLogShockerInfo(value: unknown): value is ControlLogShockerInfo {
   return (
     isObject(value) &&
-    'id' in value &&
+    Object.hasOwn(value, 'id') &&
+    Object.hasOwn(value, 'name') &&
     isString(value.id) &&
-    'name' in value &&
     isString(value.name)
   );
 }
 export function isControlLog(value: unknown): value is ControlLog {
   return (
     isObject(value) &&
-    'shocker' in value &&
+    Object.hasOwn(value, 'shocker') &&
+    Object.hasOwn(value, 'type') &&
+    Object.hasOwn(value, 'intensity') &&
+    Object.hasOwn(value, 'duration') &&
+    Object.hasOwn(value, 'executedAt') &&
     isControlLogShockerInfo(value.shocker) &&
-    'type' in value &&
     isNumber(value.type) &&
-    'intensity' in value &&
     isNumber(value.intensity) &&
-    'duration' in value &&
     isNumber(value.duration) &&
-    'executedAt' in value &&
     isString(value.executedAt)
   );
 }

src/lib/signalr/models/ControlLogSender.ts

@@ -2,7 +2,7 @@ import { isObject, isString } from '$lib/typeguards';
 
 export interface ControlLogSender {
   connectionId: string;
-  additionalItems: { [key: string]: object };
+  additionalItems: object;
   id: string;
   name: string;
   image: string;
@@ -12,18 +12,17 @@ export interface ControlLogSender {
 export function isControlLogSender(value: unknown): value is ControlLogSender {
   return (
     isObject(value) &&
-    'connectionId' in value &&
+    Object.hasOwn(value, 'connectionId') &&
+    Object.hasOwn(value, 'additionalItems') &&
+    Object.hasOwn(value, 'id') &&
+    Object.hasOwn(value, 'name') &&
+    Object.hasOwn(value, 'image') &&
+    Object.hasOwn(value, 'customName') &&
     isString(value.connectionId) &&
-    'additionalItems' in value &&
     isObject(value.additionalItems) &&
-    Object.values(value.additionalItems).every(isObject) &&
-    'id' in value &&
     isString(value.id) &&
-    'name' in value &&
     isString(value.name) &&
-    'image' in value &&
     isString(value.image) &&
-    'customName' in value &&
     (value.customName === null || isString(value.customName))
   );
 }

src/lib/signalr/models/DeviceOnlineState.ts

@@ -1,4 +1,4 @@
-import { isObject } from '$lib/typeguards';
+import { isBoolean, isObject, isString } from '$lib/typeguards';
 
 export interface DeviceOnlineState {
   device: string;
@@ -9,11 +9,11 @@ export interface DeviceOnlineState {
 export function isDeviceOnlineState(value: unknown): value is DeviceOnlineState {
   return (
     isObject(value) &&
-    'device' in value &&
-    'online' in value &&
-    'firmwareVersion' in value &&
-    typeof value.device === 'string' &&
-    typeof value.online === 'boolean' &&
-    (typeof value.firmwareVersion === 'string' || value.firmwareVersion === null)
+    Object.hasOwn(value, 'device') &&
+    Object.hasOwn(value, 'online') &&
+    Object.hasOwn(value, 'firmwareVersion') &&
+    isString(value.device) &&
+    isBoolean(value.online) &&
+    (value.firmwareVersion === null || isString(value.firmwareVersion))
   );
 }

src/lib/typeguards/basicGuards.ts

@@ -1,5 +1,5 @@
-export function isObject(data: unknown): data is object {
-  return typeof data === 'object' && data !== null;
+export function isObject(value: unknown): value is object {
+  return typeof value === 'object' && !Array.isArray(value) && value !== null;
 }
 export function isString(value: unknown): value is string {
   return typeof value === 'string' || value instanceof String;
@@ -14,5 +14,5 @@ export function isArrayBuffer(value: unknown): value is ArrayBuffer {
   return value instanceof ArrayBuffer;
 }
 export function isDate(value: unknown): value is Date {
-  return value instanceof Date && !isNaN(value.getTime());
+  return value instanceof Date;
 }

tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "./.svelte-kit/tsconfig.json",
   "compilerOptions": {
+    "lib": ["es2022", "DOM"],
     "allowJs": true,
     "checkJs": true,
     "esModuleInterop": true,

vite.config.ts

@@ -64,6 +64,9 @@ export default defineConfig(async ({ command, mode, isPreview }) => {
   const useLocalRedirect = isLocalServe && !isProduction && !isTruthy(env.CI);
 
   return defineConfig({
+    build: {
+      target: 'es2022'
+    },
     plugins: [...(useLocalRedirect ? [mkcert()] : []), sveltekit(), tailwindcss()],
     server: await getServerConfig(mode, useLocalRedirect),
     test: { include: ['src/**/*.{test,spec}.{js,ts}'] },