@ng-prism/core 22.5.0 → 22.7.0-beta.0

package/dist/app/services/prism-renderer.service.js

@@ -1,4 +1,6 @@
-import { computed, inject, Injectable, signal } from '@angular/core';
+import { computed, effect, inject, Injectable, signal, untracked } from '@angular/core';
+import { COMPOSITION_SUBJECT_ATTR } from '../../shared/composition.js';
+import { activeCase } from '../renderer/composition.js';
 import { PrismNavigationService } from './prism-navigation.service.js';
 import * as i0 from "@angular/core";
 export function computeVariantState(comp, index, options = {}) {
@@ -31,14 +33,32 @@ export function computeVariantState(comp, index, options = {}) {
         ...defaults,
         ...filteredVariantInputs
     };
-    if (comp.meta.componentMeta.isDirective && variant?.content) {
-        values['__prismContent__'] = typeof variant.content === 'string' ? variant.content : '';
+    const hostContent = directiveHostContent(comp, index);
+    if (hostContent !== undefined) {
+        values['__prismContent__'] = hostContent;
     }
     return {
         values,
-        activeContent: comp.meta.componentMeta.isDirective ? undefined : variant?.content
+        activeContent: projectedContent(comp, index)
     };
 }
+/**
+ * The text `content` the `__PrismHost` of a directive renders through `__prismContent__`, `undefined` for a variant
+ * without content, a component, or a composed variant, whose template holds the content and whose wrapper does not
+ * declare `__prismContent__`.
+ */
+function directiveHostContent(comp, index) {
+    const content = comp.meta.showcaseConfig.variants?.[index]?.content;
+    if (!comp.meta.componentMeta.isDirective || !content || activeCase(comp, index))
+        return undefined;
+    return typeof content === 'string' ? content : '';
+}
+/** The `content` the renderer projects into a component, `undefined` for a directive and for a composed variant. */
+function projectedContent(comp, index) {
+    if (comp.meta.componentMeta.isDirective || activeCase(comp, index))
+        return undefined;
+    return comp.meta.showcaseConfig.variants?.[index]?.content;
+}
 function valuesEqual(a, b) {
     if (a === b)
         return true;
@@ -57,12 +77,32 @@ export class PrismRendererService {
     navigationService = inject(PrismNavigationService);
     activeVariantIndex = signal(0, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "activeVariantIndex" }] : /* istanbul ignore next */ []));
+    /**
+     * Position in `ShowcaseConfig.states` of the component-level state on the
+     * canvas, `null` for none. Part of the addressed cell next to the variant:
+     * it survives a variant change and goes with the component.
+     */
+    activeStateIndex = signal(null, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "activeStateIndex" }] : /* istanbul ignore next */ []));
     inputValues = signal({}, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "inputValues" }] : /* istanbul ignore next */ []));
     activeContent = signal(undefined, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "activeContent" }] : /* istanbul ignore next */ []));
     renderedElement = signal(null, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "renderedElement" }] : /* istanbul ignore next */ []));
+    /**
+     * The element of the showcased component or directive in what the canvas
+     * renders: in a composition the one the wrapper marks, else the rendered
+     * element itself. `null` while nothing is rendered. Since 22.7.0.
+     */
+    subjectElement = computed(() => {
+        const root = this.renderedElement();
+        if (!root)
+            return null;
+        const selector = `[${COMPOSITION_SUBJECT_ATTR}]`;
+        return root.matches(selector) ? root : (root.querySelector(selector) ?? root);
+    }, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "subjectElement" }] : /* istanbul ignore next */ []));
     dirtyInputCount = computed(() => {
         const comp = this.navigationService.activeComponent();
         if (!comp)
@@ -78,20 +118,45 @@ export class PrismRendererService {
         return count;
     }, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "dirtyInputCount" }] : /* istanbul ignore next */ []));
+    /** The component the variant, the state and the inputs belong to, `null` before the first. */
     _lastClassName = null;
+    constructor() {
+        // The variant and the state go with the component in every view, so the reset on a switch follows
+        // navigation, not the renderer: the shell mounts `<prism-renderer>` in the Playground only, and the Overview
+        // keeps its view when the sidebar picks another component. A root effect, created before the URL service's,
+        // so it runs first in the same flush and the URL never sees the previous component's cell on the new one.
+        effect(() => {
+            const comp = this.navigationService.activeComponent();
+            if (comp)
+                untracked(() => this.reconcileForComponent(comp));
+        });
+    }
     resetForComponent(comp) {
         this._lastClassName = comp.meta.className;
         this.activeVariantIndex.set(0);
+        this.activeStateIndex.set(null);
         this.applyVariant(0, comp);
     }
+    /**
+     * Brings the variant, the state and the inputs in line with `comp`: a full
+     * reset when it is another component than the last one, else the variant
+     * and the state clamped to what it still declares and the inputs kept.
+     * Runs on every navigation and again when the renderer mounts, which then
+     * finds the component current and keeps what an Overview cell or a restore
+     * selected.
+     */
     reconcileForComponent(comp) {
         const prev = this._lastClassName;
         this._lastClassName = comp.meta.className;
         if (prev !== null && prev !== comp.meta.className) {
             this.activeVariantIndex.set(0);
+            this.activeStateIndex.set(null);
             this.applyVariant(0, comp);
             return;
         }
+        const stateIndex = this.activeStateIndex();
+        if (stateIndex !== null && stateIndex >= (comp.meta.showcaseConfig.states?.length ?? 0))
+            this.activeStateIndex.set(null);
         const variants = comp.meta.showcaseConfig.variants ?? [];
         const maxIndex = Math.max(0, variants.length - 1);
         const preservedIndex = Math.min(this.activeVariantIndex(), maxIndex);
@@ -113,11 +178,12 @@ export class PrismRendererService {
         const variant = variants[preservedIndex];
         const variantInputs = variant?.inputs ?? {};
         const merged = { ...defaults, ...variantInputs, ...preserved };
-        if (comp.meta.componentMeta.isDirective && variant?.content && preserved['__prismContent__'] === undefined) {
-            merged['__prismContent__'] = typeof variant.content === 'string' ? variant.content : '';
+        const hostContent = directiveHostContent(comp, preservedIndex);
+        if (hostContent !== undefined && preserved['__prismContent__'] === undefined) {
+            merged['__prismContent__'] = hostContent;
         }
         this.inputValues.set(merged);
-        this.activeContent.set(comp.meta.componentMeta.isDirective ? undefined : variant?.content);
+        this.activeContent.set(projectedContent(comp, preservedIndex));
     }
     selectVariant(index) {
         this.activeVariantIndex.set(index);
@@ -125,6 +191,9 @@ export class PrismRendererService {
         if (comp)
             this.applyVariant(index, comp);
     }
+    selectState(index) {
+        this.activeStateIndex.set(index);
+    }
     updateInput(name, value) {
         this.inputValues.update((prev) => ({ ...prev, [name]: value }));
     }
@@ -147,4 +216,4 @@ export class PrismRendererService {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(PrismRendererService, [{
         type: Injectable,
         args: [{ providedIn: 'root' }]
-    }], null, null); })();
+    }], () => [], null); })();

package/dist/app/services/prism-search.service.d.ts

@@ -1,9 +1,13 @@
 import type { StyleguidePage } from '../../plugin/page.types.js';
+import type { RuntimePipe } from '../../plugin/pipe.types.js';
+import type { RuntimeService } from '../../plugin/service.types.js';
 import * as i0 from "@angular/core";
 export declare class PrismSearchService {
     private readonly manifestService;
     readonly query: import("@angular/core").WritableSignal<string>;
     readonly filteredComponents: import("@angular/core").Signal<import("../../index.js").RuntimeComponent[]>;
+    readonly filteredServices: import("@angular/core").Signal<RuntimeService[]>;
+    readonly filteredPipes: import("@angular/core").Signal<RuntimePipe[]>;
     readonly filteredPages: import("@angular/core").Signal<StyleguidePage[]>;
     search(q: string): void;
     clear(): void;

package/dist/app/services/prism-search.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prism-search.service.d.ts","sourceRoot":"","sources":["../../../src/app/services/prism-search.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;;AAGjE,qBACa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgC;IAEhE,QAAQ,CAAC,KAAK,iDAAc;IAE5B,QAAQ,CAAC,kBAAkB,8EAcxB;IAEH,QAAQ,CAAC,aAAa,mDAMnB;IAEH,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAIvB,KAAK,IAAI,IAAI;yCAjCJ,kBAAkB;;CAoC9B"}
+{"version":3,"file":"prism-search.service.d.ts","sourceRoot":"","sources":["../../../src/app/services/prism-search.service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;;AAkBpE,qBACa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgC;IAEhE,QAAQ,CAAC,KAAK,iDAAc;IAE5B,QAAQ,CAAC,kBAAkB,8EAMxB;IAEH,QAAQ,CAAC,gBAAgB,mDAMtB;IAEH,QAAQ,CAAC,aAAa,gDAMnB;IAEH,QAAQ,CAAC,aAAa,mDAMnB;IAEH,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAIvB,KAAK,IAAI,IAAI;yCAzCJ,kBAAkB;;CA4C9B"}

package/dist/app/services/prism-search.service.js

@@ -1,6 +1,18 @@
 import { computed, inject, Injectable, signal } from '@angular/core';
 import { PrismManifestService } from './prism-manifest.service.js';
 import * as i0 from "@angular/core";
+/**
+ * Whether a showcased item matches a query that is already lowercased and
+ * trimmed: its title, category or tags, or one of `names`, the identifiers
+ * that only some kinds have (a service's class name, a pipe's class name and
+ * template name).
+ */
+function matchesQuery(q, config, names = []) {
+    return (config.title.toLowerCase().includes(q) ||
+        names.some((name) => name.toLowerCase().includes(q)) ||
+        (config.category?.toLowerCase().includes(q) ?? false) ||
+        (config.tags?.some((t) => t.toLowerCase().includes(q)) ?? false));
+}
 export class PrismSearchService {
     manifestService = inject(PrismManifestService);
     query = signal('', /* @ts-ignore */
@@ -10,14 +22,25 @@ export class PrismSearchService {
         const all = this.manifestService.components();
         if (!q)
             return all;
-        return all.filter((comp) => {
-            const config = comp.meta.showcaseConfig;
-            return (config.title.toLowerCase().includes(q) ||
-                (config.category?.toLowerCase().includes(q) ?? false) ||
-                (config.tags?.some((t) => t.toLowerCase().includes(q)) ?? false));
-        });
+        return all.filter((comp) => matchesQuery(q, comp.meta.showcaseConfig));
     }, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "filteredComponents" }] : /* istanbul ignore next */ []));
+    filteredServices = computed(() => {
+        const q = this.query().toLowerCase().trim();
+        const all = this.manifestService.services();
+        if (!q)
+            return all;
+        return all.filter((service) => matchesQuery(q, service.meta.showcaseConfig, [service.meta.className]));
+    }, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "filteredServices" }] : /* istanbul ignore next */ []));
+    filteredPipes = computed(() => {
+        const q = this.query().toLowerCase().trim();
+        const all = this.manifestService.pipes();
+        if (!q)
+            return all;
+        return all.filter((pipe) => matchesQuery(q, pipe.meta.showcaseConfig, [pipe.meta.className, pipe.meta.pipeName]));
+    }, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "filteredPipes" }] : /* istanbul ignore next */ []));
     filteredPages = computed(() => {
         const q = this.query().toLowerCase().trim();
         const all = this.manifestService.pages();

package/dist/app/services/prism-theme.service.d.ts

@@ -2,9 +2,17 @@ import * as i0 from "@angular/core";
 export declare class PrismThemeService {
     readonly theme: import("@angular/core").WritableSignal<"light" | "dark">;
     readonly isDark: import("@angular/core").Signal<boolean>;
-    private configOverrides;
-    private darkOverrides;
-    private lightOverrides;
+    private readonly overrides;
+    /** Every token of the active mode, including the user's overrides. */
+    readonly appTokens: import("@angular/core").Signal<Record<string, string>>;
+    /**
+     * The dark set, for the header: since 22.7 it is a navy brand band in both
+     * themes. Bound as an inline style on the header host, so tokens composed
+     * from others (tints, status surfaces) are evaluated there again rather than
+     * inherited already resolved against the light theme.
+     */
+    readonly headerTokens: import("@angular/core").Signal<Record<string, string>>;
+    private readonly warnedDeprecations;
     constructor();
     toggle(): void;
     applyConfigOverrides(config: {

package/dist/app/services/prism-theme.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prism-theme.service.d.ts","sourceRoot":"","sources":["../../../src/app/services/prism-theme.service.ts"],"names":[],"mappings":";AAMA,qBACa,iBAAiB;IAC1B,QAAQ,CAAC,KAAK,2DAAoD;IAClE,QAAQ,CAAC,MAAM,0CAA2C;IAE1D,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,cAAc,CAA8B;;IAapD,MAAM,IAAI,IAAI;IAId,oBAAoB,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,GAAG,IAAI;IAO/I,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,eAAe;yCA5Dd,iBAAiB;;CAsE7B"}
+{"version":3,"file":"prism-theme.service.d.ts","sourceRoot":"","sources":["../../../src/app/services/prism-theme.service.ts"],"names":[],"mappings":";AAOA,qBACa,iBAAiB;IAC1B,QAAQ,CAAC,KAAK,2DAAoD;IAClE,QAAQ,CAAC,MAAM,0CAA2C;IAE1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IAExD,sEAAsE;IACtE,QAAQ,CAAC,SAAS,yDAA6E;IAE/F;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,yDAAuE;IAE5F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;;IAaxD,MAAM,IAAI,IAAI;IAId,oBAAoB,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,GAAG,IAAI;IAK/I,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,eAAe;yCAjEd,iBAAiB;;CA2E7B"}

package/dist/app/services/prism-theme.service.js

@@ -1,16 +1,28 @@
 import { computed, effect, Injectable, signal } from '@angular/core';
-import { PRISM_BASE_TOKENS, PRISM_DARK_THEME, PRISM_LIGHT_THEME } from '../theme/prism-default-theme.js';
+import { deprecatedTokenNotice } from '../theme/deprecated-tokens.js';
+import { FAVICON_SVG_DATA_URI } from '../theme/favicon.js';
+import { resolveThemeTokens } from '../theme/resolve-theme-tokens.js';
 import * as i0 from "@angular/core";
 const STORAGE_KEY = 'ng-prism-theme';
-const FAVICON_DATA_URI = `data:image/x-icon;base64,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AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAA////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAQAAgAAAAAABAADAAAAAAAMAAMAAAAAAAwAA4AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAAAAPAAD4AAAAAB8AAPwAAAAAPwAA/AAAAAA/AAD+AAAAAH8AAP4AAAAAfwAA/wAAAAD/AAD/AAAAAP8AAP+AAAAB/wAA/8AAAAP/AAD/wAAAA/8AAP/gAAAH/wAA/+AAAAf/AAD/8AAAD/8AAP/wAAAP/wAA//gAAB//AAD//AAAP/8AAP/8AAA//wAA//4AAH//AAD//gAAf/8AAP//AAD//wAA//8AAP//AAD//4AB//8AAP//wAP//wAA///AA///AAD//+AH//8AAP//4Af//wAA///wD///AAD///AP//8AAP//+B///wAA///8P///AAD///w///8AAP///n///wAA////////AAD///////8AACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGYzzAWAAKoGgACqBoAAqgaAAKoGgACqBoAAqgaAAKoGgACqBqoA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`;
 export class PrismThemeService {
     theme = signal(this.readStoredTheme(), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "theme" }] : /* istanbul ignore next */ []));
     isDark = computed(() => this.theme() === 'dark', /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "isDark" }] : /* istanbul ignore next */ []));
-    configOverrides = {};
-    darkOverrides = {};
-    lightOverrides = {};
+    overrides = signal({}, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "overrides" }] : /* istanbul ignore next */ []));
+    /** Every token of the active mode, including the user's overrides. */
+    appTokens = computed(() => resolveThemeTokens(this.theme(), this.overrides()).tokens, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "appTokens" }] : /* istanbul ignore next */ []));
+    /**
+     * The dark set, for the header: since 22.7 it is a navy brand band in both
+     * themes. Bound as an inline style on the header host, so tokens composed
+     * from others (tints, status surfaces) are evaluated there again rather than
+     * inherited already resolved against the light theme.
+     */
+    headerTokens = computed(() => resolveThemeTokens('dark', this.overrides()).tokens, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "headerTokens" }] : /* istanbul ignore next */ []));
+    warnedDeprecations = new Set();
     constructor() {
         this.applyFavicon();
         effect(() => {
@@ -24,25 +36,21 @@ export class PrismThemeService {
         this.theme.update((t) => (t === 'dark' ? 'light' : 'dark'));
     }
     applyConfigOverrides(config) {
-        this.configOverrides = config.theme ?? {};
-        this.darkOverrides = config.darkTheme ?? {};
-        this.lightOverrides = config.lightTheme ?? {};
+        this.overrides.set({ theme: config.theme, darkTheme: config.darkTheme, lightTheme: config.lightTheme });
         this.applyTokens();
     }
     applyTokens() {
-        const isDark = this.isDark();
-        const base = isDark ? PRISM_DARK_THEME : PRISM_LIGHT_THEME;
-        const specific = isDark ? this.darkOverrides : this.lightOverrides;
-        const merged = {
-            ...PRISM_BASE_TOKENS,
-            ...base,
-            ...specific,
-            ...this.configOverrides
-        };
+        const { tokens, deprecatedOverrides } = resolveThemeTokens(this.theme(), this.overrides());
         const style = document.documentElement.style;
-        for (const [key, value] of Object.entries(merged)) {
+        for (const [key, value] of Object.entries(tokens)) {
             style.setProperty(key, value);
         }
+        for (const token of deprecatedOverrides) {
+            if (this.warnedDeprecations.has(token))
+                continue;
+            this.warnedDeprecations.add(token);
+            console.warn(`[ng-prism] ${deprecatedTokenNotice(token)}`);
+        }
     }
     applyFavicon() {
         let link = document.querySelector('link[rel="icon"]');
@@ -52,7 +60,7 @@ export class PrismThemeService {
             document.head.appendChild(link);
         }
         link.type = 'image/svg+xml';
-        link.href = FAVICON_DATA_URI;
+        link.href = FAVICON_SVG_DATA_URI;
     }
     readStoredTheme() {
         try {

package/dist/app/services/prism-url-state.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prism-url-state.service.d.ts","sourceRoot":"","sources":["../../../src/app/services/prism-url-state.service.ts"],"names":[],"mappings":";AAgBA,qBACa,oBAAoB;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgC;IAChE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkC;IACpE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgC;IAChE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAE7C,OAAO,CAAC,YAAY,CAAS;IAE7B,IAAI,IAAI,IAAI;IAqBZ,OAAO,CAAC,cAAc;IA2CtB,OAAO,CAAC,UAAU;yCA1ET,oBAAoB;;CA+GhC"}
+{"version":3,"file":"prism-url-state.service.d.ts","sourceRoot":"","sources":["../../../src/app/services/prism-url-state.service.ts"],"names":[],"mappings":";AAoDA,qBACa,oBAAoB;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgC;IAChE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkC;IACpE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgC;IAChE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAE7C,OAAO,CAAC,YAAY,CAAS;IAE7B,IAAI,IAAI,IAAI;IAsBZ,OAAO,CAAC,cAAc;IAyEtB,OAAO,CAAC,UAAU;yCAzGT,oBAAoB;;CAiJhC"}

package/dist/app/services/prism-url-state.service.js

@@ -6,12 +6,48 @@ import { PrismPanelService } from './prism-panel.service.js';
 import { PrismRendererService } from './prism-renderer.service.js';
 import * as i0 from "@angular/core";
 const PARAM_COMPONENT = 'component';
+const PARAM_SERVICE = 'service';
+const PARAM_PIPE = 'pipe';
 const PARAM_PAGE = 'page';
 const PARAM_VARIANT = 'variant';
+const PARAM_STATE = 'state';
 const PARAM_VIEW = 'view';
 const DEFAULT_VIEW = 'renderer';
 const PARAM_PANEL = 'panel';
 const DEFAULT_PANEL = 'controls';
+/** The index a `variant` parameter addresses in a list of `count` variants, `0` for anything that is not one. */
+function parseVariantIndex(param, count) {
+    if (param === null)
+        return 0;
+    const index = parseInt(param, 10);
+    return !Number.isNaN(index) && index >= 0 && index < count ? index : 0;
+}
+/** The index a `state` parameter addresses in a list of `count` states, `null` for anything that is not one. */
+function parseStateIndex(param, count) {
+    if (param === null || !/^\d+$/.test(param))
+        return null;
+    const index = Number(param);
+    return index < count ? index : null;
+}
+/**
+ * What a URL addresses, `null` for nothing. The same precedence as the restore,
+ * prefixed per kind so a component, a service and a pipe of one name still differ.
+ */
+function navKey(params) {
+    const component = params.get(PARAM_COMPONENT);
+    const service = params.get(PARAM_SERVICE);
+    const pipe = params.get(PARAM_PIPE);
+    const page = params.get(PARAM_PAGE);
+    if (component !== null)
+        return `${PARAM_COMPONENT}:${component}`;
+    if (service !== null)
+        return `${PARAM_SERVICE}:${service}`;
+    if (pipe !== null)
+        return `${PARAM_PIPE}:${pipe}`;
+    if (page !== null)
+        return `${PARAM_PAGE}:${page}`;
+    return null;
+}
 export class PrismUrlStateService {
     manifestService = inject(PrismManifestService);
     navigationService = inject(PrismNavigationService);
@@ -27,34 +63,60 @@ export class PrismUrlStateService {
         effect(() => {
             const item = this.navigationService.activeItem();
             const variantIndex = this.rendererService.activeVariantIndex();
+            const stateIndex = this.rendererService.activeStateIndex();
             const viewId = this.panelService.activeViewId();
             const panelId = this.panelService.activePanelId();
             if (this.suppressSync)
                 return;
-            this.writeToUrl(item, variantIndex, viewId, panelId);
+            this.writeToUrl(item, variantIndex, stateIndex, viewId, panelId);
         }, { injector: this.injector });
         window.addEventListener('popstate', () => this.restoreFromUrl());
     }
     restoreFromUrl() {
         const params = new URLSearchParams(window.location.search);
         const componentClassName = params.get(PARAM_COMPONENT);
+        const serviceClassName = params.get(PARAM_SERVICE);
+        const pipeClassName = params.get(PARAM_PIPE);
         const pageTitle = params.get(PARAM_PAGE);
         const variantParam = params.get(PARAM_VARIANT);
+        const stateParam = params.get(PARAM_STATE);
         const viewId = params.get(PARAM_VIEW);
         const panelId = params.get(PARAM_PANEL);
+        let stateIndex = null;
         this.suppressSync = true;
         try {
             if (componentClassName) {
                 const comp = this.manifestService.components().find((c) => c.meta.className === componentClassName);
                 if (comp) {
+                    const previousClassName = this.navigationService.activeComponent()?.meta.className;
                     this.navigationService.select(comp);
-                    if (variantParam !== null) {
-                        const index = parseInt(variantParam, 10);
-                        const maxIndex = (comp.meta.showcaseConfig.variants?.length ?? 1) - 1;
-                        if (!Number.isNaN(index) && index >= 0 && index <= maxIndex) {
-                            this.rendererService.activeVariantIndex.set(index);
-                        }
+                    // Switching to another component resets the variant and the state
+                    // once `PrismRendererService` follows the navigation, after this
+                    // restore. Starting the component here makes it the current one
+                    // before the indexes below are set, so that reset, and the renderer
+                    // mounting it, keep them (a popstate between components). Not for
+                    // the component already on screen: a popstate that addresses it (a
+                    // hash link inside it fires one) must keep the control overrides.
+                    if (previousClassName !== comp.meta.className) {
+                        this.rendererService.resetForComponent(comp);
                     }
+                    const variantIndex = parseVariantIndex(variantParam, comp.meta.showcaseConfig.variants?.length ?? 1);
+                    if (variantIndex !== this.rendererService.activeVariantIndex()) {
+                        this.rendererService.selectVariant(variantIndex);
+                    }
+                    stateIndex = parseStateIndex(stateParam, comp.meta.showcaseConfig.states?.length ?? 0);
+                }
+            }
+            else if (serviceClassName) {
+                const service = this.manifestService.services().find((s) => s.meta.className === serviceClassName);
+                if (service) {
+                    this.navigationService.selectService(service);
+                }
+            }
+            else if (pipeClassName) {
+                const pipe = this.manifestService.pipes().find((p) => p.meta.className === pipeClassName);
+                if (pipe) {
+                    this.navigationService.selectPipe(pipe);
                 }
             }
             else if (pageTitle) {
@@ -63,6 +125,7 @@ export class PrismUrlStateService {
                     this.navigationService.selectPage(page);
                 }
             }
+            this.rendererService.selectState(stateIndex);
             if (viewId) {
                 this.panelService.activeViewId.set(viewId);
             }
@@ -74,7 +137,7 @@ export class PrismUrlStateService {
             this.suppressSync = false;
         }
     }
-    writeToUrl(item, variantIndex, viewId, panelId) {
+    writeToUrl(item, variantIndex, stateIndex, viewId, panelId) {
         // Built from scratch, never from the current search string: parameters the
         // app does not own must not survive a navigation. `?capture=1` relies on
         // this; the "capture flag" specs pin the guarantee.
@@ -84,6 +147,15 @@ export class PrismUrlStateService {
             if (variantIndex > 0) {
                 params.set(PARAM_VARIANT, String(variantIndex));
             }
+            if (stateIndex !== null) {
+                params.set(PARAM_STATE, String(stateIndex));
+            }
+        }
+        else if (item?.kind === 'service') {
+            params.set(PARAM_SERVICE, item.data.meta.className);
+        }
+        else if (item?.kind === 'pipe') {
+            params.set(PARAM_PIPE, item.data.meta.className);
         }
         else if (item?.kind === 'page') {
             params.set(PARAM_PAGE, item.data.title);
@@ -98,10 +170,7 @@ export class PrismUrlStateService {
         const newUrl = queryString ? `${window.location.pathname}?${queryString}` : window.location.pathname;
         if (newUrl === window.location.pathname + window.location.search)
             return;
-        const currentParams = new URLSearchParams(window.location.search);
-        const prevNavKey = currentParams.get(PARAM_COMPONENT) ?? currentParams.get(PARAM_PAGE);
-        const newNavKey = params.get(PARAM_COMPONENT) ?? params.get(PARAM_PAGE);
-        if (prevNavKey !== newNavKey) {
+        if (navKey(new URLSearchParams(window.location.search)) !== navKey(params)) {
             window.history.pushState(null, '', newUrl);
         }
         else {

package/dist/app/shared/badge.types.d.ts

@@ -0,0 +1,7 @@
+import type { StatusTone } from '../../plugin/status.js';
+/** Colour roles of `prism-badge`. */
+export type BadgeTone = 'neutral' | 'primary' | 'success' | 'warn' | 'danger';
+export type { StatusTone };
+/** The badge tone that shows a status verdict. */
+export declare function toneForStatus(status: StatusTone): BadgeTone;
+//# sourceMappingURL=badge.types.d.ts.map

package/dist/app/shared/badge.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"badge.types.d.ts","sourceRoot":"","sources":["../../../src/app/shared/badge.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qCAAqC;AACrC,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE9E,YAAY,EAAE,UAAU,EAAE,CAAC;AAQ3B,kDAAkD;AAClD,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAE3D"}

package/dist/app/shared/badge.types.js

@@ -0,0 +1,9 @@
+const STATUS_BADGE_TONE = {
+    ok: 'success',
+    warn: 'warn',
+    danger: 'danger'
+};
+/** The badge tone that shows a status verdict. */
+export function toneForStatus(status) {
+    return STATUS_BADGE_TONE[status];
+}

package/dist/app/shared/brand-mark.d.ts

@@ -0,0 +1,35 @@
+/**
+ * The ng-prism symbol, the mark without the wordmark, as data.
+ *
+ * Kept as data rather than an SVG file because two consumers draw it with
+ * different gradient ids: the logo component renders one instance per place it
+ * appears (header and sidebar footer at the same time), and SVG gradient ids are
+ * document-global; the favicon serialises it once into a data URI. The geometry
+ * is copied verbatim from `docs/assets/brand/ng-prism-symbol.svg` (2048 × 1608
+ * canvas), which `brand-mark.spec.ts` checks, and must not be edited: the brand
+ * guide forbids reshaping the mark.
+ */
+export interface BrandMarkGradient {
+    id: string;
+    /** End points on the mark's canvas (`gradientUnits="userSpaceOnUse"`). */
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+    stops: ReadonlyArray<readonly [offset: string, colour: string]>;
+}
+export interface BrandMarkFacet {
+    d: string;
+    /** A gradient id from {@link BRAND_MARK_GRADIENTS}, or a solid colour. */
+    gradient?: string;
+    colour?: string;
+}
+export declare const BRAND_MARK_GRADIENTS: readonly BrandMarkGradient[];
+export declare const BRAND_MARK_FACETS: readonly BrandMarkFacet[];
+/** The mark's bounding box on the kit canvas, trimmed to the facets. */
+export declare const BRAND_MARK_VIEWBOX = "4 31 2036 1561";
+/** The same box padded to a square, for icons the browser would otherwise letterbox. */
+export declare const BRAND_MARK_SQUARE_VIEWBOX = "4 -206.5 2036 2036";
+/** The mark as a standalone SVG document, with every gradient id prefixed. */
+export declare function brandMarkSvg(idPrefix: string, viewBox: string): string;
+//# sourceMappingURL=brand-mark.d.ts.map

package/dist/app/shared/brand-mark.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"brand-mark.d.ts","sourceRoot":"","sources":["../../../src/app/shared/brand-mark.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,0EAA0E;IAC1E,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACnE;AAED,MAAM,WAAW,cAAc;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,oBAAoB,EAAE,SAAS,iBAAiB,EAa5D,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,SAAS,cAAc,EAyBtD,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AAEnD,wFAAwF;AACxF,eAAO,MAAM,yBAAyB,uBAAuB,CAAC;AAE9D,8EAA8E;AAC9E,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAUtE"}