@reforgium/presentia 1.4.1 → 1.4.3

package/fesm2022/reforgium-presentia.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, signal, computed, inject, DestroyRef, PLATFORM_ID, afterRenderEffect, Injectable, TemplateRef, ViewContainerRef, effect, Input, Directive, input, ElementRef, Renderer2, Injector, afterNextRender, runInInjectionContext, Pipe, makeEnvironmentProviders, LOCALE_ID } from '@angular/core';
-import { TRANSLATION, SELECTED_LANG, CHANGE_LANG, SELECTED_THEME, CHANGE_THEME, CURRENT_DEVICE, deepEqual } from '@reforgium/internal';
+import { getChainedValue, TRANSLATION, SELECTED_LANG, CHANGE_LANG, SELECTED_THEME, CHANGE_THEME, CURRENT_DEVICE, deepEqual } from '@reforgium/internal';
 import { BreakpointObserver } from '@angular/cdk/layout';
 import { isPlatformBrowser, DOCUMENT } from '@angular/common';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -470,7 +470,7 @@ class LangService {
         return text.replace(/\{\{(.*?)}}/g, (_, k) => String(params[k.trim()] ?? ''));
     }
     getChainedValue(query = '', source = this.#cache()) {
-        if (!query || typeof source !== 'object') {
+        if (!query || !source || typeof source !== 'object') {
             return undefined;
         }
         // Prefer the exact (flat) key match first, then attempt deep lookup.
@@ -478,14 +478,20 @@ class LangService {
             return source[query];
         }
         const parts = query.split('.');
-        let acc = source;
-        for (const key of parts) {
-            if (typeof acc !== 'object') {
-                return undefined;
+        const record = source;
+        for (let i = parts.length - 1; i > 0; i--) {
+            const flatPrefix = parts.slice(0, i).join('.');
+            if (!(flatPrefix in record)) {
+                continue;
             }
-            acc = acc[key];
+            const nestedPath = parts.slice(i).join('.');
+            const prefixed = record[flatPrefix];
+            if (!nestedPath) {
+                return prefixed;
+            }
+            return getChainedValue(prefixed, nestedPath);
         }
-        return acc;
+        return getChainedValue(source, query);
     }
     getStoredLang() {
         const normalize = (value) => this.normalizeLang(value);
@@ -1408,7 +1414,7 @@ class RouteWatcher {
     constructor() {
         const read = () => {
             const snap = this.deepestSnapshot();
-            const url = joinUrl(snap.url);
+            const url = snapshotFullPath(snap);
             !deepEqual(snap.params, this.#params()) && this.#params.set(snap.params);
             !deepEqual(snap.queryParams, this.#query()) && this.#query.set(snap.queryParams);
             !deepEqual(snap.data, this.#data()) && this.#data.set(snap.data);
@@ -1443,6 +1449,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.1", ngImpor
 function joinUrl(segments) {
     return segments.length ? segments.map((s) => s.path).join('/') : '';
 }
+/** Builds a full route path from root to current snapshot */
+function snapshotFullPath(snap) {
+    return snap.pathFromRoot
+        .map((s) => joinUrl(s.url))
+        .filter(Boolean)
+        .join('/');
+}
 
 /**
  * Generated bundle index. Do not edit.

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.1",
+  "version": "1.4.3",
   "name": "@reforgium/presentia",
   "description": "reforgium State modules",
   "author": "rtommievich",

package/types/reforgium-presentia.d.ts

@@ -322,7 +322,7 @@ declare class LangService {
      * - If `config.kgValue` is not defined, the property will return the default value 'kg'.
      * - For other languages (e.g. `ru`, `en`) returns source language as-is.
      */
-    readonly currentLang: Signal<"ru" | "kg" | "ky">;
+    readonly currentLang: Signal<"ru" | "kg" | "en" | (string & {}) | "ky">;
     /**
      * Extracts readonly value from private property `#lang` and assigns it to `innerLangVal`.
      * Expected that property `#lang` has `asReadonly` method that returns immutable representation.