yuppi 1.2.3 → 1.2.5

package/README.md

@@ -112,31 +112,21 @@ Yuppi
 │   ├── URI
 │   └── Username
 │
-└── type Types
-    │
-    ├── AnyObject
-    ├── JSONSchema
-    ├── Schema
-    ├── ValidateOptions
-    ├── ValidationError
-    └── YuppiOptions
+├── type AnyObject
+├── type JSONSchema
+├── type Schema
+├── type ValidateOptions
+├── type ValidationError
+└── type YuppiOptions
 ```
 
 ### Import
 
 Briefly as follows.
 
-> TypeScript
->
-> ```typescript
-> import { Yuppi, Patterns, type Types as YuppiTypes } from "yuppi";
-> ```
->
-> JavaScript
->
-> ```javascript
-> import { Yuppi, Patterns } from "yuppi";
-> ```
+```typescript
+import { Yuppi, Patterns } from "yuppi";
+```
 
 ### Constructors
 
@@ -170,7 +160,7 @@ Validate the properties with your Yuppi schema.
 > Example:
 >
 > ```typescript
-> const schema: YuppiTypes.Schema = {
+> const schema: Schema = {
 >   display_name: {
 >     type: "string",
 >     min: 1,
@@ -197,7 +187,7 @@ Validate the properties with your Yuppi schema.
 >   }
 > };
 >
-> const properties: YuppiTypes.AnyObject = {
+> const properties: AnyObject = {
 >   display_name: "Fırat",
 >   username: "fir4tozden",
 >   email: "fir4tozden@gmail.com"
@@ -212,7 +202,7 @@ Validate the properties with your Yuppi schema.
 >       email: "fir4tozden@gmail.com"
 >     }
 >   */
-> } catch((error: YuppiTypes.ValidationError)) {
+> } catch((error: ValidationError)) {
 >   console.log(error.message); // "Field email must match the required pattern ^[a-zA-Z0-9._-]+@([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$"
 > }
 > ```
@@ -232,7 +222,7 @@ Convert your Yuppi schema into Yup schema.
 > Example:
 >
 > ```typescript
-> const schema: YuppiTypes.Schema = {
+> const schema: Schema = {
 >   display_name: {
 >     type: "string",
 >     min: 1,
@@ -272,12 +262,12 @@ Convert your Yuppi schema into [JSON Schema](https://json-schema.org).
 > | --------- | ------- | -------------------------- |
 > | schema    |         | [Schema]<br/>Yuppi schema. |
 >
-> returns [AnyObject]
+> returns [JSONSchema]
 >
 > Example:
 >
 > ```typescript
-> const schema: YuppiTypes.Schema = {
+> const schema: Schema = {
 >   display_name: {
 >     type: "string",
 >     min: 1,

package/dist/Yuppi.class.d.mts

@@ -1,16 +1,23 @@
+import * as yup from 'yup';
 import { AnyObject } from './types/AnyObject.type.mjs';
 import { JSONSchema } from './types/JSONSchema.type.mjs';
 import { Schema } from './types/Schema.type.mjs';
 import { YuppiOptions } from './types/YuppiOptions.type.mjs';
-import 'yup';
 import '@sinclair/typebox';
 import './types/ValidateOptions.type.mjs';
 
 declare class Yuppi {
     private readonly options;
     constructor(options?: YuppiOptions);
-    validate(schema: Schema, properties: AnyObject): AnyObject;
-    convertToYup(schema: Schema): AnyObject;
+    validate(schema: Schema, properties: AnyObject): {
+        [x: string]: any;
+        [x: number]: any;
+    };
+    convertToYup(schema: Schema): yup.ObjectSchema<{
+        [x: string]: any;
+    }, yup.AnyObject, {
+        [x: string]: any;
+    }, "">;
     convertToJSONSchema(schema: Schema): JSONSchema;
 }
 

package/dist/Yuppi.class.d.ts

@@ -1,16 +1,23 @@
+import * as yup from 'yup';
 import { AnyObject } from './types/AnyObject.type.js';
 import { JSONSchema } from './types/JSONSchema.type.js';
 import { Schema } from './types/Schema.type.js';
 import { YuppiOptions } from './types/YuppiOptions.type.js';
-import 'yup';
 import '@sinclair/typebox';
 import './types/ValidateOptions.type.js';
 
 declare class Yuppi {
     private readonly options;
     constructor(options?: YuppiOptions);
-    validate(schema: Schema, properties: AnyObject): AnyObject;
-    convertToYup(schema: Schema): AnyObject;
+    validate(schema: Schema, properties: AnyObject): {
+        [x: string]: any;
+        [x: number]: any;
+    };
+    convertToYup(schema: Schema): yup.ObjectSchema<{
+        [x: string]: any;
+    }, yup.AnyObject, {
+        [x: string]: any;
+    }, "">;
     convertToJSONSchema(schema: Schema): JSONSchema;
 }
 

package/dist/Yuppi.class.js

@@ -71,6 +71,11 @@ var convertToYup = (schema, error_messages) => {
       schema2 = Yup.string().typeError(({ path }) => (error_messages?.string?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
       schema2 = schema2.transform((property) => typeof property === "string" ? property.trim() : property);
+      if (config.enum !== void 0)
+        schema2 = schema2.oneOf(
+          config.enum.map((item) => item.trim()),
+          ({ path }) => (error_messages?.string?.enum ?? "").split("{path}").join(path)
+        );
       if (config.min !== void 0)
         schema2 = schema2.min(
           config.min,
@@ -87,6 +92,7 @@ var convertToYup = (schema, error_messages) => {
     } else if (config.type === "number") {
       schema2 = Yup.number().typeError(({ path }) => (error_messages?.number?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
+      if (config.enum !== void 0) schema2 = schema2.oneOf(config.enum, ({ path }) => (error_messages?.number?.enum ?? "").split("{path}").join(path));
       if (config.min !== void 0) schema2 = schema2.min(config.min, ({ path, min }) => (error_messages?.number?.min ?? "").split("{path}").join(path).split("{min}").join(min.toString()));
       if (config.max !== void 0) schema2 = schema2.max(config.max, ({ path, max }) => (error_messages?.number?.max ?? "").split("{path}").join(path).split("{max}").join(max.toString()));
       if (config.integer === true) schema2 = schema2.integer(({ path }) => (error_messages?.number?.integer ?? "").split("{path}").join(path));
@@ -137,11 +143,11 @@ var import_typebox = require("@sinclair/typebox");
 var convertToJSONSchema = (schema) => {
   const build = (key, config) => {
     if (config.type === "string") {
-      let schema2 = import_typebox.Type.String({ minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
+      let schema2 = import_typebox.Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
       if (config.nullable) schema2 = import_typebox.Type.Union([schema2, import_typebox.Type.Null()]);
       return config.required ? schema2 : import_typebox.Type.Optional(schema2);
     } else if (config.type === "number") {
-      let schema2 = config.integer === true ? import_typebox.Type.Integer({ minimum: config.min, maximum: config.max, default: config.default }) : import_typebox.Type.Number({ minimum: config.min, maximum: config.max, default: config.default });
+      let schema2 = config.integer === true ? import_typebox.Type.Integer({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default }) : import_typebox.Type.Number({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default });
       if (config.nullable) schema2 = import_typebox.Type.Union([schema2, import_typebox.Type.Null()]);
       return config.required ? schema2 : import_typebox.Type.Optional(schema2);
     } else if (config.type === "boolean") {
@@ -179,11 +185,13 @@ var YuppiOptionsDefault = {
     },
     string: {
       type: "Field {path} must be a string",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be at least {min} character{plural_suffix}",
       max: "Field {path} must be at most {max} character{plural_suffix}"
     },
     number: {
       type: "Field {path} must be a number",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be greater than or equal to {min}",
       max: "Field {path} must be less than or equal to {max}",
       integer: "Field {path} must be an integer",

package/dist/Yuppi.class.mjs

@@ -37,6 +37,11 @@ var convertToYup = (schema, error_messages) => {
       schema2 = Yup.string().typeError(({ path }) => (error_messages?.string?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
       schema2 = schema2.transform((property) => typeof property === "string" ? property.trim() : property);
+      if (config.enum !== void 0)
+        schema2 = schema2.oneOf(
+          config.enum.map((item) => item.trim()),
+          ({ path }) => (error_messages?.string?.enum ?? "").split("{path}").join(path)
+        );
       if (config.min !== void 0)
         schema2 = schema2.min(
           config.min,
@@ -53,6 +58,7 @@ var convertToYup = (schema, error_messages) => {
     } else if (config.type === "number") {
       schema2 = Yup.number().typeError(({ path }) => (error_messages?.number?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
+      if (config.enum !== void 0) schema2 = schema2.oneOf(config.enum, ({ path }) => (error_messages?.number?.enum ?? "").split("{path}").join(path));
       if (config.min !== void 0) schema2 = schema2.min(config.min, ({ path, min }) => (error_messages?.number?.min ?? "").split("{path}").join(path).split("{min}").join(min.toString()));
       if (config.max !== void 0) schema2 = schema2.max(config.max, ({ path, max }) => (error_messages?.number?.max ?? "").split("{path}").join(path).split("{max}").join(max.toString()));
       if (config.integer === true) schema2 = schema2.integer(({ path }) => (error_messages?.number?.integer ?? "").split("{path}").join(path));
@@ -103,11 +109,11 @@ import { Type } from "@sinclair/typebox";
 var convertToJSONSchema = (schema) => {
   const build = (key, config) => {
     if (config.type === "string") {
-      let schema2 = Type.String({ minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
+      let schema2 = Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
       if (config.nullable) schema2 = Type.Union([schema2, Type.Null()]);
       return config.required ? schema2 : Type.Optional(schema2);
     } else if (config.type === "number") {
-      let schema2 = config.integer === true ? Type.Integer({ minimum: config.min, maximum: config.max, default: config.default }) : Type.Number({ minimum: config.min, maximum: config.max, default: config.default });
+      let schema2 = config.integer === true ? Type.Integer({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default }) : Type.Number({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default });
       if (config.nullable) schema2 = Type.Union([schema2, Type.Null()]);
       return config.required ? schema2 : Type.Optional(schema2);
     } else if (config.type === "boolean") {
@@ -145,11 +151,13 @@ var YuppiOptionsDefault = {
     },
     string: {
       type: "Field {path} must be a string",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be at least {min} character{plural_suffix}",
       max: "Field {path} must be at most {max} character{plural_suffix}"
     },
     number: {
       type: "Field {path} must be a number",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be greater than or equal to {min}",
       max: "Field {path} must be less than or equal to {max}",
       integer: "Field {path} must be an integer",

package/dist/defaults/YuppiOptions.default.js

@@ -32,11 +32,13 @@ var YuppiOptionsDefault = {
     },
     string: {
       type: "Field {path} must be a string",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be at least {min} character{plural_suffix}",
       max: "Field {path} must be at most {max} character{plural_suffix}"
     },
     number: {
       type: "Field {path} must be a number",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be greater than or equal to {min}",
       max: "Field {path} must be less than or equal to {max}",
       integer: "Field {path} must be an integer",

package/dist/defaults/YuppiOptions.default.mjs

@@ -8,11 +8,13 @@ var YuppiOptionsDefault = {
     },
     string: {
       type: "Field {path} must be a string",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be at least {min} character{plural_suffix}",
       max: "Field {path} must be at most {max} character{plural_suffix}"
     },
     number: {
       type: "Field {path} must be a number",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be greater than or equal to {min}",
       max: "Field {path} must be less than or equal to {max}",
       integer: "Field {path} must be an integer",

package/dist/main.d.mts

@@ -1,13 +1,12 @@
 export { Yuppi } from './Yuppi.class.mjs';
 export { P as Patterns } from './Patterns.barrel-D-k3IHDq.mjs';
-export { T as Types } from './Types.barrel--XGUUjIp.mjs';
-import './types/AnyObject.type.mjs';
+export { AnyObject } from './types/AnyObject.type.mjs';
+export { JSONSchema } from './types/JSONSchema.type.mjs';
+export { Schema } from './types/Schema.type.mjs';
+export { ValidateOptions } from './types/ValidateOptions.type.mjs';
+export { ValidationError } from './types/ValidationError.type.mjs';
+export { YuppiOptions } from './types/YuppiOptions.type.mjs';
 import 'yup';
-import './types/JSONSchema.type.mjs';
-import '@sinclair/typebox';
-import './types/Schema.type.mjs';
-import './types/YuppiOptions.type.mjs';
-import './types/ValidateOptions.type.mjs';
 import './patterns/Any.pattern.mjs';
 import './patterns/Domain.pattern.mjs';
 import './patterns/Email.pattern.mjs';
@@ -15,4 +14,4 @@ import './patterns/HTTP.pattern.mjs';
 import './patterns/PhoneNumber.pattern.mjs';
 import './patterns/URI.pattern.mjs';
 import './patterns/Username.pattern.mjs';
-import './types/ValidationError.type.mjs';
+import '@sinclair/typebox';

package/dist/main.d.ts

@@ -1,13 +1,12 @@
 export { Yuppi } from './Yuppi.class.js';
 export { P as Patterns } from './Patterns.barrel-JdN3lL2Q.js';
-export { T as Types } from './Types.barrel-wzQq8e9v.js';
-import './types/AnyObject.type.js';
+export { AnyObject } from './types/AnyObject.type.js';
+export { JSONSchema } from './types/JSONSchema.type.js';
+export { Schema } from './types/Schema.type.js';
+export { ValidateOptions } from './types/ValidateOptions.type.js';
+export { ValidationError } from './types/ValidationError.type.js';
+export { YuppiOptions } from './types/YuppiOptions.type.js';
 import 'yup';
-import './types/JSONSchema.type.js';
-import '@sinclair/typebox';
-import './types/Schema.type.js';
-import './types/YuppiOptions.type.js';
-import './types/ValidateOptions.type.js';
 import './patterns/Any.pattern.js';
 import './patterns/Domain.pattern.js';
 import './patterns/Email.pattern.js';
@@ -15,4 +14,4 @@ import './patterns/HTTP.pattern.js';
 import './patterns/PhoneNumber.pattern.js';
 import './patterns/URI.pattern.js';
 import './patterns/Username.pattern.js';
-import './types/ValidationError.type.js';
+import '@sinclair/typebox';

package/dist/main.js

@@ -74,6 +74,11 @@ var convertToYup = (schema, error_messages) => {
       schema2 = Yup.string().typeError(({ path }) => (error_messages?.string?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
       schema2 = schema2.transform((property) => typeof property === "string" ? property.trim() : property);
+      if (config.enum !== void 0)
+        schema2 = schema2.oneOf(
+          config.enum.map((item) => item.trim()),
+          ({ path }) => (error_messages?.string?.enum ?? "").split("{path}").join(path)
+        );
       if (config.min !== void 0)
         schema2 = schema2.min(
           config.min,
@@ -90,6 +95,7 @@ var convertToYup = (schema, error_messages) => {
     } else if (config.type === "number") {
       schema2 = Yup.number().typeError(({ path }) => (error_messages?.number?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
+      if (config.enum !== void 0) schema2 = schema2.oneOf(config.enum, ({ path }) => (error_messages?.number?.enum ?? "").split("{path}").join(path));
       if (config.min !== void 0) schema2 = schema2.min(config.min, ({ path, min }) => (error_messages?.number?.min ?? "").split("{path}").join(path).split("{min}").join(min.toString()));
       if (config.max !== void 0) schema2 = schema2.max(config.max, ({ path, max }) => (error_messages?.number?.max ?? "").split("{path}").join(path).split("{max}").join(max.toString()));
       if (config.integer === true) schema2 = schema2.integer(({ path }) => (error_messages?.number?.integer ?? "").split("{path}").join(path));
@@ -140,11 +146,11 @@ var import_typebox = require("@sinclair/typebox");
 var convertToJSONSchema = (schema) => {
   const build = (key, config) => {
     if (config.type === "string") {
-      let schema2 = import_typebox.Type.String({ minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
+      let schema2 = import_typebox.Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
       if (config.nullable) schema2 = import_typebox.Type.Union([schema2, import_typebox.Type.Null()]);
       return config.required ? schema2 : import_typebox.Type.Optional(schema2);
     } else if (config.type === "number") {
-      let schema2 = config.integer === true ? import_typebox.Type.Integer({ minimum: config.min, maximum: config.max, default: config.default }) : import_typebox.Type.Number({ minimum: config.min, maximum: config.max, default: config.default });
+      let schema2 = config.integer === true ? import_typebox.Type.Integer({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default }) : import_typebox.Type.Number({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default });
       if (config.nullable) schema2 = import_typebox.Type.Union([schema2, import_typebox.Type.Null()]);
       return config.required ? schema2 : import_typebox.Type.Optional(schema2);
     } else if (config.type === "boolean") {
@@ -182,11 +188,13 @@ var YuppiOptionsDefault = {
     },
     string: {
       type: "Field {path} must be a string",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be at least {min} character{plural_suffix}",
       max: "Field {path} must be at most {max} character{plural_suffix}"
     },
     number: {
       type: "Field {path} must be a number",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be greater than or equal to {min}",
       max: "Field {path} must be less than or equal to {max}",
       integer: "Field {path} must be an integer",

package/dist/main.mjs

@@ -43,6 +43,11 @@ var convertToYup = (schema, error_messages) => {
       schema2 = Yup.string().typeError(({ path }) => (error_messages?.string?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
       schema2 = schema2.transform((property) => typeof property === "string" ? property.trim() : property);
+      if (config.enum !== void 0)
+        schema2 = schema2.oneOf(
+          config.enum.map((item) => item.trim()),
+          ({ path }) => (error_messages?.string?.enum ?? "").split("{path}").join(path)
+        );
       if (config.min !== void 0)
         schema2 = schema2.min(
           config.min,
@@ -59,6 +64,7 @@ var convertToYup = (schema, error_messages) => {
     } else if (config.type === "number") {
       schema2 = Yup.number().typeError(({ path }) => (error_messages?.number?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
+      if (config.enum !== void 0) schema2 = schema2.oneOf(config.enum, ({ path }) => (error_messages?.number?.enum ?? "").split("{path}").join(path));
       if (config.min !== void 0) schema2 = schema2.min(config.min, ({ path, min }) => (error_messages?.number?.min ?? "").split("{path}").join(path).split("{min}").join(min.toString()));
       if (config.max !== void 0) schema2 = schema2.max(config.max, ({ path, max }) => (error_messages?.number?.max ?? "").split("{path}").join(path).split("{max}").join(max.toString()));
       if (config.integer === true) schema2 = schema2.integer(({ path }) => (error_messages?.number?.integer ?? "").split("{path}").join(path));
@@ -109,11 +115,11 @@ import { Type } from "@sinclair/typebox";
 var convertToJSONSchema = (schema) => {
   const build = (key, config) => {
     if (config.type === "string") {
-      let schema2 = Type.String({ minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
+      let schema2 = Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
       if (config.nullable) schema2 = Type.Union([schema2, Type.Null()]);
       return config.required ? schema2 : Type.Optional(schema2);
     } else if (config.type === "number") {
-      let schema2 = config.integer === true ? Type.Integer({ minimum: config.min, maximum: config.max, default: config.default }) : Type.Number({ minimum: config.min, maximum: config.max, default: config.default });
+      let schema2 = config.integer === true ? Type.Integer({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default }) : Type.Number({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default });
       if (config.nullable) schema2 = Type.Union([schema2, Type.Null()]);
       return config.required ? schema2 : Type.Optional(schema2);
     } else if (config.type === "boolean") {
@@ -151,11 +157,13 @@ var YuppiOptionsDefault = {
     },
     string: {
       type: "Field {path} must be a string",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be at least {min} character{plural_suffix}",
       max: "Field {path} must be at most {max} character{plural_suffix}"
     },
     number: {
       type: "Field {path} must be a number",
+      enum: "Field {path} must be one of the allowed values",
       min: "Field {path} must be greater than or equal to {min}",
       max: "Field {path} must be less than or equal to {max}",
       integer: "Field {path} must be an integer",

package/dist/patterns/Any.pattern.d.mts

@@ -1,3 +1,3 @@
-declare const Any: string;
+declare const Any = "[\\s\\S]*";
 
 export { Any };

package/dist/patterns/Any.pattern.d.ts

@@ -1,3 +1,3 @@
-declare const Any: string;
+declare const Any = "[\\s\\S]*";
 
 export { Any };

package/dist/patterns/Domain.pattern.d.mts

@@ -1,3 +1,3 @@
-declare const Domain: string;
+declare const Domain = "^([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
 
 export { Domain };

package/dist/patterns/Domain.pattern.d.ts

@@ -1,3 +1,3 @@
-declare const Domain: string;
+declare const Domain = "^([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
 
 export { Domain };

package/dist/patterns/Email.pattern.d.mts

@@ -1,3 +1,3 @@
-declare const Email: string;
+declare const Email = "^[a-zA-Z0-9._-]+@([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
 
 export { Email };

package/dist/patterns/Email.pattern.d.ts

@@ -1,3 +1,3 @@
-declare const Email: string;
+declare const Email = "^[a-zA-Z0-9._-]+@([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
 
 export { Email };

package/dist/patterns/HTTP.pattern.d.mts

@@ -1,3 +1,3 @@
-declare const HTTP: string;
+declare const HTTP = "^(https?:\\/\\/)([a-zA-Z0-9._%+-]+(:[a-zA-Z0-9._%+-]+)?@)?([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}(:\\d+)?(\\/[a-zA-Z0-9._-~%!$&'()*+,;=:@/]*)?(\\?[a-zA-Z0-9._~%!$&'()*+,;=:@/?-]*)?$";
 
 export { HTTP };

package/dist/patterns/HTTP.pattern.d.ts

@@ -1,3 +1,3 @@
-declare const HTTP: string;
+declare const HTTP = "^(https?:\\/\\/)([a-zA-Z0-9._%+-]+(:[a-zA-Z0-9._%+-]+)?@)?([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}(:\\d+)?(\\/[a-zA-Z0-9._-~%!$&'()*+,;=:@/]*)?(\\?[a-zA-Z0-9._~%!$&'()*+,;=:@/?-]*)?$";
 
 export { HTTP };

package/dist/patterns/PhoneNumber.pattern.d.mts

@@ -1,3 +1,3 @@
-declare const PhoneNumber: string;
+declare const PhoneNumber = "^\\d{4}-\\d{7,12}$";
 
 export { PhoneNumber };

package/dist/patterns/PhoneNumber.pattern.d.ts

@@ -1,3 +1,3 @@
-declare const PhoneNumber: string;
+declare const PhoneNumber = "^\\d{4}-\\d{7,12}$";
 
 export { PhoneNumber };

package/dist/patterns/URI.pattern.d.mts

@@ -1,3 +1,3 @@
-declare const URI: string;
+declare const URI = "^([a-zA-Z][a-zA-Z0-9+\\-.]*:\\/\\/)([a-zA-Z0-9._%+-]+(:[a-zA-Z0-9._%+-]+)?@)?([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}(:\\d+)?(\\/[a-zA-Z0-9._-~%!$&'()*+,;=:@/]*)?(\\?[a-zA-Z0-9._~%!$&'()*+,;=:@/?-]*)?$";
 
 export { URI };

package/dist/patterns/URI.pattern.d.ts

@@ -1,3 +1,3 @@
-declare const URI: string;
+declare const URI = "^([a-zA-Z][a-zA-Z0-9+\\-.]*:\\/\\/)([a-zA-Z0-9._%+-]+(:[a-zA-Z0-9._%+-]+)?@)?([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}(:\\d+)?(\\/[a-zA-Z0-9._-~%!$&'()*+,;=:@/]*)?(\\?[a-zA-Z0-9._~%!$&'()*+,;=:@/?-]*)?$";
 
 export { URI };

package/dist/patterns/Username.pattern.d.mts

@@ -1,3 +1,3 @@
-declare const Username: string;
+declare const Username = "^(?=.*[a-zA-Z])[a-zA-Z0-9][a-zA-Z0-9_]*$";
 
 export { Username };

package/dist/patterns/Username.pattern.d.ts

@@ -1,3 +1,3 @@
-declare const Username: string;
+declare const Username = "^(?=.*[a-zA-Z])[a-zA-Z0-9][a-zA-Z0-9_]*$";
 
 export { Username };

package/dist/types/Schema.type.d.mts

@@ -6,6 +6,7 @@ type Base = {
 };
 type String = Base & {
     type: "string";
+    enum?: string[];
     min?: number;
     max?: number;
     lowercase?: boolean;
@@ -13,6 +14,7 @@ type String = Base & {
 };
 type Number = Base & {
     type: "number";
+    enum?: number[];
     min?: number;
     max?: number;
     integer?: boolean;
@@ -38,8 +40,6 @@ type Array = Base & {
     items: Types;
 };
 type Types = String | Number | Boolean | Date | Object$1 | Array;
-type Schema = {
-    [key: string]: Types;
-};
+type Schema = Record<string, Types>;
 
 export type { Array, Base, Boolean, Date, Number, Object$1 as Object, Schema, String, Types };

package/dist/types/Schema.type.d.ts

@@ -6,6 +6,7 @@ type Base = {
 };
 type String = Base & {
     type: "string";
+    enum?: string[];
     min?: number;
     max?: number;
     lowercase?: boolean;
@@ -13,6 +14,7 @@ type String = Base & {
 };
 type Number = Base & {
     type: "number";
+    enum?: number[];
     min?: number;
     max?: number;
     integer?: boolean;
@@ -38,8 +40,6 @@ type Array = Base & {
     items: Types;
 };
 type Types = String | Number | Boolean | Date | Object$1 | Array;
-type Schema = {
-    [key: string]: Types;
-};
+type Schema = Record<string, Types>;
 
 export type { Array, Base, Boolean, Date, Number, Object$1 as Object, Schema, String, Types };

package/dist/types/YuppiOptions.type.d.mts

@@ -10,11 +10,13 @@ type YuppiOptions = {
         };
         string?: {
             type?: string;
+            enum?: string;
             min?: string;
             max?: string;
         };
         number?: {
             type?: string;
+            enum?: string;
             min?: string;
             max?: string;
             integer?: string;

package/dist/types/YuppiOptions.type.d.ts

@@ -10,11 +10,13 @@ type YuppiOptions = {
         };
         string?: {
             type?: string;
+            enum?: string;
             min?: string;
             max?: string;
         };
         number?: {
             type?: string;
+            enum?: string;
             min?: string;
             max?: string;
             integer?: string;

package/dist/utils/ConvertToJSONSchema.util.js

@@ -32,11 +32,11 @@ var Any = "[\\s\\S]*";
 var convertToJSONSchema = (schema) => {
   const build = (key, config) => {
     if (config.type === "string") {
-      let schema2 = import_typebox.Type.String({ minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
+      let schema2 = import_typebox.Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
       if (config.nullable) schema2 = import_typebox.Type.Union([schema2, import_typebox.Type.Null()]);
       return config.required ? schema2 : import_typebox.Type.Optional(schema2);
     } else if (config.type === "number") {
-      let schema2 = config.integer === true ? import_typebox.Type.Integer({ minimum: config.min, maximum: config.max, default: config.default }) : import_typebox.Type.Number({ minimum: config.min, maximum: config.max, default: config.default });
+      let schema2 = config.integer === true ? import_typebox.Type.Integer({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default }) : import_typebox.Type.Number({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default });
       if (config.nullable) schema2 = import_typebox.Type.Union([schema2, import_typebox.Type.Null()]);
       return config.required ? schema2 : import_typebox.Type.Optional(schema2);
     } else if (config.type === "boolean") {

package/dist/utils/ConvertToJSONSchema.util.mjs

@@ -8,11 +8,11 @@ var Any = "[\\s\\S]*";
 var convertToJSONSchema = (schema) => {
   const build = (key, config) => {
     if (config.type === "string") {
-      let schema2 = Type.String({ minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
+      let schema2 = Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern ?? Any).source, default: config.default });
       if (config.nullable) schema2 = Type.Union([schema2, Type.Null()]);
       return config.required ? schema2 : Type.Optional(schema2);
     } else if (config.type === "number") {
-      let schema2 = config.integer === true ? Type.Integer({ minimum: config.min, maximum: config.max, default: config.default }) : Type.Number({ minimum: config.min, maximum: config.max, default: config.default });
+      let schema2 = config.integer === true ? Type.Integer({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default }) : Type.Number({ enum: config.enum, minimum: config.min, maximum: config.max, default: config.default });
       if (config.nullable) schema2 = Type.Union([schema2, Type.Null()]);
       return config.required ? schema2 : Type.Optional(schema2);
     } else if (config.type === "boolean") {

package/dist/utils/ConvertToYup.util.d.mts

@@ -1,9 +1,12 @@
-import { AnyObject } from '../types/AnyObject.type.mjs';
+import * as yup from 'yup';
 import { Schema } from '../types/Schema.type.mjs';
 import { YuppiOptions } from '../types/YuppiOptions.type.mjs';
-import 'yup';
 import '../types/ValidateOptions.type.mjs';
 
-declare const convertToYup: (schema: Schema, error_messages: YuppiOptions["error_messages"]) => AnyObject;
+declare const convertToYup: (schema: Schema, error_messages: YuppiOptions["error_messages"]) => yup.ObjectSchema<{
+    [x: string]: any;
+}, yup.AnyObject, {
+    [x: string]: any;
+}, "">;
 
 export { convertToYup };

package/dist/utils/ConvertToYup.util.d.ts

@@ -1,9 +1,12 @@
-import { AnyObject } from '../types/AnyObject.type.js';
+import * as yup from 'yup';
 import { Schema } from '../types/Schema.type.js';
 import { YuppiOptions } from '../types/YuppiOptions.type.js';
-import 'yup';
 import '../types/ValidateOptions.type.js';
 
-declare const convertToYup: (schema: Schema, error_messages: YuppiOptions["error_messages"]) => AnyObject;
+declare const convertToYup: (schema: Schema, error_messages: YuppiOptions["error_messages"]) => yup.ObjectSchema<{
+    [x: string]: any;
+}, yup.AnyObject, {
+    [x: string]: any;
+}, "">;
 
 export { convertToYup };

package/dist/utils/ConvertToYup.util.js

@@ -68,6 +68,11 @@ var convertToYup = (schema, error_messages) => {
       schema2 = Yup.string().typeError(({ path }) => (error_messages?.string?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
       schema2 = schema2.transform((property) => typeof property === "string" ? property.trim() : property);
+      if (config.enum !== void 0)
+        schema2 = schema2.oneOf(
+          config.enum.map((item) => item.trim()),
+          ({ path }) => (error_messages?.string?.enum ?? "").split("{path}").join(path)
+        );
       if (config.min !== void 0)
         schema2 = schema2.min(
           config.min,
@@ -84,6 +89,7 @@ var convertToYup = (schema, error_messages) => {
     } else if (config.type === "number") {
       schema2 = Yup.number().typeError(({ path }) => (error_messages?.number?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
+      if (config.enum !== void 0) schema2 = schema2.oneOf(config.enum, ({ path }) => (error_messages?.number?.enum ?? "").split("{path}").join(path));
       if (config.min !== void 0) schema2 = schema2.min(config.min, ({ path, min }) => (error_messages?.number?.min ?? "").split("{path}").join(path).split("{min}").join(min.toString()));
       if (config.max !== void 0) schema2 = schema2.max(config.max, ({ path, max }) => (error_messages?.number?.max ?? "").split("{path}").join(path).split("{max}").join(max.toString()));
       if (config.integer === true) schema2 = schema2.integer(({ path }) => (error_messages?.number?.integer ?? "").split("{path}").join(path));

package/dist/utils/ConvertToYup.util.mjs

@@ -34,6 +34,11 @@ var convertToYup = (schema, error_messages) => {
       schema2 = Yup.string().typeError(({ path }) => (error_messages?.string?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
       schema2 = schema2.transform((property) => typeof property === "string" ? property.trim() : property);
+      if (config.enum !== void 0)
+        schema2 = schema2.oneOf(
+          config.enum.map((item) => item.trim()),
+          ({ path }) => (error_messages?.string?.enum ?? "").split("{path}").join(path)
+        );
       if (config.min !== void 0)
         schema2 = schema2.min(
           config.min,
@@ -50,6 +55,7 @@ var convertToYup = (schema, error_messages) => {
     } else if (config.type === "number") {
       schema2 = Yup.number().typeError(({ path }) => (error_messages?.number?.type ?? "").split("{path}").join(path));
       schema2 = base(schema2, key, config);
+      if (config.enum !== void 0) schema2 = schema2.oneOf(config.enum, ({ path }) => (error_messages?.number?.enum ?? "").split("{path}").join(path));
       if (config.min !== void 0) schema2 = schema2.min(config.min, ({ path, min }) => (error_messages?.number?.min ?? "").split("{path}").join(path).split("{min}").join(min.toString()));
       if (config.max !== void 0) schema2 = schema2.max(config.max, ({ path, max }) => (error_messages?.number?.max ?? "").split("{path}").join(path).split("{max}").join(max.toString()));
       if (config.integer === true) schema2 = schema2.integer(({ path }) => (error_messages?.number?.integer ?? "").split("{path}").join(path));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuppi",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Schemas that can be converted to Yup and JSON Schema.",
   "license": "MIT",
   "homepage": "https://github.com/keift/yuppi",
@@ -10,22 +10,20 @@
   "types": "./dist/main.d.ts",
   "scripts": {
     "tests": "bun run lint && bun test",
-    "prettier": "prettier --write ./",
     "build": "tsup",
+    "prettier": "prettier --write ./",
     "lint": "eslint ./"
   },
   "dependencies": {
-    "@sinclair/typebox": "^0.34.38",
+    "@sinclair/typebox": "^0.34.41",
     "@types/lodash": "^4.17.20",
     "lodash": "^4.17.21",
-    "yup": "^1.6.1"
+    "yup": "^1.7.0"
   },
   "devDependencies": {
-    "jiti": "^2.5.1",
+    "neatlint": "^1.1.4",
     "prettier": "^3.6.2",
-    "tsup": "^8.5.0",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.38.0"
+    "tsup": "^8.5.0"
   },
   "repository": {
     "type": "git",

package/dist/Types.barrel--XGUUjIp.d.mts

@@ -1,18 +0,0 @@
-import { AnyObject } from './types/AnyObject.type.mjs';
-import { JSONSchema } from './types/JSONSchema.type.mjs';
-import { Schema } from './types/Schema.type.mjs';
-import { ValidateOptions } from './types/ValidateOptions.type.mjs';
-import { ValidationError } from './types/ValidationError.type.mjs';
-import { YuppiOptions } from './types/YuppiOptions.type.mjs';
-
-declare const Types_barrel_AnyObject: typeof AnyObject;
-declare const Types_barrel_JSONSchema: typeof JSONSchema;
-declare const Types_barrel_Schema: typeof Schema;
-declare const Types_barrel_ValidateOptions: typeof ValidateOptions;
-declare const Types_barrel_ValidationError: typeof ValidationError;
-declare const Types_barrel_YuppiOptions: typeof YuppiOptions;
-declare namespace Types_barrel {
-  export { Types_barrel_AnyObject as AnyObject, Types_barrel_JSONSchema as JSONSchema, Types_barrel_Schema as Schema, Types_barrel_ValidateOptions as ValidateOptions, Types_barrel_ValidationError as ValidationError, Types_barrel_YuppiOptions as YuppiOptions };
-}
-
-export { Types_barrel as T };

package/dist/Types.barrel-wzQq8e9v.d.ts

@@ -1,18 +0,0 @@
-import { AnyObject } from './types/AnyObject.type.js';
-import { JSONSchema } from './types/JSONSchema.type.js';
-import { Schema } from './types/Schema.type.js';
-import { ValidateOptions } from './types/ValidateOptions.type.js';
-import { ValidationError } from './types/ValidationError.type.js';
-import { YuppiOptions } from './types/YuppiOptions.type.js';
-
-declare const Types_barrel_AnyObject: typeof AnyObject;
-declare const Types_barrel_JSONSchema: typeof JSONSchema;
-declare const Types_barrel_Schema: typeof Schema;
-declare const Types_barrel_ValidateOptions: typeof ValidateOptions;
-declare const Types_barrel_ValidationError: typeof ValidationError;
-declare const Types_barrel_YuppiOptions: typeof YuppiOptions;
-declare namespace Types_barrel {
-  export { Types_barrel_AnyObject as AnyObject, Types_barrel_JSONSchema as JSONSchema, Types_barrel_Schema as Schema, Types_barrel_ValidateOptions as ValidateOptions, Types_barrel_ValidationError as ValidationError, Types_barrel_YuppiOptions as YuppiOptions };
-}
-
-export { Types_barrel as T };