@aerogel/core 0.0.0-next.b18f4e0acd39431045c2f444c711303890143193 → 0.0.0-next.b3caf219a503ce9b8c65ef1463132c9507f56c0a

package/src/components/ui/Modal.vue

@@ -0,0 +1,55 @@
+<template>
+    <HeadlessModal v-slot="{ close }" :persistent="persistent" v-bind="props">
+        <HeadlessModalOverlay class="fixed inset-0 bg-gray-500/75" />
+
+        <HeadlessModalContent :class="renderedWrapperClass">
+            <div v-if="!persistent" class="absolute top-0 right-0 hidden pt-1.5 pr-1.5 sm:block">
+                <Button variant="ghost" size="icon" @click="close()">
+                    <span class="sr-only">{{ $td('ui.close', 'Close') }}</span>
+                    <IconClose class="size-3 text-gray-400" />
+                </Button>
+            </div>
+
+            <HeadlessModalTitle v-if="title" class="text-base font-semibold text-gray-900">
+                <AGMarkdown :text="title" inline />
+            </HeadlessModalTitle>
+
+            <div :class="renderedContentClass">
+                <slot :close="close" />
+            </div>
+        </HeadlessModalContent>
+    </HeadlessModal>
+</template>
+
+<script setup lang="ts">
+import IconClose from '~icons/zondicons/close';
+
+import { computed } from 'vue';
+import type { HTMLAttributes } from 'vue';
+
+import AGMarkdown from '@aerogel/core/components/lib/AGMarkdown.vue';
+import HeadlessModal from '@aerogel/core/components/headless/HeadlessModal.vue';
+import HeadlessModalContent from '@aerogel/core/components/headless/HeadlessModalContent.vue';
+import HeadlessModalOverlay from '@aerogel/core/components/headless/HeadlessModalOverlay.vue';
+import HeadlessModalTitle from '@aerogel/core/components/headless/HeadlessModalTitle.vue';
+import { classes } from '@aerogel/core/components/utils';
+import type { ModalProps, ModalSlots } from '@aerogel/core/components/contracts/Modal';
+
+const {
+    class: contentClass = '',
+    wrapperClass = '',
+    title,
+    persistent,
+    ...props
+} = defineProps<ModalProps & { wrapperClass?: HTMLAttributes['class']; class?: HTMLAttributes['class'] }>();
+
+defineSlots<ModalSlots>();
+
+const renderedContentClass = computed(() => classes({ 'mt-2': title }, contentClass));
+const renderedWrapperClass = computed(() =>
+    classes(
+        // eslint-disable-next-line vue/max-len
+        'fixed top-1/2 left-1/2 z-50 w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl sm:max-w-lg',
+        wrapperClass,
+    ));
+</script>

package/src/components/ui/ModalContext.vue

@@ -0,0 +1,30 @@
+<template>
+    <component :is="modal.component" v-bind="modalProperties" />
+</template>
+
+<script setup lang="ts">
+import { computed, provide, toRef, unref } from 'vue';
+
+import type { UIModal, UIModalContext } from '@aerogel/core/ui/UI.state';
+import type { AcceptRefs } from '@aerogel/core/utils/vue';
+
+const props = defineProps<{
+    modal: UIModal;
+    childIndex?: number;
+}>();
+
+const modalProperties = computed(() => {
+    const properties = {} as typeof props.modal.properties;
+
+    for (const property in props.modal.properties) {
+        properties[property] = unref(props.modal.properties[property]);
+    }
+
+    return properties;
+});
+
+provide<AcceptRefs<UIModalContext>>('modal', {
+    modal: toRef(props, 'modal'),
+    childIndex: toRef(props, 'childIndex'),
+});
+</script>

package/src/components/ui/ProgressBar.vue

@@ -0,0 +1,50 @@
+<template>
+    <div class="mt-1 h-2 w-full overflow-hidden rounded-full bg-gray-200">
+        <div :class="filledClasses" :style="`transform:translateX(-${(1 - renderedProgress) * 100}%)`" />
+        <span class="sr-only">
+            {{
+                $td('ui.progress', '{progress}% complete', {
+                    progress: renderedProgress * 100,
+                })
+            }}
+        </span>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onUnmounted, ref, watch } from 'vue';
+
+import { classes } from '@aerogel/core/components/utils';
+import type Job from '@aerogel/core/jobs/Job';
+
+const { filledClass, progress, job } = defineProps<{
+    filledClass?: string;
+    progress?: number;
+    job?: Job;
+}>();
+
+let cleanup: Function | undefined;
+const jobProgress = ref(0);
+const filledClasses = computed(() =>
+    classes('size-full transition-transform duration-500 rounded-r-full ease-linear bg-primary', filledClass));
+const renderedProgress = computed(() => {
+    if (typeof progress === 'number') {
+        return progress;
+    }
+
+    return jobProgress.value;
+});
+
+watch(
+    () => job,
+    () => {
+        cleanup?.();
+
+        jobProgress.value = job?.progress ?? 0;
+        cleanup = job?.listeners.add({ onUpdated: (value) => (jobProgress.value = value) });
+    },
+    { immediate: true },
+);
+
+onUnmounted(() => cleanup?.());
+</script>

package/src/components/ui/PromptModal.vue

@@ -0,0 +1,35 @@
+<template>
+    <Modal v-slot="{ close }" :title="title" persistent>
+        <Form :form="form" @submit="close(form.draft)">
+            <AGMarkdown :text="message" />
+            <Input
+                name="draft"
+                class="mt-2"
+                :placeholder="placeholder"
+                :label="label"
+            />
+
+            <div class="mt-4 flex flex-row-reverse gap-2">
+                <Button :variant="acceptVariant" submit>
+                    {{ renderedAcceptText }}
+                </Button>
+                <Button :variant="cancelVariant" @click="close(false)">
+                    {{ renderedCancelText }}
+                </Button>
+            </div>
+        </Form>
+    </Modal>
+</template>
+
+<script setup lang="ts">
+import AGMarkdown from '@aerogel/core/components/lib/AGMarkdown.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 { PromptModalProps } from '@aerogel/core/components/contracts/PromptModal';
+
+const { cancelVariant = 'secondary', ...props } = defineProps<PromptModalProps>();
+const { form, renderedAcceptText, renderedCancelText } = usePromptModal(props);
+</script>

package/src/components/ui/index.ts

@@ -0,0 +1,15 @@
+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 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 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';

package/src/components/utils.ts

@@ -1,10 +1,107 @@
-export function extractComponentProps<T extends Record<string, unknown>>(
-    values: Record<string, unknown>,
-    definitions: Record<string, unknown>,
-): T {
-    return Object.keys(definitions).reduce((extracted, prop) => {
-        extracted[prop] = values[prop];
-
-        return extracted;
-    }, {} as Record<string, unknown>) as T;
+import clsx from 'clsx';
+import { computed, customRef, inject, onUnmounted, unref } from 'vue';
+import { cva } from 'class-variance-authority';
+import { isObject } from '@noeldemartin/utils';
+import { twMerge } from 'tailwind-merge';
+import type { ClassValue } from 'clsx';
+import type { ComputedRef, ExtractPropTypes, PropType, Ref, UnwrapNestedRefs } from 'vue';
+import type { GetClosureArgs, GetClosureResult, Nullable } from '@noeldemartin/utils';
+
+import type { HasElement } from '@aerogel/core/components/contracts/shared';
+import type { FormController } from '@aerogel/core/forms';
+
+export type CVAConfig<T> = NonNullable<GetClosureArgs<typeof cva<T>>[1]>;
+export type CVAProps<T> = NonNullable<GetClosureArgs<GetClosureResult<typeof cva<T>>>[0]>;
+export type RefsObject<T> = { [K in keyof T]: Ref<T[K]> | T[K] };
+export type Variants<T extends Record<string, string>> = Required<{
+    [K in keyof T]: {
+        [key in T[K]]: string;
+    };
+}>;
+
+export type ComponentPropDefinitions<T> = {
+    [K in keyof T]: {
+        type?: PropType<T[K]>;
+        default: T[K] | (() => T[K]) | null;
+    };
+};
+
+export type PickComponentProps<TValues, TDefinitions> = {
+    [K in keyof TValues]: K extends keyof TDefinitions ? TValues[K] : never;
+};
+
+export function computedVariantClasses<T>(
+    value: RefsObject<{ baseClasses?: string } & CVAProps<T>>,
+    config: { baseClasses?: string } & CVAConfig<T>,
+): ComputedRef<string> {
+    return computed(() => {
+        const { baseClasses: valueBaseClasses, ...valueRefs } = value;
+        const { baseClasses: configBaseClasses, ...configs } = config;
+        const variants = cva(configBaseClasses, configs as CVAConfig<T>);
+        const values = Object.entries(valueRefs).reduce((extractedValues, [name, valueRef]) => {
+            extractedValues[name as keyof CVAProps<T>] = unref(valueRef);
+
+            return extractedValues;
+        }, {} as CVAProps<T>);
+
+        return classes(variants(values), unref(valueBaseClasses));
+    });
+}
+
+export function classes(...inputs: ClassValue[]): string {
+    return twMerge(clsx(inputs));
+}
+
+export function elementRef(): Ref<HTMLElement | undefined> {
+    return customRef((track, trigger) => {
+        let value: HTMLElement | undefined = undefined;
+
+        return {
+            get() {
+                track();
+
+                return value;
+            },
+            set(newValue) {
+                value = getElement(newValue);
+
+                trigger();
+            },
+        };
+    });
+}
+
+export function extractComponentProps<TDefinitions extends {}, TValues extends ExtractPropTypes<TDefinitions>>(
+    values: TValues,
+    definitions: TDefinitions,
+): PickComponentProps<TValues, TDefinitions> {
+    return Object.keys(definitions).reduce(
+        (extracted, prop) => {
+            extracted[prop] = values[prop as keyof TValues];
+
+            return extracted;
+        },
+        {} as Record<string, unknown>,
+    ) as PickComponentProps<TValues, TDefinitions>;
+}
+
+export function getElement(value: unknown): HTMLElement | undefined {
+    if (value instanceof HTMLElement) {
+        return value;
+    }
+
+    if (hasElement(value)) {
+        return value.$el;
+    }
+}
+
+export function hasElement(value: unknown): value is UnwrapNestedRefs<HasElement> {
+    return isObject(value) && '$el' in value;
+}
+
+export function onFormFocus(input: { name: Nullable<string> }, listener: () => unknown): void {
+    const form = inject<FormController | null>('form', null);
+    const stop = form?.on('focus', (name) => input.name === name && listener());
+
+    onUnmounted(() => stop?.());
 }

package/src/directives/index.ts

@@ -1,15 +1,15 @@
 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';
+
 export default definePlugin({
     install(app, options) {
         const directives = {
@@ -23,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,12 +1,40 @@
-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 interface ElementSize {
+    width: number;
+    height: number;
+}
+
+export type MeasureDirectiveListener = (size: ElementSize) => unknown;
 
 export default defineDirective({
-    mounted(element: HTMLElement, { value }: { value?: () => unknown }) {
-        const sizes = element.getBoundingClientRect();
+    mounted(element: HTMLElement, { value }) {
+        // TODO replace with argument when typed properly
+        const modifiers = { css: true, watch: true };
+
+        const listener = typeof value === 'function' ? (value as MeasureDirectiveListener) : null;
+        const update = () => {
+            const sizes = element.getBoundingClientRect();
 
-        element.style.setProperty('--width', `${sizes.width}px`);
-        element.style.setProperty('--height', `${sizes.height}px`);
+            if (modifiers.css) {
+                element.style.setProperty('--width', `${sizes.width}px`);
+                element.style.setProperty('--height', `${sizes.height}px`);
+            }
 
-        value?.();
+            listener?.({ width: sizes.width, height: sizes.height });
+        };
+
+        if (modifiers.watch) {
+            resizeObservers.set(element, tap(new ResizeObserver(update)).observe(element));
+        }
+
+        update();
+    },
+    unmounted(element) {
+        resizeObservers.get(element)?.unobserve(element);
+        resizeObservers.delete(element);
     },
 });

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,15 +1,16 @@
-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, { UIComponents } from '@aerogel/core/ui/UI';
+import { translateWithDefault } from '@aerogel/core/lang/utils';
+import { Colors } from '@aerogel/core/components/constants';
+import { Events } from '@aerogel/core/services';
+import type { ErrorReportModalProps } from '@aerogel/core/components/contracts/ErrorReportModal';
+import type { ModalComponent } from '@aerogel/core/ui/UI.state';
 
 import Service from './Errors.state';
-import { Colors } from '@/components/constants';
-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 {
 
@@ -33,13 +34,19 @@ export class ErrorsService extends Service {
             return;
         }
 
-        UI.openModal<ModalComponent<AGErrorReportModalProps>>(UI.requireComponent(UIComponents.ErrorReportModal), {
+        UI.openModal<ModalComponent<ErrorReportModalProps>>(UI.requireComponent(UIComponents.ErrorReportModal), {
             reports,
         });
     }
 
     public async report(error: ErrorSource, message?: string): Promise<void> {
-        if (App.development || App.testing) {
+        await Events.emit('error', { error, message });
+
+        if (isTesting('unit')) {
+            throw error;
+        }
+
+        if (isDevelopment()) {
             this.logError(error);
         }
 
@@ -74,7 +81,7 @@ export class ErrorsService extends Service {
                         text: translateWithDefault('errors.viewDetails', 'View details'),
                         dismiss: true,
                         handler: () =>
-                            UI.openModal<ModalComponent<AGErrorReportModalProps>>(
+                            UI.openModal<ModalComponent<ErrorReportModalProps>>(
                                 UI.requireComponent(UIComponents.ErrorReportModal),
                                 { reports: [report] },
                             ),
@@ -110,22 +117,6 @@ export class ErrorsService extends Service {
         });
     }
 
-    public getErrorMessage(error: ErrorSource): string {
-        if (typeof error === 'string') {
-            return error;
-        }
-
-        if (error instanceof Error || error instanceof JSError) {
-            return error.message;
-        }
-
-        if (isObject(error)) {
-            return toString(error['message'] ?? error['description'] ?? 'Unknown error object');
-        }
-
-        return translateWithDefault('errors.unknown', 'Unknown Error');
-    }
-
     private logError(error: unknown): void {
         // eslint-disable-next-line no-console
         console.error(error);
@@ -185,4 +176,10 @@ export class ErrorsService extends Service {
 
 }
 
-export default facade(new ErrorsService());
+export default facade(ErrorsService);
+
+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,25 +1,19 @@
 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 { Errors, ErrorSource, ErrorReport, ErrorReportLog };
+export * from './utils';
+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) => {
-    if (!Errors.instance) {
-        // eslint-disable-next-line no-console
-        console.warn('Errors service hasn\'t been initialized properly!');
-
-        // eslint-disable-next-line no-console
-        console.error(error);
-
-        return true;
-    }
-
     Errors.report(error);
 
     return true;
@@ -44,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

@@ -0,0 +1,35 @@
+import { JSError, isObject, toString } from '@noeldemartin/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;
+    }
+
+    if (error instanceof Error || error instanceof JSError) {
+        return error.message;
+    }
+
+    if (isObject(error)) {
+        return toString(error['message'] ?? error['description'] ?? 'Unknown error object');
+    }
+
+    return translateWithDefault('errors.unknown', 'Unknown Error');
+}

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

@@ -1,10 +1,11 @@
 import { describe, expect, expectTypeOf, it } from 'vitest';
 
-import { useForm } from './composition';
-import { FormFieldTypes } from '@/main';
-import { numberInput, requiredStringInput } from '@/forms/utils';
+import { useForm } from '@aerogel/core/forms/composition';
+import { numberInput, requiredStringInput } from '@aerogel/core/forms/utils';
 
-describe('Form', () => {
+import { FormFieldTypes } from './FormController';
+
+describe('FormController', () => {
 
     it('defines magic fields', () => {
         const form = useForm({
@@ -55,4 +56,32 @@ describe('Form', () => {
         expect(form.name).toBeNull();
     });
 
+    it('trims values', () => {
+        // Arrange
+        const form = useForm({
+            trimmed: {
+                type: FormFieldTypes.String,
+                rules: 'required',
+            },
+            untrimmed: {
+                type: FormFieldTypes.String,
+                rules: 'required',
+                trim: false,
+            },
+        });
+
+        // Act
+        form.trimmed = '   ';
+        form.untrimmed = '   ';
+
+        form.submit();
+
+        // Assert
+        expect(form.valid).toBe(false);
+        expect(form.submitted).toBe(true);
+        expect(form.trimmed).toEqual('');
+        expect(form.untrimmed).toEqual('   ');
+        expect(form.errors).toEqual({ trimmed: ['required'], untrimmed: null });
+    });
+
 });