fix(validator): change ValidType to StringifyableRecord

Alwatr · Feb 25, 2023 · ca1e191 · ca1e191
1 parent 4c5f669
commit ca1e191
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/core/validator/src/type.ts b/core/validator/src/type.ts
@@ -9,7 +9,3 @@ export type JsonSchema = {
     | boolean
     | null;
 };
-
-export type ValidType = {
-  [key: string]: ValidType | string | number | boolean | null;
-};
diff --git a/core/validator/src/validator.ts b/core/validator/src/validator.ts
@@ -1,11 +1,11 @@
 import {isNumber} from '@alwatr/math';
 
-import type {JsonSchema, ValidType} from './type.js';
+import type {JsonSchema} from './type.js';
 import type {Stringifyable, StringifyableRecord} from '@alwatr/type';
 
 export type {JsonSchema};
 
-export function validator<T extends ValidType>(
+export function validator<T extends StringifyableRecord>(
     validSchema: JsonSchema,
     targetObject: StringifyableRecord,
     additionalProperties = false,
@@ -45,7 +45,7 @@ export function validator<T extends ValidType>(
 
     if (typeof itemSchema === 'object' && itemSchema != null) {
       // nested object
-      targetObject[itemName] = validator<ValidType>(
+      targetObject[itemName] = validator<StringifyableRecord>(
           itemSchema,
         itemValue as StringifyableRecord,
         additionalProperties,