@sinclair/typebox 0.24.49 → 0.24.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.24.49",
+  "version": "0.24.51",
   "description": "JSONSchema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",

package/typebox.d.ts

@@ -178,15 +178,15 @@ export interface TProperties {
 export declare type ObjectProperties<T> = T extends TObject<infer U> ? U : never;
 export declare type ObjectPropertyKeys<T> = T extends TObject<infer U> ? keyof U : never;
 export declare type TAdditionalProperties = undefined | TSchema | boolean;
-export interface ObjectOptions<A extends TAdditionalProperties = undefined> extends SchemaOptions {
-    additionalProperties?: A;
+export interface ObjectOptions extends SchemaOptions {
+    additionalProperties?: TAdditionalProperties;
     minProperties?: number;
     maxProperties?: number;
 }
-export interface TObject<T extends TProperties = TProperties, A extends TAdditionalProperties = undefined> extends TSchema, ObjectOptions<A> {
+export interface TObject<T extends TProperties = TProperties> extends TSchema, ObjectOptions {
     [Kind]: 'Object';
-    static: A extends TSchema ? PropertiesReduce<T, this['params']> & Record<string, Static<A, ['params']>> : PropertiesReduce<T, this['params']>;
-    additionalProperties?: A;
+    static: PropertiesReduce<T, this['params']>;
+    additionalProperties?: TAdditionalProperties;
     type: 'object';
     properties: T;
     required?: string[];
@@ -210,7 +210,7 @@ export interface TPromise<T extends TSchema = TSchema> extends TSchema {
     type: 'promise';
     item: TSchema;
 }
-export declare type TRecordKey = TString | TNumber | TUnion<TLiteral<any>[]>;
+export declare type TRecordKey = TString | TNumeric | TUnion<TLiteral<any>[]>;
 export interface TRecord<K extends TRecordKey = TRecordKey, T extends TSchema = TSchema> extends TSchema {
     [Kind]: 'Record';
     static: Record<Static<K>, Static<T, this['params']>>;
@@ -351,7 +351,7 @@ export declare class TypeBuilder {
     /** Creates a number type */
     Number(options?: NumericOptions): TNumber;
     /** Creates an object type with the given properties */
-    Object<T extends TProperties, A extends TAdditionalProperties = undefined>(properties: T, options?: ObjectOptions<A>): TObject<T, A>;
+    Object<T extends TProperties>(properties: T, options?: ObjectOptions): TObject<T>;
     /** Creates a new object whose properties are omitted from the given object */
     Omit<T extends TObject, K extends TUnion<TLiteral<string>[]>>(schema: T, keys: K, options?: ObjectOptions): TOmit<T, UnionStringLiteralToTuple<K>>;
     /** Creates a new object whose properties are omitted from the given object */
@@ -369,7 +369,7 @@ export declare class TypeBuilder {
     /** Creates an object whose properties are derived from the given string literal union. */
     Record<K extends TUnion<TLiteral[]>, T extends TSchema>(key: K, schema: T, options?: ObjectOptions): TObject<TRecordProperties<K, T>>;
     /** Creates a record type */
-    Record<K extends TString | TNumber, T extends TSchema>(key: K, schema: T, options?: ObjectOptions): TRecord<K, T>;
+    Record<K extends TString | TNumeric, T extends TSchema>(key: K, schema: T, options?: ObjectOptions): TRecord<K, T>;
     /** Creates a recursive object type */
     Recursive<T extends TSchema>(callback: (self: TSelf) => T, options?: SchemaOptions): TRecursive<T>;
     /** Creates a reference schema */

package/typebox.js

@@ -259,7 +259,7 @@ class TypeBuilder {
             }, {}), { ...options, [exports.Hint]: 'Record' });
         }
         // otherwise return TRecord with patternProperties
-        const pattern = key[exports.Kind] === 'Number' ? '^(0|[1-9][0-9]*)$' : key[exports.Kind] === 'String' && key.pattern ? key.pattern : '^.*$';
+        const pattern = ['Integer', 'Number'].includes(key[exports.Kind]) ? '^(0|[1-9][0-9]*)$' : key[exports.Kind] === 'String' && key.pattern ? key.pattern : '^.*$';
         return this.Create({
             ...options,
             [exports.Kind]: 'Record',