@tstdl/base 0.78.1 → 0.78.3

package/schema/types.d.ts

@@ -3,30 +3,29 @@ import type { AbstractConstructor, OneOrMany, Record, Type, TypedOmit } from "..
 import type { NormalizedSchema, Schema, SchemaTestable } from './schema';
 import type { SchemaError } from './schema.error';
 declare const schemaOutputTypeSymbol: unique symbol;
-export declare type SchemaFactoryFunction<T, O = T> = (data: T) => NormalizeValueType<O>;
-export declare type SchemaFactory<T, O = T> = {
+export declare type SchemaFactoryFunction<T> = (data: T) => T;
+export declare type SchemaFactory<T> = {
     type: Type<T>;
     builder?: undefined;
 } | {
     type?: undefined;
-    builder: SchemaFactoryFunction<T, O>;
+    builder: SchemaFactoryFunction<T>;
 };
 export declare type ObjectSchemaProperties<T> = {
-    [K in keyof T]-?: OneOrMany<SchemaTestable<any, T[K]>>;
+    [K in keyof T]-?: OneOrMany<SchemaTestable<T[K]>>;
 };
 export declare type NormalizedObjectSchemaProperties<T> = {
-    [K in keyof T]-?: Schema<any, T[K]>;
+    [K in keyof T]-?: Schema<T[K]>;
 };
-export declare type SchemaInput<T extends SchemaTestable> = T extends ObjectSchema<infer U, any> ? U : T extends ValueSchema<infer U, any> ? U : T extends TypeSchema<infer U> ? U : T extends ValueType<infer U> ? NormalizeValueType<U> : never;
-export declare type SchemaOutput<T extends SchemaTestable> = T extends ObjectSchema<any, infer O> ? O : T extends ValueSchema<any, infer O> ? O : T extends TypeSchema<infer O> ? O : T extends ValueType<infer O> ? NormalizeValueType<O> : never;
+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[]> = {
     [P in keyof T]: SchemaOutput<T[P]>;
 };
-export declare type ObjectSchemaOrType<T = any, O = T> = ObjectSchema<T, O> | AbstractConstructor<O>;
-export declare type ObjectSchema<T = any, O = T> = {
-    [schemaOutputTypeSymbol]?: O;
+export declare type ObjectSchemaOrType<T = any> = ObjectSchema<T> | AbstractConstructor<T>;
+export declare type ObjectSchema<T = any> = {
+    [schemaOutputTypeSymbol]?: T;
     sourceType?: ValueType;
-    factory?: SchemaFactory<T, O>;
+    factory?: SchemaFactory<T>;
     properties: ObjectSchemaProperties<T>;
     mask?: boolean;
     allowUnknownProperties?: OneOrMany<SchemaTestable>;
@@ -37,9 +36,9 @@ export declare type TypeSchema<T = any> = {
 export declare type NormalizedTypeSchema<T = any> = {
     foo: ResolvedValueType<T>;
 };
-export declare type ValueSchema<T = unknown, O = T> = {
-    [schemaOutputTypeSymbol]?: O;
-    schema: OneOrMany<SchemaTestable<T, O>>;
+export declare type ValueSchema<T = unknown> = {
+    [schemaOutputTypeSymbol]?: T;
+    schema: OneOrMany<SchemaTestable<T>>;
     array?: boolean;
     optional?: boolean;
     nullable?: boolean;
@@ -51,22 +50,23 @@ export declare type ValueSchema<T = unknown, O = T> = {
     arrayConstraints?: OneOrMany<SchemaArrayConstraint>;
     valueConstraints?: OneOrMany<SchemaValueConstraint>;
 };
-export declare type NormalizedObjectSchema<T = any, O = T> = {
-    [schemaOutputTypeSymbol]?: O;
-    factory?: SchemaFactory<T, O>;
+export declare type ValueSchemaOptions = TypedOmit<ValueSchema, 'schema' | typeof schemaOutputTypeSymbol>;
+export declare type NormalizedObjectSchema<T = any> = {
+    [schemaOutputTypeSymbol]?: T;
+    factory?: SchemaFactory<T>;
     properties: NormalizedObjectSchemaProperties<T>;
     mask?: boolean;
     allowUnknownProperties: Set<Schema>;
 };
-export declare type NormalizedValueSchema<T = any, O = T> = {
-    [schemaOutputTypeSymbol]?: O;
-    schema: Set<Schema<T, O>>;
+export declare type NormalizedValueSchema<T = any> = {
+    [schemaOutputTypeSymbol]?: T;
+    schema: Set<Schema<T>>;
     array: boolean;
     optional: boolean;
     nullable: boolean;
     coerce: boolean;
     coercers: Map<ValueType, SchemaValueCoercer[]>;
-    transformers: readonly SchemaValueTransformer<any, any, any>[];
+    transformers: readonly SchemaValueTransformer[];
     arrayConstraints: readonly SchemaArrayConstraint[];
     valueConstraints: readonly SchemaValueConstraint[];
 };
@@ -98,10 +98,9 @@ export declare abstract class SchemaValueConstraint {
     abstract readonly expects: OneOrMany<string>;
     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>>;
-    abstract readonly targetType: ValueType<TransformOutput>;
-    abstract transform(value: O, path: JsonPath, context: TransformerContext): TransformResult<TransformOutput>;
+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>;
@@ -149,30 +148,28 @@ export declare type CoerceResult = {
     value?: undefined;
     error: SchemaError;
 };
-export declare type TransformResult<T> = {
-    success: true;
-    value: T;
-    error?: undefined;
-} | {
-    success: false;
-    value?: undefined;
-    error: SchemaError;
+export declare const transformErrorResultSymbol: unique symbol;
+export declare type TransformErrorResult = {
+    [transformErrorResultSymbol]: SchemaError;
 };
+export declare 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>;
-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<SchemaTestable<T, O>>, options?: TypedOmit<ValueSchema<T, O>, 'schema'>): ValueSchema<T, O>;
+export declare function objectSchema<T extends Record>(schema: ObjectSchema<T>): 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, 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 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 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: any): schema is TypeSchema<T>;
 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<SchemaTestable<T, O>>): OneOrMany<Schema<T, O>>;
-export declare function schemaTestableToSchema<T, O>(valueTypeOrSchema: SchemaTestable<T, O>): Schema<T, O>;
+export declare function valueTypesOrSchemasToSchemas<T>(valueTypesOrSchemas: OneOrMany<SchemaTestable<T>>): OneOrMany<Schema<T>>;
+export declare function schemaTestableToSchema<T>(valueTypeOrSchema: SchemaTestable<T>): Schema<T>;
 export {};

package/schema/types.js

@@ -1,7 +1,7 @@
 "use strict";
 /* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
-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.SchemaValueCoercer = exports.SchemaValueTransformer = exports.SchemaValueConstraint = exports.SchemaArrayConstraint = exports.primitiveConstructorSet = exports.primitiveConstructors = void 0;
+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.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.primitiveConstructors = [String, Number, Boolean, Symbol, BigInt, Function, 'undefined', 'null'];
@@ -18,6 +18,15 @@ exports.SchemaValueTransformer = SchemaValueTransformer;
 class SchemaValueCoercer {
 }
 exports.SchemaValueCoercer = SchemaValueCoercer;
+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 (0, object_1.filterObject)(properties, type_guards_1.isDefined);
 }
@@ -65,7 +74,7 @@ function isDeferredValueType(value) {
 exports.isDeferredValueType = isDeferredValueType;
 function resolveValueTypes(valueTypes) {
     if ((0, type_guards_1.isArray)(valueTypes)) {
-        return valueTypes.flatMap((valueType) => resolveValueTypes(valueType));
+        return valueTypes.map(resolveValueType);
     }
     return resolveValueType(valueTypes);
 }

package/schema/types.js.map

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

package/schema/utils/schema.d.ts

@@ -7,12 +7,12 @@ export declare const normalizeValueSchema: typeof _normalizeValueSchema;
 export declare const normalizeTypeSchema: typeof _normalizeTypeSchema;
 export declare const getArrayItemSchema: typeof _getArrayItemSchema;
 export declare const tryGetObjectSchemaFromReflection: typeof _tryGetObjectSchemaFromReflection;
-export declare function getObjectSchema<T, O = T>(schemaOrType: ObjectSchemaOrType<T, O>): ObjectSchema<T, O>;
-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>;
+export declare function getObjectSchema<T>(schemaOrType: ObjectSchemaOrType<T>): ObjectSchema<T>;
+declare function _normalizeSchema<T>(schema: Schema<T>): NormalizedSchema<T>;
+declare function _normalizeObjectSchema<T>(schema: ObjectSchema<T>): NormalizedObjectSchema<T>;
+declare function _normalizeValueSchema<T>(schema: ValueSchema<T>): NormalizedValueSchema<T>;
 declare function _normalizeTypeSchema<T>(schema: TypeSchema<T>): NormalizedTypeSchema<T>;
-declare function _getArrayItemSchema<T, O>(schema: ValueSchema<T, O>): ValueSchema<T, O>;
+declare function _getArrayItemSchema<T>(schema: ValueSchema<T>): ValueSchema<T>;
 export declare function getObjectSchemaFromReflection<T>(type: AbstractConstructor<T>): ObjectSchema<T>;
 declare function _tryGetObjectSchemaFromReflection<T>(type: AbstractConstructor<T>): ObjectSchema<T> | null;
 export {};

package/schema/utils/schema.js

@@ -15,9 +15,9 @@ exports.normalizeTypeSchema = (0, memoize_1.memoizeSingle)(_normalizeTypeSchema,
 exports.getArrayItemSchema = (0, memoize_1.memoizeSingle)(_getArrayItemSchema, { weak: true });
 exports.tryGetObjectSchemaFromReflection = (0, memoize_1.memoizeSingle)(_tryGetObjectSchemaFromReflection, { weak: true });
 function getObjectSchema(schemaOrType) {
-    return ((0, type_guards_1.isFunction)(schemaOrType)
+    return (0, type_guards_1.isFunction)(schemaOrType)
         ? getObjectSchemaFromReflection(schemaOrType)
-        : schemaOrType);
+        : schemaOrType;
 }
 exports.getObjectSchema = getObjectSchema;
 function _normalizeSchema(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

@@ -2,6 +2,7 @@ import type { OneOrMany } from "../../types";
 import type { SchemaTestable } from '../schema';
 import type { ResolvedValueType, ValueType } from '../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;
 export declare function getSchemaTypeNames(schema: SchemaTestable): string[];
 export declare function getSchemaValueTypes(schema: OneOrMany<SchemaTestable>): ResolvedValueType[];

package/schema/utils/value-type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSchemaValueTypes = exports.getSchemaTypeNames = exports.getValueTypeName = exports.getValueType = void 0;
+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");
@@ -14,6 +14,15 @@ function getValueType(value) {
     return value.constructor;
 }
 exports.getValueType = getValueType;
+function includesValueType(valueType, valueTypes) {
+    const resolvedValueTypes = (0, types_1.resolveValueTypes)(valueTypes);
+    const resolvedValueType = (0, types_1.resolveValueType)(valueType);
+    if ((0, type_guards_1.isArray)(resolvedValueTypes)) {
+        return resolvedValueTypes.includes(resolvedValueType);
+    }
+    return resolvedValueType == resolvedValueTypes;
+}
+exports.includesValueType = includesValueType;
 function getValueTypeName(valueType) {
     const resolvedValueType = (0, types_1.resolveValueType)(valueType);
     return (0, type_guards_1.isString)(resolvedValueType)

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,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,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,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"}

package/schema/coercers/default-value.coercer.d.ts

@@ -1,9 +0,0 @@
-import type { CoerceResult, ValueType } from '../types';
-import { SchemaValueCoercer } from '../types';
-export declare class DefaultValueCoercer extends SchemaValueCoercer {
-    readonly defaultValue: any;
-    readonly sourceType: readonly ["undefined", "null"];
-    readonly targetType: ValueType;
-    constructor(defaultValue: any);
-    coerce(): CoerceResult;
-}

package/schema/coercers/default-value.coercer.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultValueCoercer = void 0;
-const types_1 = require("../types");
-class DefaultValueCoercer extends types_1.SchemaValueCoercer {
-    constructor(defaultValue) {
-        super();
-        this.sourceType = ['undefined', 'null'];
-        this.defaultValue = defaultValue;
-    }
-    coerce() {
-        return { success: true, value: this.defaultValue };
-    }
-}
-exports.DefaultValueCoercer = DefaultValueCoercer;
-//# sourceMappingURL=default-value.coercer.js.map

package/schema/coercers/default-value.coercer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"default-value.coercer.js","sourceRoot":"","sources":["../../../source/schema/coercers/default-value.coercer.ts"],"names":[],"mappings":";;;AACA,oCAA8C;AAE9C,MAAa,mBAAoB,SAAQ,0BAAkB;IAKzD,YAAY,YAAiB;QAC3B,KAAK,EAAE,CAAC;QAJD,eAAU,GAAG,CAAC,WAAW,EAAE,MAAM,CAAU,CAAC;QAMnD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED,MAAM;QACJ,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;IACrD,CAAC;CACF;AAdD,kDAcC"}