@tstdl/base 0.71.67 → 0.71.70-beta1

package/reflection/registry.d.ts

@@ -1,32 +1,48 @@
 import type { Constructor, Type } from "../types";
-import type { DecoratorData } from './decorator-data';
+import type { DecoratorData } from './types';
 declare type Data = Map<string | symbol, any>;
-export declare type ReflectionMetadata = TypeMetadata | PropertyMetadata | MethodMetadata | ParameterMetadata;
-export declare type TypeMetadata = {
-    constructor: Constructor;
-    parameters: ParameterMetadata[];
-    properties: Map<string | symbol, PropertyMetadata>;
-    staticProperties: Map<string | symbol, PropertyMetadata>;
-    methods: Map<string | symbol, MethodMetadata>;
-    staticMethods: Map<string | symbol, MethodMetadata>;
-    data: Data;
+export declare type ReflectionMetadata = TypeMetadata | PropertyMetadata | MethodMetadata | ConstructorParameterMetadata | MethodParameterMetadata;
+export declare type MetadataType = 'type' | 'property' | 'method' | 'method-parameter' | 'constructor-parameter';
+export declare type MetadataBase<T extends MetadataType> = {
+    metadataType: T;
+};
+export declare type TypeMetadata = MetadataBase<'type'> & {
+    readonly constructor: Constructor;
+    /** may be undefined if class has no constructor */
+    readonly parameters: ConstructorParameterMetadata[] | undefined;
+    readonly properties: Map<string | symbol, PropertyMetadata>;
+    readonly staticProperties: Map<string | symbol, PropertyMetadata>;
+    readonly methods: Map<string | symbol, MethodMetadata>;
+    readonly staticMethods: Map<string | symbol, MethodMetadata>;
+    readonly data: Data;
+    readonly registered: boolean;
 };
-export declare type PropertyMetadata = {
+export declare type PropertyMetadata = MetadataBase<'property'> & {
+    key: string | symbol;
     type: Type;
+    isAccessor: boolean;
     data: Data;
 };
-export declare type MethodMetadata = {
-    parameters: ParameterMetadata[];
+export declare type MethodMetadata = MetadataBase<'method'> & {
+    parameters: MethodParameterMetadata[];
     returnType: Type | undefined;
     data: Data;
 };
-export declare type ParameterMetadata = {
+export declare type ConstructorParameterMetadata = MetadataBase<'constructor-parameter'> & {
+    type: Type | undefined;
+    index: number;
+    data: Data;
+};
+export declare type MethodParameterMetadata = MetadataBase<'method-parameter'> & {
     type: Type;
+    index: number;
     data: Data;
 };
+export declare type ParameterMetadata = ConstructorParameterMetadata | MethodParameterMetadata;
 export declare class ReflectionRegistry {
     private readonly metadataMap;
     constructor();
+    hasType(type: Constructor): boolean;
     getMetadata(type: Constructor): TypeMetadata;
     register(target: object, propertyKey?: string | symbol, descriptorOrParameterIndex?: PropertyDescriptor | number): DecoratorData;
     registerDecoratorData(data: DecoratorData): ReflectionMetadata;

package/reflection/registry.js

@@ -4,7 +4,7 @@ exports.reflectionRegistry = exports.ReflectionRegistry = void 0;
 /* eslint-disable max-classes-per-file */
 const data_structures_1 = require("../data-structures");
 const factory_map_1 = require("../utils/factory-map");
-const object_1 = require("../utils/object");
+const lazy_property_1 = require("../utils/object/lazy-property");
 const reflection_1 = require("../utils/reflection");
 const type_guards_1 = require("../utils/type-guards");
 const decorator_data_1 = require("./decorator-data");
@@ -12,6 +12,9 @@ class ReflectionRegistry {
     constructor() {
         this.metadataMap = new factory_map_1.FactoryMap((type) => this.initializeType(type), new data_structures_1.WeakRefMap());
     }
+    hasType(type) {
+        return this.metadataMap.has(type) && this.getMetadata(type).registered;
+    }
     getMetadata(type) {
         return this.metadataMap.get(type);
     }
@@ -22,11 +25,14 @@ class ReflectionRegistry {
     }
     registerDecoratorData(data) {
         const metadata = this.metadataMap.get(data.constructor);
+        metadata.registered = true;
         if (data.type == 'class') {
             return metadata;
         }
         else if ((data.type == 'property') || (data.type == 'accessor')) {
-            return (data.static ? metadata.staticProperties : metadata.properties).get(data.propertyKey);
+            const propertyMetadata = (data.static ? metadata.staticProperties : metadata.properties).get(data.propertyKey);
+            propertyMetadata.isAccessor = data.type == 'accessor';
+            return propertyMetadata;
         }
         else if (data.type == 'method') {
             return (data.static ? metadata.staticMethods : metadata.methods).get(data.methodKey);
@@ -35,11 +41,12 @@ class ReflectionRegistry {
             return (data.static ? metadata.staticMethods : metadata.methods).get(data.methodKey);
         }
         else if (data.type == 'constructor-parameter') { // eslint-disable-line @typescript-eslint/no-unnecessary-condition
+            if ((0, type_guards_1.isUndefined)(metadata.parameters)) {
+                throw new Error('Constructor parameters are not available. (missing decoration?)');
+            }
             return metadata.parameters[data.index];
         }
-        else {
-            throw new Error(`Unknown DecoratorData type ${data.type}`);
-        }
+        throw new Error(`Unknown DecoratorData type ${data.type}`);
     }
     /**
      * Unregister a type. Can be useful if you replace a class with an decorator.
@@ -51,20 +58,20 @@ class ReflectionRegistry {
     }
     // eslint-disable-next-line max-lines-per-function
     initializeType(type) {
-        return (0, object_1.lazyObject)({
-            constructor: (0, object_1.lazyObjectValue)(type),
+        return (0, lazy_property_1.lazyObject)({
+            metadataType: 'type',
+            constructor: (0, lazy_property_1.lazyObjectValue)(type),
             parameters: {
                 initializer() {
-                    const parameters = (0, reflection_1.getParameterTypes)(type);
-                    (0, type_guards_1.assertDefined)(parameters, 'missing constructor parameters');
-                    return parameters.map((parameter) => ({ type: parameter, data: new Map() }));
+                    const parametersTypes = (0, reflection_1.getParameterTypes)(type);
+                    return parametersTypes?.map((parameterType, index) => ({ metadataType: 'constructor-parameter', index, type: parameterType, data: new Map() }));
                 }
             },
             properties: {
-                initializer: () => new factory_map_1.FactoryMap((key) => ({ type: (0, reflection_1.getDesignType)(type.prototype, key), data: new Map() }))
+                initializer: () => new factory_map_1.FactoryMap((key) => ({ metadataType: 'property', key, type: (0, reflection_1.getDesignType)(type.prototype, key), isAccessor: false, data: new Map() }))
             },
             staticProperties: {
-                initializer: () => new factory_map_1.FactoryMap((key) => ({ type: (0, reflection_1.getDesignType)(type, key), data: new Map() }))
+                initializer: () => new factory_map_1.FactoryMap((key) => ({ metadataType: 'property', key, type: (0, reflection_1.getDesignType)(type, key), isAccessor: false, data: new Map() }))
             },
             methods: {
                 initializer: () => new factory_map_1.FactoryMap((key) => {
@@ -73,7 +80,7 @@ class ReflectionRegistry {
                     if ((0, type_guards_1.isUndefined)(parameters)) {
                         throw new Error(`Could not get parameters for method ${key.toString()} of type ${type.name}`);
                     }
-                    return { parameters: parameters.map((parameter) => ({ type: parameter, data: new Map() })), returnType, data: new Map() };
+                    return { metadataType: 'method', parameters: parameters.map((parameter, index) => ({ metadataType: 'method-parameter', index, type: parameter, data: new Map() })), returnType, data: new Map() };
                 })
             },
             staticMethods: {
@@ -83,10 +90,11 @@ class ReflectionRegistry {
                     if ((0, type_guards_1.isUndefined)(parameters)) {
                         throw new Error(`Could not get parameters for static method ${key.toString()} of type ${type.name}`);
                     }
-                    return { parameters: parameters.map((parameter) => ({ type: parameter, data: new Map() })), returnType, data: new Map() };
+                    return { metadataType: 'method', parameters: parameters.map((parameter, index) => ({ metadataType: 'method-parameter', index, type: parameter, data: new Map() })), returnType, data: new Map() };
                 })
             },
-            data: { initializer: () => new Map() }
+            data: { initializer: () => new Map() },
+            registered: false
         });
     }
 }

package/reflection/registry.js.map

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

package/reflection/types.d.ts

@@ -0,0 +1,88 @@
+import type { Constructor, Record } from "../types";
+import type { UnionToIntersection } from 'type-fest';
+import type { ConstructorParameterMetadata, MethodMetadata, MethodParameterMetadata, ParameterMetadata, PropertyMetadata, TypeMetadata } from './registry';
+export declare type DecoratorType = 'class' | 'property' | 'accessor' | 'method' | 'parameter' | 'methodParameter' | 'constructorParameter';
+export declare type DecoratorHandler<T extends DecoratorType = DecoratorType> = (data: DecoratorData<T>, metadata: DecoratorMetadata<T>) => DecoratorHandlerReturnType<T>;
+export declare type DecoratorHandlerReturnType<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMap<DecoratorHandlerReturnTypeMap, T>;
+export declare type Decorator<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMapIntersection<DecoratorMap, T>;
+export declare type DecoratorData<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMap<DecoratorDataMap, T>;
+export declare type DecoratorMetadata<T extends DecoratorType = DecoratorType> = DecoratorOptionsTypeMap<DecoratorMetadataMap, T>;
+export declare type DecoratorTypeMap<T extends Record<DecoratorType> = Record<DecoratorType>> = T;
+export declare type DecoratorOptionsTypeMap<T extends DecoratorTypeMap, U extends DecoratorType> = {
+    [D in U]: T[D];
+}[U];
+export declare type DecoratorOptionsTypeMapIntersection<T extends DecoratorTypeMap, U extends DecoratorType> = UnionToIntersection<DecoratorOptionsTypeMap<T, U>>;
+export declare type DecoratorDataMap = DecoratorTypeMap<{
+    class: ClassDecoratorData;
+    property: PropertyDecoratorData;
+    accessor: AccessorDecoratorData;
+    method: MethodDecoratorData;
+    parameter: ParameterDecoratorData;
+    methodParameter: MethodParameterDecoratorData;
+    constructorParameter: ConstructorParameterDecoratorData;
+}>;
+export declare type DecoratorMetadataMap = DecoratorTypeMap<{
+    class: TypeMetadata;
+    property: PropertyMetadata;
+    accessor: PropertyMetadata;
+    method: MethodMetadata;
+    parameter: ParameterMetadata;
+    methodParameter: MethodParameterMetadata;
+    constructorParameter: ConstructorParameterMetadata;
+}>;
+export declare type DecoratorHandlerReturnTypeMap = DecoratorTypeMap<{
+    class: void | undefined | Constructor;
+    property: void;
+    accessor: void;
+    method: void | PropertyDescriptor;
+    parameter: void;
+    methodParameter: void;
+    constructorParameter: void;
+}>;
+export declare type DecoratorMap = DecoratorTypeMap<{
+    class: ClassDecorator;
+    property: PropertyDecorator;
+    accessor: MethodDecorator;
+    method: MethodDecorator;
+    parameter: ParameterDecorator;
+    methodParameter: ParameterDecorator;
+    constructorParameter: ParameterDecorator;
+}>;
+export declare type DecoratorDataBase<Type extends string> = {
+    type: Type;
+    constructor: Constructor;
+    prototype: object;
+};
+export declare type ClassDecoratorData = DecoratorDataBase<'class'>;
+export declare type PropertyDecoratorData = DecoratorDataBase<'property'> & {
+    static: boolean;
+    propertyKey: string | symbol;
+};
+export declare type AccessorDecoratorData = DecoratorDataBase<'accessor'> & {
+    static: boolean;
+    propertyKey: string | symbol;
+    descriptor: PropertyDescriptor;
+};
+export declare type PropertyOrAccessorDecoratorData = PropertyDecoratorData | AccessorDecoratorData;
+export declare type MethodDecoratorData = DecoratorDataBase<'method'> & {
+    static: boolean;
+    methodKey: string | symbol;
+    descriptor: PropertyDescriptor;
+};
+export declare type MethodParameterDecoratorData = DecoratorDataBase<'parameter'> & {
+    static: boolean;
+    methodKey: string | symbol;
+    index: number;
+};
+export declare type ConstructorParameterDecoratorData = DecoratorDataBase<'constructor-parameter'> & {
+    index: number;
+};
+export declare type ParameterDecoratorData = MethodParameterDecoratorData | ConstructorParameterDecoratorData;
+export declare type ClassDecoratorHandler = DecoratorHandler<'class'>;
+export declare type PropertyDecoratorHandler = DecoratorHandler<'property'>;
+export declare type AccessorDecoratorHandler = DecoratorHandler<'accessor'>;
+export declare type PropertyOrAccessorDecoratorHandler = DecoratorHandler<'property' | 'accessor'>;
+export declare type MethodDecoratorHandler = DecoratorHandler<'method'>;
+export declare type ParameterDecoratorHandler = DecoratorHandler<'parameter'>;
+export declare type ConstructorParameterDecoratorHandler = DecoratorHandler<'constructorParameter'>;
+export declare type MethodParameterDecoratorHandler = DecoratorHandler<'methodParameter'>;

package/reflection/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/reflection/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/reflection/types.ts"],"names":[],"mappings":""}

package/reflection/utils.d.ts

@@ -1,27 +1,27 @@
-import type { Constructor, Record } from "../types";
-import type { AccessorDecoratorData, ClassDecoratorData, ConstructorParameterDecoratorData, DecoratorData, MethodDecoratorData, MethodParameterDecoratorData, ParameterDecoratorData, PropertyDecoratorData, PropertyOrAccessorDecoratorData } from './decorator-data';
-export declare type Decorator = ClassDecorator | PropertyDecorator | MethodDecorator | ParameterDecorator;
-export declare type DecoratorHandler = (data: DecoratorData) => ReturnType<Decorator>;
-export declare type ClassDecoratorHandler<T extends Constructor> = (data: ClassDecoratorData) => void | undefined | T;
-export declare type PropertyDecoratorHandler = (data: PropertyDecoratorData) => void;
-export declare type AccessorDecoratorHandler = (data: AccessorDecoratorData) => void;
-export declare type PropertyOrAccessorDecoratorHandler = <T>(data: PropertyOrAccessorDecoratorData) => void | TypedPropertyDescriptor<T>;
-export declare type MethodDecoratorHandler = <T>(data: MethodDecoratorData) => void | TypedPropertyDescriptor<T>;
-export declare type ParameterDecoratorHandler = (data: ParameterDecoratorData) => void;
-export declare type ConstructorParameterDecoratorHandler = (data: ConstructorParameterDecoratorData) => void;
-export declare type MethodParameterDecoratorHandler = (data: MethodParameterDecoratorData) => void;
+import type { Constructor, PropertiesOfType, Record } from "../types";
+import type { Decorator, DecoratorHandler, DecoratorType } from './types';
+export declare type CreateDecoratorTypeOptions = {
+    [P in DecoratorType]?: boolean;
+};
 export declare type CreateDecoratorOptions = {
     data?: Record<string | symbol>;
+    /** merge data values instead of replacing them (requires them to be objects) */
+    mergeData?: boolean;
+};
+export declare type SpecificCreateDecoratorOptions<T extends DecoratorType> = CreateDecoratorOptions & {
+    handler?: DecoratorHandler<T>;
 };
-export declare function createDecorator(decorator: DecoratorHandler, options?: CreateDecoratorOptions): Decorator;
-export declare function createClassDecorator<T extends Constructor>(decorator: ClassDecoratorHandler<T>, options?: CreateDecoratorOptions): ClassDecorator;
-export declare function createPropertyDecorator(decorator: PropertyDecoratorHandler, options?: CreateDecoratorOptions): PropertyDecorator;
-export declare function createAccessorDecorator(decorator: AccessorDecoratorHandler, options?: CreateDecoratorOptions): MethodDecorator;
-export declare function createPropertyOrAccessorDecorator(decorator: PropertyOrAccessorDecoratorHandler, options?: CreateDecoratorOptions): MethodDecorator;
-export declare function createMethodDecorator(decorator: MethodDecoratorHandler, options?: CreateDecoratorOptions): MethodDecorator;
-export declare function createParameterDecorator(decorator: ParameterDecoratorHandler, options?: CreateDecoratorOptions): ParameterDecorator;
-export declare function createConstructorParameterDecorator(decorator: ConstructorParameterDecoratorHandler, options?: CreateDecoratorOptions): ParameterDecorator;
-export declare function createMethodParameterDecorator(decorator: MethodParameterDecoratorHandler, options?: CreateDecoratorOptions): ParameterDecorator;
+declare type CreateDecoratorType<T extends CreateDecoratorOptions> = Extract<PropertiesOfType<T, true>, DecoratorType>;
+export declare function createDecorator<T extends CreateDecoratorTypeOptions & CreateDecoratorOptions>(options: T, handler?: DecoratorHandler<CreateDecoratorType<T>>): Decorator<CreateDecoratorType<T>>;
+export declare function createClassDecorator(options?: SpecificCreateDecoratorOptions<'class'>): ClassDecorator;
+export declare function createPropertyDecorator(options?: SpecificCreateDecoratorOptions<'property'>): PropertyDecorator;
+export declare function createAccessorDecorator(options?: SpecificCreateDecoratorOptions<'accessor'>): MethodDecorator;
+export declare function createPropertyOrAccessorDecorator(options?: SpecificCreateDecoratorOptions<'property' | 'accessor'>): Decorator<'property' | 'accessor'>;
+export declare function createMethodDecorator(options?: SpecificCreateDecoratorOptions<'method'>): MethodDecorator;
+export declare function createParameterDecorator(options?: SpecificCreateDecoratorOptions<'parameter'>): ParameterDecorator;
+export declare function createMethodParameterDecorator(options?: SpecificCreateDecoratorOptions<'methodParameter'>): ParameterDecorator;
+export declare function createConstructorParameterDecorator(options?: SpecificCreateDecoratorOptions<'constructorParameter'>): ParameterDecorator;
 export declare function getConstructor<T extends Constructor = Constructor>(constructorOrTarget: object): T;
 export declare function getTypeInfoString(type: Constructor): string;
 export declare function printType(type: Constructor): void;
+export {};

package/reflection/utils.js

@@ -1,79 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printType = exports.getTypeInfoString = exports.getConstructor = exports.createMethodParameterDecorator = exports.createConstructorParameterDecorator = exports.createParameterDecorator = exports.createMethodDecorator = exports.createPropertyOrAccessorDecorator = exports.createAccessorDecorator = exports.createPropertyDecorator = exports.createClassDecorator = exports.createDecorator = void 0;
+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;
+const noop_1 = require("../utils/noop");
+const object_1 = require("../utils/object/object");
 const type_guards_1 = require("../utils/type-guards");
 const decorator_data_1 = require("./decorator-data");
 const registry_1 = require("./registry");
-function createDecorator(decorator, options = {}) {
+function createDecorator(options, handler = noop_1.noop) {
     function decoratorWrapper(target, propertyKey, descriptorOrParameterIndex) {
         const data = (0, decorator_data_1.getDecoratorData)(target, propertyKey, descriptorOrParameterIndex);
+        const optionsType = (data.type == 'constructor-parameter') ? 'constructorParameter' : data.type;
+        const valid = (options[optionsType] == true)
+            || (optionsType == 'parameter' && ((options.constructorParameter == true) || (options.methodParameter == true)))
+            || (((optionsType == 'constructorParameter') || (optionsType == 'methodParameter')) && (options.parameter == true));
+        (0, type_guards_1.assert)(valid, () => `Decorator cannot be used for ${data.type}.`);
         const metadata = registry_1.reflectionRegistry.registerDecoratorData(data);
         if ((0, type_guards_1.isDefined)(options.data)) {
-            for (const [key, value] of Object.entries(options.data)) {
-                metadata.data.set(key, value);
+            for (const [key, value] of (0, object_1.objectEntries)(options.data)) {
+                if (options.mergeData != true) {
+                    metadata.data.set(key, value);
+                }
+                else {
+                    const existing = metadata.data.get(key) ?? {};
+                    (0, type_guards_1.assertObject)(existing, 'Existing and new data must be of type object in order to merge them.');
+                    (0, type_guards_1.assertObject)(value, 'Existing and new data must be of type object in order to merge them.');
+                    metadata.data.set(key, { ...existing, ...value });
+                }
             }
         }
-        return decorator(data);
+        return handler(data, metadata);
     }
     return decoratorWrapper;
 }
 exports.createDecorator = createDecorator;
-function createClassDecorator(decorator, options = {}) {
-    return createDecorator((data) => {
-        (0, type_guards_1.assert)(data.type == 'class', `Class decorator cannot be used for ${data.type}.`);
-        return decorator(data);
-    }, options);
+function createClassDecorator(options = {}) {
+    return createDecorator({ ...options, class: true }, options.handler);
 }
 exports.createClassDecorator = createClassDecorator;
-function createPropertyDecorator(decorator, options = {}) {
-    return createDecorator((data) => {
-        (0, type_guards_1.assert)(data.type == 'property', `Property decorator cannot be used for ${data.type}.`);
-        decorator(data);
-    }, options);
+function createPropertyDecorator(options = {}) {
+    return createDecorator({ ...options, property: true }, options.handler);
 }
 exports.createPropertyDecorator = createPropertyDecorator;
-function createAccessorDecorator(decorator, options = {}) {
-    return createDecorator((data) => {
-        (0, type_guards_1.assert)(data.type == 'accessor', `Accessor decorator cannot be used for ${data.type}.`);
-        decorator(data);
-    }, options);
+function createAccessorDecorator(options = {}) {
+    return createDecorator({ ...options, accessor: true }, options.handler);
 }
 exports.createAccessorDecorator = createAccessorDecorator;
-function createPropertyOrAccessorDecorator(decorator, options = {}) {
-    return createDecorator((data) => {
-        (0, type_guards_1.assert)((data.type == 'property') || (data.type == 'accessor'), `Property or accessor decorator cannot be used for ${data.type}.`);
-        decorator(data);
-    }, options);
+function createPropertyOrAccessorDecorator(options = {}) {
+    return createDecorator({ ...options, property: true, accessor: true }, options.handler);
 }
 exports.createPropertyOrAccessorDecorator = createPropertyOrAccessorDecorator;
-function createMethodDecorator(decorator, options = {}) {
-    return createDecorator((data) => {
-        (0, type_guards_1.assert)(data.type == 'method', `Method decorator cannot be used for ${data.type}.`);
-        return decorator(data);
-    }, options);
+function createMethodDecorator(options = {}) {
+    return createDecorator({ ...options, method: true }, options.handler);
 }
 exports.createMethodDecorator = createMethodDecorator;
-function createParameterDecorator(decorator, options = {}) {
-    return createDecorator((data) => {
-        (0, type_guards_1.assert)((data.type == 'parameter') || (data.type == 'constructor-parameter'), `Parameter decorator cannot be used for ${data.type}.`);
-        decorator(data);
-    }, options);
+function createParameterDecorator(options = {}) {
+    return createDecorator({ ...options, parameter: true }, options.handler);
 }
 exports.createParameterDecorator = createParameterDecorator;
-function createConstructorParameterDecorator(decorator, options = {}) {
-    return createDecorator((data) => {
-        (0, type_guards_1.assert)((data.type == 'constructor-parameter'), `Constructor-Parameter decorator cannot be used for ${data.type}.`);
-        decorator(data);
-    }, options);
-}
-exports.createConstructorParameterDecorator = createConstructorParameterDecorator;
-function createMethodParameterDecorator(decorator, options = {}) {
-    return createDecorator((data) => {
-        (0, type_guards_1.assert)((data.type == 'parameter'), `Method-Parameter decorator cannot be used for ${data.type}.`);
-        decorator(data);
-    }, options);
+function createMethodParameterDecorator(options = {}) {
+    return createDecorator({ ...options, methodParameter: true }, options.handler);
 }
 exports.createMethodParameterDecorator = createMethodParameterDecorator;
+function createConstructorParameterDecorator(options = {}) {
+    return createDecorator({ ...options, constructorParameter: true }, options.handler);
+}
+exports.createConstructorParameterDecorator = createConstructorParameterDecorator;
 function getConstructor(constructorOrTarget) {
     return (0, type_guards_1.isFunction)(constructorOrTarget)
         ? constructorOrTarget
@@ -83,7 +74,7 @@ exports.getConstructor = getConstructor;
 function getTypeInfoString(type) {
     const lines = [];
     const metadata = registry_1.reflectionRegistry.getMetadata(type);
-    const constructorParameters = metadata.parameters.map((parameter) => parameter.type.name).join(', ');
+    const constructorParameters = metadata.parameters?.map((parameter) => parameter.type?.name ?? '<unknown>').join(', ') ?? '?';
     lines.push(`${metadata.constructor.name}(${constructorParameters})`);
     for (const [key, propertyMetadata] of metadata.staticProperties) {
         const propertyKey = (0, type_guards_1.isSymbol)(key) ? `[${key.toString()}]` : key;
@@ -91,7 +82,7 @@ function getTypeInfoString(type) {
     }
     for (const [key, methodMetadata] of metadata.staticMethods) {
         const propertyKey = (0, type_guards_1.isSymbol)(key) ? `[${key.toString()}]` : key;
-        const parameters = metadata.parameters.map((parameter) => parameter.type.name).join(', ');
+        const parameters = methodMetadata.parameters.map((parameter) => parameter.type.name).join(', ');
         lines.push(`  static ${propertyKey}(${parameters}): ${methodMetadata.returnType?.name ?? 'void'}`);
     }
     for (const [key, propertyMetadata] of metadata.properties) {
@@ -100,7 +91,7 @@ function getTypeInfoString(type) {
     }
     for (const [key, methodMetadata] of metadata.methods) {
         const propertyKey = (0, type_guards_1.isSymbol)(key) ? `[${key.toString()}]` : key;
-        const parameters = metadata.parameters.map((parameter) => parameter.type.name).join(', ');
+        const parameters = methodMetadata.parameters.map((parameter) => parameter.type.name).join(', ');
         lines.push(`  ${propertyKey}(${parameters}): ${methodMetadata.returnType?.name ?? 'void'}`);
     }
     return lines.join('\n');

package/reflection/utils.js.map

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

package/schema/schemas/object.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign = exports.object = exports.ObjectSchemaValidator = void 0;
 const map_1 = require("../../utils/map");
+const object_1 = require("../../utils/object/object");
 const type_guards_1 = require("../../utils/type-guards");
 const schema_error_1 = require("../schema.error");
 const schema_validator_1 = require("../schema.validator");
@@ -9,7 +10,7 @@ const types_1 = require("../types");
 class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
     constructor(validators, schema) {
         super(schema);
-        this.validatorEntries = new Map(Object.entries(validators));
+        this.validatorEntries = new Map((0, object_1.objectEntries)(validators));
     }
     static assign(a, b) {
         const validatorEntries = Object.fromEntries([...a.validatorEntries.entries(), ...b.validatorEntries.entries()]);
@@ -65,7 +66,7 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
         else if (value === null) {
             return { valid: false, error: schema_error_1.SchemaError.expectedButGot('object', 'null', path) };
         }
-        const valueEntries = new Map(Object.entries(value));
+        const valueEntries = new Map((0, object_1.objectEntries)(value));
         const unknownKeys = (0, map_1.differenceMaps)(valueEntries, this.validatorEntries);
         if ((unknownKeys.length > 0) && (this.schema.mask != true) && ((0, type_guards_1.isBoolean)(this.schema.mask) || !options.mask) && (this.schema.keepUnknown != true)) {
             const keys = unknownKeys.map((entry) => entry[0]).join(', ');
@@ -76,7 +77,7 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
 }
 exports.ObjectSchemaValidator = ObjectSchemaValidator;
 function object(entries, options) {
-    const validatorEntries = Object.entries(entries);
+    const validatorEntries = (0, object_1.objectEntries)(entries);
     const mappedValidatorEntries = validatorEntries.map(([key, value]) => [key, value.schema]);
     const schema = (0, types_1.schemaHelper)({
         type: 'object',

package/schema/schemas/object.js.map

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

package/search-index/elastic/search-index.d.ts

@@ -25,7 +25,7 @@ export declare class ElasticSearchIndex<T extends Entity> extends SearchIndex<T>
     delete(id: string): Promise<void>;
     deleteByQuery(query: Query<T>): Promise<void>;
     search(searchQueryOrCursor: Query<T> | string, options?: QueryOptions<T>): Promise<SearchResult<T>>;
-    count(query: Query<T>, options?: QueryOptions<T>): Promise<number>;
+    count(query?: Query<T>, options?: QueryOptions<T>): Promise<number>;
     drop(): Promise<void>;
     exists(): Promise<boolean>;
 }

package/search-index/elastic/search-index.js

@@ -6,7 +6,7 @@ const error_1 = require("../../error");
 const search_index_1 = require("..");
 const base64_1 = require("../../utils/base64");
 const encoding_1 = require("../../utils/encoding");
-const object_1 = require("../../utils/object");
+const object_1 = require("../../utils/object/object");
 const type_guards_1 = require("../../utils/type-guards");
 const keyword_rewriter_1 = require("./keyword-rewriter");
 const query_converter_1 = require("./query-converter");
@@ -112,7 +112,7 @@ class ElasticSearchIndex extends search_index_1.SearchIndex {
         }
         const result = await this.client.count({
             index: this.indexName,
-            query: (0, query_converter_1.convertQuery)(query)
+            query: (0, query_converter_1.convertQuery)(query ?? {})
         });
         return result.count;
     }