@antelopejs/dms 0.11.1 → 0.12.0

package/frontend-vue/layers/dms-ui/app/components/form/LocalizedField.vue

@@ -1,13 +1,18 @@
 <script setup lang="ts">
 import { formErrorsInjectionKey } from "@nuxt/ui/composables/useFormField";
+import { isObject } from "#dms-core/app/utils/type-check";
 import type { FormField } from "../../composables/form/types";
 import { resolveDmsComponent } from "../../composables/resolveDmsComponent";
 import { escapeRegExp } from "../../build/composables/form/formEntryContext";
+import type { validateFormState } from "../../build/composables/form/formValidation";
 import DmsFormErrorText from "../../build/components/form/FormErrorText.vue";
 
 interface LocalizedFieldProps {
   field: FormField;
-  initialValues?: Record<string, unknown>;
+  initialValues?: Record<
+    string,
+    Parameters<typeof validateFormState>[1][string]
+  >;
   loading: boolean;
   componentId: string;
   pageId: string;
@@ -22,9 +27,7 @@ const { processI18n } = useTranslation();
 
 const isExpanded = ref(false);
 
-function withAllLocales(
-  current: Record<string, string>,
-): Record<string, string> {
+function withAllLocales(current: Record<string, string>) {
   const updated = { ...current };
   locales.value.forEach((lang) => {
     if (!(lang.code in updated)) {
@@ -37,7 +40,7 @@ function withAllLocales(
 watch(
   fieldValue,
   (value) => {
-    if (!value || typeof value !== "object") {
+    if (!value || !isObject(value)) {
       fieldValue.value = withAllLocales({});
       return;
     }
@@ -48,20 +51,14 @@ watch(
   { immediate: true },
 );
 
-// The values the inputs show. Until the form hands a per-locale object back
-// (the watcher above fills it in, but the server render and the hydration
-// pass run before that answer), every locale reads empty, so the inputs are
-// in the markup from the first paint instead of popping in at hydration.
 const EMPTY_TEXT = "";
 const localeValues = computed<Record<string, string>>(() =>
-  fieldValue.value && typeof fieldValue.value === "object"
-    ? fieldValue.value
-    : {},
+  fieldValue.value && isObject(fieldValue.value) ? fieldValue.value : {},
 );
 
 function setLocaleValue(code: string, value: string): void {
   const current = fieldValue.value;
-  if (current && typeof current === "object") {
+  if (current && isObject(current)) {
     current[code] = value;
     return;
   }
@@ -76,9 +73,6 @@ const showDisplay = computed(
   () => !!props.field.disabled && !!props.field.type,
 );
 
-// The control shown in the reader's language is the field: its errors (and
-// those of the field as a whole, a server's) show under it. The panel lists
-// the other languages, each with its own.
 const otherLocales = computed(() =>
   locales.value.filter((lang) => lang.code !== locale.value),
 );
@@ -89,11 +83,8 @@ const mainErrorPattern = computed(
     ),
 );
 
-// A translation refused while the panel is closed opens it: its error shows
-// on its own line.
 const formErrors = inject(formErrorsInjectionKey, null);
-// The error slot replaces the hint under the field: given only while the
-// field holds an error.
+
 const hasMainError = computed(
   () =>
     !!formErrors?.value.some((error) =>

package/frontend-vue/layers/dms-ui/app/components/form/components/Calendar.vue

@@ -7,6 +7,7 @@ import { useForwardPropsEmits } from "reka-ui";
 import { useUserRegionalPreferences } from "#dms-core/app/composables/user/useUserRegionalPreferences";
 import { useFormField } from "@nuxt/ui/composables/useFormField";
 import { FIELD_RING_INVALID_CLASS } from "../../../build/utils/fieldTrigger";
+import { isObject, isString } from "#dms-core/app/utils/type-check";
 import {
   parseDate,
   fromDate,
@@ -14,7 +15,6 @@ import {
   type CalendarDate,
 } from "@internationalized/date";
 
-// Mid-selection, the range calendar emits a range whose end is still unset.
 interface StrictDateRange {
   start: CalendarDate | undefined;
   end: CalendarDate | undefined;
@@ -66,6 +66,12 @@ function convertIsoStringToCalendarDate(value: string): CalendarDate {
   return parseDate(value.split("T")[0]!);
 }
 
+function convertToCalendarDate(
+  value: string | Date | CalendarDate,
+): CalendarDate;
+function convertToCalendarDate(
+  value: string | Date | CalendarDate | undefined,
+): CalendarDate | undefined;
 function convertToCalendarDate(
   value: string | Date | CalendarDate | undefined,
 ): CalendarDate | undefined {
@@ -88,7 +94,7 @@ function convertDateRangeValue(
 }
 
 function isDateRangeValue(
-  value: unknown,
+  value: Parameters<typeof isObject>[0],
 ): value is StringDateRange | StrictDateRange | NativeDateRange {
   return (
     isObject(value) && value !== null && "start" in value && "end" in value
@@ -103,19 +109,17 @@ function convertModelValue(value: DateValue): DateValue {
     return convertDateRangeValue(value);
   }
   if (Array.isArray(value)) {
-    return value.map(convertToCalendarDate) as CalendarDate[];
+    return value.map((entry) => convertToCalendarDate(entry));
   }
   return value;
 }
 
-// An inline calendar has no border: an invalid field rings it.
 const {
   color: fieldColor,
   ariaAttrs,
   emitFormChange,
 } = useFormField(
-  // Its props typing knows only Nuxt UI colours and sizes; it reads `id`,
-  // `color` and `disabled` from these.
+  // oxlint-disable-next-line anti-slop/require-safety-comment-for-type-assertion -- The generic form-field parameter extraction excludes Calendar's concrete size and color values; retain the unchecked adapter.
   props as Parameters<typeof useFormField>[0],
 );
 const invalid = computed(() => fieldColor.value === "error");
@@ -128,34 +132,33 @@ const convertedProps = computed(() => {
   const { minDate: _minDate, maxDate: _maxDate, ...calendarProps } = props;
   return {
     ...calendarProps,
-    color:
-      (calendarProps.color as string) === "error"
-        ? undefined
-        : calendarProps.color,
+    color: calendarProps.color === "error" ? undefined : calendarProps.color,
+    // oxlint-disable-next-line anti-slop/require-safety-comment-for-type-assertion -- CalendarProps admits date-time and zoned variants outside the local model union; preserve their unchecked conversion passthrough.
     modelValue: convertModelValue(calendarProps.modelValue as DateValue),
   };
 });
 
-// Bound on the calendar itself: forwarding only passes props this component
-// was given, and the bounds arrive as `minDate` / `maxDate`.
 const minValue = computed(() => props.minValue ?? toBoundDate(props.minDate));
 const maxValue = computed(() => props.maxValue ?? toBoundDate(props.maxDate));
 
 type EmitEvent = string;
-type EmitValue = unknown;
 
-const wrappedEmits = (event: EmitEvent, value: EmitValue) => {
+const wrappedEmits = (
+  event: EmitEvent,
+  value: Parameters<typeof forwardEmit>[1],
+) => {
   forwardEmit(event, value);
-  // After the update: the field re-validates its new value.
+
   if (event === "update:modelValue") emitFormChange();
 };
 
-function forwardEmit(event: EmitEvent, value: EmitValue): void {
+function forwardEmit(
+  event: EmitEvent,
+  value: Parameters<typeof isObject>[0],
+): void {
   if (event === "update:modelValue" && value) {
     if (Array.isArray(value)) {
-      const isoStrings = (value as CalendarDate[]).map((date) =>
-        date.toString(),
-      );
+      const isoStrings = value.map((date) => date.toString());
       emits("update:modelValue", isoStrings);
     } else if (
       isObject(value) &&
@@ -163,26 +166,24 @@ function forwardEmit(event: EmitEvent, value: EmitValue): void {
       "month" in value &&
       "day" in value
     ) {
-      const isoString = (value as unknown as CalendarDate).toString();
+      const isoString = value.toString();
       emits("update:modelValue", isoString);
     } else if (isObject(value) && "start" in value && "end" in value) {
-      const dateRange = value as unknown as StrictDateRange;
-      const startIso = dateRange.start?.toString();
-      const endIso = dateRange.end?.toString();
+      const startIso = value.start?.toString();
+      const endIso = value.end?.toString();
       emits("update:modelValue", { start: startIso, end: endIso });
     } else {
+      // oxlint-disable-next-line anti-slop/require-safety-comment-for-type-assertion -- The declared model emit excludes this unchecked passthrough branch's arbitrary values; inference and the emit owner cannot establish a valid string here.
       emits("update:modelValue", value as string | null | undefined);
     }
   } else {
+    // SAFETY: useForwardPropsEmits forwards event names and arguments unchanged; this widens the call surface without changing the actual emitter.
     const forwardEvent = emits as (event: string, ...args: unknown[]) => void;
     forwardEvent(event, value);
   }
 }
 
-const forwarded = useForwardPropsEmits(
-  convertedProps,
-  wrappedEmits as typeof emits,
-);
+const forwarded = useForwardPropsEmits(convertedProps, wrappedEmits);
 </script>
 
 <template>

package/frontend-vue/layers/dms-ui/app/components/form/components/Cascader.vue

@@ -50,8 +50,6 @@ const emit = defineEmits<{
   "update:modelValue": [value: string | string[] | undefined];
 }>();
 
-// The field state UFormField hands its control: the error border and aria
-// attributes go on the trigger (not on the search input of the panel).
 const {
   color: fieldColor,
   ariaAttrs,
@@ -67,7 +65,7 @@ const { t } = useI18n();
 const { processI18n } = useTranslation();
 
 interface CascaderResponse {
-  results: Record<string, unknown>[];
+  results: Parameters<typeof buildCascaderTree>[0];
   total: number;
 }
 
@@ -87,7 +85,7 @@ const { data, status, execute } = await useDmsAsyncData(
       },
     });
   },
-  // Options to pick from, not the page's data.
+
   { lazy: true, immediate: false, refreshOnPageRefresh: false },
 );
 
@@ -99,8 +97,6 @@ const selectedValues = computed<string[]>(() => {
   return props.modelValue ? [String(props.modelValue)] : [];
 });
 
-// The picked rows and their ancestors, read by `?ids=` level by level: the
-// field names its value before the menu is opened, whatever the tree's size.
 const { readRelationRows } = useRelationRows();
 const { data: ancestry } = await useDmsAsyncData(
   () => `cascader-value-${instanceId}-${selectedValues.value.join(",")}`,
@@ -119,7 +115,7 @@ const { data: ancestry } = await useDmsAsyncData(
           selectedValues.value,
         )
       : Promise.resolve(undefined),
-  // The field's label, not the page's data.
+
   { lazy: true, refreshOnPageRefresh: false },
 );
 const rows = computed(() => data.value?.results ?? []);
@@ -324,7 +320,7 @@ function activateHighlighted() {
   handleColumnNodeClick(node, highlighted.value.column);
 }
 
-const keyHandlers: Record<string, () => void> = {
+const keyHandlers: Record<KeyboardEvent["key"], () => void> = {
   ArrowDown: () => moveHighlight(1),
   ArrowUp: () => moveHighlight(-1),
   ArrowRight: enterChildren,

package/frontend-vue/layers/dms-ui/app/components/form/components/Checkbox.vue

@@ -12,7 +12,6 @@ defineSlots<CheckboxSlots>();
 
 const forwarded = useForwardPropsEmits(props, emits);
 
-// The app-wide light icon weight is too thin inside a 16px box.
 const CHECK_ICON = "i-ph-check-bold";
 const INDETERMINATE_ICON = "i-ph-minus-bold";
 </script>

package/frontend-vue/layers/dms-ui/app/components/form/components/ChoiceCards.vue

@@ -34,9 +34,6 @@ const props = withDefaults(defineProps<ChoiceCardsProps>(), {
 });
 const model = defineModel<ChoiceValue | ChoiceValue[] | null | undefined>();
 
-// Nuxt UI's choice cards, as the v2 theme draws them: the options side by
-// side, wrapping, each with its description. The column count is a custom
-// property, so any `columns` needs no class of its own.
 const CARDS_UI = {
   fieldset:
     "grid gap-2.5 @min-[480px]:grid-cols-[repeat(var(--dms-choice-columns),minmax(0,1fr))]",
@@ -46,7 +43,7 @@ const columnsStyle = computed(() => ({
   "--dms-choice-columns": String(Math.max(1, Math.round(props.columns))),
 }));
 
-const items = computed(() => props.items as unknown as RadioGroupItem[]);
+const items = computed<RadioGroupItem[]>(() => props.items);
 const pickedMany = computed<ChoiceValue[]>({
   get: () => (Array.isArray(model.value) ? model.value : []),
   set: (value) => (model.value = value),

package/frontend-vue/layers/dms-ui/app/components/form/components/DatePicker.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts" generic="R extends boolean, M extends boolean">
 import { formatDate } from "#dms-core/app/utils/formatter";
+import { isObject, isString } from "#dms-core/app/utils/type-check";
 import { useUserRegionalPreferences } from "#dms-core/app/composables/user/useUserRegionalPreferences";
 import type {
   CalendarProps,
@@ -21,7 +22,6 @@ import {
   FIELD_TRIGGER_UI,
 } from "../../../build/utils/fieldTrigger";
 
-// Mid-selection, the range calendar emits a range whose end is still unset.
 interface StrictDateRange {
   start: CalendarDate | undefined;
   end: CalendarDate | undefined;
@@ -77,8 +77,6 @@ defineSlots<CalendarSlots>();
 const { locale, t } = useI18n();
 const { weekStartsOn } = useUserRegionalPreferences();
 
-// The picker holds calendar days, read as UTC midnights (see
-// convertToCalendarDate): written in UTC, a day never shifts with the zone.
 const DATE_LABEL_FORMAT: Intl.DateTimeFormatOptions = {
   year: "numeric",
   month: "long",
@@ -92,6 +90,12 @@ function convertIsoStringToCalendarDate(value: string): CalendarDate {
   return parseDate(value.split("T")[0]!);
 }
 
+function convertToCalendarDate(
+  value: string | Date | CalendarDate,
+): CalendarDate;
+function convertToCalendarDate(
+  value: string | Date | CalendarDate | undefined,
+): CalendarDate | undefined;
 function convertToCalendarDate(
   value: string | Date | CalendarDate | undefined,
 ): CalendarDate | undefined {
@@ -114,7 +118,7 @@ function convertDateRangeValue(
 }
 
 function isDateRangeValue(
-  value: unknown,
+  value: Parameters<typeof isObject>[0],
 ): value is StringDateRange | StrictDateRange | NativeDateRange {
   return (
     isObject(value) && value !== null && "start" in value && "end" in value
@@ -122,13 +126,12 @@ function isDateRangeValue(
 }
 
 function convertModelValue(value: DateValue): DateValue {
-  // A range may also arrive as `[start, end]`, the list shape the date type
-  // still accepts.
   if (props.range && Array.isArray(value)) {
-    return convertDateRangeValue({
-      start: value[0] as string | undefined,
-      end: value[1] as string | undefined,
-    });
+    const rangeValue = { start: value[0], end: value[1] };
+    return {
+      start: convertToCalendarDate(rangeValue.start),
+      end: convertToCalendarDate(rangeValue.end),
+    };
   }
   if (isString(value)) {
     return convertIsoStringToCalendarDate(value);
@@ -137,39 +140,31 @@ function convertModelValue(value: DateValue): DateValue {
     return convertDateRangeValue(value);
   }
   if (Array.isArray(value)) {
-    return value.map(convertToCalendarDate) as CalendarDate[];
+    return value.map((entry) => convertToCalendarDate(entry));
   }
   return value;
 }
 
-// The field state UFormField hands its control: the error border and aria
-// attributes go on the trigger, picks and closes re-validate the field.
 const {
   color: fieldColor,
   ariaAttrs,
   emitFormBlur,
   emitFormChange,
-} = useFormField(
-  // Its props typing knows only Nuxt UI colours and sizes; it reads `id`,
-  // `color` and `disabled` from these.
-  props as Parameters<typeof useFormField>[0],
-);
+} = useFormField<DatePickerProps>(props);
 const invalid = computed(() => fieldColor.value === "error");
 
-// A range picked halfway (its start only) is no range, and the calendar
-// drops that start once it closes: the field says the end is missing, until
-// a whole range is picked or the field is cleared.
 const RANGE_INCOMPLETE = "$dms.field_errors.range_incomplete";
 const { report } = useControlError();
 let isHalfPicked = false;
 
 /** Follows a range being picked: its start alone, then both ends. */
-function trackRangePick(value: unknown): void {
+function trackRangePick(value: Parameters<typeof forwardEmit>[1]): void {
   if (value === null || value === undefined) {
     isHalfPicked = false;
     report(undefined);
     return;
   }
+  // oxlint-disable-next-line anti-slop/require-safety-comment-for-type-assertion -- The forwarded event has no validated range owner; keep optional property reads on arbitrary non-null values rather than adding validation.
   const ends = value as Partial<StrictDateRange>;
   if (!ends.start) return;
   isHalfPicked = !ends.end;
@@ -182,9 +177,10 @@ const isPickerOpen = ref(false);
  * Whether a pick completes the field: a day, or a range's end. A multiple
  * picker stays open for the next day, a range for its end.
  */
-function isPickComplete(value: unknown): boolean {
+function isPickComplete(value: Parameters<typeof forwardEmit>[1]): boolean {
   if (!value || props.multiple) return false;
   if (!props.range) return true;
+  // oxlint-disable-next-line anti-slop/require-safety-comment-for-type-assertion -- The forwarded event has no validated range owner; keep its existing optional-property truthiness checks on arbitrary values.
   const ends = value as Partial<StrictDateRange>;
   return !!ends.start && !!ends.end;
 }
@@ -207,28 +203,26 @@ const convertedProps = computed(() => {
     maxDate: _maxDate,
     color,
     ...calendarProps
-  } = props as DatePickerProps;
+  } = props;
   return {
     ...calendarProps,
     color: color === "error" ? undefined : color,
-    modelValue: convertModelValue(modelValue.value as DateValue),
+    modelValue: convertModelValue(modelValue.value),
   };
 });
 
-// Bound on the calendar itself: forwarding only passes props this component
-// was given, and the bounds arrive as `minDate` / `maxDate`.
 const minValue = computed(() => props.minValue ?? toBoundDate(props.minDate));
 const maxValue = computed(() => props.maxValue ?? toBoundDate(props.maxDate));
 
 type EmitEvent = string;
-type EmitValue = unknown;
+type EmitValue = Parameters<typeof isObject>[0];
 
 const wrappedEmits = (event: EmitEvent, value: EmitValue) => {
   forwardEmit(event, value);
   if (event === "update:modelValue" && props.range) trackRangePick(value);
-  // After the update: the field re-validates its new value.
+
   if (event === "update:modelValue") emitFormChange();
-  // The day picked, the calendar closes, as it does when left.
+
   if (event === "update:modelValue" && isPickComplete(value)) {
     onPickerToggle(false);
   }
@@ -237,9 +231,7 @@ const wrappedEmits = (event: EmitEvent, value: EmitValue) => {
 function forwardEmit(event: EmitEvent, value: EmitValue): void {
   if (event === "update:modelValue" && value) {
     if (Array.isArray(value)) {
-      const isoStrings = (value as CalendarDate[]).map((date) =>
-        date.toString(),
-      );
+      const isoStrings = value.map((date) => date.toString());
       emits("update:modelValue", isoStrings);
     } else if (
       isObject(value) &&
@@ -247,39 +239,37 @@ function forwardEmit(event: EmitEvent, value: EmitValue): void {
       "month" in value &&
       "day" in value
     ) {
-      const isoString = (value as unknown as CalendarDate).toString();
+      const isoString = value.toString();
       emits("update:modelValue", isoString);
     } else if (isObject(value) && "start" in value && "end" in value) {
-      const dateRange = value as unknown as StrictDateRange;
-      const startIso = dateRange.start?.toString();
-      const endIso = dateRange.end?.toString();
+      const startIso = value.start?.toString();
+      const endIso = value.end?.toString();
       emits("update:modelValue", { start: startIso, end: endIso });
     } else {
+      // oxlint-disable-next-line anti-slop/require-safety-comment-for-type-assertion -- The declared model emit excludes this unchecked passthrough branch's arbitrary values; inference and the emit owner cannot establish a valid string here.
       emits("update:modelValue", value as string | null | undefined);
     }
   } else {
+    // SAFETY: Vue emit forwards event names and payloads at runtime, including the placeholder and start-value events not serialized above.
     const forwardEvent = emits as (event: string, ...args: unknown[]) => void;
     forwardEvent(event, value);
   }
 }
 
-const forwarded = useForwardPropsEmits(
-  convertedProps as unknown as ComputedRef<CalendarProps<R, M>>,
-  wrappedEmits as typeof emits,
-);
+const forwarded = useForwardPropsEmits(convertedProps, wrappedEmits);
 const buttonProps = reactivePick(props, "disabled");
 
-function formatDateLabel(value: unknown): string | undefined {
+function formatDateLabel(
+  value: Parameters<typeof formatDate>[0],
+): string | undefined {
   if (value === undefined || value === null) {
     return undefined;
   }
-  // A CalendarDate stringifies to its ISO date.
+
   const date = value instanceof Date ? value : String(value);
   return formatDate(date, locale.value, DATE_LABEL_FORMAT) ?? undefined;
 }
 
-// Range mode holds a { start, end } object and multiple mode an array, which
-// formatDate cannot read as a single date.
 const label = computed(() => {
   const value: unknown = modelValue.value;
   if (props.range && Array.isArray(value)) {

package/frontend-vue/layers/dms-ui/app/components/form/components/DatePickerRange.vue

@@ -41,12 +41,7 @@ function emitRange(start: string | undefined, end: string | undefined) {
 
 const { t } = useI18n();
 
-// Both pickers show the field's error.
-const { color: fieldColor } = useFormField(
-  // Its props typing knows only Nuxt UI colours and sizes; it reads `id`,
-  // `color` and `disabled` from these.
-  props as Parameters<typeof useFormField>[0],
-);
+const { color: fieldColor } = useFormField<DatePickerRangeProps>(props);
 const pickerColor = computed(() =>
   fieldColor.value === "error" ? "error" : undefined,
 );

package/frontend-vue/layers/dms-ui/app/components/form/components/Display.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { isVNode } from "vue";
+import type { DataTypeFormatter } from "#dms-core/app/composables/data-types/useDataType";
+import { isString } from "#dms-core/app/utils/type-check";
 import { NUMERIC_TYPE_IDS } from "../../../build/composables/data-types/useColumnValueRenderer";
 
 interface DisplayProps {
@@ -9,13 +11,11 @@ interface DisplayProps {
   /** The field's label, which names the value where it is not text (an image). */
   label?: string;
   /** The record the value belongs to, read as a grid cell reads its row. */
-  row?: Record<string, unknown>;
+  row?: Record<string, NonNullable<Parameters<DataTypeFormatter>[3]>[string]>;
 }
 
 const props = defineProps<DisplayProps>();
-// The field's options, spread on the display as on its input: the
-// formatter reads them as a table cell does (a status' labels and tones,
-// a select's items).
+
 const options = useAttrs();
 
 const { getDataType } = useDataTypes();
@@ -28,7 +28,7 @@ const dataType = computed(() =>
 );
 const dedicatedComponent = computed(() => dataType.value?.displayComponent);
 
-const isEmptyValue = (value: unknown): boolean => {
+const isEmptyValue = (value: DisplayProps["modelValue"]): boolean => {
   if (value === null || value === undefined || value === "") return true;
   if (Array.isArray(value) && value.length === 0) return true;
   return false;
@@ -45,8 +45,7 @@ const formattedValue = computed(() => {
 });
 
 const isVNodeValue = computed(() => isVNode(formattedValue.value));
-// Amounts read in tabular figures, so a read-only list's amounts and the
-// totals under it line up in one font.
+
 const isNumeric = computed(() => NUMERIC_TYPE_IDS.has(props.type ?? ""));
 </script>
 
@@ -68,7 +67,7 @@ const isNumeric = computed(() => NUMERIC_TYPE_IDS.has(props.type ?? ""));
     v-else
     class="text-default flex min-h-9 items-center py-1.5 text-sm"
     :class="isNumeric && 'tabular-nums'"
-    :title="typeof formattedValue === 'string' ? formattedValue : undefined"
+    :title="isString(formattedValue) ? formattedValue : undefined"
   >
     <component :is="formattedValue" v-if="isVNodeValue" />
     <span v-else-if="formattedValue === EMPTY_FALLBACK" class="text-dimmed">

package/frontend-vue/layers/dms-ui/app/components/form/components/File.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useId } from "vue";
+import { isString } from "#dms-core/app/utils/type-check";
 import DmsFieldError from "../../field-error/FieldError.vue";
 import { fieldErrorId } from "#dms-core/app/composables/useFieldErrors";
 import { FORM_FIELD_LOADING_KEY } from "../../../composables/form/types/field-loading";
@@ -41,14 +42,11 @@ const emit = defineEmits<{
 const { $authFetch } = useAuthFetch();
 const { t } = useI18n();
 
-// The field state UFormField hands its control, passed on to the drop zone
-// (this component takes it, so UFileUpload would not see it).
 const { emitFormChange, color, highlight, ariaAttrs } = useFormField();
-// Files refused by the field's constraints, named under the drop zone: an
-// error of this field, not a toast.
+
 const rejections = ref<string[]>([]);
 const rejectionId = fieldErrorId(`file-${useId()}`);
-// A refused file speaks for itself; otherwise the field's own error does.
+
 const dropZoneAria = computed(() =>
   rejections.value.length
     ? { "aria-invalid": true, "aria-describedby": rejectionId }
@@ -60,7 +58,7 @@ const { uploadWithProgress } = useUploadWithProgress();
 const selectedFiles = ref<File | File[] | null>(null);
 const uploadingFiles = ref<UploadingFile[]>([]);
 const uploadedKeys = ref<string[]>([]);
-// Read with the page for the stored value, in the browser for a new one.
+
 const files = useFileMetadata(props.storage);
 
 const initializeFromModelValue = (
@@ -68,7 +66,7 @@ const initializeFromModelValue = (
 ) => {
   if (!val) {
     uploadedKeys.value = [];
-  } else if (typeof val === "string") {
+  } else if (isString(val)) {
     uploadedKeys.value = val ? [val] : [];
   } else {
     uploadedKeys.value = val;
@@ -86,14 +84,13 @@ const openFile = async (resourceKey: string) => {
 watch(
   () => props.modelValue,
   (val) => {
-    const newKeys = !val ? [] : typeof val === "string" ? [val] : val;
+    const newKeys = !val ? [] : isString(val) ? [val] : val;
     if (newKeys.join(",") !== uploadedKeys.value.join(",")) {
       uploadedKeys.value = newKeys;
     }
   },
 );
 
-// A copy: an upload into a multiple field pushes its key.
 watch(
   () => [...uploadedKeys.value],
   (keys) => keys.forEach((key) => void files.resolve(key)),