@dzeio/schema 0.0.5 → 0.1.0

package/dist/Schema.d.mts

@@ -40,6 +40,11 @@ declare abstract class SchemaItem<Type = any> implements StandardSchemaV1<Type>
     private invalidError;
     constructor(items?: Array<unknown> | IArguments);
     defaultValue(value: Type, strict?: boolean): this;
+    /**
+    * make sure the value is one of the `values`
+    * @param values the values the item MUST contains
+    */
+    in(...values: Array<Type>): this;
     attrs(...attributes: Array<string>): this;
     attr(...attributes: Array<string>): this;
     setInvalidError(err: string): this;
@@ -285,8 +290,8 @@ declare class SchemaUnion<T extends Array<SchemaItem>> extends SchemaItem<ItemTy
 
 declare function isNull(value: unknown): value is undefined | null;
 declare function parseQuery<T extends SchemaItem>(model: T, query: URLSearchParams, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
-declare function parseFormData<T extends SchemaObject>(model: T, data: FormData, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
-declare function parseForm<T extends SchemaObject>(model: T, form: HTMLFormElement, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
+declare function parseFormData<T extends SchemaItem>(model: T, data: FormData, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
+declare function parseForm<T extends SchemaItem>(model: T, form: HTMLFormElement, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
 
 declare function parceable(): (target: object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<any>) => TypedPropertyDescriptor<any>;
 type SchemaItemStatic = new (...args: Array<any>) => SchemaItem;

package/dist/Schema.d.ts

@@ -40,6 +40,11 @@ declare abstract class SchemaItem<Type = any> implements StandardSchemaV1<Type>
     private invalidError;
     constructor(items?: Array<unknown> | IArguments);
     defaultValue(value: Type, strict?: boolean): this;
+    /**
+    * make sure the value is one of the `values`
+    * @param values the values the item MUST contains
+    */
+    in(...values: Array<Type>): this;
     attrs(...attributes: Array<string>): this;
     attr(...attributes: Array<string>): this;
     setInvalidError(err: string): this;
@@ -285,8 +290,8 @@ declare class SchemaUnion<T extends Array<SchemaItem>> extends SchemaItem<ItemTy
 
 declare function isNull(value: unknown): value is undefined | null;
 declare function parseQuery<T extends SchemaItem>(model: T, query: URLSearchParams, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
-declare function parseFormData<T extends SchemaObject>(model: T, data: FormData, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
-declare function parseForm<T extends SchemaObject>(model: T, form: HTMLFormElement, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
+declare function parseFormData<T extends SchemaItem>(model: T, data: FormData, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
+declare function parseForm<T extends SchemaItem>(model: T, form: HTMLFormElement, opts?: Parameters<T['parse']>[1]): ReturnType<T['parse']>;
 
 declare function parceable(): (target: object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<any>) => TypedPropertyDescriptor<any>;
 type SchemaItemStatic = new (...args: Array<any>) => SchemaItem;

package/dist/Schema.js

@@ -119,6 +119,10 @@ var _SchemaItem = class _SchemaItem {
     });
     return this;
   }
+  in(...values) {
+    this.addValidation((input) => values.includes(input));
+    return this;
+  }
   attrs(...attributes) {
     this.attributes.concat(attributes);
     return this;
@@ -205,6 +209,9 @@ var _SchemaItem = class _SchemaItem {
 __decorateClass([
   parceable()
 ], _SchemaItem.prototype, "defaultValue", 1);
+__decorateClass([
+  parceable()
+], _SchemaItem.prototype, "in", 1);
 var SchemaItem = _SchemaItem;
 
 // src/items/array.ts
@@ -375,20 +382,19 @@ function parseQuery(model, query, opts) {
   return model.parse(record, opts);
 }
 function parseFormData(model, data, opts) {
-  var _a;
   const record = {};
   for (const [key, value] of data) {
-    const isArray = (_a = model.model[key].isOfType([])) != null ? _a : false;
-    (0, import_object_util3.objectSet)(record, key.split(".").map((it) => /^\d+$/g.test(it) ? parseInt(it, 10) : it), isArray ? data.getAll(key) : value);
+    const hasMultipleValues = data.getAll(key).length > 1;
+    (0, import_object_util3.objectSet)(record, key.split(".").map((it) => /^\d+$/g.test(it) ? parseInt(it, 10) : it), hasMultipleValues ? data.getAll(key) : value);
   }
   const handleBoolean = (value, keys) => {
-    var _a2;
+    var _a;
     if (value instanceof SchemaNullable) {
       handleBoolean(value.unwrap(), keys);
     }
     if (value instanceof SchemaArray) {
       const elements = (0, import_object_util3.objectGet)(record, keys);
-      for (let it = 0; it < ((_a2 = elements == null ? void 0 : elements.length) != null ? _a2 : 0); it++) {
+      for (let it = 0; it < ((_a = elements == null ? void 0 : elements.length) != null ? _a : 0); it++) {
         handleBoolean(value.unwrap(), [...keys, it]);
       }
     }
@@ -404,7 +410,9 @@ function parseFormData(model, data, opts) {
       handleBoolean(value, [...keys, key]);
     });
   };
-  handleSchemaForBoolean(model.model);
+  if (model instanceof SchemaObject) {
+    handleSchemaForBoolean(model.model);
+  }
   return model.parse(record, opts);
 }
 function parseForm(model, form, opts) {

package/dist/Schema.mjs

@@ -76,6 +76,10 @@ var _SchemaItem = class _SchemaItem {
     });
     return this;
   }
+  in(...values) {
+    this.addValidation((input) => values.includes(input));
+    return this;
+  }
   attrs(...attributes) {
     this.attributes.concat(attributes);
     return this;
@@ -162,6 +166,9 @@ var _SchemaItem = class _SchemaItem {
 __decorateClass([
   parceable()
 ], _SchemaItem.prototype, "defaultValue", 1);
+__decorateClass([
+  parceable()
+], _SchemaItem.prototype, "in", 1);
 var SchemaItem = _SchemaItem;
 
 // src/items/array.ts
@@ -332,20 +339,19 @@ function parseQuery(model, query, opts) {
   return model.parse(record, opts);
 }
 function parseFormData(model, data, opts) {
-  var _a;
   const record = {};
   for (const [key, value] of data) {
-    const isArray = (_a = model.model[key].isOfType([])) != null ? _a : false;
-    objectSet(record, key.split(".").map((it) => /^\d+$/g.test(it) ? parseInt(it, 10) : it), isArray ? data.getAll(key) : value);
+    const hasMultipleValues = data.getAll(key).length > 1;
+    objectSet(record, key.split(".").map((it) => /^\d+$/g.test(it) ? parseInt(it, 10) : it), hasMultipleValues ? data.getAll(key) : value);
   }
   const handleBoolean = (value, keys) => {
-    var _a2;
+    var _a;
     if (value instanceof SchemaNullable) {
       handleBoolean(value.unwrap(), keys);
     }
     if (value instanceof SchemaArray) {
       const elements = objectGet(record, keys);
-      for (let it = 0; it < ((_a2 = elements == null ? void 0 : elements.length) != null ? _a2 : 0); it++) {
+      for (let it = 0; it < ((_a = elements == null ? void 0 : elements.length) != null ? _a : 0); it++) {
         handleBoolean(value.unwrap(), [...keys, it]);
       }
     }
@@ -361,7 +367,9 @@ function parseFormData(model, data, opts) {
       handleBoolean(value, [...keys, key]);
     });
   };
-  handleSchemaForBoolean(model.model);
+  if (model instanceof SchemaObject) {
+    handleSchemaForBoolean(model.model);
+  }
   return model.parse(record, opts);
 }
 function parseForm(model, form, opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dzeio/schema",
-	"version": "0.0.5",
+	"version": "0.1.0",
 	"dependencies": {
 		"@dzeio/object-util": "^1.8.3"
 	},