@aerogel/core 0.0.0-next.7035064d9ec6a82a936ee8dfcc4b58ed2e25a399 → 0.0.0-next.73a6df428477c011a1aebe0a932ebef0aa5e1b16

package/src/services/Service.ts

@@ -11,9 +11,10 @@ import {
 import type { Constructor, Nullable } from '@noeldemartin/utils';
 import type { Store } from 'pinia';
 
-import ServiceBootError from '@/errors/ServiceBootError';
-import { defineServiceStore } from '@/services/store';
-import type { Unref } from '@/utils/vue';
+import ServiceBootError from '@aerogel/core/errors/ServiceBootError';
+import { appNamespace } from '@aerogel/core/utils/app';
+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
@@ -32,7 +33,7 @@ export type StateWatchers<TService extends Service, TState extends ServiceState>
 export type ServiceWithState<
     State extends ServiceState = ServiceState,
     ComputedState extends ServiceState = {},
-    ServiceStorage = Partial<State>
+    ServiceStorage = Partial<State>,
 > = Constructor<Unref<State>> &
     Constructor<ComputedState> &
     Constructor<Service<Unref<State>, ComputedState, Unref<ServiceStorage>>>;
@@ -40,7 +41,7 @@ export type ServiceWithState<
 export function defineServiceState<
     State extends ServiceState = ServiceState,
     ComputedState extends ServiceState = {},
-    ServiceStorage = Partial<State>
+    ServiceStorage = Partial<State>,
 >(options: {
     name: string;
     initialState: State | (() => State);
@@ -52,17 +53,17 @@ export function defineServiceState<
 }): 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(): Unref<State> {
+        protected override getInitialState(): Unref<State> {
             if (typeof options.initialState === 'function') {
                 return options.initialState();
             }
@@ -86,19 +87,19 @@ export function defineServiceState<
             }, {} as Unref<State>);
         }
 
-        protected getComputedStateDefinition(): ComputedStateDefinition<Unref<State>, ComputedState> {
+        protected override getComputedStateDefinition(): ComputedStateDefinition<Unref<State>, ComputedState> {
             return (options.computed ?? {}) as ComputedStateDefinition<Unref<State>, ComputedState>;
         }
 
-        protected getStateWatchers(): StateWatchers<Service, Unref<State>> {
+        protected override getStateWatchers(): StateWatchers<Service, Unref<State>> {
             return (options.watch ?? {}) as StateWatchers<Service, Unref<State>>;
         }
 
-        protected serializePersistedState(state: Partial<State>): ServiceStorage {
+        protected override serializePersistedState(state: Partial<State>): ServiceStorage {
             return options.serialize?.(state) ?? (state as ServiceStorage);
         }
 
-        protected deserializePersistedState(state: ServiceStorage): Partial<State> {
+        protected override deserializePersistedState(state: ServiceStorage): Partial<State> {
             return options.restore?.(state) ?? (state as Partial<State>);
         }
     
@@ -108,7 +109,7 @@ export function defineServiceState<
 export default class Service<
     State extends ServiceState = DefaultServiceState,
     ComputedState extends ServiceState = {},
-    ServiceStorage = Partial<State>
+    ServiceStorage = Partial<State>,
 > extends MagicObject {
 
     public static persist: string[] = [];
@@ -142,9 +143,9 @@ export default class Service<
         return this._booted;
     }
 
-    public static<T extends typeof Service>(): T;
-    public static<T extends typeof Service, K extends keyof T>(property: K): T[K];
-    public static<T extends typeof Service, K extends keyof T>(property?: K): T | T[K] {
+    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);
     }
 
@@ -164,7 +165,7 @@ export default class Service<
     }
 
     public hasPersistedState(): boolean {
-        return Storage.has(this._name);
+        return Storage.has(this.storageKey);
     }
 
     public hasState<P extends keyof State>(property: P): boolean {
@@ -182,10 +183,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;
@@ -219,7 +220,7 @@ export default class Service<
         this.onPersistentStateUpdated(state);
     }
 
-    protected __get(property: string): unknown {
+    protected override __get(property: string): unknown {
         if (this.hasState(property)) {
             return this.getState(property);
         }
@@ -227,10 +228,14 @@ 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 get storageKey(): string {
+        return `${appNamespace()}:${this._name}`;
+    }
+
     protected onStateUpdated(update: Partial<State>, old: Partial<State>): void {
         const persisted = objectOnly(update, this.static('persist'));
 
@@ -250,13 +255,13 @@ export default class Service<
     }
 
     protected onPersistentStateUpdated(persisted: Partial<State>): void {
-        const storage = Storage.get<ServiceStorage>(this._name);
+        const storage = Storage.get<ServiceStorage>(this.storageKey);
 
         if (!storage) {
             return;
         }
 
-        Storage.set(this._name, {
+        Storage.set(this.storageKey, {
             ...storage,
             ...this.serializePersistedState(objectDeepClone(persisted) as Partial<State>),
         });
@@ -303,14 +308,14 @@ export default class Service<
             return;
         }
 
-        if (Storage.has(this._name)) {
-            const persisted = Storage.require<ServiceStorage>(this._name);
+        if (Storage.has(this.storageKey)) {
+            const persisted = Storage.require<ServiceStorage>(this.storageKey);
             this.setState(this.deserializePersistedState(persisted));
 
             return;
         }
 
-        Storage.set(this._name, objectOnly(this.getState(), this.static('persist')));
+        Storage.set(this.storageKey, objectOnly(this.getState(), this.static('persist')));
     }
 
     protected requireStore(): Store<string, State, ComputedState, {}> {

package/src/services/Storage.ts

@@ -1,7 +1,7 @@
 import { facade } from '@noeldemartin/utils';
 
-import Events from '@/services/Events';
-import Service from '@/services/Service';
+import Events from '@aerogel/core/services/Events';
+import Service from '@aerogel/core/services/Service';
 
 export class StorageService extends Service {
 
@@ -13,7 +13,7 @@ export class StorageService extends Service {
 
 export default facade(StorageService);
 
-declare module '@/services/Events' {
+declare module '@aerogel/core/services/Events' {
     export interface EventsPayload {
         'purge-storage': void;
     }

package/src/services/index.ts

@@ -1,6 +1,7 @@
-import type { App as VueApp } from 'vue';
+import type { App as AppInstance } 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';
@@ -8,6 +9,7 @@ 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';
@@ -28,7 +30,7 @@ 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: AppInstance, services: Record<string, Service>): Promise<void> {
     await Promise.all(
         Object.entries(services).map(async ([name, service]) => {
             await service
@@ -39,7 +41,7 @@ export async function bootServices(app: VueApp, services: Record<string, Service
 
     Object.assign(app.config.globalProperties, services);
 
-    if (App.development || App.testing) {
+    if (isDevelopment() || isTesting()) {
         Object.assign(globalThis, services);
     }
 }
@@ -52,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

@@ -2,14 +2,14 @@ import { objectOnly } from '@noeldemartin/utils';
 
 export type Replace<
     TOriginal extends Record<string, unknown>,
-    TReplacements extends Partial<Record<keyof TOriginal, 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>>
+    TReplacements extends Partial<Record<keyof TOriginal, unknown>>,
 >(original: TOriginal, replacements: TReplacements): Replace<TOriginal, TReplacements> {
     return {
         ...original,

package/src/testing/index.ts

@@ -1,20 +1,25 @@
+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 { App } from '@aerogel/core/services';
+import { definePlugin } from '@aerogel/core/plugins';
+import type { Services } from '@aerogel/core/services';
 
 export interface AerogelTestingRuntime {
     on: (typeof Events)['on'];
+    service<T extends keyof Services>(name: T): Services[T] | null;
 }
 
 export default definePlugin({
     async install() {
-        if (import.meta.env.MODE !== 'testing') {
+        if (!isTesting()) {
             return;
         }
 
         globalThis.testingRuntime = {
             on: ((...args: GetClosureArgs<(typeof Events)['on']>) => Events.on(...args)) as (typeof Events)['on'],
+            service: (name) => App.service(name),
         };
     },
 });

package/src/testing/setup.ts

@@ -1,27 +1,11 @@
-import { mock, tap, toString } 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) => {
-    const localStorage: Record<string, string> = {};
-
-    global.jest = vi;
-    global.navigator = { languages: ['en'] };
-    global.localStorage = mock<Storage>({
-        getItem: (key) => localStorage[key] ?? null,
-        setItem(key, value) {
-            localStorage[key] = toString(value);
-        },
-    });
-});
-
 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,25 +1,19 @@
 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;
+    closing: boolean;
     beforeClose: Promise<T | undefined>;
     afterClose: Promise<T | undefined>;
 }
 
-export interface ModalComponent<
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    Properties extends Record<string, unknown> = Record<string, unknown>,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    Result = unknown
-> {}
-
-export interface Snackbar {
+export interface UIToast {
     id: string;
     component: Component;
     properties: Record<string, unknown>;
@@ -28,12 +22,13 @@ export interface Snackbar {
 export default defineServiceState({
     name: 'ui',
     initialState: {
-        modals: [] as Modal[],
-        snackbars: [] as Snackbar[],
+        modals: [] as UIModal[],
+        toasts: [] as UIToast[],
         layout: getCurrentLayout(),
     },
     computed: {
-        mobile: ({ layout }) => layout === Layouts.Mobile,
         desktop: ({ layout }) => layout === Layouts.Desktop,
+        mobile: ({ layout }) => layout === Layouts.Mobile,
+        openModals: ({ modals }) => modals.filter(({ closing }) => !closing),
     },
 });