@tstdl/base 0.81.35 → 0.82.1

package/schema/types/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./schema-array-constraint"), exports);
+__exportStar(require("./schema-value-coercer"), exports);
+__exportStar(require("./schema-value-constraint"), exports);
+__exportStar(require("./schema-value-transformer"), exports);
+__exportStar(require("./types"), exports);
+//# sourceMappingURL=index.js.map

package/schema/types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/schema/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,yDAAuC;AACvC,4DAA0C;AAC1C,6DAA2C;AAC3C,0CAAwB"}

package/schema/types/schema-array-constraint.d.ts

@@ -0,0 +1,5 @@
+import type { JsonPath } from "../../json-path/json-path";
+import type { ConstraintContext, ConstraintResult } from './types';
+export declare abstract class SchemaArrayConstraint {
+    abstract validate(value: readonly unknown[], path: JsonPath, context: ConstraintContext): ConstraintResult;
+}

package/schema/types/schema-array-constraint.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaArrayConstraint = void 0;
+class SchemaArrayConstraint {
+}
+exports.SchemaArrayConstraint = SchemaArrayConstraint;
+//# sourceMappingURL=schema-array-constraint.js.map

package/schema/types/schema-array-constraint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-array-constraint.js","sourceRoot":"","sources":["../../../source/schema/types/schema-array-constraint.ts"],"names":[],"mappings":";;;AAGA,MAAsB,qBAAqB;CAE1C;AAFD,sDAEC"}

package/schema/types/schema-value-coercer.d.ts

@@ -0,0 +1,8 @@
+import type { JsonPath } from "../../json-path/json-path";
+import type { OneOrMany } from "../../types";
+import type { CoercerContext, CoerceResult, ValueType } from './types';
+export declare abstract class SchemaValueCoercer {
+    abstract readonly sourceType: OneOrMany<ValueType>;
+    abstract readonly targetType: ValueType;
+    abstract coerce(value: unknown, path: JsonPath, context: CoercerContext): CoerceResult;
+}

package/schema/types/schema-value-coercer.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaValueCoercer = void 0;
+class SchemaValueCoercer {
+}
+exports.SchemaValueCoercer = SchemaValueCoercer;
+//# sourceMappingURL=schema-value-coercer.js.map

package/schema/types/schema-value-coercer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-value-coercer.js","sourceRoot":"","sources":["../../../source/schema/types/schema-value-coercer.ts"],"names":[],"mappings":";;;AAIA,MAAsB,kBAAkB;CAKvC;AALD,gDAKC"}

package/schema/types/schema-value-constraint.d.ts

@@ -0,0 +1,8 @@
+import type { JsonPath } from "../../json-path/json-path";
+import type { OneOrMany } from "../../types";
+import type { ConstraintContext, ConstraintResult, ValueType } from './types';
+export declare abstract class SchemaValueConstraint {
+    abstract readonly suitableTypes: OneOrMany<ValueType>;
+    abstract readonly expects: OneOrMany<string>;
+    abstract validate(value: unknown, path: JsonPath, context: ConstraintContext): ConstraintResult;
+}

package/schema/types/schema-value-constraint.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaValueConstraint = void 0;
+class SchemaValueConstraint {
+}
+exports.SchemaValueConstraint = SchemaValueConstraint;
+//# sourceMappingURL=schema-value-constraint.js.map

package/schema/types/schema-value-constraint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-value-constraint.js","sourceRoot":"","sources":["../../../source/schema/types/schema-value-constraint.ts"],"names":[],"mappings":";;;AAIA,MAAsB,qBAAqB;CAK1C;AALD,sDAKC"}

package/schema/types/schema-value-transformer.d.ts

@@ -0,0 +1,7 @@
+import type { JsonPath } from "../../json-path/json-path";
+import type { OneOrMany } from "../../types";
+import type { TransformerContext, TransformResult, ValueType } from './types';
+export declare abstract class SchemaValueTransformer<T = any, O = any> {
+    abstract readonly sourceType?: OneOrMany<ValueType<T>>;
+    abstract transform(value: T, path: JsonPath, context: TransformerContext): TransformResult<O>;
+}

package/schema/types/schema-value-transformer.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaValueTransformer = void 0;
+class SchemaValueTransformer {
+}
+exports.SchemaValueTransformer = SchemaValueTransformer;
+//# sourceMappingURL=schema-value-transformer.js.map

package/schema/types/schema-value-transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-value-transformer.js","sourceRoot":"","sources":["../../../source/schema/types/schema-value-transformer.ts"],"names":[],"mappings":";;;AAIA,MAAsB,sBAAsB;CAI3C;AAJD,wDAIC"}

package/schema/{types.d.ts → types/types.d.ts}

@@ -1,28 +1,31 @@
-import type { JsonPath } from "../json-path/json-path";
-import type { AbstractConstructor, OneOrMany, Record, Type, TypedOmit } from "../types";
-import type { NormalizedSchema, Schema, SchemaTestable } from './schema';
-import type { SchemaError } from './schema.error';
+import type { AbstractConstructor, OneOrMany, Record, Type, TypedOmit } from "../../types";
+import type { NormalizedSchema, Schema, SchemaTestable } from '../schema';
+import type { SchemaError } from '../schema.error';
+import type { SchemaArrayConstraint } from './schema-array-constraint';
+import type { SchemaValueCoercer } from './schema-value-coercer';
+import type { SchemaValueConstraint } from './schema-value-constraint';
+import type { SchemaValueTransformer } from './schema-value-transformer';
 declare const schemaOutputTypeSymbol: unique symbol;
-export declare type SchemaFactoryFunction<T> = (data: T) => T;
-export declare type SchemaFactory<T> = {
+export type SchemaFactoryFunction<T> = (data: T) => T;
+export type SchemaFactory<T> = {
     type: Type<T>;
     builder?: undefined;
 } | {
     type?: undefined;
     builder: SchemaFactoryFunction<T>;
 };
-export declare type ObjectSchemaProperties<T> = {
+export type ObjectSchemaProperties<T> = {
     [K in keyof T]-?: OneOrMany<SchemaTestable<T[K]>>;
 };
-export declare type NormalizedObjectSchemaProperties<T> = {
+export type NormalizedObjectSchemaProperties<T> = {
     [K in keyof T]-?: Schema<T[K]>;
 };
-export declare type SchemaOutput<T extends SchemaTestable> = T extends ObjectSchema<infer O> ? O : T extends ValueSchema<infer O> ? O : T extends TypeSchema<infer O> ? O : T extends ValueType<infer O> ? NormalizeValueType<O> : never;
-export declare type TupleSchemaOutput<T extends readonly SchemaTestable[]> = {
+export type SchemaOutput<T extends SchemaTestable> = T extends ObjectSchema<infer O> ? O : T extends ValueSchema<infer O> ? O : T extends TypeSchema<infer O> ? O : T extends ValueType<infer O> ? NormalizeValueType<O> : never;
+export type TupleSchemaOutput<T extends readonly SchemaTestable[]> = {
     [P in keyof T]: SchemaOutput<T[P]>;
 };
-export declare type ObjectSchemaOrType<T = any> = ObjectSchema<T> | AbstractConstructor<T>;
-export declare type ObjectSchema<T = any> = {
+export type ObjectSchemaOrType<T = any> = ObjectSchema<T> | AbstractConstructor<T>;
+export type ObjectSchema<T = any> = {
     [schemaOutputTypeSymbol]?: T;
     sourceType?: ValueType;
     factory?: SchemaFactory<T>;
@@ -30,13 +33,13 @@ export declare type ObjectSchema<T = any> = {
     mask?: boolean;
     allowUnknownProperties?: OneOrMany<SchemaTestable>;
 };
-export declare type TypeSchema<T = any> = {
+export type TypeSchema<T = any> = {
     type: ValueType<T>;
 };
-export declare type NormalizedTypeSchema<T = any> = {
+export type NormalizedTypeSchema<T = any> = {
     foo: ResolvedValueType<T>;
 };
-export declare type ValueSchema<T = unknown> = {
+export type ValueSchema<T = unknown> = {
     [schemaOutputTypeSymbol]?: T;
     schema: OneOrMany<SchemaTestable<T>>;
     array?: boolean;
@@ -50,15 +53,15 @@ export declare type ValueSchema<T = unknown> = {
     arrayConstraints?: OneOrMany<SchemaArrayConstraint>;
     valueConstraints?: OneOrMany<SchemaValueConstraint>;
 };
-export declare type ValueSchemaOptions = TypedOmit<ValueSchema, 'schema' | typeof schemaOutputTypeSymbol>;
-export declare type NormalizedObjectSchema<T = any> = {
+export type ValueSchemaOptions = TypedOmit<ValueSchema, 'schema' | typeof schemaOutputTypeSymbol>;
+export type NormalizedObjectSchema<T = any> = {
     [schemaOutputTypeSymbol]?: T;
     factory?: SchemaFactory<T>;
     properties: NormalizedObjectSchemaProperties<T>;
     mask?: boolean;
     allowUnknownProperties: Set<Schema>;
 };
-export declare type NormalizedValueSchema<T = any> = {
+export type NormalizedValueSchema<T = any> = {
     [schemaOutputTypeSymbol]?: T;
     schema: Set<Schema<T>>;
     array: boolean;
@@ -70,44 +73,27 @@ export declare type NormalizedValueSchema<T = any> = {
     arrayConstraints: readonly SchemaArrayConstraint[];
     valueConstraints: readonly SchemaValueConstraint[];
 };
-export declare type SchemaContext = {
+export type SchemaContext = {
     schema: NormalizedSchema;
     options: SchemaTestOptions;
 };
-export declare type ConstraintContext = SchemaContext;
-export declare type TransformerContext = SchemaContext;
-export declare type CoercerContext = SchemaContext;
-export declare type NormalizeValueType<T> = T extends String ? string : T extends Number ? number : T extends Boolean ? boolean : T extends BigInt ? bigint : T extends Symbol ? symbol : T extends 'undefined' ? undefined : T extends 'null' ? null : T extends 'any' ? any : T;
-export declare type NormalizeToValueType<T> = T extends string | String ? typeof String : T extends number ? typeof Number : T extends boolean ? typeof Boolean : T extends bigint ? typeof BigInt : T extends symbol ? typeof Symbol : T extends undefined ? 'undefined' : T extends null ? 'null' : T extends any ? 'any' : never;
-export declare type ValueType<T = any> = AbstractConstructor<T> | NormalizeToValueType<T> | DeferredValueType<T>;
-export declare type DeferredValueType<T = any> = {
+export type ConstraintContext = SchemaContext;
+export type TransformerContext = SchemaContext;
+export type CoercerContext = SchemaContext;
+export type NormalizeValueType<T> = T extends String ? string : T extends Number ? number : T extends Boolean ? boolean : T extends BigInt ? bigint : T extends Symbol ? symbol : T extends 'undefined' ? undefined : T extends 'null' ? null : T extends 'any' ? any : T;
+export type NormalizeToValueType<T> = T extends string | String ? typeof String : T extends number ? typeof Number : T extends boolean ? typeof Boolean : T extends bigint ? typeof BigInt : T extends symbol ? typeof Symbol : T extends undefined ? 'undefined' : T extends null ? 'null' : T extends any ? 'any' : never;
+export type ValueType<T = any> = AbstractConstructor<T> | NormalizeToValueType<T> | DeferredValueType<T>;
+export type DeferredValueType<T = any> = {
     deferred: () => ValueType<T>;
 };
-export declare type ResolvedValueType<T = any> = Exclude<ValueType<T>, DeferredValueType>;
-export declare type Coercible = {
+export type ResolvedValueType<T = any> = Exclude<ValueType<T>, DeferredValueType>;
+export type Coercible = {
     coerce?: boolean;
 };
 export declare const primitiveConstructors: ValueType[];
 export declare const primitiveConstructorSet: Set<ValueType<any>>;
-export declare abstract class SchemaArrayConstraint {
-    abstract validate(value: readonly unknown[], path: JsonPath, context: ConstraintContext): ConstraintResult;
-}
-export declare type OptionKeys<T extends Record> = readonly (keyof T)[];
-export declare abstract class SchemaValueConstraint {
-    abstract readonly suitableTypes: OneOrMany<ValueType>;
-    abstract readonly expects: OneOrMany<string>;
-    abstract validate(value: unknown, path: JsonPath, context: ConstraintContext): ConstraintResult;
-}
-export declare abstract class SchemaValueTransformer<T = any, O = any> {
-    abstract readonly sourceType?: OneOrMany<ValueType<T>>;
-    abstract transform(value: T, path: JsonPath, context: TransformerContext): TransformResult<O>;
-}
-export declare abstract class SchemaValueCoercer {
-    abstract readonly sourceType: OneOrMany<ValueType>;
-    abstract readonly targetType: ValueType;
-    abstract coerce(value: unknown, path: JsonPath, context: CoercerContext): CoerceResult;
-}
-export declare type SchemaTestOptions = {
+export type OptionKeys<T extends Record> = readonly (keyof T)[];
+export type SchemaTestOptions = {
     /**
      * Try to convert wrong input into desired output.
      * Can be specified on definition and validation. If specified on both, definition has higher priority
@@ -123,7 +109,7 @@ export declare type SchemaTestOptions = {
      */
     fastErrors?: boolean;
 };
-export declare type SchemaTestResult<T> = {
+export type SchemaTestResult<T> = {
     valid: true;
     value: T;
     error?: undefined;
@@ -132,14 +118,14 @@ export declare type SchemaTestResult<T> = {
     value?: undefined;
     error: SchemaError;
 };
-export declare type ConstraintResult = {
+export type ConstraintResult = {
     valid: true;
     error?: undefined;
 } | {
     valid: false;
     error: SchemaError;
 };
-export declare type CoerceResult = {
+export type CoerceResult = {
     success: true;
     value: any;
     error?: undefined;
@@ -149,10 +135,10 @@ export declare type CoerceResult = {
     error: SchemaError;
 };
 export declare const transformErrorResultSymbol: unique symbol;
-export declare type TransformErrorResult = {
+export type TransformErrorResult = {
     [transformErrorResultSymbol]: SchemaError;
 };
-export declare type TransformResult<T> = T | TransformErrorResult;
+export type TransformResult<T> = T | TransformErrorResult;
 export declare function transformErrorResult(error: SchemaError): TransformErrorResult;
 export declare function isTransformErrorResult(value: any): value is TransformErrorResult;
 export declare function objectSchemaProperties<T extends Record>(properties: ObjectSchemaProperties<T>): ObjectSchemaProperties<T>;
@@ -160,16 +146,20 @@ export declare function objectSchema<T extends Record>(schema: ObjectSchema<T>):
 export declare function valueSchema<T>(schema: OneOrMany<SchemaTestable<T>>, options?: TypedOmit<ValueSchema<T>, 'schema'>): ValueSchema<T>;
 export declare function typeSchema<T>(type: ValueType<T>): TypeSchema<NormalizeValueType<T>>;
 export declare function isSchema<T>(value: any): value is Schema<T>;
-export declare function isObjectSchema<T extends Record>(schema: Schema<T>): schema is ObjectSchema<T>;
-export declare function isObjectSchema<T extends Record>(schema: any): schema is ObjectSchema<T>;
-export declare function isValueSchema<T>(schema: Schema<T>): schema is ValueSchema<T>;
+export declare function isObjectSchema<T extends Record = any>(schema: SchemaTestable<T>): schema is ObjectSchema<T>;
+export declare function isObjectSchema<T extends Record = any>(schema: any): schema is ObjectSchema<T>;
+export declare function isValueSchema<T>(schema: SchemaTestable<T>): schema is ValueSchema<T>;
 export declare function isValueSchema<T>(schema: any): schema is ValueSchema<T>;
-export declare function isTypeSchema<T>(schema: Schema<T>): schema is TypeSchema<T>;
+export declare function isTypeSchema<T>(schema: SchemaTestable<T>): schema is TypeSchema<T>;
 export declare function isTypeSchema<T>(schema: any): schema is TypeSchema<T>;
-export declare function isDeferredValueType<T>(value: ValueType<T>): value is DeferredValueType<T>;
+export declare function isDeferredValueType<T>(value: SchemaTestable<T>): value is DeferredValueType<T>;
 export declare function isDeferredValueType(value: any): value is DeferredValueType;
 export declare function resolveValueTypes<T>(valueTypes: OneOrMany<ValueType<T>>): OneOrMany<ResolvedValueType<T>>;
 export declare function resolveValueType<T>(valueType: ValueType<T>): ResolvedValueType<T>;
 export declare function valueTypesOrSchemasToSchemas<T>(valueTypesOrSchemas: OneOrMany<SchemaTestable<T>>): OneOrMany<Schema<T>>;
 export declare function schemaTestableToSchema<T>(valueTypeOrSchema: SchemaTestable<T>): Schema<T>;
+export declare function optimizeObjectSchema<T>(schema: ObjectSchema<T>): ObjectSchema<T>;
+export declare function optimizeObjectSchemaProperties<T>(properties: ObjectSchemaProperties<T>): ObjectSchemaProperties<T>;
+export declare function optimizeValueSchema<T>(schema: ValueSchema<T>): ValueSchema<T>;
+export declare function optimizeSchema<T>(schema: OneOrMany<SchemaTestable<T>>): OneOrMany<SchemaTestable<T>>;
 export {};

package/schema/types/types.js

@@ -0,0 +1,174 @@
+"use strict";
+/* eslint-disable @typescript-eslint/ban-types */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.optimizeSchema = exports.optimizeValueSchema = exports.optimizeObjectSchemaProperties = exports.optimizeObjectSchema = exports.schemaTestableToSchema = 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.isTransformErrorResult = exports.transformErrorResult = exports.transformErrorResultSymbol = exports.primitiveConstructorSet = exports.primitiveConstructors = void 0;
+const object_1 = require("../../utils/object/object");
+const type_guards_1 = require("../../utils/type-guards");
+exports.primitiveConstructors = [String, Number, Boolean, Symbol, BigInt, Function, 'undefined', 'null'];
+exports.primitiveConstructorSet = new Set(exports.primitiveConstructors);
+exports.transformErrorResultSymbol = Symbol('Transform error');
+function transformErrorResult(error) {
+    return { [exports.transformErrorResultSymbol]: error };
+}
+exports.transformErrorResult = transformErrorResult;
+function isTransformErrorResult(value) {
+    return (0, type_guards_1.isObject)(value) && (0, object_1.hasOwnProperty)(value, exports.transformErrorResultSymbol);
+}
+exports.isTransformErrorResult = isTransformErrorResult;
+function objectSchemaProperties(properties) {
+    return optimizeObjectSchemaProperties(properties);
+}
+exports.objectSchemaProperties = objectSchemaProperties;
+function objectSchema(schema) {
+    return optimizeObjectSchema(schema);
+}
+exports.objectSchema = objectSchema;
+function valueSchema(schema, options) {
+    return optimizeValueSchema({ schema, ...options });
+}
+exports.valueSchema = valueSchema;
+function typeSchema(type) {
+    return { type };
+}
+exports.typeSchema = typeSchema;
+function isSchema(value) {
+    return isObjectSchema(value) || isValueSchema(value) || isTypeSchema(value);
+}
+exports.isSchema = isSchema;
+function isObjectSchema(schema) {
+    return (0, type_guards_1.isObject)(schema?.properties);
+}
+exports.isObjectSchema = isObjectSchema;
+function isValueSchema(schema) {
+    return (0, type_guards_1.isObject)(schema) && (0, type_guards_1.isDefined)(schema?.schema);
+}
+exports.isValueSchema = isValueSchema;
+function isTypeSchema(schema) {
+    if (!(0, type_guards_1.isObject)(schema)) {
+        return false;
+    }
+    const type = schema.type;
+    return (0, type_guards_1.isObject)(schema)
+        && ((0, type_guards_1.isFunction)(type)
+            || ((0, type_guards_1.isObject)(type) && (0, type_guards_1.isFunction)(type.deferred))
+            || (type == 'undefined')
+            || (type == 'null')
+            || (type == 'any'));
+}
+exports.isTypeSchema = isTypeSchema;
+function isDeferredValueType(value) {
+    return (0, type_guards_1.isObject)(value) && (0, type_guards_1.isFunction)(value.deferred);
+}
+exports.isDeferredValueType = isDeferredValueType;
+function resolveValueTypes(valueTypes) {
+    if ((0, type_guards_1.isArray)(valueTypes)) {
+        return valueTypes.map(resolveValueType);
+    }
+    return resolveValueType(valueTypes);
+}
+exports.resolveValueTypes = resolveValueTypes;
+function resolveValueType(valueType) {
+    return isDeferredValueType(valueType)
+        ? resolveValueType(valueType.deferred())
+        : valueType;
+}
+exports.resolveValueType = resolveValueType;
+function valueTypesOrSchemasToSchemas(valueTypesOrSchemas) {
+    if ((0, type_guards_1.isArray)(valueTypesOrSchemas)) {
+        return valueTypesOrSchemas.map(schemaTestableToSchema);
+    }
+    return schemaTestableToSchema(valueTypesOrSchemas);
+}
+exports.valueTypesOrSchemasToSchemas = valueTypesOrSchemasToSchemas;
+function schemaTestableToSchema(valueTypeOrSchema) {
+    if (isSchema(valueTypeOrSchema)) {
+        return valueTypeOrSchema;
+    }
+    return typeSchema(valueTypeOrSchema);
+}
+exports.schemaTestableToSchema = schemaTestableToSchema;
+function optimizeObjectSchema(schema) {
+    return {
+        ...(0, object_1.filterObject)(schema, type_guards_1.isDefined),
+        properties: optimizeObjectSchemaProperties(schema.properties)
+    };
+}
+exports.optimizeObjectSchema = optimizeObjectSchema;
+function optimizeObjectSchemaProperties(properties) {
+    const entries = (0, object_1.objectEntries)(properties)
+        .map(([property, innerSchema]) => [property, optimizeSchema(innerSchema)]);
+    return Object.fromEntries(entries);
+}
+exports.optimizeObjectSchemaProperties = optimizeObjectSchemaProperties;
+function optimizeValueSchema(schema) {
+    const optimized = optimizeSchema(schema);
+    return isValueSchema(optimized) ? optimized : { schema: optimized };
+}
+exports.optimizeValueSchema = optimizeValueSchema;
+function optimizeSchema(schema) {
+    if ((0, type_guards_1.isArray)(schema)) {
+        if (schema.length == 1) {
+            return optimizeSchema(schema[0]);
+        }
+        return schema.flatMap(optimizeSchema);
+    }
+    if ((0, type_guards_1.isFunction)(schema) || (0, type_guards_1.isString)(schema) || isDeferredValueType(schema)) {
+        return schema;
+    }
+    if (isTypeSchema(schema)) {
+        return schema.type;
+    }
+    if (isValueSchema(schema)) {
+        const entries = (0, object_1.objectEntries)(schema).filter(([, value]) => (0, type_guards_1.isDefined)(value));
+        if (entries.length == 1) {
+            if (!(0, type_guards_1.isArray)(schema.schema)) {
+                return optimizeSchema(schema.schema);
+            }
+            else if (schema.schema.length == 1) {
+                return optimizeSchema(schema.schema[0]);
+            }
+            return schema.schema.map(optimizeSchema);
+        }
+        const combinedProperties = new Set([...(0, object_1.objectKeys)(schema), ...(0, object_1.objectKeys)(schema.schema)]);
+        if (isValueSchema(schema.schema)
+            && !combinedProperties.has('array')
+            && !combinedProperties.has('coerce')
+            && !combinedProperties.has('coercers')
+            && !combinedProperties.has('transformers')
+            && !combinedProperties.has('arrayConstraints')
+            && !combinedProperties.has('valueConstraints')) {
+            return {
+                schema: optimizeSchema(schema.schema.schema),
+                ...(0, object_1.filterObject)({
+                    optional: ((schema.optional ?? false) || (schema.schema.optional ?? false)) ? true : undefined,
+                    nullable: ((schema.nullable ?? false) || (schema.schema.nullable ?? false)) ? true : undefined
+                }, type_guards_1.isDefined)
+            };
+        }
+        const { schema: innerSchema, optional, nullable, coercers, transformers, arrayConstraints, valueConstraints, ...rest } = schema;
+        return (0, object_1.filterObject)({
+            schema: optimizeSchema(innerSchema),
+            optional: (optional ?? false) ? true : undefined,
+            nullable: (nullable ?? false) ? true : undefined,
+            coercers: optimizeOneOrMany(coercers),
+            transformers: optimizeOneOrMany(transformers),
+            arrayConstraints: optimizeOneOrMany(arrayConstraints),
+            valueConstraints: optimizeOneOrMany(valueConstraints),
+            ...rest
+        }, type_guards_1.isDefined);
+    }
+    return optimizeObjectSchema(schema);
+}
+exports.optimizeSchema = optimizeSchema;
+function optimizeOneOrMany(values) {
+    if ((0, type_guards_1.isArray)(values)) {
+        if (values.length == 0) {
+            return undefined;
+        }
+        if (values.length == 1) {
+            return values[0];
+        }
+    }
+    return values;
+}
+//# sourceMappingURL=types.js.map

package/schema/types/types.js.map

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

package/schema/utils/schema.js

@@ -87,7 +87,7 @@ function getObjectSchemaFromReflection(type) {
 exports.getObjectSchemaFromReflection = getObjectSchemaFromReflection;
 function _tryGetObjectSchemaFromReflection(type) {
     const metadata = registry_1.reflectionRegistry.getMetadata(type);
-    if (!metadata.registered) {
+    if ((0, type_guards_1.isUndefined)(metadata)) {
         return null;
     }
     const typeData = metadata.data.tryGet('schema') ?? {};

package/schema/utils/schema.js.map

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

package/schema/utils/value-type.d.ts

@@ -1,6 +1,6 @@
 import type { OneOrMany } from "../../types";
 import type { SchemaTestable } from '../schema';
-import type { ResolvedValueType, ValueType } from '../types';
+import type { ResolvedValueType, ValueType } from '../types/types';
 export declare function getValueType(value: unknown): ResolvedValueType;
 export declare function includesValueType(valueType: ValueType, valueTypes: OneOrMany<ValueType>): boolean;
 export declare function getValueTypeName(valueType: ValueType): string;

package/schema/utils/value-type.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchemaValueTypes = exports.getSchemaTypeNames = exports.getValueTypeName = exports.includesValueType = exports.getValueType = void 0;
 const array_1 = require("../../utils/array/array");
 const type_guards_1 = require("../../utils/type-guards");
-const types_1 = require("../types");
+const types_1 = require("../types/types");
 function getValueType(value) {
     if ((0, type_guards_1.isUndefined)(value)) {
         return 'undefined';

package/schema/utils/value-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"value-type.js","sourceRoot":"","sources":["../../../source/schema/utils/value-type.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAC9C,yDAAyF;AAGzF,oCAAiI;AAEjI,SAAgB,YAAY,CAAC,KAAc;IACzC,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;QACtB,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,IAAA,oBAAM,EAAC,KAAK,CAAC,EAAE;QACjB,OAAO,MAAM,CAAC;KACf;IAED,OAAQ,KAAgB,CAAC,WAAkC,CAAC;AAC9D,CAAC;AAVD,oCAUC;AAED,SAAgB,iBAAiB,CAAC,SAAoB,EAAE,UAAgC;IACtF,MAAM,kBAAkB,GAAG,IAAA,yBAAiB,EAAC,UAAU,CAAC,CAAC;IACzD,MAAM,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;IAEtD,IAAI,IAAA,qBAAO,EAAC,kBAAkB,CAAC,EAAE;QAC/B,OAAO,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;KACvD;IAED,OAAO,iBAAiB,IAAI,kBAAkB,CAAC;AACjD,CAAC;AATD,8CASC;AAED,SAAgB,gBAAgB,CAAC,SAAoB;IACnD,MAAM,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;IAEtD,OAAO,IAAA,sBAAQ,EAAC,iBAAiB,CAAC;QAChC,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC;AAC7B,CAAC;AAND,4CAMC;AAED,SAAgB,kBAAkB,CAAC,MAAsB;IACvD,OAAO,mBAAmB,CAAC,MAAM,CAAC;SAC/B,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAA,sBAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5E,CAAC;AAHD,gDAGC;AAED,SAAgB,mBAAmB,CAAC,MAAiC;IACnE,IAAI,IAAA,oBAAY,EAAC,MAAM,CAAC,EAAE;QACxB,OAAO,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;KACxC;IAED,IAAI,IAAA,wBAAU,EAAC,MAAM,CAAC,EAAE;QACtB,OAAO,CAAC,MAAM,CAAC,CAAC;KACjB;IAED,IAAI,IAAA,sBAAQ,EAAC,MAAM,CAAC,EAAE;QACpB,OAAO,CAAC,MAAM,CAAC,CAAC;KACjB;IAED,IAAI,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAE;QAC1B,OAAO,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC;KACxD;IAED,IAAI,IAAA,qBAAa,EAAC,MAAM,CAAC,EAAE;QACzB,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAA,eAAO,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;KAC1E;IAED,IAAI,IAAA,2BAAmB,EAAC,MAAM,CAAC,EAAE;QAC/B,OAAO,mBAAmB,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC,CAAC;KACtD;IAED,IAAI,IAAA,qBAAO,EAAC,MAAM,CAAC,EAAE;QACnB,OAAO,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;KAC5C;IAED,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;AACxC,CAAC;AA9BD,kDA8BC"}
+{"version":3,"file":"value-type.js","sourceRoot":"","sources":["../../../source/schema/utils/value-type.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAC9C,yDAAyF;AAGzF,0CAAuI;AAEvI,SAAgB,YAAY,CAAC,KAAc;IACzC,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;QACtB,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,IAAA,oBAAM,EAAC,KAAK,CAAC,EAAE;QACjB,OAAO,MAAM,CAAC;KACf;IAED,OAAQ,KAAgB,CAAC,WAAkC,CAAC;AAC9D,CAAC;AAVD,oCAUC;AAED,SAAgB,iBAAiB,CAAC,SAAoB,EAAE,UAAgC;IACtF,MAAM,kBAAkB,GAAG,IAAA,yBAAiB,EAAC,UAAU,CAAC,CAAC;IACzD,MAAM,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;IAEtD,IAAI,IAAA,qBAAO,EAAC,kBAAkB,CAAC,EAAE;QAC/B,OAAO,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;KACvD;IAED,OAAO,iBAAiB,IAAI,kBAAkB,CAAC;AACjD,CAAC;AATD,8CASC;AAED,SAAgB,gBAAgB,CAAC,SAAoB;IACnD,MAAM,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;IAEtD,OAAO,IAAA,sBAAQ,EAAC,iBAAiB,CAAC;QAChC,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC;AAC7B,CAAC;AAND,4CAMC;AAED,SAAgB,kBAAkB,CAAC,MAAsB;IACvD,OAAO,mBAAmB,CAAC,MAAM,CAAC;SAC/B,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAA,sBAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5E,CAAC;AAHD,gDAGC;AAED,SAAgB,mBAAmB,CAAC,MAAiC;IACnE,IAAI,IAAA,oBAAY,EAAC,MAAM,CAAC,EAAE;QACxB,OAAO,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;KACxC;IAED,IAAI,IAAA,wBAAU,EAAC,MAAM,CAAC,EAAE;QACtB,OAAO,CAAC,MAAM,CAAC,CAAC;KACjB;IAED,IAAI,IAAA,sBAAQ,EAAC,MAAM,CAAC,EAAE;QACpB,OAAO,CAAC,MAAM,CAAC,CAAC;KACjB;IAED,IAAI,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAE;QAC1B,OAAO,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC;KACxD;IAED,IAAI,IAAA,qBAAa,EAAC,MAAM,CAAC,EAAE;QACzB,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAA,eAAO,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;KAC1E;IAED,IAAI,IAAA,2BAAmB,EAAC,MAAM,CAAC,EAAE;QAC/B,OAAO,mBAAmB,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC,CAAC;KACtD;IAED,IAAI,IAAA,qBAAO,EAAC,MAAM,CAAC,EAAE;QACnB,OAAO,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;KAC5C;IAED,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;AACxC,CAAC;AA9BD,kDA8BC"}

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

@@ -1,7 +1,7 @@
 import type { Injectable } from "../../container";
 import { resolveArgumentType } from "../../container";
 import type { Entity } from "../../database";
-export declare type ElasticSearchIndexConfigArgument<T extends Entity = Entity> = string | ElasticSearchIndexConfig<T>;
+export type ElasticSearchIndexConfigArgument<T extends Entity = Entity> = string | ElasticSearchIndexConfig<T>;
 export declare abstract class ElasticSearchIndexConfig<T extends Entity = Entity> implements Injectable<ElasticSearchIndexConfigArgument> {
     readonly indexName: string;
     readonly [resolveArgumentType]: ElasticSearchIndexConfigArgument<T>;

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

@@ -1,16 +1,16 @@
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
-export declare type ElasticQuery = QueryDslQueryContainer;
-export declare type ElasticBooleanQuery = Required<Pick<QueryDslQueryContainer, 'bool'>>;
-export declare type ElasticIdsQuery = Required<Pick<QueryDslQueryContainer, 'ids'>>;
-export declare type ElasticMatchAllQuery = Required<Pick<QueryDslQueryContainer, 'match_all'>>;
-export declare type ElasticRangeQuery = Required<Pick<QueryDslQueryContainer, 'range'>>;
-export declare type ElasticRegexQuery = Required<Pick<QueryDslQueryContainer, 'regexp'>>;
-export declare type ElasticTermQuery = Required<Pick<QueryDslQueryContainer, 'term'>>;
-export declare type ElasticTermsQuery = Required<Pick<QueryDslQueryContainer, 'terms'>>;
-export declare type ElasticMatchQuery = Required<Pick<QueryDslQueryContainer, 'match'>>;
-export declare type ElasticExistsQuery = Required<Pick<QueryDslQueryContainer, 'exists'>>;
-export declare type ElasticMultiMatchQuery = Required<Pick<QueryDslQueryContainer, 'multi_match'>>;
-export declare type ElasticGeoBoundingBoxQuery = Required<Pick<QueryDslQueryContainer, 'geo_bounding_box'>>;
-export declare type ElasticGeoDistanceQuery = Required<Pick<QueryDslQueryContainer, 'geo_distance'>>;
-export declare type ElasticGeoPolygonQuery = Required<Pick<QueryDslQueryContainer, 'geo_polygon'>>;
-export declare type ElasticGeoShapeQuery = Required<Pick<QueryDslQueryContainer, 'geo_shape'>>;
+export type ElasticQuery = QueryDslQueryContainer;
+export type ElasticBooleanQuery = Required<Pick<QueryDslQueryContainer, 'bool'>>;
+export type ElasticIdsQuery = Required<Pick<QueryDslQueryContainer, 'ids'>>;
+export type ElasticMatchAllQuery = Required<Pick<QueryDslQueryContainer, 'match_all'>>;
+export type ElasticRangeQuery = Required<Pick<QueryDslQueryContainer, 'range'>>;
+export type ElasticRegexQuery = Required<Pick<QueryDslQueryContainer, 'regexp'>>;
+export type ElasticTermQuery = Required<Pick<QueryDslQueryContainer, 'term'>>;
+export type ElasticTermsQuery = Required<Pick<QueryDslQueryContainer, 'terms'>>;
+export type ElasticMatchQuery = Required<Pick<QueryDslQueryContainer, 'match'>>;
+export type ElasticExistsQuery = Required<Pick<QueryDslQueryContainer, 'exists'>>;
+export type ElasticMultiMatchQuery = Required<Pick<QueryDslQueryContainer, 'multi_match'>>;
+export type ElasticGeoBoundingBoxQuery = Required<Pick<QueryDslQueryContainer, 'geo_bounding_box'>>;
+export type ElasticGeoDistanceQuery = Required<Pick<QueryDslQueryContainer, 'geo_distance'>>;
+export type ElasticGeoPolygonQuery = Required<Pick<QueryDslQueryContainer, 'geo_polygon'>>;
+export type ElasticGeoShapeQuery = Required<Pick<QueryDslQueryContainer, 'geo_shape'>>;