@aerogel/core 0.0.0-next.ea2e864c719d0a4d01b04729a9b681c0e9c85ea7 → 0.0.0-next.eb6fcafb87cdccbc72933f616799ca3124d1eca8

package/src/services/Service.ts

@@ -12,6 +12,7 @@ import type { Constructor, Nullable } from '@noeldemartin/utils';
 import type { Store } from 'pinia';
 
 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';
 
@@ -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 {
@@ -231,6 +232,10 @@ export default class Service<
         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/testing/index.ts

@@ -2,10 +2,13 @@ import { isTesting } from '@noeldemartin/utils';
 import type { GetClosureArgs } from '@noeldemartin/utils';
 
 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({
@@ -16,6 +19,7 @@ export default definePlugin({
 
         globalThis.testingRuntime = {
             on: ((...args: GetClosureArgs<(typeof Events)['on']>) => Events.on(...args)) as (typeof Events)['on'],
+            service: (name) => App.service(name),
         };
     },
 });

package/src/ui/UI.ts

@@ -1,5 +1,5 @@
 import { after, facade, fail, isDevelopment, required, uuid } from '@noeldemartin/utils';
-import { markRaw, nextTick } from 'vue';
+import { markRaw, nextTick, unref } from 'vue';
 import type { ComponentExposed, ComponentProps } from 'vue-component-type-helpers';
 import type { Component } from 'vue';
 import type { ClosureArgs } from '@noeldemartin/utils';
@@ -64,6 +64,7 @@ export type LoadingOptions = AcceptRefs<{
     title?: string;
     message?: string;
     progress?: number;
+    delay?: number;
 }>;
 
 export interface ConfirmOptionsWithCheckboxes<T extends ConfirmModalCheckboxes = ConfirmModalCheckboxes>
@@ -218,7 +219,11 @@ export class UIService extends Service {
         operation?: Promise<T> | (() => T),
     ): Promise<T> {
         const processOperation = (o: Promise<T> | (() => T)) => (typeof o === 'function' ? Promise.resolve(o()) : o);
-        const processArgs = (): { operationPromise: Promise<T>; props?: AcceptRefs<LoadingModalProps> } => {
+        const processArgs = (): {
+            operationPromise: Promise<T>;
+            props?: AcceptRefs<LoadingModalProps>;
+            delay?: number;
+        } => {
             if (typeof operationOrMessageOrOptions === 'string') {
                 return {
                     props: { message: operationOrMessageOrOptions },
@@ -230,13 +235,24 @@ export class UIService extends Service {
                 return { operationPromise: processOperation(operationOrMessageOrOptions) };
             }
 
+            const { delay, ...props } = operationOrMessageOrOptions;
+
             return {
-                props: operationOrMessageOrOptions,
+                props,
+                delay: unref(delay),
                 operationPromise: processOperation(operation as Promise<T> | (() => T)),
             };
         };
 
-        const { operationPromise, props } = processArgs();
+        let delayed = false;
+        const { operationPromise, props, delay } = processArgs();
+
+        delay && (await Promise.race([after({ ms: delay }).then(() => (delayed = true)), operationPromise]));
+
+        if (delay && !delayed) {
+            return operationPromise;
+        }
+
         const modal = await this.modal(this.requireComponent('loading-modal'), props);
 
         try {

package/src/utils/app.ts

@@ -0,0 +1,7 @@
+import Aerogel from 'virtual:aerogel';
+
+import { stringToSlug } from '@noeldemartin/utils';
+
+export function appNamespace(): string {
+    return Aerogel.namespace ?? stringToSlug(Aerogel.name);
+}

package/src/utils/index.ts

@@ -1,3 +1,4 @@
+export * from './app';
 export * from './classes';
 export * from './composition/events';
 export * from './composition/forms';