@umbraco-cms/backoffice 15.3.1 → 15.4.0-rc

package/dist-cms/json-schema/umbraco-package-schema.d.ts

@@ -1,4 +1,4 @@
-import './all-packages.js';
+import '../packages/core/extension-registry/index.js';
 /**
  * Umbraco package manifest JSON
  */
@@ -22,6 +22,12 @@ export interface UmbracoPackage {
      * @default true
      */
     allowTelemetry?: boolean;
+    /**
+     * @title Decides if the package sends telemetry data for collection
+     * @default true
+     * @deprecated Use allowTelemetry instead
+     */
+    allowPackageTelemetry?: boolean;
     /**
      * @title Decides if the package is allowed to be accessed by the public, e.g. on the login screen
      * @default false

package/dist-cms/json-schema/umbraco-package-schema.js

@@ -1 +1 @@
-import './all-packages.js';
+import '../packages/core/extension-registry/index.js';

package/dist-cms/libs/context-api/provide/context-provider.js

@@ -84,7 +84,7 @@ export class UmbContextProvider {
         // Note we are not removing the event listener in the hostDisconnected, therefor we do it here [NL].
         this.#eventTarget?.removeEventListener(UMB_CONTEXT_REQUEST_EVENT_TYPE, this.#handleContextRequest);
         this.#eventTarget?.removeEventListener(UMB_DEBUG_CONTEXT_EVENT_TYPE, this.#handleDebugContextRequest);
-        // We do not want to call a destroy method on the instance, because maybe it should be re-provided later on. [NL]
+        // We do not want to call a destroy method on the instance, cause maybe it should be re-provided later on. [NL]
         this.#instance = undefined;
         this.#eventTarget = undefined;
     }

package/dist-cms/libs/extension-api/registry/extension.registry.d.ts

@@ -9,33 +9,40 @@ export declare class UmbExtensionRegistry<IncomingManifestTypes extends Manifest
     private _kinds;
     readonly kinds: Observable<ManifestKind<ManifestTypes>[]>;
     defineKind(kind: ManifestKind<ManifestTypes>): void;
+    /**
+     * Exclude an extension from being available.
+     * Notice if you are looking to replace, then you can achieve such via the `overwrites` property in the manifest.
+     * @param {string} alias - The alias of the extension to exclude.
+     */
     exclude(alias: string): void;
     /**
      * Register an extension.
-     * @param {(ManifestTypes | ManifestKind<ManifestTypes>)} manifest - The extension to register.
+     * @param {(ManifestBase | ManifestKind<ManifestBase>)} manifest - The extension to register.
      * @memberof UmbExtensionRegistry
      */
     register(manifest: ManifestTypes | ManifestKind<ManifestTypes>): void;
     /**
      * Get all registered extensions.
-     * @returns {Array<ManifestTypes>} - All registered extensions.
+     * @returns {Array<ManifestBase>} - All registered extensions.
      * @memberof UmbExtensionRegistry
      */
     getAllExtensions(): Array<ManifestTypes>;
     /**
      * Register many extensions.
-     * @param {(Array<ManifestTypes | ManifestKind<ManifestTypes>>)} manifests - The extensions to register.
+     * @param {(Array<ManifestBase | ManifestKind<ManifestBase>>)} manifests - The extensions to register.
      * @memberof UmbExtensionRegistry
      */
     registerMany(manifests: Array<ManifestTypes | ManifestKind<ManifestTypes>>): void;
     /**
      * Unregister many extensions with the given aliases.
+     * Notice it is more secure to exclude it, only unregister extensions that you provided.
      * @param {Array<string>} aliases - The aliases of the extensions to unregister.
      * @memberof UmbExtensionRegistry
      */
     unregisterMany(aliases: Array<string>): void;
     /**
      * Unregister an extension with the given alias.
+     * Notice it is more secure to exclude it, only unregister extensions that you provided.
      * @param {string} alias - The alias of the extension to unregister.
      * @memberof UmbExtensionRegistry
      */
@@ -54,53 +61,73 @@ export declare class UmbExtensionRegistry<IncomingManifestTypes extends Manifest
     clear(): void;
     /**
      * Get an observable that provides an extension matching the given alias.
-     * @param alias {string} - The alias of the extension to get.
-     * @returns {Observable<T | undefined>} - An observable of the extension that matches the alias.
+     * @param {string} alias - The alias of the extension to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extension that matches the alias.
      */
     byAlias<T extends ManifestBase = ManifestBase>(alias: string): Observable<T | undefined>;
     /**
      * Get an extension that matches the given alias, this will not return an observable, it is a one of retrieval if it exists at the given point in time.
-     * @param alias {string} - The alias of the extension to get.
-     * @returns {<T | undefined>} - The extension manifest that matches the alias.
+     * @param {string} alias - The alias of the extension to get.
+     * @returns {ManifestBase | undefined} - The extension manifest that matches the alias.
      */
     getByAlias<T extends ManifestBase = ManifestBase>(alias: string): T | undefined;
     /**
      * Get an observable that provides extensions matching the given type and alias.
-     * @param type {string} - The type of the extensions to get.
-     * @param alias {string} - The alias of the extensions to get.
-     * @returns {Observable<T | undefined>} - An observable of the extensions that matches the type and alias.
+     * @param {string} type - The type of the extensions to get.
+     * @param {string} alias - The alias of the extensions to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extensions that matches the type and alias.
      */
     byTypeAndAlias<Key extends string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, alias: string): Observable<T | undefined>;
+    /**
+     * Get an observable that provides extensions matching the given type and alias.
+     * @param {string} type - The type of the extensions to get.
+     * @param {Array<string>} aliases - The aliases of the extensions to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extensions that matches the type and one of the aliases.
+     */
     byTypeAndAliases<Key extends string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, aliases: Array<string>): Observable<Array<T>>;
     /**
      * Get an observable of extensions by type and a given filter method.
      * This will return the all extensions that matches the type and which filter method returns true.
      * The filter method will be called for each extension manifest of the given type, and the first argument to it is the extension manifest.
-     * @param type {string} - The type of the extension to get
-     * @param filter {(ext: T): void} - The filter method to use to filter the extensions
-     * @returns {Observable<Array<T>>} - An observable of the extensions that matches the type and filter method
+     * @param {string} type - The type of the extension to get.
+     * @param {(ext: ManifestBase) => boolean} filter - The filter method to use to filter the extensions.
+     * @returns {Observable<Array<ManifestBase>>} - An observable of the extensions that matches the type and filter method.
      */
     byTypeAndFilter<Key extends string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, filter: (ext: T) => boolean): Observable<Array<T>>;
+    /**
+     * Get an extensions by type and a given filter method.
+     * This will return the all extensions that matches the type and which filter method returns true.
+     * The filter method will be called for each extension manifest of the given type, and the first argument to it is the extension manifest.
+     * @param {string} type - The type of the extension to get.
+     * @param {(ext: ManifestBase) => boolean} filter - The filter method to use to filter the extensions.
+     * @returns {Observable<Array<ManifestBase>>} - An observable of the extensions that matches the type and filter method.
+     */
     getByTypeAndFilter<Key extends string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, filter: (ext: T) => boolean): Array<T>;
     /**
      * Get an observable of extensions by types and a given filter method.
      * This will return the all extensions that matches the types and which filter method returns true.
      * The filter method will be called for each extension manifest of the given types, and the first argument to it is the extension manifest.
-     * @param types {Array<string>} - The types of the extensions to get.
-     * @param filter {(ext: T): void} - The filter method to use to filter the extensions
-     * @returns {Observable<Array<T>>} - An observable of the extensions that matches the type and filter method
+     * @param {Array<string>} types - The types of the extensions to get.
+     * @param {(ext: ManifestBase) => boolean} filter - The filter method to use to filter the extensions
+     * @returns {Observable<Array<ManifestBase>>} - An observable of the extensions that matches the type and filter method
      */
     byTypesAndFilter<ExtensionTypes extends ManifestBase = ManifestBase>(types: string[], filter: (ext: ExtensionTypes) => boolean): Observable<Array<ExtensionTypes>>;
     /**
      * Get an observable that provides extensions matching the given type.
-     * @param type {string} - The type of the extensions to get.
-     * @returns {Observable<T | undefined>} - An observable of the extensions that matches the type.
+     * @param {string} type - The type of the extensions to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extensions that matches the type.
      */
     byType<Key extends string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key): Observable<Array<T>>;
+    /**
+     * Get all extensions that matches the given extension type.
+     * @param {string} type  - The type of the extension to get.
+     * @returns {ManifestBase | undefined} - The extension manifest that matches the alias.
+     */
+    getByType<Key extends string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key): Array<T>;
     /**
      * Get an observable that provides extensions matching given types.
-     * @param types {Array<string>} - The types of the extensions to get.
-     * @returns {Observable<T | undefined>} - An observable of the extensions that matches the types.
+     * @param {Array<string>} types - The types of the extensions to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extensions that matches the types.
      */
     byTypes<ExtensionTypes extends ManifestBase = ManifestBase>(types: string[]): Observable<Array<ExtensionTypes>>;
     /**

package/dist-cms/libs/extension-api/registry/extension.registry.js

@@ -2,30 +2,39 @@ import { UmbBasicState } from '../../observable-api/index.js';
 import { map, distinctUntilChanged, combineLatest, of, switchMap } from '../../../external/rxjs/index.js';
 /**
  *
- * @param previousValue {Array<ManifestBase>} - previous value
- * @param currentValue {Array<ManifestBase>} - current value
+ * @param {Array<ManifestBase>} previousValues - previous value
+ * @param {Array<ManifestBase>} currentValues - current value
  * @returns {boolean} - true if value is assumed to be the same as previous value.
  */
-function extensionArrayMemoization(previousValue, currentValue) {
+function extensionArrayMemoization(previousValues, currentValues) {
     // If length is different, data is different:
-    if (previousValue.length !== currentValue.length) {
+    if (previousValues.length !== currentValues.length) {
         return false;
     }
-    // previousValue has an alias that is not present in currentValue:
-    if (previousValue.find((p) => !currentValue.find((c) => c.alias === p.alias))) {
+    // is there some properties that differs?:
+    if (previousValues.some((p) => {
+        const n = currentValues.find((c) => c.alias === p.alias);
+        if (!n) {
+            return true;
+        }
+        if (p.conditions?.length !== n.conditions?.length) {
+            return true;
+        }
+        return !(p === n);
+    })) {
         return false;
     }
     return true;
 }
 /**
  *
- * @param previousValue {Array<ManifestBase>} - previous value
- * @param currentValue {Array<ManifestBase>} - current value
+ * @param {Array<ManifestBase>} previousValues - previous value
+ * @param {Array<ManifestBase>} currentValues - current value
  * @returns {boolean} - true if value is assumed to be the same as previous value.
  */
-function extensionAndKindMatchArrayMemoization(previousValue, currentValue) {
+function extensionAndKindMatchArrayMemoization(previousValues, currentValues) {
     // If length is different, data is different:
-    if (previousValue.length !== currentValue.length) {
+    if (previousValues.length !== currentValues.length) {
         return false;
     }
     // previousValue has an alias that is not present in currentValue:
@@ -34,11 +43,15 @@ function extensionAndKindMatchArrayMemoization(previousValue, currentValue) {
         return false;
     }*/
     // if previousValue has different meta values:
-    if (currentValue.find((newValue) => {
-        const oldValue = previousValue.find((c) => c.alias === newValue.alias);
+    if (currentValues.some((currentValue) => {
+        const previousValue = previousValues.find((c) => c.alias === currentValue.alias);
         // First check if we found a previous value, matching this alias.
         // Then checking __isMatchedWithKind, as this is much more performant than checking the whole object. (I assume the only change happening to an extension is the match with a kind, we do not want to watch for other changes)
-        return oldValue === undefined || newValue.__isMatchedWithKind !== oldValue.__isMatchedWithKind;
+        return (previousValue === undefined ||
+            previousValue !== currentValue ||
+            previousValue.alias !== currentValue.alias ||
+            previousValue.__isMatchedWithKind !== currentValue.__isMatchedWithKind ||
+            previousValue.conditions?.length !== currentValue.conditions?.length);
     })) {
         return false;
     }
@@ -46,28 +59,28 @@ function extensionAndKindMatchArrayMemoization(previousValue, currentValue) {
 }
 /**
  *
- * @param previousValue {Array<ManifestBase>} - previous value
- * @param currentValue {Array<ManifestBase>} - current value
+ * @param {Array<ManifestBase>} previousValue - previous value
+ * @param {Array<ManifestBase>} currentValue - current value
  * @returns {boolean} - true if value is assumed to be the same as previous value.
  */
 function extensionSingleMemoization(previousValue, currentValue) {
-    if (previousValue && currentValue) {
-        return previousValue.alias === currentValue.alias;
-    }
-    return previousValue === currentValue;
+    return !(previousValue === undefined ||
+        previousValue !== currentValue ||
+        previousValue.alias !== currentValue.alias ||
+        previousValue.conditions?.length !== currentValue.conditions?.length);
 }
 /**
  *
- * @param previousValue {Array<ManifestBase>} - previous value
- * @param currentValue {Array<ManifestBase>} - current value
+ * @param {Array<ManifestBase>} previousValue - previous value
+ * @param {Array<ManifestBase>} currentValue - current value
  * @returns {boolean} - true if value is assumed to be the same as previous value.
  */
 function extensionAndKindMatchSingleMemoization(previousValue, currentValue) {
-    if (previousValue && currentValue) {
-        return (previousValue.alias === currentValue.alias &&
-            previousValue.__isMatchedWithKind === currentValue.__isMatchedWithKind);
-    }
-    return previousValue === currentValue;
+    return !(previousValue === undefined ||
+        previousValue !== currentValue ||
+        previousValue.alias !== currentValue.alias ||
+        previousValue.__isMatchedWithKind !== currentValue.__isMatchedWithKind ||
+        previousValue.conditions?.length !== currentValue.conditions?.length);
 }
 const sortExtensions = (a, b) => (b.weight || 0) - (a.weight || 0);
 export class UmbExtensionRegistry {
@@ -88,6 +101,7 @@ export class UmbExtensionRegistry {
     #appendAdditionalConditions(manifest) {
         const newConditions = this.#additionalConditions.get(manifest.alias);
         if (newConditions) {
+            manifest = { ...manifest };
             // Append the condition to the extensions conditions array
             if (manifest.conditions) {
                 for (const condition of newConditions) {
@@ -115,6 +129,11 @@ export class UmbExtensionRegistry {
         nextData.push(kind);
         this._kinds.setValue(nextData);
     }
+    /**
+     * Exclude an extension from being available.
+     * Notice if you are looking to replace, then you can achieve such via the `overwrites` property in the manifest.
+     * @param {string} alias - The alias of the extension to exclude.
+     */
     exclude(alias) {
         this.#exclusions.push(alias);
         this._extensions.setValue(this._extensions.getValue().filter(this.#acceptExtension));
@@ -122,7 +141,7 @@ export class UmbExtensionRegistry {
     #acceptExtension;
     /**
      * Register an extension.
-     * @param {(ManifestTypes | ManifestKind<ManifestTypes>)} manifest - The extension to register.
+     * @param {(ManifestBase | ManifestKind<ManifestBase>)} manifest - The extension to register.
      * @memberof UmbExtensionRegistry
      */
     register(manifest) {
@@ -145,7 +164,7 @@ export class UmbExtensionRegistry {
     }
     /**
      * Get all registered extensions.
-     * @returns {Array<ManifestTypes>} - All registered extensions.
+     * @returns {Array<ManifestBase>} - All registered extensions.
      * @memberof UmbExtensionRegistry
      */
     getAllExtensions() {
@@ -153,7 +172,7 @@ export class UmbExtensionRegistry {
     }
     /**
      * Register many extensions.
-     * @param {(Array<ManifestTypes | ManifestKind<ManifestTypes>>)} manifests - The extensions to register.
+     * @param {(Array<ManifestBase | ManifestKind<ManifestBase>>)} manifests - The extensions to register.
      * @memberof UmbExtensionRegistry
      */
     registerMany(manifests) {
@@ -162,6 +181,7 @@ export class UmbExtensionRegistry {
     }
     /**
      * Unregister many extensions with the given aliases.
+     * Notice it is more secure to exclude it, only unregister extensions that you provided.
      * @param {Array<string>} aliases - The aliases of the extensions to unregister.
      * @memberof UmbExtensionRegistry
      */
@@ -170,6 +190,7 @@ export class UmbExtensionRegistry {
     }
     /**
      * Unregister an extension with the given alias.
+     * Notice it is more secure to exclude it, only unregister extensions that you provided.
      * @param {string} alias - The alias of the extension to unregister.
      * @memberof UmbExtensionRegistry
      */
@@ -234,7 +255,6 @@ export class UmbExtensionRegistry {
     #kindsOfTypes(types) {
         return this.kinds.pipe(map((kinds) => kinds.filter((kind) => types.indexOf(kind.matchType) !== -1)), distinctUntilChanged(extensionArrayMemoization));
     }
-    // TODO: can we get rid of as unknown here
     #extensionsOfTypes(types) {
         return this.extensions.pipe(map((exts) => exts.filter((ext) => types.indexOf(ext.type) !== -1)), distinctUntilChanged(extensionArrayMemoization));
     }
@@ -272,8 +292,8 @@ export class UmbExtensionRegistry {
     }
     /**
      * Get an observable that provides an extension matching the given alias.
-     * @param alias {string} - The alias of the extension to get.
-     * @returns {Observable<T | undefined>} - An observable of the extension that matches the alias.
+     * @param {string} alias - The alias of the extension to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extension that matches the alias.
      */
     byAlias(alias) {
         return this.extensions.pipe(map((exts) => exts.find((ext) => ext.alias === alias)), distinctUntilChanged(extensionSingleMemoization), switchMap((ext) => {
@@ -285,8 +305,8 @@ export class UmbExtensionRegistry {
     }
     /**
      * Get an extension that matches the given alias, this will not return an observable, it is a one of retrieval if it exists at the given point in time.
-     * @param alias {string} - The alias of the extension to get.
-     * @returns {<T | undefined>} - The extension manifest that matches the alias.
+     * @param {string} alias - The alias of the extension to get.
+     * @returns {ManifestBase | undefined} - The extension manifest that matches the alias.
      */
     getByAlias(alias) {
         const ext = this._extensions.getValue().find((ext) => ext.alias === alias);
@@ -297,9 +317,9 @@ export class UmbExtensionRegistry {
     }
     /**
      * Get an observable that provides extensions matching the given type and alias.
-     * @param type {string} - The type of the extensions to get.
-     * @param alias {string} - The alias of the extensions to get.
-     * @returns {Observable<T | undefined>} - An observable of the extensions that matches the type and alias.
+     * @param {string} type - The type of the extensions to get.
+     * @param {string} alias - The alias of the extensions to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extensions that matches the type and alias.
      */
     byTypeAndAlias(type, alias) {
         return combineLatest([
@@ -307,6 +327,12 @@ export class UmbExtensionRegistry {
             this.#kindsOfType(type),
         ]).pipe(map(this.#mergeExtensionWithKinds), distinctUntilChanged(extensionAndKindMatchSingleMemoization));
     }
+    /**
+     * Get an observable that provides extensions matching the given type and alias.
+     * @param {string} type - The type of the extensions to get.
+     * @param {Array<string>} aliases - The aliases of the extensions to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extensions that matches the type and one of the aliases.
+     */
     byTypeAndAliases(type, aliases) {
         return combineLatest([
             this.extensions.pipe(map((exts) => exts.filter((ext) => ext.type === type && aliases.indexOf(ext.alias) !== -1)), distinctUntilChanged(extensionArrayMemoization)),
@@ -317,9 +343,9 @@ export class UmbExtensionRegistry {
      * Get an observable of extensions by type and a given filter method.
      * This will return the all extensions that matches the type and which filter method returns true.
      * The filter method will be called for each extension manifest of the given type, and the first argument to it is the extension manifest.
-     * @param type {string} - The type of the extension to get
-     * @param filter {(ext: T): void} - The filter method to use to filter the extensions
-     * @returns {Observable<Array<T>>} - An observable of the extensions that matches the type and filter method
+     * @param {string} type - The type of the extension to get.
+     * @param {(ext: ManifestBase) => boolean} filter - The filter method to use to filter the extensions.
+     * @returns {Observable<Array<ManifestBase>>} - An observable of the extensions that matches the type and filter method.
      */
     byTypeAndFilter(type, filter) {
         return combineLatest([
@@ -327,7 +353,14 @@ export class UmbExtensionRegistry {
             this.#kindsOfType(type),
         ]).pipe(map(this.#mergeExtensionsWithKinds), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
     }
-    // TODO: Write test for this method:
+    /**
+     * Get an extensions by type and a given filter method.
+     * This will return the all extensions that matches the type and which filter method returns true.
+     * The filter method will be called for each extension manifest of the given type, and the first argument to it is the extension manifest.
+     * @param {string} type - The type of the extension to get.
+     * @param {(ext: ManifestBase) => boolean} filter - The filter method to use to filter the extensions.
+     * @returns {Observable<Array<ManifestBase>>} - An observable of the extensions that matches the type and filter method.
+     */
     getByTypeAndFilter(type, filter) {
         const exts = this._extensions
             .getValue()
@@ -344,9 +377,9 @@ export class UmbExtensionRegistry {
      * Get an observable of extensions by types and a given filter method.
      * This will return the all extensions that matches the types and which filter method returns true.
      * The filter method will be called for each extension manifest of the given types, and the first argument to it is the extension manifest.
-     * @param types {Array<string>} - The types of the extensions to get.
-     * @param filter {(ext: T): void} - The filter method to use to filter the extensions
-     * @returns {Observable<Array<T>>} - An observable of the extensions that matches the type and filter method
+     * @param {Array<string>} types - The types of the extensions to get.
+     * @param {(ext: ManifestBase) => boolean} filter - The filter method to use to filter the extensions
+     * @returns {Observable<Array<ManifestBase>>} - An observable of the extensions that matches the type and filter method
      */
     byTypesAndFilter(types, filter) {
         return combineLatest([
@@ -356,16 +389,31 @@ export class UmbExtensionRegistry {
     }
     /**
      * Get an observable that provides extensions matching the given type.
-     * @param type {string} - The type of the extensions to get.
-     * @returns {Observable<T | undefined>} - An observable of the extensions that matches the type.
+     * @param {string} type - The type of the extensions to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extensions that matches the type.
      */
     byType(type) {
         return combineLatest([this.#extensionsOfType(type), this.#kindsOfType(type)]).pipe(map(this.#mergeExtensionsWithKinds), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
     }
+    /**
+     * Get all extensions that matches the given extension type.
+     * @param {string} type  - The type of the extension to get.
+     * @returns {ManifestBase | undefined} - The extension manifest that matches the alias.
+     */
+    getByType(type) {
+        const exts = this._extensions.getValue().filter((ext) => ext.type === type);
+        if (exts.length === 0) {
+            return [];
+        }
+        const kinds = this._kinds.getValue();
+        return exts
+            .map((ext) => (ext?.kind ? (this.#mergeExtensionWithKinds([ext, kinds]) ?? ext) : ext))
+            .sort(sortExtensions);
+    }
     /**
      * Get an observable that provides extensions matching given types.
-     * @param types {Array<string>} - The types of the extensions to get.
-     * @returns {Observable<T | undefined>} - An observable of the extensions that matches the types.
+     * @param {Array<string>} types - The types of the extensions to get.
+     * @returns {Observable<ManifestBase | undefined>} - An observable of the extensions that matches the types.
      */
     byTypes(types) {
         return combineLatest([this.#extensionsOfTypes(types), this.#kindsOfTypes(types)]).pipe(map(this.#mergeExtensionsWithKinds), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
@@ -387,7 +435,7 @@ export class UmbExtensionRegistry {
     appendConditions(alias, newConditions) {
         const existingConditionsToBeAdded = this.#additionalConditions.get(alias);
         this.#additionalConditions.set(alias, existingConditionsToBeAdded ? [...existingConditionsToBeAdded, ...newConditions] : newConditions);
-        const allExtensions = this._extensions.getValue();
+        const allExtensions = [...this._extensions.getValue()];
         for (const extension of allExtensions) {
             if (extension.alias === alias) {
                 // Replace the existing extension with the updated one

package/dist-cms/libs/localization-api/localization.controller.js

@@ -1,5 +1,4 @@
 import { umbLocalizationManager } from './localization.manager.js';
-import { escapeHTML } from '../../packages/core/utils/index.js';
 const LocalizationControllerAlias = Symbol();
 /**
  * The UmbLocalizeController enables localization for your element.
@@ -101,18 +100,15 @@ export class UmbLocalizationController {
         else {
             return String(key);
         }
-        // As translated texts can contain HTML, we will need to render with unsafeHTML.
-        // But arguments can come from user input, so they should be escaped.
-        const sanitizedArgs = args.map((a) => escapeHTML(a));
         if (typeof term === 'function') {
-            return term(...sanitizedArgs);
+            return term(...args);
         }
         if (typeof term === 'string') {
-            if (sanitizedArgs.length) {
+            if (args.length) {
                 // Replace placeholders of format "%index%" and "{index}" with provided values
                 term = term.replace(/(%(\d+)%|\{(\d+)\})/g, (match, _p1, p2, p3) => {
                     const index = p2 || p3;
-                    return typeof sanitizedArgs[index] !== 'undefined' ? String(sanitizedArgs[index]) : match;
+                    return typeof args[index] !== 'undefined' ? String(args[index]) : match;
                 });
             }
         }

package/dist-cms/libs/observable-api/utils/json-string-comparison.function.js

@@ -8,5 +8,5 @@
  * Meaning no class instances can take part in this data.
  */
 export function jsonStringComparison(a, b) {
-    return JSON.stringify(a) === JSON.stringify(b);
+    return (a === undefined && b === undefined) || JSON.stringify(a) === JSON.stringify(b);
 }

package/dist-cms/mocks/data/data-type/data-type.data.js

@@ -262,10 +262,6 @@ export const data = [
                 alias: 'ignoreUserStartNodes',
                 value: false,
             },
-            {
-                alias: 'showOpenButton',
-                value: true,
-            },
             {
                 alias: 'filter',
                 value: '',
@@ -1028,7 +1024,9 @@ export const data = [
                     'Umb.Tiptap.Table',
                     'Umb.Tiptap.TextAlign',
                     'Umb.Tiptap.TextDirection',
+                    'Umb.Tiptap.TextIndent',
                     'Umb.Tiptap.Underline',
+                    'Umb.Tiptap.WordCount',
                 ],
             },
             {
@@ -1039,30 +1037,42 @@ export const data = [
                             'Umb.Tiptap.Toolbar.SourceEditor',
                             'Umb.Tiptap.Toolbar.Undo',
                             'Umb.Tiptap.Toolbar.Redo',
-                            'Umb.Tiptap.Toolbar.StyleSelect',
-                            'Umb.Tiptap.Toolbar.FontFamily',
-                            'Umb.Tiptap.Toolbar.FontSize',
                             'Umb.Tiptap.Toolbar.ClearFormatting',
+                        ],
+                        ['Umb.Tiptap.Toolbar.StyleSelect', 'Umb.Tiptap.Toolbar.FontFamily', 'Umb.Tiptap.Toolbar.FontSize'],
+                        [
                             'Umb.Tiptap.Toolbar.Bold',
                             'Umb.Tiptap.Toolbar.Italic',
+                            'Umb.Tiptap.Toolbar.Underline',
+                            'Umb.Tiptap.Toolbar.Strike',
+                        ],
+                        ['Umb.Tiptap.Toolbar.TextColorForeground', 'Umb.Tiptap.Toolbar.TextColorBackground'],
+                        [
                             'Umb.Tiptap.Toolbar.TextAlignLeft',
                             'Umb.Tiptap.Toolbar.TextAlignCenter',
                             'Umb.Tiptap.Toolbar.TextAlignRight',
+                        ],
+                        ['Umb.Tiptap.Toolbar.Subscript', 'Umb.Tiptap.Toolbar.Superscript'],
+                        ['Umb.Tiptap.Toolbar.CodeBlock'],
+                        [
+                            'Umb.Tiptap.Toolbar.CharacterMap',
                             'Umb.Tiptap.Toolbar.TextDirectionRtl',
                             'Umb.Tiptap.Toolbar.TextDirectionLtr',
+                        ],
+                        ['Umb.Tiptap.Toolbar.TextIndent', 'Umb.Tiptap.Toolbar.TextOutdent'],
+                        [
                             'Umb.Tiptap.Toolbar.BulletList',
                             'Umb.Tiptap.Toolbar.OrderedList',
                             'Umb.Tiptap.Toolbar.Blockquote',
-                            'Umb.Tiptap.Toolbar.Link',
-                            'Umb.Tiptap.Toolbar.Unlink',
                             'Umb.Tiptap.Toolbar.HorizontalRule',
-                            'Umb.Tiptap.Toolbar.Table',
-                            'Umb.Tiptap.Toolbar.MediaPicker',
-                            'Umb.Tiptap.Toolbar.EmbeddedMedia',
                         ],
+                        ['Umb.Tiptap.Toolbar.Anchor', 'Umb.Tiptap.Toolbar.Link', 'Umb.Tiptap.Toolbar.Unlink'],
+                        ['Umb.Tiptap.Toolbar.Table', 'Umb.Tiptap.Toolbar.MediaPicker', 'Umb.Tiptap.Toolbar.EmbeddedMedia'],
                     ],
                 ],
             },
+            { alias: 'statusbar', value: [['Umb.Tiptap.Statusbar.ElementPath'], ['Umb.Tiptap.Statusbar.WordCount']] },
+            { alias: 'stylesheets', value: ['/rte-styles.css'] },
             { alias: 'dimensions', value: { height: 500 } },
             { alias: 'maxImageSize', value: 500 },
             { alias: 'ignoreUserStartNodes', value: false },
@@ -1092,7 +1102,7 @@ export const data = [
                 value: '+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-s[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*],figure,figcaption,video[*],audio[*],picture[*],source[*],canvas[*]',
             },
             { alias: 'invalidElements', value: 'font' },
-            { alias: 'stylesheets', value: [] },
+            { alias: 'stylesheets', value: ['/rte-styles.css'] },
             {
                 alias: 'toolbar',
                 value: [
@@ -1102,11 +1112,18 @@ export const data = [
                     'styles',
                     'fontfamily',
                     'fontsize',
+                    'forecolor',
+                    'backcolor',
+                    'blockquote',
+                    'removeformat',
                     'bold',
                     'italic',
+                    'underline',
+                    'strikethrough',
                     'alignleft',
                     'aligncenter',
                     'alignright',
+                    'alignjustify',
                     'bullist',
                     'numlist',
                     'outdent',
@@ -1114,6 +1131,9 @@ export const data = [
                     'link',
                     'unlink',
                     'anchor',
+                    'hr',
+                    'subscript',
+                    'superscript',
                     'charmap',
                     'rtl',
                     'ltr',

package/dist-cms/mocks/data/document/data/permissions-test.data.d.ts

@@ -0,0 +1,2 @@
+import type { UmbMockDocumentModel } from '../document.data.js';
+export declare const data: Array<UmbMockDocumentModel>;