@umbraco-cms/backoffice 18.3.0-rc2 → 19.0.0-beta1

package/dist-cms/packages/core/tree/tree-item-api/tree-item-api-context-base.d.ts

@@ -1,7 +1,6 @@
 import type { UmbTreeItemModel } from '../types.js';
 import { UMB_TREE_CONTEXT } from '../tree.context.token.js';
 import type { UmbTreeItemApi } from './tree-item-api.interface.js';
-import type { Observable } from '../../../../external/rxjs/index.js';
 import { UmbBooleanState, UmbObjectState } from '../../../../libs/observable-api/index.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
@@ -24,17 +23,17 @@ export declare abstract class UmbTreeItemApiContextBase<TreeItemType extends Umb
     /** Exposes the tree context consumer so subclasses can call `.asPromise()` on it. */
     protected readonly _treeContextConsumer: import("../../../../libs/context-api/index.js").UmbContextConsumerController<import("../tree.context.interface.js").UmbTreeContext<UmbTreeItemModel, import("../types.js").UmbTreeRootModel, import("../index.js").UmbTreeRootItemsRequestArgs>, import("../tree.context.interface.js").UmbTreeContext<UmbTreeItemModel, import("../types.js").UmbTreeRootModel, import("../index.js").UmbTreeRootItemsRequestArgs>>;
     protected readonly _treeItem: UmbObjectState<TreeItemType | undefined>;
-    readonly treeItem: Observable<TreeItemType | undefined>;
+    readonly treeItem: import("rxjs").Observable<TreeItemType | undefined>;
     protected readonly _isSelectable: UmbBooleanState<false>;
-    readonly isSelectable: Observable<boolean>;
-    readonly isSelectableContext: Observable<boolean>;
+    readonly isSelectable: import("rxjs").Observable<boolean>;
+    readonly isSelectableContext: import("rxjs").Observable<boolean>;
     protected readonly _isSelected: UmbBooleanState<false>;
-    readonly isSelected: Observable<boolean>;
+    readonly isSelected: import("rxjs").Observable<boolean>;
     protected readonly _isActive: UmbBooleanState<false>;
-    readonly isActive: Observable<boolean>;
-    readonly hasChildren: Observable<boolean>;
-    readonly hasActiveDescendant: Observable<boolean | undefined>;
-    readonly noAccess: Observable<boolean>;
+    readonly isActive: import("rxjs").Observable<boolean>;
+    readonly hasChildren: import("rxjs").Observable<boolean>;
+    readonly hasActiveDescendant: import("rxjs").Observable<boolean | undefined>;
+    readonly noAccess: import("rxjs").Observable<boolean>;
     protected readonly _drillable: UmbBooleanState<false>;
     /**
      * Whether opening this item takes the user into it, as answered by the tree — it is a property of the tree's host,
@@ -42,17 +41,10 @@ export declare abstract class UmbTreeItemApiContextBase<TreeItemType extends Umb
      *
      * False until the tree says otherwise, so a host that cannot is never mistaken for one that can.
      */
-    readonly drillable: Observable<boolean>;
-    /**
-     * @returns {Observable<boolean>} True if any entity action is registered for this entity type
-     * @deprecated Deprecated since v17. This only tells whether a manifest exists for the entity type, it does not
-     * evaluate the conditions of the actions. Render `<umb-entity-actions-bundle>`, which resolves the actions
-     * that are actually permitted for the item. Will be removed in v19.
-     */
-    get hasActions(): Observable<boolean>;
+    readonly drillable: import("rxjs").Observable<boolean>;
     protected readonly _selectOnly: UmbBooleanState<false>;
-    readonly selectOnly: Observable<boolean>;
-    readonly path: Observable<string>;
+    readonly selectOnly: import("rxjs").Observable<boolean>;
+    readonly path: import("rxjs").Observable<string>;
     /**
      * Public accessor for the tree context. Kept public for backward compatibility.
      * @returns {typeof UMB_TREE_CONTEXT.TYPE | undefined} The tree context

package/dist-cms/packages/core/tree/tree-item-api/tree-item-api-context-base.js

@@ -1,11 +1,10 @@
 import { UMB_TREE_CONTEXT } from '../tree.context.token.js';
 import { UMB_TREE_ITEM_BASE_CONTEXT } from '../tree-item/tree-item.context.token.js';
-import { combineLatest, distinctUntilChanged, map } from '../../../../external/rxjs/index.js';
-import { umbExtensionsRegistry } from '../../extension-registry/index.js';
+import { map } from '../../../../external/rxjs/index.js';
 import { UmbBooleanState, UmbObjectState, UmbStringState } from '../../../../libs/observable-api/index.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { UMB_WORKSPACE_EDIT_PATH_PATTERN, UMB_WORKSPACE_PATH_PATTERN } from '../../workspace/index.js';
-import { debounce, UmbDeprecation } from '../../utils/index.js';
+import { debounce } from '../../utils/index.js';
 import { UmbEntityContext, UmbParentEntityContext } from '../../entity/index.js';
 import { UMB_SECTION_CONTEXT } from '../../section/index.js';
 /**
@@ -28,25 +27,6 @@ export class UmbTreeItemApiContextBase extends UmbContextBase {
     #gotTreeContext;
     #isSelectableContext;
     #hasActiveDescendant;
-    #hideTreeItemActions;
-    /**
-     * @returns {Observable<boolean>} True if any entity action is registered for this entity type
-     * @deprecated Deprecated since v17. This only tells whether a manifest exists for the entity type, it does not
-     * evaluate the conditions of the actions. Render `<umb-entity-actions-bundle>`, which resolves the actions
-     * that are actually permitted for the item. Will be removed in v19.
-     */
-    get hasActions() {
-        new UmbDeprecation({
-            deprecated: 'UmbTreeItemApiContextBase.hasActions',
-            removeInVersion: '19.0.0',
-            solution: 'Render <umb-entity-actions-bundle>, which resolves the entity actions that are permitted for the item.',
-        }).warn();
-        return combineLatest([
-            this._treeItem.asObservablePart((item) => item?.entityType),
-            umbExtensionsRegistry.byType('entityAction'),
-            this.#hideTreeItemActions.asObservable(),
-        ]).pipe(map(([entityType, actions, hide]) => !hide && !!entityType && actions.some((action) => action.forEntityTypes.includes(entityType))), distinctUntilChanged());
-    }
     #path;
     #sectionContext;
     #entityContext;
@@ -73,7 +53,6 @@ export class UmbTreeItemApiContextBase extends UmbContextBase {
         this.hasChildren = this._treeItem.asObservablePart((item) => item?.hasChildren ?? false);
         this.#hasActiveDescendant = new UmbBooleanState(undefined);
         this.hasActiveDescendant = this.#hasActiveDescendant.asObservable();
-        this.#hideTreeItemActions = new UmbBooleanState(false);
         this.noAccess = this._treeItem.asObservablePart((item) => item?.noAccess ?? false);
         this._drillable = new UmbBooleanState(false);
         /**
@@ -219,9 +198,6 @@ export class UmbTreeItemApiContextBase extends UmbContextBase {
     _onTreeContextChanged(_context) {
         this.#observeActive();
         this.#observeIsCurrentLocation();
-        if (_context.hideTreeItemActions) {
-            this.observe(_context.hideTreeItemActions, (value) => this.#hideTreeItemActions.setValue(value ?? false), '_observeHideTreeItemActions');
-        }
     }
     #observeActive() {
         if (this.unique === undefined || this.entityType === undefined)

package/dist-cms/packages/core/tree/tree-item-api/tree-item-api.interface.d.ts

@@ -20,11 +20,6 @@ export interface UmbTreeItemApi<TreeItemType extends UmbTreeItemModel = UmbTreeI
     readonly isSelected: Observable<boolean>;
     readonly isActive: Observable<boolean>;
     readonly hasChildren: Observable<boolean>;
-    /**
-     * @deprecated Deprecated since v17. Render `<umb-entity-actions-bundle>`, which resolves the entity actions that
-     * are permitted for the item, instead of asking whether any are registered for the entity type. Will be removed in v19.
-     */
-    readonly hasActions: Observable<boolean>;
     readonly noAccess: Observable<boolean>;
     readonly path: Observable<string>;
     setTreeItem(item: TreeItemType | undefined): void;

package/dist-cms/packages/core/tree/tree-item-card/default/default-tree-item-card.element.d.ts

@@ -15,7 +15,7 @@ export declare class UmbDefaultTreeItemCardElement extends UmbLitElement {
     private _hasChildren;
     private _noAccess;
     private _path;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
 }
 declare global {
     interface HTMLElementTagNameMap {

package/dist-cms/packages/core/tree/tree-menu-item/tree-menu-item.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbMenuItemTreeDefaultElement extends UmbLitElement impleme
     manifest?: ManifestMenuItemTreeKind;
     private _menuItemExpansion;
     constructor();
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
 }
 export default UmbMenuItemTreeDefaultElement;
 declare global {

package/dist-cms/packages/core/tree/view/card/card-tree-view.element.d.ts

@@ -5,7 +5,7 @@ import '../../tree-item-card/tree-item-card-extension.element.js';
 export declare class UmbCardTreeViewElement extends UmbTreeViewElementBase<UmbTreeItemModel> {
     private _items;
     protected _gotTreeContext(): void;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult;
 }
 export default UmbCardTreeViewElement;

package/dist-cms/packages/core/tree/view/classic/classic-tree-view.element.d.ts

@@ -12,7 +12,7 @@ export declare class UmbClassicTreeViewElement extends UmbTreeViewElementBase {
     private _isMenu;
     private _startNode?;
     protected _gotTreeContext(): void;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult;
 }
 export default UmbClassicTreeViewElement;

package/dist-cms/packages/core/tree/view/table/table-tree-view.element.d.ts

@@ -38,7 +38,7 @@ export declare class UmbTableTreeViewElement extends UmbTreeViewElementBase<UmbT
     protected _renderExpandSymbol(_item: UmbTreeItemModel): TemplateResult | undefined;
     willUpdate(changedProperties: PropertyValues): void;
     disconnectedCallback(): void;
-    render(): TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }
 export default UmbTableTreeViewElement;

package/dist-cms/packages/core/tree/view/table/tree-name-table-column-layout.element.d.ts

@@ -11,7 +11,7 @@ export declare class UmbTreeNameTableColumnLayoutElement extends UmbLitElement i
     column: UmbTableColumn;
     item: UmbTableItem;
     value: UmbTreeNameTableColumnValue;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }
 declare global {

package/dist-cms/packages/core/tree/workspace-view/tree-workspace-view.element.d.ts

@@ -9,7 +9,7 @@ export declare class UmbTreeWorkspaceViewElement extends UmbLitElement {
     private _interactionMemories?;
     constructor();
     protected updated(changedProperties: PropertyValues): void;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult;
 }
 export { UmbTreeWorkspaceViewElement as element };

package/dist-cms/packages/core/utils/guard-manager/guard.manager.base.d.ts

@@ -16,6 +16,10 @@ export declare abstract class UmbGuardManagerBase<RuleType extends UmbGuardRule
     readonly rules: import("rxjs").Observable<RuleType[]>;
     readonly hasRules: import("rxjs").Observable<boolean>;
     protected _fallback: import("rxjs").Observable<boolean>;
+    /**
+     * Emits whether the guard permits when no rule applies.
+     */
+    readonly fallbackPermitted: import("rxjs").Observable<boolean>;
     protected _getFallback(): boolean;
     fallbackToNotPermitted(): void;
     fallbackToPermitted(): void;

package/dist-cms/packages/core/utils/guard-manager/guard.manager.base.js

@@ -9,6 +9,10 @@ export class UmbGuardManagerBase extends UmbControllerBase {
         this.hasRules = this._rules.asObservablePart((x) => x.length > 0);
         this.#fallback = new UmbBooleanState(false);
         this._fallback = this.#fallback.asObservable();
+        /**
+         * Emits whether the guard permits when no rule applies.
+         */
+        this.fallbackPermitted = this._fallback;
     }
     #fallback;
     _getFallback() {

package/dist-cms/packages/core/utils/guard-manager/index.d.ts

@@ -1,3 +1,4 @@
 export * from './guard.manager.base.js';
 export * from './readonly-guard.manager.js';
 export * from './readonly-variant-guard.manager.js';
+export { resolveVariantGuardPermission } from './resolve-variant-guard-permission.function.js';

package/dist-cms/packages/core/utils/guard-manager/index.js

@@ -1,3 +1,4 @@
 export * from './guard.manager.base.js';
 export * from './readonly-guard.manager.js';
 export * from './readonly-variant-guard.manager.js';
+export { resolveVariantGuardPermission } from './resolve-variant-guard-permission.function.js';

package/dist-cms/packages/core/utils/guard-manager/readonly-variant-guard.manager.d.ts

@@ -1,17 +1,14 @@
 import { UmbReadOnlyGuardManager } from './readonly-guard.manager.js';
-import type { UmbGuardRule } from './guard.manager.base.js';
+import { type UmbVariantGuardRule } from './resolve-variant-guard-permission.function.js';
 import type { UmbVariantId } from '../../variant/index.js';
 import { type Observable } from '../../../../libs/observable-api/index.js';
-export interface UmbVariantGuardRule extends UmbGuardRule {
-    variantId?: UmbVariantId;
-}
+export type { UmbVariantGuardRule } from './resolve-variant-guard-permission.function.js';
 /**
  * Read only guard manager for variant rules.
  * @class UmbReadOnlyVariantGuardManager
  * @augments {UmbReadOnlyGuardManager<UmbVariantGuardRule>}
  */
 export declare class UmbReadOnlyVariantGuardManager extends UmbReadOnlyGuardManager<UmbVariantGuardRule> {
-    #private;
     /**
      * Observe if the given variantId is permitted to read
      * @param {UmbVariantId} variantId - The variantId to check
@@ -31,7 +28,7 @@ export declare class UmbReadOnlyVariantGuardManager extends UmbReadOnlyGuardMana
      * @returns {Observable<{ variantId: UmbVariantId; permitted: boolean }[]>} - Observable that emits an array of objects with a permitted boolean and the variantId
      * @memberof UmbReadOnlyVariantGuardManager
      */
-    isPermittedForObservableVariants(variantIds: Observable<UmbVariantId[]>): Observable<{
+    isPermittedForObservableVariants(variantIds: Observable<UmbVariantId[] | undefined>): Observable<{
         variantId: UmbVariantId;
         permitted: boolean;
     }[]>;

package/dist-cms/packages/core/utils/guard-manager/readonly-variant-guard.manager.js

@@ -1,14 +1,6 @@
 import { UmbReadOnlyGuardManager } from './readonly-guard.manager.js';
+import { resolveVariantGuardPermission, } from './resolve-variant-guard-permission.function.js';
 import { mergeObservables } from '../../../../libs/observable-api/index.js';
-/**
- * Checks if the given rule applies to the given variantId
- * @param {UmbVariantGuardRule} rule - The rule to check
- * @param {UmbVariantId} variantId - The variantId to check against
- * @returns {boolean} True if the rule applies to the variantId
- */
-function findRule(rule, variantId) {
-    return rule.variantId?.compare(variantId) || rule.variantId === undefined;
-}
 /**
  * Read only guard manager for variant rules.
  * @class UmbReadOnlyVariantGuardManager
@@ -24,7 +16,7 @@ export class UmbReadOnlyVariantGuardManager extends UmbReadOnlyGuardManager {
     isPermittedForVariant(variantId) {
         return mergeObservables([
             this._rules.asObservablePart((rules) => {
-                return this.#resolvePermission(rules, variantId);
+                return resolveVariantGuardPermission(rules, variantId);
             }),
             this._fallback,
         ], ([permitted, fallback]) => permitted ?? fallback);
@@ -39,7 +31,7 @@ export class UmbReadOnlyVariantGuardManager extends UmbReadOnlyGuardManager {
             if (!variantId) {
                 return undefined;
             }
-            return this.#resolvePermission(rules, variantId) ?? fallback;
+            return resolveVariantGuardPermission(rules, variantId) ?? fallback;
         });
     }
     /**
@@ -53,7 +45,10 @@ export class UmbReadOnlyVariantGuardManager extends UmbReadOnlyGuardManager {
             if (!variantIds || variantIds.length === 0) {
                 return [];
             }
-            return variantIds.map((id) => ({ variantId: id, permitted: this.#resolvePermission(rules, id) ?? fallback }));
+            return variantIds.map((id) => ({
+                variantId: id,
+                permitted: resolveVariantGuardPermission(rules, id) ?? fallback,
+            }));
         });
     }
     /**
@@ -63,15 +58,6 @@ export class UmbReadOnlyVariantGuardManager extends UmbReadOnlyGuardManager {
      * @memberof UmbReadOnlyVariantGuardManager
      */
     getIsPermittedForVariant(variantId) {
-        return this.#resolvePermission(this.getRules(), variantId) ?? this._getFallback();
-    }
-    #resolvePermission(rules, variantId) {
-        if (rules.filter((x) => x.permitted === false).some((rule) => findRule(rule, variantId))) {
-            return false;
-        }
-        if (rules.filter((x) => x.permitted === true).some((rule) => findRule(rule, variantId))) {
-            return true;
-        }
-        return undefined;
+        return resolveVariantGuardPermission(this.getRules(), variantId) ?? this._getFallback();
     }
 }

package/dist-cms/packages/core/utils/guard-manager/resolve-variant-guard-permission.function.d.ts

@@ -0,0 +1,12 @@
+import type { UmbGuardRule } from './guard.manager.base.js';
+import type { UmbVariantId } from '../../variant/index.js';
+export interface UmbVariantGuardRule extends UmbGuardRule {
+    variantId?: UmbVariantId;
+}
+/**
+ * Resolves the permission of a variantId from a set of variant rules. Rules that are not permitted take precedence.
+ * @param {UmbVariantGuardRule[]} rules - The rules to resolve from
+ * @param {UmbVariantId} variantId - The variantId to resolve the permission for
+ * @returns {boolean | undefined} The resolved permission, or undefined if no rule applies to the variantId
+ */
+export declare function resolveVariantGuardPermission(rules: Array<UmbVariantGuardRule>, variantId: UmbVariantId): boolean | undefined;

package/dist-cms/packages/core/utils/guard-manager/resolve-variant-guard-permission.function.js

@@ -0,0 +1,24 @@
+/**
+ * Checks if the given rule applies to the given variantId
+ * @param {UmbVariantGuardRule} rule - The rule to check
+ * @param {UmbVariantId} variantId - The variantId to check against
+ * @returns {boolean} True if the rule applies to the variantId
+ */
+function findRule(rule, variantId) {
+    return rule.variantId?.compare(variantId) || rule.variantId === undefined;
+}
+/**
+ * Resolves the permission of a variantId from a set of variant rules. Rules that are not permitted take precedence.
+ * @param {UmbVariantGuardRule[]} rules - The rules to resolve from
+ * @param {UmbVariantId} variantId - The variantId to resolve the permission for
+ * @returns {boolean | undefined} The resolved permission, or undefined if no rule applies to the variantId
+ */
+export function resolveVariantGuardPermission(rules, variantId) {
+    if (rules.filter((x) => x.permitted === false).some((rule) => findRule(rule, variantId))) {
+        return false;
+    }
+    if (rules.filter((x) => x.permitted === true).some((rule) => findRule(rule, variantId))) {
+        return true;
+    }
+    return undefined;
+}

package/dist-cms/packages/core/validation/components/form-validation-message.element.js

@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbValidationInvalidEvent, UmbValidationValidEvent } from '../events/index.js';
 import { css, customElement, html, property, repeat, unsafeHTML } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../lit-element/index.js';
+import { sanitizeHTML } from '../../utils/index.js';
 /**
  * @description - Component for displaying one or more validation messages from UMB/UUI Form Control within the given scope.
  * Notice: Only supports components that is build on the UMB / UUI FormControlMixing.
@@ -76,7 +77,7 @@ let UmbFormValidationMessageElement = class UmbFormValidationMessageElement exte
         return html `
 			<slot></slot>
 			<div id="messages">
-				${repeat(this._messages, (item) => html `<div>${unsafeHTML(item[1])}</div>`)}
+				${repeat(this._messages, (item) => html `<div>${unsafeHTML(sanitizeHTML(item[1]))}</div>`)}
 				<slot name="message"></slot>
 			</div>
 		`;

package/dist-cms/packages/core/validation/const.d.ts

@@ -1,2 +1,3 @@
 export declare const UMB_VALIDATION_EMPTY_LOCALIZATION_KEY = "#validation_invalidEmpty";
+export declare const UMB_VALIDATION_MISSING_LOCALIZATION_KEY = "#validation_invalidNull";
 export declare const UMB_VALIDATION_FALSE_LOCALIZATION_KEY = "#validation_invalidFalse";

package/dist-cms/packages/core/validation/const.js

@@ -1,2 +1,3 @@
 export const UMB_VALIDATION_EMPTY_LOCALIZATION_KEY = '#validation_invalidEmpty';
+export const UMB_VALIDATION_MISSING_LOCALIZATION_KEY = '#validation_invalidNull';
 export const UMB_VALIDATION_FALSE_LOCALIZATION_KEY = '#validation_invalidFalse';

package/dist-cms/packages/core/validation/context/server-model-validator.context.js

@@ -1,8 +1,18 @@
 import { UmbValidationPathTranslationController } from '../controllers/validation-path-translation/index.js';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UMB_VALIDATION_MISSING_LOCALIZATION_KEY } from '../const.js';
 import { UMB_VALIDATION_CONTEXT } from './validation.context-token.js';
 import { UMB_SERVER_MODEL_VALIDATOR_CONTEXT } from './server-model-validator.context-token.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { UmbId } from '../../id/index.js';
+/**
+ * The server reports a value that is missing separately from one that is present but empty. That distinction is
+ * meaningful over the API, but not when the message is presented, so both map to the same message.
+ * @param {string} body - the message as returned by the server.
+ * @returns {string} the message to present.
+ */
+function convertMissingToEmpty(body) {
+    return body === UMB_VALIDATION_MISSING_LOCALIZATION_KEY ? UMB_VALIDATION_EMPTY_LOCALIZATION_KEY : body;
+}
 export class UmbServerModelValidatorContext extends UmbContextBase {
     #pathTranslators = [];
     #validatePromise;
@@ -73,7 +83,7 @@ export class UmbServerModelValidatorContext extends UmbContextBase {
                     if (path.endsWith('.Value')) {
                         path = path.slice(0, -6) + '.value';
                     }
-                    newBodies.forEach((body) => messages.push({ type: 'server', key: UmbId.new(), path, body }));
+                    newBodies.forEach((body) => messages.push({ type: 'server', key: UmbId.new(), path, body: convertMissingToEmpty(body) }));
                     //this.#context!.messages.addMessages('server', path, errorBody.errors[path]);
                 });
             }

package/dist-cms/packages/core/validation/utils/index.d.ts

@@ -3,6 +3,7 @@ export * from './data-path-variant-query.function.js';
 export * from './extract-first-json-query-containing.function.js';
 export * from './extract-json-query-properties.function.js';
 export * from './first-json-path-bracket.function.js';
+export * from './is-above-zero-and-below-minimum.function.js';
 export * from './json-path.function.js';
 export * from './scope-mapper-json-paths.function.js';
 export * from './query-mapper-json-paths.function.js';

package/dist-cms/packages/core/validation/utils/index.js

@@ -3,6 +3,7 @@ export * from './data-path-variant-query.function.js';
 export * from './extract-first-json-query-containing.function.js';
 export * from './extract-json-query-properties.function.js';
 export * from './first-json-path-bracket.function.js';
+export * from './is-above-zero-and-below-minimum.function.js';
 export * from './json-path.function.js';
 export * from './scope-mapper-json-paths.function.js';
 export * from './query-mapper-json-paths.function.js';

package/dist-cms/packages/core/validation/utils/is-above-zero-and-below-minimum.function.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Determines whether a count is above zero and below the configured minimum.
+ * @param {number} count - the number of items held.
+ * @param {number | undefined} min - the configured minimum, where undefined or zero means no minimum.
+ * @returns {boolean} true when the count is above zero and below the minimum.
+ */
+export declare function isAboveZeroAndBelowMinimum(count: number, min: number | undefined): boolean;

package/dist-cms/packages/core/validation/utils/is-above-zero-and-below-minimum.function.js

@@ -0,0 +1,9 @@
+/**
+ * Determines whether a count is above zero and below the configured minimum.
+ * @param {number} count - the number of items held.
+ * @param {number | undefined} min - the configured minimum, where undefined or zero means no minimum.
+ * @returns {boolean} true when the count is above zero and below the minimum.
+ */
+export function isAboveZeroAndBelowMinimum(count, min) {
+    return !!min && count > 0 && count < min;
+}

package/dist-cms/packages/core/value-summary/global-components/value-summary.element.d.ts

@@ -5,7 +5,7 @@ export declare class UmbValueSummaryExtensionElement extends UmbLitElement {
     set valueType(value: string | undefined);
     get valueType(): string | undefined;
     value?: unknown;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
 }
 export { UmbValueSummaryExtensionElement as element };
 declare global {

package/dist-cms/packages/core/value-summary/value-types/boolean/boolean-value-summary.element.d.ts

@@ -1,7 +1,7 @@
 import { UmbValueSummaryElementBase } from '../../base/value-summary-element.base.js';
 import { nothing } from '../../../../../external/lit/index.js';
 export declare class UmbBooleanValueSummaryElement extends UmbValueSummaryElementBase<boolean> {
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
 }
 export { UmbBooleanValueSummaryElement as element };
 declare global {

package/dist-cms/packages/core/variant/index.d.ts

@@ -1,7 +1,6 @@
 export * from './constants.js';
+export * from './utils/index.js';
 export * from './context/index.js';
-export * from './sort-variants.function.js';
 export * from './variant-id.class.js';
-export * from './variant-object-compare.function.js';
 export * from './variant-resolver.js';
 export type * from './types.js';

package/dist-cms/packages/core/variant/index.js

@@ -1,6 +1,5 @@
 export * from './constants.js';
+export * from './utils/index.js';
 export * from './context/index.js';
-export * from './sort-variants.function.js';
 export * from './variant-id.class.js';
-export * from './variant-object-compare.function.js';
 export * from './variant-resolver.js';

package/dist-cms/packages/core/variant/types.d.ts

@@ -3,20 +3,22 @@ import type { UmbLanguageDetailModel } from '../../language/index.js';
 import type { ScheduleRequestModel } from '../backend-api/index.js';
 import type { UmbPropertyValueData } from '../property/index.js';
 import type { UmbEntityFlag } from '../entity-flag/index.js';
+/**
+ * Generic model for an object that has variant properties (culture and segment).
+ */
 export type UmbObjectWithVariantProperties = {
     culture: string | null;
     segment: string | null;
 };
+export interface UmbVariantPropertyValueModel extends UmbObjectWithVariantProperties, UmbPropertyValueData {
+}
+/** Model for Data of a Variant Entry (culture only)*/
 export interface UmbVariantDataModel {
     culture: string | null;
-    segment: string | null;
-}
-export interface UmbVariantPropertyValueModel extends UmbVariantDataModel, UmbPropertyValueData {
 }
 export interface UmbEntityVariantModel {
     name: string;
     culture: string | null;
-    segment: string | null;
     createDate: string | null;
     updateDate: string | null;
     state?: string | null;
@@ -31,7 +33,6 @@ export interface UmbEntityVariantOptionModel<VariantType extends UmbEntityVarian
     segmentInfo?: {
         alias: string;
         name: string;
-        cultures?: string[] | null;
     };
     /**
      * The unique identifier is a VariantId string.
@@ -40,6 +41,10 @@ export interface UmbEntityVariantOptionModel<VariantType extends UmbEntityVarian
     culture: string | null;
     segment: string | null;
 }
+/**
+ * A variant option as it is supplied to a workspace, before its language has been resolved from the culture.
+ */
+export type UmbEntityVariantOptionSourceModel<VariantOptionType extends UmbEntityVariantOptionModel = UmbEntityVariantOptionModel> = Omit<VariantOptionType, 'language'>;
 /** @deprecated use `UmbEntityVariantOptionModel` instead */
 export interface UmbVariantOptionModel<VariantType extends UmbEntityVariantModel = UmbEntityVariantModel> extends UmbEntityVariantOptionModel<VariantType> {
 }

package/dist-cms/packages/core/variant/utils/expand-variant-ids-with-segment-options.function.d.ts

@@ -0,0 +1,11 @@
+import { UmbVariantId } from '../variant-id.class.js';
+import type { UmbEntityVariantOptionModel } from '../types.js';
+/**
+ * Expands a variant id selection so that every selected culture (including the invariant
+ * culture) is represented by all of its available segment variants. A variant id that already
+ * targets a specific segment is kept as-is.
+ * @param {Array<UmbVariantId>} variantIds - The selected variant ids to expand.
+ * @param {Array<UmbEntityVariantOptionModel>} variantOptions - The available variant options to expand against.
+ * @returns {Array<UmbVariantId>} The expanded variant ids.
+ */
+export declare function umbExpandVariantIdsWithSegmentOptions(variantIds: Array<UmbVariantId>, variantOptions: Array<UmbEntityVariantOptionModel> | undefined): Array<UmbVariantId>;

package/dist-cms/packages/core/variant/utils/expand-variant-ids-with-segment-options.function.js

@@ -0,0 +1,19 @@
+import { UmbVariantId } from '../variant-id.class.js';
+/**
+ * Expands a variant id selection so that every selected culture (including the invariant
+ * culture) is represented by all of its available segment variants. A variant id that already
+ * targets a specific segment is kept as-is.
+ * @param {Array<UmbVariantId>} variantIds - The selected variant ids to expand.
+ * @param {Array<UmbEntityVariantOptionModel>} variantOptions - The available variant options to expand against.
+ * @returns {Array<UmbVariantId>} The expanded variant ids.
+ */
+export function umbExpandVariantIdsWithSegmentOptions(variantIds, variantOptions) {
+    return variantIds.flatMap((variantId) => {
+        if (variantId.segment !== null)
+            return [variantId];
+        const segmentOptions = variantOptions
+            ?.filter((option) => option.culture === variantId.culture)
+            .map((option) => UmbVariantId.Create(option)) ?? [];
+        return segmentOptions.length > 0 ? segmentOptions : [variantId];
+    });
+}

package/dist-cms/packages/core/variant/utils/index.d.ts

@@ -0,0 +1,5 @@
+export * from './expand-variant-ids-with-segment-options.function.js';
+export * from './sort-variants.function.js';
+export * from './variant-ids-to-cultures.function.js';
+export * from './variant-object-compare.function.js';
+export * from './variant-object-sort-compare.function.js';

package/dist-cms/packages/core/variant/utils/index.js

@@ -0,0 +1,5 @@
+export * from './expand-variant-ids-with-segment-options.function.js';
+export * from './sort-variants.function.js';
+export * from './variant-ids-to-cultures.function.js';
+export * from './variant-object-compare.function.js';
+export * from './variant-object-sort-compare.function.js';

package/dist-cms/packages/core/variant/{sort-variants.function.d.ts → utils/sort-variants.function.d.ts}

@@ -1,4 +1,4 @@
-import type { UmbEntityVariantOptionModel } from './types.js';
+import type { UmbEntityVariantOptionModel } from '../types.js';
 /**
  * Sorts entity variants in priority order:
  * 1. Default language first

package/dist-cms/packages/core/variant/{sort-variants.function.js → utils/sort-variants.function.js}

@@ -1,4 +1,4 @@
-import { UmbPublishableVariantState } from './constants.js';
+import { UmbPublishableVariantState } from '../constants.js';
 const variantStatesOrder = {
     [UmbPublishableVariantState.PUBLISHED_PENDING_CHANGES]: 1,
     [UmbPublishableVariantState.PUBLISHED]: 1,

package/dist-cms/packages/core/variant/utils/variant-ids-to-cultures.function.d.ts

@@ -0,0 +1,8 @@
+import type { UmbVariantId } from '../variant-id.class.js';
+/**
+ * Maps variant ids to their distinct cultures. Missing variant ids are skipped, so the result never contains `undefined`.
+ * The invariant culture is represented as `null` and is kept in the result; filter it out locally where it is not wanted.
+ * @param {Array<UmbVariantId | undefined>} variantIds - The variant ids to map.
+ * @returns {Array<string | null>} The distinct cultures, in order of first occurrence.
+ */
+export declare function umbVariantIdsToCultures(variantIds: Array<UmbVariantId | undefined>): Array<string | null>;