typebox 1.3.6 → 1.3.8

package/build/guard/emit.d.mts

@@ -33,6 +33,9 @@ export declare function IsGreaterEqualThan(left: string, right: string): string;
 export declare function IsMinLength(value: string, length: string): string;
 export declare function IsMaxLength(value: string, length: string): string;
 export declare function Every(value: string, offset: string, params: [value: string, index: string], expression: string): string;
+export declare function Some(value: string, params: [value: string, index: string], expression: string): string;
+export declare function SomeAll(value: string, params: [value: string, index: string], expression: string): string;
+export declare function Counted(value: string, params: [value: string, index: string], expression: string): string;
 export declare function Entries(value: string): string;
 export declare function Keys(value: string): string;
 export declare function HasPropertyKey(value: string, key: string): string;
@@ -50,5 +53,4 @@ export declare function If(condition: string, then: string): string;
 export declare function Return(expression: string): string;
 export declare function ReduceAnd(operands: string[]): string;
 export declare function ReduceOr(operands: string[]): string;
-export declare function PrefixIncrement(expression: string): string;
 export declare function MultipleOf(dividend: string, divisor: string): string;

package/build/guard/emit.mjs

@@ -110,6 +110,15 @@ export function Every(value, offset, params, expression) {
         ? `${value}.every((${params[0]}, ${params[1]}) => ${expression})`
         : `((value, callback) => { for(let index = ${offset}; index < value.length; index++) if (!callback(value[index], index)) return false; return true })(${value}, (${params[0]}, ${params[1]}) => ${expression})`;
 }
+export function Some(value, params, expression) {
+    return `${value}.some((${params[0]}, ${params[1]}) => ${expression})`;
+}
+export function SomeAll(value, params, expression) {
+    return `((value, callback) => { let result = false; for(let index = 0; index < value.length; index++) if (callback(value[index], index)) result = true; return result })(${value}, (${params[0]}, ${params[1]}) => ${expression})`;
+}
+export function Counted(value, params, expression) {
+    return `${value}.reduce((result, ${params[0]}, ${params[1]}) => (${expression}) ? ++result : result, 0)`;
+}
 // --------------------------------------------------------------------------
 // Objects
 // --------------------------------------------------------------------------
@@ -145,6 +154,8 @@ export function Member(left, right) {
     return `${left}${IsIdentifier(right) ? `.${right}` : `[${Constant(right)}]`}`;
 }
 export function Constant(value) {
+    if (!G.IsValueLike(value))
+        throw Error('Unsupported Constant');
     return G.IsString(value) ? JSON.stringify(value) : `${value}`;
 }
 export function Ternary(condition, true_, false_) {
@@ -172,15 +183,11 @@ export function ReduceAnd(operands) {
     return G.IsEqual(operands.length, 0) ? 'true' : operands.reduce((left, right) => And(left, right));
 }
 export function ReduceOr(operands) {
-    // deno-coverage-ignore - we never observe 0 operands
     return G.IsEqual(operands.length, 0) ? 'false' : operands.reduce((left, right) => Or(left, right));
 }
 // --------------------------------------------------------------------------
-// Arithmetic
+// MultipleOf
 // --------------------------------------------------------------------------
-export function PrefixIncrement(expression) {
-    return `++${expression}`;
-}
 export function MultipleOf(dividend, divisor) {
     return `Guard.IsMultipleOf(${dividend}, ${divisor})`;
 }

package/build/guard/guard.d.mts

@@ -39,10 +39,16 @@ export declare function GraphemeCount(value: string): number;
 export declare function IsMaxLength(value: string, length: number): boolean;
 /** Returns true if the string has at least the given number of graphemes */
 export declare function IsMinLength(value: string, length: number): boolean;
-/** Returns true if all elements from offset satisfy the callback, short-circuiting on the first failure */
+/** Returns true if every element from offset satisfies the callback, short-circuiting on the first failure */
 export declare function Every<T>(value: T[], offset: number, callback: (value: T, index: number) => boolean): boolean;
-/** Returns true if all elements from offset satisfy the callback, visiting every element regardless of failure */
+/** Returns true if every element from offset satisfies the callback, using exhaustive enumeration */
 export declare function EveryAll<T>(value: T[], offset: number, callback: (value: T, index: number) => boolean): boolean;
+/** Returns true if some element satisfies the callback, short-circuiting on the first success */
+export declare function Some<T>(value: T[], callback: (value: T, index: number) => boolean): boolean;
+/** Returns true if some element satisfies the callback, using exhaustive enumeration */
+export declare function SomeAll<T>(value: T[], callback: (value: T, index: number) => boolean): boolean;
+/** Returns the count of elements that satisfy the callback */
+export declare function Counted(value: unknown[], callback: (value: unknown, index: number) => boolean): number;
 /** Shifts the left-most element from an array and dispatches to the true arm, or the false arm if empty */
 export declare function ShiftLeft<T, True extends (left: T, right: T[]) => unknown, False extends () => unknown>(array: T[], true_: True, false_: False): ReturnType<True> | ReturnType<False>;
 /** Returns true if the PropertyKey is Unsafe (ref: prototype-pollution). */

package/build/guard/guard.mjs

@@ -138,7 +138,7 @@ export function IsMinLength(value, length) {
 // --------------------------------------------------------------------------
 // Array
 // --------------------------------------------------------------------------
-/** Returns true if all elements from offset satisfy the callback, short-circuiting on the first failure */
+/** Returns true if every element from offset satisfies the callback, short-circuiting on the first failure */
 export function Every(value, offset, callback) {
     for (let index = offset; index < value.length; index++) {
         if (!callback(value[index], index))
@@ -146,7 +146,7 @@ export function Every(value, offset, callback) {
     }
     return true;
 }
-/** Returns true if all elements from offset satisfy the callback, visiting every element regardless of failure */
+/** Returns true if every element from offset satisfies the callback, using exhaustive enumeration */
 export function EveryAll(value, offset, callback) {
     let result = true;
     for (let index = offset; index < value.length; index++) {
@@ -155,6 +155,27 @@ export function EveryAll(value, offset, callback) {
     }
     return result;
 }
+/** Returns true if some element satisfies the callback, short-circuiting on the first success */
+export function Some(value, callback) {
+    for (let index = 0; index < value.length; index++) {
+        if (callback(value[index], index))
+            return true;
+    }
+    return false;
+}
+/** Returns true if some element satisfies the callback, using exhaustive enumeration */
+export function SomeAll(value, callback) {
+    let result = false;
+    for (let index = 0; index < value.length; index++) {
+        if (callback(value[index], index))
+            result = true;
+    }
+    return result;
+}
+/** Returns the count of elements that satisfy the callback */
+export function Counted(value, callback) {
+    return value.reduce((result, value, index) => callback(value, index) ? ++result : result, 0);
+}
 /** Shifts the left-most element from an array and dispatches to the true arm, or the false arm if empty */
 export function ShiftLeft(array, true_, false_) {
     return (IsEqual(array.length, 0) ? false_() : true_(array[0], array.slice(1)));

package/build/schema/engine/_context.mjs

@@ -7,10 +7,10 @@ import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
 function HasUnevaluatedFromObject(value) {
     return (Schema.IsUnevaluatedItems(value)
         || Schema.IsUnevaluatedProperties(value)
-        || G.Keys(value).some(key => HasUnevaluatedFromUnknown(value[key])));
+        || G.Some(G.Keys(value), key => HasUnevaluatedFromUnknown(value[key])));
 }
 function HasUnevaluatedFromArray(value) {
-    return value.some(value => HasUnevaluatedFromUnknown(value));
+    return G.Some(value, value => HasUnevaluatedFromUnknown(value));
 }
 function HasUnevaluatedFromUnknown(value) {
     return (G.IsArray(value) ? HasUnevaluatedFromArray(value) :
@@ -18,7 +18,7 @@ function HasUnevaluatedFromUnknown(value) {
             false);
 }
 export function HasUnevaluated(context, schema) {
-    return HasUnevaluatedFromUnknown(schema) || G.Keys(context).some(key => HasUnevaluatedFromUnknown(context[key]));
+    return HasUnevaluatedFromUnknown(schema) || G.Some(G.Keys(context), key => HasUnevaluatedFromUnknown(context[key]));
 }
 // ------------------------------------------------------------------
 // BuildContext

package/build/schema/engine/_functions.mjs

@@ -1,5 +1,4 @@
 // deno-fmt-ignore-file
-import { Hashing } from '../../system/hashing/index.mjs';
 import { EmitGuard as E } from '../../guard/index.mjs';
 import { BuildSchema } from './schema.mjs';
 const index = [0];
@@ -9,7 +8,7 @@ const funcs = new Map();
 // CreateName
 // ------------------------------------------------------------------
 function NextName() {
-    return Hashing.Hash(index[0]++);
+    return `${index[0]++}`;
 }
 function CreateName(schema, href) {
     if (!names.has(schema))

package/build/schema/engine/additionalItems.mjs

@@ -12,15 +12,25 @@ function IsValid(schema) {
 // ------------------------------------------------------------------
 // Build
 // ------------------------------------------------------------------
-export function BuildAdditionalItems(stack, context, schema, value) {
-    if (!IsValid(schema))
-        return E.Constant(true);
+function BuildAdditionalItemsStandard(stack, context, schema, value) {
     const [item, index] = [Unique(), Unique()];
     const isSchema = BuildSchemaPushStack(stack, context, schema.additionalItems, item);
     const isLength = E.IsLessThan(index, E.Constant(schema.items.length));
     const addIndex = context.AddIndex(index);
-    const guarded = context.UseUnevaluated() ? E.Or(isLength, E.And(isSchema, addIndex)) : E.Or(isLength, isSchema);
-    return E.Call(E.Member(value, 'every'), [E.ArrowFunction([item, index], guarded)]);
+    return E.Every(value, E.Constant(0), [item, index], E.Or(isLength, E.And(isSchema, addIndex)));
+}
+function BuildAdditionalItemsFast(stack, context, schema, value) {
+    const [item, index] = [Unique(), Unique()];
+    const isSchema = BuildSchemaPushStack(stack, context, schema.additionalItems, item);
+    const isLength = E.IsLessThan(index, E.Constant(schema.items.length));
+    return E.Every(value, E.Constant(0), [item, index], E.Or(isLength, isSchema));
+}
+export function BuildAdditionalItems(stack, context, schema, value) {
+    if (!IsValid(schema))
+        return E.Constant(true);
+    return context.UseUnevaluated()
+        ? BuildAdditionalItemsStandard(stack, context, schema, value)
+        : BuildAdditionalItemsFast(stack, context, schema, value);
 }
 // ------------------------------------------------------------------
 // Check
@@ -28,7 +38,7 @@ export function BuildAdditionalItems(stack, context, schema, value) {
 export function CheckAdditionalItems(stack, context, schema, value) {
     if (!IsValid(schema))
         return true;
-    const isAdditionalItems = value.every((item, index) => {
+    const isAdditionalItems = G.Every(value, 0, (item, index) => {
         return G.IsLessThan(index, schema.items.length)
             || (CheckSchemaPushStack(stack, context, schema.additionalItems, item) && context.AddIndex(index));
     });
@@ -40,7 +50,7 @@ export function CheckAdditionalItems(stack, context, schema, value) {
 export function ErrorAdditionalItems(stack, context, schemaPath, instancePath, schema, value) {
     if (!IsValid(schema))
         return true;
-    const isAdditionalItems = value.every((item, index) => {
+    const isAdditionalItems = G.Every(value, 0, (item, index) => {
         const nextSchemaPath = `${schemaPath}/additionalItems`;
         const nextInstancePath = `${instancePath}/${index}`;
         return G.IsLessThan(index, schema.items.length) ||

package/build/schema/engine/contains.mjs

@@ -12,13 +12,24 @@ function IsValid(schema) {
 // ------------------------------------------------------------------
 // Build
 // ------------------------------------------------------------------
+function BuildContainsStandard(stack, context, schema, value) {
+    const [item, index] = [Unique(), Unique()];
+    const isLength = E.Not(E.IsEqual(E.Member(value, 'length'), E.Constant(0)));
+    const isSome = E.SomeAll(value, [item, index], E.And(BuildSchema(stack, context, schema.contains, item), context.AddIndex(index)));
+    return E.And(isLength, isSome);
+}
+function BuildContainsFast(stack, context, schema, value) {
+    const [item] = [Unique()];
+    const isLength = E.Not(E.IsEqual(E.Member(value, 'length'), E.Constant(0)));
+    const isSome = E.Some(value, [item, '_'], BuildSchema(stack, context, schema.contains, item));
+    return E.And(isLength, isSome);
+}
 export function BuildContains(stack, context, schema, value) {
     if (!IsValid(schema))
         return E.Constant(true);
-    const item = Unique();
-    const isLength = E.Not(E.IsEqual(E.Member(value, 'length'), E.Constant(0)));
-    const isSome = E.Call(E.Member(value, 'some'), [E.ArrowFunction([item], BuildSchema(stack, context, schema.contains, item))]);
-    return E.And(isLength, isSome);
+    return context.UseUnevaluated()
+        ? BuildContainsStandard(stack, context, schema, value)
+        : BuildContainsFast(stack, context, schema, value);
 }
 // ------------------------------------------------------------------
 // Check
@@ -26,8 +37,9 @@ export function BuildContains(stack, context, schema, value) {
 export function CheckContains(stack, context, schema, value) {
     if (!IsValid(schema))
         return true;
-    return !G.IsEqual(value.length, 0) &&
-        value.some((item) => CheckSchema(stack, context, schema.contains, item));
+    return !G.IsEqual(value.length, 0) && G.SomeAll(value, (item, index) => {
+        return CheckSchema(stack, context, schema.contains, item) && context.AddIndex(index);
+    });
 }
 // ------------------------------------------------------------------
 // Error

package/build/schema/engine/enum.mjs

@@ -16,7 +16,7 @@ export function BuildEnum(_stack, _context, schema, value) {
 // Check
 // ------------------------------------------------------------------
 export function CheckEnum(_stack, _context, schema, value) {
-    return schema.enum.some(option => G.IsValueLike(option)
+    return G.Some(schema.enum, option => G.IsValueLike(option)
         ? G.IsEqual(value, option)
         : G.IsDeepEqual(value, option));
 }

package/build/schema/engine/items.mjs

@@ -5,15 +5,26 @@ import { BuildSchemaPushStack, CheckSchemaPushStack, ErrorSchemaPushStack } from
 // ------------------------------------------------------------------
 // ItemsSized
 // ------------------------------------------------------------------
-function BuildItemsSized(stack, context, schema, value) {
+function BuildItemsSizedStandard(stack, context, schema, value) {
     return E.ReduceAnd(schema.items.map((schema, index) => {
         const isLength = E.IsLessEqualThan(E.Member(value, 'length'), E.Constant(index));
         const isSchema = BuildSchemaPushStack(stack, context, schema, `${value}[${index}]`);
         const addIndex = context.AddIndex(E.Constant(index));
-        const guarded = context.UseUnevaluated() ? E.And(isSchema, addIndex) : isSchema;
-        return E.Or(isLength, guarded);
+        return E.Or(isLength, E.And(isSchema, addIndex));
     }));
 }
+function BuildItemsSizedFast(stack, context, schema, value) {
+    return E.ReduceAnd(schema.items.map((schema, index) => {
+        const isLength = E.IsLessEqualThan(E.Member(value, 'length'), E.Constant(index));
+        const isSchema = BuildSchemaPushStack(stack, context, schema, `${value}[${index}]`);
+        return E.Or(isLength, isSchema);
+    }));
+}
+function BuildItemsSized(stack, context, schema, value) {
+    return context.UseUnevaluated()
+        ? BuildItemsSizedStandard(stack, context, schema, value)
+        : BuildItemsSizedFast(stack, context, schema, value);
+}
 function CheckItemsSized(stack, context, schema, value) {
     return G.Every(schema.items, 0, (schema, index) => {
         return G.IsLessEqualThan(value.length, index)
@@ -31,12 +42,21 @@ function ErrorItemsSized(stack, context, schemaPath, instancePath, schema, value
 // ------------------------------------------------------------------
 // ItemsUnsized
 // ------------------------------------------------------------------
-function BuildItemsUnsized(stack, context, schema, value) {
+function BuildItemsUnsizedStandard(stack, context, schema, value) {
     const offset = Schema.IsPrefixItems(schema) ? schema.prefixItems.length : 0;
     const isSchema = BuildSchemaPushStack(stack, context, schema.items, 'element');
     const addIndex = context.AddIndex('index');
-    const guarded = context.UseUnevaluated() ? E.And(isSchema, addIndex) : isSchema;
-    return E.Every(value, E.Constant(offset), ['element', 'index'], guarded);
+    return E.Every(value, E.Constant(offset), ['element', 'index'], E.And(isSchema, addIndex));
+}
+function BuildItemsUnsizedFast(stack, context, schema, value) {
+    const offset = Schema.IsPrefixItems(schema) ? schema.prefixItems.length : 0;
+    const isSchema = BuildSchemaPushStack(stack, context, schema.items, 'element');
+    return E.Every(value, E.Constant(offset), ['element', 'index'], isSchema);
+}
+function BuildItemsUnsized(stack, context, schema, value) {
+    return context.UseUnevaluated()
+        ? BuildItemsUnsizedStandard(stack, context, schema, value)
+        : BuildItemsUnsizedFast(stack, context, schema, value);
 }
 function CheckItemsUnsized(stack, context, schema, value) {
     const offset = Schema.IsPrefixItems(schema) ? schema.prefixItems.length : 0;

package/build/schema/engine/maxContains.mjs

@@ -15,8 +15,8 @@ function IsValid(schema) {
 export function BuildMaxContains(stack, context, schema, value) {
     if (!IsValid(schema))
         return E.Constant(true);
-    const [result, item] = [Unique(), Unique()];
-    const count = E.Call(E.Member(value, 'reduce'), [E.ArrowFunction([result, item], E.Ternary(BuildSchema(stack, context, schema.contains, item), E.PrefixIncrement(result), result)), E.Constant(0)]);
+    const [item] = [Unique()];
+    const count = E.Counted(value, [item, '_'], BuildSchema(stack, context, schema.contains, item));
     return E.IsLessEqualThan(count, E.Constant(schema.maxContains));
 }
 // ------------------------------------------------------------------
@@ -25,7 +25,7 @@ export function BuildMaxContains(stack, context, schema, value) {
 export function CheckMaxContains(stack, context, schema, value) {
     if (!IsValid(schema))
         return true;
-    const count = value.reduce((result, item) => CheckSchema(stack, context, schema.contains, item) ? ++result : result, 0);
+    const count = G.Counted(value, (item) => CheckSchema(stack, context, schema.contains, item));
     return G.IsLessEqualThan(count, schema.maxContains);
 }
 // ------------------------------------------------------------------

package/build/schema/engine/minContains.mjs

@@ -12,12 +12,22 @@ function IsValid(schema) {
 // ------------------------------------------------------------------
 // Build
 // ------------------------------------------------------------------
+function BuildMinContainsStandard(stack, context, schema, value) {
+    const [item, index] = [Unique(), Unique()];
+    const count = E.Counted(value, [item, index], E.And(BuildSchema(stack, context, schema.contains, item), context.AddIndex(index)));
+    return E.IsGreaterEqualThan(count, E.Constant(schema.minContains));
+}
+function BuildMinContainsFast(stack, context, schema, value) {
+    const [item] = [Unique()];
+    const count = E.Counted(value, [item, '_'], BuildSchema(stack, context, schema.contains, item));
+    return E.IsGreaterEqualThan(count, E.Constant(schema.minContains));
+}
 export function BuildMinContains(stack, context, schema, value) {
     if (!IsValid(schema))
         return E.Constant(true);
-    const [result, item] = [Unique(), Unique()];
-    const count = E.Call(E.Member(value, 'reduce'), [E.ArrowFunction([result, item], E.Ternary(BuildSchema(stack, context, schema.contains, item), E.PrefixIncrement(result), result)), E.Constant(0)]);
-    return E.IsGreaterEqualThan(count, E.Constant(schema.minContains));
+    return context.UseUnevaluated()
+        ? BuildMinContainsStandard(stack, context, schema, value)
+        : BuildMinContainsFast(stack, context, schema, value);
 }
 // ------------------------------------------------------------------
 // Check
@@ -25,7 +35,7 @@ export function BuildMinContains(stack, context, schema, value) {
 export function CheckMinContains(stack, context, schema, value) {
     if (!IsValid(schema))
         return true;
-    const count = value.reduce((result, item) => CheckSchema(stack, context, schema.contains, item) ? ++result : result, 0);
+    const count = G.Counted(value, (item, index) => CheckSchema(stack, context, schema.contains, item) && context.AddIndex(index));
     return G.IsGreaterEqualThan(count, schema.minContains);
 }
 // ------------------------------------------------------------------

package/build/schema/engine/not.mjs

@@ -6,14 +6,16 @@ import { BuildSchema, CheckSchema } from './schema.mjs';
 // ------------------------------------------------------------------
 // Build
 // ------------------------------------------------------------------
-function BuildNotUnevaluated(stack, context, schema, value) {
+function BuildNotStandard(stack, context, schema, value) {
     return Reducer(stack, context, [schema.not], value, E.Not(E.IsEqual(E.Member('results', 'length'), E.Constant(1))));
 }
 function BuildNotFast(stack, context, schema, value) {
     return E.Not(BuildSchema(stack, context, schema.not, value));
 }
 export function BuildNot(stack, context, schema, value) {
-    return context.UseUnevaluated() ? BuildNotUnevaluated(stack, context, schema, value) : BuildNotFast(stack, context, schema, value);
+    return context.UseUnevaluated()
+        ? BuildNotStandard(stack, context, schema, value)
+        : BuildNotFast(stack, context, schema, value);
 }
 // ------------------------------------------------------------------
 // Check

package/build/schema/engine/oneOf.mjs

@@ -3,22 +3,23 @@ import { CheckContext, AccumulatedErrorContext } from './_context.mjs';
 import { Reducer } from './_reducer.mjs';
 import { EmitGuard as E, Guard as G } from '../../guard/index.mjs';
 import { BuildSchema, CheckSchema, ErrorSchema } from './schema.mjs';
+import { Unique } from './_unique.mjs';
 // ------------------------------------------------------------------
 // Build
 // ------------------------------------------------------------------
-function BuildOneOfUnevaluated(stack, context, schema, value) {
+function BuildOneOfStandard(stack, context, schema, value) {
     return Reducer(stack, context, schema.oneOf, value, E.IsEqual(E.Member('results', 'length'), E.Constant(1)));
 }
 function BuildOneOfFast(stack, context, schema, value) {
+    const [result] = [Unique()];
     const results = E.ArrayLiteral(schema.oneOf.map((schema) => BuildSchema(stack, context, schema, value)));
-    const count = E.Call(E.Member(results, 'reduce'), [
-        E.ArrowFunction(['count', 'result'], E.Ternary(E.IsEqual('result', E.Constant(true)), E.PrefixIncrement('count'), 'count')),
-        E.Constant(0),
-    ]);
+    const count = E.Counted(results, [result, '_'], E.IsEqual(result, E.Constant(true)));
     return E.IsEqual(count, E.Constant(1));
 }
 export function BuildOneOf(stack, context, schema, value) {
-    return context.UseUnevaluated() ? BuildOneOfUnevaluated(stack, context, schema, value) : BuildOneOfFast(stack, context, schema, value);
+    return context.UseUnevaluated()
+        ? BuildOneOfStandard(stack, context, schema, value)
+        : BuildOneOfFast(stack, context, schema, value);
 }
 // ------------------------------------------------------------------
 // Check

package/build/schema/engine/ref.mjs

@@ -5,7 +5,7 @@ import { CheckContext, AccumulatedErrorContext } from './_context.mjs';
 import { EmitGuard as E } from '../../guard/index.mjs';
 import { CheckSchema, ErrorSchema } from './schema.mjs';
 // ------------------------------------------------------------------
-// BuildRefStandard
+// BuildRef
 // ------------------------------------------------------------------
 function BuildRefStandard(stack, context, target, value) {
     const interior = E.ArrowFunction(['context', 'value'], Functions.CreateFunction(stack, context, target, 'value'));
@@ -17,15 +17,9 @@ function BuildRefStandard(stack, context, target, value) {
     ]));
     return E.Call(exterior, ['context', value]);
 }
-// ------------------------------------------------------------------
-// BuildRefStandard
-// ------------------------------------------------------------------
 function BuildRefFast(stack, context, target, value) {
     return Functions.CreateFunction(stack, context, target, value);
 }
-// ------------------------------------------------------------------
-// BuildRef
-// ------------------------------------------------------------------
 export function BuildRef(stack, context, schema, value) {
     const target = stack.Ref(schema) ?? false;
     return context.UseUnevaluated()

package/build/schema/engine/schema.mjs

@@ -49,7 +49,7 @@ import { BuildUniqueItems, CheckUniqueItems, ErrorUniqueItems } from './uniqueIt
 // ----------------------------------------------------------------
 function HasTypeName(schema, typename) {
     return Schema.IsType(schema) &&
-        (G.IsArray(schema.type) && schema.type.includes(typename) ||
+        (G.IsArray(schema.type) && G.IsGreaterThan(schema.type.length, 0) && G.Every(schema.type, 0, type => G.IsEqual(type, typename)) ||
             G.IsEqual(schema.type, typename));
 }
 // ----------------------------------------------------------------

package/build/schema/engine/type.mjs

@@ -48,7 +48,7 @@ function BuildTypeNames(stack, context, typenames, value) {
     return E.ReduceOr(typenames.map(type => BuildTypeName(stack, context, type, value)));
 }
 function CheckTypeNames(stack, context, types, schema, value) {
-    return types.some(type => CheckTypeName(stack, context, type, schema, value));
+    return G.Some(types, type => CheckTypeName(stack, context, type, schema, value));
 }
 // ------------------------------------------------------------------
 // Type

package/build/value/errors/errors.d.mts

@@ -3,14 +3,14 @@ import type { TLocalizedValidationError } from '../../error/index.mjs';
 /**
  * Performs an exhaustive Check on the specified value and reports any errors found.
  * If no errors are found, an empty array is returned. Unlike Check, this function
- * does not terminate at the first occurance of an error. For best performance, call
+ * does not terminate at the first occurrence of an error. For best performance, call
  * Check first and call Errors only if Check returns false.
  */
 export declare function Errors<Type extends TSchema>(type: Type, value: unknown): TLocalizedValidationError[];
 /**
  * Performs an exhaustive Check on the specified value and reports any errors found.
  * If no errors are found, an empty array is returned. Unlike Check, this function
- * does not terminate at the first occurance of an error. For best performance, call
+ * does not terminate at the first occurrence of an error. For best performance, call
  * Check first and call Errors only if Check returns false.
  */
 export declare function Errors<Context extends TProperties, Type extends TSchema>(context: Context, type: Type, value: unknown): TLocalizedValidationError[];

package/build/value/errors/errors.mjs

@@ -4,7 +4,7 @@ import { Errors as SchemaErrors, } from '../../schema/index.mjs';
 /**
  * Performs an exhaustive Check on the specified value and reports any errors found.
  * If no errors are found, an empty array is returned. Unlike Check, this function
- * does not terminate at the first occurance of an error. For best performance, call
+ * does not terminate at the first occurrence of an error. For best performance, call
  * Check first and call Errors only if Check returns false.
  */
 export function Errors(...args) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typebox",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "keywords": [
     "typescript",
     "jsonschema"
@@ -16,17 +16,21 @@
   "types": "./build/index.d.mts",
   "module": "./build/index.mjs",
   "exports": {
-    "./guard": {
-      "import": "./build/guard/index.mjs",
-      "default": "./build/guard/index.mjs"
+    "./error": {
+      "import": "./build/error/index.mjs",
+      "default": "./build/error/index.mjs"
+    },
+    "./value": {
+      "import": "./build/value/index.mjs",
+      "default": "./build/value/index.mjs"
     },
     "./system": {
       "import": "./build/system/index.mjs",
       "default": "./build/system/index.mjs"
     },
-    "./schema": {
-      "import": "./build/schema/index.mjs",
-      "default": "./build/schema/index.mjs"
+    "./guard": {
+      "import": "./build/guard/index.mjs",
+      "default": "./build/guard/index.mjs"
     },
     "./format": {
       "import": "./build/format/index.mjs",
@@ -40,13 +44,9 @@
       "import": "./build/type/index.mjs",
       "default": "./build/type/index.mjs"
     },
-    "./value": {
-      "import": "./build/value/index.mjs",
-      "default": "./build/value/index.mjs"
-    },
-    "./error": {
-      "import": "./build/error/index.mjs",
-      "default": "./build/error/index.mjs"
+    "./schema": {
+      "import": "./build/schema/index.mjs",
+      "default": "./build/schema/index.mjs"
     },
     ".": {
       "import": "./build/index.mjs",
@@ -55,14 +55,17 @@
   },
   "typesVersions": {
     "*": {
-      "guard": [
-        "./build/guard/index.d.mts"
+      "error": [
+        "./build/error/index.d.mts"
+      ],
+      "value": [
+        "./build/value/index.d.mts"
       ],
       "system": [
         "./build/system/index.d.mts"
       ],
-      "schema": [
-        "./build/schema/index.d.mts"
+      "guard": [
+        "./build/guard/index.d.mts"
       ],
       "format": [
         "./build/format/index.d.mts"
@@ -73,11 +76,8 @@
       "type": [
         "./build/type/index.d.mts"
       ],
-      "value": [
-        "./build/value/index.d.mts"
-      ],
-      "error": [
-        "./build/error/index.d.mts"
+      "schema": [
+        "./build/schema/index.d.mts"
       ],
       ".": [
         "./build/index.d.mts"

package/readme.md

@@ -91,7 +91,7 @@ const User = Type.Object({                       // const User = {
                                                  //       type: 'string', 
                                                  //       format: 'email' 
                                                  //     }
-                                                 //   }
+                                                 //   },
                                                  //   required: [
                                                  //     'id', 
                                                  //     'name', 
@@ -111,9 +111,9 @@ type User = Type.Static<typeof User>              // type User = {
 
 ## Script
 
-[Documentation](https://sinclairzx81.github.io/typebox/#/docs/script/overview) | [Example 1](https://www.typescriptlang.org/play/?target=99&module=7#code/JYWwDg9gTgLgBAFQJ5gKZwGZQiOByGFVAIwgA88AoSgehrgFkIATAVwBtVKBjCAOwDO8BgEMYACzgBeREQB0AZW5RgYGAAoABpThxCaOADVU3GNABM0uAG84ZAFxw+rEMVRQANHCSPnr93AAvjp6REYmZlAAzFa2Dk4ubp7evonuXgBeqf5QQSH66Mam0AAssXbZSV4+CTmZlelwAO4NucGaAJTUdHAAIqhofMyofMIsHFy8gvC2DKgCkoFWyGiKyqoaohJemrr5YcawqGSxIbqQAsAwwPyORZElHmdO0CAi7HcR0FFPurqsADdPsUoOYQsFdAU4ABxVA4VAwKBIU5-OAA9zXbjzT5HMgAbQAur8-sAhsAsQJWoTwfsDFt3MB3ii-iJXMARjBgQ9ibpmMAMBhWAJUFzSjy4AI0NwOCIoKKoCUaZCwnMFszdABzOEgBFIxyw+GIpDit4wBnvRz0lTvGmdbr0ABKrFGoHQDtQGE4phufEoqvEcjA2DQsHZAjkWsNSMDwYxYbk6NDFLkV1QIHDQYgIeu80DEEu134MazcdzZD98wDmez8cjOqNxZrucTmNzqfTjdL4b4r3endDZYrC37OfDdd1SBH8Zb5LbZo71a7ckBU8H-tX4dN5vYG7kfIFQtQu-L68XA83Ym3u9ZxHZo2PQ6rsfPci31p3Z9HcklJhlUAftD0AoMBiOScAAJJ8Bg7gjFilCCnw3r8HAUAjMMUDqDqCyOCsR7AaB3AADwFBAGCMJWAB8HQ2CEWEBuODYzhSeIAAwEnmBY+nI5a6HREbahOCZxsxbFyD2UBvDuPFwHxDHRkx8ysexK7SXxb6Mju+6CsK3G0ZWr6Xu+cg3neMC6bx+nqX2P7Suwsq6YEQA) | [Example 2](https://www.typescriptlang.org/play/?target=99&module=7#code/JYWwDg9gTgLgBAFQJ5gKZwGZQiOByGFVAIwgA88AoSgehrgFkIATAVwBtVKA7AQxFQBnMLwDG6BrxgALOAG9KcOKjKRYcURG6D4ANVSiY0AExwAvIiIA6APLEAVgZgAKOXDIAuS2isA5ViDEqFDOAJQANHBIXsg+-oHBYXAAvqGKyqrQ8Jraek7QAMzm3qi2Dk6u7jHW8UEhEVHVcQF1YZEAXk2ltYmhKWlKKmrZWjpw+obQACzFsaV2joaVniV+Lb2R0as99R1dawm7cADu+ztJqZTJ1HRwACKoaNzMqNzwTGyclDlj+rAqs2sCwqCiUkEEwBgwC0XkkMisEyMUCm4XS3GgIF47FhUmkCPyUAKqKUrAAbjj4YiTFc0j94ABxVA4VAwKBIQE+YFLUFwUnBKHiQT7ACCUCgvCQzj+MBUEXSwGewEFIrFEuccwOrVCaUudMYUmCwCxHPm5W56X4xGArxgFLxVORxLgzGAGAwrEEqDt+MmjvSwgMHF4UG9DqmNO+o3eQlkFg1XJcPIA5kyBKytozmemnZiZVAjdj9XmCxHaPQAEqsN6gdDl1AYTiGaHcSgMGNWMDYNCwa2CKwprNsjtd-m9qx8nuCqyQ1AgPudiDdqFCDsQCFQrTDxejldkVvthdLscDtNDw87vsTgUrmdzrdHlfoqCY9j3i9WPdtwR4889lcnlkzxHP9L1HKdb3nYDlz7Mk3xAj992-ODoKsXNDSxZCxxdN0PVKX8UM-A8oLHND8ww-Cx0ta03kw3dEJ-YiV1IgtaL7ANRCDKBWIQss4AAZRgKQlTgABJbgMGCV5xEod1uCbLQ4CgV4XhCARv32AShNEAAeQg0AgDBGBjAA+PoeTUvEAPTccwKEABtAAGABdVd12bBClAs-tU0ApAbMneznKsJ8Xw8uAvKsocryVQKXNgvdPPbZiMOw91PTCrzktfKibQypKDTI192M4hDkiAA) | [Challenge](test/typescript/readme.md)
+[Documentation](https://sinclairzx81.github.io/typebox/#/docs/script/overview) | [Example 1](https://www.typescriptlang.org/play/?target=99&module=7#code/JYWwDg9gTgLgBAFQJ5gKZwGZQiOByGFVAIwgA88AoSgehrgFkIATAVwBtVKBjCAOwDO8AN5wAChCFwAvnAC8iIgDoAytyjAwMABQADSnDiE0cAKoDUUeXGEHDcYMwBccPqxDFLAGjuG+AQxBUFyENPgBzO2k7Y3QAYRwgvngFW3sHZ1d3TygfdJhUMhgQmDDwvPt-VhgAC2gXc0somKJxSRSbXwyXNw9vLphgGE4SsorDUmYkUeAI8bgq2vqzC1yu3hAkmAEXBM3UZIBtAF1m3QBKajo4ACVUDE5uQf5KCSElMGw0WGBUASVHK92h8vpZBn8lINhlw3jAQRBvuD-os6lB4Yjfv9AbD0WDMUoUdBcT8IQEgkD3p8EXiIRstliCiB-lSMRCCkUKXCWTT-nSDtsAYzmaCScjqqjiUiAcxOZL8XzkgzUEy5RDCWjuaKlGSuLR6ABJPgYSwHbhcDCsPhPYD8OCfP787SQIQuZBoVQwfyDbgAHliEAwbSEAD5zp1DM64YCI8CoZw7JGCeKidG7cD1drAlwY+8FdtDgAGY6QwowBPAvMCQvFjOpxOV6tJpZonWUaRAA) | [Example 2](https://www.typescriptlang.org/play/?target=99&module=7#code/JYWwDg9gTgLgBAFQJ5gKZwGZQiOByGFVAIwgA88AoSgehrgFkIATAVwBtVKBjCAOwDO8AKoDUUOAF5ERAHQB5YgCtU3GAAoA3pThxgzAFwy0sgHKsQxceoCUAGh1w+AQxCojyEwGUYUYHwBzW0oAXxsefiE4AGEcNz54aU9UBWVVDW1dfQ85c0tre0cYVDIYHO9ffyDC3WdWGAALaCNRcVDw3kF4AAUIKKS5RRU1LUds4xS8qyhbB10YYBhOcpSfP0DZx1JmJBXZNarN2vqmqBaxKDm4XhB4mAE9gEEoKGckdVjb1ATwsOo6OAAJVQGE4amA-EovSEsjA2DQsGAqAEsn0UL6MFh8PEC2RsgWSy40MxcIgCNxKLqjWgWLJOKRKLRxNp5IZsippxZ9LxLjc6JhpNZeJud0ZxRAKMF3JRxVK-JJ2MRwri33uqPFksVFPZJxpUqVjOY8q5BtkItVYtQEpN2o5eq1bN5XFo9AAknwMOJvtwuBhWHxwfw4HDkar1JAhHsfM4FtwADyENAQDBwYkAPhscEywYxqKNugjmIJnEchZ11KgedLubtlad1Zh5oSAgA2gAGAC6+JKMAbmKb93bXdrVYLuYHrc75c59ZCQA) | [Challenge](test/typescript/readme.md)
 
-TypeBox includes a runtime scripting engine that can transform TypeScript definitions into JSON Schema. The engine is implemented symmetrically at runtime and inside TypeScript's type system. It supports many programmable type-level constructs such as Conditional, Mapped, Indexed, Generic, Distributive Conditional, and more. The engine is designed for TypeScript 7 but is supported in TypeScript 5 and above.
+TypeBox includes a runtime TypeScript engine that can transform TypeScript definitions to JSON Schema. The engine is fully type-safe and supports many programmable constructs including Conditional, Mapped, Indexed, Generics, Distributive Generics, and more.
 
 ### Example
 
@@ -121,50 +121,43 @@ Syntax highlighting is available via the [Visual Studio Marketplace](https://mar
 
 ```typescript
 // Module
-const Math = Type.Script(`
-  type Vector2 = { x: number, y: number }
-  type Vector3 = { x: number, y: number, z: number }
-  type Vector4 = { x: number, y: number, z: number, w: number }
-`)
-
-// Dependent Module
-const { Mesh } = Type.Script(Math, `  
-  type Vertex = {
-    position: Vector4,
-    normal: Vector3,
-    uv: Vector2
-  }
-  type Geometry = {
-    vertices: Vertex[],
-    indices: number[]
+const { Post } = Type.Script(`
+  type User = {
+    id: number,
+    name: string
   }
-  type Material = {
-    ambient: Vector4,
-    diffuse: Vector4,
-    specular: Vector4
+  type Comment = {
+    id: number,
+    text: string,
+    author: User
   }
-  type Mesh = {
-    geometry: Geometry,
-    material: Material
+  type Post = {
+    id: number,
+    title: string,
+    body: string,
+    author: User,
+    comments: Comment[]
   }
 `)
 
-// Runtime Reflection
-Mesh.properties.geometry.properties.vertices.items.properties.position.properties.x
-Mesh.properties.geometry.properties.vertices.items.properties.normal.properties.x
-Mesh.properties.geometry.properties.vertices.items.properties.uv.properties.x
-Mesh.properties.material.properties.diffuse.properties.x
-Mesh.properties.material.properties.ambient.properties.x
-Mesh.properties.material.properties.specular.properties.x
-
-// Static Inference
-function render(mesh: Type.Static<typeof Mesh>) {
-  mesh.geometry.vertices[0].position.x
-  mesh.geometry.vertices[0].normal.x
-  mesh.geometry.vertices[0].uv.x
-  mesh.material.diffuse.x
-  mesh.material.ambient.x
-  mesh.material.specular.x
+// Reflection
+Post.properties.id
+Post.properties.title
+Post.properties.author.properties.id
+Post.properties.author.properties.name
+Post.properties.comments.items.properties.text
+Post.properties.comments.items.properties.author.properties.id
+Post.properties.comments.items.properties.author.properties.name
+
+// Inference
+function present(post: Type.Static<typeof Post>) {
+  post.id
+  post.title
+  post.author.id
+  post.author.name
+  post.comments[0].text
+  post.comments[0].author.id
+  post.comments[0].author.name
 }
 ```
 
@@ -236,7 +229,7 @@ const value = Vector.Parse({                       // const value: {
 
 The following table shows specification coverage implemented by TypeBox.
 
-Ref: [JSON Schema Test Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite) 
+[JSON Schema Test Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite) 
 
 | Spec | 3 | 4 | 6 | 7 | 2019-09 | 2020-12 | v1 |
 |:-----|:--|:--|:--|:--|:--|:--|:--|
@@ -279,11 +272,11 @@ Ref: [JSON Schema Test Suite](https://github.com/json-schema-org/JSON-Schema-Tes
 | properties | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | propertyNames | - | - | ✅ | ✅ | ✅ | ✅ | ✅ |
 | recursiveRef | - | - | - | - | ✅ | - | - |
-| ref | 23/27 | 37/45 | 67/70 | 75/78 | 79/81 | 77/79 | 77/79 |
+| ref | 22/27 | 37/45 | 67/70 | 75/78 | 79/81 | 77/79 | 77/79 |
 | required | 3/4 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | type | 73/80 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| unevaluatedItems | - | - | - | - | ✅ | 65/71 | 64/71 |
-| unevaluatedProperties | - | - | - | - | ✅ | ✅ | 124/125 |
+| unevaluatedItems | - | - | - | - | ✅ | ✅ | 70/71 |
+| unevaluatedProperties | - | - | - | - | ✅ | ✅ | 128/129 |
 | uniqueItems | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |