v1.0.7

Author: fir4tozden

package.json

@@ -20,8 +20,7 @@
     "json-schema-to-typescript": "^15.0.4",
     "lodash.merge": "^4.6.2",
     "slugify": "^1.6.6",
-    "sort-keys": "^6.0.0",
-    "typof": "^1.0.16"
+    "sort-keys": "^6.0.0"
   },
   "devDependencies": {
     "prettier": "latest",

src/types/Schema.type.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/array-type */
-
 export type String = {
   type: 'string';
   enum?: string[];
@@ -51,7 +49,7 @@ export type Object = {
   required: boolean;
 };
 
-export type Array = {
+export type _Array = {
   type: 'array';
   min?: number;
   max?: number;
@@ -61,7 +59,7 @@ export type Array = {
   required: boolean;
 };
 
-export type TypeSingle = String | Number | Boolean | Date | Object | Array;
+export type TypeSingle = String | Number | Boolean | Date | Object | _Array;
 
 export type TypeUnion = [TypeSingle, TypeSingle, ...TypeSingle[]];
 

src/utils/Engine.util.ts

@@ -20,6 +20,14 @@ const getRegex = (pattern: string) => {
 };
 
 const findMatchedType = (type_union: TypeUnion, property: unknown) => {
+  if (property === undefined) {
+    const schema_with_default = type_union.find((schema) => schema.default !== undefined);
+
+    if (schema_with_default) return schema_with_default;
+
+    return type_union[0];
+  }
+
   const matched = type_union.find((schema) => {
     if (property === null) return schema.nullable;
 
@@ -34,25 +42,35 @@ const findMatchedType = (type_union: TypeUnion, property: unknown) => {
 };
 
 const findMatchedSchema = (schema_union: SchemaUnion, properties: Record<string, unknown>) => {
-  const matched = schema_union.find((schemaRecord) => {
-    const first_key = Object.keys(schemaRecord)[0];
-
-    if (!first_key) return false;
-
-    const first_type = schemaRecord[first_key];
-    const target_type = Array.isArray(first_type) ? first_type[0] : first_type;
-    const property = properties[first_key];
+  let best_match = schema_union[0];
+  let max_score = -1;
 
-    if (property === null) return target_type.nullable;
+  for (const schema_record of schema_union) {
+    let score = 0;
 
-    if (target_type.type === 'date') return typeof property === 'string' || property instanceof Date;
-    if (target_type.type === 'array') return Array.isArray(property);
-    if (target_type.type === 'object') return typeof property === 'object' && !Array.isArray(property);
+    for (const key of Object.keys(schema_record)) {
+      const property = properties[key];
+      const schema_def = schema_record[key];
+      const target_type = Array.isArray(schema_def) ? findMatchedType(schema_def, property) : schema_def;
+
+      if (property === null) {
+        if (target_type.nullable) {
+          score++;
+        } else score -= 2;
+      } else if (property !== undefined) {
+        if ((target_type.type === 'string' && typeof property === 'string') || (target_type.type === 'number' && typeof property === 'number') || (target_type.type === 'boolean' && typeof property === 'boolean') || (target_type.type === 'object' && typeof property === 'object' && !Array.isArray(property)) || (target_type.type === 'array' && Array.isArray(property))) {
+          score++;
+        } else score -= 2;
+      } else if (target_type.required && target_type.default === undefined) score -= 1;
+    }
 
-    return typeof property === target_type.type;
-  });
+    if (score > max_score) {
+      max_score = score;
+      best_match = schema_record;
+    }
+  }
 
-  return matched ?? schema_union[0];
+  return best_match;
 };
 
 export const validate = async <const _Schema extends Schema>(schema: _Schema, properties: Record<string, unknown>, options: TeyitOptions): Promise<InferSchema<_Schema>> => {
@@ -82,7 +100,7 @@ export const validate = async <const _Schema extends Schema>(schema: _Schema, pr
     } else throw new ValidationError({ errors: [error] });
   };
 
-  const processProperty = (equivalent: TypeSingle, property: unknown, path: string): unknown => {
+  const processProperty = async (equivalent: TypeSingle, property: unknown, path: string): Promise<unknown> => {
     if (property === undefined) {
       if (equivalent.default !== undefined) {
         return equivalent.default;
@@ -150,7 +168,7 @@ export const validate = async <const _Schema extends Schema>(schema: _Schema, pr
 
       return value;
     } else if (equivalent.type === 'number') {
-      if (typeof property !== 'number') {
+      if (typeof property !== 'number' || !Number.isFinite(property)) {
         reportError({ message: (options.error_messages?.number?.type ?? '').replaceAll('{path}', path), parts: { path } });
 
         return property;
@@ -166,7 +184,7 @@ export const validate = async <const _Schema extends Schema>(schema: _Schema, pr
 
       if (equivalent.positive === true && property < 0) reportError({ message: (options.error_messages?.number?.positive ?? '').replaceAll('{path}', path), parts: { path } });
 
-      if (equivalent.negative === true && property >= 0) reportError({ message: (options.error_messages?.number?.negative ?? '').replaceAll('{path}', path), parts: { path } });
+      if (equivalent.negative === true && property > 0) reportError({ message: (options.error_messages?.number?.negative ?? '').replaceAll('{path}', path), parts: { path } });
 
       return property;
     } else if (equivalent.type === 'boolean') {
@@ -220,7 +238,7 @@ export const validate = async <const _Schema extends Schema>(schema: _Schema, pr
         const target_schema = Array.isArray(schema_property) ? findMatchedType(schema_property, property_record[key]) : schema_property;
 
         const next_path = path === 'root' ? key : `${path}.${key}`;
-        const property_processed = processProperty(target_schema, property_record[key], next_path);
+        const property_processed = await processProperty(target_schema, property_record[key], next_path);
 
         if (property_processed !== undefined) result_record[key] = property_processed;
       }
@@ -247,7 +265,7 @@ export const validate = async <const _Schema extends Schema>(schema: _Schema, pr
         const base_path = path === 'root' ? '' : path;
         const next_path = `${base_path}[${String(i)}]`;
 
-        results_array[i] = processProperty(target_schema, property[i], next_path);
+        results_array[i] = await processProperty(target_schema, property[i], next_path);
       }
 
       return results_array;
@@ -267,7 +285,7 @@ export const validate = async <const _Schema extends Schema>(schema: _Schema, pr
       const schema_property = schema_record[key];
       const target_schema = Array.isArray(schema_property) ? findMatchedType(schema_property, properties[key]) : schema_property;
 
-      const property_processed = processProperty(target_schema, properties[key], key);
+      const property_processed = await processProperty(target_schema, properties[key], key);
 
       if (property_processed !== undefined) result_record[key] = property_processed;
     }

tests/SchemaUnion.test.ts

@@ -1,6 +1,6 @@
 import { Teyit, type Schema, type ValidationError } from '../src/main';
 
-const teyit = new Teyit({ output_dir: './tests/generated/teyit' });
+const teyit = new Teyit();
 
 const schema = [
   {

tests/TypeUnion.test.ts

@@ -1,6 +1,6 @@
 import { Teyit, type Schema, type ValidationError } from '../src/main';
 
-const teyit = new Teyit({ output_dir: './tests/generated/teyit' });
+const teyit = new Teyit();
 
 const schema = {
   field: [