@aerogel/core 0.0.0-next.f9394854509d71d644498ac087706a2f8f8eea1c → 0.0.0-next.fcfbfdc3428c34c4d1c0e781b61d244f13232fc9

package/src/services/Service.ts

@@ -1,49 +1,68 @@
-import { MagicObject, PromisedValue, Storage, fail, isEmpty, objectDeepClone, objectOnly } from '@noeldemartin/utils';
-import type { Constructor } from '@noeldemartin/utils';
-import type { MaybeRef } from 'vue';
+import {
+    MagicObject,
+    PromisedValue,
+    Storage,
+    arrayFrom,
+    fail,
+    isEmpty,
+    objectDeepClone,
+    objectOnly,
+} from '@noeldemartin/utils';
+import type { Constructor, Nullable } from '@noeldemartin/utils';
 import type { Store } from 'pinia';
 
-import ServiceBootError from '@/errors/ServiceBootError';
-import { defineServiceStore } from '@/services/store';
+import ServiceBootError from '@aerogel/core/errors/ServiceBootError';
+import { defineServiceStore } from '@aerogel/core/services/store';
+import type { Unref } from '@aerogel/core/utils/vue';
 
 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 ServiceConstructor<T extends Service = Service> = Constructor<T> & typeof Service;
-export type UnrefServiceState<State extends ServiceState> = {
-    [K in keyof State]: State[K] extends MaybeRef<infer T> ? T : State[K];
-};
 
 export type ComputedStateDefinition<TState extends ServiceState, TComputedState extends ServiceState> = {
-    [K in keyof TComputedState]: (state: UnrefServiceState<TState>) => TComputedState[K];
+    [K in keyof TComputedState]: (state: Unref<TState>) => TComputedState[K];
 } & ThisType<{
     readonly [K in keyof TComputedState]: TComputedState[K];
 }>;
 
+export type StateWatchers<TService extends Service, TState extends ServiceState> = {
+    [K in keyof TState]?: (this: TService, value: TState[K], oldValue: TState[K]) => unknown;
+};
+
+export type ServiceWithState<
+    State extends ServiceState = ServiceState,
+    ComputedState extends ServiceState = {},
+    ServiceStorage = Partial<State>,
+> = Constructor<Unref<State>> &
+    Constructor<ComputedState> &
+    Constructor<Service<Unref<State>, ComputedState, Unref<ServiceStorage>>>;
+
 export function defineServiceState<
     State extends ServiceState = ServiceState,
-    ComputedState extends ServiceState = {}
+    ComputedState extends ServiceState = {},
+    ServiceStorage = Partial<State>,
 >(options: {
     name: string;
     initialState: State | (() => State);
     persist?: (keyof State)[];
+    watch?: StateWatchers<Service, State>;
     computed?: ComputedStateDefinition<State, ComputedState>;
-    serialize?: (state: Partial<State>) => Partial<State>;
-}): Constructor<UnrefServiceState<State>> &
-    Constructor<ComputedState> &
-    Constructor<Service<UnrefServiceState<State>, ComputedState, Partial<UnrefServiceState<State>>>> {
-    return class extends Service<UnrefServiceState<State>, ComputedState> {
+    serialize?: (state: Partial<State>) => ServiceStorage;
+    restore?: (state: ServiceStorage) => Partial<State>;
+}): ServiceWithState<State, ComputedState, ServiceStorage> {
+    return class extends Service<Unref<State>, ComputedState, ServiceStorage> {
 
-        public static persist = (options.persist as string[]) ?? [];
+        public static override persist = (options.persist as string[]) ?? [];
 
-        protected usesStore(): boolean {
+        protected override usesStore(): boolean {
             return true;
         }
 
-        protected getName(): string | null {
+        protected override getName(): string | null {
             return options.name ?? null;
         }
 
-        protected getInitialState(): UnrefServiceState<State> {
+        protected override getInitialState(): Unref<State> {
             if (typeof options.initialState === 'function') {
                 return options.initialState();
             }
@@ -64,26 +83,32 @@ export function defineServiceState<
                 state[key as keyof State] = value;
 
                 return state;
-            }, {} as UnrefServiceState<State>);
+            }, {} as Unref<State>);
         }
 
-        protected getComputedStateDefinition(): ComputedStateDefinition<UnrefServiceState<State>, ComputedState> {
-            return (options.computed ?? {}) as ComputedStateDefinition<UnrefServiceState<State>, ComputedState>;
+        protected override getComputedStateDefinition(): ComputedStateDefinition<Unref<State>, ComputedState> {
+            return (options.computed ?? {}) as ComputedStateDefinition<Unref<State>, ComputedState>;
         }
 
-        protected serializePersistedState(state: Partial<State>): Partial<State> {
-            return options.serialize?.(state) ?? state;
+        protected override getStateWatchers(): StateWatchers<Service, Unref<State>> {
+            return (options.watch ?? {}) as StateWatchers<Service, Unref<State>>;
         }
 
-    } as unknown as Constructor<UnrefServiceState<State>> &
-        Constructor<ComputedState> &
-        Constructor<Service<UnrefServiceState<State>, ComputedState, Partial<UnrefServiceState<State>>>>;
+        protected override serializePersistedState(state: Partial<State>): ServiceStorage {
+            return options.serialize?.(state) ?? (state as ServiceStorage);
+        }
+
+        protected override deserializePersistedState(state: ServiceStorage): Partial<State> {
+            return options.restore?.(state) ?? (state as Partial<State>);
+        }
+    
+    } as unknown as ServiceWithState<State, ComputedState, ServiceStorage>;
 }
 
 export default class Service<
     State extends ServiceState = DefaultServiceState,
     ComputedState extends ServiceState = {},
-    ServiceStorage extends Partial<State> = Partial<State>
+    ServiceStorage = Partial<State>,
 > extends MagicObject {
 
     public static persist: string[] = [];
@@ -91,6 +116,7 @@ export default class Service<
     protected _name: string;
     private _booted: PromisedValue<void>;
     private _computedStateKeys: Set<keyof State>;
+    private _watchers: StateWatchers<Service, State>;
     private _store: Store<string, State, ComputedState, {}> | false;
 
     constructor() {
@@ -101,6 +127,7 @@ export default class Service<
         this._name = this.getName() ?? new.target.name;
         this._booted = new PromisedValue();
         this._computedStateKeys = new Set(Object.keys(getters));
+        this._watchers = this.getStateWatchers();
         this._store =
             this.usesStore() &&
             defineServiceStore(this._name, {
@@ -115,6 +142,12 @@ export default class Service<
         return this._booted;
     }
 
+    public override static<T extends typeof Service>(): T;
+    public override static<T extends typeof Service, K extends keyof T>(property: K): T[K];
+    public override static<T extends typeof Service, K extends keyof T>(property?: K): T | T[K] {
+        return super.static<T, K>(property as K);
+    }
+
     public launch(): Promise<void> {
         const handleError = (error: unknown) => this._booted.reject(new ServiceBootError(this._name, error));
 
@@ -149,10 +182,10 @@ export default class Service<
         const store = this._store as any;
 
         if (property) {
-            return store ? store[property] : undefined;
+            return store ? store[property] : (undefined as State[P]);
         }
 
-        return store ? store : {};
+        return store ? store : ({} as State);
     }
 
     public setState<P extends keyof State>(property: P, value: State[P]): void;
@@ -162,16 +195,31 @@ export default class Service<
             return;
         }
 
-        const state = (
-            typeof stateOrProperty === 'string' ? { [stateOrProperty]: value } : stateOrProperty
-        ) as Partial<State>;
+        const update = typeof stateOrProperty === 'string' ? { [stateOrProperty]: value } : stateOrProperty;
+        const old = objectOnly(this._store.$state as State, Object.keys(update));
 
-        Object.assign(this._store.$state, state);
+        Object.assign(this._store.$state, update);
+        this.onStateUpdated(update as Partial<State>, old as Partial<State>);
+    }
 
-        this.onStateUpdated(state);
+    public updatePersistedState<T extends keyof State>(key: T): void;
+    public updatePersistedState<T extends keyof State>(keys: T[]): void;
+    public updatePersistedState<T extends keyof State>(keyOrKeys: T | T[]): void {
+        if (!this._store) {
+            return;
+        }
+
+        const keys = arrayFrom(keyOrKeys) as Array<keyof State>;
+        const state = objectOnly(this._store.$state as State, keys);
+
+        if (isEmpty(state)) {
+            return;
+        }
+
+        this.onPersistentStateUpdated(state);
     }
 
-    protected __get(property: string): unknown {
+    protected override __get(property: string): unknown {
         if (this.hasState(property)) {
             return this.getState(property);
         }
@@ -179,19 +227,29 @@ export default class Service<
         return super.__get(property);
     }
 
-    protected __set(property: string, value: unknown): void {
+    protected override __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);
+    protected onStateUpdated(update: Partial<State>, old: Partial<State>): void {
+        const persisted = objectOnly(update, this.static('persist'));
 
-        if (isEmpty(persisted)) {
-            return;
+        if (!isEmpty(persisted)) {
+            this.onPersistentStateUpdated(persisted as Partial<State>);
         }
 
+        for (const property in update) {
+            const watcher = this._watchers[property] as Nullable<(value: unknown, oldValue: unknown) => unknown>;
+
+            if (!watcher || update[property] === old[property]) {
+                continue;
+            }
+
+            watcher.call(this, update[property], old[property]);
+        }
+    }
+
+    protected onPersistentStateUpdated(persisted: Partial<State>): void {
         const storage = Storage.get<ServiceStorage>(this._name);
 
         if (!storage) {
@@ -220,34 +278,39 @@ export default class Service<
         return {} as ComputedStateDefinition<State, ComputedState>;
     }
 
-    protected serializePersistedState(state: Partial<State>): Partial<State> {
-        return state;
+    protected getStateWatchers(): StateWatchers<Service, State> {
+        return {};
+    }
+
+    protected serializePersistedState(state: Partial<State>): ServiceStorage {
+        return state as ServiceStorage;
+    }
+
+    protected deserializePersistedState(state: ServiceStorage): Partial<State> {
+        return state as Partial<State>;
     }
 
     protected async frameworkBoot(): Promise<void> {
-        this.initializePersistedState();
+        this.restorePersistedState();
     }
 
     protected async boot(): Promise<void> {
         // Placeholder for overrides, don't place any functionality here.
     }
 
-    protected initializePersistedState(): void {
-        // TODO fix this.static()
-        const persist = (this.constructor as unknown as { persist: string[] }).persist;
-
-        if (!this.usesStore() || isEmpty(persist)) {
+    protected restorePersistedState(): void {
+        if (!this.usesStore() || isEmpty(this.static('persist'))) {
             return;
         }
 
         if (Storage.has(this._name)) {
             const persisted = Storage.require<ServiceStorage>(this._name);
-            this.setState(persisted);
+            this.setState(this.deserializePersistedState(persisted));
 
             return;
         }
 
-        Storage.set(this._name, objectOnly(this.getState(), persist));
+        Storage.set(this._name, objectOnly(this.getState(), this.static('persist')));
     }
 
     protected requireStore(): Store<string, State, ComputedState, {}> {

package/src/services/Storage.ts

@@ -0,0 +1,20 @@
+import { facade } from '@noeldemartin/utils';
+
+import Events from '@aerogel/core/services/Events';
+import Service from '@aerogel/core/services/Service';
+
+export class StorageService extends Service {
+
+    public async purge(): Promise<void> {
+        await Events.emit('purge-storage');
+    }
+
+}
+
+export default facade(StorageService);
+
+declare module '@aerogel/core/services/Events' {
+    export interface EventsPayload {
+        'purge-storage': void;
+    }
+}

package/src/services/index.ts

@@ -1,24 +1,29 @@
 import type { App as VueApp } from 'vue';
 
-import { definePlugin } from '@/plugins';
+import { definePlugin } from '@aerogel/core/plugins';
+import { isDevelopment, isTesting } from '@noeldemartin/utils';
 
 import App from './App';
 import Cache from './Cache';
 import Events from './Events';
 import Service from './Service';
+import Storage from './Storage';
 import { getPiniaStore } from './store';
+import type { AppSetting } from './App.state';
 
 export * from './App';
 export * from './Cache';
 export * from './Events';
 export * from './Service';
 export * from './store';
+export * from './utils';
 
-export { App, Cache, Events, Service };
+export { App, Cache, Events, Storage, Service };
 
 const defaultServices = {
     $app: App,
     $events: Events,
+    $storage: Storage,
 };
 
 export type DefaultServices = typeof defaultServices;
@@ -36,7 +41,9 @@ export async function bootServices(app: VueApp, services: Record<string, Service
 
     Object.assign(app.config.globalProperties, services);
 
-    App.development && Object.assign(window, services);
+    if (isDevelopment() || isTesting()) {
+        Object.assign(globalThis, services);
+    }
 }
 
 export default definePlugin({
@@ -47,17 +54,19 @@ export default definePlugin({
         };
 
         app.use(getPiniaStore());
+        options.settings?.forEach((setting) => App.addSetting(setting));
 
         await bootServices(app, services);
     },
 });
 
-declare module '@/bootstrap/options' {
+declare module '@aerogel/core/bootstrap/options' {
     export interface AerogelOptions {
         services?: Record<string, Service>;
+        settings?: AppSetting[];
     }
 }
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
     interface ComponentCustomProperties extends Services {}
 }

package/src/services/utils.ts

@@ -0,0 +1,18 @@
+import { objectOnly } from '@noeldemartin/utils';
+
+export type Replace<
+    TOriginal extends Record<string, unknown>,
+    TReplacements extends Partial<Record<keyof TOriginal, unknown>>,
+> = {
+    [K in keyof TOriginal]: TReplacements extends Record<K, infer Replacement> ? Replacement : TOriginal[K];
+};
+
+export function replaceExisting<
+    TOriginal extends Record<string, unknown>,
+    TReplacements extends Partial<Record<keyof TOriginal, unknown>>,
+>(original: TOriginal, replacements: TReplacements): Replace<TOriginal, TReplacements> {
+    return {
+        ...original,
+        ...objectOnly(replacements, Object.keys(original)),
+    } as Replace<TOriginal, TReplacements>;
+}

package/src/testing/index.ts

@@ -1,7 +1,8 @@
+import { isTesting } from '@noeldemartin/utils';
 import type { GetClosureArgs } from '@noeldemartin/utils';
 
-import Events from '@/services/Events';
-import { definePlugin } from '@/plugins';
+import Events from '@aerogel/core/services/Events';
+import { definePlugin } from '@aerogel/core/plugins';
 
 export interface AerogelTestingRuntime {
     on: (typeof Events)['on'];
@@ -9,7 +10,7 @@ export interface AerogelTestingRuntime {
 
 export default definePlugin({
     async install() {
-        if (import.meta.env.MODE !== 'testing') {
+        if (!isTesting()) {
             return;
         }
 

package/src/testing/setup.ts

@@ -1,19 +1,11 @@
-import { mock, tap } from '@noeldemartin/utils';
+import { FakeLocalStorage } from '@noeldemartin/testing';
 import { beforeEach, vi } from 'vitest';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-tap(globalThis, (global: any) => {
-    global.jest = vi;
-    global.navigator = { languages: ['en'] };
-    global.localStorage = mock<Storage>({
-        getItem: () => null,
-        setItem: () => null,
-    });
+vi.mock('dompurify', async () => {
+    return { default: { sanitize: (html: string) => html } };
 });
 
 beforeEach(() => {
-    vi.stubGlobal('document', {
-        querySelector: () => null,
-        getElementById: () => null,
-    });
+    FakeLocalStorage.reset();
+    FakeLocalStorage.patchGlobal();
 });

package/src/ui/UI.state.ts

@@ -1,10 +1,10 @@
 import type { Component } from 'vue';
 
-import { defineServiceState } from '@/services/Service';
+import { defineServiceState } from '@aerogel/core/services/Service';
 
 import { Layouts, getCurrentLayout } from './utils';
 
-export interface Modal<T = unknown> {
+export interface UIModal<T = unknown> {
     id: string;
     properties: Record<string, unknown>;
     component: Component;
@@ -12,14 +12,19 @@ export interface Modal<T = unknown> {
     afterClose: Promise<T | undefined>;
 }
 
+export interface UIModalContext {
+    modal: UIModal;
+    childIndex?: number;
+}
+
 export interface ModalComponent<
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    Properties extends Record<string, unknown> = Record<string, unknown>,
+    Properties extends object = object,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    Result = unknown
+    Result = unknown,
 > {}
 
-export interface Snackbar {
+export interface UIToast {
     id: string;
     component: Component;
     properties: Record<string, unknown>;
@@ -28,8 +33,8 @@ export interface Snackbar {
 export default defineServiceState({
     name: 'ui',
     initialState: {
-        modals: [] as Modal[],
-        snackbars: [] as Snackbar[],
+        modals: [] as UIModal[],
+        toasts: [] as UIToast[],
         layout: getCurrentLayout(),
     },
     computed: {