typebox 1.3.11 → 1.3.13

package/build/schema/engine/_stack.mjs

@@ -22,7 +22,7 @@ export class Stack {
     // Base
     // ----------------------------------------------------------------
     BaseURL() {
-        return this.ids.reduce((result, schema) => new URL(schema.$id, result), new URL('http://unknown'));
+        return this.ids.reduce((result, schema) => new URL(schema.$id, result), Resolve.DefaultBase);
     }
     Base() {
         return this.ids[this.ids.length - 1] ?? this.schema;

package/build/schema/engine/additionalProperties.mjs

@@ -3,6 +3,7 @@ import * as S from '../types/index.mjs';
 import * as V from './_externals.mjs';
 import { Unique } from './_unique.mjs';
 import { AccumulatedErrorContext } from './_context.mjs';
+import { UnicodeRegExp } from './_regexp.mjs';
 import { EmitGuard as E, Guard as G } from '../../guard/index.mjs';
 import { BuildSchemaPushStack, CheckSchemaPushStack, ErrorSchemaPushStack } from './schema.mjs';
 // ------------------------------------------------------------------
@@ -58,7 +59,7 @@ export function BuildAdditionalPropertiesFast(_context, schema, value) {
 // ------------------------------------------------------------------
 export function BuildAdditionalPropertiesStandard(stack, context, schema, value) {
     const [key, _index] = [Unique(), Unique()];
-    const regexp = V.CreateVariable(new RegExp(GetPropertiesPattern(schema)));
+    const regexp = V.CreateVariable(UnicodeRegExp(GetPropertiesPattern(schema)));
     const isSchema = BuildSchemaPushStack(stack, context, schema.additionalProperties, `${value}[${key}]`);
     const isKey = E.Call(E.Member(regexp, 'test'), [key]);
     const addKey = context.AddKey(key);
@@ -78,7 +79,7 @@ export function BuildAdditionalProperties(stack, context, schema, value) {
 // Check
 // ------------------------------------------------------------------
 export function CheckAdditionalProperties(stack, context, schema, value) {
-    const regexp = new RegExp(GetPropertiesPattern(schema));
+    const regexp = UnicodeRegExp(GetPropertiesPattern(schema));
     const isAdditionalProperties = G.Every(G.Keys(value), 0, (key, _index) => {
         return regexp.test(key) ||
             (CheckSchemaPushStack(stack, context, schema.additionalProperties, value[key]) && context.AddKey(key));
@@ -89,7 +90,7 @@ export function CheckAdditionalProperties(stack, context, schema, value) {
 // Error
 // ------------------------------------------------------------------
 export function ErrorAdditionalProperties(stack, context, schemaPath, instancePath, schema, value) {
-    const regexp = new RegExp(GetPropertiesPattern(schema));
+    const regexp = UnicodeRegExp(GetPropertiesPattern(schema));
     const additionalProperties = [];
     const isAdditionalProperties = G.EveryAll(G.Keys(value), 0, (key, _index) => {
         const nextSchemaPath = `${schemaPath}/additionalProperties`;

package/build/schema/engine/pattern.mjs

@@ -1,18 +1,19 @@
 // deno-fmt-ignore-file
 import * as Externals from './_externals.mjs';
 import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
+import { UnicodeRegExp } from './_regexp.mjs';
 // ------------------------------------------------------------------
 // Build
 // ------------------------------------------------------------------
 export function BuildPattern(_stack, _context, schema, value) {
-    const regexp = Externals.CreateVariable(G.IsString(schema.pattern) ? new RegExp(schema.pattern, 'u') : schema.pattern);
+    const regexp = Externals.CreateVariable(G.IsString(schema.pattern) ? UnicodeRegExp(schema.pattern) : schema.pattern);
     return E.Call(E.Member(regexp, 'test'), [value]);
 }
 // ------------------------------------------------------------------
 // Check
 // ------------------------------------------------------------------
 export function CheckPattern(_stack, _context, schema, value) {
-    const regexp = G.IsString(schema.pattern) ? new RegExp(schema.pattern, 'u') : schema.pattern;
+    const regexp = G.IsString(schema.pattern) ? UnicodeRegExp(schema.pattern) : schema.pattern;
     return regexp.test(value);
 }
 // ------------------------------------------------------------------

package/build/schema/engine/patternProperties.mjs

@@ -1,6 +1,7 @@
 // deno-fmt-ignore-file
 import * as Externals from './_externals.mjs';
 import { Unique } from './_unique.mjs';
+import { UnicodeRegExp } from './_regexp.mjs';
 import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
 import { BuildSchemaPushStack, CheckSchemaPushStack, ErrorSchemaPushStack } from './schema.mjs';
 // ------------------------------------------------------------------
@@ -9,7 +10,7 @@ import { BuildSchemaPushStack, CheckSchemaPushStack, ErrorSchemaPushStack } from
 export function BuildPatternProperties(stack, context, schema, value) {
     return E.ReduceAnd(G.Entries(schema.patternProperties).map(([pattern, schema]) => {
         const [key, prop] = [Unique(), Unique()];
-        const regexp = Externals.CreateVariable(new RegExp(pattern, 'u'));
+        const regexp = Externals.CreateVariable(UnicodeRegExp(pattern));
         const notKey = E.Not(E.Call(E.Member(regexp, 'test'), [key]));
         const isSchema = BuildSchemaPushStack(stack, context, schema, prop);
         const addKey = context.AddKey(key);
@@ -22,7 +23,7 @@ export function BuildPatternProperties(stack, context, schema, value) {
 // ------------------------------------------------------------------
 export function CheckPatternProperties(stack, context, schema, value) {
     return G.Every(G.Entries(schema.patternProperties), 0, ([pattern, schema]) => {
-        const regexp = new RegExp(pattern, 'u');
+        const regexp = UnicodeRegExp(pattern);
         return G.Every(G.Entries(value), 0, ([key, prop]) => {
             return !regexp.test(key) || CheckSchemaPushStack(stack, context, schema, prop) && context.AddKey(key);
         });
@@ -34,7 +35,7 @@ export function CheckPatternProperties(stack, context, schema, value) {
 export function ErrorPatternProperties(stack, context, schemaPath, instancePath, schema, value) {
     return G.EveryAll(G.Entries(schema.patternProperties), 0, ([pattern, schema]) => {
         const nextSchemaPath = `${schemaPath}/patternProperties/${pattern}`;
-        const regexp = new RegExp(pattern, 'u');
+        const regexp = UnicodeRegExp(pattern);
         return G.EveryAll(G.Entries(value), 0, ([key, value]) => {
             const nextInstancePath = `${instancePath}/${key}`;
             const notKey = !regexp.test(key);

package/build/schema/engine/schema.mjs

@@ -45,12 +45,21 @@ import { BuildUnevaluatedItems, CheckUnevaluatedItems, ErrorUnevaluatedItems } f
 import { BuildUnevaluatedProperties, CheckUnevaluatedProperties, ErrorUnevaluatedProperties } from './unevaluatedProperties.mjs';
 import { BuildUniqueItems, CheckUniqueItems, ErrorUniqueItems } from './uniqueItems.mjs';
 // ----------------------------------------------------------------
-// HasTypeName
+// HasTypeName (Optimization)
+//
+// We only consider a schema as having a type name when the schema 
+// has a single type string, or when every element in the type 
+// array is the same. For a type array, we must treat multi-variant 
+// types as unions and therefore can NOT use an optimized forward 
+// type check.
+//
 // ----------------------------------------------------------------
 function HasTypeName(schema, typename) {
-    return Schema.IsType(schema) &&
-        (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));
+    return (Schema.IsType(schema) &&
+        ((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)));
 }
 // ----------------------------------------------------------------
 // HasObject

package/build/schema/resolve/ref.d.mts

@@ -1,3 +1,4 @@
 import * as Schema from '../types/index.mjs';
+export declare const DefaultBase: URL;
 export declare function Ref(schema: Schema.XSchemaObject, ref: string): Schema.XSchema | undefined;
 export declare function DynamicRef(root: Schema.XSchemaObject, base: Schema.XSchemaObject, dynamicRef: Schema.XDynamicRef, dynamicAnchors: Schema.XDynamicAnchor[]): Schema.XSchema | undefined;

package/build/schema/resolve/ref.mjs

@@ -3,6 +3,10 @@ import { Guard } from '../../guard/index.mjs';
 import { Pointer } from '../pointer/index.mjs';
 import * as Schema from '../types/index.mjs';
 // ------------------------------------------------------------------
+// DefaultBase
+// ------------------------------------------------------------------
+export const DefaultBase = new URL('https://json-schema.org');
+// ------------------------------------------------------------------
 // Match: Id
 // ------------------------------------------------------------------
 function MatchId(schema, base, ref) {
@@ -83,8 +87,15 @@ function FromArray(schema, base, ref) {
 // ------------------------------------------------------------------
 // FromObject
 // ------------------------------------------------------------------
+function SkipProperty(key) {
+    // these are explicit data encoded in a schema, they should not
+    // be considered valid targets used for de-referencing.
+    return Guard.IsEqual(key, 'const') || Guard.IsEqual(key, 'enum');
+}
 function FromObject(schema, base, ref) {
     return Guard.Keys(schema).reduce((result, key) => {
+        if (SkipProperty(key))
+            return result;
         const match = FromValue(schema[key], base, ref);
         return !Guard.IsUndefined(match) ? match : result;
     }, undefined);
@@ -111,8 +122,7 @@ function FromValue(schema, base, ref) {
 // Ref
 // ------------------------------------------------------------------
 export function Ref(schema, ref) {
-    const defaultBase = new URL('http://unknown/');
-    const initialBase = Schema.IsId(schema) ? new URL(schema.$id, defaultBase.href) : defaultBase;
+    const initialBase = Schema.IsId(schema) ? new URL(schema.$id, DefaultBase.href) : DefaultBase;
     const initialRef = new URL(ref, initialBase.href);
     return FromValue(schema, initialBase, initialRef);
 }
@@ -134,7 +144,7 @@ export function DynamicRef(root, base, dynamicRef, dynamicAnchors) {
     // Extract the fragment portion of the reference. According to the test suite,
     // only plain fragment names (e.g., "#foo") trigger the dynamic scope; JSON 
     // Pointer fragments (e.g., "#/definitions/foo") bypass dynamic resolution.
-    const fragment = new URL(dynamicRef.$dynamicRef, 'http://unknown/').hash;
+    const fragment = new URL(dynamicRef.$dynamicRef, DefaultBase).hash;
     if (fragment.startsWith('#/'))
         return fragmentTarget;
     // Search the live dynamic anchor stack for a schema whose $dynamicAnchor matches the

package/build/schema/types/index.d.mts

@@ -6,8 +6,6 @@ export * from './anchor.mjs';
 export * from './anyOf.mjs';
 export * from './const.mjs';
 export * from './contains.mjs';
-export * from './contentEncoding.mjs';
-export * from './contentMediaType.mjs';
 export * from './default.mjs';
 export * from './defs.mjs';
 export * from './dependencies.mjs';

package/build/schema/types/index.mjs

@@ -12,8 +12,6 @@ export * from './anchor.mjs';
 export * from './anyOf.mjs';
 export * from './const.mjs';
 export * from './contains.mjs';
-export * from './contentEncoding.mjs';
-export * from './contentMediaType.mjs';
 export * from './default.mjs';
 export * from './defs.mjs';
 export * from './dependencies.mjs';

package/build/system/memory/clone.mjs

@@ -24,7 +24,7 @@ function IsSchemaObject(value) {
 }
 function FromSchemaObject(value) {
     const result = {};
-    for (const key of Object.getOwnPropertyNames(value)) {
+    for (const key of Guard.Keys(value)) {
         if (Guard.IsUnsafePropertyKey(key))
             continue; // (ignore: prototype-pollution)
         const descriptor = Object.getOwnPropertyDescriptor(value, key); // safe-name!

package/build/system/memory/discard.mjs

@@ -1,12 +1,13 @@
 // deno-lint-ignore-file no-explicit-any
 // deno-fmt-ignore-file
+import { Guard } from '../../guard/index.mjs';
 import { Metrics } from './metrics.mjs';
 import { Clone } from './clone.mjs';
 /** Discards multiple property keys from the given object value */
 export function Discard(value, propertyKeys) {
     Metrics.discard += 1;
     const result = {};
-    for (const key of Object.getOwnPropertyNames(value)) {
+    for (const key of Guard.Keys(value)) {
         if (propertyKeys.includes(key))
             continue;
         const descriptor = Object.getOwnPropertyDescriptor(value, key); // safe-name!

package/build/type/engine/evaluate/broaden.d.mts

@@ -2,13 +2,13 @@ import { type TSchema } from '../../types/schema.mjs';
 import { type TAny } from '../../types/any.mjs';
 import { type TNever } from '../../types/never.mjs';
 import { type TObject } from '../../types/object.mjs';
-import { type TCompare, ResultRightInside, ResultLeftInside, ResultEqual } from './compare.mjs';
+import { type TUnknown } from '../../types/unknown.mjs';
+import { type TCompare, CompareResultLeftInside, CompareResultEqual, CompareResultDisjoint } from './compare.mjs';
 import { type TFlatten } from './flatten.mjs';
 import { type TEvaluateType } from './evaluate.mjs';
-type TBroadFilter<Type extends TSchema, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TCompare<Type, Left> extends typeof ResultRightInside ? TBroadFilter<Type, Right, [...Result]> : TBroadFilter<Type, Right, [...Result, Left]> : Result);
-type TIsBroadestType<Type extends TSchema, Types extends TSchema[]> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TCompare<Type, Left> extends typeof ResultLeftInside | typeof ResultEqual ? false : TIsBroadestType<Type, Right> : true);
-type TBroadenType<Type extends TSchema, Types extends TSchema[], Evaluated extends TSchema = TEvaluateType<Type>, Result extends TSchema[] = (Evaluated extends TAny ? [Evaluated] : TIsBroadestType<Evaluated, Types> extends true ? [...TBroadFilter<Evaluated, Types>, Evaluated] : Types)> = Result;
-type TBroadenTypes<Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? (Left extends TObject ? TBroadenTypes<Right, [...Result, Left]> : Left extends TNever ? TBroadenTypes<Right, Result> : TBroadenTypes<Right, TBroadenType<Left, Result>>) : Result);
+type TBroadenFilter<Type extends TSchema, Types extends TSchema[], Result extends TSchema[] = [], All extends TSchema[] = Types> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TCompare<Type, Left> extends typeof CompareResultLeftInside | typeof CompareResultEqual ? All : TCompare<Type, Left> extends typeof CompareResultDisjoint ? TBroadenFilter<Type, Right, [...Result, Left], All> : TBroadenFilter<Type, Right, Result, All> : [...Result, Type]);
+type TBroadenType<Type extends TSchema, Types extends TSchema[], Result extends TSchema[], Evaluated extends TSchema = TEvaluateType<Type>> = (Evaluated extends TAny ? [Evaluated] : Evaluated extends TUnknown ? [Evaluated] : Evaluated extends TNever ? TBroadenTypes<Types, Result> : Evaluated extends TObject ? TBroadenTypes<Types, [...Result, Evaluated]> : TBroadenTypes<Types, TBroadenFilter<Evaluated, Result>>);
+type TBroadenTypes<Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TBroadenType<Left, Right, Result> : Result);
 export type TBroaden<Types extends TSchema[], Broadened extends TSchema[] = TBroadenTypes<Types>, Flattened extends TSchema[] = TFlatten<Broadened>> = Flattened;
 /** Broadens a set of types and returns either the most broad type, or union or disjoint types. */
 export declare function Broaden<Types extends TSchema[]>(types: [...Types]): TBroaden<Types>;

package/build/type/engine/evaluate/broaden.mjs

@@ -3,37 +3,31 @@ import { Guard } from '../../../guard/index.mjs';
 import { IsAny } from '../../types/any.mjs';
 import { IsNever } from '../../types/never.mjs';
 import { IsObject } from '../../types/object.mjs';
-import { Compare, ResultRightInside, ResultLeftInside, ResultEqual } from './compare.mjs';
+import { IsUnknown } from '../../types/unknown.mjs';
+import { Compare, CompareResultLeftInside, CompareResultEqual, CompareResultDisjoint } from './compare.mjs';
 import { Flatten } from './flatten.mjs';
 import { EvaluateType } from './evaluate.mjs';
-function BroadFilter(type, types) {
-    return types.filter(left => {
-        return Compare(type, left) === ResultRightInside
-            ? false
-            : true;
-    });
-}
-function IsBroadestType(type, types) {
-    const result = types.some(left => {
-        const result = Compare(type, left);
-        return Guard.IsEqual(result, ResultLeftInside) || Guard.IsEqual(result, ResultEqual);
-    });
-    return Guard.IsEqual(result, false);
+function BroadenFilter(type, types, result = [], all = types) {
+    return Guard.ShiftLeft(types, (left, right) => {
+        const compare = Compare(type, left);
+        return ((Guard.IsEqual(compare, CompareResultLeftInside) || Guard.IsEqual(compare, CompareResultEqual))
+            ? all // Left in set. Return original All set.
+            : Guard.IsEqual(compare, CompareResultDisjoint)
+                ? BroadenFilter(type, right, [...result, left], all) // Left is disjoint, keep it
+                : BroadenFilter(type, right, result, all) // Left in Type, drop it
+        );
+    }, () => [...result, type]); // Type broadest in set
 }
-function BroadenType(type, types) {
+function BroadenType(type, types, result) {
     const evaluated = EvaluateType(type);
-    return (IsAny(evaluated) ? [evaluated] :
-        IsBroadestType(evaluated, types)
-            ? [...BroadFilter(evaluated, types), evaluated]
-            : types);
+    return (IsAny(evaluated) ? [evaluated] : // terminate (always the most broad)
+        IsUnknown(evaluated) ? [evaluated] : // terminate (always the most broad)
+            IsNever(evaluated) ? BroadenTypes(types, result) : // ignored: never is dropped
+                IsObject(evaluated) ? BroadenTypes(types, [...result, evaluated]) : // objects are always considered (too expensive to compare)
+                    BroadenTypes(types, BroadenFilter(evaluated, result)));
 }
-function BroadenTypes(types) {
-    return types.reduce((result, left) => {
-        return (IsObject(left) ? [...result, left] : // push
-            IsNever(left) ? result : // ignore
-                BroadenType(left, result) // broaden
-        );
-    }, []);
+function BroadenTypes(types, result = []) {
+    return Guard.ShiftLeft(types, (left, right) => (BroadenType(left, right, result)), () => result);
 }
 /** Broadens a set of types and returns either the most broad type, or union or disjoint types. */
 export function Broaden(types) {

package/build/type/engine/evaluate/compare.d.mts

@@ -1,15 +1,11 @@
 import { type TSchema } from '../../types/index.mjs';
-import { type TUnknown } from '../../types/unknown.mjs';
 import { type TExtends, ExtendsResult } from "../../extends/index.mjs";
-export declare const ResultEqual = "equal";
-export declare const ResultDisjoint = "disjoint";
-export declare const ResultLeftInside = "left-inside";
-export declare const ResultRightInside = "right-inside";
-export type TCompareResult = typeof ResultEqual | typeof ResultDisjoint | typeof ResultLeftInside | typeof ResultRightInside;
+export declare const CompareResultEqual = 0;
+export declare const CompareResultDisjoint = 1;
+export declare const CompareResultLeftInside = 2;
+export declare const CompareResultRightInside = 3;
+export type TCompareResult = (typeof CompareResultEqual | typeof CompareResultDisjoint | typeof CompareResultLeftInside | typeof CompareResultRightInside);
 /** Compares left and right types and determines their set relationship */
-export type TCompare<Left extends TSchema, Right extends TSchema, Extends extends [ExtendsResult.TResult, ExtendsResult.TResult] = [
-    Left extends TUnknown ? ExtendsResult.TExtendsFalse : TExtends<{}, Left, Right>,
-    Left extends TUnknown ? ExtendsResult.TExtendsTrue : TExtends<{}, Right, Left>
-]> = (Extends extends [ExtendsResult.TExtendsTrueLike, ExtendsResult.TExtendsTrueLike] ? typeof ResultEqual : Extends extends [ExtendsResult.TExtendsTrueLike, ExtendsResult.TExtendsFalse] ? typeof ResultLeftInside : Extends extends [ExtendsResult.TExtendsFalse, ExtendsResult.TExtendsTrueLike] ? typeof ResultRightInside : typeof ResultDisjoint);
+export type TCompare<Left extends TSchema, Right extends TSchema, Extends extends [ExtendsResult.TResult, ExtendsResult.TResult] = [TExtends<{}, Left, Right>, TExtends<{}, Right, Left>]> = (Extends extends [ExtendsResult.TExtendsTrueLike, ExtendsResult.TExtendsTrueLike] ? typeof CompareResultEqual : Extends extends [ExtendsResult.TExtendsTrueLike, ExtendsResult.TExtendsFalse] ? typeof CompareResultLeftInside : Extends extends [ExtendsResult.TExtendsFalse, ExtendsResult.TExtendsTrueLike] ? typeof CompareResultRightInside : typeof CompareResultDisjoint);
 /** Compares left and right types and determines their set relationship. */
 export declare function Compare<Left extends TSchema, Right extends TSchema>(left: Left, right: Right): TCompare<Left, Right>;

package/build/type/engine/evaluate/compare.mjs

@@ -1,22 +1,18 @@
 // deno-lint-ignore-file ban-types
 // deno-fmt-ignore-file
-import { IsUnknown } from '../../types/unknown.mjs';
 import { Extends, ExtendsResult } from "../../extends/index.mjs";
 // ------------------------------------------------------------------
 // TCompare
 // ------------------------------------------------------------------
-export const ResultEqual = 'equal';
-export const ResultDisjoint = 'disjoint';
-export const ResultLeftInside = 'left-inside';
-export const ResultRightInside = 'right-inside';
+export const CompareResultEqual = 0; // 'equal'
+export const CompareResultDisjoint = 1; // 'disjoint'
+export const CompareResultLeftInside = 2; // 'left-inside'
+export const CompareResultRightInside = 3; // 'right-inside'
 /** Compares left and right types and determines their set relationship. */
 export function Compare(left, right) {
-    const extendsCheck = [
-        IsUnknown(left) ? ExtendsResult.ExtendsFalse() : Extends({}, left, right),
-        IsUnknown(left) ? ExtendsResult.ExtendsTrue({}) : Extends({}, right, left),
-    ];
-    return (ExtendsResult.IsExtendsTrueLike(extendsCheck[0]) && ExtendsResult.IsExtendsTrueLike(extendsCheck[1]) ? ResultEqual :
-        ExtendsResult.IsExtendsTrueLike(extendsCheck[0]) && ExtendsResult.IsExtendsFalse(extendsCheck[1]) ? ResultLeftInside :
-            ExtendsResult.IsExtendsFalse(extendsCheck[0]) && ExtendsResult.IsExtendsTrueLike(extendsCheck[1]) ? ResultRightInside :
-                ResultDisjoint);
+    const extendsCheck = [Extends({}, left, right), Extends({}, right, left)];
+    return (ExtendsResult.IsExtendsTrueLike(extendsCheck[0]) && ExtendsResult.IsExtendsTrueLike(extendsCheck[1]) ? CompareResultEqual :
+        ExtendsResult.IsExtendsTrueLike(extendsCheck[0]) && ExtendsResult.IsExtendsFalse(extendsCheck[1]) ? CompareResultLeftInside :
+            ExtendsResult.IsExtendsFalse(extendsCheck[0]) && ExtendsResult.IsExtendsTrueLike(extendsCheck[1]) ? CompareResultRightInside :
+                CompareResultDisjoint);
 }

package/build/type/engine/evaluate/composite.d.mts

@@ -1,4 +1,3 @@
-import { type TUnreachable } from '../../../system/unreachable/index.mjs';
 import { type TReadonly } from '../../types/_readonly.mjs';
 import { type TOptional } from '../../types/_optional.mjs';
 import { type TSchema } from '../../types/schema.mjs';
@@ -12,6 +11,10 @@ import { type TRemoveReadonly } from '../../action/_remove_readonly.mjs';
 import { type TRemoveOptional } from '../../action/_remove_optional.mjs';
 import { type TTupleElementsToProperties } from '../tuple/to_object.mjs';
 import { type TEvaluateIntersect } from './evaluate.mjs';
+/** Returns true if the type is a valid operand to Composite. */
+export type TCanComposite<Type extends TSchema> = (Type extends TObject<infer _ extends TProperties> ? true : Type extends TTuple<infer _ extends TSchema[]> ? true : false);
+/** Returns true if the type is a valid operand to Composite. */
+export declare function CanComposite<Type extends TSchema>(type: Type): TCanComposite<Type>;
 type TIsReadonlyProperty<Left extends TSchema, Right extends TSchema> = (Left extends TReadonly<Left> ? Right extends TReadonly<Right> ? true : false : false);
 type TIsOptionalProperty<Left extends TSchema, Right extends TSchema> = (Left extends TOptional<Left> ? Right extends TOptional<Right> ? true : false : false);
 type TCompositeProperty<Left extends TSchema, Right extends TSchema, IsReadonly extends boolean = TIsReadonlyProperty<Left, Right>, IsOptional extends boolean = TIsOptionalProperty<Left, Right>, Evaluated extends TSchema = TEvaluateIntersect<[Left, Right]>, Property extends TSchema = TRemoveReadonly<TRemoveOptional<Evaluated>>> = ([
@@ -25,10 +28,10 @@ type TCompositeProperty<Left extends TSchema, Right extends TSchema, IsReadonly
     IsOptional
 ] extends [false, true] ? TAddOptional<Property> : Property);
 type TCompositePropertyKey<Left extends TProperties, Right extends TProperties, Key extends PropertyKey, Result extends TSchema = (Key extends keyof Left ? Key extends keyof Right ? TCompositeProperty<Left[Key], Right[Key]> : Left[Key] : Key extends keyof Right ? Right[Key] : TNever)> = Result;
-type TCompositeProperties<Left extends TProperties, Right extends TProperties, Result extends TProperties = {
-    [Key in keyof (Right & Left)]: TCompositePropertyKey<Left, Right, Key>;
+type TCompositeProperties<Left extends TProperties, Right extends TProperties, Keys extends PropertyKey = keyof (Left & Right), Result extends TProperties = {
+    [Key in Keys]: TCompositePropertyKey<Left, Right, Key>;
 }> = Result;
-type TGetProperties<Type extends TSchema, Result extends TProperties = (Type extends TObject<infer Properties extends TProperties> ? Properties : Type extends TTuple<infer Types extends TSchema[]> ? TTupleElementsToProperties<Types> : TUnreachable)> = Result;
+type TGetProperties<Type extends TSchema, Result extends TProperties = (Type extends TObject<infer Properties extends TProperties> ? Properties : Type extends TTuple<infer Types extends TSchema[]> ? TTupleElementsToProperties<Types> : {})> = Result;
 export type TComposite<Left extends TSchema, Right extends TSchema, LeftProperties extends TProperties = TGetProperties<Left>, RightProperties extends TProperties = TGetProperties<Right>, Properties extends TProperties = TCompositeProperties<LeftProperties, RightProperties>, Result extends TSchema = TObject<Properties>> = Result;
 export declare function Composite<Left extends TSchema, Right extends TSchema>(left: Left, right: Right): TComposite<Left, Right>;
 export {};

package/build/type/engine/evaluate/composite.mjs

@@ -1,6 +1,5 @@
 // deno-fmt-ignore-file
 // deno-lint-ignore-file
-import { Unreachable } from '../../../system/unreachable/index.mjs';
 import { Guard } from '../../../guard/index.mjs';
 import { IsReadonly } from '../../types/_readonly.mjs';
 import { IsOptional } from '../../types/_optional.mjs';
@@ -13,6 +12,10 @@ import { RemoveReadonly } from '../../action/_remove_readonly.mjs';
 import { RemoveOptional } from '../../action/_remove_optional.mjs';
 import { TupleElementsToProperties } from '../tuple/to_object.mjs';
 import { EvaluateIntersect } from './evaluate.mjs';
+/** Returns true if the type is a valid operand to Composite. */
+export function CanComposite(type) {
+    return (IsObject(type) || IsTuple(type));
+}
 function IsReadonlyProperty(left, right) {
     return (IsReadonly(left) ? IsReadonly(right) ? true : false : false);
 }
@@ -32,36 +35,26 @@ function CompositeProperty(left, right) {
 }
 function CompositePropertyKey(left, right, key) {
     return (key in left
-        ? key in right
-            ? CompositeProperty(left[key], right[key])
-            : left[key]
-        : key in right
-            ? right[key]
-            : Never());
+        ? key in right ? CompositeProperty(left[key], right[key]) : left[key]
+        : key in right ? right[key] : Never());
 }
 function CompositeProperties(left, right) {
-    const keys = new Set([...Guard.Keys(right), ...Guard.Keys(left)]);
-    return [...keys].reduce((result, key) => {
+    const keys = new Set([...Guard.Keys(left), ...Guard.Keys(right)]);
+    const result = [...keys].reduce((result, key) => {
         return { ...result, [key]: CompositePropertyKey(left, right, key) };
     }, {});
+    return result;
 }
-// ------------------------------------------------------------------
-// deno-coverage-ignore-start - symmetric unreachable | internal
-//
-// Composite is called by Distribute which provisions the type as
-// either TObject ot TTuple. Fall-through unreachable.
-//
-// ------------------------------------------------------------------
 function GetProperties(type) {
     const result = (IsObject(type) ? type.properties :
         IsTuple(type) ? TupleElementsToProperties(type.items) :
-            Unreachable() // {}
-    );
+            {});
     return result;
 }
 export function Composite(left, right) {
     const leftProperties = GetProperties(left);
     const rightProperties = GetProperties(right);
     const properties = CompositeProperties(leftProperties, rightProperties);
-    return Object(properties);
+    const result = Object(properties);
+    return result;
 }

package/build/type/engine/evaluate/distribute.d.mts

@@ -1,27 +1,11 @@
 import { type TSchema } from '../../types/schema.mjs';
-import { type TProperties } from '../../types/properties.mjs';
 import { type TUnion } from '../../types/union.mjs';
-import { type TObject } from '../../types/object.mjs';
-import { type TTuple } from '../../types/tuple.mjs';
-import { type TComposite } from './composite.mjs';
 import { type TNarrow } from './narrow.mjs';
-import { type TEvaluateType } from './evaluate.mjs';
 import { type TEvaluateIntersect } from './evaluate.mjs';
-type TIsObjectLike<Type extends TSchema> = (Type extends TObject<infer _ extends TProperties> ? true : Type extends TTuple<infer _ extends TSchema[]> ? true : false);
-type TIsUnionOperand<Left extends TSchema, Right extends TSchema, IsUnionLeft extends boolean = Left extends TUnion ? true : false, IsUnionRight extends boolean = Right extends TUnion ? true : false, Result extends boolean = IsUnionLeft extends true ? true : IsUnionRight extends true ? true : false> = Result;
-type TDistributeOperation<Left extends TSchema, Right extends TSchema, EvaluatedLeft extends TSchema = TEvaluateType<Left>, EvaluatedRight extends TSchema = TEvaluateType<Right>, IsUnionOperand extends boolean = TIsUnionOperand<EvaluatedLeft, EvaluatedRight>, IsObjectLeft extends boolean = TIsObjectLike<EvaluatedLeft>, IsObjectRight extends boolean = TIsObjectLike<EvaluatedRight>, Result extends TSchema = ([
-    IsUnionOperand
-] extends [true] ? TEvaluateIntersect<[EvaluatedLeft, EvaluatedRight]> : [
-    IsObjectLeft,
-    IsObjectRight
-] extends [true, true] ? TComposite<EvaluatedLeft, EvaluatedRight> : [
-    IsObjectLeft,
-    IsObjectRight
-] extends [true, false] ? EvaluatedLeft : [
-    IsObjectLeft,
-    IsObjectRight
-] extends [false, true] ? EvaluatedRight : TNarrow<EvaluatedLeft, EvaluatedRight>)> = Result;
-type TDistributeType<Type extends TSchema, Distribution extends TSchema[], Result extends TSchema[] = []> = (Distribution extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TDistributeType<Type, Right, [...Result, TDistributeOperation<Type, Left>]> : Result extends [] ? [Type] : Result);
+import { type TEvaluateType } from './evaluate.mjs';
+type TShouldEvaluate<Left extends TSchema, Right extends TSchema, IsUnionLeft extends boolean = Left extends TUnion ? true : false, IsUnionRight extends boolean = Right extends TUnion ? true : false, Result extends boolean = IsUnionLeft extends true ? true : IsUnionRight extends true ? true : false> = Result;
+type TDistributeOperation<Left extends TSchema, Right extends TSchema, EvaluatedLeft extends TSchema = TEvaluateType<Left>, EvaluatedRight extends TSchema = TEvaluateType<Right>, ShouldEvaluate extends boolean = TShouldEvaluate<EvaluatedLeft, EvaluatedRight>, Result extends TSchema = [ShouldEvaluate] extends [true] ? TEvaluateIntersect<[EvaluatedLeft, EvaluatedRight]> : TNarrow<EvaluatedLeft, EvaluatedRight>> = Result;
+type TDistributeType<Type extends TSchema, Distribution extends TSchema[], Result extends TSchema[] = []> = (Distribution extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TDistributeType<Type, Right, [...Result, TDistributeOperation<Left, Type>]> : Result extends [] ? [Type] : Result);
 type TDistributeUnion<Types extends TSchema[], Distribution extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TDistributeUnion<Right, Distribution, [...Result, ...TDistribute<[Left], Distribution>]> : Result);
 export type TDistribute<Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? Left extends TUnion<infer UnionTypes extends TSchema[]> ? TDistribute<Right, TDistributeUnion<UnionTypes, Result>> : TDistribute<Right, TDistributeType<Left, Result>> : Result);
 export declare function Distribute<Types extends TSchema[]>(types: [...Types], result?: TSchema[]): TDistribute<Types>;

package/build/type/engine/evaluate/distribute.mjs

@@ -2,36 +2,24 @@
 // deno-fmt-ignore-file
 import { Guard } from '../../../guard/index.mjs';
 import { IsUnion } from '../../types/union.mjs';
-import { IsObject } from '../../types/object.mjs';
-import { IsTuple } from '../../types/tuple.mjs';
-import { Composite } from './composite.mjs';
 import { Narrow } from './narrow.mjs';
-import { EvaluateType } from './evaluate.mjs';
 import { EvaluateIntersect } from './evaluate.mjs';
-function IsObjectLike(type) {
-    return IsObject(type) || IsTuple(type);
-}
-function IsUnionOperand(left, right) {
-    const isUnionLeft = IsUnion(left);
-    const isUnionRight = IsUnion(right);
-    const result = isUnionLeft || isUnionRight;
+import { EvaluateType } from './evaluate.mjs';
+function ShouldEvaluate(left, right) {
+    const result = IsUnion(left) || IsUnion(right);
     return result;
 }
 function DistributeOperation(left, right) {
     const evaluatedLeft = EvaluateType(left);
     const evaluatedRight = EvaluateType(right);
-    const isUnionOperand = IsUnionOperand(evaluatedLeft, evaluatedRight);
-    const isObjectLeft = IsObjectLike(evaluatedLeft);
-    const IsObjectRight = IsObjectLike(evaluatedRight);
-    const result = (isUnionOperand ? EvaluateIntersect([evaluatedLeft, evaluatedRight]) :
-        isObjectLeft && IsObjectRight ? Composite(evaluatedLeft, evaluatedRight) :
-            isObjectLeft && !IsObjectRight ? evaluatedLeft :
-                !isObjectLeft && IsObjectRight ? evaluatedRight :
-                    Narrow(evaluatedLeft, evaluatedRight));
+    const shouldEvaluate = ShouldEvaluate(evaluatedLeft, evaluatedRight);
+    const result = shouldEvaluate
+        ? EvaluateIntersect([evaluatedLeft, evaluatedRight])
+        : Narrow(evaluatedLeft, evaluatedRight);
     return result;
 }
 function DistributeType(type, types, result = []) {
-    return Guard.ShiftLeft(types, (left, right) => DistributeType(type, right, [...result, DistributeOperation(type, left)]), () => Guard.IsEqual(result.length, 0)
+    return Guard.ShiftLeft(types, (left, right) => DistributeType(type, right, [...result, DistributeOperation(left, type)]), () => Guard.IsEqual(result.length, 0)
         ? [type]
         : result);
 }

package/build/type/engine/evaluate/evaluate.d.mts

@@ -1,8 +1,8 @@
 import { type TSchema } from '../../types/schema.mjs';
 import { type TDependent } from '../../types/dependent.mjs';
 import { type TEnum, type TEnumValue } from '../../types/enum.mjs';
-import { type TLiteral } from '../../types/literal.mjs';
 import { type TIntersect } from '../../types/intersect.mjs';
+import { type TLiteral } from '../../types/literal.mjs';
 import { type TNever } from '../../types/never.mjs';
 import { type TTemplateLiteral } from '../../types/template_literal.mjs';
 import { type TUnion } from '../../types/union.mjs';
@@ -10,11 +10,11 @@ import { type TDistribute } from './distribute.mjs';
 import { type TBroaden } from './broaden.mjs';
 import { type TExcludeOperation } from '../exclude/operation.mjs';
 import { type TTemplateLiteralDecode } from '../template_literal/decode.mjs';
-export type TEvaluateDependent<If extends TSchema, Then extends TSchema, Else extends TSchema, Intersect extends TSchema = TIntersect<[If, Then]>, Excluded extends TSchema = TExcludeOperation<Else, If>, Result extends TSchema = TEvaluateUnion<[Intersect, Excluded]>> = Result;
+export type TEvaluateDependent<If extends TSchema, Then extends TSchema, Else extends TSchema, Intersected extends TSchema = TEvaluateIntersect<[If, Then]>, Excluded extends TSchema = TExcludeOperation<Else, If>, Result extends TSchema = TEvaluateUnion<[Intersected, Excluded]>> = Result;
 export declare function EvaluateDependent<If extends TSchema, Then extends TSchema, Else extends TSchema>(if_: If, then_: Then, else_: Else): TEvaluateDependent<If, Then, Else>;
 export type TEvaluateEnum<Values extends TEnumValue[], Result extends TSchema[] = []> = (Values extends [infer Left extends TEnumValue, ...infer Right extends TEnumValue[]] ? TEvaluateEnum<Right, [...Result, TLiteral<Left>]> : TEvaluateUnion<Result>);
-export declare function EvaluateEnum<Values extends TEnumValue[]>(values: [...Values]): TEvaluateEnum<Values>;
-export type TEvaluateIntersect<Types extends TSchema[], Distribution extends TSchema[] = TDistribute<Types>, Broadend extends TSchema[] = TBroaden<Distribution>, Result extends TSchema = TEvaluateUnionFast<Broadend>> = Result;
+export declare function EvaluateEnum<Values extends TEnumValue[]>(values: [...Values], result?: TSchema[]): TEvaluateEnum<Values>;
+export type TEvaluateIntersect<Types extends TSchema[], Distribution extends TSchema[] = TDistribute<Types>, Broadend extends TSchema[] = TBroaden<Distribution>, Result extends TSchema = TEvaluateUnion<Broadend>> = Result;
 export declare function EvaluateIntersect<Types extends TSchema[]>(types: [...Types]): TEvaluateIntersect<Types>;
 export type TEvaluateTemplateLiteral<Pattern extends string, Evaluated extends TSchema = TTemplateLiteralDecode<Pattern>, Result extends TSchema = TEvaluateType<Evaluated>> = Result;
 export declare function EvaluateTemplateLiteral<Pattern extends string>(pattern: Pattern): TEvaluateTemplateLiteral<Pattern>;