@dzeio/schema 0.0.4 → 0.0.6

package/dist/Schema.d.mts

@@ -1,16 +1,5 @@
 import { StandardSchemaV1 } from '@standard-schema/spec';
 
-declare class SchemaNullable<Type extends SchemaItem> extends SchemaItem<SchemaInfer<Type> | undefined> {
-    readonly child: Type;
-    constructor(child: Type);
-    unwrap(): Type;
-    parse(input: unknown, options?: {
-        fast?: boolean;
-    }): ValidationResult<SchemaInfer<Type> | undefined>;
-    isOfType(input: unknown): input is SchemaInfer<Type> | undefined;
-    private isNull;
-}
-
 declare abstract class SchemaItem<Type = any> implements StandardSchemaV1<Type> {
     '~standard': StandardSchemaV1.Props<Type>;
     /**
@@ -191,6 +180,17 @@ declare class SchemaLiteral<Type> extends SchemaItem<Type> {
     isOfType(input: unknown): input is Type;
 }
 
+declare class SchemaNullable<Type extends SchemaItem> extends SchemaItem<SchemaInfer<Type> | undefined> {
+    readonly child: Type;
+    constructor(child: Type);
+    unwrap(): Type;
+    parse(input: unknown, options?: {
+        fast?: boolean;
+    }): ValidationResult<SchemaInfer<Type> | undefined>;
+    isOfType(input: unknown): input is SchemaInfer<Type> | undefined;
+    private isNull;
+}
+
 declare class SchemaNumber extends SchemaItem<number> {
     /**
      * validate that the number is less or equal than {@link value}
@@ -285,8 +285,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

@@ -1,16 +1,5 @@
 import { StandardSchemaV1 } from '@standard-schema/spec';
 
-declare class SchemaNullable<Type extends SchemaItem> extends SchemaItem<SchemaInfer<Type> | undefined> {
-    readonly child: Type;
-    constructor(child: Type);
-    unwrap(): Type;
-    parse(input: unknown, options?: {
-        fast?: boolean;
-    }): ValidationResult<SchemaInfer<Type> | undefined>;
-    isOfType(input: unknown): input is SchemaInfer<Type> | undefined;
-    private isNull;
-}
-
 declare abstract class SchemaItem<Type = any> implements StandardSchemaV1<Type> {
     '~standard': StandardSchemaV1.Props<Type>;
     /**
@@ -191,6 +180,17 @@ declare class SchemaLiteral<Type> extends SchemaItem<Type> {
     isOfType(input: unknown): input is Type;
 }
 
+declare class SchemaNullable<Type extends SchemaItem> extends SchemaItem<SchemaInfer<Type> | undefined> {
+    readonly child: Type;
+    constructor(child: Type);
+    unwrap(): Type;
+    parse(input: unknown, options?: {
+        fast?: boolean;
+    }): ValidationResult<SchemaInfer<Type> | undefined>;
+    isOfType(input: unknown): input is SchemaInfer<Type> | undefined;
+    private isNull;
+}
+
 declare class SchemaNumber extends SchemaItem<number> {
     /**
      * validate that the number is less or equal than {@link value}
@@ -285,8 +285,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

@@ -57,34 +57,6 @@ var import_object_util3 = require("@dzeio/object-util");
 
 // src/SchemaItem.ts
 var import_object_util = require("@dzeio/object-util");
-
-// src/items/nullable.ts
-var SchemaNullable = class extends SchemaItem {
-  constructor(child) {
-    super([child]);
-    this.child = child;
-  }
-  unwrap() {
-    return this.child;
-  }
-  parse(input, options) {
-    if (this.isNull(input)) {
-      return {
-        valid: true,
-        object: void 0
-      };
-    }
-    return this.child.parse(input, options);
-  }
-  isOfType(input) {
-    return Array.isArray(input);
-  }
-  isNull(value) {
-    return typeof value === "undefined" || value === null;
-  }
-};
-
-// src/SchemaItem.ts
 var _SchemaItem = class _SchemaItem {
   constructor(items) {
     // standard Schema V1 spec
@@ -324,6 +296,32 @@ __decorateClass([
   parceable()
 ], SchemaBoolean.prototype, "parseString", 1);
 
+// src/items/nullable.ts
+var SchemaNullable = class extends SchemaItem {
+  constructor(child) {
+    super([child]);
+    this.child = child;
+  }
+  unwrap() {
+    return this.child;
+  }
+  parse(input, options) {
+    if (this.isNull(input)) {
+      return {
+        valid: true,
+        object: void 0
+      };
+    }
+    return this.child.parse(input, options);
+  }
+  isOfType(input) {
+    return Array.isArray(input);
+  }
+  isNull(value) {
+    return typeof value === "undefined" || value === null;
+  }
+};
+
 // src/items/object.ts
 var import_object_util2 = require("@dzeio/object-util");
 var SchemaObject = class extends SchemaItem {
@@ -377,20 +375,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]);
       }
     }
@@ -406,7 +403,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) {
@@ -679,9 +678,6 @@ var SchemaUnion = class extends SchemaItem {
 // src/Schema.ts
 function parceable() {
   return (target, propertyKey, descriptor) => {
-    if (!(target instanceof SchemaItem)) {
-      throw new Error("the decorator is only usable on Schema");
-    }
     if (!(propertyKey in target)) {
       throw new Error("property not set in object");
     }

package/dist/Schema.mjs

@@ -14,34 +14,6 @@ import { objectGet, objectLoop as objectLoop2, objectSet } from "@dzeio/object-u
 
 // src/SchemaItem.ts
 import { objectClean } from "@dzeio/object-util";
-
-// src/items/nullable.ts
-var SchemaNullable = class extends SchemaItem {
-  constructor(child) {
-    super([child]);
-    this.child = child;
-  }
-  unwrap() {
-    return this.child;
-  }
-  parse(input, options) {
-    if (this.isNull(input)) {
-      return {
-        valid: true,
-        object: void 0
-      };
-    }
-    return this.child.parse(input, options);
-  }
-  isOfType(input) {
-    return Array.isArray(input);
-  }
-  isNull(value) {
-    return typeof value === "undefined" || value === null;
-  }
-};
-
-// src/SchemaItem.ts
 var _SchemaItem = class _SchemaItem {
   constructor(items) {
     // standard Schema V1 spec
@@ -281,6 +253,32 @@ __decorateClass([
   parceable()
 ], SchemaBoolean.prototype, "parseString", 1);
 
+// src/items/nullable.ts
+var SchemaNullable = class extends SchemaItem {
+  constructor(child) {
+    super([child]);
+    this.child = child;
+  }
+  unwrap() {
+    return this.child;
+  }
+  parse(input, options) {
+    if (this.isNull(input)) {
+      return {
+        valid: true,
+        object: void 0
+      };
+    }
+    return this.child.parse(input, options);
+  }
+  isOfType(input) {
+    return Array.isArray(input);
+  }
+  isNull(value) {
+    return typeof value === "undefined" || value === null;
+  }
+};
+
 // src/items/object.ts
 import { isObject, objectClone, objectLoop } from "@dzeio/object-util";
 var SchemaObject = class extends SchemaItem {
@@ -334,20 +332,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]);
       }
     }
@@ -363,7 +360,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) {
@@ -636,9 +635,6 @@ var SchemaUnion = class extends SchemaItem {
 // src/Schema.ts
 function parceable() {
   return (target, propertyKey, descriptor) => {
-    if (!(target instanceof SchemaItem)) {
-      throw new Error("the decorator is only usable on Schema");
-    }
     if (!(propertyKey in target)) {
       throw new Error("property not set in object");
     }

package/package.json

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