@aerogel/core 0.0.0-next.d7394c3aa6aac799b0971e63819a8713d05a5123 → 0.0.0-next.e4c0d5bd2801fbe93545477ea515af53df69b522

package/src/components/ui/PromptModal.vue

@@ -0,0 +1,38 @@
+<template>
+    <!-- @vue-generic {import('@aerogel/core/ui/UI').ModalExposeResult<PromptModalExpose>} -->
+    <Modal v-slot="{ close }" :title="renderedTitle" persistent>
+        <Form :form @submit="close(form.draft)">
+            <Markdown v-if="renderedMessage" :text="renderedMessage" />
+            <Input
+                name="draft"
+                class="mt-2"
+                :placeholder
+                :label
+            />
+
+            <div class="mt-4 flex flex-row-reverse gap-2">
+                <Button :variant="acceptVariant" submit>
+                    {{ renderedAcceptText }}
+                </Button>
+                <Button :variant="cancelVariant" @click="close()">
+                    {{ renderedCancelText }}
+                </Button>
+            </div>
+        </Form>
+    </Modal>
+</template>
+
+<script setup lang="ts">
+import Markdown from '@aerogel/core/components/ui/Markdown.vue';
+import Button from '@aerogel/core/components/ui/Button.vue';
+import Form from '@aerogel/core/components/ui/Form.vue';
+import Input from '@aerogel/core/components/ui/Input.vue';
+import Modal from '@aerogel/core/components/ui/Modal.vue';
+import { usePromptModal } from '@aerogel/core/components/contracts/PromptModal';
+import type { PromptModalExpose, PromptModalProps } from '@aerogel/core/components/contracts/PromptModal';
+
+const { cancelVariant = 'secondary', ...props } = defineProps<PromptModalProps>();
+const { form, renderedTitle, renderedMessage, renderedAcceptText, renderedCancelText } = usePromptModal(props);
+
+defineExpose<PromptModalExpose>();
+</script>

package/src/components/ui/Select.vue

@@ -0,0 +1,27 @@
+<template>
+    <HeadlessSelect :ref="forwardRef" v-bind="$props" @update:model-value="$emit('update:modelValue', $event)">
+        <SelectLabel />
+        <slot>
+            <SelectTrigger />
+            <SelectOptions />
+        </slot>
+    </HeadlessSelect>
+</template>
+
+<script setup lang="ts" generic="T extends Nullable<FormFieldValue>">
+import { useForwardExpose } from 'reka-ui';
+import type { Nullable } from '@noeldemartin/utils';
+
+import HeadlessSelect from '@aerogel/core/components/headless/HeadlessSelect.vue';
+import type { SelectEmits, SelectProps } from '@aerogel/core/components/contracts/Select';
+import type { FormFieldValue } from '@aerogel/core/forms';
+
+import SelectLabel from './SelectLabel.vue';
+import SelectOptions from './SelectOptions.vue';
+import SelectTrigger from './SelectTrigger.vue';
+
+defineProps<SelectProps<T>>();
+defineEmits<SelectEmits<T>>();
+
+const { forwardRef } = useForwardExpose();
+</script>

package/src/components/ui/SelectLabel.vue

@@ -0,0 +1,17 @@
+<template>
+    <HeadlessSelectLabel v-if="$slots.default" :class="renderedClasses">
+        <slot />
+    </HeadlessSelectLabel>
+    <HeadlessSelectLabel v-else :class="renderedClasses" />
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+
+import HeadlessSelectLabel from '@aerogel/core/components/headless/HeadlessSelectLabel.vue';
+import { classes, injectReactiveOrFail } from '@aerogel/core/utils';
+import type { SelectExpose } from '@aerogel/core/components/contracts/Select';
+
+const select = injectReactiveOrFail<SelectExpose>('select', '<SelectLabel> must be a child of a <Select>');
+const renderedClasses = computed(() => classes('block text-sm leading-6 font-medium text-gray-900', select.labelClass));
+</script>

package/src/components/ui/SelectOption.vue

@@ -0,0 +1,29 @@
+<template>
+    <HeadlessSelectOption :class="renderedOuterClasses" :value>
+        <div :class="renderedInnerClasses">
+            <slot />
+        </div>
+    </HeadlessSelectOption>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { AcceptableValue } from 'reka-ui';
+import type { HTMLAttributes } from 'vue';
+
+import HeadlessSelectOption from '@aerogel/core/components/headless/HeadlessSelectOption.vue';
+import { classes } from '@aerogel/core/utils';
+
+const { class: outerClass, innerClass } = defineProps<{
+    value: AcceptableValue;
+    class?: HTMLAttributes['class'];
+    innerClass?: HTMLAttributes['class'];
+}>();
+const renderedOuterClasses = computed(() => classes('group p-1 outline-none', outerClass));
+const renderedInnerClasses = computed(() =>
+    classes(
+        // eslint-disable-next-line vue/max-len
+        'relative flex max-w-[calc(100vw-2rem)] cursor-pointer items-center truncate rounded-md gap-2 px-2 py-1 text-sm select-none *:truncate group-data-[highlighted]:bg-gray-100 group-data-[state=checked]:font-semibold group-data-[state=unchecked]:opacity-50',
+        innerClass,
+    ));
+</script>

package/src/components/ui/SelectOptions.vue

@@ -0,0 +1,35 @@
+<template>
+    <HeadlessSelectOptions :class="renderedClasses">
+        <slot v-if="select.options?.length">
+            <SelectOption v-for="option of select?.options ?? []" :key="option.key" :value="option.value">
+                {{ option.label }}
+            </SelectOption>
+        </slot>
+        <slot v-else>
+            <SelectOption disabled :value="null">
+                {{ $td('ui.selectEmpty', 'No options available') }}
+            </SelectOption>
+        </slot>
+    </HeadlessSelectOptions>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { HTMLAttributes } from 'vue';
+
+import HeadlessSelectOptions from '@aerogel/core/components/headless/HeadlessSelectOptions.vue';
+import { classes, injectReactiveOrFail } from '@aerogel/core/utils';
+import type { SelectExpose } from '@aerogel/core/components/contracts/Select';
+
+import SelectOption from './SelectOption.vue';
+
+const { class: rootClasses } = defineProps<{ class?: HTMLAttributes['class'] }>();
+
+const select = injectReactiveOrFail<SelectExpose>('select', '<SelectOptions> must be a child of a <Select>');
+const renderedClasses = computed(() =>
+    classes(
+        'z-50 overflow-auto rounded-lg bg-white text-base shadow-lg ring-1 ring-black/5 focus:outline-hidden',
+        select.optionsClass,
+        rootClasses,
+    ));
+</script>

package/src/components/ui/SelectTrigger.vue

@@ -0,0 +1,29 @@
+<template>
+    <HeadlessSelectTrigger :class="renderedClasses">
+        <HeadlessSelectValue class="col-start-1 row-start-1 truncate pr-6" />
+        <IconCheveronDown class="col-start-1 row-start-1 size-5 self-center justify-self-end text-gray-500 sm:size-4" />
+    </HeadlessSelectTrigger>
+</template>
+
+<script setup lang="ts">
+import IconCheveronDown from '~icons/zondicons/cheveron-down';
+
+import { computed } from 'vue';
+import type { HTMLAttributes } from 'vue';
+
+import HeadlessSelectTrigger from '@aerogel/core/components/headless/HeadlessSelectTrigger.vue';
+import HeadlessSelectValue from '@aerogel/core/components/headless/HeadlessSelectValue.vue';
+import { injectReactiveOrFail } from '@aerogel/core/utils';
+import { classes } from '@aerogel/core/utils/classes';
+import type { SelectExpose } from '@aerogel/core/components/contracts/Select';
+
+const { class: rootClasses } = defineProps<{ class?: HTMLAttributes['class'] }>();
+const select = injectReactiveOrFail<SelectExpose>('select', '<SelectTrigger> must be a child of a <Select>');
+const renderedClasses = computed(() =>
+    classes(
+        // eslint-disable-next-line vue/max-len
+        'focus:outline-primary-600 data-[state=open]:outline-primary-600 grid w-full cursor-default grid-cols-1 rounded-md bg-white py-1.5 pr-2 pl-3 text-left text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus:outline-2 focus:-outline-offset-2 sm:text-sm/6',
+        { 'mt-1': select.label },
+        rootClasses,
+    ));
+</script>

package/src/components/ui/SettingsModal.vue

@@ -0,0 +1,15 @@
+<template>
+    <Modal :title="$td('settings.title', 'Settings')">
+        <component :is="setting.component" v-for="(setting, key) in settings" :key />
+    </Modal>
+</template>
+
+<script setup lang="ts">
+import { arraySorted } from '@noeldemartin/utils';
+import { computed } from 'vue';
+
+import App from '@aerogel/core/services/App';
+import Modal from '@aerogel/core/components/ui/Modal.vue';
+
+const settings = computed(() => arraySorted(App.settings, 'priority', 'desc'));
+</script>

package/src/components/{lib/AGStartupCrash.vue → ui/StartupCrash.vue}

@@ -1,10 +1,10 @@
 <template>
-    <div class="grid flex-grow place-items-center">
+    <div class="grid grow place-items-center">
         <div class="flex flex-col items-center space-y-6 p-8">
             <h1 class="mt-2 text-center text-4xl font-medium text-red-600">
                 {{ $td('startupCrash.title', 'Something went wrong!') }}
             </h1>
-            <AGMarkdown
+            <Markdown
                 :text="
                     $td(
                         'startupCrash.message',
@@ -14,18 +14,18 @@
                 class="mt-4 text-center"
             />
             <div class="mt-4 flex flex-col space-y-4">
-                <AGButton color="danger" @click="$app.reload()">
+                <Button variant="danger" @click="$app.reload()">
                     {{ $td('startupCrash.reload', 'Try again') }}
-                </AGButton>
-                <AGButton color="danger" @click="$errors.inspect($errors.startupErrors)">
+                </Button>
+                <Button variant="danger" @click="$errors.inspect($errors.startupErrors)">
                     {{ $td('startupCrash.inspect', 'View error details') }}
-                </AGButton>
+                </Button>
             </div>
         </div>
     </div>
 </template>
 
 <script setup lang="ts">
-import AGMarkdown from './AGMarkdown.vue';
-import AGButton from '../forms/AGButton.vue';
+import Markdown from '@aerogel/core/components/ui/Markdown.vue';
+import Button from '@aerogel/core/components/ui/Button.vue';
 </script>

package/src/components/ui/Toast.vue

@@ -0,0 +1,46 @@
+<template>
+    <HeadlessToast :class="renderedClasses">
+        <Markdown v-if="message" :text="message" inline />
+
+        <Button
+            v-for="(action, key) of actions"
+            :key
+            :action
+            :variant
+            :as="HeadlessToastAction"
+        />
+    </HeadlessToast>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { HTMLAttributes } from 'vue';
+
+import Button from '@aerogel/core/components/ui/Button.vue';
+import Markdown from '@aerogel/core/components/ui/Markdown.vue';
+import HeadlessToast from '@aerogel/core/components/headless/HeadlessToast.vue';
+import HeadlessToastAction from '@aerogel/core/components/headless/HeadlessToastAction.vue';
+import { variantClasses } from '@aerogel/core/utils/classes';
+import type { ToastExpose, ToastProps } from '@aerogel/core/components/contracts/Toast';
+import type { Variants } from '@aerogel/core/utils/classes';
+
+const { class: baseClasses, variant = 'secondary' } = defineProps<ToastProps & { class?: HTMLAttributes['class'] }>();
+const renderedClasses = computed(() =>
+    variantClasses<Variants<Pick<ToastProps, 'variant'>>>(
+        { baseClasses, variant },
+        {
+            baseClasses: 'flex items-center gap-2 rounded-md p-2 ring-1 shadow-lg border-gray-200',
+            variants: {
+                variant: {
+                    secondary: 'bg-gray-900 text-white ring-black',
+                    danger: 'bg-red-50 text-red-900 ring-red-100',
+                },
+            },
+            defaultVariants: {
+                variant: 'secondary',
+            },
+        },
+    ));
+
+defineExpose<ToastExpose>();
+</script>

package/src/components/ui/index.ts

@@ -0,0 +1,32 @@
+export { default as AdvancedOptions } from './AdvancedOptions.vue';
+export { default as AlertModal } from './AlertModal.vue';
+export { default as Button } from './Button.vue';
+export { default as Checkbox } from './Checkbox.vue';
+export { default as ConfirmModal } from './ConfirmModal.vue';
+export { default as DropdownMenu } from './DropdownMenu.vue';
+export { default as DropdownMenuOption } from './DropdownMenuOption.vue';
+export { default as DropdownMenuOptions } from './DropdownMenuOptions.vue';
+export { default as EditableContent } from './EditableContent.vue';
+export { default as ErrorLogs } from './ErrorLogs.vue';
+export { default as ErrorLogsModal } from './ErrorLogsModal.vue';
+export { default as ErrorMessage } from './ErrorMessage.vue';
+export { default as ErrorReportModal } from './ErrorReportModal.vue';
+export { default as ErrorReportModalButtons } from './ErrorReportModalButtons.vue';
+export { default as ErrorReportModalTitle } from './ErrorReportModalTitle.vue';
+export { default as Form } from './Form.vue';
+export { default as Input } from './Input.vue';
+export { default as Link } from './Link.vue';
+export { default as LoadingModal } from './LoadingModal.vue';
+export { default as Markdown } from './Markdown.vue';
+export { default as Modal } from './Modal.vue';
+export { default as ModalContext } from './ModalContext.vue';
+export { default as ProgressBar } from './ProgressBar.vue';
+export { default as PromptModal } from './PromptModal.vue';
+export { default as Select } from './Select.vue';
+export { default as SelectLabel } from './SelectLabel.vue';
+export { default as SelectOption } from './SelectOption.vue';
+export { default as SelectOptions } from './SelectOptions.vue';
+export { default as SelectTrigger } from './SelectTrigger.vue';
+export { default as SettingsModal } from './SettingsModal.vue';
+export { default as StartupCrash } from './StartupCrash.vue';
+export { default as Toast } from './Toast.vue';

package/src/directives/index.ts

@@ -1,13 +1,11 @@
 import type { Directive } from 'vue';
 
-import { definePlugin } from '@/plugins';
+import { definePlugin } from '@aerogel/core/plugins';
 
-import initialFocus from './initial-focus';
 import measure from './measure';
 
 const builtInDirectives: Record<string, Directive> = {
-    'initial-focus': initialFocus,
-    'measure': measure,
+    measure: measure,
 };
 
 export * from './measure';
@@ -25,8 +23,14 @@ export default definePlugin({
     },
 });
 
-declare module '@/bootstrap/options' {
+declare module '@aerogel/core/bootstrap/options' {
     export interface AerogelOptions {
         directives?: Record<string, Directive>;
     }
 }
+
+declare module 'vue' {
+    interface ComponentCustomDirectives {
+        measure: Directive<string, string>;
+    }
+}

package/src/directives/measure.ts

@@ -1,8 +1,17 @@
-import { defineDirective } from '@/utils/vue';
+import { defineDirective } from '@aerogel/core/utils/vue';
 import { tap } from '@noeldemartin/utils';
 
 const resizeObservers: WeakMap<HTMLElement, ResizeObserver> = new WeakMap();
 
+export type MeasureDirectiveValue =
+    | MeasureDirectiveListener
+    | {
+          css?: boolean;
+          watch?: boolean;
+      };
+
+export type MeasureDirectiveModifiers = 'css' | 'watch';
+
 export interface ElementSize {
     width: number;
     height: number;
@@ -10,11 +19,8 @@ export interface ElementSize {
 
 export type MeasureDirectiveListener = (size: ElementSize) => unknown;
 
-export default defineDirective({
-    mounted(element: HTMLElement, { value }) {
-        // TODO replace with argument when typed properly
-        const modifiers = { css: true, watch: true };
-
+export default defineDirective<MeasureDirectiveValue, MeasureDirectiveModifiers>({
+    mounted(element: HTMLElement, { value, modifiers }) {
         const listener = typeof value === 'function' ? (value as MeasureDirectiveListener) : null;
         const update = () => {
             const sizes = element.getBoundingClientRect();

package/src/errors/Errors.state.ts

@@ -1,6 +1,6 @@
 import type { JSError } from '@noeldemartin/utils';
 
-import { defineServiceState } from '@/services';
+import { defineServiceState } from '@aerogel/core/services';
 
 export type ErrorSource = string | Error | JSError | unknown;
 

package/src/errors/Errors.ts

@@ -1,16 +1,13 @@
-import { JSError, facade, isObject, objectWithoutEmpty, toString } from '@noeldemartin/utils';
+import { JSError, facade, isDevelopment, isObject, isTesting, objectWithoutEmpty, toString } from '@noeldemartin/utils';
 
-import App from '@/services/App';
-import ServiceBootError from '@/errors/ServiceBootError';
-import UI, { UIComponents } from '@/ui/UI';
-import { translateWithDefault } from '@/lang/utils';
+import App from '@aerogel/core/services/App';
+import ServiceBootError from '@aerogel/core/errors/ServiceBootError';
+import UI from '@aerogel/core/ui/UI';
+import { translateWithDefault } from '@aerogel/core/lang/utils';
+import { Events } from '@aerogel/core/services';
 
 import Service from './Errors.state';
-import { Colors } from '@/components/constants';
-import { Events } from '@/services';
-import type { AGErrorReportModalProps } from '@/components/modals/AGErrorReportModal';
 import type { ErrorReport, ErrorReportLog, ErrorSource } from './Errors.state';
-import type { ModalComponent } from '@/ui/UI.state';
 
 export class ErrorsService extends Service {
 
@@ -25,28 +22,33 @@ export class ErrorsService extends Service {
         this.enabled = false;
     }
 
-    public async inspect(error: ErrorSource | ErrorReport[]): Promise<void> {
-        const reports = Array.isArray(error) ? (error as ErrorReport[]) : [await this.createErrorReport(error)];
-
-        if (reports.length === 0) {
+    public async inspect(error: ErrorSource | ErrorReport, reports?: ErrorReport[]): Promise<void>;
+    public async inspect(reports: ErrorReport[]): Promise<void>;
+    public async inspect(errorOrReports: ErrorSource | ErrorReport[], _reports?: ErrorReport[]): Promise<void> {
+        if (Array.isArray(errorOrReports) && errorOrReports.length === 0) {
             UI.alert(translateWithDefault('errors.inspectEmpty', 'Nothing to inspect!'));
 
             return;
         }
 
-        UI.openModal<ModalComponent<AGErrorReportModalProps>>(UI.requireComponent(UIComponents.ErrorReportModal), {
-            reports,
-        });
+        const report = Array.isArray(errorOrReports)
+            ? (errorOrReports[0] as ErrorReport)
+            : this.isErrorReport(errorOrReports)
+                ? errorOrReports
+                : await this.createErrorReport(errorOrReports);
+        const reports = Array.isArray(errorOrReports) ? (errorOrReports as ErrorReport[]) : (_reports ?? [report]);
+
+        UI.modal(UI.requireComponent('error-report-modal'), { report, reports });
     }
 
     public async report(error: ErrorSource, message?: string): Promise<void> {
         await Events.emit('error', { error, message });
 
-        if (App.testing) {
+        if (isTesting('unit')) {
             throw error;
         }
 
-        if (App.development) {
+        if (isDevelopment()) {
             this.logError(error);
         }
 
@@ -71,20 +73,16 @@ export class ErrorsService extends Service {
             date: new Date(),
         };
 
-        UI.showSnackbar(
+        UI.toast(
             message ??
                 translateWithDefault('errors.notice', 'Something went wrong, but it\'s not your fault. Try again!'),
             {
-                color: Colors.Danger,
+                variant: 'danger',
                 actions: [
                     {
-                        text: translateWithDefault('errors.viewDetails', 'View details'),
+                        label: translateWithDefault('errors.viewDetails', 'View details'),
                         dismiss: true,
-                        handler: () =>
-                            UI.openModal<ModalComponent<AGErrorReportModalProps>>(
-                                UI.requireComponent(UIComponents.ErrorReportModal),
-                                { reports: [report] },
-                            ),
+                        click: () => UI.modal(UI.requireComponent('error-report-modal'), { report, reports: [report] }),
                     },
                 ],
             },
@@ -126,6 +124,10 @@ export class ErrorsService extends Service {
         }
     }
 
+    private isErrorReport(error: unknown): error is ErrorReport {
+        return isObject(error) && 'title' in error;
+    }
+
     private async createErrorReport(error: ErrorSource): Promise<ErrorReport> {
         if (typeof error === 'string') {
             return { title: error };
@@ -178,7 +180,7 @@ export class ErrorsService extends Service {
 
 export default facade(ErrorsService);
 
-declare module '@/services/Events' {
+declare module '@aerogel/core/services/Events' {
     export interface EventsPayload {
         error: { error: ErrorSource; message?: string };
     }

package/src/errors/JobCancelledError.ts

@@ -0,0 +1,3 @@
+import { JSError } from '@noeldemartin/utils';
+
+export default class JobCancelledError extends JSError {}

package/src/errors/index.ts

@@ -1,13 +1,16 @@
 import type { App } from 'vue';
 
-import { bootServices } from '@/services';
-import { definePlugin } from '@/plugins';
+import { bootServices } from '@aerogel/core/services';
+import { definePlugin } from '@aerogel/core/plugins';
 
 import Errors from './Errors';
-import { ErrorReport, ErrorReportLog, ErrorSource } from './Errors.state';
+import type { ErrorReport, ErrorReportLog, ErrorSource } from './Errors.state';
 
 export * from './utils';
-export { Errors, ErrorSource, ErrorReport, ErrorReportLog };
+export { Errors };
+export { default as JobCancelledError } from './JobCancelledError';
+export { default as ServiceBootError } from './ServiceBootError';
+export type { ErrorSource, ErrorReport, ErrorReportLog };
 
 const services = { $errors: Errors };
 const frameworkHandler: ErrorHandler = (error) => {
@@ -35,12 +38,12 @@ export default definePlugin({
     },
 });
 
-declare module '@/bootstrap/options' {
+declare module '@aerogel/core/bootstrap/options' {
     export interface AerogelOptions {
         handleError?(error: ErrorSource): boolean;
     }
 }
 
-declare module '@/services' {
+declare module '@aerogel/core/services' {
     export interface Services extends ErrorsServices {}
 }

package/src/errors/utils.ts

@@ -1,8 +1,24 @@
 import { JSError, isObject, toString } from '@noeldemartin/utils';
-import { translateWithDefault } from '@/lang/utils';
+import { translateWithDefault } from '@aerogel/core/lang/utils';
 import type { ErrorSource } from './Errors.state';
 
+const handlers: ErrorHandler[] = [];
+
+export type ErrorHandler = (error: ErrorSource) => string | undefined;
+
+export function registerErrorHandler(handler: ErrorHandler): void {
+    handlers.push(handler);
+}
+
 export function getErrorMessage(error: ErrorSource): string {
+    for (const handler of handlers) {
+        const result = handler(error);
+
+        if (result) {
+            return result;
+        }
+    }
+
     if (typeof error === 'string') {
         return error;
     }

package/src/forms/{Form.test.ts → FormController.test.ts}

@@ -1,10 +1,18 @@
 import { describe, expect, expectTypeOf, it } from 'vitest';
+import { tt } from '@noeldemartin/testing';
+import type { Equals } from '@noeldemartin/utils';
+import type { Expect } from '@noeldemartin/testing';
 
-import { useForm } from './composition';
-import { FormFieldTypes } from '@/main';
-import { numberInput, requiredStringInput } from '@/forms/utils';
+import {
+    numberInput,
+    objectInput,
+    requiredObjectInput,
+    requiredStringInput,
+    stringInput,
+} from '@aerogel/core/forms/utils';
+import { useForm } from '@aerogel/core/utils/composition/forms';
 
-describe('Form', () => {
+describe('FormController', () => {
 
     it('defines magic fields', () => {
         const form = useForm({
@@ -20,7 +28,7 @@ describe('Form', () => {
         // Arrange
         const form = useForm({
             name: {
-                type: FormFieldTypes.String,
+                type: 'string',
                 rules: 'required',
             },
         });
@@ -38,7 +46,7 @@ describe('Form', () => {
         // Arrange
         const form = useForm({
             name: {
-                type: FormFieldTypes.String,
+                type: 'string',
                 rules: 'required',
             },
         });
@@ -59,11 +67,11 @@ describe('Form', () => {
         // Arrange
         const form = useForm({
             trimmed: {
-                type: FormFieldTypes.String,
+                type: 'string',
                 rules: 'required',
             },
             untrimmed: {
-                type: FormFieldTypes.String,
+                type: 'string',
                 rules: 'required',
                 trim: false,
             },
@@ -83,4 +91,20 @@ describe('Form', () => {
         expect(form.errors).toEqual({ trimmed: ['required'], untrimmed: null });
     });
 
+    it('infers field types', () => {
+        const form = useForm({
+            one: stringInput(),
+            two: requiredStringInput(),
+            three: objectInput(),
+            four: requiredObjectInput<{ foo: string; bar?: number }>(),
+        });
+
+        tt<
+            | Expect<Equals<typeof form.one, string | null>>
+            | Expect<Equals<typeof form.two, string>>
+            | Expect<Equals<typeof form.three, object | null>>
+            | Expect<Equals<typeof form.four, { foo: string; bar?: number }>>
+        >();
+    });
+
 });