feat: implement field validation (#290)

* feat: implement field validation

* update

* update

* update

Author: ymc9

packages/eslint-config/base.js renamed to packages/config/eslint-config/base.js

@@ -543,22 +543,22 @@ attribute @upper() @@@targetField([StringField]) @@@validation
 /**
  * Validates a number field is greater than the given value.
  */
-attribute @gt(_ value: Int, _ message: String?) @@@targetField([IntField, FloatField, DecimalField]) @@@validation
+attribute @gt(_ value: Any, _ message: String?) @@@targetField([IntField, FloatField, DecimalField, BigIntField]) @@@validation
 
 /**
  * Validates a number field is greater than or equal to the given value.
  */
-attribute @gte(_ value: Int, _ message: String?) @@@targetField([IntField, FloatField, DecimalField]) @@@validation
+attribute @gte(_ value: Any, _ message: String?) @@@targetField([IntField, FloatField, DecimalField, BigIntField]) @@@validation
 
 /**
  * Validates a number field is less than the given value.
  */
-attribute @lt(_ value: Int, _ message: String?) @@@targetField([IntField, FloatField, DecimalField]) @@@validation
+attribute @lt(_ value: Any, _ message: String?) @@@targetField([IntField, FloatField, DecimalField, BigIntField]) @@@validation
 
 /**
  * Validates a number field is less than or equal to the given value.
  */
-attribute @lte(_ value: Int, _ message: String?) @@@targetField([IntField, FloatField, DecimalField]) @@@validation
+attribute @lte(_ value: Any, _ message: String?) @@@targetField([IntField, FloatField, DecimalField, BigIntField]) @@@validation
 
 /**
  * Validates the entity with a complex condition.

packages/eslint-config/package.json renamed to packages/config/eslint-config/package.json

@@ -1,4 +1,4 @@
-import type { Decimal } from 'decimal.js';
+import type Decimal from 'decimal.js';
 import { type GetModels, type IsDelegateModel, type ProcedureDef, type SchemaDef } from '../schema';
 import type { AuthType } from '../schema/auth';
 import type { OrUndefinedIf, Simplify, UnwrapTuplePromises } from '../utils/type-utils';

packages/typescript-config/base.json renamed to packages/config/typescript-config/base.json

@@ -131,15 +131,10 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
         model: GetModels<Schema>,
         filter: any,
     ): Promise<unknown | undefined> {
-        const idFields = requireIdFields(this.schema, model);
-        const _filter = flattenCompoundUniqueFilters(this.schema, model, filter);
-        const query = kysely
-            .selectFrom(model)
-            .where((eb) => eb.and(_filter))
-            .select(idFields.map((f) => kysely.dynamic.ref(f)))
-            .limit(1)
-            .modifyEnd(this.makeContextComment({ model, operation: 'read' }));
-        return this.executeQueryTakeFirst(kysely, query, 'exists');
+        return this.readUnique(kysely, model, {
+            where: filter,
+            select: this.makeIdSelect(model),
+        });
     }
 
     protected async read(

packages/typescript-config/package.json renamed to packages/config/typescript-config/package.json

@@ -4,17 +4,18 @@ import stableStringify from 'json-stable-stringify';
 import { match, P } from 'ts-pattern';
 import { z, ZodSchema, ZodType } from 'zod';
 import {
+    type AttributeApplication,
     type BuiltinType,
     type EnumDef,
     type FieldDef,
     type GetModels,
     type ModelDef,
     type SchemaDef,
-} from '../../schema';
-import { enumerate } from '../../utils/enumerate';
-import { extractFields } from '../../utils/object-utils';
-import { formatError } from '../../utils/zod-utils';
-import { AGGREGATE_OPERATORS, LOGICAL_COMBINATORS, NUMERIC_FIELD_TYPES } from '../constants';
+} from '../../../schema';
+import { enumerate } from '../../../utils/enumerate';
+import { extractFields } from '../../../utils/object-utils';
+import { formatError } from '../../../utils/zod-utils';
+import { AGGREGATE_OPERATORS, LOGICAL_COMBINATORS, NUMERIC_FIELD_TYPES } from '../../constants';
 import {
     type AggregateArgs,
     type CountArgs,
@@ -29,16 +30,23 @@ import {
     type UpdateManyAndReturnArgs,
     type UpdateManyArgs,
     type UpsertArgs,
-} from '../crud-types';
-import { InputValidationError, InternalError } from '../errors';
+} from '../../crud-types';
+import { InputValidationError, InternalError } from '../../errors';
 import {
     fieldHasDefaultValue,
     getDiscriminatorField,
     getEnum,
     getUniqueFields,
     requireField,
     requireModel,
-} from '../query-utils';
+} from '../../query-utils';
+import {
+    addBigIntValidation,
+    addCustomValidation,
+    addDecimalValidation,
+    addNumberValidation,
+    addStringValidation,
+} from './utils';
 
 type GetSchemaFunc<Schema extends SchemaDef, Options> = (model: GetModels<Schema>, options: Options) => ZodType;
 
@@ -191,11 +199,14 @@ export class InputValidator<Schema extends SchemaDef> {
             schema = getSchema(model, options);
             this.schemaCache.set(cacheKey!, schema);
         }
-        const { error } = schema.safeParse(args);
+        const { error, data } = schema.safeParse(args);
         if (error) {
-            throw new InputValidationError(`Invalid ${operation} args: ${formatError(error)}`, error);
+            throw new InputValidationError(
+                `Invalid ${operation} args for model "${model}": ${formatError(error)}`,
+                error,
+            );
         }
-        return args as T;
+        return data as T;
     }
 
     // #region Find
@@ -235,17 +246,28 @@ export class InputValidator<Schema extends SchemaDef> {
         return result;
     }
 
-    private makePrimitiveSchema(type: string) {
+    private makePrimitiveSchema(type: string, attributes?: AttributeApplication[]) {
         if (this.schema.typeDefs && type in this.schema.typeDefs) {
             return this.makeTypeDefSchema(type);
         } else {
             return match(type)
-                .with('String', () => z.string())
-                .with('Int', () => z.number().int())
-                .with('Float', () => z.number())
+                .with('String', () => addStringValidation(z.string(), attributes))
+                .with('Int', () => addNumberValidation(z.number().int(), attributes))
+                .with('Float', () => addNumberValidation(z.number(), attributes))
                 .with('Boolean', () => z.boolean())
-                .with('BigInt', () => z.union([z.number().int(), z.bigint()]))
-                .with('Decimal', () => z.union([z.number(), z.instanceof(Decimal), z.string()]))
+                .with('BigInt', () =>
+                    z.union([
+                        addNumberValidation(z.number().int(), attributes),
+                        addBigIntValidation(z.bigint(), attributes),
+                    ]),
+                )
+                .with('Decimal', () =>
+                    z.union([
+                        addNumberValidation(z.number(), attributes),
+                        addDecimalValidation(z.instanceof(Decimal), attributes),
+                        addDecimalValidation(z.string(), attributes),
+                    ]),
+                )
                 .with('DateTime', () => z.union([z.date(), z.string().datetime()]))
                 .with('Bytes', () => z.instanceof(Uint8Array))
                 .otherwise(() => z.unknown());
@@ -860,7 +882,7 @@ export class InputValidator<Schema extends SchemaDef> {
                     uncheckedVariantFields[field] = fieldSchema;
                 }
             } else {
-                let fieldSchema: ZodType = this.makePrimitiveSchema(fieldDef.type);
+                let fieldSchema: ZodType = this.makePrimitiveSchema(fieldDef.type, fieldDef.attributes);
 
                 if (fieldDef.array) {
                     fieldSchema = z
@@ -889,14 +911,17 @@ export class InputValidator<Schema extends SchemaDef> {
             }
         });
 
+        const uncheckedCreateSchema = addCustomValidation(z.strictObject(uncheckedVariantFields), modelDef.attributes);
+        const checkedCreateSchema = addCustomValidation(z.strictObject(checkedVariantFields), modelDef.attributes);
+
         if (!hasRelation) {
-            return this.orArray(z.strictObject(uncheckedVariantFields), canBeArray);
+            return this.orArray(uncheckedCreateSchema, canBeArray);
         } else {
             return z.union([
-                z.strictObject(uncheckedVariantFields),
-                z.strictObject(checkedVariantFields),
-                ...(canBeArray ? [z.array(z.strictObject(uncheckedVariantFields))] : []),
-                ...(canBeArray ? [z.array(z.strictObject(checkedVariantFields))] : []),
+                uncheckedCreateSchema,
+                checkedCreateSchema,
+                ...(canBeArray ? [z.array(uncheckedCreateSchema)] : []),
+                ...(canBeArray ? [z.array(checkedCreateSchema)] : []),
             ]);
         }
     }
@@ -1112,7 +1137,7 @@ export class InputValidator<Schema extends SchemaDef> {
                     uncheckedVariantFields[field] = fieldSchema;
                 }
             } else {
-                let fieldSchema: ZodType = this.makePrimitiveSchema(fieldDef.type).optional();
+                let fieldSchema: ZodType = this.makePrimitiveSchema(fieldDef.type, fieldDef.attributes).optional();
 
                 if (this.isNumericField(fieldDef)) {
                     fieldSchema = z.union([
@@ -1161,10 +1186,12 @@ export class InputValidator<Schema extends SchemaDef> {
             }
         });
 
+        const uncheckedUpdateSchema = addCustomValidation(z.strictObject(uncheckedVariantFields), modelDef.attributes);
+        const checkedUpdateSchema = addCustomValidation(z.strictObject(checkedVariantFields), modelDef.attributes);
         if (!hasRelation) {
-            return z.strictObject(uncheckedVariantFields);
+            return uncheckedUpdateSchema;
         } else {
-            return z.union([z.strictObject(uncheckedVariantFields), z.strictObject(checkedVariantFields)]);
+            return z.union([uncheckedUpdateSchema, checkedUpdateSchema]);
         }
     }