@tstdl/base 0.78.0-beta4 → 0.78.0-beta42

package/schema/types.d.ts

@@ -1,33 +1,40 @@
 import type { JsonPath } from "../json-path/json-path";
 import type { AbstractConstructor, OneOrMany, Record, Type, TypedOmit } from "../types";
-import type { Schema, SchemaTestable } from './schema';
+import type { NormalizedSchema, Schema, SchemaTestable } from './schema';
 import type { SchemaError } from './schema.error';
 declare const schemaOutputTypeSymbol: unique symbol;
-export declare type SchemaFactoryFunction<T extends Record, O = T> = (data: T) => NormalizeValueType<O>;
-export declare type SchemaFactory<T extends Record, O = T> = {
+export declare type SchemaFactoryFunction<T, O = T> = (data: T) => NormalizeValueType<O>;
+export declare type SchemaFactory<T, O = T> = {
     type: Type<T>;
     builder?: undefined;
 } | {
     type?: undefined;
     builder: SchemaFactoryFunction<T, O>;
 };
-export declare type ObjectSchemaProperties<T extends Record> = {
-    [K in keyof T]-?: OneOrMany<ValueType<T[K]>>;
+export declare type ObjectSchemaProperties<T> = {
+    [K in keyof T]-?: OneOrMany<Schema<any, T[K]>>;
 };
 export declare type NormalizedObjectSchemaProperties<T> = {
-    [K in keyof T]: Schema<T[K]>;
+    [K in keyof T]-?: Schema<any, T[K]>;
 };
-export declare type SchemaOutput<T extends SchemaTestable> = T extends ObjectSchema<any, infer O> ? O : T extends ValueSchema<any, infer O> ? O : T extends TypeSchema ? InstanceType<T> : never;
-export declare type ObjectSchema<T extends Record = any, O extends Record = T> = {
+export declare type SchemaOutput<T extends Schema> = T extends ObjectSchema<any, infer O> ? O : T extends ValueSchema<any, infer O> ? O : T extends TypeSchema<infer O> ? O : never;
+export declare type ObjectSchema<T = any, O = T> = {
     [schemaOutputTypeSymbol]?: O;
+    sourceType?: ValueType;
     factory?: SchemaFactory<T, O>;
     properties: ObjectSchemaProperties<T>;
     mask?: boolean;
-    allowUnknownProperties?: OneOrMany<ValueType>;
+    allowUnknownProperties?: OneOrMany<SchemaTestable>;
+};
+export declare type TypeSchema<T = any> = {
+    type: ValueType<T>;
+};
+export declare type NormalizedTypeSchema<T = any> = {
+    foo: ResolvedValueType<T>;
 };
-export declare type TypeSchema<T = any, O = T> = AbstractConstructor<T & O>;
 export declare type ValueSchema<T = unknown, O = T> = {
-    type: OneOrMany<ValueType<T, O>>;
+    [schemaOutputTypeSymbol]?: O;
+    schema: OneOrMany<SchemaTestable<T, O>>;
     array?: boolean;
     optional?: boolean;
     nullable?: boolean;
@@ -39,7 +46,7 @@ export declare type ValueSchema<T = unknown, O = T> = {
     arrayConstraints?: OneOrMany<SchemaArrayConstraint>;
     valueConstraints?: OneOrMany<SchemaValueConstraint>;
 };
-export declare type NormalizedObjectSchema<T extends Record = any, O extends Record = T> = {
+export declare type NormalizedObjectSchema<T = any, O = T> = {
     [schemaOutputTypeSymbol]?: O;
     factory?: SchemaFactory<T, O>;
     properties: NormalizedObjectSchemaProperties<T>;
@@ -48,7 +55,7 @@ export declare type NormalizedObjectSchema<T extends Record = any, O extends Rec
 };
 export declare type NormalizedValueSchema<T = any, O = T> = {
     [schemaOutputTypeSymbol]?: O;
-    type: Set<ResolvedValueType<T, O>>;
+    schema: Set<Schema<T, O>>;
     array: boolean;
     optional: boolean;
     nullable: boolean;
@@ -59,25 +66,25 @@ export declare type NormalizedValueSchema<T = any, O = T> = {
     valueConstraints: readonly SchemaValueConstraint[];
 };
 export declare type SchemaContext = {
-    schema: NormalizedValueSchema;
+    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;
-export declare type NormalizeToValueType<T> = T extends 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' : never;
-export declare type ValueType<T = any, O = T> = Schema<T, O> | TypeSchema<T, O> | NormalizeToValueType<T> | DeferredValueType<T, O> | 'undefined' | 'null' | 'any';
-export declare type DeferredValueType<T = unknown, O = T> = {
-    deferred: () => ValueType<T, O>;
-};
-export declare type ResolvedValueType<T = unknown, O = T> = Exclude<ValueType<T, O>, DeferredValueType>;
-export declare type ValueTypeOutput<T extends ValueType | DeferredValueType> = T extends (ValueType<infer _, infer O> | DeferredValueType<infer _, infer O>) ? NormalizeValueType<O> : never;
+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 = unknown> = {
+    deferred: () => ValueType<T>;
+};
+export declare type ResolvedValueType<T = unknown> = Exclude<ValueType<T>, DeferredValueType>;
+export declare type ValueTypeOutput<T extends ValueType> = T extends ValueType<infer U> ? NormalizeValueType<U> : never;
 export declare type Coercible = {
     coerce?: boolean;
 };
-export declare const primitiveValueTypes: ValueType[];
-export declare const primitiveValueTypesSet: Set<ValueType<any, any>>;
+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;
 }
@@ -88,7 +95,7 @@ export declare abstract class SchemaValueConstraint {
     abstract validate(value: unknown, path: JsonPath, context: ConstraintContext): ConstraintResult;
 }
 export declare abstract class SchemaValueTransformer<T = any, O = T, TransformOutput = O> {
-    abstract readonly sourceType: OneOrMany<ValueType<T, O>>;
+    abstract readonly sourceType: OneOrMany<ValueType<T>>;
     abstract readonly targetType: ValueType<TransformOutput>;
     abstract transform(value: O, path: JsonPath, context: TransformerContext): TransformResult<TransformOutput>;
 }
@@ -110,19 +117,19 @@ export declare type SchemaTestOptions = {
     mask?: boolean;
 };
 export declare type SchemaTestResult<T> = {
-    success: true;
+    valid: true;
     value: T;
     error?: undefined;
 } | {
-    success: false;
+    valid: false;
     value?: undefined;
     error: SchemaError;
 };
 export declare type ConstraintResult = {
-    success: true;
+    valid: true;
     error?: undefined;
 } | {
-    success: false;
+    valid: false;
     error: SchemaError;
 };
 export declare type CoerceResult = {
@@ -143,14 +150,21 @@ export declare type TransformResult<T> = {
     value?: undefined;
     error: SchemaError;
 };
-export declare function objectSchema<T, O = T>(schema: ObjectSchema<T, O>): ObjectSchema<T, O>;
-export declare function valueSchema<T, O = T>(type: ValueSchema<T, O>['type'], options?: TypedOmit<ValueSchema<T, O>, 'type'>): ValueSchema<T, O>;
-export declare function isSchema<T, O>(value: ValueType<T, O>): value is Schema<T, O>;
-export declare function isObjectSchema<T extends Record, O extends Record>(value: ValueType<T, O>): value is ObjectSchema<T, O>;
-export declare function isValueSchema<T, O>(value: ValueType<T, O>): value is ValueSchema<T, O>;
-export declare function isDeferredValueType<T, O>(value: ValueType<T, O>): value is DeferredValueType<T, O>;
-export declare function deferrableValueTypesToValueTypes<T, O>(valueTypes: OneOrMany<ValueType<T, O>>): OneOrMany<ResolvedValueType<T, O>>;
-export declare function deferrableValueTypeToResolvedValueTypes<T, O>(valueType: ValueType<T, O>): ResolvedValueType<T, O>;
-export declare function valueTypeToSchema<T, O>(valueType: ValueType<T, O>): Schema<T, O>;
-export declare function valueTypesToSchema<T, O>(valueType: OneOrMany<ValueType<T, O>>): Schema<T, O>;
+export declare function objectSchemaProperties<T extends Record>(properties: ObjectSchemaProperties<T>): ObjectSchemaProperties<T>;
+export declare function objectSchema<T extends Record, O extends Record = T>(schema: ObjectSchema<T, O>): ObjectSchema<T, O>;
+export declare function valueSchema<T, O = T>(schema: OneOrMany<Schema<T, O>>, options?: TypedOmit<ValueSchema<T, O>, 'schema'>): ValueSchema<T, O>;
+export declare function typeSchema<T>(type: ValueType<T>): TypeSchema<NormalizeValueType<T>>;
+export declare function isSchema<T, O>(value: any): value is Schema<T, O>;
+export declare function isObjectSchema<T extends Record, O extends Record>(schema: Schema<T, O>): schema is ObjectSchema<T, O>;
+export declare function isObjectSchema<T extends Record, O extends Record>(schema: any): schema is ObjectSchema<T, O>;
+export declare function isValueSchema<T, O>(schema: Schema<T, O>): schema is ValueSchema<T, O>;
+export declare function isValueSchema<T, O>(schema: any): schema is ValueSchema<T, O>;
+export declare function isTypeSchema<T, O>(schema: Schema<T, O>): schema is TypeSchema<O>;
+export declare function isTypeSchema<T, O>(schema: any): schema is TypeSchema<O>;
+export declare function isDeferredValueType<T>(value: ValueType<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, O>(valueTypesOrSchemas: OneOrMany<ValueType<O> | Schema<T, O>>): OneOrMany<Schema<T, O>>;
+export declare function valueTypeOrSchemaToSchema<T, O>(valueTypeOrSchema: ValueType<O> | Schema<T, O>): Schema<T, O>;
 export {};

package/schema/types.js

@@ -1,10 +1,11 @@
 "use strict";
 /* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.valueTypesToSchema = exports.valueTypeToSchema = exports.deferrableValueTypeToResolvedValueTypes = exports.deferrableValueTypesToValueTypes = exports.isDeferredValueType = exports.isValueSchema = exports.isObjectSchema = exports.isSchema = exports.valueSchema = exports.objectSchema = exports.SchemaValueCoercer = exports.SchemaValueTransformer = exports.SchemaValueConstraint = exports.SchemaArrayConstraint = exports.primitiveValueTypesSet = exports.primitiveValueTypes = void 0;
+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;
+const object_1 = require("../utils/object/object");
 const type_guards_1 = require("../utils/type-guards");
-exports.primitiveValueTypes = [String, Number, Boolean, BigInt, Symbol, Function, 'undefined', 'null'];
-exports.primitiveValueTypesSet = new Set(exports.primitiveValueTypes);
+exports.primitiveConstructors = [String, Number, Boolean, Symbol, BigInt, Function, 'undefined', 'null'];
+exports.primitiveConstructorSet = new Set(exports.primitiveConstructors);
 class SchemaArrayConstraint {
 }
 exports.SchemaArrayConstraint = SchemaArrayConstraint;
@@ -17,61 +18,75 @@ exports.SchemaValueTransformer = SchemaValueTransformer;
 class SchemaValueCoercer {
 }
 exports.SchemaValueCoercer = SchemaValueCoercer;
+function objectSchemaProperties(properties) {
+    return (0, object_1.filterObject)(properties, type_guards_1.isDefined);
+}
+exports.objectSchemaProperties = objectSchemaProperties;
 function objectSchema(schema) {
-    return schema;
+    return (0, object_1.filterObject)(schema, type_guards_1.isDefined);
 }
 exports.objectSchema = objectSchema;
-function valueSchema(type, options) {
-    return { type, ...options };
+function valueSchema(schema, options) {
+    return (0, object_1.filterObject)({ schema, ...options }, type_guards_1.isDefined);
 }
 exports.valueSchema = valueSchema;
+function typeSchema(type) {
+    return { type };
+}
+exports.typeSchema = typeSchema;
 function isSchema(value) {
-    return isObjectSchema(value) || isValueSchema(value);
+    return isObjectSchema(value) || isValueSchema(value) || isTypeSchema(value);
 }
 exports.isSchema = isSchema;
-function isObjectSchema(value) {
-    return (0, type_guards_1.isObject)(value?.properties);
+function isObjectSchema(schema) {
+    return (0, type_guards_1.isObject)(schema?.properties);
 }
 exports.isObjectSchema = isObjectSchema;
-function isValueSchema(value) {
-    return (0, type_guards_1.isObject)(value) && (0, type_guards_1.isDefined)(value?.type);
+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)
+            || (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 deferrableValueTypesToValueTypes(valueTypes) {
+function resolveValueTypes(valueTypes) {
     if ((0, type_guards_1.isArray)(valueTypes)) {
-        return valueTypes.flatMap((valueType) => deferrableValueTypesToValueTypes(valueType));
+        return valueTypes.flatMap((valueType) => resolveValueTypes(valueType));
     }
-    return deferrableValueTypeToResolvedValueTypes(valueTypes);
+    return resolveValueType(valueTypes);
 }
-exports.deferrableValueTypesToValueTypes = deferrableValueTypesToValueTypes;
-function deferrableValueTypeToResolvedValueTypes(valueType) {
+exports.resolveValueTypes = resolveValueTypes;
+function resolveValueType(valueType) {
     return isDeferredValueType(valueType)
-        ? deferrableValueTypeToResolvedValueTypes(valueType.deferred())
+        ? resolveValueType(valueType.deferred())
         : valueType;
 }
-exports.deferrableValueTypeToResolvedValueTypes = deferrableValueTypeToResolvedValueTypes;
-function valueTypeToSchema(valueType) {
-    if ((0, type_guards_1.isFunction)(valueType) || (0, type_guards_1.isString)(valueType)) {
-        return valueSchema(valueType);
-    }
-    if (isDeferredValueType(valueType)) {
-        return valueTypeToSchema(valueType.deferred());
+exports.resolveValueType = resolveValueType;
+function valueTypesOrSchemasToSchemas(valueTypesOrSchemas) {
+    if ((0, type_guards_1.isArray)(valueTypesOrSchemas)) {
+        return valueTypesOrSchemas.map(valueTypeOrSchemaToSchema);
     }
-    return valueType;
+    return valueTypeOrSchemaToSchema(valueTypesOrSchemas);
 }
-exports.valueTypeToSchema = valueTypeToSchema;
-function valueTypesToSchema(valueType) {
-    if ((0, type_guards_1.isFunction)(valueType) || (0, type_guards_1.isArray)(valueType) || (0, type_guards_1.isString)(valueType)) {
-        return valueSchema(valueType);
-    }
-    if (isDeferredValueType(valueType)) {
-        return valueTypeToSchema(valueType);
+exports.valueTypesOrSchemasToSchemas = valueTypesOrSchemasToSchemas;
+function valueTypeOrSchemaToSchema(valueTypeOrSchema) {
+    if (isSchema(valueTypeOrSchema)) {
+        return valueTypeOrSchema;
     }
-    return valueType;
+    return typeSchema(valueTypeOrSchema);
 }
-exports.valueTypesToSchema = valueTypesToSchema;
+exports.valueTypeOrSchemaToSchema = valueTypeOrSchemaToSchema;
 //# sourceMappingURL=types.js.map

package/schema/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/schema/types.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AAIjD,sDAAyF;AA0G5E,QAAA,mBAAmB,GAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;AAC5G,QAAA,sBAAsB,GAAG,IAAI,GAAG,CAAC,2BAAmB,CAAC,CAAC;AAEnE,MAAsB,qBAAqB;CAE1C;AAFD,sDAEC;AAID,MAAsB,qBAAqB;CAK1C;AALD,sDAKC;AAED,MAAsB,sBAAsB;CAK3C;AALD,wDAKC;AAED,MAAsB,kBAAkB;CAKvC;AALD,gDAKC;AAgCD,SAAgB,YAAY,CAAW,MAA0B;IAC/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAFD,oCAEC;AAED,SAAgB,WAAW,CAAW,IAA+B,EAAE,OAA8C;IACnH,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;AAC9B,CAAC;AAFD,kCAEC;AAED,SAAgB,QAAQ,CAAO,KAAsB;IACnD,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AACvD,CAAC;AAFD,4BAEC;AAED,SAAgB,cAAc,CAAqC,KAAsB;IACvF,OAAO,IAAA,sBAAQ,EAAE,KAA2C,EAAE,UAAU,CAAC,CAAC;AAC5E,CAAC;AAFD,wCAEC;AAED,SAAgB,aAAa,CAAO,KAAsB;IACxD,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,uBAAS,EAAE,KAA0C,EAAE,IAAI,CAAC,CAAC;AACzF,CAAC;AAFD,sCAEC;AAED,SAAgB,mBAAmB,CAAO,KAAsB;IAC9D,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,wBAAU,EAAE,KAA2B,CAAC,QAAQ,CAAC,CAAC;AAC9E,CAAC;AAFD,kDAEC;AAED,SAAgB,gCAAgC,CAAO,UAAsC;IAC3F,IAAI,IAAA,qBAAO,EAAC,UAAU,CAAC,EAAE;QACvB,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC,CAAC;KACvF;IAED,OAAO,uCAAuC,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC;AAND,4EAMC;AAED,SAAgB,uCAAuC,CAAO,SAA0B;IACtF,OAAO,mBAAmB,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,uCAAuC,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC/D,CAAC,CAAC,SAAoC,CAAC;AAC3C,CAAC;AAJD,0FAIC;AAED,SAAgB,iBAAiB,CAAO,SAA0B;IAChE,IAAI,IAAA,wBAAU,EAAC,SAAS,CAAC,IAAI,IAAA,sBAAQ,EAAC,SAAS,CAAC,EAAE;QAChD,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC;KAC/B;IAED,IAAI,mBAAmB,CAAC,SAAS,CAAC,EAAE;QAClC,OAAO,iBAAiB,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;KAChD;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAVD,8CAUC;AAED,SAAgB,kBAAkB,CAAO,SAAqC;IAC5E,IAAI,IAAA,wBAAU,EAAC,SAAS,CAAC,IAAI,IAAA,qBAAO,EAAC,SAAS,CAAC,IAAI,IAAA,sBAAQ,EAAC,SAAS,CAAC,EAAE;QACtE,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC;KAC/B;IAED,IAAI,mBAAmB,CAAC,SAAS,CAAC,EAAE;QAClC,OAAO,iBAAiB,CAAC,SAAS,CAAC,CAAC;KACrC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAVD,gDAUC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/schema/types.ts"],"names":[],"mappings":"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"}

package/schema/utils/schema.d.ts

@@ -1,8 +1,16 @@
-import type { NormalizedObjectSchema, NormalizedValueSchema, ObjectSchema, ValueSchema } from '../types';
-export declare const normalizeSchema: typeof _normalizeObjectSchema;
+import type { AbstractConstructor } from "../../types";
+import type { NormalizedSchema, Schema } from '../schema';
+import type { NormalizedObjectSchema, NormalizedTypeSchema, NormalizedValueSchema, ObjectSchema, TypeSchema, ValueSchema } from '../types';
+export declare const normalizeSchema: typeof _normalizeSchema;
+export declare const normalizeObjectSchema: typeof _normalizeObjectSchema;
 export declare const normalizeValueSchema: typeof _normalizeValueSchema;
+export declare const normalizeTypeSchema: typeof _normalizeTypeSchema;
 export declare const getArrayItemSchema: typeof _getArrayItemSchema;
-export declare function _normalizeObjectSchema<T, O>(objectSchema: ObjectSchema<T, O>): NormalizedObjectSchema<T, O>;
-export declare function _normalizeValueSchema<T, O>(valueSchema: ValueSchema<T, O>): NormalizedValueSchema<T, O>;
-declare function _getArrayItemSchema<T, O>(valueSchema: ValueSchema<T, O>): ValueSchema<T, O>;
+export declare const getSchemaFromReflection: typeof _getObjectSchemaFromReflection;
+declare function _normalizeSchema<T, O>(schema: Schema<T, O>): NormalizedSchema<T, O>;
+declare function _normalizeObjectSchema<T, O>(schema: ObjectSchema<T, O>): NormalizedObjectSchema<T, O>;
+declare function _normalizeValueSchema<T, O>(schema: ValueSchema<T, O>): NormalizedValueSchema<T, O>;
+declare function _normalizeTypeSchema<T>(schema: TypeSchema<T>): NormalizedTypeSchema<T>;
+declare function _getArrayItemSchema<T, O>(schema: ValueSchema<T, O>): ValueSchema<T, O>;
+declare function _getObjectSchemaFromReflection<T>(type: AbstractConstructor<T>): ObjectSchema<T> | null;
 export {};

package/schema/utils/schema.js

@@ -1,37 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._normalizeValueSchema = exports._normalizeObjectSchema = exports.getArrayItemSchema = exports.normalizeValueSchema = exports.normalizeSchema = void 0;
+exports.getSchemaFromReflection = exports.getArrayItemSchema = exports.normalizeTypeSchema = exports.normalizeValueSchema = exports.normalizeObjectSchema = exports.normalizeSchema = void 0;
+const registry_1 = require("../../reflection/registry");
 const array_1 = require("../../utils/array/array");
 const memoize_1 = require("../../utils/function/memoize");
 const object_1 = require("../../utils/object/object");
+const type_guards_1 = require("../../utils/type-guards");
+const assign_1 = require("../schemas/assign");
 const types_1 = require("../types");
-exports.normalizeSchema = (0, memoize_1.memoizeSingle)(_normalizeObjectSchema, { weak: true });
+exports.normalizeSchema = (0, memoize_1.memoizeSingle)(_normalizeSchema, { weak: true });
+exports.normalizeObjectSchema = (0, memoize_1.memoizeSingle)(_normalizeObjectSchema, { weak: true });
 exports.normalizeValueSchema = (0, memoize_1.memoizeSingle)(_normalizeValueSchema, { weak: true });
+exports.normalizeTypeSchema = (0, memoize_1.memoizeSingle)(_normalizeTypeSchema, { weak: true });
 exports.getArrayItemSchema = (0, memoize_1.memoizeSingle)(_getArrayItemSchema, { weak: true });
-function _normalizeObjectSchema(objectSchema) {
-    const normalizedObjectSchema = {
-        factory: objectSchema.factory,
-        properties: (0, object_1.mapObjectValues)(objectSchema.properties, types_1.valueTypesToSchema),
-        mask: objectSchema.mask,
-        allowUnknownProperties: new Set((0, array_1.toArray)(objectSchema.allowUnknownProperties ?? []).map(types_1.valueTypesToSchema))
+exports.getSchemaFromReflection = (0, memoize_1.memoizeSingle)(_getObjectSchemaFromReflection, { weak: true });
+function _normalizeSchema(schema) {
+    if ((0, types_1.isObjectSchema)(schema)) {
+        return (0, exports.normalizeObjectSchema)(schema);
+    }
+    if ((0, types_1.isValueSchema)(schema)) {
+        return (0, exports.normalizeValueSchema)(schema);
+    }
+    if ((0, types_1.isTypeSchema)(schema)) {
+        return (0, exports.normalizeTypeSchema)(schema);
+    }
+    throw new Error('Unsupported schema.');
+}
+function _normalizeObjectSchema(schema) {
+    const normalizedSchema = {
+        factory: schema.factory,
+        properties: (0, object_1.mapObjectValues)(schema.properties, (propertyValueType) => ((0, type_guards_1.isArray)(propertyValueType) ? (0, types_1.valueSchema)(propertyValueType) : propertyValueType)),
+        mask: schema.mask,
+        allowUnknownProperties: new Set((0, array_1.toArray)(schema.allowUnknownProperties ?? []).map(types_1.valueTypeOrSchemaToSchema))
     };
-    return normalizedObjectSchema;
+    return normalizedSchema;
 }
-exports._normalizeObjectSchema = _normalizeObjectSchema;
-function _normalizeValueSchema(valueSchema) {
-    const valueTypes = (0, array_1.toArray)((0, types_1.deferrableValueTypesToValueTypes)(valueSchema.type));
+function _normalizeValueSchema(schema) {
     const normalizedValueSchema = {
-        type: new Set(valueTypes),
-        array: valueSchema.array ?? false,
-        optional: valueSchema.optional ?? false,
-        nullable: valueSchema.nullable ?? false,
-        coerce: valueSchema.coerce ?? false,
+        schema: new Set((0, array_1.toArray)(schema.schema).map(types_1.valueTypeOrSchemaToSchema)),
+        array: schema.array ?? false,
+        optional: schema.optional ?? false,
+        nullable: schema.nullable ?? false,
+        coerce: schema.coerce ?? false,
         coercers: new Map(),
-        transformers: (0, array_1.toArray)(valueSchema.transformers ?? []),
-        arrayConstraints: (0, array_1.toArray)(valueSchema.arrayConstraints ?? []),
-        valueConstraints: (0, array_1.toArray)(valueSchema.valueConstraints ?? [])
+        transformers: (0, array_1.toArray)(schema.transformers ?? []),
+        arrayConstraints: (0, array_1.toArray)(schema.arrayConstraints ?? []),
+        valueConstraints: (0, array_1.toArray)(schema.valueConstraints ?? [])
     };
-    for (const coercer of (0, array_1.toArray)(valueSchema.coercers ?? [])) {
+    for (const coercer of (0, array_1.toArray)(schema.coercers ?? [])) {
         for (const sourceType of (0, array_1.toArray)(coercer.sourceType)) {
             if (!normalizedValueSchema.coercers.has(sourceType)) {
                 normalizedValueSchema.coercers.set(sourceType, []);
@@ -41,16 +57,60 @@ function _normalizeValueSchema(valueSchema) {
     }
     return normalizedValueSchema;
 }
-exports._normalizeValueSchema = _normalizeValueSchema;
-function _getArrayItemSchema(valueSchema) {
+function _normalizeTypeSchema(schema) {
+    const normalizedSchema = {
+        foo: (0, types_1.resolveValueType)(schema.type)
+    };
+    return normalizedSchema;
+}
+function _getArrayItemSchema(schema) {
     const itemSchema = {
-        type: valueSchema.type,
+        schema: schema.schema,
         array: false,
         optional: false,
         nullable: false,
-        transformers: valueSchema.transformers,
-        valueConstraints: valueSchema.valueConstraints
+        transformers: schema.transformers,
+        valueConstraints: schema.valueConstraints
     };
     return itemSchema;
 }
+function _getObjectSchemaFromReflection(type) {
+    const metadata = registry_1.reflectionRegistry.getMetadata(type);
+    if (!metadata.registered) {
+        return null;
+    }
+    const typeData = metadata.data.tryGet('schema');
+    const properties = {};
+    for (const [key, propertyMetadata] of metadata.properties) {
+        const reflectionData = propertyMetadata.data.tryGet('schema');
+        const itemType = reflectionData?.schema;
+        const array = (reflectionData?.array == true) ? true : undefined;
+        if (array && ((0, type_guards_1.isUndefined)(itemType) || ((0, type_guards_1.isArray)(itemType) && (itemType.length == 0)))) {
+            throw new Error(`Item type missing on type ${type.name} at property "${String(key)}"`);
+        }
+        properties[key] = (0, types_1.valueSchema)((0, types_1.valueTypesOrSchemasToSchemas)(itemType ?? propertyMetadata.type), {
+            array,
+            optional: reflectionData?.optional,
+            nullable: reflectionData?.nullable,
+            coerce: reflectionData?.coerce,
+            coercers: reflectionData?.coercers,
+            transformers: reflectionData?.transformers,
+            arrayConstraints: reflectionData?.arrayConstraints,
+            valueConstraints: reflectionData?.valueConstraints
+        });
+    }
+    const schema = (0, types_1.objectSchema)({
+        sourceType: type,
+        factory: (0, type_guards_1.isDefined)(typeData?.factory) ? { builder: typeData.factory } : { type: type },
+        properties,
+        mask: typeData?.mask,
+        allowUnknownProperties: ((0, type_guards_1.isUndefined)(typeData?.allowUnknownProperties) || ((0, type_guards_1.isArray)(typeData?.allowUnknownProperties) && (typeData?.allowUnknownProperties.length == 0))) ? undefined : typeData?.allowUnknownProperties
+    });
+    const prototype = Reflect.getPrototypeOf(type);
+    if ((0, type_guards_1.isNotNull)(prototype) && registry_1.reflectionRegistry.hasType(prototype)) {
+        const parentSchema = (0, exports.getSchemaFromReflection)(prototype);
+        return (0, assign_1.assign)(parentSchema, schema);
+    }
+    return schema;
+}
 //# sourceMappingURL=schema.js.map

package/schema/utils/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../source/schema/utils/schema.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,0DAAyD;AACzD,sDAAwD;AAExD,oCAAgF;AAEnE,QAAA,eAAe,GAAG,IAAA,uBAAa,EAAC,sBAAsB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;AACxE,QAAA,oBAAoB,GAAG,IAAA,uBAAa,EAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;AAC5E,QAAA,kBAAkB,GAAG,IAAA,uBAAa,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;AAErF,SAAgB,sBAAsB,CAAO,YAAgC;IAC3E,MAAM,sBAAsB,GAAiC;QAC3D,OAAO,EAAE,YAAY,CAAC,OAAO;QAC7B,UAAU,EAAE,IAAA,wBAAe,EAAC,YAAY,CAAC,UAAU,EAAE,0BAAkB,CAAmD;QAC1H,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,sBAAsB,EAAE,IAAI,GAAG,CAAC,IAAA,eAAO,EAAC,YAAY,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC;KAC5G,CAAC;IAEF,OAAO,sBAAsB,CAAC;AAChC,CAAC;AATD,wDASC;AAED,SAAgB,qBAAqB,CAAO,WAA8B;IACxE,MAAM,UAAU,GAAG,IAAA,eAAO,EAAC,IAAA,wCAAgC,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/E,MAAM,qBAAqB,GAAgC;QACzD,IAAI,EAAE,IAAI,GAAG,CAAC,UAAU,CAAC;QACzB,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,KAAK;QACjC,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,KAAK;QACvC,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,KAAK;QACvC,MAAM,EAAE,WAAW,CAAC,MAAM,IAAI,KAAK;QACnC,QAAQ,EAAE,IAAI,GAAG,EAAE;QACnB,YAAY,EAAE,IAAA,eAAO,EAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QACrD,gBAAgB,EAAE,IAAA,eAAO,EAAC,WAAW,CAAC,gBAAgB,IAAI,EAAE,CAAC;QAC7D,gBAAgB,EAAE,IAAA,eAAO,EAAC,WAAW,CAAC,gBAAgB,IAAI,EAAE,CAAC;KAC9D,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,IAAA,eAAO,EAAC,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE;QACzD,KAAK,MAAM,UAAU,IAAI,IAAA,eAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACpD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACnD,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;aACpD;YAED,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/D;KACF;IAED,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AA1BD,sDA0BC;AAED,SAAS,mBAAmB,CAAO,WAA8B;IAC/D,MAAM,UAAU,GAAsB;QACpC,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE,KAAK;QACf,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;KAC/C,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"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,3 +1,5 @@
+import type { SchemaTestable } from '../schema';
 import type { ResolvedValueType, ValueType } from '../types';
-export declare function getValueType(value: unknown): ResolvedValueType;
+export declare function getValueType(value: unknown): ResolvedValueType<any>;
 export declare function getValueTypeName(valueType: ValueType): string;
+export declare function getSchemaTypeNames(schema: SchemaTestable): string[];

package/schema/utils/value-type.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getValueTypeName = exports.getValueType = void 0;
+exports.getSchemaTypeNames = exports.getValueTypeName = exports.getValueType = void 0;
+const array_1 = require("../../utils/array/array");
 const type_guards_1 = require("../../utils/type-guards");
+const types_1 = require("../types");
 function getValueType(value) {
     if ((0, type_guards_1.isUndefined)(value)) {
         return 'undefined';
@@ -13,7 +15,35 @@ function getValueType(value) {
 }
 exports.getValueType = getValueType;
 function getValueTypeName(valueType) {
-    return (0, type_guards_1.isString)(valueType) ? valueType : (0, type_guards_1.isFunction)(valueType) ? valueType.name : 'object';
+    const resolvedValueType = (0, types_1.resolveValueType)(valueType);
+    return (0, type_guards_1.isString)(resolvedValueType)
+        ? resolvedValueType
+        : resolvedValueType.name;
 }
 exports.getValueTypeName = getValueTypeName;
+function getSchemaTypeNames(schema) {
+    if ((0, types_1.isTypeSchema)(schema)) {
+        const name = getValueTypeName(schema.type);
+        return [name];
+    }
+    if ((0, type_guards_1.isFunction)(schema)) {
+        const name = getValueTypeName(schema);
+        return [name];
+    }
+    if ((0, type_guards_1.isString)(schema)) {
+        return [schema];
+    }
+    if ((0, types_1.isObjectSchema)(schema)) {
+        const name = getValueTypeName(schema.sourceType ?? Object);
+        return [name];
+    }
+    if ((0, types_1.isValueSchema)(schema)) {
+        return [...new Set((0, array_1.toArray)(schema.schema).flatMap(getSchemaTypeNames))];
+    }
+    if ((0, types_1.isDeferredValueType)(schema)) {
+        return getSchemaTypeNames((0, types_1.resolveValueType)(schema));
+    }
+    throw new Error('Unsupported schema');
+}
+exports.getSchemaTypeNames = getSchemaTypeNames;
 //# sourceMappingURL=value-type.js.map

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,yDAAgF;AAGhF,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,WAAmB,CAAC;AAC/C,CAAC;AAVD,oCAUC;AAED,SAAgB,gBAAgB,CAAC,SAAoB;IACnD,OAAO,IAAA,sBAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,wBAAU,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC7F,CAAC;AAFD,4CAEC"}
+{"version":3,"file":"value-type.js","sourceRoot":"","sources":["../../../source/schema/utils/value-type.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAC9C,yDAAgF;AAGhF,oCAA8G;AAE9G,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,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,IAAI,IAAA,oBAAY,EAAC,MAAM,CAAC,EAAE;QACxB,MAAM,IAAI,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;KACf;IAED,IAAI,IAAA,wBAAU,EAAC,MAAM,CAAC,EAAE;QACtB,MAAM,IAAI,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC;KACf;IAED,IAAI,IAAA,sBAAQ,EAAC,MAAM,CAAC,EAAE;QACpB,OAAO,CAAC,MAAM,CAAC,CAAC;KACjB;IAED,IAAI,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAE;QAC1B,MAAM,IAAI,GAAG,gBAAgB,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,CAAC;KACf;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,kBAAkB,CAAC,CAAC,CAAC,CAAC;KACzE;IAED,IAAI,IAAA,2BAAmB,EAAC,MAAM,CAAC,EAAE;QAC/B,OAAO,kBAAkB,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC,CAAC;KACrD;IAED,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;AACxC,CAAC;AA7BD,gDA6BC"}

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

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../source/search-index/elastic/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAAyE;AAEzE,yDAA+C;AAK/C,IAAsB,wBAAwB,GAA9C,MAAsB,wBAAwB;IAI5C,YAAyB,iBAAuD;QAC9E,IAAI,CAAC,SAAS,GAAG,IAAA,sBAAQ,EAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC;IACjG,CAAC;CACF,CAAA;AAPqB,wBAAwB;IAD7C,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,qBAAS,GAAE,CAAA;;GAJJ,wBAAwB,CAO7C;AAPqB,4DAAwB"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../source/search-index/elastic/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAAyE;AAEzE,yDAA+C;AAKxC,IAAe,wBAAwB,GAAvC,MAAe,wBAAwB;IAI5C,YAAyB,iBAAuD;QAC9E,IAAI,CAAC,SAAS,GAAG,IAAA,sBAAQ,EAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC;IACjG,CAAC;CACF,CAAA;AAPqB,wBAAwB;IAD7C,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,qBAAS,GAAE,CAAA;;GAJJ,wBAAwB,CAO7C;AAPqB,4DAAwB"}

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

@@ -1,6 +1,6 @@
 import type { Entity } from "../../../database";
 import type { DeepFlatten, StringMap, TypedOmit } from "../../../types";
-import type { MappingBooleanProperty, MappingDateProperty, MappingGeoPointProperty, MappingKeywordProperty, MappingNestedProperty, MappingNumberProperty, MappingObjectProperty, MappingPropertyBase, MappingTextProperty, MappingTypeMapping } from '@elastic/elasticsearch/lib/api/types';
+import type { MappingBooleanProperty, MappingByteNumberProperty, MappingDateProperty, MappingDoubleNumberProperty, MappingFloatNumberProperty, MappingGeoPointProperty, MappingHalfFloatNumberProperty, MappingIntegerNumberProperty, MappingKeywordProperty, MappingLongNumberProperty, MappingNestedProperty, MappingObjectProperty, MappingPropertyBase, MappingScaledFloatNumberProperty, MappingShortNumberProperty, MappingTextProperty, MappingTypeMapping, MappingUnsignedLongNumberProperty } from '@elastic/elasticsearch/lib/api/types';
 export declare type ElasticIndexMapping<T extends Entity = Entity> = TypedOmit<MappingTypeMapping, 'properties'> & ElasticNestedIndexMapping<TypedOmit<T, 'id'>>;
 export declare type ElasticNestedIndexMapping<T> = {
     properties: {
@@ -12,6 +12,7 @@ declare type ElasticIndexMappingItemBase = {
     index?: boolean;
     fields?: StringMap<ElasticIndexMappingItem>;
 };
+export declare type MappingNumberProperty = MappingByteNumberProperty | MappingDoubleNumberProperty | MappingFloatNumberProperty | MappingHalfFloatNumberProperty | MappingIntegerNumberProperty | MappingLongNumberProperty | MappingShortNumberProperty | MappingScaledFloatNumberProperty | MappingUnsignedLongNumberProperty;
 export declare type ElasticKeywordIndexMappingItem = ElasticIndexMappingItemBase & StrippedBaseType<MappingKeywordProperty>;
 export declare type ElasticTextIndexMappingItem = ElasticIndexMappingItemBase & StrippedBaseType<MappingTextProperty>;
 export declare type ElasticNumberIndexMappingItem = ElasticIndexMappingItemBase & StrippedBaseType<MappingNumberProperty>;

package/search-index/elastic/model/index-mapping.js.map

@@ -1 +1 @@
-{"version":3,"file":"index-mapping.js","sourceRoot":"","sources":["../../../../source/search-index/elastic/model/index-mapping.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,uDAAoD;AA0CpD,SAAgB,0BAA0B,CAAmB,QAAkC;IAC7F,OAAO,IAAA,oBAAY,EAAC,QAAQ,CAAC,CAAC;AAChC,CAAC;AAFD,gEAEC"}
+{"version":3,"file":"index-mapping.js","sourceRoot":"","sources":["../../../../source/search-index/elastic/model/index-mapping.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,uDAAoD;AAqDpD,SAAgB,0BAA0B,CAAmB,QAAkC;IAC7F,OAAO,IAAA,oBAAY,EAAC,QAAQ,CAAC,CAAC;AAChC,CAAC;AAFD,gEAEC"}

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

@@ -138,6 +138,6 @@ function deserializeCursor(cursor) {
 }
 function convertError(error, raw) {
     const cause = ((0, type_guards_1.isDefined)(error.caused_by)) ? convertError(error.caused_by) : undefined;
-    return new search_index_1.SearchIndexError(error.type, error.reason, { raw, cause });
+    return new search_index_1.SearchIndexError(error.type, error.reason ?? 'No error message provided.', { raw, cause });
 }
 //# sourceMappingURL=search-index.js.map