@reforgium/presentia 2.1.1 → 2.1.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [2.1.2]: 14.04.2026
+### Fix:
+- fixed `presentia-gen-namespaces` skipping spread (`...someRoutes`) and bare-reference (`someRoutes`) items in route arrays — generator now resolves them via imports and recurses into their exports
+- fixed `presentia-gen-namespaces` not handling single-object route exports (`export const route: AppRoute = { ... }`) — added object-literal fallback in `parseRoutesFromExport` alongside the existing array-literal path
+- fixed `LangPipe` NG0100 in Angular dev mode: cache-hit path was returning `existing.value()` directly, bypassing the namespace-loaded guard that cache-miss applied — both paths now go through a shared `applyNamespaceGuard` method
+
+---
+
 ## [2.1.1]: 07.04.2026
 ### Fix:
 - fixed `presentia-gen-namespaces` tsconfig loading to parse commented `tsconfig` files instead of failing on raw `JSON.parse(...)`

package/bin/presentia-gen-namespaces.mjs

@@ -863,6 +863,40 @@ function parseRoutes(arrayLiteral, context) {
     }
   }
 
+  // Handle spread (...someRoutes) and bare references (someRoutes) that are not object literals
+  for (const item of splitTopLevelItems(arrayLiteral)) {
+    const trimmed = item.trim();
+
+    if (trimmed.startsWith('{')) continue;
+
+    const spreadMatch = /^\.\.\.\s*(\w+)$/.exec(trimmed);
+    const refName = spreadMatch ? spreadMatch[1] : /^\w+$/.test(trimmed) ? trimmed : null;
+
+    if (!refName) continue;
+
+    const imported = context.imports.get(refName);
+
+    if (!imported) continue;
+
+    const resolved = context.resolver(imported.specifier, context.routesFile);
+
+    if (!resolved) {
+      generatorReport?.addIssue({
+        type: 'unresolved-spread-routes',
+        filePath: context.routesFile,
+        message: `Could not resolve spread routes import "${imported.specifier}" (${refName})`,
+      });
+      continue;
+    }
+
+    routes.push(
+      ...parseRoutesFromExport(resolved, imported.imported, {
+        ...context,
+        routesFile: resolved,
+      }),
+    );
+  }
+
   return routes;
 }
 
@@ -876,20 +910,36 @@ function parseRoutesFromExport(filePath, exportName, context) {
   visitedRouteExports.add(visitKey);
 
   const source = stripComments(readText(filePath));
+  const newContext = {
+    ...context,
+    constObjects: parseConstObjects(filePath, context.resolver),
+    imports: parseImports(source),
+    routesFile: filePath,
+  };
+
   const arrayLiteral =
     extractArrayLiteral(source, new RegExp(`\\bexport\\s+const\\s+${exportName}\\s*:\\s*[^=]+=\\s*\\[`, 'g')) ??
     extractArrayLiteral(source, new RegExp(`\\bexport\\s+const\\s+${exportName}\\s*=\\s*\\[`, 'g'));
 
-  if (!arrayLiteral) {
-    return [];
+  if (arrayLiteral) {
+    return parseRoutes(arrayLiteral, newContext);
   }
 
-  return parseRoutes(arrayLiteral, {
-    ...context,
-    constObjects: parseConstObjects(filePath, context.resolver),
-    imports: parseImports(source),
-    routesFile: filePath,
-  });
+  // Fallback: try as a single route object export (e.g. export const analyticsRoutes: AppRoute = { ... })
+  const objectMatch =
+    new RegExp(`\\bexport\\s+const\\s+${exportName}\\s*:\\s*[^=]+=\\s*\\{`, 'g').exec(source) ??
+    new RegExp(`\\bexport\\s+const\\s+${exportName}\\s*=\\s*\\{`, 'g').exec(source);
+
+  if (objectMatch) {
+    const start = source.indexOf('{', objectMatch.index);
+    const end = findMatching(source, start, '{', '}');
+
+    if (start >= 0 && end >= 0) {
+      return parseRoutes(`[${source.slice(start, end + 1)}]`, newContext);
+    }
+  }
+
+  return [];
 }
 
 function collectComponentNamespaces(filePath, exportName, context) {

package/fesm2022/reforgium-presentia.mjs

@@ -73,10 +73,10 @@ const DEVICE_BREAKPOINTS = new InjectionToken('RE_DEVICE_BREAKPOINTS', {
  */
 class AdaptiveService {
     /** @internal Signal of the current device type. */
-    #device = signal('desktop', ...(ngDevMode ? [{ debugName: "#device" }] : []));
+    #device = signal('desktop', ...(ngDevMode ? [{ debugName: "#device" }] : /* istanbul ignore next */ []));
     /** @internal Signals of the current window width and height. */
-    #width = signal(0, ...(ngDevMode ? [{ debugName: "#width" }] : []));
-    #height = signal(0, ...(ngDevMode ? [{ debugName: "#height" }] : []));
+    #width = signal(0, ...(ngDevMode ? [{ debugName: "#width" }] : /* istanbul ignore next */ []));
+    #height = signal(0, ...(ngDevMode ? [{ debugName: "#height" }] : /* istanbul ignore next */ []));
     /**
      * Current device type (reactive signal).
      * Possible values: `'desktop' | 'tablet' | 'mobile'`.
@@ -99,15 +99,15 @@ class AdaptiveService {
      * Computed signal indicating whether the current device is a desktop.
      * Used for conditional rendering or layout configuration.
      */
-    isDesktop = computed(() => this.#device() === 'desktop', ...(ngDevMode ? [{ debugName: "isDesktop" }] : []));
-    isMobile = computed(() => this.#device() === 'mobile', ...(ngDevMode ? [{ debugName: "isMobile" }] : []));
-    isTablet = computed(() => this.#device() === 'tablet', ...(ngDevMode ? [{ debugName: "isTablet" }] : []));
-    isDesktopSmall = computed(() => this.#device() === 'desktop-s', ...(ngDevMode ? [{ debugName: "isDesktopSmall" }] : []));
+    isDesktop = computed(() => this.#device() === 'desktop', ...(ngDevMode ? [{ debugName: "isDesktop" }] : /* istanbul ignore next */ []));
+    isMobile = computed(() => this.#device() === 'mobile', ...(ngDevMode ? [{ debugName: "isMobile" }] : /* istanbul ignore next */ []));
+    isTablet = computed(() => this.#device() === 'tablet', ...(ngDevMode ? [{ debugName: "isTablet" }] : /* istanbul ignore next */ []));
+    isDesktopSmall = computed(() => this.#device() === 'desktop-s', ...(ngDevMode ? [{ debugName: "isDesktopSmall" }] : /* istanbul ignore next */ []));
     /**
      * Computed signal determining whether the screen is in portrait orientation.
      * Returns `true` if window height is greater than width.
      */
-    isPortrait = computed(() => this.#height() > this.#width(), ...(ngDevMode ? [{ debugName: "isPortrait" }] : []));
+    isPortrait = computed(() => this.#height() > this.#width(), ...(ngDevMode ? [{ debugName: "isPortrait" }] : /* istanbul ignore next */ []));
     deviceBreakpoints = inject(DEVICE_BREAKPOINTS);
     devicePriority = Object.keys(this.deviceBreakpoints);
     destroyRef = inject(DestroyRef);
@@ -200,10 +200,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.4", ngImpor
  * the template is automatically added or removed from the DOM.
  */
 class IfDeviceDirective {
-    deviceInput = signal(undefined, ...(ngDevMode ? [{ debugName: "deviceInput" }] : []));
-    atLeastInput = signal(undefined, ...(ngDevMode ? [{ debugName: "atLeastInput" }] : []));
-    betweenInput = signal(undefined, ...(ngDevMode ? [{ debugName: "betweenInput" }] : []));
-    inverseInput = signal(false, ...(ngDevMode ? [{ debugName: "inverseInput" }] : []));
+    deviceInput = signal(undefined, ...(ngDevMode ? [{ debugName: "deviceInput" }] : /* istanbul ignore next */ []));
+    atLeastInput = signal(undefined, ...(ngDevMode ? [{ debugName: "atLeastInput" }] : /* istanbul ignore next */ []));
+    betweenInput = signal(undefined, ...(ngDevMode ? [{ debugName: "betweenInput" }] : /* istanbul ignore next */ []));
+    inverseInput = signal(false, ...(ngDevMode ? [{ debugName: "inverseInput" }] : /* istanbul ignore next */ []));
     tpl = inject(TemplateRef);
     vcr = inject(ViewContainerRef);
     adaptive = inject(AdaptiveService);
@@ -435,14 +435,14 @@ function extractRouteParamKeys(path) {
 class RouteWatcher {
     router = inject(Router);
     destroyRef = inject(DestroyRef);
-    #params = signal({}, ...(ngDevMode ? [{ debugName: "#params" }] : []));
-    #deepestParams = signal({}, ...(ngDevMode ? [{ debugName: "#deepestParams" }] : []));
-    #query = signal({}, ...(ngDevMode ? [{ debugName: "#query" }] : []));
-    #data = signal({}, ...(ngDevMode ? [{ debugName: "#data" }] : []));
-    #mergedData = signal({}, ...(ngDevMode ? [{ debugName: "#mergedData" }] : []));
-    #url = signal('', ...(ngDevMode ? [{ debugName: "#url" }] : []));
-    #routePattern = signal('', ...(ngDevMode ? [{ debugName: "#routePattern" }] : []));
-    #fragment = signal(null, ...(ngDevMode ? [{ debugName: "#fragment" }] : []));
+    #params = signal({}, ...(ngDevMode ? [{ debugName: "#params" }] : /* istanbul ignore next */ []));
+    #deepestParams = signal({}, ...(ngDevMode ? [{ debugName: "#deepestParams" }] : /* istanbul ignore next */ []));
+    #query = signal({}, ...(ngDevMode ? [{ debugName: "#query" }] : /* istanbul ignore next */ []));
+    #data = signal({}, ...(ngDevMode ? [{ debugName: "#data" }] : /* istanbul ignore next */ []));
+    #mergedData = signal({}, ...(ngDevMode ? [{ debugName: "#mergedData" }] : /* istanbul ignore next */ []));
+    #url = signal('', ...(ngDevMode ? [{ debugName: "#url" }] : /* istanbul ignore next */ []));
+    #routePattern = signal('', ...(ngDevMode ? [{ debugName: "#routePattern" }] : /* istanbul ignore next */ []));
+    #fragment = signal(null, ...(ngDevMode ? [{ debugName: "#fragment" }] : /* istanbul ignore next */ []));
     /** Params merged from root to deepest route. */
     params = this.#params.asReadonly();
     /** Params declared on the deepest route only. */
@@ -469,7 +469,7 @@ class RouteWatcher {
         url: this.#url(),
         routePattern: this.#routePattern(),
         fragment: this.#fragment(),
-    }), ...(ngDevMode ? [{ debugName: "state" }] : []));
+    }), ...(ngDevMode ? [{ debugName: "state" }] : /* istanbul ignore next */ []));
     constructor() {
         const read = () => {
             const snapshot = this.deepestSnapshot();
@@ -725,8 +725,8 @@ class LangService {
         ...LangService.BUILTIN_LANGS,
         ...this.normalizeSupportedLangs(this.config.supportedLangs ?? []),
     ]);
-    #lang = signal(this.getStoredLang(), ...(ngDevMode ? [{ debugName: "#lang" }] : []));
-    #cache = signal({}, ...(ngDevMode ? [{ debugName: "#cache" }] : []));
+    #lang = signal(this.getStoredLang(), ...(ngDevMode ? [{ debugName: "#lang" }] : /* istanbul ignore next */ []));
+    #cache = signal({}, ...(ngDevMode ? [{ debugName: "#cache" }] : /* istanbul ignore next */ []));
     #loadedNamespaces = new Set();
     #pendingLoads = new Map();
     #pendingBatchLoads = new Map();
@@ -743,7 +743,7 @@ class LangService {
     currentLang = computed(() => {
         const lang = this.#lang();
         return lang === 'kg' ? (this.config?.kgValue ?? 'kg') : lang;
-    }, ...(ngDevMode ? [{ debugName: "currentLang" }] : []));
+    }, ...(ngDevMode ? [{ debugName: "currentLang" }] : /* istanbul ignore next */ []));
     /**
      * Extracts readonly value from private property `#lang` and assigns it to `innerLangVal`.
      * Expected that property `#lang` has `asReadonly` method that returns immutable representation.
@@ -1186,19 +1186,19 @@ class LangDirective {
      * Localization mode: defines which parts of the element will be translated.
      * @default 'all'
      */
-    lang = input('all', { ...(ngDevMode ? { debugName: "lang" } : {}), alias: 'reLang' });
+    lang = input('all', { ...(ngDevMode ? { debugName: "lang" } : /* istanbul ignore next */ {}), alias: 'reLang' });
     /**
      * Explicit key for text content translation.
      */
-    reLangKeySig = signal(undefined, ...(ngDevMode ? [{ debugName: "reLangKeySig" }] : []));
+    reLangKeySig = signal(undefined, ...(ngDevMode ? [{ debugName: "reLangKeySig" }] : /* istanbul ignore next */ []));
     /**
      * Explicit attribute-to-key map for translation.
      */
-    reLangAttrsSig = signal(undefined, ...(ngDevMode ? [{ debugName: "reLangAttrsSig" }] : []));
+    reLangAttrsSig = signal(undefined, ...(ngDevMode ? [{ debugName: "reLangAttrsSig" }] : /* istanbul ignore next */ []));
     /**
      * Name of an additional attribute to localize (besides standard `title`, `label`, `placeholder`).
      */
-    langForAttr = input(...(ngDevMode ? [undefined, { debugName: "langForAttr" }] : []));
+    langForAttr = input(...(ngDevMode ? [undefined, { debugName: "langForAttr" }] : /* istanbul ignore next */ []));
     el = inject(ElementRef);
     renderer = inject(Renderer2);
     service = inject(LangService);
@@ -1452,7 +1452,7 @@ class LangPipe {
         const existing = this.cache.get(key);
         if (existing) {
             if (now - existing.ts < this.ttlMs) {
-                return existing.value();
+                return this.applyNamespaceGuard(query, existing.value());
             }
             this.cache.delete(key);
         }
@@ -1460,7 +1460,9 @@ class LangPipe {
             this.cache.set(key, { value: this.lang.observe(query, params ?? undefined), ts: now });
             this.evictIfNeeded();
         }
-        const value = this.cache.get(key).value();
+        return this.applyNamespaceGuard(query, this.cache.get(key).value());
+    }
+    applyNamespaceGuard(query, value) {
         const ns = query.split('.', 1)[0];
         if (ns && !this.lang.isNamespaceLoaded(ns)) {
             const placeholder = this.config.placeholder;
@@ -1608,7 +1610,7 @@ class ThemeService {
     persistence = inject(THEME_PERSISTENCE_ADAPTER);
     isBrowser = isPlatformBrowser(inject(PLATFORM_ID));
     document = inject(DOCUMENT);
-    #theme = signal(this.themeDefault, ...(ngDevMode ? [{ debugName: "#theme" }] : []));
+    #theme = signal(this.themeDefault, ...(ngDevMode ? [{ debugName: "#theme" }] : /* istanbul ignore next */ []));
     /**
      * Current active theme (`light` or `dark`).
      *
@@ -1618,13 +1620,13 @@ class ThemeService {
      * <div [class]="themeService.theme()"></div>
      * ```
      */
-    theme = computed(() => this.#theme(), ...(ngDevMode ? [{ debugName: "theme" }] : []));
+    theme = computed(() => this.#theme(), ...(ngDevMode ? [{ debugName: "theme" }] : /* istanbul ignore next */ []));
     /**
      * Convenient flag returning `true` if the light theme is active.
      * Suitable for conditional style application or resource selection.
      */
-    isLight = computed(() => this.#theme() === themes.light, ...(ngDevMode ? [{ debugName: "isLight" }] : []));
-    isDark = computed(() => this.#theme() === themes.dark, ...(ngDevMode ? [{ debugName: "isDark" }] : []));
+    isLight = computed(() => this.#theme() === themes.light, ...(ngDevMode ? [{ debugName: "isLight" }] : /* istanbul ignore next */ []));
+    isDark = computed(() => this.#theme() === themes.dark, ...(ngDevMode ? [{ debugName: "isDark" }] : /* istanbul ignore next */ []));
     constructor() {
         effect(() => {
             if (!this.isBrowser) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.1",
+  "version": "2.1.2",
   "name": "@reforgium/presentia",
   "description": "Angular infrastructure library for i18n, route-aware namespace preload, theming, adaptive breakpoints, route state, and SEO",
   "author": "rtommievich",

package/types/reforgium-presentia.d.ts

@@ -608,6 +608,7 @@ declare class LangPipe implements PipeTransform {
     private readonly maxCacheSize;
     constructor();
     transform(query: string | null | undefined, params?: LangParams | null): string;
+    private applyNamespaceGuard;
     private makeKey;
     private evictIfNeeded;
     private warnUnresolvedKey;