@tstdl/base 0.78.0-beta15 → 0.78.0-beta16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tstdl/base",
3
- "version": "0.78.0-beta15",
3
+ "version": "0.78.0-beta16",
4
4
  "author": "Patrick Hein",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -39,7 +39,7 @@
39
39
  "peerDependencies": {
40
40
  "@elastic/elasticsearch": "^8.2",
41
41
  "@koa/router": "^12.0",
42
- "@tstdl/angular": "^0.11.0-beta15",
42
+ "@tstdl/angular": "^0.11.0-beta16",
43
43
  "chroma-js": "^2.4",
44
44
  "got": "^12.3",
45
45
  "handlebars": "^4.7",
@@ -46,7 +46,7 @@ function getDecoratorData(target, propertyKey, descriptorOrParameterIndex) {
46
46
  }
47
47
  else if ((0, type_guards_1.isDefined)(propertyKey) && (0, type_guards_1.isNumber)(descriptorOrParameterIndex)) {
48
48
  return {
49
- type: 'parameter',
49
+ type: 'method-parameter',
50
50
  constructor,
51
51
  prototype,
52
52
  static: isStatic,
@@ -1 +1 @@
1
- {"version":3,"file":"decorator-data.js","sourceRoot":"","sources":["../../source/reflection/decorator-data.ts"],"names":[],"mappings":";;;AAAA,sDAA6F;AAE7F,mCAAyC;AAEzC,kDAAkD;AAClD,SAAgB,gBAAgB,CAAC,MAAc,EAAE,WAA6B,EAAE,0BAAwD;IACtI,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;IACxC,MAAM,QAAQ,GAAG,OAAO,MAAM,IAAI,UAAU,CAAC;IAE7C,IAAI,IAAA,yBAAW,EAAC,WAAW,CAAC,IAAI,IAAA,yBAAW,EAAC,0BAA0B,CAAC,EAAE;QACvE,OAAO;YACL,IAAI,EAAE,OAAO;YACb,WAAW;YACX,SAAS;SACV,CAAC;KACH;SACI,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,yBAAW,EAAC,0BAA0B,CAAC,EAAE;QAC1E,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,WAAW;YACX,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,WAAW;SACZ,CAAC;KACH;SACI,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,sBAAQ,EAAC,0BAA0B,CAAC,IAAI,CAAC,IAAA,wBAAU,EAAC,0BAA0B,CAAC,GAAG,IAAI,0BAA0B,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,wDAAwD;QACnN,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,WAAW;YACX,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,WAAW;YACX,UAAU,EAAE,0BAA0B;SACvC,CAAC;KACH;SACI,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,sBAAQ,EAAC,0BAA0B,CAAC,IAAI,IAAA,wBAAU,EAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE;QACvH,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,WAAW;YACX,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,WAAW;YACtB,UAAU,EAAE,0BAA0B;SACvC,CAAC;KACH;SACI,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,sBAAQ,EAAC,0BAA0B,CAAC,EAAE;QACvE,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,WAAW;YACX,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,WAAW;YACtB,KAAK,EAAE,0BAA0B;SAClC,CAAC;KACH;SACI,IAAI,IAAA,sBAAQ,EAAC,0BAA0B,CAAC,EAAE;QAC7C,OAAO;YACL,IAAI,EAAE,uBAAuB;YAC7B,WAAW;YACX,SAAS;YACT,KAAK,EAAE,0BAA0B;SAClC,CAAC;KACH;IAED,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAClC,CAAC;AA7DD,4CA6DC"}
1
+ {"version":3,"file":"decorator-data.js","sourceRoot":"","sources":["../../source/reflection/decorator-data.ts"],"names":[],"mappings":";;;AAAA,sDAA6F;AAE7F,mCAAyC;AAEzC,kDAAkD;AAClD,SAAgB,gBAAgB,CAAC,MAAc,EAAE,WAA6B,EAAE,0BAAwD;IACtI,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;IACxC,MAAM,QAAQ,GAAG,OAAO,MAAM,IAAI,UAAU,CAAC;IAE7C,IAAI,IAAA,yBAAW,EAAC,WAAW,CAAC,IAAI,IAAA,yBAAW,EAAC,0BAA0B,CAAC,EAAE;QACvE,OAAO;YACL,IAAI,EAAE,OAAO;YACb,WAAW;YACX,SAAS;SACV,CAAC;KACH;SACI,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,yBAAW,EAAC,0BAA0B,CAAC,EAAE;QAC1E,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,WAAW;YACX,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,WAAW;SACZ,CAAC;KACH;SACI,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,sBAAQ,EAAC,0BAA0B,CAAC,IAAI,CAAC,IAAA,wBAAU,EAAC,0BAA0B,CAAC,GAAG,IAAI,0BAA0B,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,wDAAwD;QACnN,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,WAAW;YACX,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,WAAW;YACX,UAAU,EAAE,0BAA0B;SACvC,CAAC;KACH;SACI,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,sBAAQ,EAAC,0BAA0B,CAAC,IAAI,IAAA,wBAAU,EAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE;QACvH,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,WAAW;YACX,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,WAAW;YACtB,UAAU,EAAE,0BAA0B;SACvC,CAAC;KACH;SACI,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,sBAAQ,EAAC,0BAA0B,CAAC,EAAE;QACvE,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,WAAW;YACX,SAAS;YACT,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,WAAW;YACtB,KAAK,EAAE,0BAA0B;SAClC,CAAC;KACH;SACI,IAAI,IAAA,sBAAQ,EAAC,0BAA0B,CAAC,EAAE;QAC7C,OAAO;YACL,IAAI,EAAE,uBAAuB;YAC7B,WAAW;YACX,SAAS;YACT,KAAK,EAAE,0BAA0B;SAClC,CAAC;KACH;IAED,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAClC,CAAC;AA7DD,4CA6DC"}
@@ -9,6 +9,6 @@ export declare function Property(options?: SpecificCreateDecoratorOptions<'prope
9
9
  export declare function Accessor(options?: SpecificCreateDecoratorOptions<'accessor'>): MethodDecorator;
10
10
  export declare function PropertyOrAccessor(options?: SpecificCreateDecoratorOptions<'property' | 'accessor'>): Decorator<'property' | 'accessor'>;
11
11
  export declare function Method(options?: SpecificCreateDecoratorOptions<'method'>): MethodDecorator;
12
- export declare function Parameter(options?: SpecificCreateDecoratorOptions<'parameter'>): ParameterDecorator;
13
- export declare function ConstructorParameter(options?: SpecificCreateDecoratorOptions<'constructorParameter'>): ParameterDecorator;
14
12
  export declare function MethodParameter(options?: SpecificCreateDecoratorOptions<'methodParameter'>): ParameterDecorator;
13
+ export declare function ConstructorParameter(options?: SpecificCreateDecoratorOptions<'constructorParameter'>): ParameterDecorator;
14
+ export declare function Parameter(options?: SpecificCreateDecoratorOptions<'parameter'>): ParameterDecorator;
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  /* eslint-disable @typescript-eslint/naming-convention */
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
- exports.MethodParameter = exports.ConstructorParameter = exports.Parameter = exports.Method = exports.PropertyOrAccessor = exports.Accessor = exports.Property = exports.Class = exports.Decorate = void 0;
4
+ exports.Parameter = exports.ConstructorParameter = exports.MethodParameter = exports.Method = exports.PropertyOrAccessor = exports.Accessor = exports.Property = exports.Class = exports.Decorate = void 0;
5
5
  const noop_1 = require("../utils/noop");
6
6
  require("reflect-metadata");
7
7
  const utils_1 = require("./utils");
@@ -38,16 +38,16 @@ function Method(options) {
38
38
  return (0, utils_1.createMethodDecorator)(options);
39
39
  }
40
40
  exports.Method = Method;
41
- function Parameter(options) {
42
- return (0, utils_1.createParameterDecorator)(options);
41
+ function MethodParameter(options) {
42
+ return (0, utils_1.createMethodParameterDecorator)(options);
43
43
  }
44
- exports.Parameter = Parameter;
44
+ exports.MethodParameter = MethodParameter;
45
45
  function ConstructorParameter(options) {
46
46
  return (0, utils_1.createConstructorParameterDecorator)(options);
47
47
  }
48
48
  exports.ConstructorParameter = ConstructorParameter;
49
- function MethodParameter(options) {
50
- return (0, utils_1.createMethodParameterDecorator)(options);
49
+ function Parameter(options) {
50
+ return (0, utils_1.createParameterDecorator)(options);
51
51
  }
52
- exports.MethodParameter = MethodParameter;
52
+ exports.Parameter = Parameter;
53
53
  //# sourceMappingURL=decorators.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../source/reflection/decorators.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAEzD,wCAAoC;AACpC,4BAA0B;AAG1B,mCAA2Q;AAE3Q,SAAgB,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,KAA8D,EAAE;IAC5G,OAAO,IAAA,uBAAe,EACpB;QACE,GAAG,OAAO;QACV,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,IAAI;QACf,eAAe,EAAE,IAAI;QACrB,oBAAoB,EAAE,IAAI;KAC3B,EACD,OAAO,IAAI,WAAI,CAChB,CAAC;AACJ,CAAC;AAdD,4BAcC;AAED,SAAgB,KAAK,CAAC,OAAiD;IACrE,OAAO,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAFD,sBAEC;AAED,SAAgB,QAAQ,CAAC,OAAoD;IAC3E,OAAO,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;AAC1C,CAAC;AAFD,4BAEC;AAED,SAAgB,QAAQ,CAAC,OAAoD;IAC3E,OAAO,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;AAC1C,CAAC;AAFD,4BAEC;AAED,SAAgB,kBAAkB,CAAC,OAAiE;IAClG,OAAO,IAAA,yCAAiC,EAAC,OAAO,CAAC,CAAC;AACpD,CAAC;AAFD,gDAEC;AAED,SAAgB,MAAM,CAAC,OAAkD;IACvE,OAAO,IAAA,6BAAqB,EAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AAFD,wBAEC;AAED,SAAgB,SAAS,CAAC,OAAqD;IAC7E,OAAO,IAAA,gCAAwB,EAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAFD,8BAEC;AAED,SAAgB,oBAAoB,CAAC,OAAgE;IACnG,OAAO,IAAA,2CAAmC,EAAC,OAAO,CAAC,CAAC;AACtD,CAAC;AAFD,oDAEC;AAED,SAAgB,eAAe,CAAC,OAA2D;IACzF,OAAO,IAAA,sCAA8B,EAAC,OAAO,CAAC,CAAC;AACjD,CAAC;AAFD,0CAEC"}
1
+ {"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../source/reflection/decorators.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAEzD,wCAAoC;AACpC,4BAA0B;AAG1B,mCAA2Q;AAE3Q,SAAgB,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,KAA8D,EAAE;IAC5G,OAAO,IAAA,uBAAe,EACpB;QACE,GAAG,OAAO;QACV,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,IAAI;QACf,eAAe,EAAE,IAAI;QACrB,oBAAoB,EAAE,IAAI;KAC3B,EACD,OAAO,IAAI,WAAI,CAChB,CAAC;AACJ,CAAC;AAdD,4BAcC;AAED,SAAgB,KAAK,CAAC,OAAiD;IACrE,OAAO,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAFD,sBAEC;AAED,SAAgB,QAAQ,CAAC,OAAoD;IAC3E,OAAO,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;AAC1C,CAAC;AAFD,4BAEC;AAED,SAAgB,QAAQ,CAAC,OAAoD;IAC3E,OAAO,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;AAC1C,CAAC;AAFD,4BAEC;AAED,SAAgB,kBAAkB,CAAC,OAAiE;IAClG,OAAO,IAAA,yCAAiC,EAAC,OAAO,CAAC,CAAC;AACpD,CAAC;AAFD,gDAEC;AAED,SAAgB,MAAM,CAAC,OAAkD;IACvE,OAAO,IAAA,6BAAqB,EAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AAFD,wBAEC;AAED,SAAgB,eAAe,CAAC,OAA2D;IACzF,OAAO,IAAA,sCAA8B,EAAC,OAAO,CAAC,CAAC;AACjD,CAAC;AAFD,0CAEC;AAED,SAAgB,oBAAoB,CAAC,OAAgE;IACnG,OAAO,IAAA,2CAAmC,EAAC,OAAO,CAAC,CAAC;AACtD,CAAC;AAFD,oDAEC;AAED,SAAgB,SAAS,CAAC,OAAqD;IAC7E,OAAO,IAAA,gCAAwB,EAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAFD,8BAEC"}
@@ -1,4 +1,4 @@
1
- import type { AbstractConstructor, AbstractType, Constructor } from "../types";
1
+ import type { AbstractConstructor } from "../types";
2
2
  import { ReflectionDataMap } from './reflection-data-map';
3
3
  import type { DecoratorData } from './types';
4
4
  export declare type ReflectionMetadata = TypeMetadata | PropertyMetadata | MethodMetadata | ConstructorParameterMetadata | MethodParameterMetadata;
@@ -20,22 +20,22 @@ export declare type TypeMetadata = MetadataBase<'type'> & {
20
20
  };
21
21
  export declare type PropertyMetadata = MetadataBase<'property'> & {
22
22
  key: string | symbol;
23
- type: AbstractType;
23
+ type: AbstractConstructor;
24
24
  isAccessor: boolean;
25
25
  data: ReflectionDataMap;
26
26
  };
27
27
  export declare type MethodMetadata = MetadataBase<'method'> & {
28
28
  parameters: MethodParameterMetadata[];
29
- returnType: AbstractType | undefined;
29
+ returnType: AbstractConstructor | undefined;
30
30
  data: ReflectionDataMap;
31
31
  };
32
32
  export declare type ConstructorParameterMetadata = MetadataBase<'constructor-parameter'> & {
33
- type: AbstractType | undefined;
33
+ type: AbstractConstructor | undefined;
34
34
  index: number;
35
35
  data: ReflectionDataMap;
36
36
  };
37
37
  export declare type MethodParameterMetadata = MetadataBase<'method-parameter'> & {
38
- type: AbstractType;
38
+ type: AbstractConstructor;
39
39
  index: number;
40
40
  data: ReflectionDataMap;
41
41
  };
@@ -43,8 +43,8 @@ export declare type ParameterMetadata = ConstructorParameterMetadata | MethodPar
43
43
  export declare class ReflectionRegistry {
44
44
  private readonly metadataMap;
45
45
  constructor();
46
- hasType(type: Constructor): boolean;
47
- getMetadata(type: AbstractType): TypeMetadata;
46
+ hasType(type: AbstractConstructor): boolean;
47
+ getMetadata(type: AbstractConstructor): TypeMetadata;
48
48
  register(target: object, propertyKey?: string | symbol, descriptorOrParameterIndex?: PropertyDescriptor | number): DecoratorData;
49
49
  registerDecoratorData(data: DecoratorData): ReflectionMetadata;
50
50
  /**
@@ -52,7 +52,7 @@ export declare class ReflectionRegistry {
52
52
  * However, this should not be necessary since WeakRefs are used.
53
53
  * @param type Type to unregister
54
54
  */
55
- unregister(type: AbstractType): void;
55
+ unregister(type: AbstractConstructor): void;
56
56
  private initializeType;
57
57
  }
58
58
  export declare const reflectionRegistry: ReflectionRegistry;
@@ -41,7 +41,7 @@ class ReflectionRegistry {
41
41
  else if (data.type == 'method') {
42
42
  return (data.static ? metadata.staticMethods : metadata.methods).get(data.methodKey);
43
43
  }
44
- else if (data.type == 'parameter') {
44
+ else if (data.type == 'method-parameter') {
45
45
  return (data.static ? metadata.staticMethods : metadata.methods).get(data.methodKey);
46
46
  }
47
47
  else if (data.type == 'constructor-parameter') { // eslint-disable-line @typescript-eslint/no-unnecessary-condition
@@ -1 +1 @@
1
- {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../source/reflection/registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../source/reflection/registry.ts"],"names":[],"mappings":"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"}
@@ -2,12 +2,13 @@ import type { Constructor, Record } from "../types";
2
2
  import type { UnionToIntersection } from 'type-fest';
3
3
  import type { ConstructorParameterMetadata, MethodMetadata, MethodParameterMetadata, ParameterMetadata, PropertyMetadata, TypeMetadata } from './registry';
4
4
  export declare type DecoratorType = 'class' | 'property' | 'accessor' | 'method' | 'parameter' | 'methodParameter' | 'constructorParameter';
5
- export declare type DecoratorHandler<T extends DecoratorType = DecoratorType> = (data: DecoratorData<T>, metadata: DecoratorMetadata<T>) => DecoratorHandlerReturnType<T>;
5
+ export declare type DecoratorHandler<T extends DecoratorType = DecoratorType> = (data: DecoratorData<T>, metadata: DecoratorMetadata<T>, originalArguments: Parameters<DecoratorUnion<T>>) => DecoratorHandlerReturnType<T>;
6
6
  export declare type DecoratorHandlerReturnType<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMap<DecoratorHandlerReturnTypeMap, T>;
7
7
  export declare type Decorator<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMapIntersection<DecoratorMap, T>;
8
8
  export declare type DecoratorUnion<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMap<DecoratorMap, T>;
9
9
  export declare type DecoratorData<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMap<DecoratorDataMap, T>;
10
10
  export declare type DecoratorMetadata<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMap<DecoratorMetadataMap, T>;
11
+ export declare type CombinedDecoratorParameters = [target: object, propertyKey?: string | symbol, descriptorOrParameterIndex?: PropertyDescriptor | number];
11
12
  export declare type DecoratorTypeMap<T extends Record<DecoratorType> = Record<DecoratorType>> = T;
12
13
  export declare type DecoratorOptionsTypeMap<T extends DecoratorTypeMap, U extends DecoratorType> = {
13
14
  [D in U]: T[D];
@@ -70,7 +71,7 @@ export declare type MethodDecoratorData = DecoratorDataBase<'method'> & {
70
71
  methodKey: string | symbol;
71
72
  descriptor: PropertyDescriptor;
72
73
  };
73
- export declare type MethodParameterDecoratorData = DecoratorDataBase<'parameter'> & {
74
+ export declare type MethodParameterDecoratorData = DecoratorDataBase<'method-parameter'> & {
74
75
  static: boolean;
75
76
  methodKey: string | symbol;
76
77
  index: number;
@@ -1,5 +1,5 @@
1
1
  import type { Constructor, OneOrMany, PropertiesOfType, Record, TypedOmit } from "../types";
2
- import type { Decorator, DecoratorHandler, DecoratorType, DecoratorUnion } from './types';
2
+ import type { CombinedDecoratorParameters, Decorator, DecoratorData, DecoratorHandler, DecoratorMetadata, DecoratorType, DecoratorUnion } from './types';
3
3
  export declare type CreateDecoratorTypeOptions = {
4
4
  [P in DecoratorType]?: boolean;
5
5
  };
@@ -14,6 +14,9 @@ export declare type SpecificCreateDecoratorOptions<T extends DecoratorType> = Ty
14
14
  handler?: DecoratorHandler<T>;
15
15
  include?: OneOrMany<DecoratorUnion<T>>;
16
16
  };
17
+ export declare type WrapDecoratorOptions = CreateDecoratorOptions & {
18
+ handler?: (data: DecoratorData, metadata: DecoratorMetadata, originalArguments: CombinedDecoratorParameters) => void;
19
+ };
17
20
  declare type CreateDecoratorType<T extends CreateDecoratorOptions> = Extract<PropertiesOfType<T, true>, DecoratorType>;
18
21
  export declare function createDecorator<T extends CreateDecoratorTypeOptions & CreateDecoratorOptions>(options: T, handler?: DecoratorHandler<CreateDecoratorType<T>>): Decorator<CreateDecoratorType<T>>;
19
22
  export declare function createClassDecorator(options?: SpecificCreateDecoratorOptions<'class'>): ClassDecorator;
@@ -21,9 +24,11 @@ export declare function createPropertyDecorator(options?: SpecificCreateDecorato
21
24
  export declare function createAccessorDecorator(options?: SpecificCreateDecoratorOptions<'accessor'>): MethodDecorator;
22
25
  export declare function createPropertyOrAccessorDecorator(options?: SpecificCreateDecoratorOptions<'property' | 'accessor'>): Decorator<'property' | 'accessor'>;
23
26
  export declare function createMethodDecorator(options?: SpecificCreateDecoratorOptions<'method'>): MethodDecorator;
24
- export declare function createParameterDecorator(options?: SpecificCreateDecoratorOptions<'parameter'>): ParameterDecorator;
25
27
  export declare function createMethodParameterDecorator(options?: SpecificCreateDecoratorOptions<'methodParameter'>): ParameterDecorator;
26
28
  export declare function createConstructorParameterDecorator(options?: SpecificCreateDecoratorOptions<'constructorParameter'>): ParameterDecorator;
29
+ export declare function createParameterDecorator(options?: SpecificCreateDecoratorOptions<'parameter'>): ParameterDecorator;
30
+ export declare function wrapDecoratorFactory<T extends (...args: any[]) => DecoratorUnion>(decoratorFactory: T, options?: WrapDecoratorOptions): T;
31
+ export declare function wrapDecorator<T extends DecoratorUnion>(decorator: T, options?: WrapDecoratorOptions): T;
27
32
  export declare function getConstructor<T extends Constructor = Constructor>(constructorOrTarget: object): T;
28
33
  export declare function getTypeInfoString(type: Constructor): string;
29
34
  export declare function printType(type: Constructor): void;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.printType = exports.getTypeInfoString = exports.getConstructor = exports.createConstructorParameterDecorator = exports.createMethodParameterDecorator = exports.createParameterDecorator = exports.createMethodDecorator = exports.createPropertyOrAccessorDecorator = exports.createAccessorDecorator = exports.createPropertyDecorator = exports.createClassDecorator = exports.createDecorator = void 0;
3
+ exports.printType = exports.getTypeInfoString = exports.getConstructor = exports.wrapDecorator = exports.wrapDecoratorFactory = exports.createParameterDecorator = exports.createConstructorParameterDecorator = exports.createMethodParameterDecorator = exports.createMethodDecorator = exports.createPropertyOrAccessorDecorator = exports.createAccessorDecorator = exports.createPropertyDecorator = exports.createClassDecorator = exports.createDecorator = void 0;
4
4
  const array_1 = require("../utils/array/array");
5
5
  const noop_1 = require("../utils/noop");
6
6
  const type_guards_1 = require("../utils/type-guards");
@@ -9,21 +9,23 @@ const registry_1 = require("./registry");
9
9
  // eslint-disable-next-line max-lines-per-function
10
10
  function createDecorator(options, handler = noop_1.noop) {
11
11
  // eslint-disable-next-line max-statements, max-lines-per-function
12
- function decoratorWrapper(target, propertyKey, descriptorOrParameterIndex) {
13
- const data = (0, decorator_data_1.getDecoratorData)(target, propertyKey, descriptorOrParameterIndex);
14
- const optionsType = (data.type == 'constructor-parameter') ? 'constructorParameter' : data.type;
12
+ function decoratorWrapper(...args) {
13
+ const data = (0, decorator_data_1.getDecoratorData)(...args);
14
+ const optionsType = (data.type == 'constructor-parameter') ? 'constructorParameter'
15
+ : (data.type == 'method-parameter') ? 'methodParameter'
16
+ : data.type;
15
17
  const valid = (options[optionsType] == true)
16
- || (optionsType == 'parameter' && ((options.constructorParameter == true) || (options.methodParameter == true)))
17
- || (((optionsType == 'constructorParameter') || (optionsType == 'methodParameter')) && (options.parameter == true));
18
+ || (optionsType == 'methodParameter' && ((options.methodParameter == true) || (options.parameter == true)))
19
+ || (optionsType == 'constructorParameter' && ((options.constructorParameter == true) || (options.parameter == true)));
18
20
  (0, type_guards_1.assert)(valid, () => `Decorator cannot be used for ${data.type}.`);
19
21
  const metadata = registry_1.reflectionRegistry.registerDecoratorData(data);
20
22
  if ((0, type_guards_1.isDefined)(options.data)) {
21
23
  metadata.data.setMany(options.data, options.mergeData);
22
24
  }
23
- const result = handler(data, metadata);
25
+ const result = handler(data, metadata, args);
24
26
  if ((0, type_guards_1.isDefined)(options.include)) {
25
27
  for (const include of (0, array_1.toArray)(options.include)) {
26
- include(target, propertyKey, descriptorOrParameterIndex); // eslint-disable-line @typescript-eslint/no-unsafe-argument
28
+ include(...args); // eslint-disable-line @typescript-eslint/no-unsafe-argument
27
29
  }
28
30
  }
29
31
  return result;
@@ -51,10 +53,6 @@ function createMethodDecorator(options = {}) {
51
53
  return createDecorator({ ...options, method: true }, options.handler);
52
54
  }
53
55
  exports.createMethodDecorator = createMethodDecorator;
54
- function createParameterDecorator(options = {}) {
55
- return createDecorator({ ...options, parameter: true }, options.handler);
56
- }
57
- exports.createParameterDecorator = createParameterDecorator;
58
56
  function createMethodParameterDecorator(options = {}) {
59
57
  return createDecorator({ ...options, methodParameter: true }, options.handler);
60
58
  }
@@ -63,6 +61,34 @@ function createConstructorParameterDecorator(options = {}) {
63
61
  return createDecorator({ ...options, constructorParameter: true }, options.handler);
64
62
  }
65
63
  exports.createConstructorParameterDecorator = createConstructorParameterDecorator;
64
+ function createParameterDecorator(options = {}) {
65
+ return createDecorator({ ...options, parameter: true }, options.handler);
66
+ }
67
+ exports.createParameterDecorator = createParameterDecorator;
68
+ function wrapDecoratorFactory(decoratorFactory, options) {
69
+ function wrappedDecoratorFactory(...args) {
70
+ const decorator = decoratorFactory(...args);
71
+ return wrapDecorator(decorator, options);
72
+ }
73
+ return wrappedDecoratorFactory;
74
+ }
75
+ exports.wrapDecoratorFactory = wrapDecoratorFactory;
76
+ function wrapDecorator(decorator, options) {
77
+ const wrappedDecorator = createDecorator({
78
+ class: true,
79
+ property: true,
80
+ method: true,
81
+ parameter: true,
82
+ methodParameter: true,
83
+ constructorParameter: true,
84
+ ...options
85
+ }, (data, metadata, args) => {
86
+ options?.handler?.(data, metadata, args);
87
+ return decorator(...args); // eslint-disable-line @typescript-eslint/no-unsafe-argument
88
+ });
89
+ return wrappedDecorator;
90
+ }
91
+ exports.wrapDecorator = wrapDecorator;
66
92
  function getConstructor(constructorOrTarget) {
67
93
  return (0, type_guards_1.isFunction)(constructorOrTarget)
68
94
  ? constructorOrTarget
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/reflection/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/reflection/utils.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,8 @@
1
1
  import { JsonPath } from "../json-path";
2
- import type { AbstractConstructor } from "../types";
3
- import type { NormalizedObjectSchema, NormalizedTypeSchema, NormalizedValueSchema, ObjectSchema, SchemaTestOptions, SchemaTestResult, SchemaValueCoercer, TypeSchema, ValueSchema, ValueType } from './types';
2
+ import { NormalizedObjectSchema, NormalizedTypeSchema, NormalizedValueSchema, ObjectSchema, SchemaTestOptions, SchemaTestResult, SchemaValueCoercer, TypeSchema, ValueSchema, ValueType } from './types';
4
3
  export declare type Schema<T = any, O = T> = ObjectSchema<T, O> | ValueSchema<T, O> | TypeSchema<O>;
5
4
  export declare type SchemaTestable<T = any, O = T> = Schema<T, O> | ValueType<O>;
6
5
  export declare type NormalizedSchema<T = any, O = T> = NormalizedObjectSchema<T, O> | NormalizedValueSchema<T, O> | NormalizedTypeSchema<O>;
7
- export declare const getSchemaFromReflection: typeof _getObjectSchemaFromReflection;
8
6
  export declare const Schema: {
9
7
  registerDefaultCoercer(coercer: SchemaValueCoercer): void;
10
8
  test<T, O>(schemaOrValueType: SchemaTestable<T, O>, value: unknown, options?: SchemaTestOptions, path?: JsonPath): SchemaTestResult<O>;
@@ -16,5 +14,3 @@ export declare const Schema: {
16
14
  */
17
15
  testWithFastError<T_3, O_3 = T_3>(schema: Schema<T_3, O_3>, value: unknown, options?: SchemaTestOptions, path?: JsonPath): SchemaTestResult<O_3>;
18
16
  };
19
- declare function _getObjectSchemaFromReflection<T>(type: AbstractConstructor<T>): ObjectSchema<T> | null;
20
- export {};
package/schema/schema.js CHANGED
@@ -1,10 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Schema = exports.getSchemaFromReflection = void 0;
3
+ exports.Schema = void 0;
4
4
  const json_path_1 = require("../json-path");
5
- const reflection_1 = require("../reflection");
6
5
  const array_1 = require("../utils/array/array");
7
- const function_1 = require("../utils/function");
8
6
  const noop_1 = require("../utils/noop");
9
7
  const object_1 = require("../utils/object/object");
10
8
  const set_1 = require("../utils/set");
@@ -18,7 +16,6 @@ const uint8_array_coercer_1 = require("./coercers/uint8-array.coercer");
18
16
  const schema_error_1 = require("./schema.error");
19
17
  const types_1 = require("./types");
20
18
  const utils_1 = require("./utils");
21
- exports.getSchemaFromReflection = (0, function_1.memoizeSingle)(_getObjectSchemaFromReflection);
22
19
  const defaultCoercers = new Map();
23
20
  let initialize = () => {
24
21
  exports.Schema.registerDefaultCoercer(number_coercer_1.numberCoercer);
@@ -45,7 +42,7 @@ exports.Schema = {
45
42
  if (result.valid) {
46
43
  return result;
47
44
  }
48
- return { valid: false, error: new schema_error_1.SchemaError(result.error.message, { ...result.error, fast: false }, result.error.cause) };
45
+ return { valid: false, error: new schema_error_1.SchemaError(result.error.message, { ...result.error, fast: false }) };
49
46
  },
50
47
  validate(schemaOrValueType, value, options) {
51
48
  const schema = (0, types_1.valueTypeOrSchemaToSchema)(schemaOrValueType);
@@ -84,7 +81,7 @@ function testType(schema, value, options = {}, path = json_path_1.JsonPath.ROOT)
84
81
  if ((value instanceof resolvedValueType) || ((0, utils_1.getValueType)(value) == resolvedValueType)) {
85
82
  return { valid: true, value: value };
86
83
  }
87
- const objectSchema = (0, exports.getSchemaFromReflection)(resolvedValueType);
84
+ const objectSchema = (0, utils_1.getSchemaFromReflection)(resolvedValueType);
88
85
  if ((0, type_guards_1.isNotNull)(objectSchema)) {
89
86
  return testObject(objectSchema, value, options, path);
90
87
  }
@@ -117,19 +114,11 @@ function testObject(objectSchema, value, options = {}, path = json_path_1.JsonPa
117
114
  }
118
115
  if (schema.allowUnknownProperties.size > 0) {
119
116
  for (const key of unknownValuePropertyKeys) {
120
- const errors = [];
121
- for (const allowedSchema of schema.allowUnknownProperties) {
122
- const propertyResult = exports.Schema.testWithFastError(allowedSchema, value[key], options, path.add(key));
123
- if (!propertyResult.valid && !mask) {
124
- errors.push(propertyResult.error);
125
- continue;
126
- }
127
- resultValue[key] = propertyResult.value;
128
- break;
129
- }
130
- if (errors.length > 0) {
131
- return { valid: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value did not match any allowed schemas.', { inner: errors, path }) };
117
+ const propertyResult = exports.Schema.testWithFastError((0, types_1.valueSchema)([...schema.allowUnknownProperties]), value[key], options, path.add(key));
118
+ if (!propertyResult.valid && !mask) {
119
+ return propertyResult;
132
120
  }
121
+ resultValue[key] = propertyResult.value;
133
122
  }
134
123
  }
135
124
  const testResultValue = (0, type_guards_1.isUndefined)(schema.factory) ? resultValue : (0, type_guards_1.isDefined)(schema.factory.type) ? resultValue : schema.factory.builder(resultValue);
@@ -186,27 +175,24 @@ function testValue(schema, value, options = {}, path = json_path_1.JsonPath.ROOT
186
175
  ...((valueSchema.coerce || options.coerce == true) ? (defaultCoercers.get(valueType) ?? []) : [])
187
176
  ];
188
177
  const errors = [];
178
+ let success = false;
189
179
  for (const coercer of coercers) {
190
180
  const coerceResult = coercer.coerce(resultValue, path, context);
191
181
  if (!coerceResult.success) {
192
182
  errors.push(coerceResult.error);
193
183
  continue;
194
184
  }
185
+ success = true;
195
186
  updateCurrentState(coerceResult.value);
196
187
  break;
197
188
  }
198
- if (errors.length > 0) {
189
+ if (!success && (errors.length > 0)) {
199
190
  return { valid: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value could not be coerced.', { inner: errors, path }) };
200
191
  }
201
192
  }
202
193
  if (!valueTestResult.valid) {
203
- const expectedNames = (0, utils_1.getSchemaTypeNames)(schema);
204
- const expectedTypeString = (expectedNames.length == 1)
205
- ? expectedNames[0]
206
- : `[${expectedNames.join(', ')}]`;
207
- const expects = valueSchema.valueConstraints.map((constraint) => constraint.expects);
208
- const expectsString = (expects.length > 0) ? ` (${expects.join(', ')})` : '';
209
- return { valid: false, error: schema_error_1.SchemaError.expectedButGot(`${expectedTypeString}${expectsString}`, valueType, path, { inner: valueTestResult.error }) };
194
+ const expectsString = getExpectString(schema);
195
+ return { valid: false, error: schema_error_1.SchemaError.expectedButGot(expectsString, valueType, path) };
210
196
  }
211
197
  if (valueSchema.transformers.length > 0) {
212
198
  let transformedValue = resultValue;
@@ -242,41 +228,20 @@ function isValidValue(validSchemas, value, options, path) {
242
228
  }
243
229
  errors.push(result.error);
244
230
  }
245
- return { valid: false, error: (errors.length == 1) ? errors[0] : new schema_error_1.SchemaError('Value did not match schema.', { path, fast: true, inner: errors }) };
246
- }
247
- function _getObjectSchemaFromReflection(type) {
248
- const metadata = reflection_1.reflectionRegistry.getMetadata(type);
249
- if (!metadata.registered) {
250
- return null;
251
- }
252
- const typeData = metadata.data.tryGet('schema');
253
- const properties = {};
254
- for (const [key, propertyMetadata] of metadata.properties) {
255
- const reflectionData = propertyMetadata.data.tryGet('schema');
256
- const itemType = ((0, type_guards_1.isDefined)(reflectionData) && (0, type_guards_1.isDefined)(reflectionData.type)) ? reflectionData.type : undefined;
257
- const array = reflectionData?.array == true;
258
- if (array && ((0, type_guards_1.isUndefined)(itemType) || ((0, type_guards_1.isArray)(itemType) && (itemType.length == 0)))) {
259
- throw new Error(`Item type missing on type ${type.name} at property "${String(key)}"`);
260
- }
261
- properties[key] = {
262
- schema: (0, types_1.valueTypesOrSchemasToSchemas)(itemType ?? propertyMetadata.type),
263
- array,
264
- optional: reflectionData?.optional,
265
- nullable: reflectionData?.nullable,
266
- coerce: reflectionData?.coerce,
267
- coercers: reflectionData?.coercers,
268
- transformers: reflectionData?.transformers,
269
- arrayConstraints: reflectionData?.arrayConstraints,
270
- valueConstraints: reflectionData?.valueConstraints
271
- };
231
+ const expectStrings = [];
232
+ for (const schema of validSchemas) {
233
+ getExpectString(schema);
272
234
  }
273
- const objectSchema = {
274
- sourceType: type,
275
- factory: (0, type_guards_1.isDefined)(typeData?.factory) ? { builder: typeData.factory } : { type: type },
276
- properties,
277
- mask: typeData?.mask,
278
- allowUnknownProperties: typeData?.allowUnknownProperties
279
- };
280
- return objectSchema;
235
+ const expectString = expectStrings.join('\n');
236
+ return { valid: false, error: schema_error_1.SchemaError.expectedButGot(expectString, (0, utils_1.getValueType)(value), path) };
237
+ }
238
+ function getExpectString(schema) {
239
+ const expectedNames = (0, utils_1.getSchemaTypeNames)(schema);
240
+ const expectedTypeString = (expectedNames.length == 1)
241
+ ? expectedNames[0]
242
+ : `[${expectedNames.join(', ')}]`;
243
+ const expects = (0, types_1.isValueSchema)(schema) ? (0, array_1.toArray)(schema.valueConstraints ?? []).map((constraint) => constraint.expects) : [];
244
+ const expectsString = (expects.length > 0) ? ` (${expects.join(', ')})` : '';
245
+ return `${expectedTypeString}${expectsString}`;
281
246
  }
282
247
  //# sourceMappingURL=schema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../source/schema/schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../source/schema/schema.ts"],"names":[],"mappings":"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"}
package/schema/types.d.ts CHANGED
@@ -150,6 +150,7 @@ export declare type TransformResult<T> = {
150
150
  value?: undefined;
151
151
  error: SchemaError;
152
152
  };
153
+ export declare function objectSchemaProperties<T>(properties: ObjectSchemaProperties<T>): ObjectSchemaProperties<T>;
153
154
  export declare function objectSchema<T, O = T>(schema: ObjectSchema<T, O>): ObjectSchema<T, O>;
154
155
  export declare function valueSchema<T, O = T>(schema: OneOrMany<Schema<T, O>>, options?: TypedOmit<ValueSchema<T, O>, 'schema'>): ValueSchema<T, O>;
155
156
  export declare function typeSchema<T>(type: ValueType<T>): TypeSchema<NormalizeValueType<T>>;
package/schema/types.js CHANGED
@@ -1,7 +1,8 @@
1
1
  "use strict";
2
2
  /* eslint-disable @typescript-eslint/ban-types */
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
- exports.valueTypeOrSchemaToSchema = exports.valueTypesOrSchemasToSchemas = exports.resolveValueType = exports.resolveValueTypes = exports.isDeferredValueType = exports.isTypeSchema = exports.isValueSchema = exports.isObjectSchema = exports.isSchema = exports.typeSchema = exports.valueSchema = exports.objectSchema = exports.SchemaValueCoercer = exports.SchemaValueTransformer = exports.SchemaValueConstraint = exports.SchemaArrayConstraint = exports.primitiveConstructorSet = exports.primitiveConstructors = void 0;
4
+ exports.valueTypeOrSchemaToSchema = exports.valueTypesOrSchemasToSchemas = exports.resolveValueType = exports.resolveValueTypes = exports.isDeferredValueType = exports.isTypeSchema = exports.isValueSchema = exports.isObjectSchema = exports.isSchema = exports.typeSchema = exports.valueSchema = exports.objectSchema = exports.objectSchemaProperties = exports.SchemaValueCoercer = exports.SchemaValueTransformer = exports.SchemaValueConstraint = exports.SchemaArrayConstraint = exports.primitiveConstructorSet = exports.primitiveConstructors = void 0;
5
+ const object_1 = require("../utils/object/object");
5
6
  const type_guards_1 = require("../utils/type-guards");
6
7
  exports.primitiveConstructors = [String, Number, Boolean, Symbol, BigInt, Function, 'undefined', 'null'];
7
8
  exports.primitiveConstructorSet = new Set(exports.primitiveConstructors);
@@ -17,12 +18,16 @@ exports.SchemaValueTransformer = SchemaValueTransformer;
17
18
  class SchemaValueCoercer {
18
19
  }
19
20
  exports.SchemaValueCoercer = SchemaValueCoercer;
21
+ function objectSchemaProperties(properties) {
22
+ return (0, object_1.filterObject)(properties, type_guards_1.isDefined);
23
+ }
24
+ exports.objectSchemaProperties = objectSchemaProperties;
20
25
  function objectSchema(schema) {
21
- return schema;
26
+ return (0, object_1.filterObject)(schema, type_guards_1.isDefined);
22
27
  }
23
28
  exports.objectSchema = objectSchema;
24
29
  function valueSchema(schema, options) {
25
- return { schema, ...options };
30
+ return (0, object_1.filterObject)({ schema, ...options }, type_guards_1.isDefined);
26
31
  }
27
32
  exports.valueSchema = valueSchema;
28
33
  function typeSchema(type) {
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/schema/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/schema/types.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import type { AbstractConstructor } from "../../types";
1
2
  import type { NormalizedSchema, Schema } from '../schema';
2
3
  import type { NormalizedObjectSchema, NormalizedTypeSchema, NormalizedValueSchema, ObjectSchema, TypeSchema, ValueSchema } from '../types';
3
4
  export declare const normalizeSchema: typeof _normalizeSchema;
@@ -5,9 +6,11 @@ export declare const normalizeObjectSchema: typeof _normalizeObjectSchema;
5
6
  export declare const normalizeValueSchema: typeof _normalizeValueSchema;
6
7
  export declare const normalizeTypeSchema: typeof _normalizeTypeSchema;
7
8
  export declare const getArrayItemSchema: typeof _getArrayItemSchema;
9
+ export declare const getSchemaFromReflection: typeof _getObjectSchemaFromReflection;
8
10
  declare function _normalizeSchema<T, O>(schema: Schema<T, O>): NormalizedSchema<T, O>;
9
11
  declare function _normalizeObjectSchema<T, O>(schema: ObjectSchema<T, O>): NormalizedObjectSchema<T, O>;
10
12
  declare function _normalizeValueSchema<T, O>(schema: ValueSchema<T, O>): NormalizedValueSchema<T, O>;
11
13
  declare function _normalizeTypeSchema<T>(schema: TypeSchema<T>): NormalizedTypeSchema<T>;
12
14
  declare function _getArrayItemSchema<T, O>(schema: ValueSchema<T, O>): ValueSchema<T, O>;
15
+ declare function _getObjectSchemaFromReflection<T>(type: AbstractConstructor<T>): ObjectSchema<T> | null;
13
16
  export {};
@@ -1,16 +1,19 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getArrayItemSchema = exports.normalizeTypeSchema = exports.normalizeValueSchema = exports.normalizeObjectSchema = exports.normalizeSchema = void 0;
3
+ exports.getSchemaFromReflection = exports.getArrayItemSchema = exports.normalizeTypeSchema = exports.normalizeValueSchema = exports.normalizeObjectSchema = exports.normalizeSchema = void 0;
4
+ const registry_1 = require("../../reflection/registry");
4
5
  const array_1 = require("../../utils/array/array");
5
6
  const memoize_1 = require("../../utils/function/memoize");
6
7
  const object_1 = require("../../utils/object/object");
7
8
  const type_guards_1 = require("../../utils/type-guards");
9
+ const assign_1 = require("../schemas/assign");
8
10
  const types_1 = require("../types");
9
11
  exports.normalizeSchema = (0, memoize_1.memoizeSingle)(_normalizeSchema, { weak: true });
10
12
  exports.normalizeObjectSchema = (0, memoize_1.memoizeSingle)(_normalizeObjectSchema, { weak: true });
11
13
  exports.normalizeValueSchema = (0, memoize_1.memoizeSingle)(_normalizeValueSchema, { weak: true });
12
14
  exports.normalizeTypeSchema = (0, memoize_1.memoizeSingle)(_normalizeTypeSchema, { weak: true });
13
15
  exports.getArrayItemSchema = (0, memoize_1.memoizeSingle)(_getArrayItemSchema, { weak: true });
16
+ exports.getSchemaFromReflection = (0, memoize_1.memoizeSingle)(_getObjectSchemaFromReflection, { weak: true });
14
17
  function _normalizeSchema(schema) {
15
18
  if ((0, types_1.isObjectSchema)(schema)) {
16
19
  return (0, exports.normalizeObjectSchema)(schema);
@@ -71,4 +74,43 @@ function _getArrayItemSchema(schema) {
71
74
  };
72
75
  return itemSchema;
73
76
  }
77
+ function _getObjectSchemaFromReflection(type) {
78
+ const metadata = registry_1.reflectionRegistry.getMetadata(type);
79
+ if (!metadata.registered) {
80
+ return null;
81
+ }
82
+ const typeData = metadata.data.tryGet('schema');
83
+ const properties = {};
84
+ for (const [key, propertyMetadata] of metadata.properties) {
85
+ const reflectionData = propertyMetadata.data.tryGet('schema');
86
+ const itemType = ((0, type_guards_1.isDefined)(reflectionData) && (0, type_guards_1.isDefined)(reflectionData.type)) ? reflectionData.type : undefined;
87
+ const array = (reflectionData?.array == true) ? true : undefined;
88
+ if (array && ((0, type_guards_1.isUndefined)(itemType) || ((0, type_guards_1.isArray)(itemType) && (itemType.length == 0)))) {
89
+ throw new Error(`Item type missing on type ${type.name} at property "${String(key)}"`);
90
+ }
91
+ properties[key] = (0, types_1.valueSchema)((0, types_1.valueTypesOrSchemasToSchemas)(itemType ?? propertyMetadata.type), {
92
+ array,
93
+ optional: reflectionData?.optional,
94
+ nullable: reflectionData?.nullable,
95
+ coerce: reflectionData?.coerce,
96
+ coercers: reflectionData?.coercers,
97
+ transformers: reflectionData?.transformers,
98
+ arrayConstraints: reflectionData?.arrayConstraints,
99
+ valueConstraints: reflectionData?.valueConstraints
100
+ });
101
+ }
102
+ const schema = (0, types_1.objectSchema)({
103
+ sourceType: type,
104
+ factory: (0, type_guards_1.isDefined)(typeData?.factory) ? { builder: typeData.factory } : { type: type },
105
+ properties,
106
+ mask: typeData?.mask,
107
+ allowUnknownProperties: ((0, type_guards_1.isUndefined)(typeData?.allowUnknownProperties) || ((0, type_guards_1.isArray)(typeData?.allowUnknownProperties) && (typeData?.allowUnknownProperties.length == 0))) ? undefined : typeData?.allowUnknownProperties
108
+ });
109
+ const prototype = Reflect.getPrototypeOf(type);
110
+ if ((0, type_guards_1.isNotNull)(prototype) && registry_1.reflectionRegistry.hasType(prototype)) {
111
+ const parentSchema = (0, exports.getSchemaFromReflection)(prototype);
112
+ return (0, assign_1.assign)(parentSchema, schema);
113
+ }
114
+ return schema;
115
+ }
74
116
  //# sourceMappingURL=schema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../source/schema/utils/schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../source/schema/utils/schema.ts"],"names":[],"mappings":"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"}