add helper to set maybeRef

myparcelnl · Oct 3, 2024 · 4878c5f · 4878c5f
1 parent 4c37ed8
commit 4878c5f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 37 deletions.
diff --git a/libs/core/src/form/Field.ts b/libs/core/src/form/Field.ts
@@ -5,7 +5,7 @@ import {type CustomHookItem, createHookManager} from '@myparcel-vfb/hook-manager
 import {isOfType, asyncEvery, type PromiseOr} from '@myparcel/ts-utils';
 import {isRequired} from '../validators';
 import {normalizeFieldConfiguration} from '../utils/normalizeFieldConfiguration';
-import {useDynamicWatcher} from '../utils';
+import {useDynamicWatcher, updateMaybeRef} from '../utils';
 import {
   type ToRecord,
   type FieldConfiguration,
@@ -160,57 +160,27 @@ export class Field<Type = unknown, Props extends ComponentProps = ComponentProps
   };
 
   public setValue(value: Type): void {
-    if (isRef(this.ref)) {
-      this.ref.value = value;
-    } else {
-      // @ts-expect-error todo
-      this.ref = value;
-    }
+    updateMaybeRef(this.ref, value);
   }
 
   public setDisabled(value: boolean): void {
-    if (isRef(this.isDisabled)) {
-      this.isDisabled.value = value;
-    } else {
-      // @ts-expect-error update types to for when the refs are unwrapped
-      this.isDisabled = value;
-    }
+    updateMaybeRef(this.isDisabled, value);
   }
 
   public setOptional(value: boolean): void {
-    if (isRef(this.isOptional)) {
-      this.isOptional.value = value;
-    } else {
-      // @ts-expect-error update types to for when the refs are unwrapped
-      this.isOptional = value;
-    }
+    updateMaybeRef(this.isOptional, value);
   }
 
   public setReadOnly(value: boolean): void {
-    if (isRef(this.isReadOnly)) {
-      this.isReadOnly.value = value;
-    } else {
-      // @ts-expect-error update types to for when the refs are unwrapped
-      this.isReadOnly = value;
-    }
+    updateMaybeRef(this.isReadOnly, value);
   }
 
   public addError(error: string): void {
-    if (isRef(this.errors)) {
-      this.errors.value.push(error);
-    } else {
-      // @ts-expect-error update types to for when the refs are unwrapped
-      this.errors.push(error);
-    }
+    updateMaybeRef(this.errors, [...toValue(this.errors), error]);
   }
 
   public setInvalid(): void {
-    if (isRef(this.isValid)) {
-      this.isValid.value = false;
-    } else {
-      // @ts-expect-error update types to for when the refs are unwrapped
-      this.isValid = false;
-    }
+    updateMaybeRef(this.isValid, false);
   }
 
   public validate = async (): Promise<boolean> => {

diff --git a/libs/core/src/utils/index.ts b/libs/core/src/utils/index.ts
@@ -4,6 +4,7 @@ export * from './defineField';
 export * from './defineForm';
 export * from './generateFieldName';
 export * from './markComponentAsRaw';
+export * from './updateMaybeRef';
 export * from './useDynamicWatcher';
 export {getDefaultFormConfiguration} from './getDefaultFormConfiguration';
 

diff --git a/libs/core/src/utils/updateMaybeRef.ts b/libs/core/src/utils/updateMaybeRef.ts
@@ -0,0 +1,10 @@
+import {isRef, type MaybeRef} from 'vue';
+
+export const updateMaybeRef = <T>(maybeRef: MaybeRef<T>, value: T): void => {
+  if (isRef(maybeRef)) {
+    maybeRef.value = value;
+    return;
+  }
+
+  maybeRef = value;
+};