@tstdl/base 0.78.0-beta2 → 0.78.0-beta5

package/schema/types.d.ts

@@ -1,29 +1,40 @@
 import type { JsonPath } from "../json-path/json-path";
-import type { OneOrMany, Record, Type } from "../types";
-import type { Schema } from './schema';
+import type { AbstractConstructor, OneOrMany, Record, Type, TypedOmit } from "../types";
+import type { NormalizedSchema, Schema } from './schema';
 import type { SchemaError } from './schema.error';
-declare const schemaTypeSymbol: unique symbol;
-export declare type SchemaFactoryFunction<T extends Record> = (data: T) => T;
-export declare type SchemaFactory<T extends Record> = {
-    type: Type<T, []>;
+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> = {
+    type: Type<T>;
     builder?: undefined;
 } | {
     type?: undefined;
-    builder: SchemaFactoryFunction<T>;
+    builder: SchemaFactoryFunction<T, O>;
 };
 export declare type ObjectSchemaProperties<T extends Record> = {
-    [K in keyof T]-?: MaybeDeferredValueTypes<T[K]>;
+    [K in keyof T]-?: OneOrMany<Schema<T[K]>>;
 };
-export declare type SchemaOutput<T extends Schema | Type> = T extends ObjectSchema<infer U> ? U : T extends ValueSchema<infer U> ? U : T extends Type<infer U> ? U : never;
-export declare type ObjectSchema<T extends Record = any> = {
-    factory?: SchemaFactory<T>;
+export declare type NormalizedObjectSchemaProperties<T> = {
+    [K in keyof T]-?: Schema<T[K]>;
+};
+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 extends Record = any, O extends Record = T> = {
+    [schemaOutputTypeSymbol]?: O;
+    sourceType?: ValueType;
+    factory?: SchemaFactory<T, O>;
     properties: ObjectSchemaProperties<T>;
     mask?: boolean;
-    allowUnknownProperties?: MaybeDeferredValueTypes;
+    allowUnknownProperties?: OneOrMany<Schema>;
+};
+export declare type TypeSchema<T = any> = {
+    type: ValueType<T>;
 };
-export declare type ValueSchema<T = any> = {
-    [schemaTypeSymbol]?: T;
-    type: MaybeDeferredValueTypes;
+export declare type NormalizedTypeSchema<T = any> = {
+    foo: ResolvedValueType<T>;
+};
+export declare type ValueSchema<T = unknown, O = T> = {
+    [schemaOutputTypeSymbol]?: O;
+    schema: OneOrMany<Schema<T, O>>;
     array?: boolean;
     optional?: boolean;
     nullable?: boolean;
@@ -35,63 +46,61 @@ export declare type ValueSchema<T = any> = {
     arrayConstraints?: OneOrMany<SchemaArrayConstraint>;
     valueConstraints?: OneOrMany<SchemaValueConstraint>;
 };
-export declare type NormalizedObjectSchema<T extends Record = any> = {
-    factory?: SchemaFactory<T>;
-    properties: {
-        [K in keyof T]: Schema<T[K]>;
-    };
+export declare type NormalizedObjectSchema<T extends Record = any, O extends Record = T> = {
+    [schemaOutputTypeSymbol]?: O;
+    factory?: SchemaFactory<T, O>;
+    properties: NormalizedObjectSchemaProperties<T>;
     mask?: boolean;
     allowUnknownProperties: Set<Schema>;
 };
-export declare type NormalizedValueSchema<T = any> = {
-    type: Set<ValueType<T>>;
+export declare type NormalizedValueSchema<T = any, O = T> = {
+    [schemaOutputTypeSymbol]?: O;
+    schema: Set<Schema<T, O>>;
     array: boolean;
     optional: boolean;
     nullable: boolean;
     coerce: boolean;
     coercers: Map<ValueType, SchemaValueCoercer[]>;
-    transformers: readonly SchemaValueTransformer[];
+    transformers: readonly SchemaValueTransformer<any, any, any>[];
     arrayConstraints: readonly SchemaArrayConstraint[];
     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 ValueType<T = any> = Schema<T> | Type<T> | typeof BigInt | typeof Symbol | typeof Function | 'undefined' | 'null' | 'any';
-export declare type DeferredValueType<T> = {
+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 MaybeDeferredValueType<T = any> = ValueType<T> | DeferredValueType<T>;
-export declare type ValueTypes<T = any> = OneOrMany<ValueType<T>>;
-export declare type DeferredValueTypes<T = any> = {
-    deferred: () => ValueTypes<T>;
-};
-export declare type MaybeDeferredValueTypes<T = any> = OneOrMany<ValueTypes<T> | DeferredValueTypes<T>> | MaybeDeferredValueTypes<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>>;
+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: ValueTypes;
+    abstract readonly suitableTypes: OneOrMany<ValueType>;
     abstract readonly expects: OneOrMany<string>;
     abstract validate(value: unknown, path: JsonPath, context: ConstraintContext): ConstraintResult;
 }
-export declare abstract class SchemaValueTransformer {
-    abstract readonly sourceType: ValueTypes;
-    abstract readonly targetType: ValueType;
-    abstract transform(value: unknown, path: JsonPath, context: TransformerContext): TransformResult;
+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 SchemaValueCoercer {
-    abstract readonly sourceType: ValueTypes;
+    abstract readonly sourceType: OneOrMany<ValueType>;
     abstract readonly targetType: ValueType;
     abstract coerce(value: unknown, path: JsonPath, context: CoercerContext): CoerceResult;
 }
@@ -132,19 +141,28 @@ export declare type CoerceResult = {
     value?: undefined;
     error: SchemaError;
 };
-export declare type TransformResult = {
+export declare type TransformResult<T> = {
     success: true;
-    value: any;
+    value: T;
     error?: undefined;
 } | {
     success: false;
     value?: undefined;
     error: SchemaError;
 };
-export declare function objectSchema<T extends ObjectSchema>(schema: T): T;
-export declare function valueSchema<T extends ValueSchema>(schema: T): T;
-export declare function isSchema<T>(value: ValueType<T>): value is Schema<T>;
-export declare function isObjectSchema<T>(value: ValueType<T>): value is ObjectSchema<T>;
-export declare function isValueSchema<T>(value: ValueType<T>): value is ValueSchema<T>;
-export declare function isDeferredValueType<T>(value: MaybeDeferredValueTypes<T>): value is (DeferredValueType<T> | DeferredValueTypes<T>);
+export declare function objectSchema<T, O = 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 extends Record, O extends Record>(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 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,10 @@
 "use strict";
+/* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
-const object_1 = require("../utils/object/object");
+exports.valueTypeOrSchemaToSchema = exports.valueTypesOrSchemasToSchemas = exports.resolveValueType = exports.resolveValueTypes = exports.isDeferredValueType = exports.isTypeSchema = exports.isValueSchema = exports.isObjectSchema = exports.isSchema = exports.typeSchema = exports.valueSchema = exports.objectSchema = exports.SchemaValueCoercer = exports.SchemaValueTransformer = exports.SchemaValueConstraint = exports.SchemaArrayConstraint = exports.primitiveConstructorSet = exports.primitiveConstructors = void 0;
 const type_guards_1 = require("../utils/type-guards");
-exports.primitiveValueTypes = [String, Number, Boolean, BigInt, Symbol, Function, 'undefined', 'null', 'any'];
-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;
@@ -21,24 +21,59 @@ function objectSchema(schema) {
     return schema;
 }
 exports.objectSchema = objectSchema;
-function valueSchema(schema) {
-    return schema;
+function valueSchema(schema, options) {
+    return { schema, ...options };
 }
 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) {
+    return (0, type_guards_1.isObject)(schema) && (0, type_guards_1.isFunction)(schema?.type);
+}
+exports.isTypeSchema = isTypeSchema;
 function isDeferredValueType(value) {
-    return (0, type_guards_1.isObject)(value) && (0, object_1.hasOwnProperty)(value, 'deferred');
+    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.flatMap((valueType) => resolveValueTypes(valueType));
+    }
+    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(valueTypeOrSchemaToSchema);
+    }
+    return valueTypeOrSchemaToSchema(valueTypesOrSchemas);
+}
+exports.valueTypesOrSchemasToSchemas = valueTypesOrSchemasToSchemas;
+function valueTypeOrSchemaToSchema(valueTypeOrSchema) {
+    if (isSchema(valueTypeOrSchema)) {
+        return valueTypeOrSchema;
+    }
+    return typeSchema(valueTypeOrSchema);
+}
+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":";;;AAEA,mDAAuD;AACvD,sDAA0D;AAuF7C,QAAA,mBAAmB,GAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AACnH,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,CAAyB,MAAS;IAC5D,OAAO,MAAM,CAAC;AAChB,CAAC;AAFD,oCAEC;AAED,SAAgB,WAAW,CAAwB,MAAS;IAC1D,OAAO,MAAM,CAAC;AAChB,CAAC;AAFD,kCAEC;AAED,SAAgB,QAAQ,CAAI,KAAmB;IAC7C,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AACvD,CAAC;AAFD,4BAEC;AAED,SAAgB,cAAc,CAAI,KAAmB;IACnD,OAAO,IAAA,sBAAQ,EAAE,KAA2C,EAAE,UAAU,CAAC,CAAC;AAC5E,CAAC;AAFD,wCAEC;AAED,SAAgB,aAAa,CAAI,KAAmB;IAClD,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,uBAAS,EAAE,KAA0C,EAAE,IAAI,CAAC,CAAC;AACzF,CAAC;AAFD,sCAEC;AAED,SAAgB,mBAAmB,CAAI,KAAiC;IACtE,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,uBAAc,EAAE,KAA4B,EAAE,UAAU,CAAC,CAAC;AACtF,CAAC;AAFD,kDAEC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/schema/types.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AAIjD,sDAA+E;AAgHlE,QAAA,qBAAqB,GAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAwC,EAAE,MAAwC,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;AAClL,QAAA,uBAAuB,GAAG,IAAI,GAAG,CAAC,6BAAqB,CAAC,CAAC;AAEtE,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,MAA+B,EAAE,OAAgD;IACrH,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;AAChC,CAAC;AAFD,kCAEC;AAED,SAAgB,UAAU,CAAI,IAAkB;IAC9C,OAAO,EAAE,IAAI,EAAuC,CAAC;AACvD,CAAC;AAFD,gCAEC;AAED,SAAgB,QAAQ,CAAqC,KAAU;IACrE,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAFD,4BAEC;AAID,SAAgB,cAAc,CAAC,MAAW;IACxC,OAAO,IAAA,sBAAQ,EAAE,MAA4C,EAAE,UAAU,CAAC,CAAC;AAC7E,CAAC;AAFD,wCAEC;AAID,SAAgB,aAAa,CAAC,MAAW;IACvC,OAAO,IAAA,sBAAQ,EAAC,MAAM,CAAC,IAAI,IAAA,uBAAS,EAAE,MAAkC,EAAE,MAAM,CAAC,CAAC;AACpF,CAAC;AAFD,sCAEC;AAID,SAAgB,YAAY,CAAC,MAAW;IACtC,OAAO,IAAA,sBAAQ,EAAC,MAAM,CAAC,IAAI,IAAA,wBAAU,EAAE,MAAiC,EAAE,IAAI,CAAC,CAAC;AAClF,CAAC;AAFD,oCAEC;AAED,SAAgB,mBAAmB,CAAI,KAAmB;IACxD,OAAO,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,wBAAU,EAAE,KAA2B,CAAC,QAAQ,CAAC,CAAC;AAC9E,CAAC;AAFD,kDAEC;AAED,SAAgB,iBAAiB,CAAI,UAAmC;IACtE,IAAI,IAAA,qBAAO,EAAC,UAAU,CAAC,EAAE;QACvB,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;KACxE;IAED,OAAO,gBAAgB,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAND,8CAMC;AAED,SAAgB,gBAAgB,CAAI,SAAuB;IACzD,OAAO,mBAAmB,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACxC,CAAC,CAAC,SAAiC,CAAC;AACxC,CAAC;AAJD,4CAIC;AAED,SAAgB,4BAA4B,CAAO,mBAA2D;IAC5G,IAAI,IAAA,qBAAO,EAAC,mBAAmB,CAAC,EAAE;QAChC,OAAO,mBAAmB,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;KAC3D;IAED,OAAO,yBAAyB,CAAC,mBAAmB,CAAC,CAAC;AACxD,CAAC;AAND,oEAMC;AAED,SAAgB,yBAAyB,CAAO,iBAA8C;IAC5F,IAAI,QAAQ,CAAO,iBAAiB,CAAC,EAAE;QACrC,OAAO,iBAAiB,CAAC;KAC1B;IAED,OAAO,UAAU,CAAC,iBAAiB,CAAkB,CAAC;AACxD,CAAC;AAND,8DAMC"}

package/schema/utils/schema.d.ts

@@ -1,12 +1,13 @@
-import type { Schema } from '../schema';
-import type { MaybeDeferredValueTypes, NormalizedObjectSchema, NormalizedValueSchema, ObjectSchema, ValueSchema, ValueTypes } from '../types';
-export declare const normalizeSchema: typeof _normalizeObjectSchema;
+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>(objectSchema: ObjectSchema<T>): NormalizedObjectSchema<T>;
-export declare function _normalizeValueSchema<T>(valueSchema: ValueSchema<T>): NormalizedValueSchema<T>;
-declare function _getArrayItemSchema<T>(valueSchema: ValueSchema<T>): ValueSchema<T>;
-export declare function maybeDeferredValueTypesToValueTypes<T>(valueTypes: MaybeDeferredValueTypes<T>): ValueTypes<T>;
-export declare function valueTypesToSchema<T>(valueType: ValueTypes<T>): Schema<T>;
-export declare function maybeDeferredValueTypesToSchema<T>(valueType: MaybeDeferredValueTypes<T>): Schema<T>;
+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>;
 export {};

package/schema/utils/schema.js

@@ -1,38 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeDeferredValueTypesToSchema = exports.valueTypesToSchema = exports.maybeDeferredValueTypesToValueTypes = exports._normalizeValueSchema = exports._normalizeObjectSchema = exports.getArrayItemSchema = exports.normalizeValueSchema = exports.normalizeSchema = void 0;
+exports.getArrayItemSchema = exports.normalizeTypeSchema = exports.normalizeValueSchema = exports.normalizeObjectSchema = exports.normalizeSchema = void 0;
 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 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, maybeDeferredValueTypesToSchema),
-        mask: objectSchema.mask,
-        allowUnknownProperties: new Set((0, array_1.toArray)(objectSchema.allowUnknownProperties ?? []).map(maybeDeferredValueTypesToSchema))
+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 = maybeDeferredValueTypesToValueTypes(valueSchema.type);
+function _normalizeValueSchema(schema) {
     const normalizedValueSchema = {
-        type: new Set((0, array_1.toArray)(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)),
+        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, []);
@@ -42,37 +54,21 @@ 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 maybeDeferredValueTypesToValueTypes(valueTypes) {
-    if ((0, type_guards_1.isArray)(valueTypes)) {
-        return valueTypes.flatMap((valueType) => maybeDeferredValueTypesToValueTypes(valueType));
-    }
-    return (0, types_1.isDeferredValueType)(valueTypes)
-        ? valueTypes.deferred()
-        : valueTypes;
-}
-exports.maybeDeferredValueTypesToValueTypes = maybeDeferredValueTypesToValueTypes;
-function valueTypesToSchema(valueType) {
-    if ((0, type_guards_1.isFunction)(valueType) || (0, type_guards_1.isArray)(valueType) || (0, type_guards_1.isString)(valueType)) {
-        return { type: valueType };
-    }
-    return valueType;
-}
-exports.valueTypesToSchema = valueTypesToSchema;
-function maybeDeferredValueTypesToSchema(valueType) {
-    const deferredValueTypes = maybeDeferredValueTypesToValueTypes(valueType);
-    return valueTypesToSchema(deferredValueTypes);
-}
-exports.maybeDeferredValueTypesToSchema = maybeDeferredValueTypesToSchema;
 //# 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":"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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,4 +1,5 @@
-import type { ValueType } from '../types';
-export declare function getValueType(value: unknown): ValueType;
+import type { Schema } from '../schema';
+import type { ResolvedValueType, ValueType } from '../types';
+export declare function getValueType(value: unknown): ResolvedValueType<any>;
 export declare function getValueTypeName(valueType: ValueType): string;
-export declare function valueTypeHasValueType(valueType: ValueType, typeToCheck: ValueType): boolean;
+export declare function getSchemaTypeNames(schema: Schema): string[];

package/schema/utils/value-type.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.valueTypeHasValueType = 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");
-const schema_1 = require("./schema");
 function getValueType(value) {
     if ((0, type_guards_1.isUndefined)(value)) {
         return 'undefined';
@@ -11,25 +11,29 @@ function getValueType(value) {
     if ((0, type_guards_1.isNull)(value)) {
         return 'null';
     }
-    return value.constructor;
+    return (0, type_guards_1.assertObjectPass)(value).constructor;
 }
 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 valueTypeHasValueType(valueType, typeToCheck) {
-    if ((0, types_1.isValueSchema)(valueType)) {
-        const resolvedValueTypes = (0, schema_1.maybeDeferredValueTypesToValueTypes)(valueType.type);
-        if ((0, type_guards_1.isArray)(resolvedValueTypes)) {
-            return resolvedValueTypes.some((innerType) => valueTypeHasValueType(innerType, typeToCheck));
-        }
-        return valueTypeHasValueType(resolvedValueTypes, typeToCheck);
+function getSchemaTypeNames(schema) {
+    if ((0, types_1.isTypeSchema)(schema)) {
+        const name = getValueTypeName(schema.type);
+        return [name];
     }
-    if ((0, types_1.isObjectSchema)(valueType)) {
-        return false;
+    if ((0, types_1.isObjectSchema)(schema)) {
+        const name = getValueTypeName(schema.sourceType ?? Object);
+        return [name];
     }
-    return valueType == typeToCheck;
+    if ((0, types_1.isValueSchema)(schema)) {
+        return [...new Set((0, array_1.toArray)(schema.schema).flatMap(getSchemaTypeNames))];
+    }
+    throw new Error('Unsupported schema');
 }
-exports.valueTypeHasValueType = valueTypeHasValueType;
+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,yDAAyF;AAEzF,oCAAyD;AACzD,qCAA+D;AAE/D,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;AAED,SAAgB,qBAAqB,CAAC,SAAoB,EAAE,WAAsB;IAChF,IAAI,IAAA,qBAAa,EAAC,SAAS,CAAC,EAAE;QAC5B,MAAM,kBAAkB,GAAG,IAAA,4CAAmC,EAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE/E,IAAI,IAAA,qBAAO,EAAC,kBAAkB,CAAC,EAAE;YAC/B,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;SAC9F;QAED,OAAO,qBAAqB,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;KAC/D;IAED,IAAI,IAAA,sBAAc,EAAC,SAAS,CAAC,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IAED,OAAO,SAAS,IAAI,WAAW,CAAC;AAClC,CAAC;AAhBD,sDAgBC"}
+{"version":3,"file":"value-type.js","sourceRoot":"","sources":["../../../source/schema/utils/value-type.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAC9C,yDAAsF;AAGtF,oCAAyF;AAEzF,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,OAAO,IAAA,8BAAgB,EAAC,KAAK,CAAC,CAAC,WAAkC,CAAC;AACpE,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,MAAc;IAC/C,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,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,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;AACxC,CAAC;AAhBD,gDAgBC"}

package/templates/providers/file-template.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-template.provider.js","sourceRoot":"","sources":["../../../source/templates/providers/file-template.provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAAwE;AAExE,yCAA6D;AAI7D,+EAAyE;AAe5D,QAAA,0BAA0B,GAA+B,EAAE,CAAC;AAEzE,MAAM,kBAAkB,GAAyB,IAAA,eAAM,EAAC;IACtD,IAAI,EAAE,IAAA,eAAM,GAAE;IACd,QAAQ,EAAE,IAAA,iBAAQ,EAAC,IAAA,eAAM,GAAE,CAAC;IAC5B,YAAY,EAAE,IAAA,iBAAQ,EAAC,IAAA,eAAM,GAAE,CAAC;IAChC,OAAO,EAAE,IAAA,iBAAQ,EAAC,IAAA,gBAAO,GAAE,CAAC;CAC7B,CAAC,CAAC;AAKH,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,sDAAgD;IAGxF,YAAyB,QAAgB;QACvC,KAAK,CAAC,kBAAkB,EAAE,QAAQ,EAAE,CAAC,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;CACF,CAAA;AANY,oBAAoB;IAHhC,IAAA,qBAAS,EAAC;QACT,uBAAuB,EAAE,GAAG,EAAE,CAAC,kCAA0B,CAAC,QAAQ;KACnE,CAAC;IAIa,WAAA,IAAA,qBAAS,GAAE,CAAA;;GAHb,oBAAoB,CAMhC;AANY,oDAAoB;AAQjC,SAAgB,6BAA6B,CAAC,SAA8C,EAAE;IAC5F,kCAA0B,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,kCAA0B,CAAC,QAAQ,CAAC;AAC/F,CAAC;AAFD,sEAEC;AAED,SAAgB,YAAY,CAAyB,QAAW;IAC9D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAFD,oCAEC"}
+{"version":3,"file":"file-template.provider.js","sourceRoot":"","sources":["../../../source/templates/providers/file-template.provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAAwE;AAExE,yCAA6D;AAI7D,+EAAyE;AAe5D,QAAA,0BAA0B,GAA+B,EAAE,CAAC;AAEzE,MAAM,kBAAkB,GAAG,IAAA,eAAM,EAAe;IAC9C,IAAI,EAAE,IAAA,eAAM,GAAE;IACd,QAAQ,EAAE,IAAA,iBAAQ,EAAC,IAAA,eAAM,GAAE,CAAC;IAC5B,YAAY,EAAE,IAAA,iBAAQ,EAAC,IAAA,eAAM,GAAE,CAAC;IAChC,OAAO,EAAE,IAAA,iBAAQ,EAAC,IAAA,gBAAO,GAAE,CAAC;CAC7B,CAAC,CAAC;AAKH,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,sDAAgD;IAGxF,YAAyB,QAAgB;QACvC,KAAK,CAAC,kBAAkB,EAAE,QAAQ,EAAE,CAAC,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;CACF,CAAA;AANY,oBAAoB;IAHhC,IAAA,qBAAS,EAAC;QACT,uBAAuB,EAAE,GAAG,EAAE,CAAC,kCAA0B,CAAC,QAAQ;KACnE,CAAC;IAIa,WAAA,IAAA,qBAAS,GAAE,CAAA;;GAHb,oBAAoB,CAMhC;AANY,oDAAoB;AAQjC,SAAgB,6BAA6B,CAAC,SAA8C,EAAE;IAC5F,kCAA0B,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,kCAA0B,CAAC,QAAQ,CAAC;AAC/F,CAAC;AAFD,sEAEC;AAED,SAAgB,YAAY,CAAyB,QAAW;IAC9D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAFD,oCAEC"}

package/types.d.ts

@@ -82,7 +82,8 @@ export declare type OmitBy<T, V> = Omit<T, {
 /**
  * normalize properties of a type that allow `undefined` to make them optional.
  */
-export declare type Optionalize<S extends object> = OmitBy<S, undefined> & Partial<PickBy<S, undefined>>;
+export declare type Optionalize<T extends object> = OmitBy<T, undefined> & Partial<PickBy<T, undefined>>;
+export declare type SimplifiedOptionalize<T extends object> = Simplify<Optionalize<T>>;
 /**
  * remove nested type information
  */
@@ -143,3 +144,36 @@ export declare type DeepPartialObject<T> = {
 export declare type DeepPartialArray<T> = DeepPartial<T>[];
 export declare type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array | BigInt64Array | BigUint64Array;
 export declare type BinaryData = ArrayBuffer | ArrayBufferView;
+declare type JoinPaths<K, P> = K extends string | number ? P extends string | number ? `${K}${'' extends P ? '' : '.'}${P}` : never : never;
+declare type Prev = [
+    never,
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+    14,
+    15,
+    16,
+    17,
+    18,
+    19,
+    20,
+    ...0[]
+];
+export declare type Paths<T, D extends number = 10> = [D] extends [never] ? never : T extends object ? {
+    [K in keyof T]-?: K extends string | number ? `${K}` | (Paths<T[K], Prev[D]> extends infer R ? JoinPaths<K, R> : never) : never;
+}[keyof T] : '';
+export declare type LeavePaths<T, D extends number = 10> = [D] extends [never] ? never : T extends object ? {
+    [K in keyof T]-?: JoinPaths<K, LeavePaths<T[K], Prev[D]>>;
+}[keyof T] : '';
+export {};

package/utils/async-iterable-helpers/includes.d.ts

@@ -0,0 +1,2 @@
+import type { AnyIterable } from '../any-iterable-iterator';
+export declare function includesAsync<T>(iterable: AnyIterable<T>, value: T): Promise<boolean>;

package/utils/async-iterable-helpers/includes.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.includesAsync = void 0;
+const any_1 = require("../iterable-helpers/any");
+const any_2 = require("./any");
+const is_async_iterable_1 = require("./is-async-iterable");
+async function includesAsync(iterable, value) {
+    return (0, is_async_iterable_1.isAsyncIterable)(iterable)
+        ? (0, any_2.anyAsync)(iterable, (item) => item == value)
+        : (0, any_1.any)(iterable, (item) => item == value);
+}
+exports.includesAsync = includesAsync;
+//# sourceMappingURL=includes.js.map

package/utils/async-iterable-helpers/includes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"includes.js","sourceRoot":"","sources":["../../../source/utils/async-iterable-helpers/includes.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,+BAAiC;AACjC,2DAAsD;AAE/C,KAAK,UAAU,aAAa,CAAI,QAAwB,EAAE,KAAQ;IACvE,OAAO,IAAA,mCAAe,EAAC,QAAQ,CAAC;QAC9B,CAAC,CAAC,IAAA,cAAQ,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,KAAK,CAAC;QAC7C,CAAC,CAAC,IAAA,SAAG,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC;AAC7C,CAAC;AAJD,sCAIC"}

package/utils/async-iterable-helpers/index.d.ts

@@ -17,6 +17,7 @@ export * from './group';
 export * from './group-single';
 export * from './group-to-map';
 export * from './group-to-single-map';
+export * from './includes';
 export * from './interrupt';
 export * from './is-async-iterable';
 export * from './last';

package/utils/async-iterable-helpers/index.js

@@ -33,6 +33,7 @@ __exportStar(require("./group"), exports);
 __exportStar(require("./group-single"), exports);
 __exportStar(require("./group-to-map"), exports);
 __exportStar(require("./group-to-single-map"), exports);
+__exportStar(require("./includes"), exports);
 __exportStar(require("./interrupt"), exports);
 __exportStar(require("./is-async-iterable"), exports);
 __exportStar(require("./last"), exports);

package/utils/async-iterable-helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/utils/async-iterable-helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,qDAAmC;AACnC,6CAA2B;AAC3B,+CAA6B;AAC7B,6CAA2B;AAC3B,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,qDAAmC;AACnC,6CAA2B;AAC3B,0CAAwB;AACxB,iDAA+B;AAC/B,iDAA+B;AAC/B,wDAAsC;AACtC,8CAA4B;AAC5B,sDAAoC;AACpC,yCAAuB;AACvB,oDAAkC;AAClC,wCAAsB;AACtB,6CAA2B;AAC3B,gDAA8B;AAC9B,6CAA2B;AAC3B,8CAA4B;AAC5B,6CAA2B;AAC3B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,sDAAoC;AACpC,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,+CAA6B;AAC7B,+CAA6B;AAC7B,wCAAsB;AACtB,6CAA2B;AAC3B,6CAA2B;AAC3B,+DAA6C;AAC7C,sDAAoC;AACpC,2CAAyB;AACzB,qDAAmC;AACnC,0CAAwB;AACxB,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/utils/async-iterable-helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,qDAAmC;AACnC,6CAA2B;AAC3B,+CAA6B;AAC7B,6CAA2B;AAC3B,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,qDAAmC;AACnC,6CAA2B;AAC3B,0CAAwB;AACxB,iDAA+B;AAC/B,iDAA+B;AAC/B,wDAAsC;AACtC,6CAA2B;AAC3B,8CAA4B;AAC5B,sDAAoC;AACpC,yCAAuB;AACvB,oDAAkC;AAClC,wCAAsB;AACtB,6CAA2B;AAC3B,gDAA8B;AAC9B,6CAA2B;AAC3B,8CAA4B;AAC5B,6CAA2B;AAC3B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,sDAAoC;AACpC,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,+CAA6B;AAC7B,+CAA6B;AAC7B,wCAAsB;AACtB,6CAA2B;AAC3B,6CAA2B;AAC3B,+DAA6C;AAC7C,sDAAoC;AACpC,2CAAyB;AACzB,qDAAmC;AACnC,0CAAwB;AACxB,0CAAwB"}