typebox 1.0.75 → 1.0.76

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

@@ -7,16 +7,7 @@ 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 | 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 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]> : [

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

@@ -15,10 +15,8 @@ function IsObjectLike(type) {
 function IsUnionOperand(left, right) {
     const isUnionLeft = IsUnion(left);
     const isUnionRight = IsUnion(right);
-    return (isUnionLeft && isUnionRight ? true :
-        !isUnionLeft && isUnionRight ? true :
-            isUnionLeft && !isUnionRight ? true :
-                false);
+    const result = isUnionLeft || isUnionRight;
+    return result;
 }
 function DistributeOperation(left, right) {
     const evaluatedLeft = EvaluateType(left);

package/build/type/engine/patterns/pattern.d.mts

@@ -1,7 +1,6 @@
-import { type TUnreachable } from '../../../system/unreachable/index.mjs';
 import { type TSchema } from '../../types/schema.mjs';
 import { type TPattern } from '../../script/parser.mjs';
-/** Parses a Pattern into a sequence of TemplateLiteral types */
-export type TParsePatternIntoTypes<Pattern extends string, Parsed extends [TSchema[], string] | [] = TPattern<Pattern>, Result extends TSchema[] = Parsed extends [infer Types extends TSchema[], string] ? Types : TUnreachable> = Result;
-/** Parses a Pattern into a sequence of TemplateLiteral types */
+/** Parses a Pattern into a sequence of TemplateLiteral types. A result of [] indicates failure to parse. */
+export type TParsePatternIntoTypes<Pattern extends string, Parsed extends [TSchema[], string] | [] = TPattern<Pattern>, Result extends TSchema[] = Parsed extends [infer Types extends TSchema[], string] ? Types : []> = Result;
+/** Parses a Pattern into a sequence of TemplateLiteral types. A result of [] indicates failure to parse. */
 export declare function ParsePatternIntoTypes<Pattern extends string>(pattern: Pattern): TParsePatternIntoTypes<Pattern>;

package/build/type/engine/patterns/pattern.mjs

@@ -1,13 +1,11 @@
 // deno-fmt-ignore-file
-import { Unreachable } from '../../../system/unreachable/index.mjs';
 import { Guard } from '../../../guard/index.mjs';
 import { Pattern } from '../../script/parser.mjs';
-/** Parses a Pattern into a sequence of TemplateLiteral types */
+/** Parses a Pattern into a sequence of TemplateLiteral types. A result of [] indicates failure to parse. */
 export function ParsePatternIntoTypes(pattern) {
     const parsed = Pattern(pattern);
     const result = Guard.IsEqual(parsed.length, 2)
         ? parsed[0]
-        : Unreachable(); // []
+        : []; // Failed to Parse
     return result;
 }
-// deno-coverage-ignore-stop

package/build/type/engine/template-literal/decode.d.mts

@@ -1,8 +1,9 @@
 import { TUnreachable } from '../../../system/unreachable/index.mjs';
+import { type TLiteral, type TLiteralValue } from '../../types/literal.mjs';
 import { type TSchema } from '../../types/schema.mjs';
-import { type TUnion } from '../../types/union.mjs';
 import { type TString } from '../../types/string.mjs';
-import { type TLiteral, type TLiteralValue } from '../../types/literal.mjs';
+import { type TTemplateLiteral } from '../../types/template-literal.mjs';
+import { type TUnion } from '../../types/union.mjs';
 import { type TParsePatternIntoTypes } from '../patterns/pattern.mjs';
 import { type TTemplateLiteralFinite } from './finite.mjs';
 type TFromLiteralPush<Variants extends string[], Value extends TLiteralValue, Result extends string[] = []> = Variants extends [infer Left extends string, ...infer Right extends string[]] ? TFromLiteralPush<Right, Value, [...Result, `${Left}${Value}`]> : Result;
@@ -14,7 +15,7 @@ type TVariantsToLiterals<Variants extends string[], Result extends TSchema[] = [
 type TDecodeTypesAsUnion<Types extends TSchema[], Variants extends string[] = TDecodeFromSpan<[], Types>, Literals extends TSchema[] = TVariantsToLiterals<Variants>, Result extends TSchema = TUnion<Literals>> = Result;
 type TDecodeTypes<Types extends TSchema[], Result extends TSchema = (Types extends [] ? TUnreachable : Types extends [infer Type extends TLiteral] ? Type : TDecodeTypesAsUnion<Types>)> = Result;
 /** Decodes a TemplateLiteral into a Type. If the TemplateLiteral yields a non-finite set, the return value is TString */
-export type TTemplateLiteralDecode<Pattern extends string, Types extends TSchema[] = TParsePatternIntoTypes<Pattern>, Finite extends boolean = TTemplateLiteralFinite<Types>, Result extends TSchema = (Finite extends true ? TDecodeTypes<Types> : TString)> = Result;
+export type TTemplateLiteralDecode<Pattern extends string, Types extends TSchema[] = TParsePatternIntoTypes<Pattern>, Result extends TSchema = (Types extends [] ? TString : TTemplateLiteralFinite<Types> extends true ? TDecodeTypes<Types> : TTemplateLiteral<Pattern>)> = Result;
 /** Decodes a TemplateLiteral into a Type. If the TemplateLiteral yields a non-finite set, the return value is TString */
 export declare function TemplateLiteralDecode<Pattern extends string>(pattern: Pattern): TTemplateLiteralDecode<Pattern>;
 export {};

package/build/type/engine/template-literal/decode.mjs

@@ -1,12 +1,13 @@
 // deno-fmt-ignore-file
 import { Unreachable } from '../../../system/unreachable/index.mjs';
 import { Guard } from '../../../guard/index.mjs';
+import { Literal, IsLiteral } from '../../types/literal.mjs';
 import { IsSchema } from '../../types/schema.mjs';
-import { Union, IsUnion } from '../../types/union.mjs';
 import { String } from '../../types/string.mjs';
-import { Literal, IsLiteral } from '../../types/literal.mjs';
+import { Union, IsUnion } from '../../types/union.mjs';
 import { ParsePatternIntoTypes } from '../patterns/pattern.mjs';
 import { TemplateLiteralFinite } from './finite.mjs';
+import { TemplateLiteralCreate } from './create.mjs';
 function FromLiteralPush(variants, value, result = []) {
     const [left, ...right] = variants;
     return (Guard.IsString(left) ? FromLiteralPush(right, value, [...result, `${left}${value}`]) : result);
@@ -65,9 +66,10 @@ function DecodeTypes(types) {
 /** Decodes a TemplateLiteral into a Type. If the TemplateLiteral yields a non-finite set, the return value is TString */
 export function TemplateLiteralDecode(pattern) {
     const types = ParsePatternIntoTypes(pattern);
-    const finite = TemplateLiteralFinite(types);
-    const result = finite
-        ? DecodeTypes(types)
-        : String();
+    const result = Guard.IsEqual(types.length, 0) // Failed to Parse
+        ? String() // ... Pattern cannot be typed, so discard
+        : TemplateLiteralFinite(types)
+            ? DecodeTypes(types)
+            : TemplateLiteralCreate(pattern);
     return result;
 }

package/build/type/types/record.d.mts

@@ -7,6 +7,7 @@ import { type TString } from './string.mjs';
 import { type TDeferred } from './deferred.mjs';
 import { type TInstantiate } from '../engine/instantiate.mjs';
 import { type TTemplateLiteralStatic } from '../engine/template-literal/index.mjs';
+import { type TTemplateLiteralDecode } from '../engine/template-literal/decode.mjs';
 type StaticPropertyKey<Key extends string, Result extends PropertyKey = (Key extends TStringKey ? string : Key extends TIntegerKey ? number : Key extends TNumberKey ? number : Key extends `^${string}$` ? TTemplateLiteralStatic<Key> : string)> = Result;
 export type StaticRecord<Stack extends string[], Direction extends StaticDirection, Context extends TProperties, This extends TProperties, Key extends string, Value extends TSchema, StaticKey extends PropertyKey = StaticPropertyKey<Key>, StaticValue extends unknown = StaticType<Stack, Direction, Context, This, Value>> = Record<StaticKey, StaticValue>;
 export type TStringKey = typeof StringKey;
@@ -37,7 +38,7 @@ export type TRecordPattern<Type extends TRecord, Result extends string = Extract
 /** Returns the raw string pattern used for the Record key  */
 export declare function RecordPattern<Type extends TRecord>(type: Type): TRecordPattern<Type>;
 /** Returns the Record key as a TypeBox type  */
-export type TRecordKey<Type extends TRecord, Pattern extends string = TRecordPattern<Type>, Result extends TSchema = (Pattern extends typeof IntegerKey ? TInteger : Pattern extends typeof NumberKey ? TNumber : TString)> = Result;
+export type TRecordKey<Type extends TRecord, Pattern extends string = TRecordPattern<Type>, Result extends TSchema = (Pattern extends typeof StringKey ? TString : Pattern extends typeof IntegerKey ? TInteger : Pattern extends typeof NumberKey ? TNumber : TTemplateLiteralDecode<Pattern>)> = Result;
 /** Returns the Record key as a TypeBox type  */
 export declare function RecordKey<Type extends TRecord>(type: Type): TRecordKey<Type>;
 export type TRecordValue<Type extends TRecord, Result extends TSchema = Type['patternProperties'][TRecordPattern<Type>]> = Result;

package/build/type/types/record.mjs

@@ -7,6 +7,7 @@ import { Number, NumberPattern } from './number.mjs';
 import { String, StringPattern } from './string.mjs';
 import { Deferred } from './deferred.mjs';
 import { Instantiate } from '../engine/instantiate.mjs';
+import { TemplateLiteralDecode } from '../engine/template-literal/decode.mjs';
 import { CreateRecord } from '../engine/record/record-create.mjs';
 export const IntegerKey = `^${IntegerPattern}$`;
 export const NumberKey = `^${NumberPattern}$`;
@@ -39,9 +40,10 @@ export function RecordPattern(type) {
 /** Returns the Record key as a TypeBox type  */
 export function RecordKey(type) {
     const pattern = RecordPattern(type);
-    const result = (Guard.IsEqual(pattern, IntegerKey) ? Integer() :
-        Guard.IsEqual(pattern, NumberKey) ? Number() :
-            String());
+    const result = (Guard.IsEqual(pattern, StringKey) ? String() :
+        Guard.IsEqual(pattern, IntegerKey) ? Integer() :
+            Guard.IsEqual(pattern, NumberKey) ? Number() :
+                TemplateLiteralDecode(pattern));
     return result;
 }
 export function RecordValue(type) {

package/package.json

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