@fluojs/core 1.0.0-beta.6 → 1.0.1

package/dist/metadata/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/metadata/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACvB,sBAAsB,EACtB,wBAAwB,EAGzB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAsBpE;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,uBAAuB,GAAG,SAAS,CAiBhI;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,uBAAuB,GAChC,IAAI,CAEN;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,mBAAmB,EAChC,IAAI,EAAE,sBAAsB,GAC3B,IAAI,CAEN;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAI3F;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,qBAAqB,EAAE,CA8B7E;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,SAAS,sBAAsB,EAAE,CAQ9H;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,wBAAwB,EAAE,CAiBnF;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,mBAAmB,EAAE,CAExF"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/metadata/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACvB,sBAAsB,EACtB,wBAAwB,EAGzB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AA0FpE;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,uBAAuB,GAAG,SAAS,CAiBhI;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,uBAAuB,GAChC,IAAI,CAEN;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,mBAAmB,EAChC,IAAI,EAAE,sBAAsB,GAC3B,IAAI,CAEN;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAI3F;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,qBAAqB,EAAE,CA8B7E;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,SAAS,sBAAsB,EAAE,CAQ9H;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,wBAAwB,EAAE,CAiBnF;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,mBAAmB,EAAE,CAExF"}

package/dist/metadata/validation.js

@@ -3,6 +3,54 @@ import { createClonedWeakMapStore } from './store.js';
 const dtoFieldBindingStore = new WeakMap();
 const dtoFieldValidationStore = new WeakMap();
 const classValidationStore = createClonedWeakMapStore(rules => rules.map(rule => cloneMutableValue(rule)));
+function getInheritedTargets(target) {
+  const targets = [];
+  let current = target;
+  while (current && current !== Object.prototype) {
+    targets.unshift(current);
+    current = Object.getPrototypeOf(current);
+  }
+  return targets;
+}
+function getInheritedConstructors(target) {
+  const targets = [];
+  let current = target;
+  while (current && current !== Function.prototype) {
+    targets.unshift(current);
+    current = Object.getPrototypeOf(current);
+  }
+  return targets;
+}
+function getInheritedStoredDtoBindingMap(target) {
+  const merged = new Map();
+  for (const current of getInheritedTargets(target)) {
+    const stored = dtoFieldBindingStore.get(current);
+    if (!stored) {
+      continue;
+    }
+    for (const [propertyKey, metadata] of stored) {
+      merged.set(propertyKey, cloneMutableValue(metadata));
+    }
+  }
+  return merged;
+}
+function getInheritedStoredDtoValidationMap(target) {
+  const merged = new Map();
+  for (const current of getInheritedTargets(target)) {
+    const stored = dtoFieldValidationStore.get(current);
+    if (!stored) {
+      continue;
+    }
+    for (const [propertyKey, rules] of stored) {
+      const existing = merged.get(propertyKey) ?? [];
+      merged.set(propertyKey, [...existing, ...rules.map(rule => cloneMutableValue(rule))]);
+    }
+  }
+  return merged;
+}
+function getInheritedStoredClassValidationRules(target) {
+  return getInheritedConstructors(target).flatMap(current => classValidationStore.read(current) ?? []);
+}
 function getStandardDtoBindingMap(target) {
   return getStandardConstructorMetadataMap(target, standardMetadataKeys.dtoFieldBinding);
 }
@@ -22,7 +70,7 @@ function getStandardClassValidationRules(target) {
  * @returns The get dto field binding metadata result.
  */
 export function getDtoFieldBindingMetadata(target, propertyKey) {
-  const stored = dtoFieldBindingStore.get(target)?.get(propertyKey);
+  const stored = getInheritedStoredDtoBindingMap(target).get(propertyKey);
   const standard = getStandardDtoBindingMap(target)?.get(propertyKey);
   const source = stored?.source ?? standard?.source;
   if (!source) {
@@ -82,7 +130,7 @@ export function appendClassValidationRule(target, rule) {
  * @returns The get dto binding schema result.
  */
 export function getDtoBindingSchema(dto) {
-  const stored = dtoFieldBindingStore.get(dto.prototype) ?? new Map();
+  const stored = getInheritedStoredDtoBindingMap(dto.prototype);
   const standard = getStandardMetadataBag(dto)?.[standardMetadataKeys.dtoFieldBinding] ?? new Map();
   const keys = mergeMetadataPropertyKeys(stored, standard);
   return keys.flatMap(propertyKey => {
@@ -115,7 +163,7 @@ export function getDtoBindingSchema(dto) {
  * @returns The get dto field validation rules result.
  */
 export function getDtoFieldValidationRules(target, propertyKey) {
-  const stored = dtoFieldValidationStore.get(target)?.get(propertyKey) ?? [];
+  const stored = getInheritedStoredDtoValidationMap(target).get(propertyKey) ?? [];
   const standard = getStandardDtoValidationMap(target)?.get(propertyKey) ?? [];
   return [...standard.map(rule => cloneMutableValue(rule)), ...stored.map(rule => cloneMutableValue(rule))];
 }
@@ -127,7 +175,7 @@ export function getDtoFieldValidationRules(target, propertyKey) {
  * @returns The get dto validation schema result.
  */
 export function getDtoValidationSchema(dto) {
-  const stored = dtoFieldValidationStore.get(dto.prototype) ?? new Map();
+  const stored = getInheritedStoredDtoValidationMap(dto.prototype);
   const standard = getStandardDtoValidationMap(dto.prototype) ?? new Map();
   const keys = mergeMetadataPropertyKeys(stored, standard);
   return keys.flatMap(propertyKey => {
@@ -149,5 +197,5 @@ export function getDtoValidationSchema(dto) {
  * @returns The get class validation rules result.
  */
 export function getClassValidationRules(target) {
-  return [...(getStandardClassValidationRules(target) ?? []), ...(classValidationStore.read(target) ?? [])];
+  return [...(getStandardClassValidationRules(target) ?? []), ...getInheritedStoredClassValidationRules(target)];
 }

package/package.json

@@ -9,7 +9,7 @@
     "types",
     "foundation"
   ],
-  "version": "1.0.0-beta.6",
+  "version": "1.0.1",
   "private": false,
   "license": "MIT",
   "repository": {