effectable 1.0.0 → 1.1.0-canary.10

package/build/connect/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/connect/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CACzD,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,CAAC,KACL,CAAC,CAAC;AAEP;;;;;;GAMG;AACH,MAAM,MAAM,0BAA0B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CACxE,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAC3B,KAAK,EAAE,CAAC,KACL,OAAO,CAAC;AAEb;;;;GAIG;AACH,MAAM,MAAM,8BAA8B,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;AAEjH;;;GAGG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,MAAM,CAC/D,MAAM,EACN,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAC1B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,IAC1D,0BAA0B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GACnC,8BAA8B,CAAC,CAAC,CAAC,GACjC,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAEzB;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;;;;OASG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAE,SAAQ,SAAS;IAC9E,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;CACnF;AAED;;;;;;GAMG;AACH,MAAM,MAAM,sBAAsB,CAChC,CAAC,GAAG,OAAO,EACX,CAAC,GAAG,OAAO,EACX,SAAS,SAAS,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,IACrE,KAAK,KAAK,EAAE,CAAC,KAAK,SAAS,CAAC;AAEhC;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,KAAK,KAAK,EAAE,GAAG,KAAK,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/connect/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CACzD,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,CAAC,KACL,CAAC,CAAC;AAEP;;;;;;GAMG;AACH,MAAM,MAAM,0BAA0B,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CACzE,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAC3B,KAAK,EAAE,CAAC,KACL,OAAO,CAAC;AAEb;;;;GAIG;AACH,MAAM,MAAM,8BAA8B,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;AAEjH;;;GAGG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,MAAM,CAC/D,MAAM,EACN,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAC1B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,IAC1D,0BAA0B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GACnC,8BAA8B,CAAC,CAAC,CAAC,GACjC,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAEzB;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;;;;OASG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAE,SAAQ,SAAS;IAC9E,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;CACnF;AAED;;;;;;GAMG;AACH,MAAM,MAAM,sBAAsB,CAChC,CAAC,GAAG,OAAO,EACX,CAAC,GAAG,OAAO,EACX,SAAS,SAAS,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,IACrE,KAAK,KAAK,EAAE,CAAC,KAAK,SAAS,CAAC;AAEhC;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,KAAK,KAAK,EAAE,GAAG,KAAK,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC"}

package/build/runtime/BusDecorators.d.ts

@@ -89,6 +89,9 @@ export declare function instanceUsesRuntimeBusDecorators(instance: object): bool
 export declare function wireRuntimeBusesIfDecorated<TCommand extends RuntimeCommand, TQuery extends RuntimeQuery, TEvent extends RuntimeEvent>(instance: object, buses: RuntimeBusesBundle<TCommand, TQuery, TEvent>): (() => void) | null;
 /**
  * Injects buses into `@Use*Bus` fields and registers `@OnCommand` / `@OnQuery` / `@OnEvent` handlers.
+ * Registration is transactional: if a handler registration or validation throws, all prior registrations
+ * are unwound in reverse order and the wiring error is rethrown. The returned disposer is idempotent
+ * and continues cleanup even if an individual disposer throws.
  *
  * @template TCommand
  * @template TQuery
@@ -101,6 +104,9 @@ export declare function wireRuntimeBuses<TCommand extends RuntimeCommand, TQuery
 /**
  * Wires multiple instances to one bus bundle: calls {@link wireRuntimeBuses} for each.
  * Order in `instances` defines wiring order; the disposer unregisters in reverse order.
+ * Wiring is transactional: if a later instance fails to wire, all earlier instances are unwound
+ * in reverse order. The returned disposer is idempotent and continues cleanup even if an
+ * individual disposer throws.
  *
  * @template TCommand
  * @template TQuery

package/build/runtime/BusDecorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BusDecorators.d.ts","sourceRoot":"","sources":["../../src/runtime/BusDecorators.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAIV,cAAc,EACd,YAAY,EACZ,YAAY,EACb,MAAM,SAAS,CAAC;AA0BjB;;;;GAIG;AACH,wBAAgB,aAAa,IAAK,iBAAiB,CAIlD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,IAAK,iBAAiB,CAIhD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,IAAK,iBAAiB,CAIhD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAE,WAAW,EAAE,MAAM,GAAG,eAAe,CAO/D;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAE,SAAS,EAAE,MAAM,GAAG,eAAe,CAO3D;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAE,SAAS,EAAE,MAAM,GAAG,eAAe,CAO3D;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CACjC,QAAQ,SAAS,cAAc,GAAG,cAAc,EAChD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,MAAM,SAAS,YAAY,GAAG,YAAY;IAE1C,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IACjC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,SAAS,cAAc,GAAG,cAAc,EAChD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,MAAM,SAAS,YAAY,GAAG,YAAY,KACtC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAMjD;AAqCD;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAkB3E;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,SAAS,cAAc,EAC/B,MAAM,SAAS,YAAY,EAC3B,MAAM,SAAS,YAAY,EAE3B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,GAClD,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAMrB;AAeD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,SAAS,cAAc,EAC/B,MAAM,SAAS,YAAY,EAC3B,MAAM,SAAS,YAAY,EAE3B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,GAClD,MAAM,IAAI,CAsEZ;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,SAAS,cAAc,EAC/B,MAAM,SAAS,YAAY,EAC3B,MAAM,SAAS,YAAY,EAE3B,KAAK,EAAE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EACnD,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,MAAM,IAAI,CAWZ"}
+{"version":3,"file":"BusDecorators.d.ts","sourceRoot":"","sources":["../../src/runtime/BusDecorators.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAIV,cAAc,EACd,YAAY,EACZ,YAAY,EACb,MAAM,SAAS,CAAC;AA0BjB;;;;GAIG;AACH,wBAAgB,aAAa,IAAK,iBAAiB,CAIlD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,IAAK,iBAAiB,CAIhD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,IAAK,iBAAiB,CAIhD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAE,WAAW,EAAE,MAAM,GAAG,eAAe,CAO/D;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAE,SAAS,EAAE,MAAM,GAAG,eAAe,CAO3D;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAE,SAAS,EAAE,MAAM,GAAG,eAAe,CAO3D;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CACjC,QAAQ,SAAS,cAAc,GAAG,cAAc,EAChD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,MAAM,SAAS,YAAY,GAAG,YAAY;IAE1C,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IACjC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,SAAS,cAAc,GAAG,cAAc,EAChD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,MAAM,SAAS,YAAY,GAAG,YAAY,KACtC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAMjD;AAqCD;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAkB3E;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,SAAS,cAAc,EAC/B,MAAM,SAAS,YAAY,EAC3B,MAAM,SAAS,YAAY,EAE3B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,GAClD,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAMrB;AAkCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,SAAS,cAAc,EAC/B,MAAM,SAAS,YAAY,EAC3B,MAAM,SAAS,YAAY,EAE3B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,GAClD,MAAM,IAAI,CAkGZ;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,SAAS,cAAc,EAC/B,MAAM,SAAS,YAAY,EAC3B,MAAM,SAAS,YAAY,EAE3B,KAAK,EAAE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EACnD,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,MAAM,IAAI,CAgCZ"}

package/build/runtime/BusDecorators.js

@@ -33,12 +33,12 @@ const ON_QUERY_ENTRIES = 'effectable:runtime:OnQuery:entries';
 const ON_EVENT_ENTRIES = 'effectable:runtime:OnEvent:entries';
 function appendPropKey(ctor, metaKey, propertyKey) {
     const key = String(propertyKey);
-    const current = Reflect.getMetadata(metaKey, ctor);
+    const current = Reflect.getOwnMetadata(metaKey, ctor);
     const next = typeof current === 'undefined' ? [key] : [...current, key];
     Reflect.defineMetadata(metaKey, next, ctor);
 }
 function appendHandlerEntry(ctor, metaKey, entry) {
-    const current = Reflect.getMetadata(metaKey, ctor);
+    const current = Reflect.getOwnMetadata(metaKey, ctor);
     const next = typeof current === 'undefined' ? [entry] : [...current, entry];
     Reflect.defineMetadata(metaKey, next, ctor);
 }
@@ -130,11 +130,11 @@ function createRuntimeBuses() {
     };
 }
 function getStringPropKeys(ctor, metaKey) {
-    const own = Reflect.getMetadata(metaKey, ctor);
+    const own = Reflect.getOwnMetadata(metaKey, ctor);
     return typeof own === 'undefined' ? [] : [...own];
 }
 function getHandlerEntries(ctor, metaKey) {
-    const own = Reflect.getMetadata(metaKey, ctor);
+    const own = Reflect.getOwnMetadata(metaKey, ctor);
     return typeof own === 'undefined' ? [] : [...own];
 }
 /**
@@ -203,8 +203,30 @@ function assignBusProps(instance, ctor, metaKey, value) {
         record[key] = value;
     }
 }
+/**
+ * Unwinds disposers in reverse order, continuing even if one throws.
+ * Returns primary error (if any) and optional cleanup errors.
+ *
+ * @param {Array<() => void>} disposers - disposers in registration order
+ * @returns {{ primaryError?: Error; cleanupErrors: Error[] }} unwinding result
+ */
+function unwindDisposers(disposers) {
+    const cleanupErrors = [];
+    for (let i = disposers.length - 1; i >= 0; i -= 1) {
+        try {
+            disposers[i]();
+        }
+        catch (err) {
+            cleanupErrors.push(err instanceof Error ? err : new Error(String(err)));
+        }
+    }
+    return { cleanupErrors };
+}
 /**
  * Injects buses into `@Use*Bus` fields and registers `@OnCommand` / `@OnQuery` / `@OnEvent` handlers.
+ * Registration is transactional: if a handler registration or validation throws, all prior registrations
+ * are unwound in reverse order and the wiring error is rethrown. The returned disposer is idempotent
+ * and continues cleanup even if an individual disposer throws.
  *
  * @template TCommand
  * @template TQuery
@@ -217,68 +239,98 @@ function wireRuntimeBuses(instance, buses) {
     const leafCtor = instance.constructor;
     const ctorChain = getConstructorChainLeafFirst(leafCtor);
     const disposers = [];
-    // Base → leaf: last assign wins when field names collide.
-    for (let i = ctorChain.length - 1; i >= 0; i -= 1) {
-        const ctor = ctorChain[i];
-        assignBusProps(instance, ctor, USE_COMMAND_BUS_PROPS, buses.commandBus);
-        assignBusProps(instance, ctor, USE_QUERY_BUS_PROPS, buses.queryBus);
-        assignBusProps(instance, ctor, USE_EVENT_BUS_PROPS, buses.eventBus);
-    }
-    const mergedCommand = new Map();
-    const mergedQuery = new Map();
-    const mergedEvent = new Map();
-    for (let i = ctorChain.length - 1; i >= 0; i -= 1) {
-        const ctor = ctorChain[i];
-        for (const { type, method } of getHandlerEntries(ctor, ON_COMMAND_ENTRIES)) {
-            mergedCommand.set(type, method);
+    try {
+        // Base → leaf: last assign wins when field names collide.
+        for (let i = ctorChain.length - 1; i >= 0; i -= 1) {
+            const ctor = ctorChain[i];
+            assignBusProps(instance, ctor, USE_COMMAND_BUS_PROPS, buses.commandBus);
+            assignBusProps(instance, ctor, USE_QUERY_BUS_PROPS, buses.queryBus);
+            assignBusProps(instance, ctor, USE_EVENT_BUS_PROPS, buses.eventBus);
         }
-        for (const { type, method } of getHandlerEntries(ctor, ON_QUERY_ENTRIES)) {
-            mergedQuery.set(type, method);
+        const mergedCommand = new Map();
+        const mergedQuery = new Map();
+        // EventBus is fan-out: keep every distinct method for a type (unlike Command/Query).
+        const mergedEvent = new Map();
+        for (let i = ctorChain.length - 1; i >= 0; i -= 1) {
+            const ctor = ctorChain[i];
+            for (const { type, method } of getHandlerEntries(ctor, ON_COMMAND_ENTRIES)) {
+                mergedCommand.set(type, method);
+            }
+            for (const { type, method } of getHandlerEntries(ctor, ON_QUERY_ENTRIES)) {
+                mergedQuery.set(type, method);
+            }
+            for (const { type, method } of getHandlerEntries(ctor, ON_EVENT_ENTRIES)) {
+                const existing = mergedEvent.get(type);
+                if (typeof existing === 'undefined') {
+                    mergedEvent.set(type, [method]);
+                }
+                else if (!existing.includes(method)) {
+                    existing.push(method);
+                }
+            }
         }
-        for (const { type, method } of getHandlerEntries(ctor, ON_EVENT_ENTRIES)) {
-            mergedEvent.set(type, method);
+        const record = instance;
+        for (const [type, method] of mergedCommand) {
+            const raw = record[method];
+            if (typeof raw !== 'function') {
+                throw new Error(`wireRuntimeBuses: OnCommand handler is not a function: ${method}`);
+            }
+            const handler = (command) => {
+                return raw.call(instance, command);
+            };
+            disposers.push(buses.commandBus.register(type, handler));
         }
-    }
-    const record = instance;
-    for (const [type, method] of mergedCommand) {
-        const raw = record[method];
-        if (typeof raw !== 'function') {
-            throw new Error(`wireRuntimeBuses: OnCommand handler is not a function: ${method}`);
+        for (const [type, method] of mergedQuery) {
+            const raw = record[method];
+            if (typeof raw !== 'function') {
+                throw new Error(`wireRuntimeBuses: OnQuery handler is not a function: ${method}`);
+            }
+            const handler = (query) => {
+                return raw.call(instance, query);
+            };
+            disposers.push(buses.queryBus.register(type, handler));
         }
-        const handler = (command) => {
-            return raw.call(instance, command);
-        };
-        disposers.push(buses.commandBus.register(type, handler));
-    }
-    for (const [type, method] of mergedQuery) {
-        const raw = record[method];
-        if (typeof raw !== 'function') {
-            throw new Error(`wireRuntimeBuses: OnQuery handler is not a function: ${method}`);
+        for (const [type, methods] of mergedEvent) {
+            for (const method of methods) {
+                const raw = record[method];
+                if (typeof raw !== 'function') {
+                    throw new Error(`wireRuntimeBuses: OnEvent handler is not a function: ${method}`);
+                }
+                const handler = (event) => {
+                    raw.call(instance, event);
+                };
+                disposers.push(buses.eventBus.subscribe(type, handler));
+            }
         }
-        const handler = (query) => {
-            return raw.call(instance, query);
-        };
-        disposers.push(buses.queryBus.register(type, handler));
     }
-    for (const [type, method] of mergedEvent) {
-        const raw = record[method];
-        if (typeof raw !== 'function') {
-            throw new Error(`wireRuntimeBuses: OnEvent handler is not a function: ${method}`);
+    catch (wiringError) {
+        const { cleanupErrors } = unwindDisposers(disposers);
+        const primary = wiringError instanceof Error ? wiringError : new Error(String(wiringError));
+        if (cleanupErrors.length > 0) {
+            primary.cleanupErrors = cleanupErrors;
         }
-        const handler = (event) => {
-            raw.call(instance, event);
-        };
-        disposers.push(buses.eventBus.subscribe(type, handler));
+        throw primary;
     }
+    let disposed = false;
     return () => {
-        for (const dispose of disposers.reverse()) {
-            dispose();
+        if (disposed) {
+            return;
+        }
+        disposed = true;
+        const { cleanupErrors } = unwindDisposers(disposers);
+        if (cleanupErrors.length > 0) {
+            const aggregateError = new Error(`wireRuntimeBuses: disposer cleanup encountered ${cleanupErrors.length} error(s)`);
+            aggregateError.cleanupErrors = cleanupErrors;
+            throw aggregateError;
         }
     };
 }
 /**
  * Wires multiple instances to one bus bundle: calls {@link wireRuntimeBuses} for each.
  * Order in `instances` defines wiring order; the disposer unregisters in reverse order.
+ * Wiring is transactional: if a later instance fails to wire, all earlier instances are unwound
+ * in reverse order. The returned disposer is idempotent and continues cleanup even if an
+ * individual disposer throws.
  *
  * @template TCommand
  * @template TQuery
@@ -289,13 +341,31 @@ function wireRuntimeBuses(instance, buses) {
  */
 function wireRuntimeBusesAll(buses, instances) {
     const disposers = [];
-    for (let i = 0; i < instances.length; i += 1) {
-        const instance = instances[i];
-        disposers.push(wireRuntimeBuses(instance, buses));
+    try {
+        for (let i = 0; i < instances.length; i += 1) {
+            const instance = instances[i];
+            disposers.push(wireRuntimeBuses(instance, buses));
+        }
+    }
+    catch (wiringError) {
+        const { cleanupErrors } = unwindDisposers(disposers);
+        const primary = wiringError instanceof Error ? wiringError : new Error(String(wiringError));
+        if (cleanupErrors.length > 0) {
+            primary.cleanupErrors = cleanupErrors;
+        }
+        throw primary;
     }
+    let disposed = false;
     return () => {
-        for (let j = disposers.length - 1; j >= 0; j -= 1) {
-            disposers[j]();
+        if (disposed) {
+            return;
+        }
+        disposed = true;
+        const { cleanupErrors } = unwindDisposers(disposers);
+        if (cleanupErrors.length > 0) {
+            const aggregateError = new Error(`wireRuntimeBusesAll: disposer cleanup encountered ${cleanupErrors.length} error(s)`);
+            aggregateError.cleanupErrors = cleanupErrors;
+            throw aggregateError;
         }
     };
 }

package/build/runtime/BusDecorators.js.map

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

package/build/runtime/CommandBus.d.ts

@@ -14,7 +14,7 @@ export declare class CommandBus<TCommand extends RuntimeCommand = RuntimeCommand
      *
      * @param {TCommand['type']} commandType - command type
      * @param {CommandHandler<TCommand, TResult>} handler - command handler
-     * @returns {() => void} unregister function
+     * @returns {() => void} unregister function; no-op if a different handler is now registered for the type
      * @throws {Error} if a handler is already registered
      */
     register<TResult>(commandType: TCommand['type'], handler: CommandHandler<TCommand, TResult>): () => void;

package/build/runtime/CommandBus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandBus.d.ts","sourceRoot":"","sources":["../../src/runtime/CommandBus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9D;;GAEG;AACH,qBAAa,UAAU,CAAC,QAAQ,SAAS,cAAc,GAAG,cAAc;IACtE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwD;IAEjF;;;;;;;OAOG;IACI,QAAQ,CAAC,OAAO,EACrB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,GACzC,MAAM,IAAI;IAWb;;;;;;OAMG;IACU,OAAO,CAAC,OAAO,EAAG,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAUnE;;;;;OAKG;IACI,UAAU,CAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI;IAIvD;;;;OAIG;IACI,KAAK,IAAK,IAAI;CAGtB"}
+{"version":3,"file":"CommandBus.d.ts","sourceRoot":"","sources":["../../src/runtime/CommandBus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9D;;GAEG;AACH,qBAAa,UAAU,CAAC,QAAQ,SAAS,cAAc,GAAG,cAAc;IACtE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwD;IAEjF;;;;;;;OAOG;IACI,QAAQ,CAAC,OAAO,EACrB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,GACzC,MAAM,IAAI;IAcb;;;;;;OAMG;IACU,OAAO,CAAC,OAAO,EAAG,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAUnE;;;;;OAKG;IACI,UAAU,CAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI;IAIvD;;;;OAIG;IACI,KAAK,IAAK,IAAI;CAGtB"}

package/build/runtime/CommandBus.js

@@ -16,16 +16,19 @@ class CommandBus {
      *
      * @param {TCommand['type']} commandType - command type
      * @param {CommandHandler<TCommand, TResult>} handler - command handler
-     * @returns {() => void} unregister function
+     * @returns {() => void} unregister function; no-op if a different handler is now registered for the type
      * @throws {Error} if a handler is already registered
      */
     register(commandType, handler) {
         if (this.handlers.has(commandType)) {
             throw new Error(`Command handler is already registered: ${commandType}`);
         }
-        this.handlers.set(commandType, handler);
+        const registered = handler;
+        this.handlers.set(commandType, registered);
         return () => {
-            this.unregister(commandType);
+            if (this.handlers.get(commandType) === registered) {
+                this.handlers.delete(commandType);
+            }
         };
     }
     /**

package/build/runtime/CommandBus.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandBus.js","sourceRoot":"","sources":["../../src/runtime/CommandBus.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;GAEG;AACH,MAAa,UAAU;IACJ,QAAQ,GAAG,IAAI,GAAG,EAA6C,CAAC;IAEjF;;;;;;;OAOG;IACI,QAAQ,CACb,WAA6B,EAC7B,OAA0C;QAE1C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,0CAA0C,WAAW,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,OAA4C,CAAC,CAAC;QAC7E,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC/B,CAAC,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAAW,OAAiB;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,sCAAsC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;QACtC,OAAO,MAAiB,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAE,WAA6B;QAC9C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF;AA5DD,gCA4DC"}
+{"version":3,"file":"CommandBus.js","sourceRoot":"","sources":["../../src/runtime/CommandBus.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;GAEG;AACH,MAAa,UAAU;IACJ,QAAQ,GAAG,IAAI,GAAG,EAA6C,CAAC;IAEjF;;;;;;;OAOG;IACI,QAAQ,CACb,WAA6B,EAC7B,OAA0C;QAE1C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,0CAA0C,WAAW,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,UAAU,GAAG,OAA4C,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC3C,OAAO,GAAG,EAAE;YACV,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,UAAU,EAAE,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACpC,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAAW,OAAiB;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,sCAAsC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;QACtC,OAAO,MAAiB,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAE,WAA6B;QAC9C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF;AA/DD,gCA+DC"}

package/build/runtime/EventBus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventBus.d.ts","sourceRoot":"","sources":["../../src/runtime/EventBus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1D;;GAEG;AACH,qBAAa,QAAQ,CAAC,MAAM,SAAS,YAAY,GAAG,YAAY;IAC9D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgD;IAC/E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D;;;;;OAKG;IACI,OAAO,CAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAapC;;;;;;OAMG;IACI,SAAS,CACd,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EACzB,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAC5B,MAAM,IAAI;IAcb;;;;;OAKG;IACI,YAAY,CAAE,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI;IAO/D;;;;;;OAMG;IACI,WAAW,CAChB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EACzB,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAC5B,IAAI;IAYP;;;;OAIG;IACI,KAAK,IAAK,IAAI;CAItB"}
+{"version":3,"file":"EventBus.d.ts","sourceRoot":"","sources":["../../src/runtime/EventBus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1D;;GAEG;AACH,qBAAa,QAAQ,CAAC,MAAM,SAAS,YAAY,GAAG,YAAY;IAC9D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgD;IAC/E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D;;;;;OAKG;IACI,OAAO,CAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAsBpC;;;;;;OAMG;IACI,SAAS,CACd,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EACzB,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAC5B,MAAM,IAAI;IAcb;;;;;OAKG;IACI,YAAY,CAAE,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI;IAO/D;;;;;;OAMG;IACI,WAAW,CAChB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EACzB,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAC5B,IAAI;IAYP;;;;OAIG;IACI,KAAK,IAAK,IAAI;CAItB"}

package/build/runtime/EventBus.js

@@ -19,13 +19,21 @@ class EventBus {
      * @returns {void}
      */
     publish(event) {
+        // Snapshot both sets before invoke so unsubscribe of a not-yet-called handler
+        // during this publish cannot silently skip that handler for the current event.
+        // Any-handlers must be snapshotted before typed handlers run: a typed handler
+        // that unsubscribes an any-handler would otherwise drop it for this event.
         const typedHandlers = this.handlersByType.get(event.type);
-        if (typeof typedHandlers !== 'undefined') {
-            for (const handler of typedHandlers) {
+        const typedSnapshot = typeof typedHandlers === 'undefined'
+            ? null
+            : [...typedHandlers];
+        const anySnapshot = [...this.anyHandlers];
+        if (typedSnapshot !== null) {
+            for (const handler of typedSnapshot) {
                 handler(event);
             }
         }
-        for (const handler of this.anyHandlers) {
+        for (const handler of anySnapshot) {
             handler(event);
         }
     }

package/build/runtime/EventBus.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventBus.js","sourceRoot":"","sources":["../../src/runtime/EventBus.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;GAEG;AACH,MAAa,QAAQ;IACF,cAAc,GAAG,IAAI,GAAG,EAAqC,CAAC;IAC9D,WAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;IAE/D;;;;;OAKG;IACI,OAAO,CAAE,KAAa;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,OAAO,aAAa,KAAK,WAAW,EAAE,CAAC;YACzC,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;gBACpC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACvC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,SAAS,CACd,SAAyB,EACzB,OAA6B;QAE7B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,WAAW;YAC7C,CAAC,CAAC,IAAI,GAAG,EAAwB;YACjC,CAAC,CAAC,OAAO,CAAC;QAEZ,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAE7C,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAE,OAA6B;QAChD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,WAAW,CAChB,SAAyB,EACzB,OAA6B;QAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;CACF;AA3FD,4BA2FC"}
+{"version":3,"file":"EventBus.js","sourceRoot":"","sources":["../../src/runtime/EventBus.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;GAEG;AACH,MAAa,QAAQ;IACF,cAAc,GAAG,IAAI,GAAG,EAAqC,CAAC;IAC9D,WAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;IAE/D;;;;;OAKG;IACI,OAAO,CAAE,KAAa;QAC3B,8EAA8E;QAC9E,+EAA+E;QAC/E,8EAA8E;QAC9E,2EAA2E;QAC3E,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,OAAO,aAAa,KAAK,WAAW;YACxD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC;QACvB,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QAE1C,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YAC3B,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;gBACpC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,SAAS,CACd,SAAyB,EACzB,OAA6B;QAE7B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,WAAW;YAC7C,CAAC,CAAC,IAAI,GAAG,EAAwB;YACjC,CAAC,CAAC,OAAO,CAAC;QAEZ,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAE7C,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAE,OAA6B;QAChD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,WAAW,CAChB,SAAyB,EACzB,OAA6B;QAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;CACF;AApGD,4BAoGC"}

package/build/runtime/HandleRegistry.d.ts

@@ -56,6 +56,7 @@ export declare function UseRef(): PropertyDecorator;
  */
 export declare class HandleRegistry {
     private readonly handles;
+    private getInheritedMetadata;
     private buildRefHandle;
     private resolveHandleKey;
     /**
@@ -77,7 +78,7 @@ export declare class HandleRegistry {
      *
      * @param {string} key - handle key
      * @param {THandle} handle - imperative API object
-     * @returns {() => void} unregister function
+     * @returns {() => void} unregister function; no-op if a different handle is now registered under the same key
      */
     register<THandle>(key: string, handle: THandle): () => void;
     /**

package/build/runtime/HandleRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HandleRegistry.d.ts","sourceRoot":"","sources":["../../src/runtime/HandleRegistry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,kBAAkB,CAAC;AAM1B,MAAM,MAAM,mBAAmB,CAAC,SAAS,GAAG,OAAO,IAC/C,MAAM,GACN,CAAC,CAAC,QAAQ,EAAE,SAAS,KAAK,MAAM,CAAC,CAAC;AAEtC;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,SAAS,GAAG,OAAO,EAC5C,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAC3C,cAAc,CAIhB;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAK,eAAe,CAmBtD;AAED;;;;GAIG;AACH,wBAAgB,MAAM,IAAK,iBAAiB,CAS3C;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IAEtD,OAAO,CAAC,cAAc;IA2CtB,OAAO,CAAC,gBAAgB;IAwBxB;;;;;;;;;OASG;IACI,YAAY,CAAE,QAAQ,EAAE,OAAO,GAAG,MAAM,IAAI;IAMnD;;;;;;;;;OASG;IACI,QAAQ,CAAC,OAAO,EAAG,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI;IAOnE;;;;;;;;OAQG;IACI,UAAU,CAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAIrC;;;;;;;OAOG;IACI,GAAG,CAAC,OAAO,EAAG,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAItD;;;;;;;;;;OAUG;IACI,OAAO,CAAC,OAAO,EAAG,GAAG,EAAE,MAAM,GAAG,OAAO;IAQ9C;;;;;;;;OAQG;IACI,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;;OAOG;IACI,IAAI,IAAK,MAAM,EAAE;IAIxB;;;;;;;OAOG;IACI,KAAK,IAAK,IAAI;CAGtB"}
+{"version":3,"file":"HandleRegistry.d.ts","sourceRoot":"","sources":["../../src/runtime/HandleRegistry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,kBAAkB,CAAC;AAM1B,MAAM,MAAM,mBAAmB,CAAC,SAAS,GAAG,OAAO,IAC/C,MAAM,GACN,CAAC,CAAC,QAAQ,EAAE,SAAS,KAAK,MAAM,CAAC,CAAC;AAEtC;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,SAAS,GAAG,OAAO,EAC5C,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAC3C,cAAc,CAIhB;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAK,eAAe,CAmBtD;AAED;;;;GAIG;AACH,wBAAgB,MAAM,IAAK,iBAAiB,CAS3C;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IAEtD,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,cAAc;IAsDtB,OAAO,CAAC,gBAAgB;IAwBxB;;;;;;;;;OASG;IACI,YAAY,CAAE,QAAQ,EAAE,OAAO,GAAG,MAAM,IAAI;IAMnD;;;;;;;;;OASG;IACI,QAAQ,CAAC,OAAO,EAAG,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI;IASnE;;;;;;;;OAQG;IACI,UAAU,CAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAIrC;;;;;;;OAOG;IACI,GAAG,CAAC,OAAO,EAAG,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAItD;;;;;;;;;;OAUG;IACI,OAAO,CAAC,OAAO,EAAG,GAAG,EAAE,MAAM,GAAG,OAAO;IAQ9C;;;;;;;;OAQG;IACI,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;;OAOG;IACI,IAAI,IAAK,MAAM,EAAE;IAIxB;;;;;;;OAOG;IACI,KAAK,IAAK,IAAI;CAGtB"}

package/build/runtime/HandleRegistry.js

@@ -62,7 +62,7 @@ function UseImperativeHandle() {
             return;
         }
         const ctor = target.constructor;
-        const current = Reflect.getMetadata(USE_IMPERATIVE_HANDLE_METADATA_KEY, ctor);
+        const current = Reflect.getOwnMetadata(USE_IMPERATIVE_HANDLE_METADATA_KEY, ctor);
         const next = typeof current === 'undefined'
             ? new Set()
             : new Set(current);
@@ -89,6 +89,21 @@ function UseRef() {
  */
 class HandleRegistry {
     handles = new Map();
+    getInheritedMetadata(ctor, metaKey) {
+        let current = ctor;
+        while (current != null && typeof current === 'function') {
+            const value = Reflect.getOwnMetadata(metaKey, current);
+            if (value !== undefined) {
+                return value;
+            }
+            const next = Object.getPrototypeOf(current);
+            if (typeof next !== 'function' || next === null) {
+                break;
+            }
+            current = next;
+        }
+        return undefined;
+    }
     buildRefHandle(instance) {
         const ctor = instance !== null && typeof instance === 'object'
             ? instance.constructor
@@ -96,7 +111,7 @@ class HandleRegistry {
         if (typeof ctor !== 'function') {
             throw new Error('HandleRegistry.autoRegister: invalid instance');
         }
-        const refPropertyKey = Reflect.getMetadata(USE_REF_PROPERTY_METADATA_KEY, ctor);
+        const refPropertyKey = this.getInheritedMetadata(ctor, USE_REF_PROPERTY_METADATA_KEY);
         if (typeof refPropertyKey === 'undefined') {
             throw new Error('HandleRegistry.autoRegister: missing ref property metadata (@UseRef)');
         }
@@ -104,8 +119,22 @@ class HandleRegistry {
         if (typeof ref !== 'object' || ref === null) {
             throw new Error('HandleRegistry.autoRegister: ref property is not an object');
         }
-        const methodNames = Reflect.getMetadata(USE_IMPERATIVE_HANDLE_METADATA_KEY, ctor);
-        if (typeof methodNames === 'undefined' || methodNames.size === 0) {
+        const methodNames = new Set();
+        let current = ctor;
+        while (current != null && typeof current === 'function') {
+            const ownMethods = Reflect.getOwnMetadata(USE_IMPERATIVE_HANDLE_METADATA_KEY, current);
+            if (ownMethods !== undefined) {
+                for (const methodName of ownMethods) {
+                    methodNames.add(methodName);
+                }
+            }
+            const next = Object.getPrototypeOf(current);
+            if (typeof next !== 'function' || next === null) {
+                break;
+            }
+            current = next;
+        }
+        if (methodNames.size === 0) {
             throw new Error('HandleRegistry.autoRegister: no @UseImperativeHandle methods');
         }
         for (const methodName of methodNames) {
@@ -124,7 +153,7 @@ class HandleRegistry {
         if (typeof ctor !== 'function') {
             throw new Error('HandleRegistry.autoRegister: invalid instance');
         }
-        const keyOrFactory = Reflect.getMetadata(USE_REF_METADATA_KEY, ctor);
+        const keyOrFactory = this.getInheritedMetadata(ctor, USE_REF_METADATA_KEY);
         if (typeof keyOrFactory === 'undefined') {
             throw new Error('HandleRegistry.autoRegister: missing @UseRef metadata');
         }
@@ -156,12 +185,14 @@ class HandleRegistry {
      *
      * @param {string} key - handle key
      * @param {THandle} handle - imperative API object
-     * @returns {() => void} unregister function
+     * @returns {() => void} unregister function; no-op if a different handle is now registered under the same key
      */
     register(key, handle) {
         this.handles.set(key, handle);
         return () => {
-            this.unregister(key);
+            if (this.handles.get(key) === handle) {
+                this.handles.delete(key);
+            }
         };
     }
     /**

package/build/runtime/HandleRegistry.js.map

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

package/build/runtime/QueryBus.d.ts

@@ -14,7 +14,7 @@ export declare class QueryBus<TQuery extends RuntimeQuery = RuntimeQuery> {
      *
      * @param {TQuery['type']} queryType - query type
      * @param {QueryHandler<TQuery, TResult>} handler - query handler
-     * @returns {() => void} unregister function
+     * @returns {() => void} unregister function; no-op if a different handler is now registered for the type
      * @throws {Error} if a handler is already registered
      */
     register<TResult>(queryType: TQuery['type'], handler: QueryHandler<TQuery, TResult>): () => void;

package/build/runtime/QueryBus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBus.d.ts","sourceRoot":"","sources":["../../src/runtime/QueryBus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1D;;GAEG;AACH,qBAAa,QAAQ,CAAC,MAAM,SAAS,YAAY,GAAG,YAAY;IAC9D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoD;IAE7E;;;;;;;OAOG;IACI,QAAQ,CAAC,OAAO,EACrB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EACzB,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,MAAM,IAAI;IAWb;;;;;;OAMG;IACU,OAAO,CAAC,OAAO,EAAG,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU/D;;;;;OAKG;IACI,UAAU,CAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;IAInD;;;;OAIG;IACI,KAAK,IAAK,IAAI;CAGtB"}
+{"version":3,"file":"QueryBus.d.ts","sourceRoot":"","sources":["../../src/runtime/QueryBus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1D;;GAEG;AACH,qBAAa,QAAQ,CAAC,MAAM,SAAS,YAAY,GAAG,YAAY;IAC9D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoD;IAE7E;;;;;;;OAOG;IACI,QAAQ,CAAC,OAAO,EACrB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EACzB,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,MAAM,IAAI;IAcb;;;;;;OAMG;IACU,OAAO,CAAC,OAAO,EAAG,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU/D;;;;;OAKG;IACI,UAAU,CAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;IAInD;;;;OAIG;IACI,KAAK,IAAK,IAAI;CAGtB"}

package/build/runtime/QueryBus.js

@@ -16,16 +16,19 @@ class QueryBus {
      *
      * @param {TQuery['type']} queryType - query type
      * @param {QueryHandler<TQuery, TResult>} handler - query handler
-     * @returns {() => void} unregister function
+     * @returns {() => void} unregister function; no-op if a different handler is now registered for the type
      * @throws {Error} if a handler is already registered
      */
     register(queryType, handler) {
         if (this.handlers.has(queryType)) {
             throw new Error(`Query handler is already registered: ${queryType}`);
         }
-        this.handlers.set(queryType, handler);
+        const registered = handler;
+        this.handlers.set(queryType, registered);
         return () => {
-            this.unregister(queryType);
+            if (this.handlers.get(queryType) === registered) {
+                this.handlers.delete(queryType);
+            }
         };
     }
     /**

package/build/runtime/QueryBus.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBus.js","sourceRoot":"","sources":["../../src/runtime/QueryBus.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;GAEG;AACH,MAAa,QAAQ;IACF,QAAQ,GAAG,IAAI,GAAG,EAAyC,CAAC;IAE7E;;;;;;;OAOG;IACI,QAAQ,CACb,SAAyB,EACzB,OAAsC;QAEtC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAwC,CAAC,CAAC;QACvE,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAAW,KAAa;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,oCAAoC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QACpC,OAAO,MAAiB,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAE,SAAyB;QAC1C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF;AA5DD,4BA4DC"}
+{"version":3,"file":"QueryBus.js","sourceRoot":"","sources":["../../src/runtime/QueryBus.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;GAEG;AACH,MAAa,QAAQ;IACF,QAAQ,GAAG,IAAI,GAAG,EAAyC,CAAC;IAE7E;;;;;;;OAOG;IACI,QAAQ,CACb,SAAyB,EACzB,OAAsC;QAEtC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,UAAU,GAAG,OAAwC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACzC,OAAO,GAAG,EAAE;YACV,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,UAAU,EAAE,CAAC;gBAChD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAAW,KAAa;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,oCAAoC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QACpC,OAAO,MAAiB,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAE,SAAyB;QAC1C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF;AA/DD,4BA+DC"}