@furystack/shades 14.0.0 → 15.0.1

package/esm/services/location-service.js

@@ -1,156 +1,137 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Injectable } from '@furystack/inject';
+import { defineService } from '@furystack/inject';
 import { deserializeQueryString as defaultDeserializeQueryString, serializeToQueryString as defaultSerializeToQueryString, } from '@furystack/rest';
 import { ObservableValue } from '@furystack/utils';
-/**
- * Singleton service that tracks browser location changes (pathname, search, hash)
- * and exposes them as observable values for reactive routing and URL-driven state.
- */
-let LocationService = class LocationService {
-    serializeToQueryString;
-    deserializeQueryString;
-    constructor(serializeToQueryString = defaultSerializeToQueryString, deserializeQueryString = defaultDeserializeQueryString) {
-        this.serializeToQueryString = serializeToQueryString;
-        this.deserializeQueryString = deserializeQueryString;
-        window.addEventListener('popstate', this.popStateListener);
-        window.addEventListener('hashchange', this.hashChangeListener);
-        this.onDeserializedLocationSearchChanged = new ObservableValue(this.deserializeQueryString(location.search));
-        this.originalPushState = window.history.pushState.bind(window.history);
-        window.history.pushState = ((...args) => {
-            this.originalPushState(...args);
-            this.updateState();
-        }).bind(this);
-        this.originalReplaceState = window.history.replaceState.bind(window.history);
-        window.history.replaceState = ((...args) => {
-            this.originalReplaceState(...args);
-            this.updateState();
-        }).bind(this);
-    }
-    originalPushState;
-    originalReplaceState;
-    [Symbol.dispose]() {
-        window.removeEventListener('popstate', this.popStateListener);
-        window.removeEventListener('hashchange', this.hashChangeListener);
-        this.onLocationSearchChanged[Symbol.dispose]();
-        this.onDeserializedLocationSearchChanged[Symbol.dispose]();
-        this.locationDeserializerObserver[Symbol.dispose]();
-        this.onLocationPathChanged[Symbol.dispose]();
-        this.onLocationHashChanged[Symbol.dispose]();
-        window.history.pushState = this.originalPushState;
-        window.history.replaceState = this.originalReplaceState;
-    }
-    /**
-     * Observable value that will be updated when the location pathname (e.g. /page/1) changes
-     */
-    onLocationPathChanged = new ObservableValue(new URL(location.href).pathname);
-    /**
-     * Observable value that will be updated when the location hash (e.g. #hash) changes
-     */
-    onLocationHashChanged = new ObservableValue(location.hash.replace('#', ''));
-    /**
-     * Observable value that will be updated when the location search (e.g. ?search=1) changes
-     */
-    onLocationSearchChanged = new ObservableValue(location.search);
-    onDeserializedLocationSearchChanged;
-    locationDeserializerObserver = this.onLocationSearchChanged.subscribe((search) => {
-        this.onDeserializedLocationSearchChanged.setValue(this.deserializeQueryString(search));
-    });
-    /**
-     * Synchronizes the observable state with the current browser location.
-     * Called internally after navigation events and history state changes.
-     */
-    updateState = (() => {
-        this.onLocationPathChanged.setValue(location.pathname);
-        this.onLocationHashChanged.setValue(location.hash.replace('#', ''));
-        this.onLocationSearchChanged.setValue(location.search);
-    }).bind(this);
-    /**
-     * Navigate to a path. Use this instead of raw history.pushState for SPA routing.
-     * The LocationService interceptor ensures routing state is updated correctly.
-     */
-    navigate(path) {
-        // eslint-disable-next-line furystack/prefer-location-service -- This IS the LocationService.navigate() implementation.
-        history.pushState(null, '', path);
-        this.updateState();
-    }
-    /**
-     * Replace the current history entry with a new path. Use this instead of
-     * raw history.replaceState for SPA redirects (e.g. the intermediate URL
-     * should not appear in the browser's back/forward stack).
-     */
-    replace(path) {
-        // eslint-disable-next-line furystack/prefer-location-service -- This IS the LocationService.replace() implementation.
-        history.replaceState(null, '', path);
-        this.updateState();
-    }
-    /**
-     * Internal cache of per-key search parameter observables created by {@link useSearchParam}.
-     */
-    searchParamObservables = new Map();
-    /**
-     * Gets or creates an observable for a search parameter
-     * @param key The search param key (e.g. ?search=1 -> search)
-     * @param defaultValue The default value if not provided
-     * @returns An observable with the current value (or default value) of the search param
-     */
-    useSearchParam(key, defaultValue) {
-        const existing = this.searchParamObservables.get(key);
-        if (!existing) {
-            const currentDeserialized = this.onDeserializedLocationSearchChanged.getValue();
+export const LocationServiceSettings = defineService({
+    name: '@furystack/shades/LocationServiceSettings',
+    lifetime: 'singleton',
+    factory: () => ({
+        serialize: defaultSerializeToQueryString,
+        deserialize: defaultDeserializeQueryString,
+    }),
+});
+export const LocationService = defineService({
+    name: '@furystack/shades/LocationService',
+    lifetime: 'singleton',
+    factory: ({ inject, onDispose }) => {
+        const { serialize, deserialize } = inject(LocationServiceSettings);
+        const onLocationPathChanged = new ObservableValue(new URL(location.href).pathname);
+        const onLocationHashChanged = new ObservableValue(location.hash.replace('#', ''));
+        const onLocationSearchChanged = new ObservableValue(location.search);
+        const onDeserializedLocationSearchChanged = new ObservableValue(deserialize(location.search));
+        const searchParamObservables = new Map();
+        const updateState = () => {
+            onLocationPathChanged.setValue(location.pathname);
+            onLocationHashChanged.setValue(location.hash.replace('#', ''));
+            onLocationSearchChanged.setValue(location.search);
+        };
+        const locationDeserializerObserver = onLocationSearchChanged.subscribe((search) => {
+            onDeserializedLocationSearchChanged.setValue(deserialize(search));
+        });
+        const popStateListener = (_ev) => {
+            updateState();
+        };
+        const hashChangeListener = (_ev) => {
+            updateState();
+        };
+        window.addEventListener('popstate', popStateListener);
+        window.addEventListener('hashchange', hashChangeListener);
+        const originalPushState = window.history.pushState.bind(window.history);
+        window.history.pushState = (...args) => {
+            originalPushState(...args);
+            updateState();
+        };
+        const originalReplaceState = window.history.replaceState.bind(window.history);
+        window.history.replaceState = (...args) => {
+            originalReplaceState(...args);
+            updateState();
+        };
+        const navigate = (path) => {
+            // eslint-disable-next-line furystack/prefer-location-service -- This IS the LocationService.navigate() implementation.
+            history.pushState(null, '', path);
+            updateState();
+        };
+        const replace = (path) => {
+            // eslint-disable-next-line furystack/prefer-location-service -- This IS the LocationService.replace() implementation.
+            history.replaceState(null, '', path);
+            updateState();
+        };
+        const useSearchParam = (key, defaultValue) => {
+            const existing = searchParamObservables.get(key);
+            if (existing)
+                return existing;
+            const currentDeserialized = onDeserializedLocationSearchChanged.getValue();
             const actualValue = Object.prototype.hasOwnProperty.call(currentDeserialized, key)
                 ? currentDeserialized[key]
                 : defaultValue;
             const newObservable = new ObservableValue(actualValue);
-            this.searchParamObservables.set(key, newObservable);
+            searchParamObservables.set(key, newObservable);
             newObservable.subscribe((value) => {
-                const currentQueryStringObject = this.onDeserializedLocationSearchChanged.getValue();
+                const currentQueryStringObject = onDeserializedLocationSearchChanged.getValue();
                 if (currentQueryStringObject[key] !== value) {
-                    const params = this.serializeToQueryString({ ...currentQueryStringObject, [key]: value });
+                    const params = serialize({ ...currentQueryStringObject, [key]: value });
                     const newUrl = `${location.pathname}?${params}`;
                     // eslint-disable-next-line furystack/prefer-location-service -- Internal LocationService plumbing for search param sync.
                     history.pushState({}, '', newUrl);
                 }
             });
-            this.onDeserializedLocationSearchChanged.subscribe((search) => {
+            onDeserializedLocationSearchChanged.subscribe((search) => {
                 const value = search[key] ?? defaultValue;
-                this.searchParamObservables.get(key)?.setValue(value);
+                searchParamObservables.get(key)?.setValue(value);
             });
             return newObservable;
-        }
-        return existing;
-    }
-    popStateListener = (_ev) => {
-        this.updateState();
-    };
-    hashChangeListener = ((_ev) => {
-        this.updateState();
-    }).bind(this);
-};
-LocationService = __decorate([
-    Injectable({ lifetime: 'singleton' }),
-    __metadata("design:paramtypes", [Object, Object])
-], LocationService);
-export { LocationService };
+        };
+        onDispose(() => {
+            window.removeEventListener('popstate', popStateListener);
+            window.removeEventListener('hashchange', hashChangeListener);
+            window.history.pushState = originalPushState;
+            window.history.replaceState = originalReplaceState;
+            locationDeserializerObserver[Symbol.dispose]();
+            // eslint-disable-next-line furystack/prefer-using-wrapper -- Disposal is deferred to the injector's onDispose hook.
+            onLocationSearchChanged[Symbol.dispose]();
+            // eslint-disable-next-line furystack/prefer-using-wrapper -- Disposal is deferred to the injector's onDispose hook.
+            onDeserializedLocationSearchChanged[Symbol.dispose]();
+            // eslint-disable-next-line furystack/prefer-using-wrapper -- Disposal is deferred to the injector's onDispose hook.
+            onLocationPathChanged[Symbol.dispose]();
+            // eslint-disable-next-line furystack/prefer-using-wrapper -- Disposal is deferred to the injector's onDispose hook.
+            onLocationHashChanged[Symbol.dispose]();
+        });
+        return {
+            deserializeQueryString: deserialize,
+            onLocationPathChanged,
+            onLocationHashChanged,
+            onLocationSearchChanged,
+            onDeserializedLocationSearchChanged,
+            searchParamObservables,
+            updateState,
+            navigate,
+            replace,
+            useSearchParam,
+        };
+    },
+});
 /**
- * Configures custom serialization for URL search state.
- * Must be called **before** `LocationService` is first instantiated by the injector.
- * @param injector The root injector
- * @param serialize Function to serialize state to a query string
- * @param deserialize Function to deserialize a query string to state
+ * Configures custom (de)serialization for URL search state by binding
+ * {@link LocationServiceSettings} on the given injector.
+ *
+ * Must be called **before** any consumer resolves {@link LocationService}:
+ * the service patches `history.pushState` / `history.replaceState` and
+ * subscribes to `popstate` / `hashchange` on construction, and those
+ * listeners are only torn down when the owning injector is disposed.
+ * Rebinding after the first resolution would leak the previous instance,
+ * so this helper throws loudly if that happens.
+ *
+ * @param injector The root injector.
+ * @param serialize Function to serialize state to a query string.
+ * @param deserialize Function to deserialize a query string to state.
+ * @throws If {@link LocationService} has already been resolved on
+ *         `injector` (or any reachable ancestor).
  */
 export const useCustomSearchStateSerializer = (injector, serialize, deserialize) => {
-    if (injector.cachedSingletons.has(LocationService)) {
-        throw new Error('useCustomSearchStateSerializer must be called before the LocationService is instantiated');
+    if (injector.isResolved(LocationService)) {
+        throw new Error('useCustomSearchStateSerializer must be called before LocationService is resolved for the first time. ' +
+            'Configure serializers during injector bootstrap (e.g. before the first render).');
     }
-    const locationService = new LocationService(serialize, deserialize);
-    injector.setExplicitInstance(locationService, LocationService);
+    injector.bind(LocationServiceSettings, () => ({ serialize, deserialize }));
+    injector.invalidate(LocationServiceSettings);
 };
 //# sourceMappingURL=location-service.js.map

package/esm/services/location-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"location-service.js","sourceRoot":"","sources":["../../src/services/location-service.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"location-service.js","sourceRoot":"","sources":["../../src/services/location-service.tsx"],"names":[],"mappings":"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"}

package/esm/services/location-service.spec.js

@@ -1,4 +1,4 @@
-import { Injector } from '@furystack/inject';
+import { createInjector } from '@furystack/inject';
 import { deserializeQueryString, serializeToQueryString, serializeValue } from '@furystack/rest';
 import { usingAsync } from '@furystack/utils';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -11,15 +11,16 @@ describe('LocationService', () => {
         document.body.innerHTML = '';
     });
     it('Shuld be constructed', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const s = i.getInstance(LocationService);
-            expect(s).toBeInstanceOf(LocationService);
+        await usingAsync(createInjector(), async (i) => {
+            const s = i.get(LocationService);
+            expect(s).toBeDefined();
+            expect(typeof s.navigate).toBe('function');
         });
     });
     it('Shuld update state on events', async () => {
-        await usingAsync(new Injector(), async (i) => {
+        await usingAsync(createInjector(), async (i) => {
             const onLocaionChanged = vi.fn();
-            const s = i.getInstance(LocationService);
+            const s = i.get(LocationService);
             s.onLocationPathChanged.subscribe(onLocaionChanged);
             expect(onLocaionChanged).toBeCalledTimes(0);
             history.pushState(null, '', '/loc1');
@@ -34,9 +35,9 @@ describe('LocationService', () => {
         });
     });
     it('Should update location path when navigate is called', async () => {
-        await usingAsync(new Injector(), async (i) => {
+        await usingAsync(createInjector(), async (i) => {
             const onLocationChanged = vi.fn();
-            const s = i.getInstance(LocationService);
+            const s = i.get(LocationService);
             s.onLocationPathChanged.subscribe(onLocationChanged);
             s.navigate('/dashboard');
             expect(s.onLocationPathChanged.getValue()).toBe('/dashboard');
@@ -45,8 +46,8 @@ describe('LocationService', () => {
     });
     describe('replace', () => {
         it('Should update the observable path without pushing a new history entry', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const s = i.getInstance(LocationService);
+            await usingAsync(createInjector(), async (i) => {
+                const s = i.get(LocationService);
                 const lengthBefore = history.length;
                 s.replace('/replaced');
                 expect(s.onLocationPathChanged.getValue()).toBe('/replaced');
@@ -54,8 +55,8 @@ describe('LocationService', () => {
             });
         });
         it('Should call history.replaceState rather than pushState', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const s = i.getInstance(LocationService);
+            await usingAsync(createInjector(), async (i) => {
+                const s = i.get(LocationService);
                 const pushSpy = vi.spyOn(history, 'pushState');
                 const replaceSpy = vi.spyOn(history, 'replaceState');
                 s.replace('/replaced-2');
@@ -67,8 +68,8 @@ describe('LocationService', () => {
             });
         });
         it('Should notify path subscribers after replace', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const s = i.getInstance(LocationService);
+            await usingAsync(createInjector(), async (i) => {
+                const s = i.get(LocationService);
                 const onLocationChanged = vi.fn();
                 s.onLocationPathChanged.subscribe(onLocationChanged);
                 s.replace('/notify');
@@ -78,8 +79,8 @@ describe('LocationService', () => {
     });
     describe('useSearchParam', () => {
         it('Should create observables lazily', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const service = i.getInstance(LocationService);
+            await usingAsync(createInjector(), async (i) => {
+                const service = i.get(LocationService);
                 const observables = service.searchParamObservables;
                 const testSearchParam = service.useSearchParam('test', null);
                 expect(observables.size).toBe(1);
@@ -92,23 +93,23 @@ describe('LocationService', () => {
             });
         });
         it('Should return the default value, if not present in the query string', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const service = i.getInstance(LocationService);
+            await usingAsync(createInjector(), async (i) => {
+                const service = i.get(LocationService);
                 const testSearchParam = service.useSearchParam('test', { value: 'foo' });
                 expect(testSearchParam.getValue()).toEqual({ value: 'foo' });
             });
         });
         it('Should return the value from the query string', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const service = i.getInstance(LocationService);
+            await usingAsync(createInjector(), async (i) => {
+                const service = i.get(LocationService);
                 history.pushState(null, '', `/loc1?test=${serializeValue(1)}`);
                 const testSearchParam = service.useSearchParam('test', 123);
                 expect(testSearchParam.getValue()).toBe(1);
             });
         });
         it('should update the observable value on push / replace states', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const service = i.getInstance(LocationService);
+            await usingAsync(createInjector(), async (i) => {
+                const service = i.get(LocationService);
                 history.pushState(null, '', `/loc1?test=${serializeValue(1)}`);
                 const testSearchParam = service.useSearchParam('test', 234);
                 expect(testSearchParam.getValue()).toBe(1);
@@ -117,28 +118,29 @@ describe('LocationService', () => {
             });
         });
         it('Should update the URL based on search value change', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const service = i.getInstance(LocationService);
+            await usingAsync(createInjector(), async (i) => {
+                const service = i.get(LocationService);
                 history.pushState(null, '', `/loc1?test=${serializeValue('2')}`);
                 const testSearchParam = service.useSearchParam('test', '');
                 testSearchParam.setValue('2');
                 expect(location.search).toBe('?test=IjIi');
             });
         });
-        it('Should throw an error when trying to use a custom serializer after LocationService has been instantiated', async () => {
-            await usingAsync(new Injector(), async (i) => {
+        it('Should throw when called after LocationService has been resolved', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const customSerializer = vi.fn((value) => serializeToQueryString(value));
                 const customDeserializer = vi.fn((value) => deserializeQueryString(value));
-                i.getInstance(LocationService);
-                expect(() => useCustomSearchStateSerializer(i, customSerializer, customDeserializer)).toThrowError('useCustomSearchStateSerializer must be called before the LocationService is instantiated');
+                // Eagerly resolve once so the service patches history / adds listeners.
+                i.get(LocationService);
+                expect(() => useCustomSearchStateSerializer(i, customSerializer, customDeserializer)).toThrow(/before LocationService is resolved/);
             });
         });
         it('Should use custom serializer and deserializer', async () => {
-            await usingAsync(new Injector(), async (i) => {
+            await usingAsync(createInjector(), async (i) => {
                 const customSerializer = vi.fn((value) => serializeToQueryString(value));
                 const customDeserializer = vi.fn((value) => deserializeQueryString(value));
                 useCustomSearchStateSerializer(i, customSerializer, customDeserializer);
-                const locationService = i.getInstance(LocationService);
+                const locationService = i.get(LocationService);
                 const testSearchParam = locationService.useSearchParam('test', { value: 'foo' });
                 testSearchParam.setValue({ value: 'bar' });
                 expect(customSerializer).toBeCalledWith({ test: { value: 'bar' } });

package/esm/services/location-service.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"location-service.spec.js","sourceRoot":"","sources":["../../src/services/location-service.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"location-service.spec.js","sourceRoot":"","sources":["../../src/services/location-service.spec.ts"],"names":[],"mappings":"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"}

package/esm/services/route-match-service.d.ts

@@ -1,3 +1,4 @@
+import type { Token } from '@furystack/inject';
 import { ObservableValue } from '@furystack/utils';
 import type { MatchChainEntry } from '../components/nested-router.js';
 /**
@@ -5,8 +6,8 @@ import type { MatchChainEntry } from '../components/nested-router.js';
  * NestedRouter as an observable. Consumers (breadcrumbs, document title,
  * navigation trees) subscribe to this instead of re-running route matching.
  */
-export declare class RouteMatchService implements Disposable {
+export interface RouteMatchService {
     readonly currentMatchChain: ObservableValue<MatchChainEntry[]>;
-    [Symbol.dispose](): void;
 }
+export declare const RouteMatchService: Token<RouteMatchService, 'singleton'>;
 //# sourceMappingURL=route-match-service.d.ts.map

package/esm/services/route-match-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-match-service.d.ts","sourceRoot":"","sources":["../../src/services/route-match-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAErE;;;;GAIG;AACH,qBACa,iBAAkB,YAAW,UAAU;IAClD,SAAgB,iBAAiB,qCAA6C;IAEvE,CAAC,MAAM,CAAC,OAAO,CAAC;CAGxB"}
+{"version":3,"file":"route-match-service.d.ts","sourceRoot":"","sources":["../../src/services/route-match-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAErE;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,iBAAiB,EAAE,eAAe,CAAC,eAAe,EAAE,CAAC,CAAA;CAC/D;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,EAAE,WAAW,CAWlE,CAAA"}

package/esm/services/route-match-service.js

@@ -1,24 +1,15 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { Injectable } from '@furystack/inject';
+import { defineService } from '@furystack/inject';
 import { ObservableValue } from '@furystack/utils';
-/**
- * Singleton service that exposes the current match chain from the nearest
- * NestedRouter as an observable. Consumers (breadcrumbs, document title,
- * navigation trees) subscribe to this instead of re-running route matching.
- */
-let RouteMatchService = class RouteMatchService {
-    currentMatchChain = new ObservableValue([]);
-    [Symbol.dispose]() {
-        this.currentMatchChain[Symbol.dispose]();
-    }
-};
-RouteMatchService = __decorate([
-    Injectable({ lifetime: 'singleton' })
-], RouteMatchService);
-export { RouteMatchService };
+export const RouteMatchService = defineService({
+    name: '@furystack/shades/RouteMatchService',
+    lifetime: 'singleton',
+    factory: ({ onDispose }) => {
+        const currentMatchChain = new ObservableValue([]);
+        onDispose(() => {
+            // eslint-disable-next-line furystack/prefer-using-wrapper -- Disposal is deferred to the injector's onDispose hook.
+            currentMatchChain[Symbol.dispose]();
+        });
+        return { currentMatchChain };
+    },
+});
 //# sourceMappingURL=route-match-service.js.map

package/esm/services/route-match-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-match-service.js","sourceRoot":"","sources":["../../src/services/route-match-service.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAGlD;;;;GAIG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACZ,iBAAiB,GAAG,IAAI,eAAe,CAAoB,EAAE,CAAC,CAAA;IAEvE,CAAC,MAAM,CAAC,OAAO,CAAC;QACrB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAA;IAC1C,CAAC;CACF,CAAA;AANY,iBAAiB;IAD7B,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,iBAAiB,CAM7B"}
+{"version":3,"file":"route-match-service.js","sourceRoot":"","sources":["../../src/services/route-match-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAYlD,MAAM,CAAC,MAAM,iBAAiB,GAA0C,aAAa,CAAC;IACpF,IAAI,EAAE,qCAAqC;IAC3C,QAAQ,EAAE,WAAW;IACrB,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;QACzB,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAoB,EAAE,CAAC,CAAA;QACpE,SAAS,CAAC,GAAG,EAAE;YACb,oHAAoH;YACpH,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAA;QACrC,CAAC,CAAC,CAAA;QACF,OAAO,EAAE,iBAAiB,EAAE,CAAA;IAC9B,CAAC;CACF,CAAC,CAAA"}