@umbraco-cms/backoffice 14.0.0-500b9dc0 → 14.0.0-5f7ff12f

package/dist-cms/libs/controller-api/controller-host-element.mixin.d.ts

@@ -0,0 +1,26 @@
+import { HTMLElementConstructor } from '../extension-api/types.js';
+import { UmbControllerAlias } from './controller-alias.type.js';
+import { UmbControllerHost } from './controller-host.interface.js';
+import type { UmbController } from './controller.interface.js';
+export declare class UmbControllerHostElement extends HTMLElement implements UmbControllerHost {
+    hasController(controller: UmbController): boolean;
+    getControllers(filterMethod: (ctrl: UmbController) => boolean): UmbController[];
+    addController(controller: UmbController): void;
+    removeControllerByAlias(alias: UmbControllerAlias): void;
+    removeController(controller: UmbController): void;
+    getHostElement(): EventTarget;
+}
+/**
+ * This mixin enables a web-component to host controllers.
+ * This enables controllers to be added to the life cycle of this element.
+ *
+ * @param {Object} superClass - superclass to be extended.
+ * @mixin
+ */
+export declare const UmbControllerHostElementMixin: <T extends HTMLElementConstructor>(superClass: T) => HTMLElementConstructor<UmbControllerHostElement> & T;
+declare global {
+    interface HTMLElement {
+        connectedCallback(): void;
+        disconnectedCallback(): void;
+    }
+}

package/dist-cms/libs/controller-api/controller-host-element.mixin.js

@@ -0,0 +1,25 @@
+import { UmbControllerHostBaseMixin } from './controller-host-base.mixin.js';
+/**
+ * This mixin enables a web-component to host controllers.
+ * This enables controllers to be added to the life cycle of this element.
+ *
+ * @param {Object} superClass - superclass to be extended.
+ * @mixin
+ */
+export const UmbControllerHostElementMixin = (superClass) => {
+    class UmbControllerHostElementClass extends UmbControllerHostBaseMixin(superClass) {
+        getHostElement() {
+            return this;
+        }
+        connectedCallback() {
+            super.connectedCallback?.();
+            this.hostConnected();
+        }
+        disconnectedCallback() {
+            super.disconnectedCallback?.();
+            this.hostDisconnected();
+        }
+    }
+    return UmbControllerHostElementClass;
+};
+//# sourceMappingURL=controller-host-element.mixin.js.map

package/dist-cms/libs/controller-api/controller-host-element.mixin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller-host-element.mixin.js","sourceRoot":"","sources":["../../../src/libs/controller-api/controller-host-element.mixin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAa7E;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAmC,UAAa,EAAE,EAAE;IAChG,MAAM,6BAA8B,SAAQ,0BAA0B,CAAC,UAAU,CAAC;QACjF,cAAc;YACb,OAAO,IAAI,CAAC;QACb,CAAC;QAED,iBAAiB;YAChB,KAAK,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC5B,IAAI,CAAC,aAAa,EAAE,CAAC;QACtB,CAAC;QAED,oBAAoB;YACnB,KAAK,CAAC,oBAAoB,EAAE,EAAE,CAAC;YAC/B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzB,CAAC;KACD;IAED,OAAO,6BAAgG,CAAC;AACzG,CAAC,CAAC"}

package/dist-cms/libs/controller-api/controller-host-initializer.element.d.ts

@@ -1,5 +1,5 @@
-import { UmbControllerHostElement } from './controller-host.mixin.js';
-declare const UmbControllerHostInitializerElement_base: (new (...args: any[]) => UmbControllerHostElement) & {
+import { UmbControllerHostElement } from './controller-host-element.mixin.js';
+declare const UmbControllerHostInitializerElement_base: import("../extension-api/types.js").HTMLElementConstructor<UmbControllerHostElement> & {
     new (): HTMLElement;
     prototype: HTMLElement;
 };

package/dist-cms/libs/controller-api/controller-host-initializer.element.js

@@ -1,5 +1,5 @@
-import { UmbControllerHostMixin } from './controller-host.mixin.js';
-export class UmbControllerHostInitializerElement extends UmbControllerHostMixin(HTMLElement) {
+import { UmbControllerHostElementMixin } from './controller-host-element.mixin.js';
+export class UmbControllerHostInitializerElement extends UmbControllerHostElementMixin(HTMLElement) {
     constructor() {
         super();
         this.attachShadow({ mode: 'open' });

package/dist-cms/libs/controller-api/controller-host-initializer.element.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller-host-initializer.element.js","sourceRoot":"","sources":["../../../src/libs/controller-api/controller-host-initializer.element.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAE9F,MAAM,OAAO,mCACZ,SAAQ,sBAAsB,CAAC,WAAW,CAAC;IAS3C;QACC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,iBAAiB;QAChB,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAClB;IACF,CAAC;CACD;AAED,cAAc,CAAC,MAAM,CAAC,iCAAiC,EAAE,mCAAmC,CAAC,CAAC"}
+{"version":3,"file":"controller-host-initializer.element.js","sourceRoot":"","sources":["../../../src/libs/controller-api/controller-host-initializer.element.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAE7G,MAAM,OAAO,mCACZ,SAAQ,6BAA6B,CAAC,WAAW,CAAC;IASlD;QACC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,iBAAiB;QAChB,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAClB;IACF,CAAC;CACD;AAED,cAAc,CAAC,MAAM,CAAC,iCAAiC,EAAE,mCAAmC,CAAC,CAAC"}

package/dist-cms/libs/controller-api/controller-host.interface.d.ts

@@ -0,0 +1,9 @@
+import type { UmbController } from './controller.interface.js';
+export declare class UmbControllerHost {
+    hasController(controller: UmbController): boolean;
+    getControllers(filterMethod: (ctrl: UmbController) => boolean): UmbController[];
+    addController(controller: UmbController): void;
+    removeControllerByAlias(unique: UmbController['controllerAlias']): void;
+    removeController(controller: UmbController): void;
+    getHostElement(): EventTarget;
+}

package/dist-cms/libs/controller-api/controller-host.interface.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=controller-host.interface.js.map

package/dist-cms/libs/controller-api/controller-host.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller-host.interface.js","sourceRoot":"","sources":["../../../src/libs/controller-api/controller-host.interface.ts"],"names":[],"mappings":""}

package/dist-cms/libs/controller-api/controller.class.d.ts

@@ -1,11 +1,47 @@
-import { UmbControllerHostElement } from './controller-host.mixin.js';
-import type { UmbControllerInterface } from './controller.interface.js';
-export declare abstract class UmbController implements UmbControllerInterface {
-    protected host?: UmbControllerHostElement;
-    private _alias?;
-    get unique(): string | undefined;
-    constructor(host: UmbControllerHostElement, alias?: string);
-    abstract hostConnected(): void;
-    abstract hostDisconnected(): void;
+import { UmbControllerHost } from './controller-host.interface.js';
+import { UmbController } from './controller.interface.js';
+declare const UmbBaseController_base: (new (host: UmbControllerHost, controllerAlias: import("./controller-alias.type.js").UmbControllerAlias) => {
+    _host: UmbControllerHost;
+    observe<T>(source: import("rxjs").Observable<T> | {
+        asObservable: () => import("rxjs").Observable<T>;
+    }, callback: (_value: T) => void, controllerAlias?: import("./controller-alias.type.js").UmbControllerAlias): import("../observable-api/observer.controller.js").UmbObserverController<T>;
+    provideContext<R = unknown>(alias: string | import("../context-api/index.js").UmbContextToken<R>, instance: R): import("../context-api/index.js").UmbContextProviderController<R>;
+    consumeContext<R_1 = unknown>(alias: string | import("../context-api/index.js").UmbContextToken<R_1>, callback: import("../context-api/index.js").UmbContextCallback<R_1>): import("../context-api/index.js").UmbContextConsumerController<R_1>;
+    hasController(controller: UmbController): boolean;
+    getControllers(filterMethod: (ctrl: UmbController) => boolean): UmbController[];
+    addController(controller: UmbController): void;
+    removeControllerByAlias(controllerAlias: import("./controller-alias.type.js").UmbControllerAlias): void;
+    removeController(controller: UmbController): void;
+    getHostElement(): EventTarget;
+    readonly controllerAlias: import("./controller-alias.type.js").UmbControllerAlias;
+    hostConnected(): void;
+    hostDisconnected(): void;
+    destroy(): void;
+}) & {
+    _host: UmbControllerHost;
+    observe<T>(source: import("rxjs").Observable<T> | {
+        asObservable: () => import("rxjs").Observable<T>;
+    }, callback: (_value: T) => void, controllerAlias?: import("./controller-alias.type.js").UmbControllerAlias): import("../observable-api/observer.controller.js").UmbObserverController<T>;
+    provideContext<R = unknown>(alias: string | import("../context-api/index.js").UmbContextToken<R>, instance: R): import("../context-api/index.js").UmbContextProviderController<R>;
+    consumeContext<R_1 = unknown>(alias: string | import("../context-api/index.js").UmbContextToken<R_1>, callback: import("../context-api/index.js").UmbContextCallback<R_1>): import("../context-api/index.js").UmbContextConsumerController<R_1>;
+    hasController(controller: UmbController): boolean;
+    getControllers(filterMethod: (ctrl: UmbController) => boolean): UmbController[];
+    addController(controller: UmbController): void;
+    removeControllerByAlias(controllerAlias: import("./controller-alias.type.js").UmbControllerAlias): void;
+    removeController(controller: UmbController): void;
+    getHostElement(): EventTarget;
+    readonly controllerAlias: import("./controller-alias.type.js").UmbControllerAlias;
+    hostConnected(): void;
+    hostDisconnected(): void;
+    destroy(): void;
+};
+/**
+ * This mixin enables a web-component to host controllers.
+ * This enables controllers to be added to the life cycle of this element.
+ *
+ */
+export declare abstract class UmbBaseController extends UmbBaseController_base implements UmbController {
+    constructor(host: UmbControllerHost, controllerAlias?: UmbController['controllerAlias']);
     destroy(): void;
 }
+export {};

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

@@ -1,17 +1,21 @@
-export class UmbController {
-    get unique() {
-        return this._alias;
-    }
-    constructor(host, alias) {
-        this.host = host;
-        this._alias = alias;
-        this.host.addController(this);
+import { UmbClassMixin } from '../class-api/index.js';
+/**
+ * This mixin enables a web-component to host controllers.
+ * This enables controllers to be added to the life cycle of this element.
+ *
+ */
+export class UmbBaseController extends UmbClassMixin(class {
+}) {
+    constructor(host, controllerAlias) {
+        super(host, controllerAlias);
+        this._host.addController(this);
     }
     destroy() {
-        if (this.host) {
-            this.host.removeController(this);
+        if (this._host) {
+            this._host.removeController(this);
         }
-        delete this.host;
+        //delete this.host;
+        super.destroy();
     }
 }
 //# sourceMappingURL=controller.class.js.map

package/dist-cms/libs/controller-api/controller.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.class.js","sourceRoot":"","sources":["../../../src/libs/controller-api/controller.class.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,aAAa;IAIlC,IAAW,MAAM;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,YAAY,IAA8B,EAAE,KAAc;QACzD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAKM,OAAO;QACb,IAAI,IAAI,CAAC,IAAI,EAAE;YACd,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;CACD"}
+{"version":3,"file":"controller.class.js","sourceRoot":"","sources":["../../../src/libs/controller-api/controller.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD;;;;GAIG;AACH,MAAM,OAAgB,iBAAkB,SAAQ,aAAa,CAAC;CAAQ,CAAC;IACtE,YAAY,IAAuB,EAAE,eAAkD;QACtF,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAEM,OAAO;QACb,IAAI,IAAI,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;SAClC;QACD,mBAAmB;QACnB,KAAK,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;CACD"}

package/dist-cms/libs/controller-api/controller.interface.d.ts

@@ -1,5 +1,6 @@
-export interface UmbControllerInterface {
-    get unique(): string | undefined;
+import type { UmbControllerAlias } from './controller-alias.type.js';
+export interface UmbController {
+    get controllerAlias(): UmbControllerAlias;
     hostConnected(): void;
     hostDisconnected(): void;
     destroy(): void;

package/dist-cms/libs/controller-api/index.d.ts

@@ -1,3 +1,6 @@
-export * from './controller-host.mixin.js';
+export * from './controller-host-base.mixin.js';
+export * from './controller-host.interface.js';
+export * from './controller-host-element.mixin.js';
 export * from './controller.class.js';
 export * from './controller.interface.js';
+export * from './controller-alias.type.js';

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

@@ -1,4 +1,7 @@
-export * from './controller-host.mixin.js';
+export * from './controller-host-base.mixin.js';
+export * from './controller-host.interface.js';
+export * from './controller-host-element.mixin.js';
 export * from './controller.class.js';
 export * from './controller.interface.js';
+export * from './controller-alias.type.js';
 //# sourceMappingURL=index.js.map

package/dist-cms/libs/controller-api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/controller-api/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/controller-api/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC"}

package/dist-cms/libs/element-api/element.mixin.d.ts

@@ -3,16 +3,11 @@ import type { HTMLElementConstructor } from '../extension-api/index.js';
 import type { UmbControllerHostElement } from '../controller-api/index.js';
 import { UmbContextToken, UmbContextCallback, UmbContextConsumerController, UmbContextProviderController } from '../context-api/index.js';
 import { UmbObserverController } from '../observable-api/index.js';
-interface ResolvedContexts {
-    [key: string]: any;
-}
-export declare class UmbElementMixinInterface extends UmbControllerHostElement {
+export declare class UmbElement extends UmbControllerHostElement {
     observe<T>(source: Observable<T> | {
         asObservable: () => Observable<T>;
     }, callback: (_value: T) => void, unique?: string): UmbObserverController<T>;
     provideContext<R = unknown>(alias: string | UmbContextToken<R>, instance: R): UmbContextProviderController<R>;
     consumeContext<R = unknown>(alias: string | UmbContextToken<R>, callback: UmbContextCallback<R>): UmbContextConsumerController<R>;
-    consumeAllContexts(contextAliases: string[], callback: (_instances: ResolvedContexts) => void): void;
 }
-export declare const UmbElementMixin: <T extends HTMLElementConstructor>(superClass: T) => HTMLElementConstructor<UmbElementMixinInterface> & T;
-export {};
+export declare const UmbElementMixin: <T extends HTMLElementConstructor>(superClass: T) => HTMLElementConstructor<UmbElement> & T;

package/dist-cms/libs/element-api/element.mixin.js

@@ -1,8 +1,8 @@
-import { UmbControllerHostMixin } from '../controller-api/index.js';
+import { UmbControllerHostElementMixin } from '../controller-api/index.js';
 import { UmbContextConsumerController, UmbContextProviderController, } from '../context-api/index.js';
 import { UmbObserverController } from '../observable-api/index.js';
 export const UmbElementMixin = (superClass) => {
-    class UmbElementMixinClass extends UmbControllerHostMixin(superClass) {
+    class UmbElementMixinClass extends UmbControllerHostElementMixin(superClass) {
         /**
          * @description Observe a RxJS source of choice.
          * @param {Observable<T>} source RxJS source
@@ -33,26 +33,6 @@ export const UmbElementMixin = (superClass) => {
         consumeContext(alias, callback) {
             return new UmbContextConsumerController(this, alias, callback);
         }
-        /**
-         * @description Setup a subscription for multiple contexts. The callback is called when all contexts are resolved.
-         * @param {string} aliases
-         * @param {method} callback Callback method called when all contexts are resolved.
-         * @memberof UmbElementMixin
-         * @deprecated it should not be necessary to consume multiple contexts at once, use consumeContext instead with an UmbContextToken
-         */
-        consumeAllContexts(_contextAliases, callback) {
-            let resolvedAmount = 0;
-            const controllers = _contextAliases.map((alias) => new UmbContextConsumerController(this, alias, () => {
-                resolvedAmount++;
-                if (resolvedAmount === _contextAliases.length) {
-                    const result = {};
-                    controllers.forEach((contextCtrl) => {
-                        result[contextCtrl.consumerAlias?.toString()] = contextCtrl.instance;
-                    });
-                    callback(result);
-                }
-            }));
-        }
     }
     return UmbElementMixinClass;
 };

package/dist-cms/libs/element-api/element.mixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"element.mixin.js","sourceRoot":"","sources":["../../../src/libs/element-api/element.mixin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAGN,4BAA4B,EAC5B,4BAA4B,GAC5B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAqB/E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAmC,UAAa,EAAE,EAAE;IAClF,MAAM,oBAAqB,SAAQ,sBAAsB,CAAC,UAAU,CAAC;QACpE;;;;;;WAMG;QACH,OAAO,CACN,MAA6D,EAC7D,QAA6B,EAC7B,MAAe;YAEf,OAAO,IAAI,qBAAqB,CAC/B,IAAI,EACH,MAAc,CAAC,YAAY,CAAC,CAAC,CAAE,MAAc,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,MAAM,EACtE,QAAQ,EACR,MAAM,CACN,CAAC;QACH,CAAC;QAED;;;;;;WAMG;QACH,cAAc,CAAc,KAAkC,EAAE,QAAW;YAC1E,OAAO,IAAI,4BAA4B,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC;QAED;;;;;;WAMG;QACH,cAAc,CACb,KAAkC,EAClC,QAA+B;YAE/B,OAAO,IAAI,4BAA4B,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC;QAED;;;;;;WAMG;QACH,kBAAkB,CAAC,eAA8B,EAAE,QAAgD;YAClG,IAAI,cAAc,GAAG,CAAC,CAAC;YACvB,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CACtC,CAAC,KAAK,EAAE,EAAE,CACT,IAAI,4BAA4B,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE;gBAClD,cAAc,EAAE,CAAC;gBAEjB,IAAI,cAAc,KAAK,eAAe,CAAC,MAAM,EAAE;oBAC9C,MAAM,MAAM,GAAqB,EAAE,CAAC;oBAEpC,WAAW,CAAC,OAAO,CAAC,CAAC,WAAyC,EAAE,EAAE;wBACjE,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC;oBACtE,CAAC,CAAC,CAAC;oBAEH,QAAQ,CAAC,MAAM,CAAC,CAAC;iBACjB;YACF,CAAC,CAAC,CACH,CAAC;QACH,CAAC;KACD;IAED,OAAO,oBAAuF,CAAC;AAChG,CAAC,CAAC"}
+{"version":3,"file":"element.mixin.js","sourceRoot":"","sources":["../../../src/libs/element-api/element.mixin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAEvF,OAAO,EAGN,4BAA4B,EAC5B,4BAA4B,GAC5B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAe/E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAmC,UAAa,EAAE,EAAE;IAClF,MAAM,oBAAqB,SAAQ,6BAA6B,CAAC,UAAU,CAAC;QAC3E;;;;;;WAMG;QACH,OAAO,CACN,MAA6D,EAC7D,QAA6B,EAC7B,MAAe;YAEf,OAAO,IAAI,qBAAqB,CAC/B,IAAI,EACH,MAAc,CAAC,YAAY,CAAC,CAAC,CAAE,MAAc,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,MAAM,EACtE,QAAQ,EACR,MAAM,CACN,CAAC;QACH,CAAC;QAED;;;;;;WAMG;QACH,cAAc,CAAc,KAAkC,EAAE,QAAW;YAC1E,OAAO,IAAI,4BAA4B,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC;QAED;;;;;;WAMG;QACH,cAAc,CACb,KAAkC,EAClC,QAA+B;YAE/B,OAAO,IAAI,4BAA4B,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC;KACD;IAED,OAAO,oBAAyE,CAAC;AAClF,CAAC,CAAC"}

package/dist-cms/libs/extension-api/bundle-extension-initializer.d.ts

@@ -5,4 +5,5 @@ export declare class UmbBundleExtensionInitializer {
     #private;
     constructor(host: UmbControllerHostElement, extensionRegistry: UmbExtensionRegistry<ManifestBundle>);
     instantiateBundle(manifest: ManifestBundle): Promise<void>;
+    unregisterBundle(manifest: ManifestBundle): Promise<void>;
 }

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

@@ -1,17 +1,22 @@
 import { loadExtension } from './load-extension.function.js';
 export class UmbBundleExtensionInitializer {
-    #host;
     #extensionRegistry;
     #bundleMap = new Map();
     constructor(host, extensionRegistry) {
-        this.#host = host;
         this.#extensionRegistry = extensionRegistry;
         extensionRegistry.extensionsOfType('bundle').subscribe((bundles) => {
+            // Unregister removed bundles:
+            this.#bundleMap.forEach((existingBundle) => {
+                if (!bundles.find((b) => b.alias === existingBundle.alias)) {
+                    this.unregisterBundle(existingBundle);
+                    this.#bundleMap.delete(existingBundle.alias);
+                }
+            });
+            // Register new bundles:
             bundles.forEach((bundle) => {
                 if (this.#bundleMap.has(bundle.alias))
                     return;
                 this.#bundleMap.set(bundle.alias, bundle);
-                // TODO: Should we unInit a entry point if is removed?
                 this.instantiateBundle(bundle);
             });
         });
@@ -30,5 +35,19 @@ export class UmbBundleExtensionInitializer {
             });
         }
     }
+    async unregisterBundle(manifest) {
+        const js = await loadExtension(manifest);
+        if (js) {
+            Object.keys(js).forEach((key) => {
+                const value = js[key];
+                if (Array.isArray(value)) {
+                    this.#extensionRegistry.unregisterMany(value.map((v) => v.alias));
+                }
+                else if (typeof value === 'object') {
+                    this.#extensionRegistry.unregister(value.alias);
+                }
+            });
+        }
+    }
 }
 //# sourceMappingURL=bundle-extension-initializer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundle-extension-initializer.js","sourceRoot":"","sources":["../../../src/libs/extension-api/bundle-extension-initializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAI7D,MAAM,OAAO,6BAA6B;IACzC,KAAK,CAAC;IACN,kBAAkB,CAAC;IACnB,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAEvB,YAAY,IAA8B,EAAE,iBAAuD;QAClG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,iBAAiB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YAClE,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC1B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;oBAAE,OAAO;gBAC9C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC1C,sDAAsD;gBACtD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,QAAwB;QAC/C,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;QAEzC,IAAI,EAAE,EAAE;YACP,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC/B,MAAM,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;gBAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACzB,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;iBAC5C;qBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBACrC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBACxC;YACF,CAAC,CAAC,CAAC;SACH;IACF,CAAC;CACD"}
+{"version":3,"file":"bundle-extension-initializer.js","sourceRoot":"","sources":["../../../src/libs/extension-api/bundle-extension-initializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAI7D,MAAM,OAAO,6BAA6B;IACzC,kBAAkB,CAAC;IACnB,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAEvB,YAAY,IAA8B,EAAE,iBAAuD;QAClG,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,iBAAiB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YAClE,8BAA8B;YAC9B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE;oBAC3D,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;oBACtC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;iBAC7C;YACF,CAAC,CAAC,CAAC;YAEH,wBAAwB;YACxB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC1B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;oBAAE,OAAO;gBAC9C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC1C,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,QAAwB;QAC/C,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;QAEzC,IAAI,EAAE,EAAE;YACP,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC/B,MAAM,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;gBAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACzB,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;iBAC5C;qBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBACrC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBACxC;YACF,CAAC,CAAC,CAAC;SACH;IACF,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAwB;QAC9C,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;QAEzC,IAAI,EAAE,EAAE;YACP,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC/B,MAAM,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;gBAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACzB,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;iBAClE;qBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBACrC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAE,KAAsB,CAAC,KAAK,CAAC,CAAC;iBAClE;YACF,CAAC,CAAC,CAAC;SACH;IACF,CAAC;CACD"}

package/dist-cms/libs/extension-api/entry-point-extension-initializer.d.ts

@@ -1,8 +1,8 @@
 import type { ManifestEntryPoint } from './types.js';
 import { UmbExtensionRegistry } from './registry/extension.registry.js';
-import { UmbElementMixinInterface } from '../element-api/index.js';
+import { UmbElement } from '../element-api/index.js';
 export declare class UmbEntryPointExtensionInitializer {
     #private;
-    constructor(host: UmbElementMixinInterface, extensionRegistry: UmbExtensionRegistry<ManifestEntryPoint>);
+    constructor(host: UmbElement, extensionRegistry: UmbExtensionRegistry<ManifestEntryPoint>);
     instantiateEntryPoint(manifest: ManifestEntryPoint): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"entry-point-extension-initializer.js","sourceRoot":"","sources":["../../../src/libs/extension-api/entry-point-extension-initializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAI7D,MAAM,OAAO,iCAAiC;IAC7C,KAAK,CAAC;IACN,kBAAkB,CAAC;IACnB,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;IAE3B,YAAY,IAA8B,EAAE,iBAA2D;QACtG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE;YAC1E,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;gBAClC,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBAAE,OAAO;gBACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;gBACtD,sDAAsD;gBACtD,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,QAA4B;QACvD,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;QACzC,kGAAkG;QAClG,IAAI,aAAa,CAAC,EAAE,CAAC,EAAE;YACtB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAC/C;IACF,CAAC;CACD"}
+{"version":3,"file":"entry-point-extension-initializer.js","sourceRoot":"","sources":["../../../src/libs/extension-api/entry-point-extension-initializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAI7D,MAAM,OAAO,iCAAiC;IAC7C,KAAK,CAAC;IACN,kBAAkB,CAAC;IACnB,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;IAE3B,YAAY,IAAgB,EAAE,iBAA2D;QACxF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE;YAC1E,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;gBAClC,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;oBAAE,OAAO;gBACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;gBACtD,sDAAsD;gBACtD,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,QAA4B;QACvD,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;QACzC,kGAAkG;QAClG,IAAI,aAAa,CAAC,EAAE,CAAC,EAAE;YACtB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAC/C;IACF,CAAC;CACD"}

package/dist-cms/libs/extension-api/{umb-lifecycle.interface.d.ts → entry-point.interface.d.ts}

@@ -1,7 +1,7 @@
 import type { UmbExtensionRegistry } from './registry/extension.registry.js';
 import { ManifestBase } from './types.js';
-import type { UmbElementMixinInterface } from '../element-api/index.js';
-export type UmbEntryPointOnInit = (host: UmbElementMixinInterface, extensionRegistry: UmbExtensionRegistry<ManifestBase>) => void;
+import type { UmbElement } from '../element-api/index.js';
+export type UmbEntryPointOnInit = (host: UmbElement, extensionRegistry: UmbExtensionRegistry<ManifestBase>) => void;
 /**
  * Interface containing supported life-cycle functions for ESModule entry points
  */

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=entry-point.interface.js.map

package/dist-cms/libs/extension-api/entry-point.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entry-point.interface.js","sourceRoot":"","sources":["../../../src/libs/extension-api/entry-point.interface.ts"],"names":[],"mappings":""}

package/dist-cms/libs/extension-api/has-init-export.function.d.ts

@@ -1,4 +1,4 @@
-import type { UmbEntryPointModule } from './umb-lifecycle.interface.js';
+import type { UmbEntryPointModule } from './entry-point.interface.js';
 /**
  * Validate if an ESModule exports a known init function called 'onInit'
  */

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

@@ -9,4 +9,4 @@ export * from './load-extension.function.js';
 export * from './registry/extension.registry.js';
 export * from './type-guards/index.js';
 export * from './types.js';
-export * from './umb-lifecycle.interface.js';
+export * from './entry-point.interface.js';

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

@@ -9,5 +9,5 @@ export * from './load-extension.function.js';
 export * from './registry/extension.registry.js';
 export * from './type-guards/index.js';
 export * from './types.js';
-export * from './umb-lifecycle.interface.js';
+export * from './entry-point.interface.js';
 //# sourceMappingURL=index.js.map

package/dist-cms/libs/extension-api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/extension-api/index.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC;AAClD,cAAc,sCAAsC,CAAC;AACrD,cAAc,oDAAoD,CAAC;AACnE,cAAc,wCAAwC,CAAC;AACvD,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/extension-api/index.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC;AAClD,cAAc,sCAAsC,CAAC;AACrD,cAAc,oDAAoD,CAAC;AACnE,cAAc,wCAAwC,CAAC;AACvD,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC;AAC3B,cAAc,4BAA4B,CAAC"}

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

@@ -9,6 +9,7 @@ export declare class UmbExtensionRegistry<IncomingManifestTypes extends Manifest
     defineKind(kind: ManifestKind<ManifestTypes>): void;
     register(manifest: ManifestTypes | ManifestKind<ManifestTypes>): void;
     registerMany(manifests: Array<ManifestTypes | ManifestKind<ManifestTypes>>): void;
+    unregisterMany(aliases: Array<string>): void;
     unregister(alias: string): void;
     isRegistered(alias: string): boolean;
     private _kindsOfType;

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

@@ -1,4 +1,5 @@
-import { BehaviorSubject, map, distinctUntilChanged, combineLatest, } from '../../../external/rxjs/index.js';
+import { UmbBasicState } from '../../observable-api/index.js';
+import { map, distinctUntilChanged, combineLatest } from '../../../external/rxjs/index.js';
 function extensionArrayMemoization(previousValue, currentValue) {
     // If length is different, data is different:
     if (previousValue.length !== currentValue.length) {
@@ -10,6 +11,28 @@ function extensionArrayMemoization(previousValue, currentValue) {
     }
     return true;
 }
+// Note: Keeping the memoization in two separate function, for performance concern.
+function extensionAndKindMatchArrayMemoization(previousValue, currentValue) {
+    // If length is different, data is different:
+    if (previousValue.length !== currentValue.length) {
+        return false;
+    }
+    // previousValue has an alias that is not present in currentValue:
+    /* !! This is covered by the test below:
+    if (previousValue.find((p) => !currentValue.find((c) => c.alias === p.alias))) {
+        return false;
+    }*/
+    // if previousValue has different meta values:
+    if (currentValue.find((newValue) => {
+        const oldValue = previousValue.find((c) => c.alias === newValue.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 false;
+    }
+    return true;
+}
 function extensionSingleMemoization(previousValue, currentValue) {
     if (previousValue && currentValue) {
         return previousValue.alias === currentValue.alias;
@@ -20,10 +43,9 @@ const sortExtensions = (a, b) => (b.weight || 0) - (a.weight || 0);
 export class UmbExtensionRegistry {
     constructor() {
         this.MANIFEST_TYPES = undefined;
-        // TODO: Use UniqueBehaviorSubject, as we don't want someone to edit data of extensions.
-        this._extensions = new BehaviorSubject([]);
+        this._extensions = new UmbBasicState([]);
         this.extensions = this._extensions.asObservable();
-        this._kinds = new BehaviorSubject([]);
+        this._kinds = new UmbBasicState([]);
         this.kinds = this._kinds.asObservable();
     }
     defineKind(kind) {
@@ -51,19 +73,23 @@ export class UmbExtensionRegistry {
     registerMany(manifests) {
         manifests.forEach((manifest) => this.register(manifest));
     }
+    unregisterMany(aliases) {
+        aliases.forEach((alias) => this.unregister(alias));
+    }
     unregister(alias) {
-        const oldExtensionsValues = this._extensions.getValue();
-        const newExtensionsValues = oldExtensionsValues.filter((extension) => extension.alias !== alias);
-        // TODO: Maybe its not needed to fire an console.error. as you might want to call this method without needing to check the existence first.
-        if (oldExtensionsValues.length === newExtensionsValues.length) {
-            console.error(`Unable to unregister extension with alias ${alias}`);
-            return;
-        }
+        const newKindsValues = this._kinds.getValue().filter((kind) => kind.alias !== alias);
+        const newExtensionsValues = this._extensions.getValue().filter((extension) => extension.alias !== alias);
+        this._kinds.next(newKindsValues);
         this._extensions.next(newExtensionsValues);
     }
     isRegistered(alias) {
-        const values = this._extensions.getValue();
-        return values.some((ext) => ext.alias === alias);
+        if (this._extensions.getValue().find((ext) => ext.alias === alias)) {
+            return true;
+        }
+        if (this._kinds.getValue().find((ext) => ext.alias === alias)) {
+            return true;
+        }
+        return false;
     }
     /*
     getByAlias(alias: string) {
@@ -94,7 +120,7 @@ export class UmbExtensionRegistry {
             if (ext) {
                 const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
                 if (baseManifest) {
-                    const merged = { ...baseManifest, ...ext };
+                    const merged = { isMatchedWithKind: true, ...baseManifest, ...ext };
                     if (baseManifest.meta) {
                         merged.meta = { ...baseManifest.meta, ...ext.meta };
                     }
@@ -110,7 +136,7 @@ export class UmbExtensionRegistry {
             // Specific Extension Meta merge (does not merge conditions)
             const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
             if (baseManifest) {
-                const merged = { ...baseManifest, ...ext };
+                const merged = { isMatchedWithKind: true, ...baseManifest, ...ext };
                 if (baseManifest.meta) {
                     merged.meta = { ...baseManifest.meta, ...ext.meta };
                 }
@@ -118,7 +144,7 @@ export class UmbExtensionRegistry {
             }
             return ext;
         })
-            .sort(sortExtensions)), distinctUntilChanged(extensionArrayMemoization));
+            .sort(sortExtensions)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
     }
     extensionsOfTypes(types) {
         return combineLatest([this._extensionsOfTypes(types), this._kindsOfTypes(types)]).pipe(map(([exts, kinds]) => exts
@@ -127,7 +153,7 @@ export class UmbExtensionRegistry {
             if (ext) {
                 const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
                 if (baseManifest) {
-                    const merged = { ...baseManifest, ...ext };
+                    const merged = { isMatchedWithKind: true, ...baseManifest, ...ext };
                     if (baseManifest.meta) {
                         merged.meta = { ...baseManifest.meta, ...ext.meta };
                     }
@@ -136,7 +162,7 @@ export class UmbExtensionRegistry {
             }
             return ext;
         })
-            .sort(sortExtensions)), distinctUntilChanged(extensionArrayMemoization));
+            .sort(sortExtensions)), distinctUntilChanged(extensionAndKindMatchArrayMemoization));
     }
 }
 //# sourceMappingURL=extension.registry.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"extension.registry.js","sourceRoot":"","sources":["../../../../src/libs/extension-api/registry/extension.registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extension.registry.js","sourceRoot":"","sources":["../../../../src/libs/extension-api/registry/extension.registry.ts"],"names":[],"mappings":"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"}