@tstdl/base 0.78.0-beta4 → 0.78.0-beta5

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":";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,8 +1,13 @@
-import type { NormalizedObjectSchema, NormalizedValueSchema, ObjectSchema, ValueSchema } 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, 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>;
+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,37 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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, types_1.valueTypesToSchema),
-        mask: objectSchema.mask,
-        allowUnknownProperties: new Set((0, array_1.toArray)(objectSchema.allowUnknownProperties ?? []).map(types_1.valueTypesToSchema))
+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)),
+        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,15 +54,20 @@ 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;
 }

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 { Schema } 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: Schema): 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';
@@ -9,11 +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 getSchemaTypeNames(schema) {
+    if ((0, types_1.isTypeSchema)(schema)) {
+        const name = getValueTypeName(schema.type);
+        return [name];
+    }
+    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))];
+    }
+    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,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/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
  */

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

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

@@ -0,0 +1 @@
+export declare function includes<T>(iterable: Iterable<T>, value: T): boolean;

package/utils/iterable-helpers/includes.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.includes = void 0;
+const any_1 = require("./any");
+function includes(iterable, value) {
+    return (0, any_1.any)(iterable, (item) => item == value);
+}
+exports.includes = includes;
+//# sourceMappingURL=includes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"includes.js","sourceRoot":"","sources":["../../../source/utils/iterable-helpers/includes.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAE5B,SAAgB,QAAQ,CAAI,QAAqB,EAAE,KAAQ;IACzD,OAAO,IAAA,SAAG,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC;AAChD,CAAC;AAFD,4BAEC"}

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

@@ -16,6 +16,7 @@ export * from './group';
 export * from './group-single';
 export * from './group-to-map';
 export * from './group-to-single-map';
+export * from './includes';
 export * from './is-iterable';
 export * from './last';
 export * from './last-or-default';

package/utils/iterable-helpers/index.js

@@ -32,6 +32,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("./is-iterable"), exports);
 __exportStar(require("./last"), exports);
 __exportStar(require("./last-or-default"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/utils/iterable-helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,0CAAwB;AACxB,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,gDAA8B;AAC9B,yCAAuB;AACvB,oDAAkC;AAClC,wCAAsB;AACtB,6CAA2B;AAC3B,gDAA8B;AAC9B,6CAA2B;AAC3B,6CAA2B;AAC3B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,sDAAoC;AACpC,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,+CAA6B;AAC7B,+CAA6B;AAC7B,wCAAsB;AACtB,0CAAwB;AACxB,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/utils/iterable-helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,0CAAwB;AACxB,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,gDAA8B;AAC9B,yCAAuB;AACvB,oDAAkC;AAClC,wCAAsB;AACtB,6CAA2B;AAC3B,gDAA8B;AAC9B,6CAA2B;AAC3B,6CAA2B;AAC3B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,sDAAoC;AACpC,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,+CAA6B;AAC7B,+CAA6B;AAC7B,wCAAsB;AACtB,0CAAwB;AACxB,0CAAwB"}