@umbraco-cms/backoffice 14.0.0--preview005-7ef2bd26 → 14.0.0--preview005-44025f0f

package/dist-cms/libs/extension-api/controller/base-extension-initializer.controller.js

@@ -120,7 +120,7 @@ export class UmbBaseExtensionInitializer extends UmbBaseController {
         __classPrivateFieldSet(this, _UmbBaseExtensionInitializer_onPermissionChanged, onPermissionChanged, "f");
     }
     _init() {
-        __classPrivateFieldSet(this, _UmbBaseExtensionInitializer_manifestObserver, this.observe(__classPrivateFieldGet(this, _UmbBaseExtensionInitializer_extensionRegistry, "f").getByAlias(__classPrivateFieldGet(this, _UmbBaseExtensionInitializer_alias, "f")), async (extensionManifest) => {
+        __classPrivateFieldSet(this, _UmbBaseExtensionInitializer_manifestObserver, this.observe(__classPrivateFieldGet(this, _UmbBaseExtensionInitializer_extensionRegistry, "f").byAlias(__classPrivateFieldGet(this, _UmbBaseExtensionInitializer_alias, "f")), async (extensionManifest) => {
             __classPrivateFieldGet(this, _UmbBaseExtensionInitializer_instances, "m", _UmbBaseExtensionInitializer_clearPermittedState).call(this);
             __classPrivateFieldSet(this, _UmbBaseExtensionInitializer_manifest, extensionManifest, "f");
             if (extensionManifest) {
@@ -197,7 +197,7 @@ _UmbBaseExtensionInitializer_promiseResolvers = new WeakMap(), _UmbBaseExtension
         oldAmountOfControllers === conditionConfigs.length;
     if (conditionConfigs.length > 0) {
         // Observes the conditions and initialize as they come in.
-        this.observe(__classPrivateFieldGet(this, _UmbBaseExtensionInitializer_extensionRegistry, "f").getByTypeAndAliases('condition', conditionAliases), __classPrivateFieldGet(this, _UmbBaseExtensionInitializer_gotConditions, "f"), '_observeConditions');
+        this.observe(__classPrivateFieldGet(this, _UmbBaseExtensionInitializer_extensionRegistry, "f").byTypeAndAliases('condition', conditionAliases), __classPrivateFieldGet(this, _UmbBaseExtensionInitializer_gotConditions, "f"), '_observeConditions');
     }
     else {
         this.removeControllerByAlias('_observeConditions');

package/dist-cms/libs/extension-api/controller/base-extensions-initializer.controller.js

@@ -111,8 +111,8 @@ export class UmbBaseExtensionsInitializer extends UmbBaseController {
     }
     _init() {
         let source = Array.isArray(__classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_type, "f"))
-            ? __classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_extensionRegistry, "f").extensionsOfTypes(__classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_type, "f"))
-            : __classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_extensionRegistry, "f").extensionsOfType(__classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_type, "f"));
+            ? __classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_extensionRegistry, "f").byTypes(__classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_type, "f"))
+            : __classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_extensionRegistry, "f").byType(__classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_type, "f"));
         if (__classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_filter, "f")) {
             source = source.pipe(map((extensions) => extensions.filter(__classPrivateFieldGet(this, _UmbBaseExtensionsInitializer_filter, "f"))));
         }

package/dist-cms/libs/extension-api/initializers/bundle-extension-initializer.js

@@ -18,7 +18,7 @@ export class UmbBundleExtensionInitializer extends UmbBaseController {
         _UmbBundleExtensionInitializer_extensionRegistry.set(this, void 0);
         _UmbBundleExtensionInitializer_bundleMap.set(this, new Map());
         __classPrivateFieldSet(this, _UmbBundleExtensionInitializer_extensionRegistry, extensionRegistry, "f");
-        this.observe(extensionRegistry.extensionsOfType('bundle'), (bundles) => {
+        this.observe(extensionRegistry.byType('bundle'), (bundles) => {
             // Unregister removed bundles:
             __classPrivateFieldGet(this, _UmbBundleExtensionInitializer_bundleMap, "f").forEach((existingBundle) => {
                 if (!bundles.find((b) => b.alias === existingBundle.alias)) {

package/dist-cms/libs/extension-api/initializers/entry-point-extension-initializer.js

@@ -20,7 +20,7 @@ export class UmbEntryPointExtensionInitializer extends UmbBaseController {
         _UmbEntryPointExtensionInitializer_entryPointMap.set(this, new Map());
         __classPrivateFieldSet(this, _UmbEntryPointExtensionInitializer_host, host, "f");
         __classPrivateFieldSet(this, _UmbEntryPointExtensionInitializer_extensionRegistry, extensionRegistry, "f");
-        this.observe(extensionRegistry.extensionsOfType('entryPoint'), (entryPoints) => {
+        this.observe(extensionRegistry.byType('entryPoint'), (entryPoints) => {
             entryPoints.forEach((entryPoint) => {
                 if (__classPrivateFieldGet(this, _UmbEntryPointExtensionInitializer_entryPointMap, "f").has(entryPoint.alias))
                     return;

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

@@ -2,6 +2,7 @@ import type { ManifestBase, ManifestKind } from '../types/index.js';
 import type { ManifestTypeMap, SpecificManifestTypeOrManifestBase } from '../types/map.types.js';
 import type { Observable } from '../../../external/rxjs/index.js';
 export declare class UmbExtensionRegistry<IncomingManifestTypes extends ManifestBase, ManifestTypes extends ManifestBase = IncomingManifestTypes | ManifestBase> {
+    #private;
     readonly MANIFEST_TYPES: ManifestTypes;
     private _extensions;
     readonly extensions: Observable<ManifestTypes[]>;
@@ -13,33 +14,59 @@ export declare class UmbExtensionRegistry<IncomingManifestTypes extends Manifest
     unregisterMany(aliases: Array<string>): void;
     unregister(alias: string): void;
     isRegistered(alias: string): boolean;
-    private checkExtension;
-    private _kindsOfType;
-    private _extensionsOfType;
-    private _kindsOfTypes;
-    private _extensionsOfTypes;
-    getByAlias<T extends ManifestBase = ManifestBase>(alias: string): Observable<T | undefined>;
-    getByTypeAndAlias<Key extends keyof ManifestTypeMap<ManifestTypes> | string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, alias: string): Observable<T | undefined>;
-    getByTypeAndAliases<Key extends keyof ManifestTypeMap<ManifestTypes> | string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, aliases: Array<string>): Observable<T[]>;
-    /**
-     * Get an observable of an extension by type and a given filter method.
+    /**
+     * Get an observable that provides extensions matching the given alias.
+     * @param alias {string} - The alias of the extensions to get.
+     * @returns {Observable<T | undefined>} - An observable of the extension that matches the alias.
+     */
+    byAlias<T extends ManifestBase = ManifestBase>(alias: string): Observable<T | undefined>;
+    /**
+     * @deprecated Use `byAlias` instead.
+     */
+    getByAlias: <T extends ManifestBase = ManifestBase>(alias: string) => Observable<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.
+     */
+    byTypeAndAlias<Key extends keyof ManifestTypeMap<ManifestTypes> | string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, alias: string): Observable<T | undefined>;
+    /**
+     * @deprecated Use `byTypeAndAlias` instead.
+     */
+    getByTypeAndAlias: <Key extends string | number | ManifestTypes["type"], T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, alias: string) => Observable<T | undefined>;
+    byTypeAndAliases<Key extends keyof ManifestTypeMap<ManifestTypes> | string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, aliases: Array<string>): Observable<T[]>;
+    /**
+     * @deprecated Use `byTypeAndAliases` instead.
+     */
+    getByTypeAndAliases: <Key extends string | number | ManifestTypes["type"], T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, aliases: Array<string>) => Observable<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<T | undefined>} - An observable of the extensions that matches the type and filter method
+     * @returns {Observable<Array<T>>} - An observable of the extensions that matches the type and filter method
      */
-    byTypeAndFilter<Key extends keyof ManifestTypeMap<ManifestTypes> | string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, filter: (ext: T) => boolean): Observable<T | undefined>;
+    byTypeAndFilter<Key extends keyof ManifestTypeMap<ManifestTypes> | string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key, filter: (ext: T) => boolean): Observable<T[]>;
     /**
      * 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.
      */
-    extensionsOfType<Key extends keyof ManifestTypeMap<ManifestTypes> | string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key): Observable<T[]>;
+    byType<Key extends keyof ManifestTypeMap<ManifestTypes> | string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key): Observable<T[]>;
+    /**
+     * @deprecated Use `byType` instead.
+     */
+    extensionsOfType: <Key extends string | number | ManifestTypes["type"], T extends ManifestBase = SpecificManifestTypeOrManifestBase<ManifestTypes, Key>>(type: Key) => Observable<T[]>;
     /**
      * Get an observable that provides extensions matching given types.
      * @param type {Array<string>} - The types of the extensions to get.
      * @returns {Observable<T | undefined>} - An observable of the extensions that matches the types.
      */
-    extensionsOfTypes<ExtensionTypes extends ManifestBase = ManifestBase>(types: string[]): Observable<Array<ExtensionTypes>>;
+    byTypes<ExtensionTypes extends ManifestBase = ManifestBase>(types: string[]): Observable<Array<ExtensionTypes>>;
+    /**
+     * @deprecated Use `byTypes` instead.
+     */
+    extensionsOfTypes: <ExtensionTypes extends ManifestBase = ManifestBase>(types: string[]) => Observable<ExtensionTypes[]>;
 }

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

@@ -1,3 +1,9 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _UmbExtensionRegistry_instances, _UmbExtensionRegistry_checkExtension, _UmbExtensionRegistry_kindsOfType, _UmbExtensionRegistry_extensionsOfType, _UmbExtensionRegistry_kindsOfTypes, _UmbExtensionRegistry_extensionsOfTypes, _UmbExtensionRegistry_mergeExtensionWithKinds, _UmbExtensionRegistry_mergeExtensionsWithKinds;
 import { UmbBasicState } from '../../observable-api/index.js';
 import { map, distinctUntilChanged, combineLatest, of, switchMap } from '../../../external/rxjs/index.js';
 function extensionArrayMemoization(previousValue, currentValue) {
@@ -48,11 +54,32 @@ function extensionAndKindMatchSingleMemoization(previousValue, currentValue) {
 const sortExtensions = (a, b) => (b.weight || 0) - (a.weight || 0);
 export class UmbExtensionRegistry {
     constructor() {
+        _UmbExtensionRegistry_instances.add(this);
         this.MANIFEST_TYPES = undefined;
         this._extensions = new UmbBasicState([]);
         this.extensions = this._extensions.asObservable();
         this._kinds = new UmbBasicState([]);
         this.kinds = this._kinds.asObservable();
+        /**
+         * @deprecated Use `byAlias` instead.
+         */
+        this.getByAlias = this.byAlias.bind(this);
+        /**
+         * @deprecated Use `byTypeAndAlias` instead.
+         */
+        this.getByTypeAndAlias = this.byTypeAndAlias.bind(this);
+        /**
+         * @deprecated Use `byTypeAndAliases` instead.
+         */
+        this.getByTypeAndAliases = this.byTypeAndAliases.bind(this);
+        /**
+         * @deprecated Use `byType` instead.
+         */
+        this.extensionsOfType = this.byType.bind(this);
+        /**
+         * @deprecated Use `byTypes` instead.
+         */
+        this.extensionsOfTypes = this.byTypes.bind(this);
     }
     defineKind(kind) {
         const extensionsValues = this._extensions.getValue();
@@ -69,7 +96,7 @@ export class UmbExtensionRegistry {
         this._kinds.setValue(nextData);
     }
     register(manifest) {
-        const isValid = this.checkExtension(manifest);
+        const isValid = __classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_checkExtension).call(this, manifest);
         if (!isValid) {
             return;
         }
@@ -97,181 +124,124 @@ export class UmbExtensionRegistry {
         }
         return false;
     }
-    /*
-    getByAlias(alias: string) {
-        // TODO: make pipes prettier/simpler/reuseable
-        return this.extensions.pipe(map((extensions) => extensions.find((extension) => extension.alias === alias) || null));
-    }
-    */
-    checkExtension(manifest) {
-        if (!manifest.type) {
-            console.error(`Extension is missing type`, manifest);
-            return false;
-        }
-        if (!manifest.alias) {
-            console.error(`Extension is missing alias`, manifest);
-            return false;
-        }
-        if (manifest.type === 'kind') {
-            this.defineKind(manifest);
-            return false;
-        }
-        const extensionsValues = this._extensions.getValue();
-        const extension = extensionsValues.find((extension) => extension.alias === manifest.alias);
-        if (extension) {
-            console.error(`Extension with alias ${manifest.alias} is already registered`);
-            return false;
-        }
-        return true;
-    }
-    _kindsOfType(type) {
-        return this.kinds.pipe(map((kinds) => kinds.filter((kind) => kind.matchType === type)), distinctUntilChanged(extensionArrayMemoization));
-    }
-    _extensionsOfType(type) {
-        return this.extensions.pipe(map((exts) => exts.filter((ext) => ext.type === type)), distinctUntilChanged(extensionArrayMemoization));
-    }
-    _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));
-    }
-    // TODO: get rid of the name get
-    getByAlias(alias) {
+    /**
+     * Get an observable that provides extensions matching the given alias.
+     * @param alias {string} - The alias of the extensions to get.
+     * @returns {Observable<T | 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) => {
             if (ext?.kind) {
-                return this._kindsOfType(ext.type).pipe(map((kinds) => {
-                    // Specific Extension Meta merge (does not merge conditions)
-                    if (ext) {
-                        // Since we dont have the type up front in this request, we will just get all kinds here and find the matching one:
-                        const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
-                        // TODO: This check can go away when making a find kind based on type and kind.
-                        if (baseManifest) {
-                            const merged = { __isMatchedWithKind: true, ...baseManifest, ...ext };
-                            if (baseManifest.meta) {
-                                merged.meta = { ...baseManifest.meta, ...ext.meta };
-                            }
-                            return merged;
-                        }
-                    }
-                    return ext;
-                }));
+                return __classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_kindsOfType).call(this, ext.type).pipe(map((kinds) => __classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_mergeExtensionWithKinds).call(this, [ext, kinds])));
             }
             return of(ext);
         }), distinctUntilChanged(extensionAndKindMatchSingleMemoization));
     }
-    // TODO: get rid of the name get
-    getByTypeAndAlias(type, alias) {
+    /**
+     * 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.
+     */
+    byTypeAndAlias(type, alias) {
         return combineLatest([
             this.extensions.pipe(map((exts) => exts.find((ext) => ext.type === type && ext.alias === alias)), distinctUntilChanged(extensionSingleMemoization)),
-            this._kindsOfType(type),
-        ]).pipe(map(([ext, kinds]) => {
-            // TODO: share one merge function between the different methods of this class:
-            // Specific Extension Meta merge (does not merge conditions)
-            if (ext) {
-                const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
-                if (baseManifest) {
-                    const merged = { __isMatchedWithKind: true, ...baseManifest, ...ext };
-                    if (baseManifest.meta) {
-                        merged.meta = { ...baseManifest.meta, ...ext.meta };
-                    }
-                    return merged;
-                }
-            }
-            return ext;
-        }), distinctUntilChanged(extensionAndKindMatchSingleMemoization));
+            __classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_kindsOfType).call(this, type),
+        ]).pipe(map(__classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_mergeExtensionWithKinds)), distinctUntilChanged(extensionAndKindMatchSingleMemoization));
     }
-    // TODO: get rid of the name get
-    getByTypeAndAliases(type, aliases) {
+    byTypeAndAliases(type, aliases) {
         return combineLatest([
             this.extensions.pipe(map((exts) => exts.filter((ext) => ext.type === type && aliases.indexOf(ext.alias) !== -1)), distinctUntilChanged(extensionArrayMemoization)),
-            this._kindsOfType(type),
-        ]).pipe(map(([exts, kinds]) => exts
-            .map((ext) => {
-            // Specific Extension Meta merge (does not merge conditions)
-            const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
-            if (baseManifest) {
-                const merged = { __isMatchedWithKind: true, ...baseManifest, ...ext };
-                if (baseManifest.meta) {
-                    merged.meta = { ...baseManifest.meta, ...ext.meta };
-                }
-                return merged;
-            }
-            return ext;
-        })
-            .sort(sortExtensions)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
+            __classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_kindsOfType).call(this, type),
+        ]).pipe(map(__classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_mergeExtensionsWithKinds)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
     }
     /**
-     * Get an observable of an extension by type and a given filter method.
+     * 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<T | undefined>} - An observable of the extensions that matches the type and filter method
+     * @returns {Observable<Array<T>>} - An observable of the extensions that matches the type and filter method
      */
     byTypeAndFilter(type, filter) {
         return combineLatest([
-            this.extensions.pipe(map((exts) => exts.find((ext) => ext.type === type && filter(ext))), distinctUntilChanged(extensionSingleMemoization)),
-            this._kindsOfType(type),
-        ]).pipe(map(([ext, kinds]) => {
-            // TODO: share one merge function between the different methods of this class:
-            // Specific Extension Meta merge (does not merge conditions)
-            if (ext) {
-                const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
-                if (baseManifest) {
-                    const merged = { __isMatchedWithKind: true, ...baseManifest, ...ext };
-                    if (baseManifest.meta) {
-                        merged.meta = { ...baseManifest.meta, ...ext.meta };
-                    }
-                    return merged;
-                }
-            }
-            return ext;
-        }), distinctUntilChanged(extensionAndKindMatchSingleMemoization));
+            this.extensions.pipe(map((exts) => exts.filter((ext) => ext.type === type && filter(ext))), distinctUntilChanged(extensionArrayMemoization)),
+            __classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_kindsOfType).call(this, type),
+        ]).pipe(map(__classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_mergeExtensionsWithKinds)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
     }
     /**
      * 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.
      */
-    extensionsOfType(type) {
-        return combineLatest([this._extensionsOfType(type), this._kindsOfType(type)]).pipe(map(([exts, kinds]) => exts
-            .map((ext) => {
-            // Specific Extension Meta merge (does not merge conditions)
-            const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
-            if (baseManifest) {
-                const merged = { __isMatchedWithKind: true, ...baseManifest, ...ext };
-                if (baseManifest.meta) {
-                    merged.meta = { ...baseManifest.meta, ...ext.meta };
-                }
-                return merged;
-            }
-            return ext;
-        })
-            .sort(sortExtensions)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
+    byType(type) {
+        return combineLatest([__classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_extensionsOfType).call(this, type), __classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_kindsOfType).call(this, type)]).pipe(map(__classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_mergeExtensionsWithKinds)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
     }
     /**
      * Get an observable that provides extensions matching given types.
      * @param type {Array<string>} - The types of the extensions to get.
      * @returns {Observable<T | undefined>} - An observable of the extensions that matches the types.
      */
-    extensionsOfTypes(types) {
-        return combineLatest([this._extensionsOfTypes(types), this._kindsOfTypes(types)]).pipe(map(([exts, kinds]) => exts
-            .map((ext) => {
-            // Specific Extension Meta merge (does not merge conditions)
-            if (ext) {
-                const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
-                if (baseManifest) {
-                    const merged = { __isMatchedWithKind: true, ...baseManifest, ...ext };
-                    if (baseManifest.meta) {
-                        merged.meta = { ...baseManifest.meta, ...ext.meta };
-                    }
-                    return merged;
-                }
-            }
-            return ext;
-        })
-            .sort(sortExtensions)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
+    byTypes(types) {
+        return combineLatest([__classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_extensionsOfTypes).call(this, types), __classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_kindsOfTypes).call(this, types)]).pipe(map(__classPrivateFieldGet(this, _UmbExtensionRegistry_instances, "m", _UmbExtensionRegistry_mergeExtensionsWithKinds)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
     }
 }
+_UmbExtensionRegistry_instances = new WeakSet(), _UmbExtensionRegistry_checkExtension = function _UmbExtensionRegistry_checkExtension(manifest) {
+    if (!manifest.type) {
+        console.error(`Extension is missing type`, manifest);
+        return false;
+    }
+    if (!manifest.alias) {
+        console.error(`Extension is missing alias`, manifest);
+        return false;
+    }
+    if (manifest.type === 'kind') {
+        this.defineKind(manifest);
+        return false;
+    }
+    const extensionsValues = this._extensions.getValue();
+    const extension = extensionsValues.find((extension) => extension.alias === manifest.alias);
+    if (extension) {
+        console.error(`Extension with alias ${manifest.alias} is already registered`);
+        return false;
+    }
+    return true;
+}, _UmbExtensionRegistry_kindsOfType = function _UmbExtensionRegistry_kindsOfType(type) {
+    return this.kinds.pipe(map((kinds) => kinds.filter((kind) => kind.matchType === type)), distinctUntilChanged(extensionArrayMemoization));
+}, _UmbExtensionRegistry_extensionsOfType = function _UmbExtensionRegistry_extensionsOfType(type) {
+    return this.extensions.pipe(map((exts) => exts.filter((ext) => ext.type === type)), distinctUntilChanged(extensionArrayMemoization));
+}, _UmbExtensionRegistry_kindsOfTypes = function _UmbExtensionRegistry_kindsOfTypes(types) {
+    return this.kinds.pipe(map((kinds) => kinds.filter((kind) => types.indexOf(kind.matchType) !== -1)), distinctUntilChanged(extensionArrayMemoization));
+}, _UmbExtensionRegistry_extensionsOfTypes = function _UmbExtensionRegistry_extensionsOfTypes(types) {
+    return this.extensions.pipe(map((exts) => exts.filter((ext) => types.indexOf(ext.type) !== -1)), distinctUntilChanged(extensionArrayMemoization));
+}, _UmbExtensionRegistry_mergeExtensionWithKinds = function _UmbExtensionRegistry_mergeExtensionWithKinds([ext, kinds,]) {
+    // Specific Extension Meta merge (does not merge conditions)
+    if (ext) {
+        // Since we don't have the type up front in this request, we will just get all kinds here and find the matching one:
+        const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
+        // TODO: This check can go away when making a find kind based on type and kind.
+        if (baseManifest) {
+            const merged = { __isMatchedWithKind: true, ...baseManifest, ...ext };
+            if (baseManifest.meta) {
+                merged.meta = { ...baseManifest.meta, ...ext.meta };
+            }
+            return merged;
+        }
+    }
+    return ext;
+}, _UmbExtensionRegistry_mergeExtensionsWithKinds = function _UmbExtensionRegistry_mergeExtensionsWithKinds([exts, kinds,]) {
+    return exts
+        .map((ext) => {
+        // Specific Extension Meta merge (does not merge conditions)
+        const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
+        if (baseManifest) {
+            const merged = { __isMatchedWithKind: true, ...baseManifest, ...ext };
+            if (baseManifest.meta) {
+                merged.meta = { ...baseManifest.meta, ...ext.meta };
+            }
+            return merged;
+        }
+        return ext;
+    })
+        .sort(sortExtensions);
+};

package/dist-cms/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.js

@@ -68,7 +68,7 @@ _UmbEntityActionsBundleElement_sectionSidebarContext = new WeakMap();
 _UmbEntityActionsBundleElement_instances = new WeakSet();
 _UmbEntityActionsBundleElement_observeEntityActions = function _UmbEntityActionsBundleElement_observeEntityActions() {
     this.observe(umbExtensionsRegistry
-        .extensionsOfType('entityAction')
+        .byType('entityAction')
         .pipe(map((actions) => actions.filter((action) => action.meta.entityTypes.includes(this.entityType)))), (actions) => {
         this._hasActions = actions.length > 0;
     }, 'umbEntityActionsObserver');

package/dist-cms/packages/core/components/input-section/input-section.element.js

@@ -21,7 +21,7 @@ let UmbInputSectionElement = class UmbInputSectionElement extends UmbInputListBa
     }
     _observeSections() {
         if (this.value.length > 0) {
-            this.observe(umbExtensionsRegistry.extensionsOfType('section'), (sections) => {
+            this.observe(umbExtensionsRegistry.byType('section'), (sections) => {
                 this._sections = sections.filter((section) => this.value.includes(section.alias));
             });
         }

package/dist-cms/packages/core/components/input-tiny-mce/input-tiny-mce.element.js

@@ -133,7 +133,7 @@ _UmbInputTinyMceElement_loadPlugins =
  * the plugins are ready and so are not associated with the editor.
  */
 async function _UmbInputTinyMceElement_loadPlugins() {
-    const observable = umbExtensionsRegistry?.extensionsOfType('tinyMcePlugin');
+    const observable = umbExtensionsRegistry?.byType('tinyMcePlugin');
     const manifests = (await firstValueFrom(observable));
     const promises = [];
     for (const manifest of manifests) {

package/dist-cms/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.js

@@ -212,7 +212,7 @@ _UmbDataTypePickerFlowModalElement_init = async function _UmbDataTypePickerFlowM
         __classPrivateFieldSet(this, _UmbDataTypePickerFlowModalElement_dataTypes, items, "f");
         this._performFiltering();
     }, '_repositoryItemsObserver');
-    this.observe(umbExtensionsRegistry.extensionsOfType('propertyEditorUi'), (propertyEditorUIs) => {
+    this.observe(umbExtensionsRegistry.byType('propertyEditorUi'), (propertyEditorUIs) => {
         // Only include Property Editor UIs which has Property Editor Schema Alias
         __classPrivateFieldSet(this, _UmbDataTypePickerFlowModalElement_propertyEditorUIs, propertyEditorUIs.filter((propertyEditorUi) => !!propertyEditorUi.meta.propertyEditorSchemaAlias), "f");
         this._performFiltering();

package/dist-cms/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.js

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _UmbPropertyEditorUIPickerModalElement_instances, _UmbPropertyEditorUIPickerModalElement_usePropertyEditorUIs, _UmbPropertyEditorUIPickerModalElement_handleClick, _UmbPropertyEditorUIPickerModalElement_select, _UmbPropertyEditorUIPickerModalElement_handleFilterInput;
 import { css, html, customElement, state, repeat } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement, } from '../../../modal/index.js';
+import { UmbModalBaseElement } from '../../../modal/index.js';
 import { umbExtensionsRegistry } from '../../../extension-registry/index.js';
 let UmbPropertyEditorUIPickerModalElement = class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement {
     constructor() {
@@ -71,7 +71,7 @@ _UmbPropertyEditorUIPickerModalElement_instances = new WeakSet();
 _UmbPropertyEditorUIPickerModalElement_usePropertyEditorUIs = function _UmbPropertyEditorUIPickerModalElement_usePropertyEditorUIs() {
     if (!this.data)
         return;
-    this.observe(umbExtensionsRegistry.extensionsOfType('propertyEditorUi'), (propertyEditorUIs) => {
+    this.observe(umbExtensionsRegistry.byType('propertyEditorUi'), (propertyEditorUIs) => {
         // Only include Property Editor UIs which has Property Editor Schema Alias
         this._propertyEditorUIs = propertyEditorUIs.filter((propertyEditorUi) => !!propertyEditorUi.meta.propertyEditorSchemaAlias);
         // TODO: groupBy is not known by TS yet

package/dist-cms/packages/core/localization/components/ui-culture-input/ui-culture-input.element.js

@@ -45,7 +45,7 @@ let UmbUiCultureInputElement = class UmbUiCultureInputElement extends FormContro
 };
 _UmbUiCultureInputElement_instances = new WeakSet();
 _UmbUiCultureInputElement_observeTranslations = function _UmbUiCultureInputElement_observeTranslations() {
-    this.observe(umbExtensionsRegistry.extensionsOfType('localization'), (localizationManifests) => {
+    this.observe(umbExtensionsRegistry.byType('localization'), (localizationManifests) => {
         __classPrivateFieldGet(this, _UmbUiCultureInputElement_instances, "m", _UmbUiCultureInputElement_mapToOptions).call(this, localizationManifests);
     }, 'umbObserveLocalizationManifests');
 };

package/dist-cms/packages/core/localization/registry/localization.registry.js

@@ -50,7 +50,7 @@ export class UmbLocalizationRegistry {
                 ...innerDictionary,
             };
         });
-        combineLatest([this.currentLanguage, extensionRegistry.extensionsOfType('localization')]).subscribe(async ([currentLanguage, extensions]) => {
+        combineLatest([this.currentLanguage, extensionRegistry.byType('localization')]).subscribe(async ([currentLanguage, extensions]) => {
             const locale = new Intl.Locale(currentLanguage);
             const filteredExt = extensions.filter((ext) => ext.meta.culture.toLowerCase() === locale.baseName.toLowerCase() ||
                 ext.meta.culture.toLowerCase() === locale.language.toLowerCase());

package/dist-cms/packages/core/modal/common/section-picker/section-picker-modal.element.js

@@ -14,7 +14,7 @@ import { UmbTextStyles } from '../../../../../shared/style/index.js';
 import { css, html, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbSelectionManager } from '../../../../../shared/utils/index.js';
 import { umbExtensionsRegistry } from '../../../extension-registry/index.js';
-import { UmbModalBaseElement, } from '../../index.js';
+import { UmbModalBaseElement } from '../../index.js';
 let UmbSectionPickerModalElement = class UmbSectionPickerModalElement extends UmbModalBaseElement {
     constructor() {
         super(...arguments);
@@ -27,7 +27,7 @@ let UmbSectionPickerModalElement = class UmbSectionPickerModalElement extends Um
         // TODO: in theory this config could change during the lifetime of the modal, so we could observe it
         __classPrivateFieldGet(this, _UmbSectionPickerModalElement_selectionManager, "f").setMultiple(this.data?.multiple ?? false);
         __classPrivateFieldGet(this, _UmbSectionPickerModalElement_selectionManager, "f").setSelection(this.data?.selection ?? []);
-        this.observe(umbExtensionsRegistry.extensionsOfType('section'), (sections) => (this._sections = sections)),
+        this.observe(umbExtensionsRegistry.byType('section'), (sections) => (this._sections = sections)),
             'umbSectionsObserver';
     }
     render() {

package/dist-cms/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.js

@@ -70,7 +70,7 @@ let UmbPropertyEditorUITinyMceToolbarConfigurationElement = class UmbPropertyEdi
     }
     async getToolbarPlugins() {
         // Get all the toolbar plugins
-        const plugin$ = umbExtensionsRegistry.extensionsOfType('tinyMcePlugin');
+        const plugin$ = umbExtensionsRegistry.byType('tinyMcePlugin');
         const plugins = await firstValueFrom(plugin$);
         plugins.forEach((p) => {
             // If the plugin has a toolbar, add it to the config

package/dist-cms/packages/core/themes/theme.context.js

@@ -36,7 +36,7 @@ export class UmbThemeContext extends UmbBaseController {
         if (themeAlias) {
             localStorage.setItem(LOCAL_STORAGE_KEY, themeAlias);
             __classPrivateFieldSet(this, _UmbThemeContext_themeObserver, this.observe(umbExtensionsRegistry
-                .extensionsOfType('theme')
+                .byType('theme')
                 .pipe(map((extensions) => extensions.filter((extension) => extension.alias === themeAlias))), async (themes) => {
                 __classPrivateFieldGet(this, _UmbThemeContext_styleElement, "f")?.remove();
                 if (themes.length > 0 && themes[0].css) {

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

@@ -142,7 +142,7 @@ _UmbTreeItemContextBase_treeItem = new WeakMap(), _UmbTreeItemContextBase_hasChi
     }, 'observeSectionPath');
 }, _UmbTreeItemContextBase_observeActions = function _UmbTreeItemContextBase_observeActions() {
     this.observe(umbExtensionsRegistry
-        .extensionsOfType('entityAction')
+        .byType('entityAction')
         .pipe(map((actions) => actions.filter((action) => action.meta.entityTypes.includes(this.entityType)))), (actions) => {
         __classPrivateFieldGet(this, _UmbTreeItemContextBase_hasActions, "f").setValue(actions.length > 0);
     }, 'observeActions');

package/dist-cms/packages/health-check/dashboard-health-check.element.js

@@ -44,7 +44,7 @@ let UmbDashboardHealthCheckElement = class UmbDashboardHealthCheckElement extend
             __classPrivateFieldGet(this, _UmbDashboardHealthCheckElement_instances, "m", _UmbDashboardHealthCheckElement_register).call(this, manifests);
         });
         this.provideContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT, this._healthCheckDashboardContext);
-        this.observe(umbExtensionsRegistry.extensionsOfType('healthCheck'), (healthCheckManifests) => {
+        this.observe(umbExtensionsRegistry.byType('healthCheck'), (healthCheckManifests) => {
             this._healthCheckDashboardContext.manifests = healthCheckManifests;
         });
     }

package/dist-cms/packages/packages/package-section/views/created/created-packages-section-view.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { html, customElement, state } from '../../../../../external/lit/index.js';
-import { umbExtensionsRegistry, } from '../../../../core/extension-registry/index.js';
+import { umbExtensionsRegistry } from '../../../../core/extension-registry/index.js';
 import { createExtensionElement } from '../../../../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
 let UmbCreatedPackagesSectionViewElement = class UmbCreatedPackagesSectionViewElement extends UmbLitElement {
@@ -14,7 +14,7 @@ let UmbCreatedPackagesSectionViewElement = class UmbCreatedPackagesSectionViewEl
         this._routes = [];
         this._workspaces = [];
         // TODO: Do not implement all workspaces at this point. We should only implement the 'package-builder' workspace.
-        this.observe(umbExtensionsRegistry?.extensionsOfType('workspace'), (workspaceExtensions) => {
+        this.observe(umbExtensionsRegistry?.byType('workspace'), (workspaceExtensions) => {
             this._workspaces = workspaceExtensions;
             this._createRoutes();
         });