moost 0.7.1 → 0.7.2

package/dist/index.cjs

@@ -48,7 +48,7 @@ let stamped = false;
 	if (stamped) return;
 	stamped = true;
 	stampModuleIdentity({
-		version: "0.7.1",
+		version: "0.7.2",
 		path: typeof __filename === "string" ? __filename : require("url").pathToFileURL(__filename).href
 	});
 }
@@ -136,7 +136,7 @@ function getDefaultLogger(topic) {
 
 //#endregion
 //#region packages/moost/src/event-scope.ts
-function _define_property$1(obj, key, value) {
+function _define_property$2(obj, key, value) {
 	if (key in obj) Object.defineProperty(obj, key, {
 		value,
 		enumerable: true,
@@ -232,7 +232,7 @@ const NO_ISOLATION = /* @__PURE__ */ new Set();
 		super({
 			logger: parent.logger,
 			parent
-		}), _define_property$1(this, "isolated", void 0), this.isolated = isolated;
+		}), _define_property$2(this, "isolated", void 0), this.isolated = isolated;
 	}
 };
 /**
@@ -385,6 +385,16 @@ let sourceRefs = [];
 
 //#endregion
 //#region packages/moost/src/metadata/moost-metadata.ts
+function _define_property$1(obj, key, value) {
+	if (key in obj) Object.defineProperty(obj, key, {
+		value,
+		enumerable: true,
+		configurable: true,
+		writable: true
+	});
+	else obj[key] = value;
+	return obj;
+}
 const METADATA_WORKSPACE = "moost";
 /**
 * A param entry is "bare" when it carries nothing but the design-time type
@@ -394,7 +404,71 @@ const METADATA_WORKSPACE = "moost";
 */ function isBareParam(param) {
 	return !param || Object.entries(param).every(([key, value]) => key === "type" || value === void 0);
 }
-const moostMate = new _prostojs_mate.Mate(METADATA_WORKSPACE, {
+/**
+* List keys that describe behaviour stacked on a class or method. Under
+* `@Inherit()` they ACCUMULATE along `extends` (base entries first, then the
+* subclass's own) instead of following the shallow own-wins merge — a subclass
+* adding a guard must not silently drop the base's error mapping or guard.
+* `authTransports` is written by `@Authenticate` (event-http) next to its
+* interceptor entry and has to travel with it. Route `handlers`, params,
+* `importController` (re-mounting would duplicate routes) and documentation
+* lists (swagger tags/security, …) keep own-wins semantics.
+*/ const ACCUMULATED_KEYS = [
+	"interceptors",
+	"pipes",
+	"authTransports",
+	"properties",
+	"requiredProps"
+];
+/**
+* The identity an entry is deduplicated by when it appears on both levels: the
+* `handler` reference for interceptor/pipe entries, the value itself otherwise.
+*/ function entryIdentity(entry) {
+	return entry?.handler ?? entry;
+}
+/**
+* Inherited entries first, then the own ones. An own entry that re-declares an
+* inherited one (same identity) takes the inherited entry's place.
+*/ function accumulate(inherited, own) {
+	const ownById = /* @__PURE__ */ new Map();
+	for (const entry of own) {
+		const id = entryIdentity(entry);
+		if (!ownById.has(id)) ownById.set(id, entry);
+	}
+	const result = [];
+	const placed = /* @__PURE__ */ new Set();
+	for (const entry of inherited) {
+		const id = entryIdentity(entry);
+		if (ownById.has(id)) {
+			placed.add(id);
+			result.push(ownById.get(id));
+		} else result.push(entry);
+	}
+	for (const entry of own) if (!placed.has(entryIdentity(entry))) result.push(entry);
+	return result;
+}
+const moostMate = new class MoostMate extends _prostojs_mate.Mate {
+	read(target, propKey) {
+		const result = super.read(target, propKey);
+		const meta = result;
+		if (!meta || this.settled.has(meta)) return result;
+		this.settled.add(meta);
+		const ctor = (0, _prostojs_mate.getConstructor)(target);
+		const own = Reflect.getOwnMetadata(this.workspace, typeof propKey === "string" ? ctor.prototype : ctor, propKey);
+		if (own && meta !== own) {
+			const inherited = this.read(Object.getPrototypeOf(ctor), propKey);
+			for (const key of ACCUMULATED_KEYS) {
+				const ownList = own[key];
+				const inheritedList = inherited?.[key];
+				if (Array.isArray(ownList) && Array.isArray(inheritedList) && inheritedList.length > 0) meta[key] = accumulate(inheritedList, ownList);
+			}
+		}
+		return result;
+	}
+	constructor(...args) {
+		super(...args), _define_property$1(this, "settled", /* @__PURE__ */ new WeakSet());
+	}
+}(METADATA_WORKSPACE, {
 	readType: true,
 	readReturnType: true,
 	collectPropKeys: true,
@@ -1366,6 +1440,12 @@ function fillLabel(target, key, index, name) {
 *   overrides, which merge the parent's metadata under their own (so adding
 *   e.g. a rate-limit decorator to an override does not unbind the parent's
 *   `@Get`/`@Post` route).
+* - Exception to "own keys win" (since 0.7.2): interceptors (incl.
+*   `@Authenticate` guards), pipes and prop decorators ACCUMULATE on the class
+*   and on overridden methods, parent first. The same interceptor/pipe
+*   *reference* on both levels runs once; a factory called on each level runs
+*   twice. A subclass can't remove a base class's class-level interceptors.
+*   Routes, params and `@ImportController` still replace.
 * - On a method/prop: enables inheritance for just that member.
 * - `@Inherit(false)` on an overridden member opts out of the merge for a
 *   deliberate full replacement (the member keeps only its own metadata).

package/dist/index.d.ts

@@ -1147,6 +1147,12 @@ declare function HandlerPaths(method?: string, opts?: TGetHandlerPathsOptions):
  *   overrides, which merge the parent's metadata under their own (so adding
  *   e.g. a rate-limit decorator to an override does not unbind the parent's
  *   `@Get`/`@Post` route).
+ * - Exception to "own keys win" (since 0.7.2): interceptors (incl.
+ *   `@Authenticate` guards), pipes and prop decorators ACCUMULATE on the class
+ *   and on overridden methods, parent first. The same interceptor/pipe
+ *   *reference* on both levels runs once; a factory called on each level runs
+ *   twice. A subclass can't remove a base class's class-level interceptors.
+ *   Routes, params and `@ImportController` still replace.
  * - On a method/prop: enables inheritance for just that member.
  * - `@Inherit(false)` on an overridden member opts out of the merge for a
  *   deliberate full replacement (the member keeps only its own metadata).

package/dist/index.mjs

@@ -47,7 +47,7 @@ let stamped = false;
 	if (stamped) return;
 	stamped = true;
 	stampModuleIdentity({
-		version: "0.7.1",
+		version: "0.7.2",
 		path: typeof __filename === "string" ? __filename : import.meta.url
 	});
 }
@@ -135,7 +135,7 @@ function getDefaultLogger(topic) {
 
 //#endregion
 //#region packages/moost/src/event-scope.ts
-function _define_property$1(obj, key, value) {
+function _define_property$2(obj, key, value) {
 	if (key in obj) Object.defineProperty(obj, key, {
 		value,
 		enumerable: true,
@@ -231,7 +231,7 @@ const NO_ISOLATION = /* @__PURE__ */ new Set();
 		super({
 			logger: parent.logger,
 			parent
-		}), _define_property$1(this, "isolated", void 0), this.isolated = isolated;
+		}), _define_property$2(this, "isolated", void 0), this.isolated = isolated;
 	}
 };
 /**
@@ -384,6 +384,16 @@ let sourceRefs = [];
 
 //#endregion
 //#region packages/moost/src/metadata/moost-metadata.ts
+function _define_property$1(obj, key, value) {
+	if (key in obj) Object.defineProperty(obj, key, {
+		value,
+		enumerable: true,
+		configurable: true,
+		writable: true
+	});
+	else obj[key] = value;
+	return obj;
+}
 const METADATA_WORKSPACE = "moost";
 /**
 * A param entry is "bare" when it carries nothing but the design-time type
@@ -393,7 +403,71 @@ const METADATA_WORKSPACE = "moost";
 */ function isBareParam(param) {
 	return !param || Object.entries(param).every(([key, value]) => key === "type" || value === void 0);
 }
-const moostMate = new Mate(METADATA_WORKSPACE, {
+/**
+* List keys that describe behaviour stacked on a class or method. Under
+* `@Inherit()` they ACCUMULATE along `extends` (base entries first, then the
+* subclass's own) instead of following the shallow own-wins merge — a subclass
+* adding a guard must not silently drop the base's error mapping or guard.
+* `authTransports` is written by `@Authenticate` (event-http) next to its
+* interceptor entry and has to travel with it. Route `handlers`, params,
+* `importController` (re-mounting would duplicate routes) and documentation
+* lists (swagger tags/security, …) keep own-wins semantics.
+*/ const ACCUMULATED_KEYS = [
+	"interceptors",
+	"pipes",
+	"authTransports",
+	"properties",
+	"requiredProps"
+];
+/**
+* The identity an entry is deduplicated by when it appears on both levels: the
+* `handler` reference for interceptor/pipe entries, the value itself otherwise.
+*/ function entryIdentity(entry) {
+	return entry?.handler ?? entry;
+}
+/**
+* Inherited entries first, then the own ones. An own entry that re-declares an
+* inherited one (same identity) takes the inherited entry's place.
+*/ function accumulate(inherited, own) {
+	const ownById = /* @__PURE__ */ new Map();
+	for (const entry of own) {
+		const id = entryIdentity(entry);
+		if (!ownById.has(id)) ownById.set(id, entry);
+	}
+	const result = [];
+	const placed = /* @__PURE__ */ new Set();
+	for (const entry of inherited) {
+		const id = entryIdentity(entry);
+		if (ownById.has(id)) {
+			placed.add(id);
+			result.push(ownById.get(id));
+		} else result.push(entry);
+	}
+	for (const entry of own) if (!placed.has(entryIdentity(entry))) result.push(entry);
+	return result;
+}
+const moostMate = new class MoostMate extends Mate {
+	read(target, propKey) {
+		const result = super.read(target, propKey);
+		const meta = result;
+		if (!meta || this.settled.has(meta)) return result;
+		this.settled.add(meta);
+		const ctor = getConstructor$1(target);
+		const own = Reflect.getOwnMetadata(this.workspace, typeof propKey === "string" ? ctor.prototype : ctor, propKey);
+		if (own && meta !== own) {
+			const inherited = this.read(Object.getPrototypeOf(ctor), propKey);
+			for (const key of ACCUMULATED_KEYS) {
+				const ownList = own[key];
+				const inheritedList = inherited?.[key];
+				if (Array.isArray(ownList) && Array.isArray(inheritedList) && inheritedList.length > 0) meta[key] = accumulate(inheritedList, ownList);
+			}
+		}
+		return result;
+	}
+	constructor(...args) {
+		super(...args), _define_property$1(this, "settled", /* @__PURE__ */ new WeakSet());
+	}
+}(METADATA_WORKSPACE, {
 	readType: true,
 	readReturnType: true,
 	collectPropKeys: true,
@@ -1365,6 +1439,12 @@ function fillLabel(target, key, index, name) {
 *   overrides, which merge the parent's metadata under their own (so adding
 *   e.g. a rate-limit decorator to an override does not unbind the parent's
 *   `@Get`/`@Post` route).
+* - Exception to "own keys win" (since 0.7.2): interceptors (incl.
+*   `@Authenticate` guards), pipes and prop decorators ACCUMULATE on the class
+*   and on overridden methods, parent first. The same interceptor/pipe
+*   *reference* on both levels runs once; a factory called on each level runs
+*   twice. A subclass can't remove a base class's class-level interceptors.
+*   Routes, params and `@ImportController` still replace.
 * - On a method/prop: enables inheritance for just that member.
 * - `@Inherit(false)` on an overridden member opts out of the merge for a
 *   deliberate full replacement (the member keeps only its own metadata).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "moost",
   "keywords": [
     "composables",
@@ -49,7 +49,7 @@
     "@wooksjs/event-http": "^0.8.0",
     "@wooksjs/http-body": "^0.8.0",
     "vitest": "4.1.12",
-    "@moostjs/event-http": "^0.7.1"
+    "@moostjs/event-http": "^0.7.2"
   },
   "scripts": {
     "pub": "pnpm publish --access public",