@umbraco-cms/backoffice 16.1.0 → 16.2.0-rc

package/dist-cms/packages/ufm/components/link/link.element.js

@@ -9,7 +9,6 @@ import { UMB_UFM_RENDER_CONTEXT } from '../ufm-render/ufm-render.context.js';
 import { customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbDocumentItemRepository, UMB_DOCUMENT_ENTITY_TYPE } from '@umbraco-cms/backoffice/document';
 import { UmbMediaItemRepository, UMB_MEDIA_ENTITY_TYPE } from '@umbraco-cms/backoffice/media';
-const elementName = 'ufm-link';
 let UmbUfmLinkElement = class UmbUfmLinkElement extends UmbUfmElementBase {
     #documentRepository;
     #mediaRepository;
@@ -64,7 +63,7 @@ __decorate([
     property()
 ], UmbUfmLinkElement.prototype, "alias", void 0);
 UmbUfmLinkElement = __decorate([
-    customElement(elementName)
+    customElement('ufm-link')
 ], UmbUfmLinkElement);
 export { UmbUfmLinkElement };
 export { UmbUfmLinkElement as element };

package/dist-cms/packages/ufm/components/localize/localize.component.d.ts

@@ -1,4 +1,4 @@
-import type { UfmToken } from '../../plugins/marked-ufm.plugin.js';
+import type { UfmToken } from '../../plugins/types.js';
 import { UmbUfmComponentBase } from '../ufm-component-base.js';
 import './localize.element.js';
 export declare class UmbUfmLocalizeComponent extends UmbUfmComponentBase {

package/dist-cms/packages/ufm/components/localize/localize.element.d.ts

@@ -1,5 +1,4 @@
 import { UmbUfmElementBase } from '../ufm-element-base.js';
-declare const elementName = "ufm-localize";
 export declare class UmbUfmLocalizeElement extends UmbUfmElementBase {
     #private;
     set alias(value: string | undefined);
@@ -8,6 +7,6 @@ export declare class UmbUfmLocalizeElement extends UmbUfmElementBase {
 export { UmbUfmLocalizeElement as element };
 declare global {
     interface HTMLElementTagNameMap {
-        [elementName]: UmbUfmLocalizeElement;
+        'ufm-localize': UmbUfmLocalizeElement;
     }
 }

package/dist-cms/packages/ufm/components/localize/localize.element.js

@@ -6,7 +6,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbUfmElementBase } from '../ufm-element-base.js';
 import { customElement, property } from '@umbraco-cms/backoffice/external/lit';
-const elementName = 'ufm-localize';
 let UmbUfmLocalizeElement = class UmbUfmLocalizeElement extends UmbUfmElementBase {
     set alias(value) {
         if (!value)
@@ -23,7 +22,7 @@ __decorate([
     property()
 ], UmbUfmLocalizeElement.prototype, "alias", null);
 UmbUfmLocalizeElement = __decorate([
-    customElement(elementName)
+    customElement('ufm-localize')
 ], UmbUfmLocalizeElement);
 export { UmbUfmLocalizeElement };
 export { UmbUfmLocalizeElement as element };

package/dist-cms/packages/ufm/components/manifests.d.ts

@@ -1,2 +1,2 @@
-import type { ManifestUfmComponent } from '../ufm-component.extension.js';
+import type { ManifestUfmComponent } from '../extensions/ufm-component.extension.js';
 export declare const manifests: Array<ManifestUfmComponent>;

package/dist-cms/packages/ufm/components/ufm-component-base.d.ts

@@ -1,5 +1,5 @@
-import type { UfmToken } from '../plugins/marked-ufm.plugin.js';
-import type { UmbUfmComponentApi } from '../ufm-component.extension.js';
+import type { UfmToken } from '../plugins/types.js';
+import type { UmbUfmComponentApi } from '../extensions/ufm-component.extension.js';
 export declare abstract class UmbUfmComponentBase implements UmbUfmComponentApi {
     protected getAttributes(text: string): string | null;
     abstract render(token: UfmToken): string | undefined;

package/dist-cms/packages/ufm/components/ufm-element-base.d.ts

@@ -1,4 +1,3 @@
-import { nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export declare abstract class UmbUfmElementBase extends UmbLitElement {
     #private;
@@ -6,5 +5,5 @@ export declare abstract class UmbUfmElementBase extends UmbLitElement {
     get filters(): string | undefined;
     value?: unknown;
     constructor();
-    render(): string | typeof nothing;
+    render(): string;
 }

package/dist-cms/packages/ufm/components/ufm-element-base.js

@@ -5,10 +5,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UMB_UFM_CONTEXT } from '../contexts/ufm.context.js';
-import { nothing, property, state } from '@umbraco-cms/backoffice/external/lit';
+import { property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export class UmbUfmElementBase extends UmbLitElement {
     #filterFuncArgs;
+    #ufmContext;
     set filters(value) {
         this.#filters = value;
         this.#filterFuncArgs = value
@@ -23,7 +24,6 @@ export class UmbUfmElementBase extends UmbLitElement {
         return this.#filters;
     }
     #filters;
-    #ufmContext;
     constructor() {
         super();
         this.consumeContext(UMB_UFM_CONTEXT, (ufmContext) => {
@@ -31,15 +31,20 @@ export class UmbUfmElementBase extends UmbLitElement {
         });
     }
     render() {
-        if (!this.#ufmContext)
-            return nothing;
         let values = Array.isArray(this.value) ? this.value : [this.value];
         if (this.#filterFuncArgs) {
+            const missing = new Set();
             for (const item of this.#filterFuncArgs) {
-                const filter = this.#ufmContext.getFilterByAlias(item.alias);
+                const filter = this.#ufmContext?.getFilterByAlias(item.alias);
                 if (filter) {
                     values = values.map((value) => filter(value, ...item.args));
                 }
+                else {
+                    missing.add(item.alias);
+                }
+            }
+            if (missing.size > 0) {
+                console.warn(`UFM filters with aliases "${Array.from(missing).join('", "')}" were not found.`);
             }
         }
         return values.join(', ');

package/dist-cms/packages/ufm/components/ufm-js-expression.element.d.ts

@@ -0,0 +1,13 @@
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+export declare class UmbUfmJsExpressionElement extends UmbLitElement {
+    #private;
+    value?: unknown;
+    constructor();
+    render(): string;
+}
+export default UmbUfmJsExpressionElement;
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-ufm-js-expression': UmbUfmJsExpressionElement;
+    }
+}

package/dist-cms/packages/ufm/components/ufm-js-expression.element.js

@@ -0,0 +1,55 @@
+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 { UMB_UFM_CONTEXT } from '../contexts/ufm.context.js';
+import { UMB_UFM_RENDER_CONTEXT } from './ufm-render/ufm-render.context.js';
+import { customElement, state } from '@umbraco-cms/backoffice/external/lit';
+import { EvalAstFactory, Parser } from '@umbraco-cms/backoffice/external/heximal-expressions';
+import { UmbLruCache } from '@umbraco-cms/backoffice/cache';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+const astFactory = new EvalAstFactory();
+const expressionCache = new UmbLruCache(1000);
+let UmbUfmJsExpressionElement = class UmbUfmJsExpressionElement extends UmbLitElement {
+    #ufmContext;
+    constructor() {
+        super();
+        this.consumeContext(UMB_UFM_CONTEXT, (ufmContext) => {
+            this.#ufmContext = ufmContext;
+        });
+        this.consumeContext(UMB_UFM_RENDER_CONTEXT, (context) => {
+            this.observe(context?.value, (value) => {
+                this.value = this.#labelTemplate(this.textContent ?? '', value);
+            }, 'observeValue');
+        });
+    }
+    #labelTemplate(expression, model) {
+        const filters = this.#ufmContext?.getFilters() ?? [];
+        const functions = Object.fromEntries(filters.map((x) => [x.alias, x.filter]));
+        const scope = { ...model, ...functions };
+        let ast = expressionCache.get(expression);
+        if (ast === undefined && !expressionCache.has(expression)) {
+            try {
+                ast = new Parser(expression, astFactory).parse();
+            }
+            catch {
+                console.error(`Error parsing expression: \`${expression}\``);
+            }
+            expressionCache.set(expression, ast);
+        }
+        return ast?.evaluate(scope) ?? '';
+    }
+    render() {
+        return (Array.isArray(this.value) ? this.value : [this.value]).join(', ');
+    }
+};
+__decorate([
+    state()
+], UmbUfmJsExpressionElement.prototype, "value", void 0);
+UmbUfmJsExpressionElement = __decorate([
+    customElement('umb-ufm-js-expression')
+], UmbUfmJsExpressionElement);
+export { UmbUfmJsExpressionElement };
+export default UmbUfmJsExpressionElement;

package/dist-cms/packages/ufm/components/ufm-render/ufm-render.element.d.ts

@@ -1,5 +1,4 @@
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-declare const elementName = "umb-ufm-render";
 export declare class UmbUfmRenderElement extends UmbLitElement {
     #private;
     inline: boolean;
@@ -14,6 +13,6 @@ export declare class UmbUfmRenderElement extends UmbLitElement {
 export { UmbUfmRenderElement as element };
 declare global {
     interface HTMLElementTagNameMap {
-        [elementName]: UmbUfmRenderElement;
+        'umb-ufm-render': UmbUfmRenderElement;
     }
 }

package/dist-cms/packages/ufm/components/ufm-render/ufm-render.element.js

@@ -9,10 +9,10 @@ import { UmbUfmRenderContext } from './ufm-render.context.js';
 import { css, customElement, nothing, property, unsafeHTML, until } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-const elementName = 'umb-ufm-render';
 let UmbUfmRenderElement = class UmbUfmRenderElement extends UmbLitElement {
     #context;
-    // No reactive property declaration cause its causing a re-render that is not needed. This just works as a shortcut to set the values on the context. [NL]
+    // No reactive property declaration because it's causing a re-render that is not needed.
+    // This just works as a shortcut to set the values on the context. [NL]
     set value(value) {
         this.#context.setValue(value);
     }
@@ -43,6 +43,10 @@ let UmbUfmRenderElement = class UmbUfmRenderElement extends UmbLitElement {
     static { this.styles = [
         UmbTextStyles,
         css `
+			:host {
+				position: relative;
+			}
+
 			* {
 				max-width: 100%;
 				word-wrap: break-word;
@@ -52,6 +56,14 @@ let UmbUfmRenderElement = class UmbUfmRenderElement extends UmbLitElement {
 				overflow: auto;
 			}
 
+			code {
+				font-family: var(--uui-font-monospace);
+				white-space: pre-wrap;
+				background-color: var(--uui-color-background);
+				border-radius: var(--uui-border-radius);
+				padding: 0.2em 0.4em;
+			}
+
 			:host > :first-child {
 				margin-block-start: 0;
 			}
@@ -69,7 +81,7 @@ __decorate([
     property()
 ], UmbUfmRenderElement.prototype, "markdown", void 0);
 UmbUfmRenderElement = __decorate([
-    customElement(elementName)
+    customElement('umb-ufm-render')
 ], UmbUfmRenderElement);
 export { UmbUfmRenderElement };
 export { UmbUfmRenderElement as element };

package/dist-cms/packages/ufm/contexts/ufm.context.d.ts

@@ -3,15 +3,32 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 export declare const UmbMarked: Marked;
-type UmbUfmFilterType = {
+export type UmbUfmFilterFunction = ((...args: Array<unknown>) => string | undefined | null) | undefined;
+export type UmbUfmFilterType = {
     alias: string;
-    filter: ((...args: Array<unknown>) => string | undefined | null) | undefined;
+    filter: UmbUfmFilterFunction;
 };
 export declare class UmbUfmContext extends UmbContextBase {
     #private;
     readonly filters: import("rxjs").Observable<UmbUfmFilterType[]>;
     constructor(host: UmbControllerHost);
-    getFilterByAlias(alias: string): ((...args: Array<unknown>) => string | undefined | null) | undefined;
+    /**
+     * Get the filters registered in the UFM context.
+     * @returns {Array<UmbUfmFilterType>} An array of filters with their aliases and filter functions.
+     */
+    getFilters(): Array<UmbUfmFilterType>;
+    /**
+     * Get a filter by its alias.
+     * @param alias The alias of the filter to retrieve.
+     * @returns {UmbUfmFilterFunction} The filter function associated with the alias, or undefined if not found.
+     */
+    getFilterByAlias(alias: string): UmbUfmFilterFunction;
+    /**
+     * Parse markdown content, optionally inline.
+     * @param markdown The markdown string to parse.
+     * @param inline If true, parse inline markdown; otherwise, parse block markdown.
+     * @returns {Promise<string>} A promise that resolves to the parsed HTML string.
+     */
     parse(markdown: string, inline: boolean): Promise<string>;
 }
 export declare const UMB_UFM_CONTEXT: UmbContextToken<UmbUfmContext, UmbUfmContext>;

package/dist-cms/packages/ufm/contexts/ufm.context.js

@@ -1,4 +1,3 @@
-import { ufm } from '../plugins/marked-ufm.plugin.js';
 import { DOMPurify } from '@umbraco-cms/backoffice/external/dompurify';
 import { Marked } from '@umbraco-cms/backoffice/external/marked';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
@@ -26,9 +25,7 @@ export const UmbMarked = new Marked({
     gfm: true,
     breaks: true,
     hooks: {
-        postprocess: (markup) => {
-            return UmbDomPurify.sanitize(markup, UmbDomPurifyConfig);
-        },
+        postprocess: (markup) => UmbDomPurify.sanitize(markup, UmbDomPurifyConfig),
     },
 });
 export class UmbUfmContext extends UmbContextBase {
@@ -37,20 +34,7 @@ export class UmbUfmContext extends UmbContextBase {
         super(host, UMB_UFM_CONTEXT);
         this.#filters = new UmbArrayState([], (x) => x.alias);
         this.filters = this.#filters.asObservable();
-        new UmbExtensionsApiInitializer(this, umbExtensionsRegistry, 'ufmComponent', [], undefined, (controllers) => {
-            UmbMarked.use(ufm(controllers
-                .map((controller) => {
-                const ctrl = controller;
-                if (!ctrl.manifest || !ctrl.api)
-                    return;
-                return {
-                    alias: ctrl.manifest.meta.alias || ctrl.manifest.alias,
-                    marker: ctrl.manifest.meta.marker,
-                    render: ctrl.api.render,
-                };
-            })
-                .filter((x) => x)));
-        });
+        new UmbExtensionsApiInitializer(this, umbExtensionsRegistry, 'markedExtension', [UmbMarked]);
         new UmbExtensionsApiInitializer(this, umbExtensionsRegistry, 'ufmFilter', [], undefined, (controllers) => {
             const filters = controllers
                 .map((controller) => {
@@ -63,9 +47,27 @@ export class UmbUfmContext extends UmbContextBase {
             this.#filters.setValue(filters);
         });
     }
+    /**
+     * Get the filters registered in the UFM context.
+     * @returns {Array<UmbUfmFilterType>} An array of filters with their aliases and filter functions.
+     */
+    getFilters() {
+        return this.#filters.getValue();
+    }
+    /**
+     * Get a filter by its alias.
+     * @param alias The alias of the filter to retrieve.
+     * @returns {UmbUfmFilterFunction} The filter function associated with the alias, or undefined if not found.
+     */
     getFilterByAlias(alias) {
         return this.#filters.getValue().find((x) => x.alias === alias)?.filter;
     }
+    /**
+     * Parse markdown content, optionally inline.
+     * @param markdown The markdown string to parse.
+     * @param inline If true, parse inline markdown; otherwise, parse block markdown.
+     * @returns {Promise<string>} A promise that resolves to the parsed HTML string.
+     */
     async parse(markdown, inline) {
         return !inline ? await UmbMarked.parse(markdown) : await UmbMarked.parseInline(markdown);
     }

package/dist-cms/packages/ufm/extensions/manifests.d.ts

@@ -0,0 +1,2 @@
+import type { ManifestMarkedExtension } from './marked-extension.extension.js';
+export declare const manifests: Array<ManifestMarkedExtension>;

package/dist-cms/packages/ufm/extensions/manifests.js

@@ -0,0 +1,20 @@
+export const manifests = [
+    {
+        type: 'markedExtension',
+        alias: 'Umb.MarkedExtension.Ufm',
+        name: 'UFM Marked Extension',
+        api: () => import('./ufm-marked-extension.api.js'),
+        meta: {
+            alias: 'ufm',
+        },
+    },
+    {
+        type: 'markedExtension',
+        alias: 'Umb.MarkedExtension.Ufmjs',
+        name: 'UFM JS Marked Extension',
+        api: () => import('./ufmjs-marked-extension.api.js'),
+        meta: {
+            alias: 'ufmjs',
+        },
+    },
+];

package/dist-cms/packages/ufm/extensions/marked-extension.extension.d.ts

@@ -0,0 +1,21 @@
+import type { ManifestApi, UmbApi } from '@umbraco-cms/backoffice/extension-api';
+/** @internal */
+export interface UmbMarkedExtensionApi extends UmbApi {
+}
+/** @internal */
+export interface MetaMarkedExtension {
+    alias: string;
+}
+/**
+ * @internal
+ * @description The `markedExtension` extension-type is currently for internal use and should be considered experimental.
+ */
+export interface ManifestMarkedExtension extends ManifestApi<UmbMarkedExtensionApi> {
+    type: 'markedExtension';
+    meta: MetaMarkedExtension;
+}
+declare global {
+    interface UmbExtensionManifestMap {
+        umbMarkedExtension: ManifestMarkedExtension;
+    }
+}

package/dist-cms/packages/ufm/extensions/marked-extension.extension.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/ufm/extensions/types.d.ts

@@ -0,0 +1,5 @@
+export type * from './marked-extension.extension.js';
+export type * from './ufm-filter.extension.js';
+export type * from './ufm-component.extension.js';
+export type { UmbUfmMarkedExtensionApi } from './ufm-marked-extension.api.js';
+export type { UmbUfmJsMarkedExtensionApi } from './ufmjs-marked-extension.api.js';

package/dist-cms/packages/ufm/extensions/types.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/ufm/{ufm-component.extension.d.ts → extensions/ufm-component.extension.d.ts}

@@ -1,4 +1,4 @@
-import type { UfmToken } from './plugins/index.js';
+import type { UfmToken } from '../plugins/types.js';
 import type { ManifestApi, UmbApi } from '@umbraco-cms/backoffice/extension-api';
 export interface UmbUfmComponentApi extends UmbApi {
     render(token: UfmToken): string | undefined;

package/dist-cms/packages/ufm/extensions/ufm-component.extension.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/ufm/extensions/ufm-filter.extension.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/ufm/extensions/ufm-marked-extension.api.d.ts

@@ -0,0 +1,8 @@
+import type { UmbMarkedExtensionApi } from './marked-extension.extension.js';
+import type { Marked } from '@umbraco-cms/backoffice/external/marked';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+export declare class UmbUfmMarkedExtensionApi implements UmbMarkedExtensionApi {
+    constructor(host: UmbControllerHost, marked: Marked);
+    destroy(): void;
+}
+export default UmbUfmMarkedExtensionApi;

package/dist-cms/packages/ufm/extensions/ufm-marked-extension.api.js

@@ -0,0 +1,23 @@
+import { ufm } from '../plugins/marked-ufm.plugin.js';
+import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { UmbExtensionsApiInitializer } from '@umbraco-cms/backoffice/extension-api';
+export class UmbUfmMarkedExtensionApi {
+    constructor(host, marked) {
+        new UmbExtensionsApiInitializer(host, umbExtensionsRegistry, 'ufmComponent', [], undefined, (controllers) => {
+            marked.use(ufm(controllers
+                .map((controller) => {
+                const ctrl = controller;
+                if (!ctrl.manifest || !ctrl.api)
+                    return;
+                return {
+                    alias: ctrl.manifest.meta.alias || ctrl.manifest.alias,
+                    marker: ctrl.manifest.meta.marker,
+                    render: ctrl.api.render,
+                };
+            })
+                .filter((x) => x)));
+        });
+    }
+    destroy() { }
+}
+export default UmbUfmMarkedExtensionApi;

package/dist-cms/packages/ufm/extensions/ufmjs-marked-extension.api.d.ts

@@ -0,0 +1,8 @@
+import type { UmbMarkedExtensionApi } from './marked-extension.extension.js';
+import type { Marked } from '@umbraco-cms/backoffice/external/marked';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+export declare class UmbUfmJsMarkedExtensionApi implements UmbMarkedExtensionApi {
+    constructor(_host: UmbControllerHost, marked: Marked);
+    destroy(): void;
+}
+export default UmbUfmJsMarkedExtensionApi;

package/dist-cms/packages/ufm/extensions/ufmjs-marked-extension.api.js

@@ -0,0 +1,8 @@
+import { ufmjs } from '../plugins/marked-ufmjs.plugin.js';
+export class UmbUfmJsMarkedExtensionApi {
+    constructor(_host, marked) {
+        marked.use(ufmjs());
+    }
+    destroy() { }
+}
+export default UmbUfmJsMarkedExtensionApi;

package/dist-cms/packages/ufm/filters/base.filter.d.ts

@@ -1,4 +1,4 @@
-import type { UmbUfmFilterApi } from '../ufm-filter.extension.js';
+import type { UmbUfmFilterApi } from '../extensions/ufm-filter.extension.js';
 export declare abstract class UmbUfmFilterBase implements UmbUfmFilterApi {
     abstract filter(...args: Array<unknown>): string | undefined | null;
     destroy(): void;

package/dist-cms/packages/ufm/filters/manifests.d.ts

@@ -1,2 +1,2 @@
-import type { ManifestUfmFilter } from '../ufm-filter.extension.js';
+import type { ManifestUfmFilter } from '../extensions/ufm-filter.extension.js';
 export declare const manifests: Array<ManifestUfmFilter>;

package/dist-cms/packages/ufm/manifests.js

@@ -1,4 +1,10 @@
 import { manifest as ufmContext } from './contexts/manifest.js';
+import { manifests as markedExtensions } from './extensions/manifests.js';
 import { manifests as ufmComponents } from './components/manifests.js';
 import { manifests as ufmFilters } from './filters/manifests.js';
-export const manifests = [ufmContext, ...ufmComponents, ...ufmFilters];
+export const manifests = [
+    ufmContext,
+    ...markedExtensions,
+    ...ufmComponents,
+    ...ufmFilters,
+];

package/dist-cms/packages/ufm/plugins/index.d.ts

@@ -1,2 +1,2 @@
 export { ufm } from './marked-ufm.plugin.js';
-export type { UfmPlugin, UfmToken } from './marked-ufm.plugin.js';
+export { ufmjs } from './marked-ufmjs.plugin.js';

package/dist-cms/packages/ufm/plugins/index.js

@@ -1 +1,2 @@
 export { ufm } from './marked-ufm.plugin.js';
+export { ufmjs } from './marked-ufmjs.plugin.js';

package/dist-cms/packages/ufm/plugins/marked-ufm.plugin.d.ts

@@ -1,15 +1,6 @@
-import type { MarkedExtension, Tokens } from '@umbraco-cms/backoffice/external/marked';
-export interface UfmPlugin {
-    alias: string;
-    marker?: string;
-    render?: (token: UfmToken) => string | undefined;
-}
-export interface UfmToken extends Tokens.Generic {
-    prefix: string;
-    text?: string;
-}
+import type { UfmPlugin } from './types.js';
+import type { MarkedExtension } from '@umbraco-cms/backoffice/external/marked';
 /**
- *
  * @param {Array<UfmPlugin>} plugins - An array of UFM plugins.
  * @returns {MarkedExtension} A Marked extension object.
  */

package/dist-cms/packages/ufm/plugins/marked-ufm.plugin.js

@@ -1,5 +1,4 @@
 /**
- *
  * @param {Array<UfmPlugin>} plugins - An array of UFM plugins.
  * @returns {MarkedExtension} A Marked extension object.
  */

package/dist-cms/packages/ufm/plugins/marked-ufmjs.plugin.d.ts

@@ -0,0 +1,5 @@
+import type { MarkedExtension } from '@umbraco-cms/backoffice/external/marked';
+/**
+ * @returns {MarkedExtension} A Marked extension object.
+ */
+export declare function ufmjs(): MarkedExtension;

package/dist-cms/packages/ufm/plugins/marked-ufmjs.plugin.js

@@ -0,0 +1,32 @@
+/**
+ * @returns {MarkedExtension} A Marked extension object.
+ */
+export function ufmjs() {
+    return {
+        extensions: [
+            {
+                name: 'ufmjs',
+                level: 'inline',
+                start: (src) => src.search(/(?<!\\)\$\{/),
+                tokenizer: (src) => {
+                    const pattern = /^\$\{((?:[^{}]|\{[^{}]*\})*)\}/;
+                    const regex = new RegExp(pattern);
+                    const match = src.match(regex);
+                    if (match) {
+                        const [raw, text] = match;
+                        return {
+                            type: 'ufmjs',
+                            raw: raw,
+                            tokens: [],
+                            text: text.trim(),
+                        };
+                    }
+                    return undefined;
+                },
+                renderer: (token) => {
+                    return `<umb-ufm-js-expression>${token.text}</umb-ufm-js-expression>`;
+                },
+            },
+        ],
+    };
+}

package/dist-cms/packages/ufm/plugins/types.d.ts

@@ -0,0 +1,10 @@
+import type { Tokens } from '@umbraco-cms/backoffice/external/marked';
+export interface UfmPlugin {
+    alias: string;
+    marker?: string;
+    render?: (token: UfmToken) => string | undefined;
+}
+export interface UfmToken extends Tokens.Generic {
+    prefix: string;
+    text?: string;
+}

package/dist-cms/packages/ufm/plugins/types.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/ufm/types.d.ts

@@ -1,2 +1,2 @@
-export type * from './ufm-filter.extension.js';
-export type * from './ufm-component.extension.js';
+export type * from './extensions/types.js';
+export type * from './plugins/types.js';

package/dist-cms/packages/user/current-user/conditions/group-id/group-id.condition.d.ts

@@ -3,7 +3,7 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
 import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
 export declare class UmbCurrentUserGroupCondition extends UmbConditionBase<UmbCurrentUserGroupIdConditionConfig> implements UmbExtensionCondition {
+    #private;
     constructor(host: UmbControllerHost, args: UmbConditionControllerArguments<UmbCurrentUserGroupIdConditionConfig>);
-    private observeCurrentUser;
 }
 export { UmbCurrentUserGroupCondition as api };