typebox 1.0.74 → 1.0.75

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

@@ -1,5 +1,4 @@
 import { type TSchema } from '../../types/schema.mjs';
-import { type TIntersect } from '../../types/intersect.mjs';
 import { type TUnion } from '../../types/union.mjs';
 import { type TObject } from '../../types/object.mjs';
 import { type TTuple } from '../../types/tuple.mjs';
@@ -7,18 +6,29 @@ 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 TCanDistribute<Type extends TSchema> = Type extends TObject | TTuple ? true : false;
-type TDistributeNormalize<Type extends TSchema> = Type extends TIntersect<infer Types extends TSchema[]> ? TEvaluateIntersect<Types> : Type;
-type TDistributeOperation<Left extends TSchema, Right extends TSchema, NormalLeft extends TSchema = TDistributeNormalize<Left>, NormalRight extends TSchema = TDistributeNormalize<Right>, IsObjectLeft extends boolean = TCanDistribute<NormalLeft>, IsObjectRight extends boolean = TCanDistribute<NormalRight>, Result extends TSchema = ([
+type TIsObjectLike<Type extends TSchema> = Type extends TObject | TTuple ? 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,
+    IsUnionRight
+] extends [true, true] ? true : [
+    IsUnionLeft,
+    IsUnionRight
+] extends [false, true] ? true : [
+    IsUnionLeft,
+    IsUnionRight
+] extends [true, false] ? 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<TEvaluateType<NormalLeft>, NormalRight> : [
+] extends [true, true] ? TComposite<EvaluatedLeft, EvaluatedRight> : [
     IsObjectLeft,
     IsObjectRight
-] extends [true, false] ? TEvaluateType<NormalLeft> : [
+] extends [true, false] ? EvaluatedLeft : [
     IsObjectLeft,
     IsObjectRight
-] extends [false, true] ? NormalRight : TNarrow<TEvaluateType<NormalLeft>, NormalRight>)> = Result;
+] 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);
 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);

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

@@ -2,7 +2,6 @@
 // deno-fmt-ignore-file
 import { Guard } from '../../../guard/index.mjs';
 import { IsSchema } from '../../types/schema.mjs';
-import { IsIntersect } from '../../types/intersect.mjs';
 import { IsUnion } from '../../types/union.mjs';
 import { IsObject } from '../../types/object.mjs';
 import { IsTuple } from '../../types/tuple.mjs';
@@ -10,23 +9,28 @@ import { Composite } from './composite.mjs';
 import { Narrow } from './narrow.mjs';
 import { EvaluateType } from './evaluate.mjs';
 import { EvaluateIntersect } from './evaluate.mjs';
-function CanDistribute(type) {
+function IsObjectLike(type) {
     return IsObject(type) || IsTuple(type);
 }
-function DistributeNormalize(type) {
-    return (IsIntersect(type)
-        ? EvaluateIntersect(type.allOf)
-        : type);
+function IsUnionOperand(left, right) {
+    const isUnionLeft = IsUnion(left);
+    const isUnionRight = IsUnion(right);
+    return (isUnionLeft && isUnionRight ? true :
+        !isUnionLeft && isUnionRight ? true :
+            isUnionLeft && !isUnionRight ? true :
+                false);
 }
 function DistributeOperation(left, right) {
-    const normalLeft = DistributeNormalize(left);
-    const normalRight = DistributeNormalize(right);
-    const isObjectLeft = CanDistribute(normalLeft);
-    const IsObjectRight = CanDistribute(normalRight);
-    const result = (isObjectLeft && IsObjectRight ? Composite(EvaluateType(normalLeft), normalRight) :
-        isObjectLeft && !IsObjectRight ? EvaluateType(normalLeft) :
-            !isObjectLeft && IsObjectRight ? normalRight :
-                Narrow(EvaluateType(normalLeft), normalRight));
+    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));
     return result;
 }
 function DistributeType(type, types, result = []) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typebox",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
-  "version": "1.0.74",
+  "version": "1.0.75",
   "keywords": [
     "typescript",
     "jsonschema"