@sinclair/typebox 0.24.46 → 0.24.48

package/errors/errors.d.ts

@@ -25,23 +25,24 @@ export declare enum ValueErrorType {
     ObjectMinProperties = 22,
     ObjectMaxProperties = 23,
     ObjectAdditionalProperties = 24,
-    Promise = 25,
-    RecordKeyNumeric = 26,
-    RecordKeyString = 27,
-    String = 28,
-    StringMinLength = 29,
-    StringMaxLength = 30,
-    StringPattern = 31,
-    StringFormatUnknown = 32,
-    StringFormat = 33,
-    TupleZeroLength = 34,
-    TupleLength = 35,
-    Undefined = 36,
-    Union = 37,
-    Uint8Array = 38,
-    Uint8ArrayMinByteLength = 39,
-    Uint8ArrayMaxByteLength = 40,
-    Void = 41
+    ObjectRequiredProperties = 25,
+    Promise = 26,
+    RecordKeyNumeric = 27,
+    RecordKeyString = 28,
+    String = 29,
+    StringMinLength = 30,
+    StringMaxLength = 31,
+    StringPattern = 32,
+    StringFormatUnknown = 33,
+    StringFormat = 34,
+    TupleZeroLength = 35,
+    TupleLength = 36,
+    Undefined = 37,
+    Union = 38,
+    Uint8Array = 39,
+    Uint8ArrayMinByteLength = 40,
+    Uint8ArrayMaxByteLength = 41,
+    Void = 42
 }
 export interface ValueError {
     type: ValueErrorType;

package/errors/errors.js

@@ -60,23 +60,24 @@ var ValueErrorType;
     ValueErrorType[ValueErrorType["ObjectMinProperties"] = 22] = "ObjectMinProperties";
     ValueErrorType[ValueErrorType["ObjectMaxProperties"] = 23] = "ObjectMaxProperties";
     ValueErrorType[ValueErrorType["ObjectAdditionalProperties"] = 24] = "ObjectAdditionalProperties";
-    ValueErrorType[ValueErrorType["Promise"] = 25] = "Promise";
-    ValueErrorType[ValueErrorType["RecordKeyNumeric"] = 26] = "RecordKeyNumeric";
-    ValueErrorType[ValueErrorType["RecordKeyString"] = 27] = "RecordKeyString";
-    ValueErrorType[ValueErrorType["String"] = 28] = "String";
-    ValueErrorType[ValueErrorType["StringMinLength"] = 29] = "StringMinLength";
-    ValueErrorType[ValueErrorType["StringMaxLength"] = 30] = "StringMaxLength";
-    ValueErrorType[ValueErrorType["StringPattern"] = 31] = "StringPattern";
-    ValueErrorType[ValueErrorType["StringFormatUnknown"] = 32] = "StringFormatUnknown";
-    ValueErrorType[ValueErrorType["StringFormat"] = 33] = "StringFormat";
-    ValueErrorType[ValueErrorType["TupleZeroLength"] = 34] = "TupleZeroLength";
-    ValueErrorType[ValueErrorType["TupleLength"] = 35] = "TupleLength";
-    ValueErrorType[ValueErrorType["Undefined"] = 36] = "Undefined";
-    ValueErrorType[ValueErrorType["Union"] = 37] = "Union";
-    ValueErrorType[ValueErrorType["Uint8Array"] = 38] = "Uint8Array";
-    ValueErrorType[ValueErrorType["Uint8ArrayMinByteLength"] = 39] = "Uint8ArrayMinByteLength";
-    ValueErrorType[ValueErrorType["Uint8ArrayMaxByteLength"] = 40] = "Uint8ArrayMaxByteLength";
-    ValueErrorType[ValueErrorType["Void"] = 41] = "Void";
+    ValueErrorType[ValueErrorType["ObjectRequiredProperties"] = 25] = "ObjectRequiredProperties";
+    ValueErrorType[ValueErrorType["Promise"] = 26] = "Promise";
+    ValueErrorType[ValueErrorType["RecordKeyNumeric"] = 27] = "RecordKeyNumeric";
+    ValueErrorType[ValueErrorType["RecordKeyString"] = 28] = "RecordKeyString";
+    ValueErrorType[ValueErrorType["String"] = 29] = "String";
+    ValueErrorType[ValueErrorType["StringMinLength"] = 30] = "StringMinLength";
+    ValueErrorType[ValueErrorType["StringMaxLength"] = 31] = "StringMaxLength";
+    ValueErrorType[ValueErrorType["StringPattern"] = 32] = "StringPattern";
+    ValueErrorType[ValueErrorType["StringFormatUnknown"] = 33] = "StringFormatUnknown";
+    ValueErrorType[ValueErrorType["StringFormat"] = 34] = "StringFormat";
+    ValueErrorType[ValueErrorType["TupleZeroLength"] = 35] = "TupleZeroLength";
+    ValueErrorType[ValueErrorType["TupleLength"] = 36] = "TupleLength";
+    ValueErrorType[ValueErrorType["Undefined"] = 37] = "Undefined";
+    ValueErrorType[ValueErrorType["Union"] = 38] = "Union";
+    ValueErrorType[ValueErrorType["Uint8Array"] = 39] = "Uint8Array";
+    ValueErrorType[ValueErrorType["Uint8ArrayMinByteLength"] = 40] = "Uint8ArrayMinByteLength";
+    ValueErrorType[ValueErrorType["Uint8ArrayMaxByteLength"] = 41] = "Uint8ArrayMaxByteLength";
+    ValueErrorType[ValueErrorType["Void"] = 42] = "Void";
 })(ValueErrorType = exports.ValueErrorType || (exports.ValueErrorType = {}));
 // -------------------------------------------------------------------
 // ValueErrors
@@ -190,12 +191,20 @@ var ValueErrors;
         }
         const propertyKeys = globalThis.Object.keys(schema.properties);
         if (schema.additionalProperties === false) {
-            for (const propKey of globalThis.Object.keys(value)) {
-                if (!propertyKeys.includes(propKey)) {
-                    yield { type: ValueErrorType.ObjectAdditionalProperties, schema, path: `${path}/${propKey}`, value: value[propKey], message: 'Unexpected property' };
+            for (const objectKey of globalThis.Object.keys(value)) {
+                if (!propertyKeys.includes(objectKey)) {
+                    yield { type: ValueErrorType.ObjectAdditionalProperties, schema, path: `${path}/${objectKey}`, value: value[objectKey], message: `Unexpected property` };
                 }
             }
         }
+        if (schema.required && schema.required.length > 0) {
+            const objectKeys = globalThis.Object.keys(value);
+            for (const requiredKey of schema.required) {
+                if (objectKeys.includes(requiredKey))
+                    continue;
+                yield { type: ValueErrorType.ObjectRequiredProperties, schema: schema.properties[requiredKey], path: `${path}/${requiredKey}`, value: undefined, message: `Expected required property` };
+            }
+        }
         for (const propertyKey of propertyKeys) {
             const propertySchema = schema.properties[propertyKey];
             if (schema.required && schema.required.includes(propertyKey)) {

package/package.json

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

package/typebox.d.ts

@@ -353,7 +353,7 @@ export declare class TypeBuilder {
     /** 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 */
-    Omit<T extends TObject, K extends ObjectPropertyKeys<T>[]>(schema: T, keys: [...K], options?: ObjectOptions): TOmit<T, K>;
+    Omit<T extends TObject, K extends ObjectPropertyKeys<T>[]>(schema: T, keys: readonly [...K], options?: ObjectOptions): TOmit<T, K>;
     /** Creates a tuple type from this functions parameters */
     Parameters<T extends TFunction<any[], any>>(schema: T, options?: SchemaOptions): TParameters<T>;
     /** Creates an object type whose properties are all optional */
@@ -361,7 +361,7 @@ export declare class TypeBuilder {
     /** Creates a object whose properties are picked from the given object */
     Pick<T extends TObject, K extends TUnion<TLiteral<string>[]>>(schema: T, keys: K, options?: ObjectOptions): TPick<T, UnionStringLiteralToTuple<K>>;
     /** Creates a object whose properties are picked from the given object */
-    Pick<T extends TObject, K extends ObjectPropertyKeys<T>[]>(schema: T, keys: [...K], options?: ObjectOptions): TPick<T, K>;
+    Pick<T extends TObject, K extends ObjectPropertyKeys<T>[]>(schema: T, keys: readonly [...K], options?: ObjectOptions): TPick<T, K>;
     /** Creates a promise type. This type cannot be represented in schema. */
     Promise<T extends TSchema>(item: T, options?: SchemaOptions): TPromise<T>;
     /** Creates an object whose properties are derived from the given string literal union. */