@aerogel/core 0.0.0-next.59bf5f7cc06e728d0cf6c00de28f1da48d7d6b8e → 0.0.0-next.7f6ed5a1f91688a86bf5ede2adc465e4fd6cfdea

package/src/services/Service.ts

@@ -1,96 +1,47 @@
-import { MagicObject, PromisedValue, Storage, isEmpty, objectDeepClone, objectOnly } from '@noeldemartin/utils';
+import { MagicObject, PromisedValue } from '@noeldemartin/utils';
+import { reactive } from 'vue';
 import type { Constructor } from '@noeldemartin/utils';
-import type { Store } from 'pinia';
 
 import ServiceBootError from '@/errors/ServiceBootError';
-import { defineServiceStore } from '@/services/store';
 
 export type ServiceState = Record<string, any>; // eslint-disable-line @typescript-eslint/no-explicit-any
-export type DefaultServiceState = any; // eslint-disable-line @typescript-eslint/no-explicit-any
+export type DefaultServiceState = {};
 export type ServiceConstructor<T extends Service = Service> = Constructor<T> & typeof Service;
 
-export type ComputedStateDefinition<TState extends ServiceState, TComputedState extends ServiceState> = {
-    [K in keyof TComputedState]: (state: TState) => TComputedState[K];
-} & ThisType<{
-    readonly [K in keyof TComputedState]: TComputedState[K];
-}>;
-
-export function defineServiceState<
-    State extends ServiceState = ServiceState,
-    ComputedState extends ServiceState = {}
->(options: {
-    name: string;
+export function defineServiceState<State extends ServiceState>(options: {
     initialState: State;
-    persist?: (keyof State)[];
-    computed?: ComputedStateDefinition<State, ComputedState>;
-    serialize?: (state: Partial<State>) => Partial<State>;
-}): Constructor<State> & Constructor<ComputedState> & Constructor<Service<State, ComputedState, Partial<State>>> {
-    return class extends Service<State, ComputedState> {
-
-        public static persist = (options.persist as string[]) ?? [];
-
-        protected usesStore(): boolean {
-            return true;
-        }
-
-        protected getName(): string | null {
-            return options.name ?? null;
-        }
+}): Constructor<State> & ServiceConstructor {
+    return class extends Service<State> {
 
         protected getInitialState(): State {
             return options.initialState;
         }
-
-        protected getComputedStateDefinition(): ComputedStateDefinition<State, ComputedState> {
-            return options.computed ?? ({} as ComputedStateDefinition<State, ComputedState>);
-        }
-
-        protected serializePersistedState(state: Partial<State>): Partial<State> {
-            return options.serialize?.(state) ?? state;
-        }
     
-    } as unknown as Constructor<State> &
-        Constructor<ComputedState> &
-        Constructor<Service<State, ComputedState, Partial<State>>>;
+    } as unknown as Constructor<State> & ServiceConstructor;
 }
 
-export default class Service<
-    State extends ServiceState = DefaultServiceState,
-    ComputedState extends ServiceState = {},
-    ServiceStorage extends Partial<State> = Partial<State>
-> extends MagicObject {
+export default class Service<State extends ServiceState = DefaultServiceState> extends MagicObject {
 
-    public static persist: string[] = [];
-
-    protected _name: string;
+    protected _namespace: string;
     private _booted: PromisedValue<void>;
-    private _computedStateKeys: Set<keyof State>;
-    private _store?: Store | false;
+    private _state: State;
 
     constructor() {
         super();
 
-        const getters = this.getComputedStateDefinition();
-
-        this._name = this.getName() ?? new.target.name;
+        this._namespace = new.target.name;
         this._booted = new PromisedValue();
-        this._computedStateKeys = new Set(Object.keys(getters));
-        this._store =
-            this.usesStore() &&
-            defineServiceStore(this._name, {
-                state: () => this.getInitialState(),
-
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                getters: getters as any,
-            });
+        this._state = reactive(this.getInitialState());
     }
 
     public get booted(): PromisedValue<void> {
         return this._booted;
     }
 
-    public launch(): Promise<void> {
-        const handleError = (error: unknown) => this._booted.reject(new ServiceBootError(this._name, error));
+    public launch(namespace?: string): Promise<void> {
+        const handleError = (error: unknown) => this._booted.reject(new ServiceBootError(this._namespace, error));
+
+        this._namespace = namespace ?? this._namespace;
 
         try {
             this.boot()
@@ -103,112 +54,38 @@ export default class Service<
         return this._booted;
     }
 
-    public hasState<P extends keyof State>(property: P): boolean {
-        if (!this._store) {
-            return false;
-        }
-
-        return property in this._store.$state || this._computedStateKeys.has(property);
-    }
-
-    public getState(): State;
-    public getState<P extends keyof State>(property: P): State[P];
-    public getState<P extends keyof State>(property?: P): State | State[P] {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const store = this._store as any;
-
-        if (property) {
-            return store ? store[property] : undefined;
-        }
-
-        return store ? store : {};
-    }
-
-    public setState<P extends keyof State>(property: P, value: State[P]): void;
-    public setState(state: Partial<State>): void;
-    public setState<P extends keyof State>(stateOrProperty: P | Partial<State>, value?: State[P]): void {
-        if (!this._store) {
-            return;
-        }
-
-        const state = (
-            typeof stateOrProperty === 'string' ? { [stateOrProperty]: value } : stateOrProperty
-        ) as Partial<State>;
-
-        Object.assign(this._store.$state, state);
-
-        this.onStateUpdated(state);
-    }
-
     protected __get(property: string): unknown {
-        if (this.hasState(property)) {
-            return this.getState(property);
+        if (!this.hasState(property)) {
+            return super.__get(property);
         }
 
-        return super.__get(property);
+        return this.getState(property);
     }
 
     protected __set(property: string, value: unknown): void {
         this.setState({ [property]: value } as Partial<State>);
     }
 
-    protected onStateUpdated(state: Partial<State>): void {
-        // TODO fix this.static()
-        const persist = (this.constructor as unknown as { persist: string[] }).persist;
-        const persisted = objectOnly(state, persist);
-
-        if (isEmpty(persisted)) {
-            return;
-        }
-
-        const storage = Storage.require<ServiceStorage>(this._name);
-
-        Storage.set(this._name, {
-            ...storage,
-            ...this.serializePersistedState(objectDeepClone(persisted) as Partial<State>),
-        });
+    protected hasState<P extends keyof State>(property: P): boolean {
+        return property in this._state;
     }
 
-    protected usesStore(): boolean {
-        return false;
+    protected getState(): State;
+    protected getState<P extends keyof State>(property: P): State[P];
+    protected getState<P extends keyof State>(property?: P): State | State[P] {
+        return property ? this._state[property] : this._state;
     }
 
-    protected getName(): string | null {
-        return null;
+    protected setState(state: Partial<State>): void {
+        Object.assign(this._state, state);
     }
 
     protected getInitialState(): State {
         return {} as State;
     }
 
-    protected getComputedStateDefinition(): ComputedStateDefinition<State, ComputedState> {
-        return {} as ComputedStateDefinition<State, ComputedState>;
-    }
-
-    protected serializePersistedState(state: Partial<State>): Partial<State> {
-        return state;
-    }
-
     protected async boot(): Promise<void> {
-        this.restorePersistedState();
-    }
-
-    protected restorePersistedState(): void {
-        // TODO fix this.static()
-        const persist = (this.constructor as unknown as { persist: string[] }).persist;
-
-        if (!this.usesStore() || isEmpty(persist)) {
-            return;
-        }
-
-        if (Storage.has(this._name)) {
-            const persisted = Storage.require<ServiceStorage>(this._name);
-            this.setState(persisted);
-
-            return;
-        }
-
-        Storage.set(this._name, objectOnly(this.getState(), persist));
+        //
     }
 
 }

package/src/services/index.ts

@@ -1,20 +1,15 @@
-import type { App as VueApp } from 'vue';
+import type { App } from 'vue';
 
-import { definePlugin } from '@/plugins';
-
-import App from './App';
 import Events from './Events';
 import Service from './Service';
-import { getPiniaStore } from './store';
+import { defineBootstrapHook } from '@/bootstrap/hooks';
 
-export * from './App';
 export * from './Events';
 export * from './Service';
 
-export { App, Events, Service };
+export { Events, Service };
 
 const defaultServices = {
-    $app: App,
     $events: Events,
 };
 
@@ -22,35 +17,18 @@ export type DefaultServices = typeof defaultServices;
 
 export interface Services extends DefaultServices {}
 
-export async function bootServices(app: VueApp, services: Record<string, Service>): Promise<void> {
+export async function bootServices(app: App, services: Record<string, Service>): Promise<void> {
     await Promise.all(
-        Object.entries(services).map(async ([_, service]) => {
+        Object.entries(services).map(async ([name, service]) => {
             // eslint-disable-next-line no-console
-            await service.launch().catch((error) => console.error(error));
+            await service.launch(name.slice(1)).catch((error) => console.error(error));
         }),
     );
 
     Object.assign(app.config.globalProperties, services);
 }
 
-export default definePlugin({
-    async install(app, options) {
-        const services = {
-            ...defaultServices,
-            ...options.services,
-        };
-
-        app.use(getPiniaStore());
-
-        await bootServices(app, services);
-    },
-});
-
-declare module '@/bootstrap/options' {
-    interface AerogelOptions {
-        services?: Record<string, Service>;
-    }
-}
+export default defineBootstrapHook((app) => bootServices(app, defaultServices));
 
 declare module '@vue/runtime-core' {
     interface ComponentCustomProperties extends Services {}

package/src/testing/stubs/lang/en.yaml

@@ -0,0 +1 @@
+foo: Bar

package/src/testing/stubs/models/User.ts

@@ -0,0 +1,3 @@
+import { Model } from 'soukai';
+
+export default class User extends Model {}

package/src/types/vite.d.ts

@@ -1 +1,3 @@
 /// <reference types="vite/client" />
+
+declare const __AG_BASE_PATH: string | undefined;

package/src/ui/UI.state.ts

@@ -2,6 +2,10 @@ import type { Component } from 'vue';
 
 import { defineServiceState } from '@/services/Service';
 
+export interface State {
+    modals: Modal[];
+}
+
 export interface Modal<T = unknown> {
     id: string;
     properties: Record<string, unknown>;
@@ -17,7 +21,6 @@ export interface ModalComponent<
     Result = unknown
 > {}
 
-export default defineServiceState({
-    name: 'ui',
-    initialState: { modals: [] as Modal[] },
+export default defineServiceState<State>({
+    initialState: { modals: [] },
 });

package/src/ui/UI.ts

@@ -20,8 +20,6 @@ type ModalResult<TComponent> = TComponent extends ModalComponent<Record<string,
 
 export const UIComponents = {
     AlertModal: 'alert-modal',
-    ConfirmModal: 'confirm-modal',
-    LoadingModal: 'loading-modal',
 } as const;
 
 export type UIComponent = ObjectValues<typeof UIComponents>;
@@ -31,39 +29,8 @@ export class UIService extends Service {
     private modalCallbacks: Record<string, Partial<ModalCallbacks>> = {};
     private components: Partial<Record<UIComponent, Component>> = {};
 
-    public alert(message: string): void;
-    public alert(title: string, message: string): void;
-    public alert(messageOrTitle: string, message?: string): void {
-        const options = typeof message === 'string' ? { title: messageOrTitle, message } : { message: messageOrTitle };
-
-        this.openModal(this.requireComponent(UIComponents.AlertModal), options);
-    }
-
-    public async confirm(message: string): Promise<boolean>;
-    public async confirm(title: string, message: string): Promise<boolean>;
-    public async confirm(messageOrTitle: string, message?: string): Promise<boolean> {
-        const options = typeof message === 'string' ? { title: messageOrTitle, message } : { message: messageOrTitle };
-        const modal = await this.openModal<ModalComponent<{ message: string }, boolean>>(
-            this.requireComponent(UIComponents.ConfirmModal),
-            options,
-        );
-        const result = await modal.beforeClose;
-
-        return result ?? false;
-    }
-
-    public async loading<T>(operation: Promise<T>): Promise<T>;
-    public async loading<T>(message: string, operation: Promise<T>): Promise<T>;
-    public async loading<T>(messageOrOperation: string | Promise<T>, operation?: Promise<T>): Promise<T> {
-        operation = typeof messageOrOperation === 'string' ? (operation as Promise<T>) : messageOrOperation;
-
-        const message = typeof messageOrOperation === 'string' ? messageOrOperation : undefined;
-        const modal = await this.openModal(this.requireComponent(UIComponents.LoadingModal), { message });
-        const result = await operation;
-
-        await this.closeModal(modal.id);
-
-        return result;
+    public alert(message: string): void {
+        this.openModal(this.requireComponent(UIComponents.AlertModal), { message });
     }
 
     public registerComponent(name: UIComponent, component: Component): void {

package/src/ui/index.ts

@@ -1,12 +1,10 @@
 import type { Component } from 'vue';
 
 import { bootServices } from '@/services';
-import { definePlugin } from '@/plugins';
+import { defineBootstrapHook } from '@/bootstrap/hooks';
 
 import UI, { UIComponents } from './UI';
 import AGAlertModal from '../components/modals/AGAlertModal.vue';
-import AGConfirmModal from '../components/modals/AGConfirmModal.vue';
-import AGLoadingModal from '../components/modals/AGLoadingModal.vue';
 import type { UIComponent } from './UI';
 
 export { UI, UIComponents, UIComponent };
@@ -15,25 +13,21 @@ const services = { $ui: UI };
 
 export type UIServices = typeof services;
 
-export default definePlugin({
-    async install(app, options) {
-        const defaultComponents = {
-            [UIComponents.AlertModal]: AGAlertModal,
-            [UIComponents.ConfirmModal]: AGConfirmModal,
-            [UIComponents.LoadingModal]: AGLoadingModal,
-        };
-
-        Object.entries({
-            ...defaultComponents,
-            ...options.components,
-        }).forEach(([name, component]) => UI.registerComponent(name as UIComponent, component));
-
-        await bootServices(app, services);
-    },
+export default defineBootstrapHook(async (app, options) => {
+    const defaultComponents = {
+        [UIComponents.AlertModal]: AGAlertModal,
+    };
+
+    Object.entries({
+        ...defaultComponents,
+        ...options.components,
+    }).forEach(([name, component]) => UI.registerComponent(name as UIComponent, component));
+
+    await bootServices(app, services);
 });
 
 declare module '@/bootstrap/options' {
-    interface AerogelOptions {
+    interface BootstrapOptions {
         components?: Partial<Record<UIComponent, Component>>;
     }
 }

package/src/utils/index.ts

@@ -1,4 +1 @@
-export * from './composition/events';
-export * from './composition/forms';
-export * from './composition/hooks';
 export * from './vue';

package/tsconfig.json

@@ -1,6 +1,15 @@
 {
-    "extends": "../../tsconfig.json",
     "compilerOptions": {
+        "target": "esnext",
+        "module": "esnext",
+        "moduleResolution": "node",
+        "strict": true,
+        "types": [],
+        "jsx": "preserve",
+        "noUncheckedIndexedAccess": true,
+        "resolveJsonModule": true,
+        "esModuleInterop": true,
+        "lib": ["esnext", "dom"],
         "baseUrl": ".",
         "paths": {
             "@/*": ["./src/*"]

package/vite.config.ts

@@ -1,13 +1,17 @@
-import Aerogel from '@aerogel/vite';
+import I18n from '@intlify/unplugin-vue-i18n/vite';
+import Vue from '@vitejs/plugin-vue';
 import { defineConfig } from 'vitest/config';
 import { resolve } from 'path';
 
+const isTesting = process.env.NODE_ENV === 'test';
+
 export default defineConfig({
     test: { clearMocks: true },
-    plugins: [Aerogel()],
+    plugins: [Vue(), I18n({ include: resolve(__dirname, './src/testing/stubs/lang/**/*.yaml') })],
     resolve: {
         alias: {
             '@': resolve(__dirname, './src'),
         },
     },
+    define: isTesting ? { __AG_BASE_PATH: 'undefined' } : undefined,
 });

package/src/components/forms/AGCheckbox.vue

@@ -1,35 +0,0 @@
-<template>
-    <AGHeadlessInput ref="$input" :name="name" class="flex">
-        <AGHeadlessInputInput
-            v-bind="$attrs"
-            type="checkbox"
-            :class="{
-                'text-indigo-600 focus:ring-indigo-600': !$input?.errors,
-                'border-red-200 text-red-600 focus:ring-red-600': $input?.errors,
-            }"
-        />
-
-        <div class="ml-2">
-            <AGHeadlessInputLabel v-if="$slots.default">
-                <slot />
-            </AGHeadlessInputLabel>
-            <AGHeadlessInputError class="text-sm text-red-600" />
-        </div>
-    </AGHeadlessInput>
-</template>
-
-<script setup lang="ts">
-import { componentRef, stringProp } from '@/utils/vue';
-
-import type { IAGHeadlessInput } from '@/components/headless/forms/AGHeadlessInput';
-
-import AGHeadlessInput from '../headless/forms/AGHeadlessInput.vue';
-import AGHeadlessInputError from '../headless/forms/AGHeadlessInputError.vue';
-import AGHeadlessInputInput from '../headless/forms/AGHeadlessInputInput.vue';
-import AGHeadlessInputLabel from '../headless/forms/AGHeadlessInputLabel.vue';
-
-defineProps({ name: stringProp() });
-defineOptions({ inheritAttrs: false });
-
-const $input = componentRef<IAGHeadlessInput>();
-</script>

package/src/components/headless/forms/AGHeadlessInputLabel.vue

@@ -1,16 +0,0 @@
-<template>
-    <label :for="input.id">
-        <slot />
-    </label>
-</template>
-
-<script setup lang="ts">
-import { injectReactiveOrFail } from '@/utils/vue';
-
-import type { IAGHeadlessInput } from './AGHeadlessInput';
-
-const input = injectReactiveOrFail<IAGHeadlessInput>(
-    'input',
-    '<AGHeadlessInputLabel> must be a child of a <AGHeadlessInput>',
-);
-</script>

package/src/components/modals/AGConfirmModal.vue

@@ -1,30 +0,0 @@
-<template>
-    <AGModal v-slot="{ close }: IAGModalDefaultSlotProps" :cancellable="false">
-        <AGMarkdown v-if="title" :text="title" as="h1" />
-        <AGMarkdown :text="message" />
-
-        <div class="mt-2 flex flex-row-reverse gap-2">
-            <AGButton @click="close(true)">
-                {{ $td('ui.ok', 'OK') }}
-            </AGButton>
-            <AGButton secondary @click="close()">
-                {{ $td('ui.cancel', 'Cancel') }}
-            </AGButton>
-        </div>
-    </AGModal>
-</template>
-
-<script setup lang="ts">
-import { requiredStringProp, stringProp } from '@/utils/vue';
-
-import AGModal from './AGModal.vue';
-import type { IAGModalDefaultSlotProps } from './AGModal';
-
-import AGButton from '../forms/AGButton.vue';
-import AGMarkdown from '../basic/AGMarkdown.vue';
-
-defineProps({
-    title: stringProp(),
-    message: requiredStringProp(),
-});
-</script>

package/src/components/modals/AGLoadingModal.vue

@@ -1,19 +0,0 @@
-<template>
-    <AGModal :cancellable="false">
-        <AGMarkdown :text="renderedMessage" />
-    </AGModal>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue';
-
-import { stringProp } from '@/utils/vue';
-import { translateWithDefault } from '@/lang/utils';
-
-import AGModal from './AGModal.vue';
-
-import AGMarkdown from '../basic/AGMarkdown.vue';
-
-const props = defineProps({ message: stringProp() });
-const renderedMessage = computed(() => props.message ?? translateWithDefault('ui.loading', 'Loading...'));
-</script>

package/src/errors/Errors.state.ts

@@ -1,31 +0,0 @@
-import type { JSError } from '@noeldemartin/utils';
-
-import { defineServiceState } from '@/services';
-
-export type ErrorSource = string | Error | JSError | unknown;
-
-export interface ErrorReport {
-    title: string;
-    description?: string;
-    details?: string;
-    error?: Error | JSError | unknown;
-}
-
-export interface ErrorReportLog {
-    report: ErrorReport;
-    seen: boolean;
-    date: Date;
-}
-
-export default defineServiceState({
-    name: 'errors',
-    initialState: {
-        logs: [] as ErrorReportLog[],
-        startupErrors: [] as ErrorReport[],
-    },
-    computed: {
-        hasErrors: ({ logs }) => logs.length > 0,
-        hasNewErrors: ({ logs }) => logs.some((error) => !error.seen),
-        hasStartupErrors: ({ startupErrors }) => startupErrors.length > 0,
-    },
-});