@ethlete/core 4.29.5 → 4.29.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ethlete/core
 
+## 4.29.7
+
+### Patch Changes
+
+- [`b79cf6a`](https://github.com/ethlete-io/ethdk/commit/b79cf6a845496d4e5c1df63c851c96dceba50881) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix router event signal skipping the initial navigation
+
+## 4.29.6
+
+### Patch Changes
+
+- [`452c6f9`](https://github.com/ethlete-io/ethdk/commit/452c6f9d3ff446fee37b719c233daf1216930e98) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix initial values inside router state being null by default
+
 ## 4.29.5
 
 ### Patch Changes

package/fesm2022/ethlete-core.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { inject, HostBinding, Input, ViewEncapsulation, ChangeDetectionStrategy, Component, InjectionToken, assertInInjectionContext, DestroyRef, ElementRef, TemplateRef, Injectable, isSignal, signal, QueryList, computed, Injector, effect, untracked, runInInjectionContext, afterNextRender, Renderer2, RendererStyleFlags2, NgZone, isDevMode, PLATFORM_ID, Directive, model, ViewContainerRef, booleanAttribute, EventEmitter, Output, numberAttribute, Pipe, input } from '@angular/core';
+import { inject, HostBinding, Input, ViewEncapsulation, ChangeDetectionStrategy, Component, InjectionToken, assertInInjectionContext, DestroyRef, ElementRef, TemplateRef, Injectable, signal, isSignal, QueryList, computed, Injector, effect, untracked, runInInjectionContext, afterNextRender, Renderer2, RendererStyleFlags2, NgZone, isDevMode, PLATFORM_ID, linkedSignal, Directive, model, ViewContainerRef, booleanAttribute, EventEmitter, Output, numberAttribute, Pipe, input } from '@angular/core';
 import { DomSanitizer, Meta, Title } from '@angular/platform-browser';
 import { Subject, BehaviorSubject, takeUntil, switchMap, of, tap, map, startWith, Observable, combineLatest, timer, fromEvent, distinctUntilChanged, pairwise, shareReplay, filter, debounceTime, finalize, merge, take, skip, takeWhile } from 'rxjs';
 import { END, HOME, PAGE_DOWN, PAGE_UP, UP_ARROW, DOWN_ARROW } from '@angular/cdk/keycodes';
@@ -1115,8 +1115,9 @@ class RouterStateService {
         this._state$ = new BehaviorSubject(this._getInitialState());
         this._afterInitialize$ = new BehaviorSubject(false);
         this.afterInitialize$ = this._afterInitialize$.pipe(filter((v) => v));
+        this.latestEvent = signal(null, ...(ngDevMode ? [{ debugName: "latestEvent" }] : []));
         this._router.events
-            .pipe(filter((event) => event instanceof NavigationEnd), distinctUntilChanged((a, b) => a.url === b.url), map((event) => {
+            .pipe(tap((event) => this.latestEvent.set(event)), filter((event) => event instanceof NavigationEnd), distinctUntilChanged((a, b) => a.url === b.url), map((event) => {
             const { url } = event;
             const urlWithoutQueryParams = url.split('?')[0] ?? '';
             const withoutFragment = urlWithoutQueryParams.split('#')[0] ?? '';
@@ -2239,13 +2240,16 @@ const transformOrReturn = (src, config) => {
 };
 /** Inject the current router event */
 const injectRouterEvent = () => {
-    const router = inject(Router);
+    const routerStateService = inject(RouterStateService);
     const isBrowser = isPlatformBrowser(inject(PLATFORM_ID));
     if (!isBrowser) {
-        return toSignal(router.events, { initialValue: null });
+        return routerStateService.latestEvent.asReadonly();
     }
     const route = window.location.pathname + window.location.search + window.location.hash;
-    return toSignal(router.events, { initialValue: new NavigationEnd(-1, route, route) });
+    return linkedSignal({
+        source: () => new NavigationEnd(-1, route, route),
+        computation: () => routerStateService.latestEvent(),
+    }).asReadonly();
 };
 /**
  * Inject the current url.
@@ -2296,16 +2300,47 @@ const createRouterState = (router) => {
         fragment,
     };
 };
+const createInitialRouterState = () => {
+    if (!isPlatformBrowser(inject(PLATFORM_ID)))
+        return {
+            data: {},
+            pathParams: {},
+            queryParams: {},
+            title: null,
+            fragment: null,
+        };
+    const url = new URL(window.location.href);
+    const queryParams = {};
+    url.searchParams.forEach((value, key) => {
+        queryParams[key] = value;
+    });
+    const fragment = url.hash ? url.hash.substring(1) : null;
+    const title = document.title || null;
+    return {
+        data: {},
+        pathParams: {}, // Cannot determine path params without route configuration
+        queryParams,
+        title,
+        fragment,
+    };
+};
 /**
  * Inject the complete router state. This includes the current route data, path params, query params, title and fragment.
  */
 const injectRouterState = () => {
     const event = injectRouterEvent();
     const router = inject(Router);
-    const routerState = signal(createRouterState(router), ...(ngDevMode ? [{ debugName: "routerState" }] : []));
+    const routerState = signal(createInitialRouterState(), ...(ngDevMode ? [{ debugName: "routerState" }] : []));
     effect(() => {
-        event();
-        untracked(() => routerState.set(createRouterState(router)));
+        const e = event();
+        untracked(() => {
+            if (e instanceof NavigationEnd && e.id === -1) {
+                return;
+            }
+            else {
+                routerState.set(createRouterState(router));
+            }
+        });
     });
     return computed(() => routerState(), { equal });
 };